versino bump; fix operanom2 use flag; add shared version

5 files changed, 117 insertions, 10 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 3d93730cc3aa..1b8f6c5bf144 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,15 @@
 # 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.48 2004/02/04 12:01:22 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.49 2004/02/21 00:32:13 lanius Exp $
+
+*opera-7.50_alpha2 (21 Feb 2004)
+
+  21 Feb 2004; Heinrich Wendel <lanius@gentoo.org> opera-7.50_alpha1.ebuild,
+  opera-7.50_alpha2.ebuild:
+  version bump, add shared version
+
+  21 Feb 2004; Heinrich Wendel <lanius@gentoo.org> opera-7.50_alpha1.ebuild:
+  fix operanom2 use flag
 
   04 Feb 2004; Heinrich Wendel <lanius@gentoo.org> opera-7.50_alpha1.ebuild:
   added operanom2 use flag, bug #40074
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 37b4c5142807..a65f6d5d7089 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,10 +1,12 @@
 MD5 5f73745f3ea4dea663aee6a41b11162d opera-6.12.ebuild 3335
-MD5 0d2fafd69c8778f3ae9f6e21f79eb756 opera-7.50_alpha1.ebuild 2322
+MD5 edf57bc2774f795e013a64a3abd1a40d opera-7.50_alpha2.ebuild 2943
+MD5 f67a023e51477b9623d375808d2940f6 opera-7.50_alpha1.ebuild 2331
 MD5 e6f999047cae80f596671ce356d82eb7 opera-7.11-r2.ebuild 3709
-MD5 c2f2ac54bf00da9aa8489438713ae3d1 ChangeLog 8199
+MD5 89ca238388eb91ad5eb8aa4b83a17ee8 ChangeLog 8302
 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 8336a92d029cd448620bf4bbd4c55715 files/opera.desktop 135
 MD5 c09ad90080045d7a49513f14b858d4e1 files/digest-opera-7.50_alpha1 93
+MD5 5c71a942d63d27924445ee68d6d96bad files/digest-opera-7.50_alpha2 279
diff --git a/net-www/opera/files/digest-opera-7.50_alpha2 b/net-www/opera/files/digest-opera-7.50_alpha2
new file mode 100644
index 000000000000..d6fe5b3ebcf8
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.50_alpha2
@@ -0,0 +1,6 @@
+MD5 cf4a4fae579b2ee4fb17318d954e86de opera-7.50-20040218.1-static-qt.i386-en.tar.bz2 4814140
+MD5 58e72a262cf69650e1d418e527702ecf opera-7.50-20040218.1-static-qt.ppc-en.tar.bz2 4910710
+MD5 0f39b0e1bbe166c96e5488741a4f88c7 opera-7.50-20040218.1-static-qt.sparc-en.tar.bz2 4841197
+MD5 03771559d4b650f6037a8b2fa1113dc8 opera-7.50-20040218.5-shared-qt.i386-en.tar.bz2 3643529
+MD5 003bc9c7bfeeb6fec70d56c5b0d64874 opera-7.50-20040218.2-shared-qt.ppc-en.tar.bz2 3587500
+MD5 bf92a769e6d0127cf09aae194c69086e opera-7.50-20040218.2-shared-qt.sparc-en.tar.bz2 3535530
diff --git a/net-www/opera/opera-7.50_alpha1.ebuild b/net-www/opera/opera-7.50_alpha1.ebuild
index cd13389b1331..5b66bcdb9fe8 100644
--- a/net-www/opera/opera-7.50_alpha1.ebuild
+++ b/net-www/opera/opera-7.50_alpha1.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.50_alpha1.ebuild,v 1.6 2004/02/04 12:01:22 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.50_alpha1.ebuild,v 1.7 2004/02/21 00:32:13 lanius Exp $
 
 # Here, like in the other .ebuilds, the static version is
 # forced for simplicity's sake
@@ -40,6 +40,12 @@ 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() {
@@ -70,12 +76,6 @@ src_install() {
 	# Install a symlink /usr/bin/opera
 	dodir /usr/bin
 	dosym /opt/opera/bin/opera /usr/bin/opera
-
-	# Make mail and irc support optional
-	if `use operanom2`; then
-		einfo "Removing mail and chat support"
-		rm ${S}/lib/m2.so
-	fi
 }
 
 pkg_postinst() {
diff --git a/net-www/opera/opera-7.50_alpha2.ebuild b/net-www/opera/opera-7.50_alpha2.ebuild
new file mode 100644
index 000000000000..f27ce2c87d50
--- /dev/null
+++ b/net-www/opera/opera-7.50_alpha2.ebuild
@@ -0,0 +1,90 @@
+# 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_alpha2.ebuild,v 1.1 2004/02/21 00:32:13 lanius Exp $
+
+# Here, like in the other .ebuilds, the static version is
+# forced for simplicity's sake
+
+IUSE="static"
+
+OPERAVER="7.50-20040218"
+OPERATYPE="1-static-qt"
+S=${WORKDIR}/${A/.tar.bz2/}
+
+DESCRIPTION="Opera web browser."
+HOMEPAGE="http://www.opera.com/linux/"
+
+# 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-2/intel-linux/en/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 )
+		ppc? ( http://snapshot.opera.com/unix/7.50-Preview-2/ppc-linux/en/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 )
+		sparc? ( http://snapshot.opera.com/unix/7.50-Preview-2/sparc-linux/en/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 )"
+else
+	SRC_URI="x86? (http://snapshot.opera.com/unix/7.50-Preview-2/intel-linux/en/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 )
+		ppc? ( http://snapshot.opera.com/unix/7.50-Preview-2/ppc-linux/en/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 )
+		sparc? ( http://snapshot.opera.com/unix/7.50-Preview-2/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
+	>=sys-devel/gcc-3.2"
+
+RDEPEND="virtual/x11
+	>=media-libs/fontconfig-2.1.94-r1
+	media-libs/libexif
+	x11-libs/openmotif
+	!static? ( =x11-libs/qt-3* )"
+
+SLOT="0"
+LICENSE="OPERA"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
+	       -e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
+	       -e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
+	       -e "s:/usr/share/icons:${D}/usr/share/icons:g" \
+	       -e "s:/etc/X11:${D}/etc/X11:g" \
+	       -e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
+	       -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
+	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
+		   -e 's:read str_answer:return 0:' \
+	       install.sh || die
+}
+
+src_compile() {
+	true
+}
+
+src_install() {
+	# Prepare installation directories for Opera's installer script.
+	dodir /etc
+
+	# Opera's native installer.
+	./install.sh --prefix="${D}"/opt/opera || die
+
+	rm ${D}/opt/opera/share/doc/opera/help
+	dosym /opt/share/doc/opera/help /opt/opera/share/opera/help
+
+	dosed /opt/opera/bin/opera
+	dosed /opt/opera/share/opera/java/opera.policy
+
+	# Install the icons
+	insinto /usr/share/pixmaps
+	doins images/opera.xpm
+
+	# Install the menu entry
+	insinto /usr/share/applications
+	doins ${FILESDIR}/opera.desktop
+
+	# Install a symlink /usr/bin/opera
+	dodir /usr/bin
+	dosym /opt/opera/bin/opera /usr/bin/opera
+}
+
+pkg_postinst() {
+	einfo "For localized language files take a look at:"
+	einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
+}