Revision bump. Match *-fbsd´s SRC_URI to other arches, fix bug #127200 with a symlink and an elog hint.

Package-Manager: portage-2.1.2.2

4 files changed, 203 insertions, 15 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 12308f20664f..08478a3a2fb8 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # 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.86 2007/04/12 06:49:39 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.87 2007/05/13 23:46:40 jer Exp $
+
+*opera-9.20-r1 (13 May 2007)
+
+  13 May 2007; Jeroen Roovers <jer@gentoo.org> +opera-9.20-r1.ebuild:
+  Revision bump. Match *-fbsd´s SRC_URI to other arches, fix bug #127200 with
+  a symlink and an elog hint.
 
   12 Apr 2007; Christian Faulhammer <opfer@gentoo.org> opera-9.20.ebuild:
   stable x86, security bug 168484
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index c5cbc23c422a..43fd2aba2bb7 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX opera-9.00-install.patch 317 RMD160 381f253152d6ce3f019da0971653428ad88b4eac SHA1 fd57a5779fdaee45796d6344efb13345fe6c1bd9 SHA256 585eb976e2115e0ee61a9abb6afb0e3c5927fcc7f9a658dadc77039c3703a6ba
 MD5 1dbb259147aa81cd5ff38c2d63ead18b files/opera-9.00-install.patch 317
 RMD160 381f253152d6ce3f019da0971653428ad88b4eac files/opera-9.00-install.patch 317
@@ -29,14 +26,18 @@ EBUILD opera-9.10.ebuild 5040 RMD160 093ef12ef1b52f5866b7b1be9b34eb9c2102448b SH
 MD5 e2e73cc0b2f13e2938a948d54439b57b opera-9.10.ebuild 5040
 RMD160 093ef12ef1b52f5866b7b1be9b34eb9c2102448b opera-9.10.ebuild 5040
 SHA256 5b0ebd67ac24e765eec5d0b2ead87a7baf76b3f371a6fe3778830bedaaf239e9 opera-9.10.ebuild 5040
+EBUILD opera-9.20-r1.ebuild 5429 RMD160 386031fef81f5c5bafa10ddf6332bb0e4c0d7969 SHA1 7cb16959ede7e58b3070b13d373cd53c6e7bc96d SHA256 7058fe7aa6ef408af24c4f964535d0057a88f0b7d12e31f8d221d934397816d1
+MD5 3c7a3b53354a193aca14fff55ef6fbdd opera-9.20-r1.ebuild 5429
+RMD160 386031fef81f5c5bafa10ddf6332bb0e4c0d7969 opera-9.20-r1.ebuild 5429
+SHA256 7058fe7aa6ef408af24c4f964535d0057a88f0b7d12e31f8d221d934397816d1 opera-9.20-r1.ebuild 5429
 EBUILD opera-9.20.ebuild 5042 RMD160 a0320f8df5c1172ff8fca46533e75a980c209f9d SHA1 ba28e360f0221ae4b6cb615496b2473dc0dbde62 SHA256 eb5bfcaebcc64b886dcff89bed59068f591f9f34f466274afc2b9fde99b284b5
 MD5 275fab7286abb5638df83a2abe83ee20 opera-9.20.ebuild 5042
 RMD160 a0320f8df5c1172ff8fca46533e75a980c209f9d opera-9.20.ebuild 5042
 SHA256 eb5bfcaebcc64b886dcff89bed59068f591f9f34f466274afc2b9fde99b284b5 opera-9.20.ebuild 5042
-MISC ChangeLog 25551 RMD160 1d1ca5aac911b97d6bd11a726a27829bcb0f4b0e SHA1 7bcde078027bcd31a9da123bdba92d2b0a825692 SHA256 8462feae7199ef6c5327d514387b30dedade68087f4a4597fadaefa93a162275
-MD5 6b424f158955b8cb1cf4a2ded511dc1c ChangeLog 25551
-RMD160 1d1ca5aac911b97d6bd11a726a27829bcb0f4b0e ChangeLog 25551
-SHA256 8462feae7199ef6c5327d514387b30dedade68087f4a4597fadaefa93a162275 ChangeLog 25551
+MISC ChangeLog 25759 RMD160 070e671cca2292ef12ccac028978ce2a6ab7549c SHA1 944a5e475e264b7149d8118e538ed533f93df8b5 SHA256 d73e878600b33627aca446a149c514f4c6e231f06a5c35aa7f27bd420d12e8bc
+MD5 4c6e8440489e06a1cd901ed0a44e1044 ChangeLog 25759
+RMD160 070e671cca2292ef12ccac028978ce2a6ab7549c ChangeLog 25759
+SHA256 d73e878600b33627aca446a149c514f4c6e231f06a5c35aa7f27bd420d12e8bc ChangeLog 25759
 MISC metadata.xml 314 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca SHA1 e8c243cb101fa6394ab03e798b26a9236416c778 SHA256 d2bd8cedc8024568ce3ed94a8fc2f973c7e713990aac862e03cdded86d57beb8
 MD5 dbaecd1106290cdb2646380dd226c9e8 metadata.xml 314
 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca metadata.xml 314
