Version bump <http://my.opera.com/desktopteam/blog/2009/11/05/key-fixes-and-stability>.

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

3 files changed, 249 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index f6daa624f2b3..c39034f48fe2 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.410 2009/11/04 12:15:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.411 2009/11/05 19:47:43 jer Exp $
+
+*opera-10.10_pre4694 (05 Nov 2009)
+
+  05 Nov 2009; Jeroen Roovers <jer@gentoo.org> +opera-10.10_pre4694.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2009/11/05/key-fixes-and-stability>.
 
   04 Nov 2009; Jeroen Roovers <jer@gentoo.org> -opera-10.00.ebuild:
   Remove old.
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 8ed0e7eb5174..513237558d5e 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -28,6 +28,14 @@ DIST opera-10.10-4685.gcc4-qt4.x86_64.tar.bz2 11309756 RMD160 bacde320dd2e021016
 DIST opera-10.10-4685.gcc4-shared-qt3.i386.tar.bz2 10494877 RMD160 8e31a96d4417c4175f1b55dd02490601922a28a5 SHA1 d405067f7c6af08b2ef42dc84856a6563520f4ba SHA256 31c1f011ec422334f2d1e056bd7586c1d3e9fad8b09f29a5a4fcb1e2150feaf0
 DIST opera-10.10-4685.gcc4-shared-qt3.ppc.tar.bz2 10634638 RMD160 38505fe5506cab0f2f1b6f0d781dd2fe8bafe655 SHA1 2a90090e95cd7d3c7b081d1e8d4e86eb18c75f3c SHA256 a07b13d27b0cbccd988577d0aee6f76dc14cc427d08fd56d4136716d0e3819f5
 DIST opera-10.10-4685.gcc4-shared-qt3.x86_64.tar.bz2 11309698 RMD160 494b51ffb86d8561506800278385fa7262a5f474 SHA1 91c2871afbc5b1e2787765ff265a7e8745ce1441 SHA256 b40d0e3791fa1a24ffc7817a1618ae7748c0d8653c1b841b9df1e948d9d7fdcd
+DIST opera-10.10-4694.freebsd7-shared-qt3.i386.tar.bz2 11730062 RMD160 dc7c0be78c7c3fcd0bab3f15ce2da3ae6b7e3f41 SHA1 3c839cf955fce8d97a9ee566948731174fffeebc SHA256 be0b4dbec51b40165e4204e3a28686efc9ce4330d2cf756e7ec45b15e6d0d02f
+DIST opera-10.10-4694.gcc4-bundled-qt4.i386.tar.bz2 16651534 RMD160 7f094b41694801156eb9f351a2b77463eb443708 SHA1 aa5bacc6446278f802bc871c939067ff2ba08c2e SHA256 54ab00358fbe929cec8c68f932fddb319ae286d409001e832bfbb4ac4b5415c2
+DIST opera-10.10-4694.gcc4-bundled-qt4.x86_64.tar.bz2 17411698 RMD160 4f450914b9a1653effef02f75749913d580c5ffc SHA1 2c97846024e73adb02ae97c38716c2943ef252f9 SHA256 9a7f6b80cbad29fe7c200c1f0f8e97441aa464f4a88857dea7364946f65a3684
+DIST opera-10.10-4694.gcc4-qt4.i386.tar.bz2 11817286 RMD160 a0d9a29cfb5570bace17668280aaeaa0b8a70b74 SHA1 a0f861fc983d1ce5e624b44a46776a163fbbc24b SHA256 2336bce8611be0b5b20392397b2f02a57165f6bee54c6cef75e7b033d56b1c57
+DIST opera-10.10-4694.gcc4-qt4.x86_64.tar.bz2 12663255 RMD160 7993c9ffe5bc03e6f1fa7063650dd3278d933491 SHA1 f4144cbe595e4e93a05d6ffd22ad9f27766239fc SHA256 4af1e8efa821486e45502989ef5e9112ae582eb697f56b1695c855006f2099ae
+DIST opera-10.10-4694.gcc4-shared-qt3.i386.tar.bz2 11841178 RMD160 2b94aedba86acc54aeb9d3c1008a9b40233522fb SHA1 72156b7ba403cdb104ce5a3294288b61ec324bb0 SHA256 247408bca8be56e4239e00cbe2973a6b32598030a0cf88f2f1a2d34d342c0664
+DIST opera-10.10-4694.gcc4-shared-qt3.ppc.tar.bz2 11997901 RMD160 c0f5ba41bb162ffc11961a822a811792d7739bdd SHA1 b1559ec85b19733809ec91084054bed010d0ecc7 SHA256 25796efce5f79615d38ffa7636b04806653bf03ca25111b51301ecb15e3c9d4d
+DIST opera-10.10-4694.gcc4-shared-qt3.x86_64.tar.bz2 12665389 RMD160 fd0351b1c816850456e4ab061723b5ea499b5fec SHA1 f8133761a2bf9ee1c94c9a2a0f6afead9f8213e7 SHA256 2f3df652a615b6f701734bb9fc3d0c9d094397287808529a85312b0921bb70a7
 DIST opera-10.10-b1-freebsd7-shared-qt3.i386.tar.bz2 10396487 RMD160 1be9636b3652600b93d7d18e0560cc59fa0ad5f2 SHA1 e95490e8ba29e4be6ea5c1d8c0d48e7a8b8fd86e SHA256 e1fac31ee551208ece2f2553cef625cac54357ccc76c4f3466c7833ef2087567
 DIST opera-10.10-b1.gcc4-bundled-qt4.i386.tar.bz2 15244746 RMD160 147ffae737b7d973e3c4e9a3071fadb699722983 SHA1 32734b80d62edc4ff87233370765cf2545f022f5 SHA256 3c68ef8fc2380cce79d71dac4b6dc1da5598c69fd4bd268bcdecca7ea33f71de
 DIST opera-10.10-b1.gcc4-bundled-qt4.x86_64.tar.bz2 16040037 RMD160 939e7d083d9c4ff950001aebe789d26ab30b3c9d SHA1 5780bcc88fc831ffb33a7bb24354ac407daa4a09 SHA256 2a75719c4920a51a9b74e86998a8e5e0639fd5cd6909a78d10a0d5fcdb0af903
