Version bump <http://my.opera.com/desktopteam/blog/2009/09/10/moar-bilds>.

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

3 files changed, 256 insertions, 12 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 99e7bfdcad7d..69b91a90cdf3 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.388 2009/09/08 08:37:37 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.389 2009/09/10 15:17:35 jer Exp $
+
+*opera-10.10_pre4609 (10 Sep 2009)
+
+  10 Sep 2009; Jeroen Roovers <jer@gentoo.org> +opera-10.10_pre4609.ebuild:
+  Version bump <http://my.opera.com/desktopteam/blog/2009/09/10/moar-bilds>.
 
   08 Sep 2009; Christian Faulhammer <fauli@gentoo.org> opera-10.00.ebuild:
   stable x86, security bug 283391
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 309465dd7bc8..98c6c5cf0725 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.21-pluginpath.patch 387 RMD160 009157fd0f3e32e3409dd3fdd3be3c03bd90eb1e SHA1 0533c681e26f2521c38a93e3c731ffe42cd1f54d SHA256 4fc3ae28d7d105bd45c30a45696222cd2bfa9e49bd32c2e7cb8073dd59b2da19
@@ -56,6 +53,14 @@ DIST opera-10.10-4594.gcc4-qt4.i386.tar.bz2 10194993 RMD160 6301ee6b0c162de8e3fe
 DIST opera-10.10-4594.gcc4-qt4.x86_64.tar.bz2 10928038 RMD160 2c3d8c774459968c434804b8c15e14e3146dfc25 SHA1 3028abc660db44c920e161c1d8ecdbccc7ebb7a4 SHA256 d9c6aced09cef3f0c6dbd6e2de46a50b9f51d5de4af29d086836deb5afed8bcd
 DIST opera-10.10-4594.gcc4-shared-qt3.i386.tar.bz2 10115711 RMD160 fd9edfa3588778dcbc95c9927281de1cfc3e3e77 SHA1 2484bbf27815d6b4a30320bf30b0a4b9b32c7280 SHA256 20b5ebcaf129ed4c3fecf668da10cbc0f424d913ad71eea34e824b5f6f72a948
 DIST opera-10.10-4594.gcc4-shared-qt3.x86_64.tar.bz2 10925351 RMD160 85400a272e49b1e6a57dbf65eb6c9db63ceefbed SHA1 0f878ea8edd6a5d24c5cdbffa2e2887d423c8b45 SHA256 5a3ccb363d700b58e328756116457176a171ac2321bbf353080b3f4071d3bd86
