Version bump <http://my.opera.com/desktopteam/blog/2009/08/13/opera-10-0-beta-3>.

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

3 files changed, 263 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 9087bc059d61..1bb5c259700c 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # 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.373 2009/08/13 10:42:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.374 2009/08/13 11:21:45 jer Exp $
+
+*opera-10.00_pre4537 (13 Aug 2009)
+
+  13 Aug 2009; Jeroen Roovers <jer@gentoo.org> +opera-10.00_pre4537.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2009/08/13/opera-10-0-beta-3>.
 
 *opera-10.00_pre4538 (13 Aug 2009)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 1f629b727a52..0e3f55b9d44e 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -64,6 +64,14 @@ DIST opera-10.00-b2.gcc4-qt4.x86_64.tar.bz2 7341424 RMD160 a6836305856fe69e0e0f5
 DIST opera-10.00-b2.gcc4-shared-qt3.i386.tar.bz2 6542676 RMD160 d313f4144fc2d93d8ac6727dcb73e8790c421b35 SHA1 7ec5ed81bc2c81488d2f91aad46dcaabf17a471a SHA256 99585fd25fc2e4da8968eef9ebf59a26d23f687c66605340adaf10c622c295a8
 DIST opera-10.00-b2.gcc4-shared-qt3.ppc.tar.bz2 6728014 RMD160 8ba0f17658f32ca2084e23f48eb84d229d44e3c0 SHA1 e9cffd1ef148210c54ee53471b7078e3d684cf0b SHA256 aeb742e3520d477fef0b9d5413ebe584faeaa9e509fe19d312cbe8779bebda39
 DIST opera-10.00-b2.gcc4-shared-qt3.x86_64.tar.bz2 7339869 RMD160 01924927985e8776afd048300439d3a11820be5f SHA1 1ccd991373d33c3f2b1603e07fa71c55f8e82861 SHA256 67f198b9a7d865b7524a032600fc0c9f73becbc3e7c5c668f50ee39538686e22
+DIST opera-10.00-b3-freebsd7-shared-qt3.i386.tar.bz2 8558598 RMD160 797c756a75df01a425772b88d1acb6e3fa4b5960 SHA1 876230349dc31b9ee6b14122fa3c48b5cbe630ea SHA256 fe4a295eec32acf57c1a8610a56ae01ab8df0f265806f96aa1b6d12ef41de8e1
+DIST opera-10.00-b3.gcc4-bundled-qt4.i386.tar.bz2 13335198 RMD160 80edeb787bf77690b9495eedeb2bbefd9d761da0 SHA1 dc896dfc20d5e13d18ebcb12fd87043a05c92493 SHA256 d99a455d6009cf136a8e8636a5b4f7c9b4734ab69f9723c1d6d9395531c74f90
+DIST opera-10.00-b3.gcc4-bundled-qt4.x86_64.tar.bz2 13998179 RMD160 e56c4cffbdf2df593a4ae534014e867e6cf423e9 SHA1 866e95714fde6bc9a1705d6ff044563b5f2fd5eb SHA256 91c84d61b99129e6398832000747f29e851d68a87bbb998b5118a5944027a7f7
+DIST opera-10.00-b3.gcc4-qt4.i386.tar.bz2 8530943 RMD160 70557b31f27945d8b360949e8d04125064fa752a SHA1 3e019b2b7c3c0e24befaf2c379d79551fff5e4dc SHA256 5f2382a582f39a8aa7626671ad17f4eac6c9f34cc12b8f2b4f13ad2dbe9ca9c7
+DIST opera-10.00-b3.gcc4-qt4.x86_64.tar.bz2 9249508 RMD160 57b9d98f882f52fd8047dddd57238cd6701d862d SHA1 17db49bf7ee2a8085781dab80d4750de672de2ed SHA256 600a5678da1a1a923bde15b3572922b61a7f6ae210a1f35fe0309609b0e94ec7
+DIST opera-10.00-b3.gcc4-shared-qt3.i386.tar.bz2 8446322 RMD160 87fa31411ff21e091b7778fb3985201019c48f15 SHA1 b6fd59a705c2a141efd1cda4b222a5d2c687a4d1 SHA256 53e1c8261373cea2e77822d4bfa093249cc15361a030cf24b8281967beebb39c
+DIST opera-10.00-b3.gcc4-shared-qt3.ppc.tar.bz2 8640588 RMD160 278a1c767f51b5e5b50a49ac51dce3a78a902156 SHA1 3000684b86000c434002eaba7c8185ea77482ddd SHA256 43afc04f379e290df04a89359da8136a0a730d30fa9eec008d447096e6b48319
+DIST opera-10.00-b3.gcc4-shared-qt3.x86_64.tar.bz2 9251396 RMD160 04c667af14bf94c68e2fa5628ecb9bf5f24458d3 SHA1 5b43aac79d06652e993d92f0dde844dd3a90dea7 SHA256 c454db9f21bf387b436a212dfa64f74e1e62ecaabe82f8046543c6c685d66184
 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
