mark 7.23-r1 stable, version bump, bug #44171

6 files changed, 39 insertions, 31 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 24ee73b96c8d..33bd303674a0 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/opera
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.50 2004/02/21 12:08:00 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.51 2004/03/14 12:15:09 lanius Exp $
+
+  14 Mar 2004; Heinrich Wendel <lanius@gentoo.org> opera-7.23-r1.ebuild,
+  opera-7.50_alpha1.ebuild:
+  mark 7.23-r1 stable, version bump, bug #44171
 
 *opera-7.23-r1 (21 Feb 2004)
 
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index e31e3be96519..a1c5802268f5 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,14 +1,14 @@
-MD5 9217f9efbeded5bc30bf9ad49409c438 ChangeLog 8647
-MD5 9d74e5348d18f3fb4545df58fbf6d211 opera-7.23-r1.ebuild 3361
-MD5 e717c585919f1e6db3c5be9c218474a9 opera-7.11-r2.ebuild 3711
-MD5 048fbbc6f1a7bd0cb848213e54854fc1 opera-7.23.ebuild 3202
 MD5 5f73745f3ea4dea663aee6a41b11162d opera-6.12.ebuild 3335
-MD5 2d9f7ac96d8cbab740c9476e7f6dbfd9 opera-7.50_alpha1.ebuild 2331
 MD5 cee0cd7a76e30f04178654b8c5b75b41 opera-7.50_alpha2.ebuild 2832
-MD5 55f9ea404caf99e8d8b26356589e6d81 files/digest-opera-7.23-r1 558
-MD5 6b3b4a590a03c0ec8095153efa68142b files/digest-opera-7.50_alpha2 558
-MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
-MD5 3713aa7ae0771d916247b5e616ee599b files/digest-opera-7.23 279
-MD5 c09ad90080045d7a49513f14b858d4e1 files/digest-opera-7.50_alpha1 93
+MD5 f5d740c224b964c1f3a126e1f876ff3a opera-7.23-r1.ebuild 3360
+MD5 e717c585919f1e6db3c5be9c218474a9 opera-7.11-r2.ebuild 3711
+MD5 6a323741e3a5af7282b325a1d30bda32 opera-7.50_alpha3.ebuild 2832
+MD5 20ba0a0fc8535990ec20a8bf78238c20 ChangeLog 8797
+MD5 048fbbc6f1a7bd0cb848213e54854fc1 opera-7.23.ebuild 3202
 MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
+MD5 3713aa7ae0771d916247b5e616ee599b files/digest-opera-7.23 279
+MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
+MD5 55f9ea404caf99e8d8b26356589e6d81 files/digest-opera-7.23-r1 558
 MD5 8336a92d029cd448620bf4bbd4c55715 files/opera.desktop 135
+MD5 6b3b4a590a03c0ec8095153efa68142b files/digest-opera-7.50_alpha2 558
+MD5 9bd81767a64a354ff76563fd74b1cac3 files/digest-opera-7.50_alpha3 279
diff --git a/net-www/opera/files/digest-opera-7.50_alpha1 b/net-www/opera/files/digest-opera-7.50_alpha1
deleted file mode 100644
index 9ceef667abe2..000000000000
--- a/net-www/opera/files/digest-opera-7.50_alpha1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 35269021023269d16dbfe98573ec0fb6 opera-7.50-20031219.1-static-qt.i386-en.tar.bz2 4848546
diff --git a/net-www/opera/files/digest-opera-7.50_alpha3 b/net-www/opera/files/digest-opera-7.50_alpha3
new file mode 100644
index 000000000000..28b0529d366b
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.50_alpha3
@@ -0,0 +1,3 @@
+MD5 0a1076c1e8cd488a73e1e9b7ee1aa431 opera-7.50-20040309.1-static-qt.i386-en.tar.bz2 4829328
+MD5 73d8521892ce7e452462a2a554ffecea opera-7.50-20040309.1-static-qt.ppc-en.tar.bz2 4923033
+MD5 a70c0110cd24a8b12679c2369f9485a5 opera-7.50-20040309.1-static-qt.sparc-en.tar.bz2 4882102
diff --git a/net-www/opera/opera-7.23-r1.ebuild b/net-www/opera/opera-7.23-r1.ebuild
index 46bdbf8fafec..6f4331bbf366 100644
--- a/net-www/opera/opera-7.23-r1.ebuild
+++ b/net-www/opera/opera-7.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.23-r1.ebuild,v 1.2 2004/02/21 12:09:42 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.23-r1.ebuild,v 1.3 2004/03/14 12:15:09 lanius Exp $
 
 IUSE="static operanom2"
 
