Fix SRC_URI magic (thanks to tomaw).

Package-Manager: portage-2.1.3.16

4 files changed, 37 insertions, 26 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 3c1aedbaa83f..4ef46b8cffe7 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.160 2007/10/25 23:32:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.161 2007/10/26 08:51:25 jer Exp $
+
+  26 Oct 2007; Jeroen Roovers <jer@gentoo.org> opera-9.50_beta1.ebuild:
+  Fix SRC_URI magic (thanks to tomaw).
 
   25 Oct 2007; Jeroen Roovers <jer@gentoo.org> opera-9.50_beta1.ebuild:
   Readd x86-fbsd keyword.
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e953fc28850e..8d699926a8d1 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -28,23 +28,25 @@ DIST opera-9.24-20071015.1-static-qt.ppc-en.tar.bz2 6840376 RMD160 60326b19358b7
 DIST opera-9.24-20071015.1-static-qt.sparc-en.tar.bz2 6743394 RMD160 9ff411d0b1cfdda79143028ee10907b3b87da676 SHA1 7541fdc2e29de63cbbe89d085d7c5fa28b3d12e1 SHA256 f56bfd4264839c6d13a19721e3d6d76ad87ea534f4b5d8e03ad59bc10fd18d9c
 DIST opera-9.24-20071015.4-shared-qt.i386.freebsd-en.tar.bz2 5123101 RMD160 f3c72fe4f21d22f87c71e07799ac986f0a3bc5a8 SHA1 05789beb4ea27f01d4e52c81ac0ae541098b965e SHA256 c0bc7497a8114f13bda60fe14c9dd6ad732c1311cdc8d55597d67b09fe389593
 DIST opera-9.24-20071015.6-shared-qt.i386-en.tar.bz2 5229490 RMD160 b2fdc5adb3577e3ca7213178c7e0b787e1cf9e43 SHA1 997e7171d13856c3d2562258117171cb307431ae SHA256 eff1982b755cf09f94bb444688e9fec5995e38de15ef300bbaea147c96453b2c
-DIST opera-9.50b-20071024.1-static-qt.i386-en.tar.bz2 7252999 RMD160 9f9b028f2d7ea66c156db4d42b73575dfa2a52aa SHA1 d9feb3be73b2185b8fd53d6e9bda9fd45966ed1e SHA256 bf61b9e53932b82a18ede09022ce1dc6a98db3f9c16a62f16a79846526b213f2
+DIST opera-9.50-20071024.2-shared-qt.x86_64-1643.tar.bz2 6036762 RMD160 6c50a708f410709198c08b29145aeee7654b973f SHA1 de1b0044a2ea9fd665599383336eb4ca44dd64f0 SHA256 c662fbe906be9118885fe3ed3e5a593ea845658f18394b040d7f8fac50c861bf
 DIST opera-9.50b-20071024.1-static-qt.i386.freebsd-en.tar.bz2 7517641 RMD160 311a905c23b4f670d3617e2f22050aa86c0c369d SHA1 a75f01fb6904280b87e847741d532d05def0fa5d SHA256 9632efd8f839c4cca16a929c63ab0d03b15c21a22b23be0c75e5c8440764a940
 DIST opera-9.50b-20071024.1-static-qt.ppc-en.tar.bz2 7236901 RMD160 6df43be8cd93ee45d60113894e4daf3ae41ee6b6 SHA1 83d2b0f00784ebffb3ac03e5883884908c10023a SHA256 2f29336bd986e0ee4e25df0815b95cdae13661aad05af542aeb65ac7dc89531d
+DIST opera-9.50b-20071024.3-shared-qt.ppc-en.tar.bz2 5752913 RMD160 7114895d497478d403a6c874ce99a2c4caa0ba0d SHA1 de0a5f42c33aba74797079d529b908d16efdf057 SHA256 a0e57f4d719d74e805b184cec9bdc35ef2eb054bf143b85d91ecf03d3d8b44af
 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.24.ebuild 5661 RMD160 ed52c1e503528186981cb79c12bafbd493501f5b SHA1 b2dd9be9fb2dbbf0264beaa867aa22e4f306abc9 SHA256 609bba0bd50bba02d1573cf6ef23ca6149a5b3b1ca574b7eb20a256c9807a7b0
 MD5 9633877ab6391197ebd88a85b7e7e656 opera-9.24.ebuild 5661
 RMD160 ed52c1e503528186981cb79c12bafbd493501f5b opera-9.24.ebuild 5661
 SHA256 609bba0bd50bba02d1573cf6ef23ca6149a5b3b1ca574b7eb20a256c9807a7b0 opera-9.24.ebuild 5661
