Fix amd64 SRC_URI thanks to Dmitry Ivankov (bug #240536).

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7-JeR i686

3 files changed, 10 insertions, 8 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index fc58d3fe001e..8d12c7d6fe6e 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,9 @@
 # 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.290 2008/10/08 12:26:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.291 2008/10/08 15:53:37 jer Exp $
+
+  08 Oct 2008; Jeroen Roovers <jer@gentoo.org> opera-9.60.ebuild:
+  Fix amd64 SRC_URI thanks to Dmitry Ivankov (bug #240536).
 
 *opera-9.60 (08 Oct 2008)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 181a1811c902..e5e9dd02ae17 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -6,7 +6,6 @@ AUX opera-9.50-pluginpath.patch 425 RMD160 53d3c9755eee6f836b9ca446512963de9c8c3
 AUX opera-freedesktop.patch 995 RMD160 9ebe36fa34b25a4ab151033a10f7b53494cb4a4a SHA1 e1613110be5c4c4061227776db590f069041f525 SHA256 dc5e4b56ae89049e9708fa3180f375b2de795219fff7d868b8dbbffd99fd7ec5
 AUX opera-gentoo.patch 2276 RMD160 6b68de743af9f420454e0555d242643dbcb45470 SHA1 7dbf662019b7e07df515d27f1519a0da86dce765 SHA256 bcfd73704420fd3bf4a191c1a018b4bb209031aab505544b5e95c24702b9ef01
 AUX opera-simplify-desktop.patch 637 RMD160 017fea605f8a81aa4f48b6cc3081c990fffa3842 SHA1 eb2011ef0d4f8754bb43b506e27ef7b622ab8e91 SHA256 c0009b41727023b3d03faa7c891764d886e92641cb57d8fa762353c9137e0a74
-DIST .gcc4-shared-qt3.x86_64.tar.bz2 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 DIST opera-9.27-20080331.1-static-qt.i386-en.tar.bz2 6813669 RMD160 353adab3fa9a401720264738ea7494c184b0df2e SHA1 4fee1c05b31be9e11fbe78c127809c3f550b775a SHA256 3f76e709ee4896abb8aa5dfc5ce7c1b75f476faf947c1f6bb8b125d0726bc031
 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
@@ -59,12 +58,12 @@ DIST opera-9.60.gcc4-shared-qt3.x86_64.tar.bz2 7189818 RMD160 f814c448aad8e95162
 DIST opera-9.60.gcc4-static-qt3.i386.tar.bz2 8489100 RMD160 d7c391de79f9ade7c96b7f11c7c7db9c643f176a SHA1 17e859b5cf56cebf07e42beb8bb52909cead4a28 SHA256 076c61f02de83170afcded44af5b556cc8c9928196781597a2b0588fd4e5d097
 EBUILD opera-9.27.ebuild 5937 RMD160 fe418d4b5a2f34664f46bb6bcee56b27f3d182e0 SHA1 bda2f3ec16759f92c4227203a3a22927cd3b811e SHA256 fff41046fb4e6c58fc1c4cb73df98857c1c2ea89a9c6131aa03f3ce6aee19e98
 EBUILD opera-9.52.ebuild 7332 RMD160 7d52e5124559fe06984017a23c5e9f513d801be5 SHA1 ceb20bc6ecd0fef8f58db346c27c726ace4fb4ec SHA256 179dae5f51aedc9e92006294994747d16b286ce29b1f17e8a12e5d292c0c3054
-EBUILD opera-9.60.ebuild 7649 RMD160 a554489c07a9b535a40dff4c8a55f0040462829a SHA1 3a4a902f50b7565475b6b63f38ec1933854e744f SHA256 3c01e267bb0bef2aa21703ec2baf820805b2d8789677b4cc2fa5122bdd1a0b76
+EBUILD opera-9.60.ebuild 7649 RMD160 45e729d9b50cd081bd2826ba2024510ea9c87f6a SHA1 1c4e1e9444a7b198d7b59ff588cf5e7432e7d343 SHA256 8c005bee94f0cc63fd5d7305f809957ab365c46c4d4ffe2dbe0db9f20b8a468a
 EBUILD opera-9.60_pre2424.ebuild 7243 RMD160 4296f757d57f955b8ef16521e3ec91e116db9206 SHA1 3ece7ed59301a70d2ee52e2a69f6a840379fae24 SHA256 cf3423d5ca6754255488e35e9a5265e0eb3d9d60edb22768396d72ca01aed323
 EBUILD opera-9.60_pre2426.ebuild 6872 RMD160 17ac883d8e1ed5aa24f6b0f7f61b4930cd05e875 SHA1 531f55174e5b605777c4704cf68b1eeacdb71274 SHA256 5414a8fedfe4ed7e3a2591c209dee6a7d0a740ce8e3364abad52627c2981986d
 EBUILD opera-9.60_pre2430.ebuild 6872 RMD160 d1dd6b7855217da963d2242c841f77791d59fc8b SHA1 ddf08e9a66bdcca3734070480e06f3ef8ad96087 SHA256 373b74394f9abc907877f867f98672aa1dcc005678a44ec8bc157a249f267fa0
 EBUILD opera-9.60_pre2436.ebuild 6950 RMD160 caaafca9c8d74aefd8ec9f7a0fb9439bc6bec720 SHA1 a174fa040fbd70ac16d269b8d199800e0cab7961 SHA256 65de0384167c93ea924dda48eb97e71ea5b43026003e628171ee88ca74c7be3e
 EBUILD opera-9.60_pre2440.ebuild 7573 RMD160 e174bf51ecf4af1ac4387f3ffc02b5247cb7de4b SHA1 308cf21fa2a933254a8792614e8e50326121ddf5 SHA256 50d045ec15f211fe6290e1ff4227bde376f9af990a3860e36e33f5cea64a3724
 EBUILD opera-9.60_pre2444.ebuild 7573 RMD160 9aff4a52ec346b5f0ad787068e509b33ae89c710 SHA1 3ad7faa7e5e5d77fe6935a21f03d5bb875af86ee SHA256 0f7f0dc47dad2f123bc0cde337b0a6e02dbeada146a6e5a3369253755a3f0f38
-MISC ChangeLog 58681 RMD160 f2f69136a262acc932c2eb279c9e46adcdf832a1 SHA1 ccb6090336e93952821e3e1bba38e667f8c0af64 SHA256 eae9f29f9065e4f2292cf90ef6b6f5d87f7036880e2a8f449b760fd590ee9ae2
+MISC ChangeLog 58808 RMD160 449a2c96bbe362796da8be5ee823eadd5693306a SHA1 2053ae8b94b915814229b1224401b668af9a5c13 SHA256 37a2a201d1ccfc6b5dc1db14acc06d4d9664844ff64632a880e4d56e123b85ae
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-9.60.ebuild b/www-client/opera/opera-9.60.ebuild
index 59d2b6b22705..74d4804f15d1 100644
--- a/www-client/opera/opera-9.60.ebuild
+++ b/www-client/opera/opera-9.60.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.60.ebuild,v 1.1 2008/10/08 12:26:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.60.ebuild,v 1.2 2008/10/08 15:53:37 jer Exp $
 
 GCONF_DEBUG="no"
 
@@ -40,7 +40,7 @@ SRC_URI="
 		!qt3-static? (
 			amd64? (
 				ia32? ( ${O_URI}linux${O_FTP}i386/${P}.gcc4-qt4.i386.tar.bz2 )
-				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${O}.gcc4-shared-qt3.x86_64.tar.bz2 )
+				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
 			)
 			x86? ( ${O_URI}linux${O_FTP}i386/${P}.gcc4-qt4.i386.tar.bz2 )
 		)
@@ -49,14 +49,14 @@ SRC_URI="
 		qt3-static? (
 			amd64? (
 				ia32? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${O}.gcc4-shared-qt3.x86_64.tar.bz2 )
+				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
 			)
 			x86? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
 		)
 		!qt3-static? (
 			amd64? (
 				ia32? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
-				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${O}.gcc4-shared-qt3.x86_64.tar.bz2 )
+				!ia32? ( ${O_URI}linux${O_FTP}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
 			)
 			x86? ( ${O_URI}linux${O_FTP}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
 		)