Removed deprecated versions, added 9.21 final (same as the weekly I removed, basically), added patch for bug #179224.

(Portage version: 2.1.2.7)

5 files changed, 44 insertions, 218 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 012297d43547..85b4ac35a1bd 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.91 2007/05/14 03:55:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.92 2007/05/21 19:04:48 jer Exp $
+
+*opera-9.21 (21 May 2007)
+
+  21 May 2007; Jeroen Roovers <jer@gentoo.org> -opera-9.20-r1.ebuild,
+  +opera-9.21.ebuild, -opera-9.21.641.ebuild:
+  Removed deprecated versions, added 9.21 final (same as the weekly I removed,
+  basically), added patch for bug #179224.
 
   14 May 2007; Jeroen Roovers <jer@gentoo.org> opera-9.20-r1.ebuild,
   opera-9.21.641.ebuild:
diff --git a/www-client/opera/files/digest-opera-9.20-r1 b/www-client/opera/files/digest-opera-9.20-r1
deleted file mode 100644
index 499f0e89936a..000000000000
--- a/www-client/opera/files/digest-opera-9.20-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 dd5365a5ca0f31b373deafdb80a17ac7 opera-9.20-20070409.1-static-qt.i386-en.tar.bz2 6790435
-RMD160 b2d4d0791ea63a3727e7cfa708d2b2833a0972f7 opera-9.20-20070409.1-static-qt.i386-en.tar.bz2 6790435
-SHA256 4ea0e5d407e11e3df247a643412eac19962c923177f2f22c23566a776dc8945f opera-9.20-20070409.1-static-qt.i386-en.tar.bz2 6790435
-MD5 21892c3663f9ce73719045de65bcd259 opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2 6547395
-RMD160 d7063b7a7da24d8b18b175511f500e15f0614a4e opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2 6547395
-SHA256 434dadf22984dea89a08a850da8a1359f4e89b963509270da680ea348a9ebc35 opera-9.20-20070409.1-static-qt.i386.freebsd-en.tar.bz2 6547395
-MD5 cc5be6d9ec178eb7cb02bc20e0238c26 opera-9.20-20070409.1-static-qt.ppc-en.tar.bz2 6832346
-RMD160 af7f1d4fe9d1337621b2b6e1b22b42b1d70294a8 opera-9.20-20070409.1-static-qt.ppc-en.tar.bz2 6832346
-SHA256 2300c15a76faa728fd6d90232df586f06a052715bafe1851aac920606e2849c2 opera-9.20-20070409.1-static-qt.ppc-en.tar.bz2 6832346
-MD5 43c9cc58c26979db270f05141ee7cc99 opera-9.20-20070409.1-static-qt.sparc-en.tar.bz2 6732208
-RMD160 4c9ccb4a84d875c76dd34ba936b2a5eb2d0b8dc4 opera-9.20-20070409.1-static-qt.sparc-en.tar.bz2 6732208
-SHA256 5b7c588345006c6b610ecb4e483335fa6962cb5756d58fbba4004a69e13b7f3c opera-9.20-20070409.1-static-qt.sparc-en.tar.bz2 6732208
-MD5 ae34b8fde421b3d27b9090ec0ad6fb17 opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2 5176848
-RMD160 b6334db5e7cfd551d03d9709d55ecb62fbbb4d54 opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2 5176848
-SHA256 98b20f7215acb9a186f563f084c11c965d4791fbe1351049317d638985a9fc41 opera-9.20-20070409.4-shared-qt.i386.freebsd-en.tar.bz2 5176848
-MD5 3d4b6805d97f72f104a4d1dfe4c61f62 opera-9.20-20070409.6-shared-qt.i386-en.tar.bz2 5229714
-RMD160 c2bea2262311a4689fac12b94eb429102807acd2 opera-9.20-20070409.6-shared-qt.i386-en.tar.bz2 5229714
-SHA256 31232712ac42928288f3042c51bf258da6be1af0168d45a8f5969addd1655c83 opera-9.20-20070409.6-shared-qt.i386-en.tar.bz2 5229714
diff --git a/www-client/opera/files/digest-opera-9.21.641 b/www-client/opera/files/digest-opera-9.21
index a7e1d38f8ce1..93cca4b6f7c0 100644
--- a/www-client/opera/files/digest-opera-9.21.641
+++ b/www-client/opera/files/digest-opera-9.21
@@ -1,18 +1,18 @@
-MD5 42e3039163f7bbfd49119860cfac60d0 opera-9.21-20070510.1-static-qt.i386-en-641.tar.bz2 6785626
-RMD160 e6ae52b94d636025c7b55158d6994d38599270f7 opera-9.21-20070510.1-static-qt.i386-en-641.tar.bz2 6785626
-SHA256 fdf6766a0408d7030f7a930576fd70aff78e2b66fe2bbe8ca1af8da4bace95cd opera-9.21-20070510.1-static-qt.i386-en-641.tar.bz2 6785626
-MD5 361c26cf5392c8f0d063a182d832ff2e opera-9.21-20070510.1-static-qt.i386.freebsd-en-641.tar.bz2 6548602
-RMD160 546858e729ed818077bd3a9226b797b0f4e63b5f opera-9.21-20070510.1-static-qt.i386.freebsd-en-641.tar.bz2 6548602
-SHA256 2ec91aa1db9352aef35f5af11eede86100c3c5fc2ffdc004211c7ceb66a54820 opera-9.21-20070510.1-static-qt.i386.freebsd-en-641.tar.bz2 6548602
-MD5 5a74849836a5cd0315983e5f1e6852a4 opera-9.21-20070510.1-static-qt.ppc-en-641.tar.bz2 6835553
-RMD160 3ccbe11c534b6301e0bd26d2d95f75707e7eebdb opera-9.21-20070510.1-static-qt.ppc-en-641.tar.bz2 6835553
-SHA256 cc668082e6c901f6d98f526956ccb5ccc7c5806c98e94345f621086b2c5dfa1a opera-9.21-20070510.1-static-qt.ppc-en-641.tar.bz2 6835553
-MD5 031f3e4ea5d0e691f8bc4a1631396ffa opera-9.21-20070510.1-static-qt.sparc-en-641.tar.bz2 6727110
-RMD160 4f46b242089d14000faaa2cade625514db9baea8 opera-9.21-20070510.1-static-qt.sparc-en-641.tar.bz2 6727110
-SHA256 6bd9ad53d62f72bbd695f6c7b63c198876ddb9c4c2fd799176f58c4cee3a55a1 opera-9.21-20070510.1-static-qt.sparc-en-641.tar.bz2 6727110
-MD5 adeb325cc356432f79190026b9ff58fe opera-9.21-20070510.4-shared-qt.i386.freebsd-en-641.tar.bz2 5179430
-RMD160 0782c734c1d31166a94906e38d1a47b5c94a2908 opera-9.21-20070510.4-shared-qt.i386.freebsd-en-641.tar.bz2 5179430
-SHA256 824429a873bf978c401c0f4d518e96665ee505e77ef9b6eea98689b4e5f1b242 opera-9.21-20070510.4-shared-qt.i386.freebsd-en-641.tar.bz2 5179430
-MD5 de48ec6a3c2e4804477d1d38982aeb10 opera-9.21-20070510.6-shared-qt.i386-en-641.tar.bz2 5227934
-RMD160 5dfd040e4baf3415c55b63fe73568807c8776d1d opera-9.21-20070510.6-shared-qt.i386-en-641.tar.bz2 5227934
-SHA256 9b15fa60bdb3ae31db648031947994826af7e42492d31595cd26f01bea61162d opera-9.21-20070510.6-shared-qt.i386-en-641.tar.bz2 5227934
+MD5 42e3039163f7bbfd49119860cfac60d0 opera-9.21-20070510.1-static-qt.i386-en.tar.bz2 6785626
+RMD160 e6ae52b94d636025c7b55158d6994d38599270f7 opera-9.21-20070510.1-static-qt.i386-en.tar.bz2 6785626
+SHA256 fdf6766a0408d7030f7a930576fd70aff78e2b66fe2bbe8ca1af8da4bace95cd opera-9.21-20070510.1-static-qt.i386-en.tar.bz2 6785626
+MD5 361c26cf5392c8f0d063a182d832ff2e opera-9.21-20070510.1-static-qt.i386.freebsd-en.tar.bz2 6548602
+RMD160 546858e729ed818077bd3a9226b797b0f4e63b5f opera-9.21-20070510.1-static-qt.i386.freebsd-en.tar.bz2 6548602
+SHA256 2ec91aa1db9352aef35f5af11eede86100c3c5fc2ffdc004211c7ceb66a54820 opera-9.21-20070510.1-static-qt.i386.freebsd-en.tar.bz2 6548602
+MD5 5a74849836a5cd0315983e5f1e6852a4 opera-9.21-20070510.1-static-qt.ppc-en.tar.bz2 6835553
+RMD160 3ccbe11c534b6301e0bd26d2d95f75707e7eebdb opera-9.21-20070510.1-static-qt.ppc-en.tar.bz2 6835553
+SHA256 cc668082e6c901f6d98f526956ccb5ccc7c5806c98e94345f621086b2c5dfa1a opera-9.21-20070510.1-static-qt.ppc-en.tar.bz2 6835553
+MD5 031f3e4ea5d0e691f8bc4a1631396ffa opera-9.21-20070510.1-static-qt.sparc-en.tar.bz2 6727110
+RMD160 4f46b242089d14000faaa2cade625514db9baea8 opera-9.21-20070510.1-static-qt.sparc-en.tar.bz2 6727110
+SHA256 6bd9ad53d62f72bbd695f6c7b63c198876ddb9c4c2fd799176f58c4cee3a55a1 opera-9.21-20070510.1-static-qt.sparc-en.tar.bz2 6727110
+MD5 adeb325cc356432f79190026b9ff58fe opera-9.21-20070510.4-shared-qt.i386.freebsd-en.tar.bz2 5179430
+RMD160 0782c734c1d31166a94906e38d1a47b5c94a2908 opera-9.21-20070510.4-shared-qt.i386.freebsd-en.tar.bz2 5179430
+SHA256 824429a873bf978c401c0f4d518e96665ee505e77ef9b6eea98689b4e5f1b242 opera-9.21-20070510.4-shared-qt.i386.freebsd-en.tar.bz2 5179430
+MD5 de48ec6a3c2e4804477d1d38982aeb10 opera-9.21-20070510.6-shared-qt.i386-en.tar.bz2 5227934
+RMD160 5dfd040e4baf3415c55b63fe73568807c8776d1d opera-9.21-20070510.6-shared-qt.i386-en.tar.bz2 5227934
+SHA256 9b15fa60bdb3ae31db648031947994826af7e42492d31595cd26f01bea61162d opera-9.21-20070510.6-shared-qt.i386-en.tar.bz2 5227934
diff --git a/www-client/opera/opera-9.21.641.ebuild b/www-client/opera/opera-9.21.641.ebuild
deleted file mode 100644
index 68ec8e137a7e..000000000000
--- a/www-client/opera/opera-9.21.641.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.21.641.ebuild,v 1.2 2007/05/14 03:55:45 jer Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Opera web browser"
-HOMEPAGE="http://www.opera.com/"
-
-SLOT="0"
-LICENSE="OPERA-9.0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-IUSE="qt-static spell gnome"
-RESTRICT="strip mirror"
-
-OPERALNG="en"
-OPERASUFF="641"
-OPERAVER="9.21-20070510"
-
-OPERA_URI="http://snapshot.opera.com/unix/Weekly-${OPERASUFF}/"
-# http://snapshot.opera.com/unix/Weekly-641/intel-linux/opera-9.21-20070510.1-static-qt.i386-en-641.tar.bz2
-# http://snapshot.opera.com/unix/Weekly-641/intel-linux/opera-9.21-20070510.6-shared-qt.i386-en-641.tar.bz2
-SRC_URI="
-	x86? ( qt-static? (
-	${OPERA_URI}intel-linux/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
-	x86? ( !qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
-	amd64? ( qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
-	amd64? ( !qt-static? ( ${OPERA_URI}intel-linux/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
-	sparc? ( ${OPERA_URI}sparc-linux/${PN}-${OPERAVER}.1-static-qt.sparc-${OPERALNG}-${OPERASUFF}.tar.bz2 )
-	ppc? ( ${OPERA_URI}ppc-linux/${PN}-${OPERAVER}.1-static-qt.ppc-${OPERALNG}-${OPERASUFF}.tar.bz2 )
-	x86-fbsd? ( !qt-static? ( ${OPERA_URI}intel-freebsd/${PN}-${OPERAVER}.4-shared-qt.i386.freebsd-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )
-	x86-fbsd? ( qt-static? ( ${OPERA_URI}/intel-freebsd/${PN}-${OPERAVER}.1-static-qt.i386.freebsd-${OPERALNG}-${OPERASUFF}.tar.bz2 ) )"
-
-DEPEND=">=sys-apps/sed-4
-	amd64? ( sys-apps/setarch )"
-
-RDEPEND="|| ( ( x11-libs/libXrandr
-				x11-libs/libXp
-				x11-libs/libXmu
-				x11-libs/libXi
-				x11-libs/libXft
-				x11-libs/libXext
-				x11-libs/libXcursor
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libICE
-			  )
-			  virtual/x11
-			)
-	>=media-libs/fontconfig-2.1.94-r1
-	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
-			 !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
-	!amd64? ( media-libs/libexif
-			  spell? ( app-text/aspell )
-			  x86? ( !qt-static? ( =x11-libs/qt-3* ) )
-			  media-libs/jpeg )"
-
-S=${WORKDIR}/${A/.tar.bz2/}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${PN}-9.21-install.patch"
-
-	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:/opt/gnome/share:${D}/opt/gnome/share: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:' \
-		-e "s:/opt/kde:${D}/usr/kde:" \
-		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
-		install.sh || die "sed failed"
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-
-	# Opera's native installer.
-	if [ ${ARCH} = "amd64" ]; then
-		linux32 ./install.sh --prefix="${D}"/opt/opera || die
-	else
-		./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
-
-	dosed /opt/opera/bin/opera
-	dosed /opt/opera/share/opera/java/opera.policy
-
-	# Install the icons
-	insinto /usr/share/pixmaps
-	doins images/opera.xpm
-	for res in 16x16 22x22 32x32 48x48 ; do
-		insinto /usr/share/icons/hicolor/${res}/apps/
-		newins images/opera_${res}.png opera.png
-	done
-
-	# 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
-
-	# fix plugin path
-	echo "Plugin Path=/opt/opera/lib/opera/plugins" >> ${D}/etc/opera6rc
-
-	# enable spellcheck
-	if use spell; then
-		if use qt-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
-
-	dodir /etc/revdep-rebuild
-	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > ${D}/etc/revdep-rebuild/90opera
-
-	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if [ ${ARCH} = "x86-fbsd" ]; then
-		scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${PN}/ | \
-		while read i; do
-			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
-			then
-				export SANITY_CHECK_LIBZ_FAILED=1
-				break
-			fi
-			sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
-		done
-		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
-	fi
-
-	# symlink to libflash-player.so:
-	dosym /opt/netscape/plugins/libflashplayer.so \
-		/opt/opera/lib/opera/plugins/libflashplayer.so
-}
-
-pkg_postinst() {
-	use gnome && gnome2_pkg_postinst
-
-	elog "For localized language files take a look at:"
-	elog " http://www.opera.com/download/languagefiles/index.dml"
-	elog
-	elog "To change the spellcheck language edit"
-	elog " /opt/opera/share/opera/ini/spellcheck.ini"
-	elog "and emerge app-dicts/aspell-language."
-	elog
-	elog "If you would like to watch videos on websites like YouTube, you will"
-	elog "need to edit \$HOME/.opera/pluginpath.ini and set:"
-	elog " /opt/netscape/plugins=2"
-}
-
-
-pkg_postrm() {
-	use gnome && gnome2_pkg_postrm
-}
diff --git a/www-client/opera/opera-9.20-r1.ebuild b/www-client/opera/opera-9.21.ebuild
index 113f8f5fbbd1..f007f2f70626 100644
--- a/www-client/opera/opera-9.20-r1.ebuild
+++ b/www-client/opera/opera-9.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.20-r1.ebuild,v 1.3 2007/05/14 03:55:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.21.ebuild,v 1.1 2007/05/21 19:04:48 jer Exp $
 
 inherit eutils gnome2
 
@@ -15,9 +15,9 @@ IUSE="qt-static spell gnome"
 RESTRICT="strip mirror"
 
 OPERALNG="en"
-OPERASUFF="638"
-OPERAVER="9.20-20070409"
-OPERAFTP="920/final/${OPERALNG}"
+OPERASUFF="641"
+OPERAVER="9.21-20070510"
+OPERAFTP="921/final/${OPERALNG}"
 
 OPERA_URI="mirror://opera/"
 SRC_URI="
@@ -52,7 +52,9 @@ RDEPEND="|| ( ( x11-libs/libXrandr
 	!amd64? ( media-libs/libexif
 			  spell? ( app-text/aspell )
 			  x86? ( !qt-static? ( =x11-libs/qt-3* ) )
-			  media-libs/jpeg )"
+			  media-libs/jpeg )
+	x86-fbsd? ( =virtual/libstdc++-3*
+	            !qt-static? ( =x11-libs/qt-3* ) )"
 
 S=${WORKDIR}/${A/.tar.bz2/}-${OPERASUFF}
 
@@ -84,7 +86,7 @@ src_install() {
 	dodir /etc
 
 	# Opera's native installer.
-	if [ ${ARCH} = "amd64" ]; then
+	if use amd64; then
 		linux32 ./install.sh --prefix="${D}"/opt/opera || die
 	else
 		./install.sh --prefix="${D}"/opt/opera || die
@@ -129,7 +131,7 @@ src_install() {
 	echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > ${D}/etc/revdep-rebuild/90opera
 
 	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
-	if [ ${ARCH} = "x86-fbsd" ]; then
+	if use x86-fbsd; then
 		scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${PN}/ | \
 		while read i; do
 			if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
@@ -157,9 +159,16 @@ pkg_postinst() {
 	elog " /opt/opera/share/opera/ini/spellcheck.ini"
 	elog "and emerge app-dicts/aspell-language."
 	elog
-	elog "If you would like to watch videos on websites like YouTube, you will"
-	elog "need to edit \$HOME/.opera/pluginpath.ini and set:"
+	elog "If you want to watch videos on websites like YouTube,"
+	elog "you will need to emerge net-www/netscape-flash,"
+	elog "then edit \$HOME/.opera/pluginpath.ini and set:"
 	elog " /opt/netscape/plugins=2"
+
+	if use x86-fbsd; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "	sysctl kern.ipc.shm_allow_removed=1"
+	fi
 }