+ fix sandbox violation, bug #55130

5 files changed, 41 insertions, 28 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 6336a78e8f2f..f47f027da0ea 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/opera
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.68 2004/06/25 15:45:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.69 2004/07/03 08:52:03 lanius Exp $
+
+*opera-7.51-r1 (03 Jul 2004)
+
+  03 Jul 2004; Heinrich Wendel <lanius@gentoo.org> opera-7.50-r1.ebuild,
+  opera-7.51-r1.ebuild:
+  fix sandbox violation, bug #55130
+  fix artsd support with java, bug #54813
 
   25 Jun 2004; Aron Griffis <agriffis@gentoo.org> opera-6.12.ebuild,
   opera-7.11-r2.ebuild, opera-7.23-r1.ebuild, opera-7.50-r1.ebuild,
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 60c9183d63be..54370b9fa5ef 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,13 +1,13 @@
 MD5 6bc54e68ebc4efff54d13094f092b6d5 opera-6.12.ebuild 3304
 MD5 0aca2d1be055c2194d30c8d7e2c2adb9 opera-7.51.ebuild 4014
+MD5 6e1bca5d074d060c37db71a08a498b3b opera-7.51-r1.ebuild 4208
 MD5 85383966c3542de9c8fb14f62be9b1b1 opera-7.23-r1.ebuild 3842
 MD5 e98a0549d46aadd78a43ba042539b497 opera-7.11-r2.ebuild 3670
-MD5 2857c7f3dab6b08759f03b8c81482b38 opera-7.50-r1.ebuild 3865
 MD5 0ae807a096d700b8eb956fe84b5b01fa ChangeLog 11368
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
 MD5 65aef7951b182fd430f7556cb174d6ba files/digest-opera-7.51 558
 MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
 MD5 9a8a982857424445242430340a70783c files/digest-opera-7.23-r1 558
-MD5 0084aae5ea2c92ac79c91b3467225005 files/digest-opera-7.50-r1 558
+MD5 65aef7951b182fd430f7556cb174d6ba files/digest-opera-7.51-r1 558
 MD5 8336a92d029cd448620bf4bbd4c55715 files/opera.desktop 135
diff --git a/net-www/opera/files/digest-opera-7.50-r1 b/net-www/opera/files/digest-opera-7.50-r1
deleted file mode 100644
index 089ff5b1ee43..000000000000
--- a/net-www/opera/files/digest-opera-7.50-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d08711644a4b4f84f1e6afca8fd16cc5 opera-7.50-20040511.1-static-qt.i386-en.tar.bz2 4849047
-MD5 f958960e7dbce816572e49fe7830bbd7 opera-7.50-20040511.5-shared-qt.i386-en.tar.bz2 3657663
-MD5 44fe3f6e6977297c99722b411291ec72 opera-7.50-20040511.1-static-qt.ppc-en.tar.bz2 4917150
-MD5 3d128c91688c01daf19e74d06b7030cb opera-7.50-20040511.2-shared-qt.ppc-en.tar.bz2 3627461
-MD5 e24b4c5461fc1fdaf30d7ebf7ff8f2bb opera-7.50-20040511.1-static-qt.sparc-en.tar.bz2 4877317
-MD5 b2a1ad92af8331d4433883c9ab075a02 opera-7.50-20040511.2-shared-qt.sparc-en.tar.bz2 3590511
diff --git a/net-www/opera/files/digest-opera-7.51-r1 b/net-www/opera/files/digest-opera-7.51-r1
new file mode 100644
index 000000000000..0d0712354032
--- /dev/null
+++ b/net-www/opera/files/digest-opera-7.51-r1
@@ -0,0 +1,6 @@
+MD5 c3266835c2b8e3b54598775802b4e7eb opera-7.51-20040602.1-static-qt.i386-en.tar.bz2 4852011
+MD5 9765ce92dd512d2dc7e3f705eacb7fbd opera-7.51-20040602.5-shared-qt.i386-en.tar.bz2 3662703
+MD5 87158b9c06ad1941778a60b3738323de opera-7.51-20040602.1-static-qt.ppc-en.tar.bz2 4916157
+MD5 436425416dfdbd6ad28655eb0f30076b opera-7.51-20040602.2-shared-qt.ppc-en.tar.bz2 3631424
+MD5 95e725b2d87d0ae1e430abe4ed9505ed opera-7.51-20040602.1-static-qt.sparc-en.tar.bz2 4877639
+MD5 a140c983880b1fbfcd0e383450d46c16 opera-7.51-20040602.2-shared-qt.sparc-en.tar.bz2 3592852
diff --git a/net-www/opera/opera-7.50-r1.ebuild b/net-www/opera/opera-7.51-r1.ebuild
index d8d7a8c86062..1a31d1d8db63 100644
--- a/net-www/opera/opera-7.50-r1.ebuild
+++ b/net-www/opera/opera-7.51-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.50-r1.ebuild,v 1.5 2004/06/25 15:45:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.51-r1.ebuild,v 1.1 2004/07/03 08:52:03 lanius Exp $
 
