Fix gconf dep bug #360307

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

5 files changed, 43 insertions, 21 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index fe0eacdb3e54..49f40428f872 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/xulrunner
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.404 2011/04/03 17:02:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.405 2011/04/04 02:12:32 anarchy Exp $
+
+*xulrunner-2.0-r1 (04 Apr 2011)
+
+  04 Apr 2011; Jory A. Pratt <anarchy@gentoo.org> -xulrunner-2.0.ebuild,
+  +xulrunner-2.0-r1.ebuild, +files/mozilla-2.0-gconf-config-update.patch:
+  Fix gconf dep bug #360307
 
   03 Apr 2011; Jeroen Roovers <jer@gentoo.org> xulrunner-1.9.2.16.ebuild:
   Stable for HPPA (bug #360055).
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 0f3914bfa99a..a0dd956ffb6d 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX bug-606109.patch 1243 RMD160 ec262eed0480d8a13c914c4781329e3ea1c23b0f SHA1 0c0cc40ee0a663422b107cc3ae5d1412b8c45ac7 SHA256 266d9c7218cc04c3badadc54f8f31b1238326b9c3052aed057ffce40c69541dc
 AUX fix-animated-gifs.patch 7789 RMD160 a8889110a2daea27e07f92a70df6cb1e39e05546 SHA1 05b335feeefff4f06004a20182f821d998b44879 SHA256 6d85d3c103b0dcdbb073302a4041a37bea97c715384d04d299c1fb49a5da7443
 AUX libnotify-0.7.patch 1777 RMD160 1669210dd704fd4cb84be3fbb8ced8bd10133abb SHA1 981a0cf66608e1b441c21db73a7203711de56fe0 SHA256 153d129004e63baca57182ce2ec381a9103feef9e5fbdf631339bce25cde9489
+AUX mozilla-2.0-gconf-config-update.patch 827 RMD160 9de17d272f6e5899f79d713b965537f66d17db79 SHA1 5f575306bec598b1ff31dccccf42fd87de25c36c SHA256 d9c53a9a728cd4e350fb4a55ab6a0783b38e4c695946b63574e7179a84c346c8
 AUX xulrunner-1.9.2-gtk+-2.21.patch 663 RMD160 20e2465da0e6c884527fd7cfebd3bdb2f8f015a9 SHA1 f2b9c26ed255bde672ccc8cb7ae4ae014f52d6f5 SHA256 79c11dc4304d748f3c2d6e451aa6d44dd1bb450d1db671e7fa4a83420c6f2c05
 AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
 DIST firefox-3.6.12.source.tar.bz2 51423668 RMD160 196e32a4cd9c6725e115aabcf320d7d8df5bca6e SHA1 1cc3885687dd5ad21167d9d45f76eb1458f46bdd SHA256 dd478c653070f451b76befc798cfa1d6b61745d8badf831a3bae453c32e68c2d
@@ -16,13 +14,6 @@ DIST xulrunner-2.0-patches-1.3.tar.bz2 63693 RMD160 aaa6901e5dc94cbe88a2e0b5cfac
 EBUILD xulrunner-1.9.2.12.ebuild 8274 RMD160 cab01d63e74c6c26034d5b5d673243f4a8000859 SHA1 965061217b8980576f3ad2d6587c49a97549b2e1 SHA256 c0b882935adebc2a63df12cfcd56b2204f9bf86658beb7c1d5bf1bad1ba4ed4e
 EBUILD xulrunner-1.9.2.15.ebuild 8247 RMD160 81faa5447d3c8a385ede7e9bbc58f5b871ea8b8a SHA1 3c6d725da62e5cd25d7e2e8748b71b21c99a3216 SHA256 663e64489d7ff75f1d3baed66fdfe4b33d7d9c0f414b6eb37a1bfa003b683b22
 EBUILD xulrunner-1.9.2.16.ebuild 8247 RMD160 ee2a89d62a6a43504d7daa72e6f1b3a91d3cc53f SHA1 894551b39796832e560c5dda5221f3635b37e725 SHA256 7471b0168ffef33ae489326fa965f5238e14c08dd036609df60ce4b067b7c107
-EBUILD xulrunner-2.0.ebuild 5564 RMD160 516a28d1fcc5a4e73555562f812c62f61cbdfae1 SHA1 ddfa155a9caf07bab9acd0dff256715644d19137 SHA256 ee9888312b77be68ab3476d7faec6a7165f89ead5905addf127feab245d680cb
-MISC ChangeLog 56079 RMD160 056b0ec90b9acbe74b9efe17d0f48b1cb50dad13 SHA1 521e9b3274007acdfe2d3861cce24768f88cd2a2 SHA256 5c537164118a7b53bab73390052542b03d53b4c1608c361ea0ed30298f98903e
-MISC metadata.xml 679 RMD160 d839e671fa5f8777084f86ec32b7b0d24b691f9b SHA1 091b58b9ac5f9564c039defc2ed931dc58cdb66b SHA256 d57c14653264c74e38033f0ba6ca60ad581bbbed29b608ea7da02d7198055ebb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2YqJEACgkQVWmRsqeSphMbBwCdHIY1PFf5RR+g1aj+pgJhoCK3
-nbUAn2T4SApUv/XosCrA+flAdJveyiTl
-=IF/4
------END PGP SIGNATURE-----
+EBUILD xulrunner-2.0-r1.ebuild 5543 RMD160 e3a454919e80d59b4de74fd7930ec73f188c80fc SHA1 69a9f3ecdc44a3b25a075461070ba42ae411e8bc SHA256 5374e541a1eabb131c971f2bc0f5b863a48cf97e630c7c674cccb5ad07f72438
+MISC ChangeLog 56292 RMD160 68dd27f0aa45c101c4a8b03d888b1e26209738fa SHA1 bba560587425f013ebc844abb1637c06d48966db SHA256 afe14deded49ed53fc64cf15c262bd6c139932e99c91fe29bbb476778f22ece5
+MISC metadata.xml 737 RMD160 ee298932f419af0c12657a8df62b797e1ae7720b SHA1 8b9e4d04ae106f928b374568a5d3e2ff0eddcc88 SHA256 400effb40ec15054f2a51ce3d9ea5c27359a4a4456c18459c014c58773491be0
diff --git a/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch b/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch
new file mode 100644
index 000000000000..464e1e118f99
--- /dev/null
+++ b/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch
@@ -0,0 +1,25 @@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -5701,16 +5701,21 @@ then
+ 
+     AC_SUBST(MOZ_ENABLE_GIO)
+     AC_SUBST(MOZ_GIO_CFLAGS)
+     AC_SUBST(MOZ_GIO_LIBS)
+    
+     dnl ========================================================
+     dnl = GConf support module
+     dnl ========================================================
++    MOZ_ARG_DISABLE_BOOL(gconf,
++    [  --disable-gconf      Disable Gconf support ],
++        MOZ_ENABLE_GCONF=,
++        MOZ_ENABLE_GCONF=force)
++
+     if test "$MOZ_ENABLE_GCONF"
+     then
+         PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
+             MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'`
+             MOZ_ENABLE_GCONF=1
+         ],[
+             if test "$MOZ_ENABLE_GCONF" = "force"
+             then
diff --git a/net-libs/xulrunner/metadata.xml b/net-libs/xulrunner/metadata.xml
index e0009ce7d45d..1a7d24372df7 100644
--- a/net-libs/xulrunner/metadata.xml
+++ b/net-libs/xulrunner/metadata.xml
@@ -10,5 +10,6 @@
         installation with secure-delete enabled</flag>
     <flag name="webm">Use system libvpx <pkg>media-libs/libvpx</pkg></flag>
     <flag name="crashreporter">Enable crash reporter for bugs</flag>
+    <flag name="gconf">Enable gnome2 gconf support</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/xulrunner/xulrunner-2.0.ebuild b/net-libs/xulrunner/xulrunner-2.0-r1.ebuild
index f8cdc58148ea..7f689d908a2a 100644
--- a/net-libs/xulrunner/xulrunner-2.0.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0-r1.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/net-libs/xulrunner/xulrunner-2.0.ebuild,v 1.3 2011/03/27 20:20:23 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0-r1.ebuild,v 1.1 2011/04/04 02:12:32 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -22,21 +22,18 @@ HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="1.9"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+crashreporter +ipc system-sqlite +webm"
+IUSE="+crashreporter gconf +ipc system-sqlite +webm"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 # More URIs appended below...
 SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
 
-# XXX: GConf is used for setting the default browser
-#      revisit to make it optional with GNOME 3
 RDEPEND="
 	>=sys-devel/binutils-2.16.1
 	>=dev-libs/nss-3.12.9
 	>=dev-libs/nspr-4.8.7
 	>=dev-libs/glib-2.26
-	>=gnome-base/gconf-1.2.1:2
-	>=x11-libs/cairo-1.10.2[X]
+	gconf? ( >=gnome-base/gconf-1.2.1:2 )
 	x11-libs/pango[X]
 	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )
 	webm? ( media-libs/libvpx
@@ -68,6 +65,8 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
+	epatch "${FILESDIR}"/mozilla-2.0-gconf-config-update.patch
+
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
 
@@ -127,8 +126,8 @@ src_configure() {
 	mozconfig_annotate '' --disable-mailnews
 	mozconfig_annotate '' --enable-canvas
 	mozconfig_annotate '' --enable-safe-browsing
-
 	mozconfig_use_enable system-sqlite
+	mozconfig_use_enable gconf
 
 	# Finalize and report settings
 	mozconfig_final