version bump

7 files changed, 19 insertions, 125 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index ddd31c83d34c..e52470169991 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/opera
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.33 2003/09/29 18:52:04 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.34 2003/10/04 17:08:13 lanius Exp $
+
+  04 Oct 2003; Heinrich Wendel <lanius@gentoo.org>:
+  fixed download on ARCH!=i386 and version bump to 7.21_pre1
 
   29 Sep 2003; Heinrich Wendel <lanius@gentoo.org> opera-7.11-r2.ebuild:
   stable bump on x86
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index c4ba5ddab7d8..9696a645ec56 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,13 +1,9 @@
 MD5 02f0ce8aa0a3eb1543ef947b276497ee opera-6.12.ebuild 3289
-MD5 ec8f7db7809e3f34fe408748e04888ae opera-7.20_beta7.ebuild 2656
-MD5 b0bdb964eaf2298529fa19c0adcec4ea opera-7.21_pre1.ebuild 2874
-MD5 0e692a30bd4996d3e458c37938e64954 opera-7.20_beta9.ebuild 2865
+MD5 dbfd07b031c0fb3af9eac7b4e12ad9fd opera-7.21_pre1.ebuild 3035
 MD5 1b7c1f0c4e1dd14c6381cf8b4937fc09 opera-7.11-r2.ebuild 3717
-MD5 0e1810d1b49d84f98f0a86073d5259a8 ChangeLog 6352
+MD5 8f4500b7217575481865c9415ea46519 ChangeLog 6331
 MD5 6a4b2402e4bb9f82a99ba80b11a4a7fa opera-6.12_beta1.ebuild 2450
 MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
-MD5 abbb8a4512000d2cc8b8b8fbda3ff1cd files/digest-opera-7.20_beta7 270
-MD5 d3b72b62e5185795147b116987839f30 files/digest-opera-7.20_beta9 270
 MD5 2754d58c2493cfc9764796a3dbfb0848 files/digest-opera-7.21_pre1 270
 MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
 MD5 060858a4f81b92854de461ed0e1f955b files/digest-opera-6.12_beta1 90