@@ -40,5 +48,6 @@ EBUILD opera-10.01.ebuild 6228 RMD160 2945e983fa221ae71d98cd93e167b04bf5c2a1b4 S
 EBUILD opera-10.10_pre4672.ebuild 6255 RMD160 215719759e8aef746f0bcb3e47d7126457272525 SHA1 46a145e99a53f4f232d427a4347c6f52c8e5d275 SHA256 dcfcc5a901629abc8d5b22da3e84c7e3307036fc70c13523a3e949b005d172e3
 EBUILD opera-10.10_pre4678.ebuild 6546 RMD160 672a26761c83687582cdce0b52e4a8a5b25ca434 SHA1 34dbf8a7c0bfb775ce7dc35d7ca43de8120bcb30 SHA256 fd15b5635e13ff084e4f8e310a3c9a344e7c6205cd00b7d1185de2abb4401091
 EBUILD opera-10.10_pre4685.ebuild 6538 RMD160 da8ceaff71469716d20678d159f1b51abfa54849 SHA1 b174a581c89c5ad4284f2a65c81645a9df0ab7db SHA256 250c117a3863e9b84abe40638e52494e657d45a3c6320f9c6f6d085edca5a063
-MISC ChangeLog 78942 RMD160 d1907316a0325cd3d0ecc214f0748c0bd2983d70 SHA1 8406ddd226dce72ccc0834af8105ed769f25c9a2 SHA256 94941372709785ef37f227eb8736ee00c87ad2c696e18428be1f9955c715e78d
+EBUILD opera-10.10_pre4694.ebuild 6538 RMD160 1ece78e601a467d41af5f4cd884801a09db40c83 SHA1 b58842d367b9db3868b0dc22e358f4dbb62a43c3 SHA256 d0aa29fe966d6afd1f1b471497a779fc8f4f38d1ee414abffdd2d1015aaedc1b
+MISC ChangeLog 79147 RMD160 6f2a892499a4eb7d0464532e50a914721e998eeb SHA1 c5491bf094ab400fe41e76c88be9fe3e238c98de SHA256 bfa9abaf206d52ce110e6bd341062083b1adff3d4d17cc6b3326e7d9361a2b26
 MISC metadata.xml 623 RMD160 b931e2f0fde75fc6d06f1c4d50306f9290953672 SHA1 2983627e32312dd3a625f0b418057341da220403 SHA256 e35d04f13c0c9a659a804ff0bd241b503fdf153e343bd566422317ddd5f90cdd
diff --git a/www-client/opera/opera-10.10_pre4694.ebuild b/www-client/opera/opera-10.10_pre4694.ebuild
new file mode 100644
index 000000000000..9a0345178635
--- /dev/null
+++ b/www-client/opera/opera-10.10_pre4694.ebuild
@@ -0,0 +1,232 @@
+# 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_pre4694.ebuild,v 1.1 2009/11/05 19:47:43 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="4694"
+
+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}.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 )
+		)
+	)
+	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."
+
+	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
+}