-EBUILD opera-9.50_beta1.ebuild 5656 RMD160 5a2621cbc34a3c98ef03ec26dbc805f8d2d9bed4 SHA1 2c2fcae355d51e2722057345393a7c5eb0f6252b SHA256 fe919c59c941253abaf4e3e56fb990c0c8bd5b1437140a100f9d53094956d6d8
-MD5 d84a81bf2eaa5bf63b6a0686977cd2fe opera-9.50_beta1.ebuild 5656
-RMD160 5a2621cbc34a3c98ef03ec26dbc805f8d2d9bed4 opera-9.50_beta1.ebuild 5656
-SHA256 fe919c59c941253abaf4e3e56fb990c0c8bd5b1437140a100f9d53094956d6d8 opera-9.50_beta1.ebuild 5656
-MISC ChangeLog 36675 RMD160 b3597fa56b691b762a1410d621be220a1583b229 SHA1 505ad60bca48442c6e017995cb3d85c6feab83c9 SHA256 71f03af740981554cc0db789689d239e6878a9fd4706029d369c3896079463a5
-MD5 c2f1f45b659ed3f3d845d575839b5ba8 ChangeLog 36675
-RMD160 b3597fa56b691b762a1410d621be220a1583b229 ChangeLog 36675
-SHA256 71f03af740981554cc0db789689d239e6878a9fd4706029d369c3896079463a5 ChangeLog 36675
+EBUILD opera-9.50_beta1.ebuild 5623 RMD160 b55cc47dd9730d8d7448daeff05ec54b314ca1d9 SHA1 0f57cb376caa99ada46b141edf2bc1dbde7eaf59 SHA256 ca8123dead99d41b56a752e8a2da2d9b9f1fd1f33c2ea877fb6854664ed47353
+MD5 9e2fb8743209626049bc2ae0f7172fe5 opera-9.50_beta1.ebuild 5623
+RMD160 b55cc47dd9730d8d7448daeff05ec54b314ca1d9 opera-9.50_beta1.ebuild 5623
+SHA256 ca8123dead99d41b56a752e8a2da2d9b9f1fd1f33c2ea877fb6854664ed47353 opera-9.50_beta1.ebuild 5623
+MISC ChangeLog 36787 RMD160 37d1ff51cfc76a9f1fa83af97744087a0bc9f4c4 SHA1 2bef7afebe7442f09c98dc643fc30ee45d6e1de5 SHA256 0e96e5efd4507f5d390f9f8a194b68fb3c215e5d450d5287094a53918076f1e2
+MD5 8c85d59cd630eff7b38d61bdf566a113 ChangeLog 36787
+RMD160 37d1ff51cfc76a9f1fa83af97744087a0bc9f4c4 ChangeLog 36787
+SHA256 0e96e5efd4507f5d390f9f8a194b68fb3c215e5d450d5287094a53918076f1e2 ChangeLog 36787
 MISC metadata.xml 371 RMD160 9ce4bac73fb1a6fb95290774b2a6a09e23be1998 SHA1 dde7f60d2a566274f7997a7d691922a1278a3558 SHA256 192dad9e5e302573e365663703055daac67ab3d40cb1e081cab9927bbc1ddbaa
 MD5 6c43eb4a469936dfc17d56ab9e7c3f12 metadata.xml 371
 RMD160 9ce4bac73fb1a6fb95290774b2a6a09e23be1998 metadata.xml 371
@@ -52,6 +54,6 @@ SHA256 192dad9e5e302573e365663703055daac67ab3d40cb1e081cab9927bbc1ddbaa metadata
 MD5 2f85304163dc11d039f841310979bedc files/digest-opera-9.24 1998
 RMD160 8f473004525e070b99b135187850bda75cd50a28 files/digest-opera-9.24 1998
 SHA256 2b4fef3014fd08bcf40ca5ad3cbaa06ff598d2222bc97278c60dd72b1615d489 files/digest-opera-9.24 1998
