see changelog ...

5 files changed, 52 insertions, 28 deletions

diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 267c6d105a18..9dad1564209d 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,8 +1,8 @@
 MD5 272c53a9949637427d9a911a926758a1 opera-6.12.ebuild 3290
-MD5 bbecaabf5e3c4e4bea2ae44f9df83c8a opera-7.20_beta5.ebuild 3025
+MD5 8eae66e0bd11902ec7303a818ce38560 opera-7.20_beta5.ebuild 2976
 MD5 b060229a0600c022164b782118244875 opera-7.11-r2.ebuild 3715
-MD5 c09bf99034a959aea749648c86084715 opera-7.20_beta4.ebuild 3194
-MD5 08ab077a4bab2dafe980db7256e6075a ChangeLog 5592
+MD5 9bb426a409bb92f5e758372376aabe1e opera-7.20_beta4.ebuild 3095
+MD5 f118f6601d3bf113995833cba8d40667 ChangeLog 5828
 MD5 7bae5c1115cbae449099217feafc29f4 opera-6.12_beta1.ebuild 2448
 MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
 MD5 c06fc9c9e26bfa2b0fdc7c89bdac926e files/digest-opera-7.20_beta4 90
diff --git a/net-www/opera/files/digest-opera-7.20_beta3 b/net-www/opera/files/digest-opera-7.20_beta3
deleted file mode 100644
index 6b128cfe04b3..000000000000
--- a/net-www/opera/files/digest-opera-7.20_beta3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 403da35ff16262087b3452c74990e4fb opera-7.20-20030807.1-static-qt.i386.tar.bz2 5019479
diff --git a/net-www/opera/files/digest-opera-7.20_beta5 b/net-www/opera/files/digest-opera-7.20_beta5
new file mode 100644
index 000000000000..4a706a8a6f15
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.20_beta5
@@ -0,0 +1 @@
+MD5 790fb5f68397023ffb2fc6b3773fba2f opera-7.20-20030825.1-static-qt.i386.tar.bz2 5058864
diff --git a/net-www/opera/opera-7.20_beta4.ebuild b/net-www/opera/opera-7.20_beta4.ebuild
index a056c0d20268..b935139ab604 100644
--- a/net-www/opera/opera-7.20_beta4.ebuild
+++ b/net-www/opera/opera-7.20_beta4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.20_beta4.ebuild,v 1.2 2003/08/22 00:12:27 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.20_beta4.ebuild,v 1.3 2003/08/26 16:54:32 lanius Exp $
 
 # Here, like in the other .ebuilds, the static version is
 # forced for simplicity's sake
@@ -18,23 +18,37 @@ RDEPEND="virtual/x11
 	media-libs/libexif
 	>=x11-libs/lesstif-0.93.40" #lesstif resolves Bug 25767
 
-KEYWORDS="-*" #please test! This is for x86 only!!
+KEYWORDS="~x86 ~ppc ~sparc"
 SLOT="0"
-OPERAVER="7.20-20030821"
-OPERATYPE="1-static-qt"
 
+if [ `use x86`]; then
+	ARCH="intel"
+	ARCH2="i386"
+	OPERAVER="7.20-20030821"
+	DIR="445-20030821-7.20-B4"
+elif [ `use ppc` ]; then
+	ARCH="ppc"
+	ARCH2="ppc"
+	OPERAVER="7.20-20030822"
+	DIR="445-20030822-7.20-B4"
+elif [ `use sparc` ]; then
+	ARCH="sparc"
+	ARCH2="sparc"
+	OPERAVER="7.20-20030822"
+	DIR="445-20030822-7.20-B4"
+fi
 
-SRC_URI="http://snapshot.opera.com/unix/intel-linux/445-20030821-7.20-B4//${PN}-${OPERAVER}.${OPERATYPE}.i386.tar.bz2"
-S=${WORKDIR}/opera-${OPERAVER}.${OPERATYPE}.i386
+if [ "$OPERA_VARIANT" = "shared" ]; then
+        RDEPEND="${RDEPEND} =x11-libs/qt-3*"
+        OPERATYPE="2-shared-qt"
+else
+        OPERATYPE="1-static-qt"
+fi
 
+SRC_URI="http://snapshot.opera.com/unix/${ARCH}-linux/${DIR}/${PN}-${OPERAVER}.${OPERATYPE}.${ARCH2}.tar.bz2"
+S=${WORKDIR}/opera-${OPERAVER}.${OPERATYPE}.${ARCH2}
 
 src_unpack() {
-	ewarn "This package is designed for an i386-based processor."
-	ewarn "Usage on another platform is at your own risk."
-	ewarn "If you want to abort this installation, press CTRL+C now"
-	ewarn "Pausing for 15 seconds..."
-	sleep 15s
-
 	unpack ${A}
 	cd ${S}
 	sed -i -e "s:/etc:${D}/etc:g" \
diff --git a/net-www/opera/opera-7.20_beta3.ebuild b/net-www/opera/opera-7.20_beta5.ebuild
index 216d2db4be7d..949ae305b992 100644
--- a/net-www/opera/opera-7.20_beta3.ebuild
+++ b/net-www/opera/opera-7.20_beta5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.20_beta3.ebuild,v 1.2 2003/08/22 00:12:27 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.20_beta5.ebuild,v 1.1 2003/08/26 16:54:32 lanius Exp $
 
 # Here, like in the other .ebuilds, the static version is
 # forced for simplicity's sake
@@ -18,23 +18,33 @@ RDEPEND="virtual/x11
 	media-libs/libexif
 	>=x11-libs/lesstif-0.93.40" #lesstif resolves Bug 25767
 
-KEYWORDS="-*" #please test! This is for x86 only!!
+KEYWORDS="~x86"
 SLOT="0"
-OPERAVER="7.20-20030807"
-OPERATYPE="1-static-qt"
 
+if [ `use x86` ]; then
+	ARCH="intel"
+	ARCH2="i386"
+	OPERAVER="7.20-20030825"
+	DIR="447-20030825-7.20-B5"
+elif [ `use ppc` ]; then
+	ARCH="ppc"
+	ARCH2="ppc"
+elif [ `use sparc` ]; then
+	ARCH="sparc"
+	ARCH2="sparc"
+fi
 
-SRC_URI="http://snapshot.opera.com/unix/intel-linux/437-20030807-7.20-B3/${PN}-${OPERAVER}.${OPERATYPE}.i386.tar.bz2"
-S=${WORKDIR}/opera-${OPERAVER}.${OPERATYPE}.i386
+if [ "$OPERA_VARIANT" = "shared" ]; then
+        RDEPEND="${RDEPEND} =x11-libs/qt-3*"
+        OPERATYPE="2-shared-qt"
+else
+        OPERATYPE="1-static-qt"
+fi
 
+SRC_URI="http://snapshot.opera.com/unix/${ARCH}-linux/${DIR}/${PN}-${OPERAVER}.${OPERATYPE}.${ARCH2}.tar.bz2"
+S=${WORKDIR}/opera-${OPERAVER}.${OPERATYPE}.${ARCH2}
 
 src_unpack() {
-	ewarn "This package is designed for an i386-based processor."
-	ewarn "Usage on another platform is at your own risk."
-	ewarn "If you want to abort this installation, press CTRL+C now"
-	ewarn "Pausing for 15 seconds..."
-	sleep 15s
-
 	unpack ${A}
 	cd ${S}
 	sed -i -e "s:/etc:${D}/etc:g" \