Version bump <http://my.opera.com/desktopteam/blog/2009/05/08/skin-debugging-and-more>. Move epatch to src_prepare(). Move opera_cd() into src_unpack() and set S only when not set to a valid directory.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 246 insertions, 13 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index b06438ec706b..f0e1dff684e1 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.338 2009/04/10 13:26:17 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.339 2009/05/08 21:03:51 jer Exp $
+
+  08 May 2009; Jeroen Roovers <jer@gentoo.org> ChangeLog:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2009/05/08/skin-debugging-and-more>.
+  Move epatch to src_prepare(). Move opera_cd() into src_unpack() and set S
+  only when not set to a valid directory.
 
   10 Apr 2009; Ulrich Mueller <ulm@gentoo.org> opera-9.64.ebuild,
   opera-10.00_pre4205.ebuild, opera-10.00_pre4214.ebuild,
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e05e13c82f33..42217e6dda3a 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX opera-10.00-pluginpath-fbsd.patch 341 RMD160 735a872421680b1468e2694f9ed41a56d0f23f60 SHA1 41ba2709c1fa585491221f924b3cd000768cd7c2 SHA256 0af425e1845617d7a5f23b1a991c7d306ea2b62b548a2201aa6f0b0ad060d023
 AUX opera-10.00-pluginpath.patch 439 RMD160 9fc1bcb8430d185d040a811c2714077eaad159af SHA1 37a6b63d4d1d34e8f43f6ba838d09ceec6cfd607 SHA256 b34e438bab40599b70a7dfd4946a82e718fb46de0384062b41c51db5a047db4c
 AUX opera-9.00-install.patch 320 RMD160 2bc2e345193c007d10db4b39335e7695cd85e4ba SHA1 aff6a31af75ffe1b073059ae5b89d3416daac384 SHA256 c0415f9832624b0f4527b4707f01f1bf069bc9cb63c25fc180218c5543471ed2
@@ -24,6 +21,11 @@ DIST opera-10.00-4214.gcc4-shared-qt3.x86_64.tar.bz2 8645763 RMD160 aaaee3f10a77
 DIST opera-10.00-4268.gcc4-shared-qt3.i386.tar.bz2 7948661 RMD160 0ed905a2e4e471332e116b5a8d0fbe313fcf14e9 SHA1 41a3104deeb296e33c10d66167331039fb5c8044 SHA256 e26c84eb2a6580a3afe3d29b1e6a5236cb61ca99bcdc790befc10d75d134a4e5
 DIST opera-10.00-4268.gcc4-shared-qt3.x86_64.tar.bz2 8606394 RMD160 a2f7f7dcbbea12340fc1e6021c51b9ca65776491 SHA1 507d9c879b88094fcb88b67b1759cb2fa04c4bb9 SHA256 5096dae208cfe494b4058bceb359d4295f52f3bea93b1cd352de665d6fd0a5ae
 DIST opera-10.00-4268.gcc4-static-qt3.i386.tar.bz2 9877121 RMD160 52d6cae17128be2a05d5e6aff5b07cbae4d6967a SHA1 cc55ea54870dfcb6a5a606ad2781c47e78eec469 SHA256 ab7e9062bd694e0ceddeaa2a2c5a8aa04f10ad2996e8d5842bd20c5a1c762d36
+DIST opera-10.00-4340.gcc4-qt4.i386.tar.bz2 7877668 RMD160 a07da1c22841c2a6ae713939e03ccb8212c55eba SHA1 38cbf8d74b8de4f63fe5d065bc4af0bdbc6e7b99 SHA256 8e7892d478f704fa9b0e8a8b674cae0baac8e0b4beb8aaa3f4bd7469a84d7cc6
+DIST opera-10.00-4340.gcc4-shared-qt3.i386.tar.bz2 7913506 RMD160 a895b130053c183384171729c8b567a315d1f874 SHA1 ec144ce36386b4e8303fc9ce1d83d9cc2b1aa618 SHA256 6616583b9b993bf53c27e82f8e6da167fc900f155493ff8604dad05055127b73
+DIST opera-10.00-4340.gcc4-shared-qt3.ppc.tar.bz2 7990321 RMD160 b95dbe15ca92d453f5a40ece33289b77cbd8fe85 SHA1 39ffbe986ef27e5ef429db14bdf85c4671376714 SHA256 927c162470d321b87492da8e476889070d302822de7ce1f1ea381916e26f588d
+DIST opera-10.00-4340.gcc4-shared-qt3.x86_64.tar.bz2 8572030 RMD160 e265750459cc82c70846d9326e8ab2f375ad4a9a SHA1 31b711b320a7ca6819c8a1146675e3d7c82f788e SHA256 2168956c673e546341af3d2a2518db8b2cf700b4f892efc8c744656ccccec5bf
+DIST opera-10.00-4340.gcc4-static-qt3.i386.tar.bz2 9812566 RMD160 56fb3ab9ec33ea2a8ad28bbc420026bcc031425c SHA1 e339bd6691e2a5bab8db2e566c3e523cfd7658b8 SHA256 62a8ccc2b0ddcd2627ab6a5ff1347d6b40f0042f54d73368021db6d74fb4ff8d
 DIST opera-9.27-20080331.1-static-qt.i386-en.tar.bz2 6813669 RMD160 353adab3fa9a401720264738ea7494c184b0df2e SHA1 4fee1c05b31be9e11fbe78c127809c3f550b775a SHA256 3f76e709ee4896abb8aa5dfc5ce7c1b75f476faf947c1f6bb8b125d0726bc031
 DIST opera-9.27-20080331.1-static-qt.i386.freebsd-en.tar.bz2 6561843 RMD160 14264eb3e249e4c23625f9a8d521a84d382077fd SHA1 8853366a874cb18a6eff86b7ce5c63923984e0a3 SHA256 ac695d429e859f2764d4c3d80798b0bcce9a8670c83ebe61ef568d197bd61aab
 DIST opera-9.27-20080331.1-static-qt.ppc-en.tar.bz2 6860940 RMD160 5e109dabb20cc8d7afc6a2ef96e274f5e4eb973c SHA1 3a6e8d565ed3a2d0373be3e36324818a7e54fedb SHA256 f3dff4eae0092a55868aa778aa14000407a13e7909f0e493c1a38c58c2bdc56d