-MD5 777ac3b785d725b0186ca654278080ad files/digest-opera-9.50_beta1 1685
-RMD160 2aff8683e1e6cde1acf7abcdff8e75ea903aa9c9 files/digest-opera-9.50_beta1 1685
-SHA256 c8a4dd286f0d3649dc0c52ef3f6db36b9a6fb489326af717e9e88fdba634e1eb files/digest-opera-9.50_beta1 1685
+MD5 38d2506d8ae2aa3e854544de2cbc9909 files/digest-opera-9.50_beta1 2347
+RMD160 e4e602be4da9a58b24af60c85be064caa4b76456 files/digest-opera-9.50_beta1 2347
+SHA256 01af39173d8d6e94ca0910525977d9e8f16feaf2b8fbe3ca6662f66435106796 files/digest-opera-9.50_beta1 2347
diff --git a/www-client/opera/files/digest-opera-9.50_beta1 b/www-client/opera/files/digest-opera-9.50_beta1
index dbb8a7630fb6..db18a3dfdd40 100644
--- a/www-client/opera/files/digest-opera-9.50_beta1
+++ b/www-client/opera/files/digest-opera-9.50_beta1
@@ -1,15 +1,21 @@
-MD5 436b1701f7736475f2aba678b2a28a13 opera-9.50b-20071024.1-static-qt.i386-en.tar.bz2 7252999
-RMD160 9f9b028f2d7ea66c156db4d42b73575dfa2a52aa opera-9.50b-20071024.1-static-qt.i386-en.tar.bz2 7252999
-SHA256 bf61b9e53932b82a18ede09022ce1dc6a98db3f9c16a62f16a79846526b213f2 opera-9.50b-20071024.1-static-qt.i386-en.tar.bz2 7252999
+MD5 bdd62bf0fd8d5ae950caa4752485f80b opera-9.50-20071024.2-shared-qt.x86_64-1643.tar.bz2 6036762
+RMD160 6c50a708f410709198c08b29145aeee7654b973f opera-9.50-20071024.2-shared-qt.x86_64-1643.tar.bz2 6036762
+SHA256 c662fbe906be9118885fe3ed3e5a593ea845658f18394b040d7f8fac50c861bf opera-9.50-20071024.2-shared-qt.x86_64-1643.tar.bz2 6036762
 MD5 72a05d6da032d4c16add4c4d7e094823 opera-9.50b-20071024.1-static-qt.i386.freebsd-en.tar.bz2 7517641
 RMD160 311a905c23b4f670d3617e2f22050aa86c0c369d opera-9.50b-20071024.1-static-qt.i386.freebsd-en.tar.bz2 7517641
 SHA256 9632efd8f839c4cca16a929c63ab0d03b15c21a22b23be0c75e5c8440764a940 opera-9.50b-20071024.1-static-qt.i386.freebsd-en.tar.bz2 7517641
 MD5 bc32812ce940e1cadd4f6ded69eb10d9 opera-9.50b-20071024.1-static-qt.ppc-en.tar.bz2 7236901
 RMD160 6df43be8cd93ee45d60113894e4daf3ae41ee6b6 opera-9.50b-20071024.1-static-qt.ppc-en.tar.bz2 7236901
 SHA256 2f29336bd986e0ee4e25df0815b95cdae13661aad05af542aeb65ac7dc89531d opera-9.50b-20071024.1-static-qt.ppc-en.tar.bz2 7236901
+MD5 8f6bb6b63adb28b3758a35ee8fdc5495 opera-9.50b-20071024.3-shared-qt.ppc-en.tar.bz2 5752913
+RMD160 7114895d497478d403a6c874ce99a2c4caa0ba0d opera-9.50b-20071024.3-shared-qt.ppc-en.tar.bz2 5752913
+SHA256 a0e57f4d719d74e805b184cec9bdc35ef2eb054bf143b85d91ecf03d3d8b44af opera-9.50b-20071024.3-shared-qt.ppc-en.tar.bz2 5752913
 MD5 e5f2c5da0b48d1adbde0fdc8a49510f0 opera-9.50b-20071024.4-shared-qt.i386.freebsd-en.tar.bz2 5589042
 RMD160 1a07ba2e71f87c25fb51265558b0c48d85ddea86 opera-9.50b-20071024.4-shared-qt.i386.freebsd-en.tar.bz2 5589042
 SHA256 0cb1c72e1ce46f7202901db9bc2f4b2318f2294d8876897ac9905cd8fe833865 opera-9.50b-20071024.4-shared-qt.i386.freebsd-en.tar.bz2 5589042
 MD5 546737a958977068dc59fb169a2328a9 opera-9.50b-20071024.6-shared-qt.i386-en.tar.bz2 5533621
 RMD160 485999e2068ddafa623686013a862fd5000efd1b opera-9.50b-20071024.6-shared-qt.i386-en.tar.bz2 5533621
 SHA256 4428d4413329e0858b686e6db2810e0beab0bb153d246887385c44271e274ed9 opera-9.50b-20071024.6-shared-qt.i386-en.tar.bz2 5533621
