Version bump <http://my.opera.com/desktopteam/blog/2009/08/14/much-work-and-lots-of-play-makes-unite-a-shiny-feature>.

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

3 files changed, 255 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 1bb5c259700c..f17df06bd485 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,13 @@
 # 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.374 2009/08/13 11:21:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.375 2009/08/14 17:08:16 jer Exp $
+
+*opera-10.00_pre4546 (14 Aug 2009)
+
+  14 Aug 2009; Jeroen Roovers <jer@gentoo.org> +opera-10.00_pre4546.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2009/08/14/much-work-and-lots-of-pla
+  y-makes-unite-a-shiny-feature>.
 
 *opera-10.00_pre4537 (13 Aug 2009)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 0e3f55b9d44e..abd09df6df6c 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -48,6 +48,13 @@ DIST opera-10.00-4538.gcc4-qt4.x86_64.tar.bz2 10838330 RMD160 225b63f9b1a202ee20
 DIST opera-10.00-4538.gcc4-shared-qt3.i386.tar.bz2 9998071 RMD160 a7b27996a727501201633b2f4f6c952e8219eb17 SHA1 3876e68bfebd6d11f97fcfb078b2d74ff3509efd SHA256 c5e96be4108f511804ec15b92407e62a8577b725747a4cbe59999bb63bdd60f3
 DIST opera-10.00-4538.gcc4-shared-qt3.ppc.tar.bz2 10212359 RMD160 aa02624169cb37621eea82247e74822d7e7ed854 SHA1 c6a00e1bf0fcfae02b4019f1aaee05fe6c5e4346 SHA256 b16a753b76214ba134260aef26e095154ed1224069889bf692fc7c02bcf94815
 DIST opera-10.00-4538.gcc4-shared-qt3.x86_64.tar.bz2 10842347 RMD160 80889f6c7cd6752dae6dfe7db725b84b2853e2a1 SHA1 820a0c61e269d5cc220a7934f30e15b08ca995e4 SHA256 3a127323aadb1af7875db15aa9c6edd06f4017a3037b541dcdbefbc81d634985
+DIST opera-10.00-4546.freebsd7-shared-qt3.i386.tar.bz2 10220585 RMD160 4ebff6ded6b53d37a92c3436aea131498c6a6a09 SHA1 933c73ed7782ffab57a0b0c8214be99c195e6ff0 SHA256 34cfe10c40175935470381580f5b858a9ef42ad876bceb42df00c825b3341275
+DIST opera-10.00-4546.gcc4-bundled-qt4.i386.tar.bz2 14946804 RMD160 383bf96481014cf94bf94ba03d6951dd83a40e3d SHA1 6d20fe9f74e5381db936eb6871020486a5f53eb7 SHA256 fd0e10506cf13d06ed4655a4e90a803251bc6c2dd8d7b1430a89b787a575156f
+DIST opera-10.00-4546.gcc4-bundled-qt4.x86_64.tar.bz2 15618966 RMD160 6c7d3a0f8024904e662eca32d27f7fb0b2730617 SHA1 57fcfb924e877dec05634c53f611ded0de4d31a2 SHA256 e4822ac066bfdccccb3a20ce7be6de0f9e16a65c09325465b6180a3f1afe0797
+DIST opera-10.00-4546.gcc4-qt4.i386.tar.bz2 10131651 RMD160 5eca73b095194e4a9c6e220e1e0567d55c5ab1b7 SHA1 ab2aed07c8b64fab318ce42d08d9dfd38201d2b3 SHA256 a679f89684dbe7e47f4cb80a1f0f7e15ae489fdf362c82790e19a6f13d8b1fa0
+DIST opera-10.00-4546.gcc4-qt4.x86_64.tar.bz2 10874922 RMD160 17b7268c285a23304671eeb13be1611ac2a889af SHA1 db330ee96308ddb6366801b468b7e586a3203cb4 SHA256 9bf3677c08a6f618011d20a26cffc546c99b4c1f3ffe1adc731bf83606564dab
+DIST opera-10.00-4546.gcc4-shared-qt3.i386.tar.bz2 10032890 RMD160 ee947648a23bca4349773d5b0e2246dc2c97e278 SHA1 c894810cc0a6b1aa80dda2e6de3792ef2823fb43 SHA256 886d687719a30f769524ef7e361906a72f9af4ff499e0e26032f88917771a707
+DIST opera-10.00-4546.gcc4-shared-qt3.x86_64.tar.bz2 10877244 RMD160 99f6135d49fc3a2460800364a84e62a844a9463d SHA1 4b48f24a5a712aa0bdbe6fdcf6c62529aed3cbc0 SHA256 2cbc31215f7bcac2ea9b73483a10458cb9cf57804506f5e648e9dc8dec5c277f
 DIST opera-10.00-b1-freebsd5-shared-qt3.i386.tar.bz2 6562405 RMD160 235ee2a570a05221c194bbb478bca3b1d8c1b3cb SHA1 ce618794f75438f0d7668b98a312855ea0e1f9ac SHA256 2554f6f68c2e180598ff1c6fc73c64fa1968a374ae62b1d2d540aaa6de6f0b56
 DIST opera-10.00-b1-freebsd5-static-qt3.i386.tar.bz2 8491058 RMD160 7121dfee4c9e94b4d3d40fe0d55d6f4d06bd7a0d SHA1 d0244f6998ffab869baae7c552d774b3d7eec751 SHA256 700a758f14a293e51999a5cad53d30732b99073162672c36b40abc711dca93fb
 DIST opera-10.00-b1.gcc4-bundled-qt4.i386.tar.bz2 11132463 RMD160 704d9df1c3dba8dc5c6a2ef08abc3a18e070d80d SHA1 37a79075d04c4c287ec138bb9def5ab3f791411c SHA256 adec320da74582c63dcd7267e8f6fcab787fab8a59dd00f54b59e4d6ec6d5be3
@@ -92,7 +99,8 @@ EBUILD opera-10.00_pre4520.ebuild 6880 RMD160 cc1330d2b75f9645abc285acc7ab76dcb2
 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-10.00_pre4546.ebuild 6780 RMD160 466be2c492a4a667e35f83a27eb046762d745669 SHA1 faf4d793413b3e2033f52c7283df2306608c190e SHA256 2c2efdb452db3d59ba636342e1133ea5627fb1bbce81fed399786944b8bc9938
 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 72455 RMD160 f962f1fc98fcf7f03a5e5e2d65cbeba6c415a43c SHA1 22ace4b0e29c3d141ebbac204ddf0c2d0636de70 SHA256 b55f856869b52bb69b24f2134370195bd7c21122fad67143d4bbbb3cc1c1c9f4
+MISC ChangeLog 72694 RMD160 fdfdcc95b2b3d9e67d229f953fbe2012e32ec892 SHA1 089eb1b3883921eca5df85f642eaf3c95b9ccc2a SHA256 d3b1710111d4e473c4293d576cbd3f35c695472d35a79514b3ed4d0558a3cc9e
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4546.ebuild b/www-client/opera/opera-10.00_pre4546.ebuild
new file mode 100644
index 000000000000..3d024b8332ee
--- /dev/null
+++ b/www-client/opera/opera-10.00_pre4546.ebuild
@@ -0,0 +1,238 @@
+# 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_pre4546.ebuild,v 1.1 2009/08/14 17:08:16 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 ~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="4546"
+
+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 )
+			)
+		)
+	)
+	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}.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 )
+			)
+		)
+	)
+	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
+}