Version bump <http://my.opera.com/desktopteam/blog/show.dml/2975248>. Drop ~ppc because no tar.bz2 has been prepared (yet).

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

3 files changed, 240 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 27d9c1008d5a..9b794f9a9150 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.320 2009/02/11 19:48:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.321 2009/02/12 21:31:10 jer Exp $
+
+*opera-10.00_pre4166 (12 Feb 2009)
+
+  12 Feb 2009; Jeroen Roovers <jer@gentoo.org> +opera-10.00_pre4166.ebuild:
+  Version bump <http://my.opera.com/desktopteam/blog/show.dml/2975248>. Drop
+  ~ppc because no tar.bz2 has been prepared (yet).
 
   11 Feb 2009; Jeroen Roovers <jer@gentoo.org>
   opera-10.00_pre4126-r1.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 05e8fe225732..711073519008 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -25,6 +25,11 @@ DIST opera-10.00-4126.gcc4-shared-qt3.i386.tar.bz2 7906109 RMD160 70d56f64b03fba
 DIST opera-10.00-4126.gcc4-shared-qt3.ppc.tar.bz2 7983798 RMD160 7bcfc53815a70c2196046693be5a0e511031808c SHA1 a16b5f5e9c11f70279db087afda19ebcfa368415 SHA256 94fb9c8c7a1244f1f6e090502df56342d6cba9ff8417663a9da29c39b6ec13fa
 DIST opera-10.00-4126.gcc4-shared-qt3.x86_64.tar.bz2 8577627 RMD160 996c413fdb23719c5c36f7b644d6019223b5cef0 SHA1 e8fe600ee69f29d5ba4a84e9b479c03a72d54962 SHA256 2ab6f06fd7675844063837aeb750c817c0cfee2f545a8edb081cd576df8bdf47
 DIST opera-10.00-4126.gcc4-static-qt3.i386.tar.bz2 9801746 RMD160 75e02741ed161c484a2490f43a613dbb09895616 SHA1 f855575ba108fa964dd18188dddd03df78fc3682 SHA256 197fd79b434a40e7bcae5a2d1a3ba05e562c4d3114960df74df0d6b97eb0ddea
+DIST opera-10.00-4166.freebsd6-shared-qt3.i386.tar.bz2 8030503 RMD160 9479c28dd734c2be81c70f569f5bca773e0be5f8 SHA1 565cab5693843df0348514558cbed093f686a312 SHA256 1fe463cf497d3c6858698775638e3cc3f3a5f1779233e52d88483e337b178cc9
+DIST opera-10.00-4166.gcc4-qt4.i386.tar.bz2 7852457 RMD160 3952565d79f44548bc83141c366f4e98a38fa5f0 SHA1 6ef17dae08bc62658557bfe9fe74fca978f90b84 SHA256 bb3b3bde86d396c86c309de7b3ca8a4edeca8cbd0eab3f9b8d7cab47ff9c2bfb
+DIST opera-10.00-4166.gcc4-shared-qt3.i386.tar.bz2 7885527 RMD160 147242370acca05af4302665b2994c60f6d36a10 SHA1 667a84eea5425a645818740465e61d98dc14764d SHA256 5bf352cebc6a3f0b0fd0bf9f373b7a35370bcefff05df5c99df57160ce5cac15
+DIST opera-10.00-4166.gcc4-shared-qt3.x86_64.tar.bz2 8536866 RMD160 f8aaf2f01ac1addbf004d685b8a9ae1b50444b1e SHA1 6ed676a0a9e0d2afeb955519cd4edb4389f88133 SHA256 b17d6a649572c9c88ea759138e5bdd5a95095119bd75de9d6d469508e979e6bb
+DIST opera-10.00-4166.gcc4-static-qt3.i386.tar.bz2 9803782 RMD160 6ac99d6423cfd4e81eb8c093863d4201b73dc931 SHA1 9bef34d3797ec9bc087d222795ee4b85729405a9 SHA256 cfdeea7f1d25a7fda9ab784bf48c985a56e617603a3c8a7ac8a467060c387971
 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
@@ -41,7 +46,8 @@ EBUILD opera-10.00_pre4102.ebuild 7667 RMD160 3e0c3a3192f7359463644b4843a1badd8f
 EBUILD opera-10.00_pre4116.ebuild 6579 RMD160 fc2520a49abb1433bce37f1da9e754a571b5cdc9 SHA1 7d2d85c9f9f2c786aad14bc9d88c542f632f072a SHA256 e7fa52dc876e24dce0e94e2b48a27371a6ef6a9629b3655bfa984734f7797802
 EBUILD opera-10.00_pre4126-r1.ebuild 6542 RMD160 717a529bd1b4d1fb25779b4f8a76a139446870f1 SHA1 6c55266e45a4d38e33dc022cb6772dac7262e8b3 SHA256 af9fea1c3ef10547402b754b3f02508e5ac11fffaff0c81dce54cb34baf6e530
 EBUILD opera-10.00_pre4126.ebuild 6610 RMD160 05c2d71748d52f635b22773c75fb8df693312bf5 SHA1 3f62cf36a909b32be36aadf0dbff59c63746b048 SHA256 86cdc3eddbd1eab134c394f4bf551670ff0c9f8ed37a25cfddd88b227fe3cdd1
