Readd ~ppc. Remove redundant media-libs/libpng dependency.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

3 files changed, 14 insertions, 7 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 6c4f0f296d85..ef99950d5664 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.327 2009/03/10 16:46:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.328 2009/03/10 17:01:55 jer Exp $
+
+  10 Mar 2009; Jeroen Roovers <jer@gentoo.org> opera-10.00_pre4205.ebuild:
+  Readd ~ppc. Remove redundant media-libs/libpng dependency.
 
 *opera-10.00_pre4205 (10 Mar 2009)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 2e161fb8f0bb..8a7a1f76642f 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -33,6 +33,7 @@ DIST opera-10.00-4166.gcc4-static-qt3.i386.tar.bz2 9803782 RMD160 6ac99d6423cfd4
 DIST opera-10.00-4205.freebsd6-shared-qt3.i386.tar.bz2 8124678 RMD160 68ebc3c2aaf6f16ab3eeeda10016e3e505b2df26 SHA1 0a3f84a0a4101bdae59755b8b3954f64d020ee6c SHA256 c93a9e446026a7364105c1e148bc5218ea6bfd84cdec41060622ba727a96cd60
 DIST opera-10.00-4205.gcc4-qt4.i386.tar.bz2 7919892 RMD160 6488683204cf8afd3f8e9a6e49d61070914ccb84 SHA1 5c437a3b7948dd466bb98529fc834d920a59fb25 SHA256 a8b65360aa8f50fd1f8eccd1a0cd0afe1ab547be551b75d40d05d78782fa24a3
 DIST opera-10.00-4205.gcc4-shared-qt3.i386.tar.bz2 7946791 RMD160 7c972aca5aed32481fcff166a07e442750cc14e8 SHA1 2f5efacd1342f69be20d6982324b919adcabb67d SHA256 d645efa1ba71692a552fa1cf00423f1f943eb68a2aeef7266e57b891abb85fb5
+DIST opera-10.00-4205.gcc4-shared-qt3.ppc.tar.bz2 8030734 RMD160 ebd627f42cee931ceb94847cdec630f020b4166b SHA1 7d8321da68647f8302c19ca8df2223b128b94763 SHA256 86f2541a45010aa4d42c6c3468ef09b6a70616aaecec08e461eb6f2cb6cd4977
 DIST opera-10.00-4205.gcc4-shared-qt3.x86_64.tar.bz2 8618335 RMD160 eed8003276686563c12cb9b0f2c107b7e016627f SHA1 c6fe410267843a24e4b47b62939465665868c2c7 SHA256 c7d069e2ccf332fa961bada7d0b0f96b57f7c31f3a70016ca0b9996d6b6403ca
 DIST opera-10.00-4205.gcc4-static-qt3.i386.tar.bz2 9848358 RMD160 b4c1bd51f8bb4e34517115dc936158b9bb1d220d SHA1 a35540c35aa120e2b1654c08910f1433132fe759 SHA256 513e777020a59444de3ad1727b3d4ea3afca1b137b962e5ac921df38451bbb82
 DIST opera-9.27-20080331.1-static-qt.i386-en.tar.bz2 6813669 RMD160 353adab3fa9a401720264738ea7494c184b0df2e SHA1 4fee1c05b31be9e11fbe78c127809c3f550b775a SHA256 3f76e709ee4896abb8aa5dfc5ce7c1b75f476faf947c1f6bb8b125d0726bc031
@@ -52,8 +53,8 @@ EBUILD opera-10.00_pre4116.ebuild 6579 RMD160 fc2520a49abb1433bce37f1da9e754a571
 EBUILD opera-10.00_pre4126-r1.ebuild 6542 RMD160 717a529bd1b4d1fb25779b4f8a76a139446870f1 SHA1 6c55266e45a4d38e33dc022cb6772dac7262e8b3 SHA256 af9fea1c3ef10547402b754b3f02508e5ac11fffaff0c81dce54cb34baf6e530
 EBUILD opera-10.00_pre4126.ebuild 6610 RMD160 05c2d71748d52f635b22773c75fb8df693312bf5 SHA1 3f62cf36a909b32be36aadf0dbff59c63746b048 SHA256 86cdc3eddbd1eab134c394f4bf551670ff0c9f8ed37a25cfddd88b227fe3cdd1
 EBUILD opera-10.00_pre4166.ebuild 6447 RMD160 8c7d7b04ec2bcd8a2c408f4d19837f64f5c2e303 SHA1 0d95b61183ec7b31752735198b948df48e940e11 SHA256 f988801322f8ac6714b0d7108273eb571b152f3b58d0ed25992b55c82d0ae639