+MD5 f57e7df51fd1cb93aedf48bc0cccf1c7 opera-9.50b-20071024.9-static-qt.i386-en.tar.bz2 7762453
+RMD160 10d877c4e7d98175e2a84881a4a5ff0bcde2d8dd opera-9.50b-20071024.9-static-qt.i386-en.tar.bz2 7762453
+SHA256 25e3366d63a2494706ca8d9238896da53709125974a0ef14d7985c4c4f203ec3 opera-9.50b-20071024.9-static-qt.i386-en.tar.bz2 7762453
diff --git a/www-client/opera/opera-9.50_beta1.ebuild b/www-client/opera/opera-9.50_beta1.ebuild
index a0d2bbac5a59..0014601feff7 100644
--- a/www-client/opera/opera-9.50_beta1.ebuild
+++ b/www-client/opera/opera-9.50_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.50_beta1.ebuild,v 1.2 2007/10/25 23:32:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.50_beta1.ebuild,v 1.3 2007/10/26 08:51:25 jer Exp $
 
 GCONF_DEBUG="no"
 
@@ -19,17 +19,17 @@ RESTRICT="strip mirror"
 O_LNG="en"
 O_SUFF="1643"
 O_VER="9.50b-20071024"
-O_FTP="950b/final/${O_LNG}"
+O_FTP="/950b/final/${O_LNG}/"
 
 O_URI="mirror://opera/"
-SRC_URI="
-	x86? ( qt-static? ( ${O_URI}linux/${O_FTP}/i386/static/${PN}-${O_VER}.1-static-qt.i386-${O_LNG}.tar.bz2 ) )
-	x86? ( !qt-static? ( ${O_URI}linux/${O_FTP}/i386/shared/${PN}-${O_VER}.6-shared-qt.i386-${O_LNG}.tar.bz2 ) )
-	amd64? ( qt-static? ( ${O_URI}linux/${O_FTP}/x86_64/static/${PN}-${O_VER}.1-static-qt.i386-${O_LNG}.tar.bz2 ) )
-	amd64? ( !qt-static? ( ${O_URI}linux/${O_FTP}/x86_64/shared/${PN}-${O_VER}.6-shared-qt.i386-${O_LNG}.tar.bz2 ) )
-	ppc? ( ${O_URI}linux/${O_FTP}/ppc/static/${PN}-${O_VER}.1-static-qt.ppc-${O_LNG}.tar.bz2 )
-	x86-fbsd? ( !qt-static? ( ${O_URI}unix/freebsd/${O_FTP}/shared/${PN}-${O_VER}.4-shared-qt.i386.freebsd-${O_LNG}.tar.bz2 ) )
-	x86-fbsd? ( qt-static? ( ${O_URI}unix/freebsd/${O_FTP}/static/${PN}-${O_VER}.1-static-qt.i386.freebsd-${O_LNG}.tar.bz2 ) )"
+
+SRC_URI="amd64? ( ${O_URI}linux${O_FTP}x86_64/${PN}-${O_VER/b/}.2-shared-qt.x86_64-${O_SUFF}.tar.bz2 )
+	x86? ( qt-static? ( ${O_URI}linux${O_FTP}i386/static/${PN}-${O_VER}.9-static-qt.i386-${O_LNG}.tar.bz2 )
+		   !qt-static? ( ${O_URI}linux${O_FTP}i386/shared/${PN}-${O_VER}.6-shared-qt.i386-${O_LNG}.tar.bz2 ) )
+	ppc? ( qtstatic? ( ${O_URI}linux${O_FTP}ppc/static/${PN}-${O_VER}.1-static-qt.ppc-${O_LNG}.tar.bz2 )
+		   !qt-static? ( ${O_URI}linux${O_FTP}ppc/shared/gcc-2.95/${PN}-${O_VER}.3-shared-qt.ppc-${O_LNG}.tar.bz2 ) )
+	x86-fbsd? (	qt-static? ( ${O_URI}unix/freebsd${O_FTP}static/${PN}-${O_VER}.1-static-qt.i386.freebsd-${O_LNG}.tar.bz2 ) )
+				!qt-static? ( ${O_URI}unix/freebsd${O_FTP}shared/${PN}-${O_VER}.4-shared-qt.i386.freebsd-${O_LNG}.tar.bz2 )"
 
 DEPEND=">=sys-apps/sed-4"