@@ -39,14 +41,8 @@ DIST opera-9.64.gcc4-static-qt3.i386.tar.bz2 9273212 RMD160 338c780de3d9495d3c27
 EBUILD opera-10.00_pre4205.ebuild 6647 RMD160 8041ded846e0a6ad04350668a17e165267515701 SHA1 35877dd325a1663d5b75855406dc6522031c0f49 SHA256 18a15d439505105e737ff474907c2ac488b6622f4968ca6d358478079b28680f
 EBUILD opera-10.00_pre4214.ebuild 6385 RMD160 6871d5e3eb5f559d28a48743a4770958dec437d7 SHA1 614d319363fe4c9c93f3e2d660f3cbed79fc6efa SHA256 b16cc3a54c54aad5133a4c40cba2525764861989e043522b720b992f6705a2a0
 EBUILD opera-10.00_pre4268.ebuild 5714 RMD160 55f3c73d2f0b2a97d544183b43bb3039b2deb2ff SHA1 56ebcde99ba5fc35052374635d1eb5f55d3e9fe6 SHA256 3b27af71bb258d21e9442c33ffcfe5c15349cacb23d836a8258831618addc914
+EBUILD opera-10.00_pre4340.ebuild 6456 RMD160 a5c4eb4e959c911e67838a1301b17ce78f0cdd6e SHA1 34b148933641ec7e0fc82276a440f858111e34a9 SHA256 6c85bb3144ef4d8a529d01f0aa667be1886e3f716a12234cea2b0b28755fd1d7
 EBUILD opera-9.27.ebuild 6053 RMD160 fa86d79c0a1beae6d3605467122c2a5451b21bff SHA1 32d8ea747f757e99ce0af0c456c4aed71a660689 SHA256 4b0d2bb5bbbdc1eb4cee89f717d6bdc556337fb4d7e7973c216292d1f4cd8fee
 EBUILD opera-9.64.ebuild 7899 RMD160 659e91541f7129ded02382285b9c6e59f106c086 SHA1 d0923a74fd110c13f3f3e4e65fce8b925ccde3af SHA256 b6218cd63a7c485009c83108147f4b925629c2e04254eae0619f305982fcb655