-IUSE="static"
+IUSE="static spell"
 
-OPERAVER="7.50-20040511"
+OPERAVER="7.51-20040602"
+OPERAFTPDIR="751"
 
 S=${WORKDIR}/${A/.tar.bz2/}
 
@@ -13,14 +14,14 @@ HOMEPAGE="http://www.opera.com/linux/"
 
 # that's an ugly workaround for the broken src_uri syntax
 SRC_URI="
-	x86? ( static? ( ftp://ftp.opera.com/pub/opera/linux/750/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	x86? ( !static? ( ftp://ftp.opera.com/pub/opera/linux/750/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	amd64? ( static? ( ftp://ftp.opera.com/pub/opera/linux/750/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
-	amd64? ( !static? ( ftp://ftp.opera.com/pub/opera/linux/750/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
-	ppc? ( static? ( ftp://ftp.opera.com/pub/opera/linux/750/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
-	ppc? ( !static? ( ftp://ftp.opera.com/pub/opera/linux/750/final/en/ppc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )
-	sparc? ( static?  ( ftp://ftp.opera.com/pub/opera/linux/750/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 ) )
-	sparc? ( !static? ( ftp://ftp.opera.com/pub/opera/linux/750/final/en/sparc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )"
+	x86? ( static? ( ftp://ftp.opera.com/pub/opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	x86? ( !static? ( ftp://ftp.opera.com/pub/opera/linux/${OPERAFTPDIR}/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	amd64? ( static? ( ftp://ftp.opera.com/pub/opera/linux/${OPERAFTPDIR}/final/en/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-en.tar.bz2 ) )
+	amd64? ( !static? ( ftp://ftp.opera.com/pub/opera/linux/${OPERAFTPDIR}/final/en/i386/shared/${PN}-${OPERAVER}.5-shared-qt.i386-en.tar.bz2 ) )
+	ppc? ( static? ( ftp://ftp.opera.com/pub/opera/linux/${OPERAFTPDIR}/final/en/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-en.tar.bz2 ) )
+	ppc? ( !static? ( ftp://ftp.opera.com/pub/opera/linux/${OPERAFTPDIR}/final/en/ppc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.ppc-en.tar.bz2 ) )
+	sparc? ( static?  ( ftp://ftp.opera.com/pub/opera/linux/${OPERAFTPDIR}/final/en/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-en.tar.bz2 ) )
+	sparc? ( !static? ( ftp://ftp.opera.com/pub/opera/linux/${OPERAFTPDIR}/final/en/sparc/shared/gcc-2.95/${PN}-${OPERAVER}.2-shared-qt.sparc-en.tar.bz2 ) )"
 
 
 # Dependencies may be augmented later (see below).
@@ -36,11 +37,11 @@ RDEPEND="virtual/x11
 	!static? (
 		amd64? ( =app-emulation/emul-linux-x86-qtlibs-1* )
 		!amd64? ( =x11-libs/qt-3* ) )
-	app-text/aspell"
+	spell? ( app-text/aspell )"
 
 SLOT="0"
 LICENSE="OPERA"
-KEYWORDS="x86 ~ppc sparc ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 src_unpack() {
 	unpack ${A}
@@ -54,6 +55,7 @@ src_unpack() {
 	       -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
 	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
 		   -e 's:read str_answer:return 0:' \
+		   -e "s:/opt/kde:${D}/usr/kde:" \
 	       install.sh || die
 }
 
@@ -72,6 +74,9 @@ src_install() {
 		./install.sh --prefix="${D}"/opt/opera || die
 	fi
 
+	# java workaround
+	sed -i -e 's:LD_PRELOAD="${OPERA_JAVA_DIR}/libawt.so":LD_PRELOAD="$LD_PRELOAD"\:"${OPERA_JAVA_DIR}/libawt.so":' ${D}/opt/opera/bin/opera
+
 	rm ${D}/opt/opera/share/doc/opera/help
 	dosym /opt/share/doc/opera/help /opt/opera/share/opera/help
 
@@ -94,13 +99,14 @@ src_install() {
 	echo "Plugin Path=/opt/opera/lib/opera/plugins" >> ${D}/etc/opera6rc
 
 	# enable spellcheck
-	if use static; then
-		DIR=$OPERAVER.1
-	else
-		use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
+	if use spell; then
+		if use static; then
+			DIR=$OPERAVER.1
+		else
+			use sparc && DIR=$OPERAVER.2 || DIR=$OPERAVER.5
+		fi
+		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
 	fi
-	echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> ${D}/opt/opera/share/opera/ini/spellcheck.ini
-
 }
 
 pkg_postinst() {