Fix pango dependency, bug 293368. The correct dep is set by the mozconfig-3.eclass.

Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64

6 files changed, 30 insertions, 18 deletions

diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 5dbfd0c7a189..d8e408a0974c 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.422 2011/06/03 16:45:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.423 2011/06/21 12:30:43 nirbheek Exp $
+
+  21 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  xulrunner-1.9.2.12.ebuild, xulrunner-1.9.2.16.ebuild,
+  xulrunner-1.9.2.17.ebuild, xulrunner-2.0.1-r1.ebuild:
+  Fix pango dependency, bug 293368. The correct dep is set by the
+  mozconfig-3.eclass.
 
   03 Jun 2011; Raúl Porcel <armin76@gentoo.org>
   files/mozilla-2.0_support_64bit_big_endian.patch:
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index d08bf13a3bd0..c6e7d137131b 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -14,16 +14,26 @@ DIST firefox-4.0.1.source.tar.bz2 65980273 RMD160 63faaae78b56db407a344549863612
 DIST xulrunner-1.9.2-patches-0.7.tar.bz2 16366 RMD160 2bfa5f56d58d5bb4508512190cf07454814fb0b5 SHA1 2c6e2cfb0c50a5595795561126de26941dbed576 SHA256 3e25e9b8d5fe9109f03889bca9240f92acd502fd68efe0e7eda304f5487b6bf0
 DIST xulrunner-1.9.2-patches-0.9.tar.bz2 15320 RMD160 2dfb86650c0a9a1f0c5bf86df7434c7c286658d6 SHA1 a2276c708eec2e92611ac1e7a2eaf25c39263d30 SHA256 5cca685442f1ab920eb1ba86719a38a437ae05bd5cefc42ababc2556425ebf5a
 DIST xulrunner-2.0-patches-1.8.tar.bz2 68053 RMD160 58ef5ff8fd037f34232a8acc706a1cb086651940 SHA1 bac72e12bfc1150ed116ba5e930688ec72157671 SHA256 88950bf5bdc34cf96bf79e1e1d2f2a4071e1f9e9d53e52f400c433f2f661b77f
-EBUILD xulrunner-1.9.2.12.ebuild 8274 RMD160 cab01d63e74c6c26034d5b5d673243f4a8000859 SHA1 965061217b8980576f3ad2d6587c49a97549b2e1 SHA256 c0b882935adebc2a63df12cfcd56b2204f9bf86658beb7c1d5bf1bad1ba4ed4e
-EBUILD xulrunner-1.9.2.16.ebuild 8247 RMD160 620bbe359323e41763a889c170cd0ba1be782201 SHA1 c11a4decf85926b1cdb4802d18e652cb0e919833 SHA256 dbb46a99cb9eb310bde59d247448e05524fa71ee0dccb86731a7ca8e6343c56d
-EBUILD xulrunner-1.9.2.17.ebuild 8159 RMD160 98b916527f97e2184c673764c5a03c78335c9d46 SHA1 6cb4fd6664f34580f1d6d7e755b57c176b2151b8 SHA256 4c48cb664c56c2cf83a80bf7a2835e5483c292988afa70471fa98ecaadf34c07
-EBUILD xulrunner-2.0.1-r1.ebuild 5945 RMD160 b1553f9fdca96a3450087682e16b394840807cee SHA1 308494d7bcc54d2617d2cd350a055bc64ad2b648 SHA256 6f3ebeea8333aad025f51293f146c7d0c94314216fe8c8a18a33d9f90fe0f2db
-MISC ChangeLog 58677 RMD160 bdea0b6a676040c76d88019fcd61be242fe127c0 SHA1 a650fba2e695fbc04b4b70bce5815167ce79efdc SHA256 7396b25eed1258251746d6d13b7947ef091492a2d45894ada40aa66ad59c82a8
+EBUILD xulrunner-1.9.2.12.ebuild 8256 RMD160 2b2f9d28037e82c91d764517219248896b435575 SHA1 0e82313134101009dbd1f7b98270282ee885a532 SHA256 785948775e0a0d6548f726c83c8f4014433393e6b7c3e19209a30fd7c0555467
+EBUILD xulrunner-1.9.2.16.ebuild 8229 RMD160 e03e65f3983c3129eee81d80fe2e7fc74ccde65c SHA1 1f01c622fbf6d6326f78057ed23eade202fa55c8 SHA256 e18c84ed98cb2eb9ec1a3e1e2dc91240027566eddc9588f63562c3a882d9d61f
+EBUILD xulrunner-1.9.2.17.ebuild 8141 RMD160 91c7c97fdfbae8237ffbe56d5fe5cb47b5aac5dd SHA1 d2c367172fc9cb876a313530dc67c088f6368f1a SHA256 faae1d83e09e7c729bc1ca18a324b204f880090a63ed232b1942be35f0f63ab2
+EBUILD xulrunner-2.0.1-r1.ebuild 5924 RMD160 414c524bd41d7a80ed7ab344456332adb79cb5cf SHA1 0d58808f8556bb748951a9507d5af332d173e481 SHA256 93ada06472bfc09189625d2567e61cc3019fe30b1744b8e2ff3ad2d61c665bc3
+MISC ChangeLog 58933 RMD160 d9491422a478043b7d3ab294b87a58bcf37c17b8 SHA1 88dadb6ae7332b4d729201cec9c03f267009c7af SHA256 81cc767f0a8852d35b6c7ad0c6ed10d40bf8f0fcb35f3d9a15fe21a841c10895
 MISC metadata.xml 737 RMD160 ee298932f419af0c12657a8df62b797e1ae7720b SHA1 8b9e4d04ae106f928b374568a5d3e2ff0eddcc88 SHA256 400effb40ec15054f2a51ce3d9ea5c27359a4a4456c18459c014c58773491be0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3pD64ACgkQuQc30/atMkD0ogCfZsz0J3W26X+Ay9A9OByrCnur
