Version bump <http://my.opera.com/desktopteam/blog/2009/03/10/new-peregrine-build>.

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 23bd75a86e5d..6c4f0f296d85 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.326 2009/03/07 16:30:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.327 2009/03/10 16:46:55 jer Exp $
+
+*opera-10.00_pre4205 (10 Mar 2009)
+
+  10 Mar 2009; Jeroen Roovers <jer@gentoo.org> +opera-10.00_pre4205.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2009/03/10/new-peregrine-build>.
 
   07 Mar 2009; Jeroen Roovers <jer@gentoo.org> -opera-9.63.ebuild:
   Remove old.
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 8ebf834eefd6..2e161fb8f0bb 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -30,6 +30,11 @@ DIST opera-10.00-4166.gcc4-qt4.i386.tar.bz2 7852457 RMD160 3952565d79f44548bc831
 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-10.00-4205.freebsd6-shared-qt3.i386.tar.bz2 8124678 RMD160 68ebc3c2aaf6f16ab3eeeda10016e3e505b2df26 SHA1 0a3f84a0a4101bdae59755b8b3954f64d020ee6c SHA256 c93a9e446026a7364105c1e148bc5218ea6bfd84cdec41060622ba727a96cd60
+DIST opera-10.00-4205.gcc4-qt4.i386.tar.bz2 7919892 RMD160 6488683204cf8afd3f8e9a6e49d61070914ccb84 SHA1 5c437a3b7948dd466bb98529fc834d920a59fb25 SHA256 a8b65360aa8f50fd1f8eccd1a0cd0afe1ab547be551b75d40d05d78782fa24a3
+DIST opera-10.00-4205.gcc4-shared-qt3.i386.tar.bz2 7946791 RMD160 7c972aca5aed32481fcff166a07e442750cc14e8 SHA1 2f5efacd1342f69be20d6982324b919adcabb67d SHA256 d645efa1ba71692a552fa1cf00423f1f943eb68a2aeef7266e57b891abb85fb5
+DIST opera-10.00-4205.gcc4-shared-qt3.x86_64.tar.bz2 8618335 RMD160 eed8003276686563c12cb9b0f2c107b7e016627f SHA1 c6fe410267843a24e4b47b62939465665868c2c7 SHA256 c7d069e2ccf332fa961bada7d0b0f96b57f7c31f3a70016ca0b9996d6b6403ca
+DIST opera-10.00-4205.gcc4-static-qt3.i386.tar.bz2 9848358 RMD160 b4c1bd51f8bb4e34517115dc936158b9bb1d220d SHA1 a35540c35aa120e2b1654c08910f1433132fe759 SHA256 513e777020a59444de3ad1727b3d4ea3afca1b137b962e5ac921df38451bbb82
 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
@@ -47,7 +52,8 @@ EBUILD opera-10.00_pre4116.ebuild 6579 RMD160 fc2520a49abb1433bce37f1da9e754a571
 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-10.00_pre4205.ebuild 6454 RMD160 76ab7ecc058b407799f092a210308e2aa872643b SHA1 46fa61fd591c471d4e21002a82bffedf325d7b80 SHA256 64a81ccccacebd24fcf31aa4193dd3cabcea2cb246c73d166555a372a92bfa50
 EBUILD opera-9.27.ebuild 5937 RMD160 fe418d4b5a2f34664f46bb6bcee56b27f3d182e0 SHA1 bda2f3ec16759f92c4227203a3a22927cd3b811e SHA256 fff41046fb4e6c58fc1c4cb73df98857c1c2ea89a9c6131aa03f3ce6aee19e98
 EBUILD opera-9.64.ebuild 7742 RMD160 6da55d636cb1a838551114c43933d9716ac6aeef SHA1 904894164f726a11e18d5032a8f5b8fddedc08e5 SHA256 8c029dedc573770d7b86dbc8f210b12b0a0ab3567250810c0ad5599ac98c9e24
-MISC ChangeLog 63592 RMD160 3a0beba81b2e3402cda8a09b8740af4805681c89 SHA1 fe801cd18de6cac4f498e09490054b532a95d09f SHA256 3be73d7c4ebcde40dd6e5358496bdc3964c06e1bdda878121a8d91418fa1d923
+MISC ChangeLog 63793 RMD160 7bfd7c3890bf372eed17fe960c62cb845cc074f5 SHA1 31b173bd58222b6374f3923d58d998fa7bf57ad1 SHA256 169053513dea7b309fe7936f72c95e658fdac62ff1d2d4085f8f0a61ee6ff164
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4205.ebuild b/www-client/opera/opera-10.00_pre4205.ebuild
new file mode 100644
index 000000000000..9bde4eafe8a5
--- /dev/null
+++ b/www-client/opera/opera-10.00_pre4205.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_pre4205.ebuild,v 1.1 2009/03/10 16:46:55 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-${P##*_pre}/"
+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
+}