Version of yelp using xulrunner 1.9

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

4 files changed, 635 insertions, 6 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 670b682dfad3..f7c6e9834ee4 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.184 2008/06/07 23:22:31 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.185 2008/07/19 01:50:48 dang Exp $
+
+*yelp-2.22.1-r10 (19 Jul 2008)
+
+  19 Jul 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/yelp-2.22.1-xulrunner-1.9.patch, +yelp-2.22.1-r10.ebuild:
+  Bump to 2.22.1-r10
+
+  - This version requires xulrunner 1.9
 
   07 Jun 2008; Mart Raudsepp <leio@gentoo.org> yelp-2.22.1-r1.ebuild:
   Call intltoolize to not fail with differing intltool version on system
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index b6d8dd07fb02..fb1483bfe474 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX yelp-2.22-with-beagle-0.3.patch 1534 RMD160 b35a62b419497c91ab6348259f87c0d30953ad57 SHA1 bee78d88d8d6908100d69ab7e288bc4ab8098fa2 SHA256 7a39a45370849720f5e3f147809c114bfc38743ed56a9caff8325297b701fb0f
+AUX yelp-2.22.1-xulrunner-1.9.patch 19677 RMD160 b463718314652821946a3cf9ca9e77e36ac2f5cc SHA1 c95312cfb2063f4d93f318d72c92a22d4b036353 SHA256 09fb68c73587dcda653701efb9a2893da5942cc12795c95f1305b5e02ac29466
 DIST yelp-2.16.2.tar.bz2 858693 RMD160 5c33700f40c6f533406d99f06731f2ffcb31d448 SHA1 d165a6a31eed3f6f2c251b9217299cd5e04ac6e0 SHA256 d3582665af98c8f4fd2f3c62d378360ea4de699bfe9e7213054071462f0650d5
 DIST yelp-2.18.1.tar.bz2 900142 RMD160 8aaf7e5f7f37369fa6822eed615f110babbecd28 SHA1 66e446596c22902290d6614b2d356b64d5bd304c SHA256 3add75de19550015a526a875bca66be81f73910561f1a84493d76d990717d1fa
 DIST yelp-2.20.0.tar.bz2 903106 RMD160 381b71583bc98dcce52a3de19407cc7f7e123ab0 SHA1 29c99793174c24f86ad34373ed5798b534aaac9e SHA256 0f4e1c5f3c4bf8d5109794b4d0a340ed847d49381d42968beb405f14b68c61ed
@@ -10,13 +11,14 @@ EBUILD yelp-2.16.2.ebuild 1078 RMD160 447c272d74b726cb01c8d6d6c5e9ebd1b10cba94 S
 EBUILD yelp-2.18.1.ebuild 1231 RMD160 d004768614c3e5e673b617b2bad5303b10ece780 SHA1 104ce5cf40331a033667bf962805e11f1f86f289 SHA256 a9aa5a617e0f83fb493209db4d9d3109fc53d7d35878bdd8550469f623fb44f1
 EBUILD yelp-2.20.0.ebuild 1626 RMD160 4b100f76cdd30e91e9bdc85d9e817fed68283a14 SHA1 9b2acc031b0fc923f736ce963ae0a195ff8a1c0c SHA256 e00b52b39b0943f903fb6180ec7b69062f71a20cb8db6b004b12c9f3bf629f78
 EBUILD yelp-2.22.1-r1.ebuild 2019 RMD160 6484dd4cbef94613e3acce79518e69da3bfe3b62 SHA1 5835819bf7dfe596ff064583a7fe97312b10e95d SHA256 37c80e522c853adf4fc275259ac8f37b0327ccfed021fa52fb8be05424e123fb
+EBUILD yelp-2.22.1-r10.ebuild 1935 RMD160 9e1ab42025f843839598c51f083e33776214bf1a SHA1 fcb960b7493286a28dfe333ccae79ced239bc1db SHA256 40f7386762339b5e6db1561842469b4e7f1b0f9a493d2d5e088209d445563bf3
 EBUILD yelp-2.22.1.ebuild 1661 RMD160 7b8c25efd8e7139ffce157d670e8ae191567be9f SHA1 c30e24ebfeea3334e5cfc292eda0b24664f96d5b SHA256 268b8619a1ab40f0056d0a043fe54409575bc0cfa7ca8cfea65dc5e079b5db90