diff --git a/net-www/opera/files/digest-opera-7.20_beta7 b/net-www/opera/files/digest-opera-7.20_beta7
deleted file mode 100644
index 490b02fe5f56..000000000000
--- a/net-www/opera/files/digest-opera-7.20_beta7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5abaa90caf74b95cf7ca2e25dd7f2698 opera-7.20-20030827.1-static-qt.i386.tar.bz2 5066256
-MD5 8a21c7d4c02f79302b2a1e3c69e0d3b8 opera-7.20-20030827.1-static-qt.ppc.tar.bz2 4885931
-MD5 9f4ecf5d125553d4a853bd66bffb683a opera-7.20-20030827.1-static-qt.sparc.tar.bz2 4825319
diff --git a/net-www/opera/files/digest-opera-7.20_beta9 b/net-www/opera/files/digest-opera-7.20_beta9
deleted file mode 100644
index 713ec65b2e95..000000000000
--- a/net-www/opera/files/digest-opera-7.20_beta9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b135a9ffa826053da6f526a365a5083b opera-7.20-20030905.1-static-qt.i386.tar.bz2 5076564
-MD5 fb9916309a64cf5a72a8cfce4b68442d opera-7.20-20030905.1-static-qt.ppc.tar.bz2 4963691
-MD5 bd4712f91ec675d1ef7ce7bf1fa87103 opera-7.20-20030905.1-static-qt.sparc.tar.bz2 4889466
diff --git a/net-www/opera/files/digest-opera-7.21_pre1 b/net-www/opera/files/digest-opera-7.21_pre1
new file mode 100644
index 000000000000..d1aee621bef9
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.21_pre1
@@ -0,0 +1,3 @@
+MD5 b86a419405f971bcc8bb81575f63794a opera-7.21-20031002.1-static-qt.i386.tar.bz2 4725258
+MD5 05f6d5509025373dfd10c96aa130239e opera-7.21-20031002.1-static-qt.ppc.tar.bz2 4781570
+MD5 a7d13b04be3f18b943ca051baedb5b00 opera-7.21-20031002.1-static-qt.sparc.tar.bz2 4731938
diff --git a/net-www/opera/opera-7.20_beta9.ebuild b/net-www/opera/opera-7.20_beta9.ebuild
deleted file mode 100644
index 46e0c689c720..000000000000
--- a/net-www/opera/opera-7.20_beta9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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_beta9.ebuild,v 1.1 2003/09/06 11:33:54 lanius Exp $
-
-# Here, like in the other .ebuilds, the static version is
-# forced for simplicity's sake
-
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
-LICENSE="OPERA"
-IUSE="gnome kde"
-
-# Dependencies may be augmented later (see below).
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="virtual/x11
-	>=media-libs/fontconfig-2.1.94-r1
-	media-libs/libexif
-	>=x11-libs/lesstif-0.93.40" #lesstif resolves Bug 25767
-
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-
-if [ `use x86` ]; then
-	ARCH="i386"
-elif [ `use ppc` ]; then
-	ARCH="ppc"
-elif [ `use sparc` ]; then
-	ARCH="sparc"
-fi
-
-OPERAVER="7.20-20030905"
-OPERATYPE="1-static-qt"
-
-SRC_URI="x86? ( http://snapshot.opera.com/unix/7.20-Beta-9/intel-linux/${PN}-${OPERAVER}.${OPERATYPE}.${ARCH}.tar.bz2 )
-	ppc? ( http://snapshot.opera.com/unix/7.20-Beta-9/ppc-linux/${PN}-${OPERAVER}.${OPERATYPE}.${ARCH}.tar.bz2 )
-	sparc? ( http://snapshot.opera.com/unix/7.20-Beta-9/sparc-linux/${PN}-${OPERAVER}.${OPERATYPE}.${ARCH}.tar.bz2 )"
-
-S=${WORKDIR}/opera-${OPERAVER}.${OPERATYPE}.${ARCH}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:/etc:${D}/etc:g" \
-	       -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-	       -e "s:read install_config:install_config=yes:" \
-	       -e "s:/opt/kde2:${D}/usr/kde/2:g" \
-	       -e "s:/opt/kde2:${D}/usr/kde/2: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:#\(LD_PRELOAD=.*libawt.so\):\1:' \
-	       -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-	       install.sh || die
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-	if [ "`use kde`" ]
-	then
-		# Install stuff for KDE2, and then simply copy it over
-		# into the KDE3 directories.
-		dodir /usr/kde/2/share/icons/{locolor,hicolor}/{16x16,22x22,32x32,48x48}/apps
-		dodir /usr/kde/2/share/applnk/Internet
-	fi
-	if [ "`use gnome`" ]
-	then
-		dodir /usr/share/gnome/pixmaps
-		dodir /usr/share/gnome/apps/Internet
-	fi
-
-	# Opera's native installer.
-	./install.sh --prefix="${D}"/opt/opera || die
-	if [ "`use kde`" ]
-	then
-		cp -R ${D}/usr/kde/2 ${D}/usr/kde/3
-	fi
-	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/icons /etc/X11/wmconfig /etc/X11/applnk/Internet \
-		/usr/share/pixmaps
-	doins images/opera.xpm
-
-	# Install a symlink /usr/bin/opera
-	dodir /usr/bin
-	dosym /opt/opera/bin/opera /usr/bin/opera
-}
diff --git a/net-www/opera/opera-7.20_beta7.ebuild b/net-www/opera/opera-7.21_pre1.ebuild
index 097b13006b17..96f762ec3f84 100644
--- a/net-www/opera/opera-7.20_beta7.ebuild
+++ b/net-www/opera/opera-7.21_pre1.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_beta7.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.21_pre1.ebuild,v 1.1 2003/10/04 17:08:25 lanius Exp $
 
 # Here, like in the other .ebuilds, the static version is
 # forced for simplicity's sake
@@ -21,19 +21,14 @@ RDEPEND="virtual/x11
 KEYWORDS="~x86 ~ppc ~sparc"
 SLOT="0"
 
-if [ `use x86` ]; then
-	ARCH="i386"
-elif [ `use ppc` ]; then
-	ARCH="ppc"
-elif [ `use sparc` ]; then
-	ARCH="sparc"
-fi
-
-OPERAVER="7.20-20030827"
+OPERAVER="7.21-20031002"
 OPERATYPE="1-static-qt"
 
-SRC_URI="ftp://ftp.task.gda.pl/pub/opera/linux/720/beta7/en/${ARCH}/static${DIR}/${PN}-${OPERAVER}.${OPERATYPE}.${ARCH}.tar.bz2"
-S=${WORKDIR}/opera-${OPERAVER}.${OPERATYPE}.${ARCH}
+SRC_URI="x86? ( http://snapshot.opera.com/unix/7.21-Preview-1/intel-linux/${PN}-${OPERAVER}.${OPERATYPE}.i386.tar.bz2 )
+	ppc? ( http://snapshot.opera.com/unix/7.21-Preview-1/ppc-linux/${PN}-${OPERAVER}.${OPERATYPE}.ppc.tar.bz2 )
+	sparc? ( http://snapshot.opera.com/unix/7.21-Preview-1/sparc-linux/${PN}-${OPERAVER}.${OPERATYPE}.sparc.tar.bz2 )"
+
+S=${WORKDIR}/${A/.tar.bz2/}
 
 src_unpack() {
 	unpack ${A}
@@ -51,6 +46,9 @@ src_unpack() {
 	       -e 's:#\(LD_PRELOAD=.*libawt.so\):\1:' \
 	       -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
 	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
+		   -e 's:chop "${DESTDIR}" "str_localdirexec"::' \
+		   -e 's:chop "${DESTDIR}" "str_localdirshare"::' \
+		   -e 's:chop "${DESTDIR}" "str_localdirplugin"::' \
 	       install.sh || die
 }