+EBUILD opera-10.00_pre4166.ebuild 6447 RMD160 8c7d7b04ec2bcd8a2c408f4d19837f64f5c2e303 SHA1 0d95b61183ec7b31752735198b948df48e940e11 SHA256 f988801322f8ac6714b0d7108273eb571b152f3b58d0ed25992b55c82d0ae639
 EBUILD opera-9.27.ebuild 5937 RMD160 fe418d4b5a2f34664f46bb6bcee56b27f3d182e0 SHA1 bda2f3ec16759f92c4227203a3a22927cd3b811e SHA256 fff41046fb4e6c58fc1c4cb73df98857c1c2ea89a9c6131aa03f3ce6aee19e98
 EBUILD opera-9.63.ebuild 7761 RMD160 d84113a28ad13ec79153c2b968faeb1b0be4914b SHA1 7deb049dbd34255f36bc4f51a1813b1c61bab223 SHA256 e06f34767567a1683c674cb428ce94d614ded19625b3d04a17bffcb27a7f25b3
-MISC ChangeLog 62759 RMD160 d233ff5254e12a87c55ff81ac20aaef708bc89b8 SHA1 120e61aba738c632800cb58ff8ea83cc1dd37c3d SHA256 30facbb69408c2b0d843298ef1c9165d213ffdbfdbbb4729f423b571737851b6
+MISC ChangeLog 63000 RMD160 2a84d2e4d99a2f2a9ed2292ac588275ac779d26e SHA1 54f44061a1e237c7792ec2e6983d3f617407d04e SHA256 db4450bcc1603fa406ee9552ba82e1cd0c6034bc483661ca4d0cb2925e59e6a0
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4166.ebuild b/www-client/opera/opera-10.00_pre4166.ebuild
new file mode 100644
index 000000000000..eb09965fa764
--- /dev/null
+++ b/www-client/opera/opera-10.00_pre4166.ebuild
@@ -0,0 +1,226 @@
+# 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_pre4166.ebuild,v 1.1 2009/02/12 21:31:10 jer Exp $
+
+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 ~x86 ~x86-fbsd"
+
+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-4166/"
+O_P="${P/_pre/-}"
+
+SRC_URI="
+	x86-fbsd? ( ${O_U}intel-freebsd/${O_P}.freebsd6-shared-qt3.i386.tar.bz2 )
+	qt-static? (
+		qt3? (
+			amd64? (
+				ia32? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+		)
+		!qt3? (
+			amd64? (
+				ia32? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_U}intel-linux/${O_P}.gcc4-static-qt3.i386.tar.bz2 )
+		)
+	)
+	!qt-static? (
+		qt3? (
+			amd64? (
+				ia32? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+				!ia32? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
+			)
+			x86? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
+		)
+		!qt3? (
+			amd64? (
+				ia32? ( ${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 )
+			)
+			x86? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.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
+	!qt-static? ( media-libs/libpng )
+	qt-static? ( !qt3? ( x11-libs/libXinerama media-libs/nas ) )
+	x86? ( !qt-static? (
+			qt3? ( =x11-libs/qt-3* )
+			!qt3? ( =x11-libs/qt-core-4* =x11-libs/qt-gui-4* )
+		   )
+		 )
+	amd64? (
+		ia32? ( app-emulation/emul-linux-x86-qtlibs )
+		!ia32? ( =x11-libs/qt-3* )
+	)
+	x86-fbsd? (
+		=virtual/libstdc++-3*
+		!qt-static? ( !qt3? ( =x11-libs/qt-3* ) )
+	)
+	"
+
+opera_cd() {
+	cd "${WORKDIR}"/${PN}* || die "failed to enter work directory"
+	S="$(pwd)"
+	einfo "Working in ${S}"
+}
+
+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}
+	opera_cd
+
+	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}-9.50-pluginpath-fbsd.patch"
+	else
+		epatch "${FILESDIR}/${PN}-9.50-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_compile() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a configure script or Makefile exists.
+	true
+}
+
+src_install() {
+	opera_cd
+	# 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 "net-www/netscape-flash. See also https://bugs.gentoo.org/198162"
+}
+
+pkg_postrm() {
+	use gnome && gnome2_pkg_postrm
+}