SPARC and PPC always get qt-static versions. Sorted generic dependencies. Formatted dependency list.

Package-Manager: portage-2.1.4.4

3 files changed, 26 insertions, 18 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index ea434663de07..20d86742ae14 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.213 2008/04/07 16:52:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.214 2008/04/07 19:24:20 jer Exp $
+
+  07 Apr 2008; Jeroen Roovers <jer@gentoo.org> opera-9.27.ebuild:
+  SPARC and PPC always get qt-static versions. Sorted generic dependencies.
+  Formatted dependency list.
 
   07 Apr 2008; Jeroen Roovers <jer@gentoo.org> -opera-9.26.ebuild:
   Remove vulnerable version (bug #216022).
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 506ef51464df..4135eef3830b 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -7,10 +7,8 @@ DIST opera-9.27-20080331.1-static-qt.i386-en.tar.bz2 6813669 RMD160 353adab3fa9a
 DIST opera-9.27-20080331.1-static-qt.i386.freebsd-en.tar.bz2 6561843 RMD160 14264eb3e249e4c23625f9a8d521a84d382077fd SHA1 8853366a874cb18a6eff86b7ce5c63923984e0a3 SHA256 ac695d429e859f2764d4c3d80798b0bcce9a8670c83ebe61ef568d197bd61aab
 DIST opera-9.27-20080331.1-static-qt.ppc-en.tar.bz2 6860940 RMD160 5e109dabb20cc8d7afc6a2ef96e274f5e4eb973c SHA1 3a6e8d565ed3a2d0373be3e36324818a7e54fedb SHA256 f3dff4eae0092a55868aa778aa14000407a13e7909f0e493c1a38c58c2bdc56d
 DIST opera-9.27-20080331.1-static-qt.sparc-en.tar.bz2 6758934 RMD160 b928a79da7f8d3f2c3df0dd4de6df4803f647691 SHA1 4b793bbce6136d9bc236fe05e40c81753bdd3b6a SHA256 74242143d1cd35268d93b355c02621c68398a83ae7b882aaeb2bdbd90d2e0672
-DIST opera-9.27-20080331.2-shared-qt.sparc-en.tar.bz2 4875912 RMD160 0cfddf76687d51fbae9b021c2882d32af7d9df96 SHA1 28ace256d59a015e16d51f4714666af3d338a4b6 SHA256 a9269b23aa4ebf765cf34ebb9373211031754ab3221a10bac687934313697e74
 DIST opera-9.27-20080331.4-shared-qt.i386.freebsd-en.tar.bz2 5137208 RMD160 c578844e0e2e9067a28e0a71772fafdd77f890d1 SHA1 451f38510de9043e2c9c5c486e34192b7b4ed814 SHA256 07b5ba9d9f012a281f76de272b06d7cb8c74fcd3a87f82ed3bde6cb42996017a
 DIST opera-9.27-20080331.6-shared-qt.i386-en.tar.bz2 5244003 RMD160 bf288e1dae863261d8e72447dfb2b7626a2c5bc2 SHA1 86ec33375f3cf98a72c8bcdf4dc45bcbdfaf39ef SHA256 8466810e3c9cd20dc6c25bf152c9edd074b6181d86236a6b9d4ccd799fea9a36
-DIST opera-9.27-20080331.6-shared-qt.ppc-en.tar.bz2 5307364 RMD160 5e37c1eda646e7acc2c9d4515477f2cab6a5d33a SHA1 ed49b766113084fc6aaa6a33d3e8d34638469c60 SHA256 bbd69ca2610f729c0b3aa68c96f05f69f641a4ff6a1ffa01e8d442b7dc27e466
 DIST opera-9.50-20071024.2-shared-qt.x86_64-1643.tar.bz2 6036762 RMD160 6c50a708f410709198c08b29145aeee7654b973f SHA1 de1b0044a2ea9fd665599383336eb4ca44dd64f0 SHA256 c662fbe906be9118885fe3ed3e5a593ea845658f18394b040d7f8fac50c861bf
 DIST opera-9.50-20080118.1-static-qt.sparc-1766.tar.bz2 7251035 RMD160 9294ad4c1869c3cc3628c9ed8d926b91b526417f SHA1 8057f4e93cec2682e0baaa2a3cf8955657b1c134 SHA256 526e2c6d632525ccc2d384e0ca582eeab8ce63778526ad8674407bef56315fdf
 DIST opera-9.50-20080118.2-shared-qt.sparc-1766.tar.bz2 5378332 RMD160 6e2e4ed876ddbaf1c1b2350ef1eaa4c904252cd6 SHA1 3041bc54de95876d2004227ee2cf44c00baa106f SHA256 f711cc13d3de5b06d401a76e759533c6e6239ded53ec98f204727c8797534139
@@ -67,7 +65,7 @@ DIST opera-9.50b-20071024.3-shared-qt.ppc-en.tar.bz2 5752913 RMD160 7114895d4974
 DIST opera-9.50b-20071024.4-shared-qt.i386.freebsd-en.tar.bz2 5589042 RMD160 1a07ba2e71f87c25fb51265558b0c48d85ddea86 SHA1 7ebbba1bb1b45b5c5a6e6e15e454b129a01409ea SHA256 0cb1c72e1ce46f7202901db9bc2f4b2318f2294d8876897ac9905cd8fe833865
 DIST opera-9.50b-20071024.6-shared-qt.i386-en.tar.bz2 5533621 RMD160 485999e2068ddafa623686013a862fd5000efd1b SHA1 1df8e3481c2b6ca449ab11291b1545a45bb84ac9 SHA256 4428d4413329e0858b686e6db2810e0beab0bb153d246887385c44271e274ed9
 DIST opera-9.50b-20071024.9-static-qt.i386-en.tar.bz2 7762453 RMD160 10d877c4e7d98175e2a84881a4a5ff0bcde2d8dd SHA1 be62bedca170355dbd300ce94700369dda6507a6 SHA256 25e3366d63a2494706ca8d9238896da53709125974a0ef14d7985c4c4f203ec3
-EBUILD opera-9.27.ebuild 5862 RMD160 31cc9e83949cbc180b4ac3d331f1e8f99820688f SHA1 4c60fa2dbcda3fc0eaac76513b89af3a925c0219 SHA256 eec1534089092a7c462ccb40179ba76062b103d12ec7e2c440ae3a021d699f7d
+EBUILD opera-9.27.ebuild 5935 RMD160 03a15aa0e98ec83b1f4561f94079d5b22a8575eb SHA1 9c707ae173eb1d4273102c028418222c1d097ec5 SHA256 b5d4c356cf5dd046b6250eca0289527348a30fc275c1ab9a928a2c801f4a6d4f
 EBUILD opera-9.50_beta1.ebuild 5895 RMD160 c901f78917d4159de6eada313f67c707e604eff1 SHA1 b6623366cb2f89abe90bf2a799fd8d1e06140723 SHA256 7918ae8eab27002f51a91ea4f9240edaf48619bf5610709a4aa1c6749bf055fc
 EBUILD opera-9.50_beta2_p1766.ebuild 5572 RMD160 9bf7db4ac524d41c6a37b3c7037843e45841e719 SHA1 211e23d9ee280df4dce539d558604a5c67aeb9d9 SHA256 e6c65523a3a4670ca680bacd8f4a5b0771f9d82a0fa3514f0f244019e3566e19
 EBUILD opera-9.50_beta2_p1772.ebuild 5515 RMD160 82c16d057c76d0d65c8fdf0327b0344eeeb4eaa6 SHA1 63254df67b4c10e8adefb94bc898d3c08b3e7359 SHA256 1e6746ecec43182090b55051dc37c95ff3502c68b94bb95bdd4905386d6282ce
@@ -77,5 +75,5 @@ EBUILD opera-9.50_beta2_p1823.ebuild 5470 RMD160 ea902595a806e851ffec55abdce7a89
 EBUILD opera-9.50_beta2_p1834.ebuild 5470 RMD160 91fd1555b21253bf34e0b0350ca588031b2d4a51 SHA1 178f62271cbc0bcf6c7eee6e0497893b53a54388 SHA256 5bcccaefa25ea021ce847e8e669219f1c9ae42d57d12b63bd4f3c0da74814e7a
 EBUILD opera-9.50_beta2_p1875.ebuild 5365 RMD160 4156df14dcc1ba4e06b25b068c5f1cadeeebba23 SHA1 0671ee79ec404c48d0dd8c02b7e09403fba07255 SHA256 40bab76f52d1e50946b35ff6e4dddbbae0853e8a88ec9693f5468a8d0c4b8434
 EBUILD opera-9.50_beta2_p1887.ebuild 5454 RMD160 4504cf2e08171a7c3b6a07bb7339eff4e729d5a1 SHA1 ba3a583f9c03292f00228f16e7fb87b470dbb551 SHA256 1ce8efe83b6d70bb0d05a967d0cca44cbb1a31f9f96855dd2386a0859965776f
-MISC ChangeLog 45142 RMD160 bc7518bca563de4f2f5fa817cd409e378950b598 SHA1 7fe6094bffc77119662bf32e27bdf6b8153da504 SHA256 4387aa69061587b8c6c1047cc5bb3de188e7855cf3fc5d1cd1b119b06a5a87b7
+MISC ChangeLog 45314 RMD160 0917ab731923e6476e616d56c1e2b421d9fbc690 SHA1 3fd45af5036b88740473d959adf3c934ce98335e SHA256 1f328f3b13aa938430c388f13584443507ce439f4fb8e7a956f244d4ae783fe4
 MISC metadata.xml 371 RMD160 9ce4bac73fb1a6fb95290774b2a6a09e23be1998 SHA1 dde7f60d2a566274f7997a7d691922a1278a3558 SHA256 192dad9e5e302573e365663703055daac67ab3d40cb1e081cab9927bbc1ddbaa
diff --git a/www-client/opera/opera-9.27.ebuild b/www-client/opera/opera-9.27.ebuild
index 2d6b23dd820d..996ed9b33315 100644
--- a/www-client/opera/opera-9.27.ebuild
+++ b/www-client/opera/opera-9.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.27.ebuild,v 1.4 2008/04/07 16:46:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.27.ebuild,v 1.5 2008/04/07 19:24:20 jer Exp $
 
 GCONF_DEBUG="no"
 
@@ -22,6 +22,10 @@ O_VER="9.27-20080331"
 O_FTP="927/final/${O_LNG}"
 
 O_URI="mirror://opera/"
+
+# qt-shared versions do not work on ppc or sparc so they always get the
+# qt-static version:
+
 SRC_URI="
 	qt-static? (
 		amd64? ( ${O_URI}linux/${O_FTP}/i386/static/${PN}-${O_VER}.1-static-qt.i386-${O_LNG}.tar.bz2 )
@@ -32,8 +36,8 @@ SRC_URI="
 	)
 	!qt-static? (
 		amd64? ( ${O_URI}linux/${O_FTP}/i386/shared/${PN}-${O_VER}.6-shared-qt.i386-${O_LNG}.tar.bz2 )
-		ppc? ( ${O_URI}linux/${O_FTP}/ppc/shared/gcc-2.95/${PN}-${O_VER}.6-shared-qt.ppc-${O_LNG}.tar.bz2 )
-		sparc? ( ${O_URI}linux/${O_FTP}/sparc/shared/gcc-2.95/${PN}-${O_VER}.2-shared-qt.sparc-${O_LNG}.tar.bz2 )
+		ppc? ( ${O_URI}linux/${O_FTP}/ppc/static/${PN}-${O_VER}.1-static-qt.ppc-${O_LNG}.tar.bz2 )
+		sparc? ( ${O_URI}linux/${O_FTP}/sparc/static/${PN}-${O_VER}.1-static-qt.sparc-${O_LNG}.tar.bz2 )
 		x86? ( ${O_URI}linux/${O_FTP}/i386/shared/${PN}-${O_VER}.6-shared-qt.i386-${O_LNG}.tar.bz2 )
 		x86-fbsd? ( ${O_URI}unix/freebsd/${O_FTP}/shared/${PN}-${O_VER}.4-shared-qt.i386.freebsd-${O_LNG}.tar.bz2 )
 	)
@@ -41,16 +45,17 @@ SRC_URI="
 
 DEPEND=">=sys-apps/sed-4"
 
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXp
-	x11-libs/libXmu
-	x11-libs/libXi
-	x11-libs/libXft
-	x11-libs/libXext
-	x11-libs/libXcursor
-	x11-libs/libX11
-	x11-libs/libSM
+RDEPEND="
 	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXrandr
 	>=media-libs/fontconfig-2.1.94-r1
 	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
 			 !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
@@ -59,7 +64,8 @@ RDEPEND="x11-libs/libXrandr
 			  x86? ( !qt-static? ( =x11-libs/qt-3* ) )
 			  media-libs/jpeg )
 	x86-fbsd? ( =virtual/libstdc++-3*
-	            !qt-static? ( =x11-libs/qt-3* ) )"
+				!qt-static? ( =x11-libs/qt-3* )  )
+	"
 
 S=${WORKDIR}/${A/.tar.bz2/}-${O_SUFF}