@@ -82,8 +90,9 @@ EBUILD opera-10.00_pre4493.ebuild 6880 RMD160 57f024e53b2dd1269e3e3a3e5c36c6e451
 EBUILD opera-10.00_pre4502.ebuild 6880 RMD160 3fdf130ce9b1f8191779c5ac18a71dce85951876 SHA1 8cfba0261ce45b65388760078491d87e25e1c33c SHA256 db37555ddc2cda8af6ed250f54286a183a961ecdce4611903edc8321fa53b1c8
 EBUILD opera-10.00_pre4520.ebuild 6880 RMD160 cc1330d2b75f9645abc285acc7ab76dcb25f0801 SHA1 36f8572a20fe8c0d323ca4fb969a4dd91e4b373e SHA256 af5db0e80377332ec617a31f8daa2ff8f0a339bac4315ceff6cb1f4989135d8a
 EBUILD opera-10.00_pre4529.ebuild 6880 RMD160 20ffe2ae7d53bc0712662efe52dc7eb8ac3e0e73 SHA1 33e4b9fce12731400644d767c9cc537b33db1616 SHA256 d5a8f0c9c698aa5d40712de8a38bca31f451f67dd7ff0afdd0eb71331d2f3258
+EBUILD opera-10.00_pre4537.ebuild 6922 RMD160 5054701101cc377555637e144a97a870f53a9182 SHA1 5ae1677a97d41d7cf14b6936f3cfa323e0675419 SHA256 4c17fee0b0ad7665f979d4ee9a1e7d00cd6eac8b5cd573d9011ba6741b72ac88
 EBUILD opera-10.00_pre4538.ebuild 6880 RMD160 414c406fffd76957e34764f4ac0a2c2c42a8f289 SHA1 addf340a2f40c3ce73fdc6101a2383efc15158ce SHA256 7cea2b31f57dd9c29fe4805d8d7a828dfa398b577eeca9441eb2836fe20a9a8a
 EBUILD opera-9.27.ebuild 6053 RMD160 fa86d79c0a1beae6d3605467122c2a5451b21bff SHA1 32d8ea747f757e99ce0af0c456c4aed71a660689 SHA256 4b0d2bb5bbbdc1eb4cee89f717d6bdc556337fb4d7e7973c216292d1f4cd8fee
 EBUILD opera-9.64.ebuild 7896 RMD160 0c981a40e72c64929e06cb3643e0a04ab538202d SHA1 64fcac7617e01be342ac7b0c2c65a38b9a867d92 SHA256 6eb45e59ecf811df18afc8ff52cb48d3608060a5c76c883abfa8772388dd7806
-MISC ChangeLog 72256 RMD160 73c1d1ac01e3a956564bf6b512f207930b3d5709 SHA1 49ba396f6d8f95ab1c305e9d46824bf28cf58c00 SHA256 8be3279dc9ee675dfab3de290efe8cd3dd6952bcc3b6a5fa569fb278c34392d1
+MISC ChangeLog 72455 RMD160 f962f1fc98fcf7f03a5e5e2d65cbeba6c415a43c SHA1 22ace4b0e29c3d141ebbac204ddf0c2d0636de70 SHA256 b55f856869b52bb69b24f2134370195bd7c21122fad67143d4bbbb3cc1c1c9f4
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4537.ebuild b/www-client/opera/opera-10.00_pre4537.ebuild
new file mode 100644
index 000000000000..d82853929206
--- /dev/null
+++ b/www-client/opera/opera-10.00_pre4537.ebuild
@@ -0,0 +1,246 @@
+# 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_pre4537.ebuild,v 1.1 2009/08/13 11:21:45 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="mirror://opera/" # base URL
+O_R="/1000b3/" # beta subdir
+O_L="${O_U}linux${O_R}beta3/en/" # linux URL
+O_F="${O_U}unix/freebsd/${O_R}en/" # freebsd URL
+
+# 1) Please check for missing (qt3/qt-static) builds
+# 2) and only then update the build number manually
+OPERABUILD="4537"
+
+if [ "${PV/*_pre}" = "${OPERABUILD}" ]; then
+	O_P="${P/_pre*/}-b3"
+else
+	O_P="SET_OPERABUILD_IN_THE_EBUILD"
+fi
+
+SRC_URI="
+	amd64? (
+		!ia32? (
+			qt-static? ( ${O_L}x86_64/${O_P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
+			!qt-static? (
+				qt3? ( ${O_L}x86_64/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+				!qt3? ( ${O_L}x86_64/${O_P}.gcc4-qt4.x86_64.tar.bz2 )
+			)
+		)
+		ia32? (
+			qt-static? ( ${O_L}i386/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
+			!qt-static? (
+				qt3? ( ${O_L}i386/shared/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+				!qt3? ( ${O_L}i386/${O_P}.gcc4-qt4.i386.tar.bz2 )
+			)
+		)
+	)
+	ppc? ( ${O_L}ppc/shared/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
+	x86? (
+		qt-static? ( ${O_L}i386/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
+		!qt-static? (
+			qt3? ( ${O_L}i386/shared/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+			!qt3? ( ${O_L}i386/${O_P}.gcc4-qt4.i386.tar.bz2 )
+		)
+	)
+	x86-fbsd? ( ${O_F}intel/shared/${O_P}-freebsd7-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 )
+			)
+		)
+	)
+	ppc? ( =x11-libs/qt-3*[-immqt] )
+	x86? (
+		qt-static? ( media-libs/nas )
+		!qt-static? (
+			qt3? ( =x11-libs/qt-3*[-immqt] )
+			!qt3? ( x11-libs/qt-core x11-libs/qt-gui )
+		)
+	)
+	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 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
+}