+DIST opera-10.10-4609.freebsd6-shared-qt3.i386.tar.bz2 10267484 RMD160 b0800202f8c7a1dd4aacf97065084d34db31bd2f SHA1 d7853b82f05c7c6d57c2234931f9cf5b0e6c893b SHA256 ec029af924323eef44c470187576992001c2ab865ff9070e47d4bc319ef4a70b
+DIST opera-10.10-4609.gcc4-bundled-qt4.i386.tar.bz2 15168470 RMD160 76afaa5b9f468ed1d8cab8a2fd06a95ee3524564 SHA1 62fdf59ea9409dd54d2a5c25cf39ef9eefe4a1dd SHA256 d858e766fd7a703140d62c58eb5acf0290939341aa824953c9ebc63e8c5c530f
+DIST opera-10.10-4609.gcc4-bundled-qt4.x86_64.tar.bz2 15827163 RMD160 1bdfcf503395a526374b2a7de21f7b5b0a0f74b7 SHA1 fadf67f3e39221451109407f1bedafd8da1893a5 SHA256 af8d8b9c5d8bdbe212eb78495a5955d19ca7c01eaee9d78aa4f9960d3458810e
+DIST opera-10.10-4609.gcc4-qt4.i386.tar.bz2 10343693 RMD160 e24a2017490cf698935c12454c0ed67456906310 SHA1 c23b6329829211de0a8018b5eef0344e44479230 SHA256 571f99f18ceeea5f374467ef64530a98b210389409e70d72ed9d5fac50f702aa
+DIST opera-10.10-4609.gcc4-qt4.x86_64.tar.bz2 11074531 RMD160 86aefbe452668def2d4c347a5e8bc22ee2037490 SHA1 6b77b0abf8d95c9859dfddd73d1639bc6b7cd5d7 SHA256 23f88fb0bf55a361368a37f7740c3e6b1b747f6d388845693ead769d1533ee6e
+DIST opera-10.10-4609.gcc4-shared-qt3.i386.tar.bz2 10266092 RMD160 cf7d63668b8fdda22086f64e65eb202fd3fc8b9d SHA1 9919583b2ecb2660ae1e384ecc83319e36147e28 SHA256 9de447c582bcfd2a8cf46ec90cfbc115a66dfde4be06029574d2998c4f6add12
+DIST opera-10.10-4609.gcc4-shared-qt3.ppc.tar.bz2 10456395 RMD160 86775401259d1fbefbc84a12fded053bdc5068d2 SHA1 b03aa2baa195410c94f1070ef254cdc83afd6ef6 SHA256 aba602eaaac3915c8271f35e9b97727ea0e9be77e48d5e8f092ac7042832583c
+DIST opera-10.10-4609.gcc4-shared-qt3.x86_64.tar.bz2 11073686 RMD160 22371151f67a426649ceac8f6f6727bff583873c SHA1 7c03d9147a6d85da481e21b4f07d843d0a4e953d SHA256 b1c20d380887ccc9fe6c2fcdd6a29882d6e01baa753c769638d1eb50851bbbdc
 DIST opera-9.64-freebsd5-shared-qt3.i386.tar.bz2 7495147 RMD160 a43a3c4b3512e36083065f17e4e1d880f1da6fe6 SHA1 cd99d3b7cef7b675f647f84b100cc1cba8ac0d76 SHA256 2203e0b99778f0251cff9b0cb8d8b88495ab213e6c62c430297db150a25125f4
 DIST opera-9.64.gcc4-qt4.i386.tar.bz2 9571076 RMD160 37a0d02b0cd1c58799adc0198869381a45c2a320 SHA1 c97cf93fa520d37a4c833c72b3a2e31e69505677 SHA256 7b1f4fb83d1d5299768a8e20b6a262a59c2eef83becc7455ee87cb78c08d51fa
 DIST opera-9.64.gcc4-shared-qt3.i386.tar.bz2 7346107 RMD160 f8f653ff28e161590a8c1ee3887511ef51e90515 SHA1 9ccb6bc7484ee8071a8453290fd9f83d087b7152 SHA256 96182de06c5b74fba8daff7da80d834a5f8554d4da6c88acb3af2d7484f33025
@@ -68,13 +73,7 @@ EBUILD opera-10.00_rc4583.ebuild 6876 RMD160 747c419f189f27e5a04910064b16182a2f9
 EBUILD opera-10.10_pre4563.ebuild 6925 RMD160 8e7a25854d0f3b36a56f9590e371f422bb35b620 SHA1 061c5d7ed24e90d7b2989f746bc198e0d24aadb0 SHA256 a602214d7a174ac78317b1aa2fdea4da1178e34da77234376bddc4ca5e4fb0cb
 EBUILD opera-10.10_pre4566.ebuild 6825 RMD160 f3330f2a59ecfa4acdc9b15bdaa44aff9136800c SHA1 85ff96fd9e43cdb8ba79ce9bcd7d31f5f4100078 SHA256 6c1cda6062211fc5072ceb1d34db2582bfede24ca5d68efcb72d29275822c707
 EBUILD opera-10.10_pre4594.ebuild 6777 RMD160 6b492fa25010c09db41f47524d9b7c465db6b4fa SHA1 f1e1b91cb4360605902d76d1f60869a604f413ab SHA256 3481c71de3358e6d07df128ed3f2e36c1497cb8b278a684b77dbfc0e172c8c01
+EBUILD opera-10.10_pre4609.ebuild 6877 RMD160 1ef5d42fe150a6e2e630f5bb10d3b38f86aab3d5 SHA1 6313e95987e9ca5f6ee5f56880a289270ef14b7e SHA256 41c524f498b2230904279e062489a62ad348980cdee534a3ad90a0dfed52bcb6
 EBUILD opera-9.64.ebuild 7902 RMD160 08d5562a596d80c82effa2433350f3cf94f91afc SHA1 b1f834e80e417c5483cfd1c67173a06c497cffa4 SHA256 077e1678c7047369d0166cf5a996fc116eb88a0f2f67f5846b240689f8831377