@@ -47,10 +48,6 @@ SHA256 aa4af149ddf2a7d58c7089756e5616687cde714c6fadc0b4c3572da5de3289c9 files/di
 MD5 f2f96e9fb4cbf8d8fb5ada1b447238d2 files/digest-opera-9.20 1998
 RMD160 a5ee69aa49105718ccbaba3a73e2166a16f7db9c files/digest-opera-9.20 1998
 SHA256 80936f89483d2f8dff6cf50325712076ba40645fd637a6a1e1686ae99fdf4fa8 files/digest-opera-9.20 1998
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGHdaUNQqtfCuFneMRAvOgAJwIp5uUk3/P1EXpwTwhg3TwO0dWpQCeKiEQ
-835sqKLOKSnWwV52QWl6mMQ=
-=Wr4y
------END PGP SIGNATURE-----
+MD5 f2f96e9fb4cbf8d8fb5ada1b447238d2 files/digest-opera-9.20-r1 1998
+RMD160 a5ee69aa49105718ccbaba3a73e2166a16f7db9c files/digest-opera-9.20-r1 1998
+SHA256 80936f89483d2f8dff6cf50325712076ba40645fd637a6a1e1686ae99fdf4fa8 files/digest-opera-9.20-r1 1998
diff --git a/www-client/opera/files/digest-opera-9.20-r1 b/www-client/opera/files/digest-opera-9.20-r1
new file mode 100644
index 000000000000..499f0e89936a
--- /dev/null
+++ b/www-client/opera/files/digest-opera-9.20-r1
@@ -0,0 +1,18 @@
+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/opera-9.20-r1.ebuild b/www-client/opera/opera-9.20-r1.ebuild
new file mode 100644
index 000000000000..01df908cc140
--- /dev/null
+++ b/www-client/opera/opera-9.20-r1.ebuild
@@ -0,0 +1,167 @@
+# 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.1 2007/05/13 23:46:40 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="638"
+OPERAVER="9.20-20070409"
+OPERAFTP="920/final/${OPERALNG}"
+
+OPERA_URI="mirror://opera/"
+SRC_URI="
+	x86? ( qt-static? ( ${OPERA_URI}linux/${OPERAFTP}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}.tar.bz2 ) )
+	x86? ( !qt-static? ( ${OPERA_URI}linux/${OPERAFTP}/i386/shared/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}.tar.bz2 ) )
+	amd64? ( qt-static? ( ${OPERA_URI}linux/${OPERAFTP}/i386/static/${PN}-${OPERAVER}.1-static-qt.i386-${OPERALNG}.tar.bz2 ) )
+	amd64? ( !qt-static? ( ${OPERA_URI}linux/${OPERAFTP}/i386/shared/${PN}-${OPERAVER}.6-shared-qt.i386-${OPERALNG}.tar.bz2 ) )
+	sparc? ( ${OPERA_URI}linux/${OPERAFTP}/sparc/static/${PN}-${OPERAVER}.1-static-qt.sparc-${OPERALNG}.tar.bz2 )
+	ppc? ( ${OPERA_URI}linux/${OPERAFTP}/ppc/static/${PN}-${OPERAVER}.1-static-qt.ppc-${OPERALNG}.tar.bz2 )
+	x86-fbsd? ( !qt-static? ( ${OPERA_URI}unix/freebsd/${OPERAFTP}/shared/${PN}-${OPERAVER}.4-shared-qt.i386.freebsd-${OPERALNG}.tar.bz2 ) )
+	x86-fbsd? ( qt-static? ( ${OPERA_URI}unix/freebsd/${OPERAFTP}/static/${PN}-${OPERAVER}.1-static-qt.i386.freebsd-${OPERALNG}.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/}-${OPERASUFF}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${PN}-9.00-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
+}
+
+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?platform=linux"
+	elog
+	elog "To change the spellcheck language edit /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
+}