-MISC ChangeLog 21210 RMD160 15b4a26044c7ad12982c6d394705ec52b0f36f77 SHA1 3edc01a83ca0cf972489f5e41acafa774c8769c3 SHA256 17fbc49c8586a421785d04325017e74df5bc23143ffa07e762c58194bdc347a9
+MISC ChangeLog 21423 RMD160 71ba2db5a87a7cc635a2d040d08c2212413c165a SHA1 7a1e58a0e858f6a721a0e2296d2f4d5b548a6303 SHA256 4321bbd47535688656f6c1ec84a420c88edff47f409d0345c80cfac435784284
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhLGEAACgkQkeYb6olFHJcm3QCfafIaIo24uvRTNrfC7PVY0mEC
-bjsAoL1c8ZhYpQd1NfM9T/zVBy7m27ah
-=LQy9
+iD8DBQFIgUiKomPajV0RnrERAtvnAJ9bVDuIUlGLMQaHJe3InYBvUoQQrgCggts2
+A4rGZcGyIY+ticleQT/Aqmk=
+=loyh
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/yelp/files/yelp-2.22.1-xulrunner-1.9.patch b/gnome-extra/yelp/files/yelp-2.22.1-xulrunner-1.9.patch
new file mode 100644
index 000000000000..10ef6a56c560
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.22.1-xulrunner-1.9.patch
@@ -0,0 +1,548 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN yelp-2.22.1.orig/configure.in yelp-2.22.1/configure.in
+--- yelp-2.22.1.orig/configure.in	2008-04-07 17:59:54.000000000 -0400
++++ yelp-2.22.1/configure.in	2008-07-18 21:35:59.000000000 -0400
+@@ -25,6 +25,8 @@ AC_HEADER_STDC
+ AM_PROG_LIBTOOL
+ AM_PATH_GLIB_2_0
+ 
++AM_PROG_CC_C_O
++
+ GNOME_DEBUG_CHECK
+ GNOME_COMPILE_WARNINGS([maximum])
+ GNOME_CXX_WARNINGS
+@@ -179,6 +181,7 @@ AC_SUBST([YELP_SEARCH_LIBS])
+ # *****
+ 
+ GECKO_INIT([MOZILLA])
++GECKO_DEFINES
+ 
+ AC_SUBST([MOZILLA])
+ AC_SUBST([MOZILLA_FLAVOUR])
+@@ -190,11 +193,20 @@ AC_SUBST([MOZILLA_GLUE_LIBS])
+ 
+ case "$MOZILLA" in
+ xulrunner) gecko_min_version=1.8 ;;
++libxul*) gecko_min_version=1.9 ;;
+ *firefox) gecko_min_version=1.5 ;;
+ *) AC_MSG_ERROR([$gecko_cv_gecko is not supported])
+ esac
+ 
+-PKG_CHECK_MODULES([MOZILLA_COMPONENT],[${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies])
++if test $MOZILLA = libxul-embedding; then
++	PKG_CHECK_MODULES([MOZILLA_COMPONENT],[libxul-embedding $gecko_cv_extra_pkg_dependencies])
++	MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS `$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`"
++elif test $MOZILLA = libxul; then
++	PKG_CHECK_MODULES([MOZILLA_COMPONENT],[libxul $gecko_cv_extra_pkg_dependencies])
++	MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS `$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`"
++else
++	PKG_CHECK_MODULES([MOZILLA_COMPONENT],[${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies])
++fi
+ 
+ dnl ====================================
+ dnl = zlib for help converters
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN yelp-2.22.1.orig/m4/gecko.m4 yelp-2.22.1/m4/gecko.m4
+--- yelp-2.22.1.orig/m4/gecko.m4	2007-04-12 17:36:04.000000000 -0400
++++ yelp-2.22.1/m4/gecko.m4	2008-07-18 21:35:59.000000000 -0400
+@@ -13,7 +13,7 @@
+ #
+ # You should have received a copy of the GNU General Public License along
+ # with this program; if not, write to the Free Software Foundation, Inc.,
+-# 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ 
+ # GECKO_INIT(VARIABLE,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+ #
+@@ -32,6 +32,7 @@
+ # VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...)
+ # VARIABLE_FLAVOUR: The flavour of the gecko that was found
+ # VARIABLE_HOME:
++# VARIABLE_NSPR: set if nspr is provided by gecko flags
+ # VARIABLE_PREFIX:
+ # VARIABLE_INCLUDE_ROOT:
+ # VARIABLE_VERSION: The version of the gecko that was found
+@@ -51,7 +52,7 @@ AC_PROG_AWK
+ AC_MSG_CHECKING([which gecko to use])
+ 
+ AC_ARG_WITH([gecko],
+-	AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
++	AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul-embedding|libxul@:>@],
+ 		       [Which gecko engine to use (autodetected by default)]))
+ 
+ # Backward compat
+@@ -60,12 +61,15 @@ AC_ARG_WITH([mozilla],[],[with_gecko=$wi
+ gecko_cv_gecko=$with_gecko
+ 
+ # Autodetect gecko
+-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla"
++_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul"
+ if test -z "$gecko_cv_gecko"; then
+ 	for lizard in $_geckos; do
+ 		if $PKG_CONFIG --exists $lizard-xpcom; then
+ 			gecko_cv_gecko=$lizard
+ 			break;
++		elif $PKG_CONFIG --exists $lizard-unstable; then
++			gecko_cv_gecko=$lizard
++			break;
+ 		fi
+ 	done
+ fi
+@@ -82,6 +86,14 @@ else
+ 	gecko_cv_have_gecko=yes
+ fi
+ 
++AC_MSG_CHECKING([manual gecko home set])
++
++AC_ARG_WITH([gecko-home],
++	AS_HELP_STRING([--with-gecko-home@<:@=[path]@:>@],
++		       [Manually set MOZILLA_FIVE_HOME]))
++
++gecko_cv_gecko_home=$with_gecko_home
++
+ # ****************
+ # Define variables
+ # ****************
+@@ -93,27 +105,38 @@ mozilla) gecko_cv_gecko_flavour=mozilla 
+ seamonkey) gecko_cv_gecko_flavour=mozilla ;;
+ *firefox) gecko_cv_gecko_flavour=toolkit ;;
+ xulrunner) gecko_cv_gecko_flavour=toolkit ;;
++libxul*) gecko_cv_gecko_flavour=toolkit ;;
+ esac
+ 
+-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
+-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
+-
++if $PKG_CONFIG --exists  ${gecko_cv_gecko}-xpcom; then
++	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
++	_GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT"
++	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
++	_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
++	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
++	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
++else
++	_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
++	_GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --cflags ${gecko_cv_gecko}-unstable`"
++	_GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
++	_GECKO_HOME="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`"
++	_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`"
++	_GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
++fi
+ fi # if gecko_cv_have_gecko
+ 
+ if test "$gecko_cv_gecko_flavour" = "toolkit"; then
+ 	AC_DEFINE([HAVE_MOZILLA_TOOLKIT],[1],[Define if mozilla is of the toolkit flavour])
+ fi
+ 
+-AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test "$gecko_cv_gecko_flavour" = "toolkit"])
+-
+ $1[]=$gecko_cv_gecko
+ $1[]_FLAVOUR=$gecko_cv_gecko_flavour
+ $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
++$1[]_CFLAGS=$_GECKO_CFLAGS
+ $1[]_LIBDIR=$_GECKO_LIBDIR
+ $1[]_HOME=$_GECKO_HOME
+ $1[]_PREFIX=$_GECKO_PREFIX
++$1[]_NSPR=$_GECKO_NSPR
+ 
+ # **************************************************************
+ # This is really gcc-only
+@@ -184,7 +207,7 @@ if test "$gecko_cv_have_gecko" = "yes"; 
+ AC_LANG_PUSH([C++])
+ 
+ _SAVE_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT"
++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS"
+ 
+ AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]])
+ AC_RUN_IFELSE(
+@@ -217,6 +240,18 @@ AC_COMPILE_IFELSE(
+ 	[gecko_cv_have_debug=no])
+ AC_MSG_RESULT([$gecko_cv_have_debug])
+ 
++AC_MSG_CHECKING([[whether we have a xpcom glue]])
++AC_COMPILE_IFELSE(
++	[AC_LANG_SOURCE(
++		[[
++		  #ifndef XPCOM_GLUE
++		  #error "no xpcom glue found"
++		  #endif]]
++	)],
++	[gecko_cv_have_xpcom_glue=yes],
++	[gecko_cv_have_xpcom_glue=no])
++AC_MSG_RESULT([$gecko_cv_have_xpcom_glue])
++
+ CPPFLAGS="$_SAVE_CPPFLAGS"
+ 
+ AC_LANG_POP([C++])
+@@ -228,9 +263,11 @@ if test "$gecko_cv_have_debug" = "yes"; 
+ 	AC_DEFINE([HAVE_GECKO_DEBUG],[1],[Define if gecko is a debug build])
+ fi
+ 
+-fi # if gecko_cv_have_gecko
++if test "$gecko_cv_have_xpcom_glue" = "yes"; then
++	AC_DEFINE([HAVE_GECKO_XPCOM_GLUE],[1],[Define if xpcom glue is used])
++fi
+ 
+-AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
++fi # if gecko_cv_have_gecko
+ 
+ # ***********************
+ # Check for gecko version
+@@ -241,7 +278,7 @@ if test "$gecko_cv_have_gecko" = "yes"; 
+ AC_LANG_PUSH([C++])
+ 
+ _SAVE_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT"
++CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS"
+ 
+ AC_CACHE_CHECK([for gecko version],
+ 	[gecko_cv_gecko_version],
+@@ -311,11 +348,6 @@ fi
+ 
+ fi # if gecko_cv_have_gecko
+ 
+-AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$gecko_cv_gecko_version_int" -ge "1007000"])
+-AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_gecko_version_int" -ge "1008000"])
+-AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_gecko_version_int" -ge "1008001"])
+-AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_gecko_version_int" -ge "1009000"])
+-
+ $1[]_VERSION=$gecko_cv_gecko_version
+ $1[]_VERSION_INT=$gecko_cv_gecko_version_int
+ 
+@@ -328,8 +360,11 @@ gecko_cv_glue_libs=
+ gecko_cv_extra_pkg_dependencies=
+ 
+ if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
+-	gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"
+-	gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s"
++	if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then
++		gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul"
++	else
++		gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue"
++	fi
+ else
+ 	gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
+ fi
+@@ -340,6 +375,29 @@ $1[]_GLUE_LIBS="$gecko_cv_glue_libs"
+ 
+ ])
+ 
++# GECKO_DEFINES
++#
++# Defines the AM_CONDITIONALS for GECKO_INIT. This is a separate call
++# so that you may call GECKO_INIT conditionally; but note that you must
++# call GECKO_DEFINES _unconditionally_ !
++
++AC_DEFUN([GECKO_DEFINES],
++[
++# Ensure we have an integer variable to compare with
++if test -z "$gecko_cv_gecko_version_int"; then
++	gecko_cv_gecko_version_int=0
++fi
++AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_flavour" = "toolkit"])
++AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_have_debug" = "yes"])
++AM_CONDITIONAL([HAVE_GECKO_1_7],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1007000"])
++AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008000"])
++AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"])
++AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"])
++AM_CONDITIONAL([HAVE_GECKO_HOME],[test "x$_GECKO_HOME" != "x"])
++AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"])
++AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"])
++])
++
+ # ***************************************************************************
+ # ***************************************************************************
+ # ***************************************************************************
+@@ -359,10 +417,20 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
+ _SAVE_CXXFLAGS="$CXXFLAGS"
+ _SAVE_LDFLAGS="$LDFLAGS"
+ _SAVE_LIBS="$LIBS"
+-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
+-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++else
++	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
++	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
++fi
++if test -n "$_GECKO_HOME"; then
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
++else
++	LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
++fi
+ 
+ _GECKO_DISPATCH_INCLUDEDIRS="$2"
+ 
+@@ -371,9 +439,11 @@ _GECKO_DISPATCH_INCLUDEDIRS="$2"
+ # Mind you, it's useful to be able to test against uninstalled mozilla builds...
+ _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
+ 
+-# Now add them to CPPFLAGS
++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding.
+ for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
+-	CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	if test -d "$_GECKO_INCLUDE_ROOT/$i"; then
++		CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
++	fi
+ done
+ 
+ m4_indir([$1],m4_shiftn(2,$@))
+@@ -426,11 +496,17 @@ AC_DEFUN([GECKO_XPCOM_PROGRAM],
+ #include <mozilla-config.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++
++#ifdef XPCOM_GLUE
++#include <nsXPCOMGlue.h>
++#else
+ #include <nsXPCOM.h>
++#endif // XPCOM_GLUE
++
+ #include <nsCOMPtr.h>
+ #include <nsILocalFile.h>
+ #include <nsIServiceManager.h>
+-#ifdef HAVE_GECKO_1_8
++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9)
+ #include <nsStringAPI.h>
+ #else
+ #include <nsString.h>
+@@ -438,16 +514,37 @@ AC_DEFUN([GECKO_XPCOM_PROGRAM],
+ ]]
+ [$1],
+ [[
++
++nsresult rv;
++#ifdef XPCOM_GLUE
++    static const GREVersionRange greVersion = {
++    "1.8", PR_TRUE,
++    "1.9.*", PR_TRUE
++    };
++    char xpcomLocation[4096];
++    rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
++    if (NS_FAILED(rv)) {
++        exit(123);
++    }
++
++    // Startup the XPCOM Glue that links us up with XPCOM.
++    XPCOMGlueStartup(xpcomLocation);
++    if (NS_FAILED(rv)) {
++        exit(124);
++    }
++#endif // XPCOM_GLUE
++
+ // redirect unwanted mozilla debug output to the bit bucket
+ freopen ("/dev/null", "w", stdout);
+ 
+-nsresult rv;
+-nsCOMPtr<nsILocalFile> directory;
++nsCOMPtr<nsILocalFile> directory = nsnull;
++#ifndef XPCOM_GLUE
+ rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE,
+ 			    getter_AddRefs (directory));
+ if (NS_FAILED (rv) || !directory) {
+ 	exit (126);
+ }
++#endif
+ 
+ rv = NS_InitXPCOM2 (nsnull, directory, nsnull);
+ if (NS_FAILED (rv)) {
+@@ -595,21 +692,22 @@ fi
+ AC_DEFUN([GECKO_XPIDL],
+ [AC_REQUIRE([GECKO_INIT])dnl
+ 
+-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
++if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then
++	_GECKO_LIBDIR="`$PKG_CONFIG pkg-config --variable=sdkdir ${gecko_cv_gecko}`/bin"
++else
++	_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
++fi
+ 
+ AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])
+ 
++if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then
++XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`"
++else
+ XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
+-
+-# Older geckos don't have this variable, see
+-# https://bugzilla.mozilla.org/show_bug.cgi?id=240473
+-
+ if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
+ 	XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`"
+ fi
+-
+ # Some distributions (Gentoo) have it in unusual places
+-
+ if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
+ 	XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl"
+ fi
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN yelp-2.22.1.orig/src/Makefile.am yelp-2.22.1/src/Makefile.am
+--- yelp-2.22.1.orig/src/Makefile.am	2008-04-07 14:02:52.000000000 -0400
++++ yelp-2.22.1/src/Makefile.am	2008-07-18 21:35:59.000000000 -0400
+@@ -65,10 +65,12 @@ mozilla_include_subdirs =	\
+ yelp_CPPFLAGS =									\
+ 	-I$(top_srcdir)								\
+ 	-I$(top_builddir)/src							\
+-	$(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(mozilla_include_subdirs))      \
+ 	$(YELP_DEFINES)								\
+ 	$(AM_CPPFLAGS)
+ 
++yelp_CPPFLAGS += $(MOZILLA_COMPONENT_CFLAGS)
++yelp_CPPFLAGS += $(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(mozilla_include_subdirs))
++
+ yelp_CFLAGS =				\
+ 	$(YELP_CFLAGS)			\
+ 	$(YELP_SEARCH_CFLAGS)		\
+@@ -92,7 +94,11 @@ yelp_LDADD =				\
+ 	$(MOZILLA_EXTRA_LIBS)		\
+ 	$(MOZILLA_GLUE_LIBS)
+ 
+-yelp_LDFLAGS = -R$(MOZILLA_HOME) $(AM_LDFLAGS)
++yelp_LDFLAGS = $(AM_LDFLAGS)
++
++if !HAVE_GECKO_XPCOM_GLUE
++yelp_LDFLAGS += -Wl,-rpath,$(MOZILLA_HOME)
++endif
+ 
+ #check_PROGRAMS =		\
+ #	test-document		\
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN yelp-2.22.1.orig/src/yelp-gecko-services.cpp yelp-2.22.1/src/yelp-gecko-services.cpp
+--- yelp-2.22.1.orig/src/yelp-gecko-services.cpp	2008-04-07 14:02:52.000000000 -0400
++++ yelp-2.22.1/src/yelp-gecko-services.cpp	2008-07-18 21:35:59.000000000 -0400
+@@ -21,7 +21,7 @@
+  */
+ 
+ #include <mozilla-config.h>
+-#include "config.h"
++#include <config.h>
+ 
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -30,12 +30,18 @@
+ 
+ #include <nsCOMPtr.h>
+ #include <nsIComponentManager.h>
++#include <nsComponentManagerUtils.h>
+ #include <nsIComponentRegistrar.h>
+ #include <nsIGenericFactory.h>
+ #include <nsILocalFile.h>
+ #include <nsIPrintSettings.h>
+ #include <nsServiceManagerUtils.h>
++
++#ifdef XPCOM_GLUE
++#include <nsXPCOMGlue.h>
++#else
+ #include <nsXPCOM.h>
++#endif
+ 
+ #include "yelp-gecko-services.h"
+ 
+@@ -298,7 +304,6 @@ PrintListener::SetPrintSettings (YelpPri
+   target->SetPrintInColor (gtk_print_settings_get_use_color (settings->config));
+ 
+   target->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters);
+-  target->SetPaperSize (nsIPrintSettings::kPaperSizeDefined);
+ 
+   GtkPaperSize *paperSize = gtk_page_setup_get_paper_size (settings->setup);
+   if (!paperSize) {
+@@ -437,15 +442,16 @@ yelp_register_printing ()
+   NS_ENSURE_SUCCESS (rv, );
+ 
+   nsCOMPtr<nsIGenericFactory> componentFactory;
+-  rv = NS_NewGenericFactory(getter_AddRefs(componentFactory),
+-			    &(sAppComps[0]));
+-    
++  componentFactory = do_CreateInstance ("@mozilla.org/generic-factory;1", &rv);
++
+   if (NS_FAILED(rv) || !componentFactory)
+     {
+       g_warning ("Failed to make a factory for %s\n", sAppComps[0].mDescription);
+       return;
+     }
+    
++  componentFactory->SetComponentInfo(&(sAppComps[0]));
++    
+   rv = cr->RegisterFactory(sAppComps[0].mCID,
+ 			   sAppComps[0].mDescription,
+ 			   sAppComps[0].mContractID,
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN yelp-2.22.1.orig/src/yelp-gecko-utils.cpp yelp-2.22.1/src/yelp-gecko-utils.cpp
+--- yelp-2.22.1.orig/src/yelp-gecko-utils.cpp	2007-04-12 17:36:05.000000000 -0400
++++ yelp-2.22.1/src/yelp-gecko-utils.cpp	2008-07-18 21:35:59.000000000 -0400
+@@ -27,6 +27,10 @@
+ 
+ #include <nsStringAPI.h>
+ 
++//#ifdef HAVE_GECKO_1_9
++//#include <gtkmozembed_glue.cpp>
++//#endif
++
+ #include <gtkmozembed.h>
+ #include <gtkmozembed_internal.h>
+ #include <nsCOMPtr.h>
+@@ -205,18 +209,45 @@ yelp_gecko_init (void)
+ #ifdef HAVE_GECKO_1_9
+ 	NS_LogInit ();
+ #endif
+-	
++
++	nsresult rv;
++#ifdef XPCOM_GLUE
++    static const GREVersionRange greVersion = {
++    "1.9a", PR_TRUE,
++    "2", PR_TRUE
++    };
++    char xpcomLocation[PATH_MAX];
++    rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, sizeof (xpcomLocation));
++    NS_ENSURE_SUCCESS (rv, FALSE);
++
++    // Startup the XPCOM Glue that links us up with XPCOM.
++    rv = XPCOMGlueStartup(xpcomLocation);
++    NS_ENSURE_SUCCESS (rv, FALSE);
++
++    rv = GTKEmbedGlueStartup();
++    NS_ENSURE_SUCCESS (rv, FALSE);
++
++    rv = GTKEmbedGlueStartupInternal();
++    NS_ENSURE_SUCCESS (rv, FALSE);
++
++    char *lastSlash = strrchr(xpcomLocation, '/');
++    if (lastSlash)
++      *lastSlash = '\0';
++
++    gtk_moz_embed_set_path(xpcomLocation);
++
++#else
+ #ifdef HAVE_GECKO_1_9
+ 	gtk_moz_embed_set_path (MOZILLA_HOME);
+ #else
+ 	gtk_moz_embed_set_comp_path (MOZILLA_HOME);
+ #endif
++#endif // XPCOM_GLUE
+ 
+ 	gtk_moz_embed_push_startup ();
+ 
+ 	yelp_register_printing ();
+ 
+-	nsresult rv;
+ 	nsCOMPtr<nsIPrefService> prefService (do_GetService (NS_PREFSERVICE_CONTRACTID, &rv));
+ 	NS_ENSURE_SUCCESS (rv, FALSE);
+ 
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN yelp-2.22.1.orig/src/yelp-main.c yelp-2.22.1/src/yelp-main.c
+--- yelp-2.22.1.orig/src/yelp-main.c	2007-08-16 15:57:38.000000000 -0400
++++ yelp-2.22.1/src/yelp-main.c	2008-07-18 21:35:59.000000000 -0400
+@@ -389,7 +389,8 @@ main (int argc, char **argv) 
+ 	}
+ 
+ 	if (!yelp_html_initialize ()) {
+-		g_error ("Could not initialize gecko!");
++		g_printerr ("Could not initialize gecko!\n");
++		exit (1);
+ 	}
+ 
+ 	if (files != NULL && files[0] != NULL) {
diff --git a/gnome-extra/yelp/yelp-2.22.1-r10.ebuild b/gnome-extra/yelp/yelp-2.22.1-r10.ebuild
new file mode 100644
index 000000000000..22b6cc67a416
--- /dev/null
+++ b/gnome-extra/yelp/yelp-2.22.1-r10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.22.1-r10.ebuild,v 1.1 2008/07/19 01:50:48 dang Exp $
+
+EAPI=1
+
+inherit eutils autotools gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="beagle lzma"
+
+RDEPEND=">=gnome-base/gconf-2
+	>=app-text/gnome-doc-utils-0.11.1
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2.14
+	>=dev-libs/libxml2-2.6.5
+	>=dev-libs/libxslt-1.1.4
+	>=x11-libs/startup-notification-0.8
+	>=dev-libs/glib-2
+	>=dev-libs/dbus-glib-0.71
+	beagle? ( || ( >=dev-libs/libbeagle-0.3.0 =app-misc/beagle-0.2* ) )
+	net-libs/xulrunner:1.9
+	sys-libs/zlib
+	app-arch/bzip2
+	lzma? ( app-arch/lzma-utils )
+	>=app-text/rarian-0.7
+	>=app-text/scrollkeeper-9999"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# patch to work with >=libbeagle-0.3, bug #215026
+	epatch "${FILESDIR}"/yelp-2.22-with-beagle-0.3.patch
+
+	# Use xulrunner 1.9.  Bug #204632
+	epatch "${FILESDIR}"/${P}-xulrunner-1.9.patch
+
+	# patch to fix parallel make, see bug #217250
+	sed -e "s/install-exec-local:/install-exec-hook:/" -i src/Makefile.am
+
+	intltoolize --force --automake || die "intltoolize failed"
+	eautoreconf
+
+	# strip stupid options in configure, see bug #196621
+	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure
+}
+
+pkg_setup() {
+	# FIXME: Add patch to make lzma-utils not automagic and use_enable here
+	G2CONF="${G2CONF} --enable-man --enable-info --with-gecko=libxul"
+
+	if use beagle; then
+		G2CONF="${G2CONF} --with-search=beagle"
+	else
+		G2CONF="${G2CONF} --with-search=basic"
+	fi
+}