-MISC ChangeLog 75139 RMD160 a9b9ea518f0b04f608776a0a6560ac4c181736a3 SHA1 76d0ad4dcfc9018c17b31ba0efaea7eeeb35fa02 SHA256 d823e6000fa075731994442f8ce7027c91b929db449c8cb0685319677fdd39a0
+MISC ChangeLog 75327 RMD160 deecc997cd769e9274d9f8423b7ee951f8f42269 SHA1 aba83c9e24e7e64476b89795f6cd60e80ba237fd SHA256 4cee245b320b17b2ad6139e8d6828d7e58618fced69c4ee4b87ba876ec2fbab2
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqmF+QACgkQNQqtfCuFneMUawCfTJngyZCHCgzRRe0ANR93kNPF
-OFkAn3T5GANXsf1/+0zFrRW2mBXU1zVV
-=n86m
------END PGP SIGNATURE-----
diff --git a/www-client/opera/opera-10.10_pre4609.ebuild b/www-client/opera/opera-10.10_pre4609.ebuild
new file mode 100644
index 000000000000..91f193d051c2
--- /dev/null
+++ b/www-client/opera/opera-10.10_pre4609.ebuild
@@ -0,0 +1,240 @@
+# 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.10_pre4609.ebuild,v 1.1 2009/09/10 15:17:35 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-10.00"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RESTRICT="mirror strip test"
+QA_DT_HASH="opt/${PN}/.*"
+
+IUSE="elibc_FreeBSD gnome ia32 qt3 qt-static"
+MY_LINGUAS="be bg cs da de el 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 ro ru sk sr sv ta te tr uk zh-CN zh-HK zh-TW"
+
+for MY_LINGUA in ${MY_LINGUAS}; do
+	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+done
+
+O_U="http://snapshot.opera.com/unix/snapshot-${PV/*_pre}/"
+
+# 1) Please check for missing (qt3/qt-static) builds
+# 2) and only then update the build number manually
+OPERABUILD="4609"
+
+if [ "${PV/*_pre}" = "${OPERABUILD}" ]; then
+	O_P="${P/_pre*/}-${OPERABUILD}"
+else
+	O_P="SET_OPERABUILD_IN_THE_EBUILD"
+fi
+
+SRC_URI="
+	amd64? (
+		!ia32? (
+			qt-static? ( ${O_U}x86_64-linux/${O_P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
+			!qt-static? (
+				qt3? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+				!qt3? ( ${O_U}x86_64-linux/${O_P}.gcc4-qt4.x86_64.tar.bz2 )
+			)
+		)
+		ia32? (
+			qt-static? ( ${O_U}intel-linux/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
+			!qt-static? (
+				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 )
+			)
+		)
+	)
+	ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
+	x86? (
+		qt-static? ( ${O_U}intel-linux/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
+		!qt-static? (
+			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 )
+		)
+	)
+	x86-fbsd? ( ${O_U}intel-freebsd/${O_P}.freebsd6-shared-qt3.i386.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
+	amd64? (
+		ia32? (
+			qt-static? ( media-libs/nas )
+			!qt-static? (
+				qt3? ( =x11-libs/qt-3*[-immqt] )
+				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+			)
+		)
+		!ia32? (
+			qt-static? ( media-libs/nas )
+			!qt-static? (
+				qt3? ( =x11-libs/qt-3*[-immqt] )
+				!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+			)
+		)
+	)
+	x86? (
+		qt-static? ( media-libs/nas )
+		!qt-static? (
+			qt3? ( =x11-libs/qt-3*[-immqt] )
+			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+		)
+	)
+	ppc? ( =x11-libs/qt-3*[-immqt] )
+	x86-fbsd? ( =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
+}
+
+pkg_setup() {
+	elog "${WARN}If you seek support, please file a bug report at${NORMAL}"
+	elog "${WARN}https://bugs.gentoo.org and post the output of${NORMAL}"
+	elog "${WARN} \`emerge --info =${CATEGORY}/${P}'${NORMAL}"
+}
+
+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"
+}
+
+# These workarounds are sadly needed because gnome2.eclass doesn't check
+# whether a configure/Makefile script exists.
+src_configure() { :; }
+src_compile() { :; }
+
+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
+
+	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 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
+}