@@ -23,7 +23,7 @@ fi
 
 SLOT="0"
 LICENSE="OPERA"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 # Dependencies may be augmented later (see below).
 DEPEND=">=sys-apps/sed-4"
diff --git a/net-www/opera/opera-7.50_alpha1.ebuild b/net-www/opera/opera-7.50_alpha3.ebuild
index 5b66bcdb9fe8..f861dc4465de 100644
--- a/net-www/opera/opera-7.50_alpha1.ebuild
+++ b/net-www/opera/opera-7.50_alpha3.ebuild
@@ -1,19 +1,26 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.50_alpha1.ebuild,v 1.7 2004/02/21 00:32:13 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.50_alpha3.ebuild,v 1.1 2004/03/14 12:15:09 lanius Exp $
 
-# Here, like in the other .ebuilds, the static version is
-# forced for simplicity's sake
+IUSE="static"
 
-IUSE="gnome kde operanom2"
-
-MY_PV="7.50-20031219"
+OPERAVER="7.50-20040309"
 OPERATYPE="1-static-qt"
-MY_P=${PN}-${MY_PV}.${OPERATYPE}.i386-en
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${A/.tar.bz2/}
+
 DESCRIPTION="Opera web browser."
 HOMEPAGE="http://www.opera.com/linux/"
-SRC_URI="http://snapshot.opera.com/unix/7.50-Preview-1/intel-linux/en/${MY_P}.tar.bz2"
+
+# that's an ugly workaround for the broken src_uri syntax
+if [ `use static` ]; then
+	SRC_URI="x86? ( http://snapshot.opera.com/unix/7.50-Preview-3/intel-linux/en/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 )
+		ppc? ( http://snapshot.opera.com/unix/7.50-Preview-3/ppc-linux/en/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 )
+		sparc? ( http://snapshot.opera.com/unix/7.50-Preview-3/sparc-linux/en/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 )"
+else
+	SRC_URI="x86? (http://snapshot.opera.com/unix/7.50-Preview-3/intel-linux/en/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 )
+		ppc? ( http://snapshot.opera.com/unix/7.50-Preview-3/ppc-linux/en/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )
+		sparc? ( http://snapshot.opera.com/unix/7.50-Preview-3/sparc-linux/en/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 )"
+fi
 
 # Dependencies may be augmented later (see below).
 DEPEND=">=sys-apps/sed-4"
@@ -21,11 +28,12 @@ DEPEND=">=sys-apps/sed-4"
 RDEPEND="virtual/x11
 	>=media-libs/fontconfig-2.1.94-r1
 	media-libs/libexif
-	x11-libs/openmotif"
+	x11-libs/openmotif
+	!static? ( =x11-libs/qt-3* )"
 
 SLOT="0"
 LICENSE="OPERA"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~sparc"
 
 src_unpack() {
 	unpack ${A}
@@ -40,12 +48,6 @@ src_unpack() {
 	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
 		   -e 's:read str_answer:return 0:' \
 	       install.sh || die
-
-	# Make mail and irc support optional
-	if [ "`use operanom2`" ]; then
-		einfo "Removing mail and chat support"
-		rm -f ${S}/lib/m2.so
-	fi
 }
 
 src_compile() {