3 files changed, 66 insertions, 4 deletions
diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 76cb8b0148ca..e70e3fbdfec1 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.272 2011/11/28 16:45:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.273 2011/12/16 08:58:52 tetromino Exp $
+
+  16 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  yelp-2.30.2-r6.ebuild, +files/yelp-2.30.2-mozilla-glue-libs.patch:
+  Fix -ldl linking problems with xulrunner-2.0 (bug #392367, thanks to Peter
+  Alfredsen and Alex Maclean). Also, gnome2_src_prepare should be after
+  eautoreconf.
 
   28 Nov 2011; Pacho Ramos <pacho@gentoo.org> -yelp-2.30.2-r1.ebuild,
   yelp-2.30.2-r6.ebuild:
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-mozilla-glue-libs.patch b/gnome-extra/yelp/files/yelp-2.30.2-mozilla-glue-libs.patch
new file mode 100644
index 000000000000..29966f272449
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.30.2-mozilla-glue-libs.patch
@@ -0,0 +1,53 @@
+From dbe69c1ea82de4028371e0a09ceabf526d95beb6 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 16 Dec 2011 03:41:10 -0500
+Subject: [PATCH] gecko.m4: do not define *_{EXTRA,GLUE}_LIBS if pkgconfig
+ file already provides libs
+
+Fixes linking with --as-needed for xulrunner-2.0's libxul-embedding.
+
+https://bugs.gentoo.org/show_bug.cgi?id=392367
+---
+ m4/gecko.m4 |   12 ++++++++----
+ 1 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/m4/gecko.m4 b/m4/gecko.m4
+index 8d2f106..92a45cf 100644
+--- a/m4/gecko.m4
++++ b/m4/gecko.m4
+@@ -115,6 +115,7 @@ 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_LIBS="`$PKG_CONFIG --libs ${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
+@@ -122,6 +123,7 @@ 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_LIBS="`$PKG_CONFIG --libs ${gecko_cv_gecko}` `$PKG_CONFIG --libs ${gecko_cv_gecko}-unstable`"
+ 	_GECKO_HOME=$with_gecko_home
+ 	_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
+@@ -364,10 +366,12 @@ gecko_cv_glue_libs=
+ gecko_cv_extra_pkg_dependencies=
+ 
+ if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
+-	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"
++	if test -z "$_GECKO_LIBS"; then
++		if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then
++			gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxpcomglue"
++		else
++			gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue"
++		fi
+ 	fi
+ else
+ 	gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed"
+-- 
+1.7.8
+
diff --git a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild b/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
index dfef57df062f..21df203b71c6 100644
--- a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r6.ebuild,v 1.4 2011/11/28 16:45:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r6.ebuild,v 1.5 2011/12/16 08:58:52 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -47,8 +47,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Fix automagic lzma support, bug #266128
 	epatch "${FILESDIR}/${PN}-2.26.0-automagic-lzma.patch"
 
@@ -73,12 +71,17 @@ src_prepare() {
 	# Fix small freezes when moving window
 	epatch "${FILESDIR}/${P}-freeze-move.patch"
 
+	# Fix -ldl linking problems with xulrunner-2.0 (bug #392367)
+	epatch "${FILESDIR}/${P}-mozilla-glue-libs.patch"
+
 	# Ensure schema is regenerated properly to prevent warnings
 	rm -f data/yelp.schemas || die
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 
+	gnome2_src_prepare
+
 	# strip stupid options in configure, see bug #196621
 	sed -i 's|$AM_CFLAGS -pedantic -ansi|$AM_CFLAGS|' configure || die "sed	failed"
 }