Fix epiphany deps, bug 323857

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

4 files changed, 12 insertions, 10 deletions

diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index d58b62077afa..255f1ca9a761 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.415 2011/03/16 10:32:12 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.416 2011/03/16 19:23:41 nirbheek Exp $
+
+  16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  gnome-2.30.2-r1.ebuild, gnome-2.32.1.ebuild:
+  Fix epiphany deps, bug 323857
 
   16 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> gnome-2.30.2.ebuild,
   gnome-2.30.2-r1.ebuild, gnome-2.32.1.ebuild:
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 2707a8cb1627..226679a69318 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,5 +1,5 @@
-EBUILD gnome-2.30.2-r1.ebuild 5613 RMD160 d26b5bbdbeca4e564837f7db58a830b1e7af81dc SHA1 6a9db41dc81167dcc9921e3459d0bce9678cf41b SHA256 0531d41fc7d83ff8c892e94826fbebaa43e6306ac9d8259f3c1f99802fddb6b7
+EBUILD gnome-2.30.2-r1.ebuild 5569 RMD160 bf2c790ca7797b6e11814d0da0cb55a8b8583d1c SHA1 c386dea58fc56281463408df7b1acbeab92ab105 SHA256 29123ada224668ecec5d15c9b8e3dcf6592e2749a1e2db33d79500538a641396
 EBUILD gnome-2.30.2.ebuild 5576 RMD160 0f01cf6340e5b34e002af8b1cd1ae9f42e6aaaf7 SHA1 c02b4f2e9b5b2004df764b0d6802492d352fd864 SHA256 7ea6019cad639487c3a9657078a8268ba4f4db3ec75f0fada9fc29f1b6e9ad32
-EBUILD gnome-2.32.1.ebuild 5467 RMD160 211d5a3c1b6737d98cd53e701878485a0ec7d452 SHA1 b18b8f11eaa30c04b1f1d29d441c1d89e720e67d SHA256 8ef64434ba84b1fc290eb22a4b92dd8eb555e742195f2bcdae107f1e78eeb5b9
-MISC ChangeLog 56089 RMD160 2e0ea6b0105c965b705aa021926a097cfe4dcf69 SHA1 1bee98ebad763881e3f745f0f23efeef948c9de4 SHA256 f98fb522c153cc2eef599d147f55b2e5b5b0d2e6ee764d7205cea44d4518dc4f
+EBUILD gnome-2.32.1.ebuild 5423 RMD160 372e4507224e10489fd1b461ea0391b2d5e7cb49 SHA1 28949e7012c2d620e23f7ab8bc75febf86f3aaa9 SHA256 e75cac0c07c87b6c997d1d37d5e494762b38e072b2f1eca858ddfb9060672e70
+MISC ChangeLog 56223 RMD160 9cc1e4a750374742e03660058af6a91b66792ca7 SHA1 a590e846c99011b926c015b4bcccd000d1f3cc6f SHA256 96dded9fbeafa39631abb89d7d1c7f049e904ba239025801ac52d904cd36f9b5
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-base/gnome/gnome-2.30.2-r1.ebuild b/gnome-base/gnome/gnome-2.30.2-r1.ebuild
index c15c0d74c621..f069d2447567 100644
--- a/gnome-base/gnome/gnome-2.30.2-r1.ebuild
+++ b/gnome-base/gnome/gnome-2.30.2-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/gnome-base/gnome/gnome-2.30.2-r1.ebuild,v 1.9 2011/03/16 10:32:12 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.30.2-r1.ebuild,v 1.10 2011/03/16 19:23:41 nirbheek Exp $
 
 EAPI="2"
 
@@ -22,7 +22,6 @@ S=${WORKDIR}
 # XXX: lower gdm to 2.20 since we still keep 2.28 masked
 # Lower epiphany to 2.26 since 2.28 is not ready to go stable
 # Lower ekiga since 3.x cannot be stabilized yet as talked with voip herd
-# ppc64 and epiphany, bug 323857
 RDEPEND="
 	>=dev-libs/glib-2.24.2:2
 	>=x11-libs/gtk+-2.20.1:2
@@ -74,7 +73,7 @@ RDEPEND="
 
 	>=media-gfx/eog-2.30.2
 
-	!ppc64? ( >=www-client/epiphany-2.30.6 )
+	>=www-client/epiphany-2.30.6
 	>=app-arch/file-roller-2.30.2
 	>=gnome-extra/gcalctool-5.28.2
 
diff --git a/gnome-base/gnome/gnome-2.32.1.ebuild b/gnome-base/gnome/gnome-2.32.1.ebuild
index 601901671a2f..18e00625508f 100644
--- a/gnome-base/gnome/gnome-2.32.1.ebuild
+++ b/gnome-base/gnome/gnome-2.32.1.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-base/gnome/gnome-2.32.1.ebuild,v 1.9 2011/03/16 10:32:12 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1.ebuild,v 1.10 2011/03/16 19:23:41 nirbheek Exp $
 
 EAPI="3"
 
@@ -21,7 +21,6 @@ S=${WORKDIR}
 # FIXME: bump gstreamer to 0.10.26
 # XXX: lower gdm to 2.20 since we still keep 2.28 masked
 # Lower epiphany to 2.26 since 2.28 is not ready to go stable
-# ppc64 and epiphany, bug 323857
 RDEPEND="
 	>=dev-libs/glib-2.26.1:2
 	>=x11-libs/gtk+-2.22.1-r1:2
@@ -73,7 +72,7 @@ RDEPEND="
 
 	>=media-gfx/eog-2.32.1:1
 
-	!ppc64? ( >=www-client/epiphany-2.30.6 )
+	>=www-client/epiphany-2.30.6
 	>=app-arch/file-roller-2.32.1
 	>=gnome-extra/gcalctool-5.32.1