-MISC ChangeLog 65713 RMD160 a9b9cc30694998ab63bfeb660c4e87af86876305 SHA1 f5069e90a50a3779a8d84b8c6c9830978caac40d SHA256 92c9463d2f574c9cebb0fcb29d046c4242c2b77c03329add41df37767ccbd354
+MISC ChangeLog 65982 RMD160 8173aeede33d0689b644780b059ab9419200c151 SHA1 55a3878cf7662d37eaeb45d3dc1df5c59f381d1a SHA256 4505d4cda005cac2b6e45b49ae20e5dd7d3b4047d35de4df9813ff46a3b80332
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAknfSVEACgkQOeoy/oIi7uw0vQCgtwq2q5pxeRrq7bzJHKqGHRS9
-lDgAoJSoqOckE/aKRuzB6lylU6RESUqI
-=RF0k
------END PGP SIGNATURE-----
diff --git a/www-client/opera/opera-10.00_pre4340.ebuild b/www-client/opera/opera-10.00_pre4340.ebuild
new file mode 100644
index 000000000000..7f6cb6fff553
--- /dev/null
+++ b/www-client/opera/opera-10.00_pre4340.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.00_pre4340.ebuild,v 1.1 2009/05/08 21:03:51 jer Exp $
+
+EAPI="2"
+
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="A standards-compliant graphical Web browser"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-9.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RESTRICT="mirror strip test"
+
+IUSE="elibc_FreeBSD gnome ia32 qt-static qt3"
+MY_LINGUAS="be bg cs da de el en en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ru sv ta te tr uk zh-CN zh-TW"
+
+for MY_LINGUA in ${MY_LINGUAS}; do
+	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+done
+
+O_U="http://snapshot.opera.com/unix/snapshot-${P##*_pre}/"
+O_P="${P/_pre/-}"
+
+SRC_URI="
+	qt-static? (
+		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
+		x86? (
+			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+			)
+		amd64? (
+			ia32? (
+				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+			)
+			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+		)
+	)
+	!qt-static? (
+		ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
+		x86? (
+			qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+			!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+		)
+		amd64? (
+			ia32? (
+				qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+				!qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
+			)
+			!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+		)
+	)
+	"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="
+	media-libs/jpeg
+	media-libs/libexif
+	>=media-libs/fontconfig-2.1.94-r1
+	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
+	x86? (
+		qt-static? (
+			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+		)
+		!qt-static? (
+			qt3? ( =x11-libs/qt-3*[-immqt] )
+			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+		)
+	)
+	ppc? ( =x11-libs/qt-3*[-immqt] )
+	amd64? (
+		ia32? (
+			qt-static? (
+				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+			)
+			!qt-static? ( =x11-libs/qt-3*[-immqt] )
+		)
+		!ia32? ( =x11-libs/qt-3*[-immqt] )
+	)
+	"
+
+opera_linguas() {
+	# Remove unwanted LINGUAS:
+	local LINGUA
+	local LNGDIR="${D}/opt/opera/share/opera/locale"
+	einfo "Keeping these locales: ${LINGUAS}."
+	for LINGUA in ${MY_LINGUAS}; do
+		if ! use linguas_${LINGUA/-/_}; then
+			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+			rm -r "${LINGUA}"
+		fi
+	done
+}
+
+src_unpack() {
+	unpack ${A}
+	if [[ ! -d ${S} ]]; then
+		cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
+		S="$(pwd)"
+		einfo "Setting WORKDIR to ${S}"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-simplify-desktop.patch"
+	epatch "${FILESDIR}/${PN}-freedesktop.patch"
+
+	# bug #181300:
+	if use elibc_FreeBSD; then
+		epatch "${FILESDIR}/${PN}-10.00-pluginpath-fbsd.patch"
+	else
+		epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
+	fi
+
+	sed -i 	-e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
+		-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
+		-e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
+		-e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
+		install.sh || die "sed failed"
+}
+
+src_configure() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a configure script exists.
+	true
+}
+
+src_compile() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a Makefile exists.
+	true
+}
+
+src_install() {
+	# Prepare installation directories for Opera's installer script.
+	dodir /etc
+
+	# Opera's native installer.
+	./install.sh --prefix="${D}"/opt/opera || die "install.sh failed"
+
+	einfo "It is safe to ignore warnings about failed checksums"
+	einfo "and about files that would be ignored ..."
+	einfo "Completing the installation where install.sh abandoned us ..."
+
+	# 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
+
+	# Adapt desktop file to Gnome when needed
+	use gnome && sed -i -e s:"GenericName\[":"Comment\[": "${D}"/usr/share/applications/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
+
+	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 elibc_FreeBSD; 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
+
+	# Add the Opera man dir to MANPATH:
+	insinto /etc/env.d
+	echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
+
+	[[ -z MY_LINGUAS ]] || opera_linguas
+}
+
+pkg_postinst() {
+	use gnome && gnome2_pkg_postinst
+
+	elog "To change the UI language, choose [Tools] -> [Preferences], open the"
+	elog "[General] tab, click on [Details...] then [Choose...] and point the"
+	elog "file chooser at /opt/opera/share/opera/locale/, then enter the"
+	elog "directory for the language you want and [Open] the .lng file."
+
+	elog
+	elog "To use the spellchecker (USE=spell) for languages other than English, do:"
+	elog " emerge app-dicts/myspell-[your language]"
+	elog " mkdir \${HOME}/.opera/dictionaries"
+	elog " cd \${HOME}/.opera/dictionaries"
+	elog " ln -s /usr/share/myspell/*.{aff,dic} ."
+	elog "A future release of Opera 10 should remedy this inconvenience."
+
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+
+	elog
+	elog "The current Opera builds may still have issues with plugins, notably"
+	elog "www-plugins/adobe-flash. See also https://bugs.gentoo.org/198162"
+}
+
+pkg_postrm() {
+	use gnome && gnome2_pkg_postrm
+}