-EBUILD opera-10.00_pre4205.ebuild 6454 RMD160 76ab7ecc058b407799f092a210308e2aa872643b SHA1 46fa61fd591c471d4e21002a82bffedf325d7b80 SHA256 64a81ccccacebd24fcf31aa4193dd3cabcea2cb246c73d166555a372a92bfa50
+EBUILD opera-10.00_pre4205.ebuild 6488 RMD160 4b9bef1c8d25078feb04be2f4be03ec29e7b9df6 SHA1 3324b15730135760b9eb9f96d73eba5fc26cb4b6 SHA256 dd8d616501ca9831dd2e1450d61cf894eece6b6be8f55487a94714193516306e
 EBUILD opera-9.27.ebuild 5937 RMD160 fe418d4b5a2f34664f46bb6bcee56b27f3d182e0 SHA1 bda2f3ec16759f92c4227203a3a22927cd3b811e SHA256 fff41046fb4e6c58fc1c4cb73df98857c1c2ea89a9c6131aa03f3ce6aee19e98
 EBUILD opera-9.64.ebuild 7742 RMD160 6da55d636cb1a838551114c43933d9716ac6aeef SHA1 904894164f726a11e18d5032a8f5b8fddedc08e5 SHA256 8c029dedc573770d7b86dbc8f210b12b0a0ab3567250810c0ad5599ac98c9e24
-MISC ChangeLog 63793 RMD160 7bfd7c3890bf372eed17fe960c62cb845cc074f5 SHA1 31b173bd58222b6374f3923d58d998fa7bf57ad1 SHA256 169053513dea7b309fe7936f72c95e658fdac62ff1d2d4085f8f0a61ee6ff164
+MISC ChangeLog 63930 RMD160 486150ad7edfacc6b54d041b7fa29ea15dbb4522 SHA1 f7d2ee18408617c8b6078e93bfb22df8b7185304 SHA256 acdb36d0375968fdd383e895d1c31dc77096efbafae20368871cf05b114ab82c
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4205.ebuild b/www-client/opera/opera-10.00_pre4205.ebuild
index 9bde4eafe8a5..370ef133a6be 100644
--- a/www-client/opera/opera-10.00_pre4205.ebuild
+++ b/www-client/opera/opera-10.00_pre4205.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4205.ebuild,v 1.1 2009/03/10 16:46:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4205.ebuild,v 1.2 2009/03/10 17:01:55 jer Exp $
 
 GCONF_DEBUG="no"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.opera.com/"
 
 SLOT="0"
 LICENSE="OPERA-9.0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 RESTRICT="mirror strip test"
 
@@ -26,6 +26,7 @@ O_U="http://snapshot.opera.com/unix/snapshot-${P##*_pre}/"
 O_P="${P/_pre/-}"
 
 SRC_URI="
+	ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
 	x86-fbsd? ( ${O_U}intel-freebsd/${O_P}.freebsd6-shared-qt3.i386.tar.bz2 )
 	qt-static? (
 		qt3? (
@@ -77,7 +78,6 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libSM
 	x11-libs/libICE
-	!qt-static? ( media-libs/libpng )
 	qt-static? ( !qt3? ( x11-libs/libXinerama media-libs/nas ) )
 	x86? ( !qt-static? (
 			qt3? ( =x11-libs/qt-3* )
@@ -88,9 +88,12 @@ RDEPEND="
 		ia32? ( app-emulation/emul-linux-x86-qtlibs )
 		!ia32? ( =x11-libs/qt-3* )
 	)
+	ppc? (
+		=x11-libs/qt-3*
+	)
 	x86-fbsd? (
 		=virtual/libstdc++-3*
-		!qt-static? ( !qt3? ( =x11-libs/qt-3* ) )
+		=x11-libs/qt-3*
 	)
 	"