stable

5 files changed, 9 insertions, 89 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 288490cc78b4..ece9635c58f6 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,10 @@
 # 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.38 2003/10/17 10:16:51 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.39 2003/10/22 22:47:49 lanius Exp $
+
+  23 Oct 2003; Heinrich Wendel <lanius@gentoo.org> opera-6.12_beta1.ebuild,
+  opera-7.21.ebuild:
+  stable bump, cause of security issues (#31775
 
 *opera-7.21_pre1 (17 Oct 2003)
 
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 8887350d742c..6e721e892b6e 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,9 +1,7 @@
 MD5 0825bd32298b0f723104dfe91d0a7bc1 opera-6.12.ebuild 3343
 MD5 1b7c1f0c4e1dd14c6381cf8b4937fc09 opera-7.11-r2.ebuild 3717
-MD5 165ac44afc045e919654ac3a5a648099 opera-7.21.ebuild 3434
-MD5 c9a667e38c02b37b4dfd508e30a6f7aa ChangeLog 6843
-MD5 dd740427a5bf51df78900253dba8c6de opera-6.12_beta1.ebuild 2504
+MD5 ab8203ea5ed2129e5b083fabd736a297 opera-7.21.ebuild 3431
+MD5 1a1c01215a4bf087e971601e6be68912 ChangeLog 6989
 MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
 MD5 5f9b38271737e848dc0c7748b2ade4fe files/digest-opera-7.21 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-6.12_beta1 b/net-www/opera/files/digest-opera-6.12_beta1
deleted file mode 100644
index aef7bce2fea0..000000000000
--- a/net-www/opera/files/digest-opera-6.12_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 445ab639281d5aa6f270d4a022aab5d7 opera-6.12-20030306.1-static-qt.sparc.tar.gz 4692037
diff --git a/net-www/opera/opera-6.12_beta1.ebuild b/net-www/opera/opera-6.12_beta1.ebuild
deleted file mode 100644
index 36e170bfa26a..000000000000
--- a/net-www/opera/opera-6.12_beta1.ebuild
+++ /dev/null
@@ -1,81 +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-6.12_beta1.ebuild,v 1.5 2003/10/04 17:21:24 lanius Exp $
-
-# Based on original Gentoo Techonologies opera ebuild
-# Modified by Gustavo Zacarias <gustavo at zacarias.com.ar> for sparc
-
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
-IUSE="gnome kde"
-
-RDEPEND="virtual/x11
-	>=x11-libs/lesstif-0.93.40" #lesstif resolves Bug 25767
-
-SLOT="0"
-LICENSE="OPERA"
-KEYWORDS="-* sparc"
-
-NV=6.12-20030306.1-static-qt.sparc
-SRC_URI="ftp://ftp.opera.com/pub/opera/linux/612/beta1/en/sparc/static/opera-${NV}.tar.gz"
-S=${WORKDIR}/opera-${NV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -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 >install.sh.hacked || die
-	mv install.sh.hacked install.sh
-	chmod +x install.sh
-
-}
-
-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.21.ebuild b/net-www/opera/opera-7.21.ebuild
index bb1e5d604663..d096eb08ec95 100644
--- a/net-www/opera/opera-7.21.ebuild
+++ b/net-www/opera/opera-7.21.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.21.ebuild,v 1.2 2003/10/17 19:20:13 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.21.ebuild,v 1.3 2003/10/22 22:47:49 lanius Exp $
 
 # Here, like in the other .ebuilds, the static version is
 # forced for simplicity's sake
@@ -18,7 +18,7 @@ RDEPEND="virtual/x11
 	media-libs/libexif
 	|| ( x11-libs/lesstif x11-libs/openmotif )"
 
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 SLOT="0"
 
 OPERAVER="7.21-20031013"