Fix SRC_URI magic (thanks to tomaw).

(Portage version: 2.1.3.16)

3 files changed, 23 insertions, 14 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/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"