Revision bump to apply a patch that extends the default site wide plugin paths (bug #181300).

Package-Manager: portage-2.1.2.9

5 files changed, 234 insertions, 5 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 39a1c9ab997f..faeaacfcd3ec 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.100 2007/06/27 15:40:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.101 2007/07/07 17:52:33 jer Exp $
+
+*opera-9.21-r1 (07 Jul 2007)
+
+  07 Jul 2007; Jeroen Roovers <jer@gentoo.org>
+  +files/opera-9.21-pluginpath.patch, +opera-9.21-r1.ebuild:
+  Revision bump to apply a patch that extends the default site wide plugin
+  paths (bug #181300).
 
   27 Jun 2007; Jeroen Roovers <jer@gentoo.org> -opera-9.20.ebuild:
   Removing old version.
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e283b59969fe..52110018577c 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -6,6 +6,10 @@ AUX opera-9.21-install.patch 315 RMD160 ae2cfd44bbe7c04533e51b8e7c93d6bacca62252
 MD5 64a31dfc938982bf361a48bc85d9ee88 files/opera-9.21-install.patch 315
 RMD160 ae2cfd44bbe7c04533e51b8e7c93d6bacca62252 files/opera-9.21-install.patch 315
 SHA256 1531f1eb1e678398c4fdd8a6a249dfdc25b564ed2b72bc5174d71757d365b948 files/opera-9.21-install.patch 315
+AUX opera-9.21-pluginpath.patch 362 RMD160 73385b13479a9b36f4ca32f4d7f3d100652f36f8 SHA1 38dd4eb94267a98ab5d24d8f05d460ff7798b3c7 SHA256 790d1657a4fd760af4b896abcf30aec86b61b3ca52e5e7bf3438870761dbf7a9
+MD5 368d2f60b85ce3bcf96ace4b943d020e files/opera-9.21-pluginpath.patch 362
+RMD160 73385b13479a9b36f4ca32f4d7f3d100652f36f8 files/opera-9.21-pluginpath.patch 362
+SHA256 790d1657a4fd760af4b896abcf30aec86b61b3ca52e5e7bf3438870761dbf7a9 files/opera-9.21-pluginpath.patch 362
 AUX opera.desktop 203 RMD160 9b20ec9dc2881d952c3a7faa3df0f05c576045ff SHA1 64192ee66aef471cb013bcd736bda73e41407ebb SHA256 e4f0514e81cfeca34c0dbab093a4d9b9d4aca2623fd7ae48a59fc16a05722675
 MD5 53f0b96c563a81120a763b72d43ca796 files/opera.desktop 203
 RMD160 9b20ec9dc2881d952c3a7faa3df0f05c576045ff files/opera.desktop 203
@@ -16,14 +20,18 @@ DIST opera-9.21-20070510.1-static-qt.ppc-en.tar.bz2 6835553 RMD160 3ccbe11c534b6
 DIST opera-9.21-20070510.1-static-qt.sparc-en.tar.bz2 6727110 RMD160 4f46b242089d14000faaa2cade625514db9baea8 SHA1 02aeabc40840534c30283450535a90312b25eb51 SHA256 6bd9ad53d62f72bbd695f6c7b63c198876ddb9c4c2fd799176f58c4cee3a55a1
 DIST opera-9.21-20070510.4-shared-qt.i386.freebsd-en.tar.bz2 5179430 RMD160 0782c734c1d31166a94906e38d1a47b5c94a2908 SHA1 014c13098b061be853245077b6c08be2966328de SHA256 824429a873bf978c401c0f4d518e96665ee505e77ef9b6eea98689b4e5f1b242
 DIST opera-9.21-20070510.6-shared-qt.i386-en.tar.bz2 5227934 RMD160 5dfd040e4baf3415c55b63fe73568807c8776d1d SHA1 9a9fc5767705f39a93efcd3e7f1e9c85a1a914cc SHA256 9b15fa60bdb3ae31db648031947994826af7e42492d31595cd26f01bea61162d
+EBUILD opera-9.21-r1.ebuild 5711 RMD160 e3d5e57d0ade474284732d937e4635486643bf7a SHA1 6076a88b878b4d2a7f941ceeb9e52b901d284242 SHA256 6c96504d2b843dc6144ad9b67cf6a668a41879c78aaae5e14fec6086b9b3212d
+MD5 46844a1ecbe7d12ee29b47669631e225 opera-9.21-r1.ebuild 5711
+RMD160 e3d5e57d0ade474284732d937e4635486643bf7a opera-9.21-r1.ebuild 5711
+SHA256 6c96504d2b843dc6144ad9b67cf6a668a41879c78aaae5e14fec6086b9b3212d opera-9.21-r1.ebuild 5711
 EBUILD opera-9.21.ebuild 5661 RMD160 d2366882ab24dbb2e1be1fc1d28f3388e8bebb14 SHA1 d517c19ebe001e11941ddda0edae0422635aeab3 SHA256 c4ef58681bf373874c194cfc16961db7d314b224939be7b73e721382064c4e7b
 MD5 1b7a6ad4f142394bb5bb84aea999c849 opera-9.21.ebuild 5661
 RMD160 d2366882ab24dbb2e1be1fc1d28f3388e8bebb14 opera-9.21.ebuild 5661
 SHA256 c4ef58681bf373874c194cfc16961db7d314b224939be7b73e721382064c4e7b opera-9.21.ebuild 5661
-MISC ChangeLog 27601 RMD160 317c7c52e5770465588bae6f4931078215472c8f SHA1 abc859cb832a81a4c368c65f94cc6c4df252e9d2 SHA256 c1b1338fb13d2b6f009f9c987f2742342b4c41d76365905d64255b94b0830495
-MD5 c830bbf08c61501b3688fee29bc47ffc ChangeLog 27601
-RMD160 317c7c52e5770465588bae6f4931078215472c8f ChangeLog 27601
-SHA256 c1b1338fb13d2b6f009f9c987f2742342b4c41d76365905d64255b94b0830495 ChangeLog 27601
+MISC ChangeLog 27838 RMD160 b2252ff30daea53fb9c07c6a294050b9f9a10d6e SHA1 ea3519d1cf1ebbd72fb55b0b68428bbb76647195 SHA256 9ea1c36a833e252d42c92e7c5145911faca5b7c41226efa58ee50ea7bb42fdb3
+MD5 6c43fd895a91fa9b5c49f3b62aa708c5 ChangeLog 27838
+RMD160 b2252ff30daea53fb9c07c6a294050b9f9a10d6e ChangeLog 27838
+SHA256 9ea1c36a833e252d42c92e7c5145911faca5b7c41226efa58ee50ea7bb42fdb3 ChangeLog 27838
 MISC metadata.xml 314 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca SHA1 e8c243cb101fa6394ab03e798b26a9236416c778 SHA256 d2bd8cedc8024568ce3ed94a8fc2f973c7e713990aac862e03cdded86d57beb8
 MD5 dbaecd1106290cdb2646380dd226c9e8 metadata.xml 314
 RMD160 a8ac5ef4c09e8e84b23eda16e27c5c9ff94be3ca metadata.xml 314
@@ -31,3 +39,6 @@ SHA256 d2bd8cedc8024568ce3ed94a8fc2f973c7e713990aac862e03cdded86d57beb8 metadata
 MD5 b0cd126d493e76e297f4a89c3ceb2fff files/digest-opera-9.21 1998
 RMD160 5b776b2f5946bcc0c30866db9776dc3b6bdab99b files/digest-opera-9.21 1998
 SHA256 73e201315fa5357161151022ec2f98af26862f3b03be08e4aa18bf413033b9f6 files/digest-opera-9.21 1998
+MD5 b0cd126d493e76e297f4a89c3ceb2fff files/digest-opera-9.21-r1 1998
+RMD160 5b776b2f5946bcc0c30866db9776dc3b6bdab99b files/digest-opera-9.21-r1 1998
+SHA256 73e201315fa5357161151022ec2f98af26862f3b03be08e4aa18bf413033b9f6 files/digest-opera-9.21-r1 1998
diff --git a/www-client/opera/files/digest-opera-9.21-r1 b/www-client/opera/files/digest-opera-9.21-r1
new file mode 100644
index 000000000000..93cca4b6f7c0
--- /dev/null
+++ b/www-client/opera/files/digest-opera-9.21-r1
@@ -0,0 +1,18 @@
+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/files/opera-9.21-pluginpath.patch b/www-client/opera/files/opera-9.21-pluginpath.patch
new file mode 100644
index 000000000000..eda1422a4dc5
--- /dev/null
+++ b/www-client/opera/files/opera-9.21-pluginpath.patch
@@ -0,0 +1,12 @@
+Should fix bug 181300 - JeR
+
+--- ini/pluginpath.ini.	2007-07-06 21:42:16.000000000 +0200
++++ ini/pluginpath.ini	2007-07-06 21:43:22.000000000 +0200
+@@ -49,6 +49,7 @@
+ ; Netscape Plug-in Paths
+ $HOME/.netscape6/plugins=1
+ $HOME/.netscape/plugins=1
++/usr/lib/nsbrowser/plugins=1
+ /opt/netscape/plugins=1
+ /usr/lib/netscape/plugins=1
+ /usr/local/netscape/plugins=1
diff --git a/www-client/opera/opera-9.21-r1.ebuild b/www-client/opera/opera-9.21-r1.ebuild
new file mode 100644
index 000000000000..6d188e9b7b32
--- /dev/null
+++ b/www-client/opera/opera-9.21-r1.ebuild
@@ -0,0 +1,181 @@
+# 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-r1.ebuild,v 1.1 2007/07/07 17:52:33 jer Exp $
+
+GCONF_DEBUG="no"
+
+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"
+OPERAFTP="921/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 )
+	x86-fbsd? ( =virtual/libstdc++-3*
+	            !qt-static? ( =x11-libs/qt-3* ) )"
+
+S=${WORKDIR}/${A/.tar.bz2/}-${OPERASUFF}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${PN}-9.00-install.patch"
+	epatch "${FILESDIR}/${P}-pluginpath.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 use 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 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 ]];
+			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 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
+}
+
+
+pkg_postrm() {
+	use gnome && gnome2_pkg_postrm
+}