-uxMAoLnlaPw1BmLmaVw5picOBk+wjdK0
-=C/IW
+iQIcBAEBAgAGBQJOAI78AAoJEO/kOhxWD91ki2wP/AxKbb4Q6NXqxRMM9XGiDxIu
+601fGjOBkCsh9pO/V82PckqzxoX4tHme8NicRa59hlTXptz6qkfhgAoYbP67BOZD
+n5EnumwqmQrJw5vcxMV5iepzOTMVx9mPKxSiCecM95RWBcUtCC3w3mrTPvfdqXLK
+eArai7bkyGpTz9Cc3X3R+TEzI5L9Jge6Uf4tdWF+2YrDJeUgylrSyXd9DuZSgOtq
+XIgreIsKHrhInCNOU48fFXSC0D+U0NNr4Gg3MO2RA/rlEbvqib3pzqXH98n5I3HX
+01emsQfAN58uPF3f6jkQcTr9IS9/R/55rcv0zt2P9i5zuoE4f1UtFxhBt2iMn7OK
+poJhHyFqq0hjZXgYbK8asto4MvyvQKt7SerBCyMAjorzFMaLQ8xrelEqB1pPZDK8
+vBIwgPk0oYz3PDq/cvzJITN6jjDb6+E1ULpE/o8mPqnSYxAfrG7MzX2CRRrq6/lO
+Fz18Ua89k1Kqc+GWC+YhnPvQ4YaSz1uPLJx2RGER2KQF8TRl56yw3EqKvnEaVsir
+Yl8vZ3WoCJP4XA0RCGtNOn5OHaMh5bpq+jb8tL/j4RTKlvCiCD1pfB14ZfsEV6Y4
+eHFh/L41UTKusMrF7JnqRmWrruVkUI+WYtkV6zNg79VfBGZ1J4BKQdkTuCfoPDZ2
+8X5TdmU5l76ICwrPuNEn
+=HeOf
 -----END PGP SIGNATURE-----
diff --git a/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild
index dbe90d70f943..4d46ae73e64a 100644
--- a/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.12.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-1.9.2.12.ebuild,v 1.9 2011/03/14 06:54:45 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild,v 1.10 2011/06/21 12:30:43 nirbheek Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -30,7 +30,6 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	>=app-text/hunspell-1.2
 	>=x11-libs/cairo-1.8.8[X]
-	x11-libs/pango[X]
 	x11-libs/libXt
 	x11-libs/pixman
 	>=dev-libs/libevent-1.4.7
diff --git a/net-libs/xulrunner/xulrunner-1.9.2.16.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.16.ebuild
index 87fecc8249db..b71d1c264036 100644
--- a/net-libs/xulrunner/xulrunner-1.9.2.16.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.16.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-1.9.2.16.ebuild,v 1.7 2011/04/10 11:21:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.16.ebuild,v 1.8 2011/06/21 12:30:43 nirbheek Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -30,7 +30,6 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	>=app-text/hunspell-1.2
 	>=x11-libs/cairo-1.8.8[X]
-	x11-libs/pango[X]
 	x11-libs/libXt
 	x11-libs/pixman
 	>=dev-libs/libevent-1.4.7
diff --git a/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild
index 893a9426d9be..ea5aa8354abc 100644
--- a/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.17.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-1.9.2.17.ebuild,v 1.6 2011/05/07 17:59:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild,v 1.7 2011/06/21 12:30:43 nirbheek Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -30,7 +30,6 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	>=app-text/hunspell-1.2
 	>=x11-libs/cairo-1.8.8[X]
-	x11-libs/pango[X]
 	x11-libs/libXt
 	x11-libs/pixman
 	>=dev-libs/libevent-1.4.7
diff --git a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild b/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
index 0ac637bd324a..cc8883a4c24f 100644
--- a/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
+++ b/net-libs/xulrunner/xulrunner-2.0.1-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.1-r1.ebuild,v 1.4 2011/05/16 17:58:38 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v 1.5 2011/06/21 12:30:43 nirbheek Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -36,7 +36,6 @@ RDEPEND="
 	>=dev-libs/nspr-4.8.7
 	>=dev-libs/glib-2.26
 	gconf? ( >=gnome-base/gconf-1.2.1:2 )
-	x11-libs/pango[X]
 	media-libs/libpng[apng]
 	dev-libs/libffi
 	system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] )