Fixed digest and SRC_URI.

4 files changed, 27 insertions, 30 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 2a4d2bc40270..7049026ef831 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/opera
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.82 2004/10/26 17:59:30 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.83 2004/11/03 10:44:58 eradicator Exp $
+
+  03 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  opera-7.60_alpha2.ebuild:
+  Fixed digest and SRC_URI.
 
 *opera-7.60_alpha2 (26 Oct 2004)
 
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 13c14b278adb..aa7540c5c433 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,7 +1,7 @@
-MD5 fe11763302728a8146c30c11ee88d0fd opera-7.54.ebuild 4905
 MD5 41528373d0d87004aa0924cde729b122 ChangeLog 13379
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 b9a23a2218a45459f742276e0613422d opera-7.60_alpha2.ebuild 4807
+MD5 dbc4de1d3e317384b5493f00671f8b15 opera-7.60_alpha2.ebuild 3952
+MD5 fe11763302728a8146c30c11ee88d0fd opera-7.54.ebuild 4905
+MD5 976e70e813d7cdd5621dd066975c5c7b files/digest-opera-7.60_alpha2 466
 MD5 0bb743783b49ab8cfc992cce68a57129 files/digest-opera-7.54 372
-MD5 c3ee613bd8db50b95750e07d5f4ac62e files/digest-opera-7.60_alpha2 93
 MD5 8336a92d029cd448620bf4bbd4c55715 files/opera.desktop 135
diff --git a/net-www/opera/files/digest-opera-7.60_alpha2 b/net-www/opera/files/digest-opera-7.60_alpha2
index f3db2dac5049..41df3a83806f 100644
--- a/net-www/opera/files/digest-opera-7.60_alpha2
+++ b/net-www/opera/files/digest-opera-7.60_alpha2
@@ -1 +1,5 @@
+MD5 a25219d40bf65fd1dd8ef602bb00bc28 opera-7.60-20041026.1-static-qt.i386-en.tar.bz2 5816761
 MD5 a7938217483f89de6ad7c43ca4e13fb4 opera-7.60-20041026.5-shared-qt.i386-en.tar.bz2 4347153
+MD5 7b893b8774f75204cdce95d4b823a68e opera-7.60-20041026.1-static-qt.sparc-en.tar.bz2 5702752
+MD5 487538aeb49d5a17f92e82fd5c5443d9 opera-7.60-20041026.2-shared-qt.sparc-en.tar.bz2 4186326
+MD5 12235e8f75c0fed89e9e75647d687d63 opera-7.60-20041026.1-static-qt.ppc-en.tar.bz2 5927734
diff --git a/net-www/opera/opera-7.60_alpha2.ebuild b/net-www/opera/opera-7.60_alpha2.ebuild
index 3278ef9aebca..6ad4fb831cec 100644
--- a/net-www/opera/opera-7.60_alpha2.ebuild
+++ b/net-www/opera/opera-7.60_alpha2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.60_alpha2.ebuild,v 1.1 2004/10/26 17:59:30 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.60_alpha2.ebuild,v 1.2 2004/11/03 10:44:58 eradicator Exp $
 
 IUSE="static spell"
 
@@ -13,25 +13,18 @@ DESCRIPTION="Opera web browser."
 HOMEPAGE="http://www.opera.com/linux/"
 
 # that's an ugly workaround for the broken src_uri syntax
+OPERA_URI="http://snapshot.opera.com/unix/${OPERAFTPDIR}/"
 SRC_URI="
-	x86? ( static? ( http://snapshot.opera.com/unix/${OPERAFTPDIR}/intel-linux/en/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	x86? ( !static? ( http://snapshot.opera.com/unix/${OPERAFTPDIR}/intel-linux/en/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	amd64? ( http://snapshot.opera.com/unix/${OPERAFTPDIR}/intel-linux/en/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 )
-	ppc? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )
-	sparc? ( http://snapshot.opera.com/unix/${OPERAFTPDIR}/intel-linux/en//${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )"
-
-# ppc shared version does not work as it uses gcc-2.95 - lanius
-#	ppc? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
-#	ppc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/ppc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )
-
-# amd64 shared libs require app-emulation/emul-linux-x86-qtlibs-1 which is not stable yet
-#	amd64? ( static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-#	amd64? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-
-# sparc shared version does not work for me as it uses gcc-2.95 - eradicator
-#	sparc? ( static?  ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 ) )
-#	sparc? ( !static? ( mirror://opera/linux/${OPERAFTPDIR}/final/en/sparc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )"
+	x86? ( static? ( ${OPERA_URI}/intel-linux/en/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	x86? ( !static? ( ${OPERA_URI}/intel-linux/en/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	amd64? ( ${OPERA}/intel-linux/en/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 )
+	sparc? ( static? ( ${OPERA_URI}/sparc-linux/en/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 ) )
+	sparc? ( !static? ( ${OPERA_URI}/sparc-linux/en/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )
+	ppc? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )"
 
+#	amd64? ( !static? ( ${OPERA_URI}/intel-linux/en/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+#	ppc? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 )
+#	ppc? ( ${OPERA_URI}/ppc-linux/en/${PN}-${OPERAVER}.3-shared-qt.ppc-en.tar.bz2 )
 
 # Dependencies may be augmented later (see below).
 DEPEND=">=sys-apps/sed-4
@@ -42,14 +35,10 @@ RDEPEND="virtual/x11
 	media-libs/libexif
 	x11-libs/openmotif
 	spell? ( app-text/aspell )
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	!amd64? ( !sparc? ( !static? ( =x11-libs/qt-3* ) ) )"
-
-#	static? (
-#		amd64? ( app-emulation/emul-linux-x86-xlibs ) )
-#	!static? (
-#		amd64? ( =app-emulation/emul-linux-x86-qtlibs-1* )
-#		!amd64? ( =x11-libs/qt-3* ) )
+	amd64? ( static? ( app-emulation/emul-linux-x86-xlibs ) 
+	         !static? ( =app-emulation/emul-linux-x86-qtlibs-1* ) )
+
+	x86? ( !static? ( =x11-libs/qt-3* ) )"
 
 SLOT="0"
 LICENSE="OPERA"