Version bump <http://my.opera.com/desktopteam/blog/2009/01/13/new-year-snapshot>.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7-JeR i686

3 files changed, 247 insertions, 3 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index b94f1901917f..c6da447e923c 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.315 2008/12/30 17:37:20 jer Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.316 2009/01/13 16:05:52 jer Exp $
+
+*opera-10.00_pre4126 (13 Jan 2009)
+
+  13 Jan 2009; Jeroen Roovers <jer@gentoo.org> +opera-10.00_pre4126.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2009/01/13/new-year-snapshot>.
 
   30 Dec 2008; Jeroen Roovers <jer@gentoo.org> opera-10.00_pre4116.ebuild:
   Depend on Qt 4 instead of 3 (bug #252630).
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e22da1f1cf34..d97d5ad9b85b 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -19,6 +19,12 @@ DIST opera-10.00-4116.gcc4-shared-qt3.i386.tar.bz2 7899607 RMD160 f6dd8209a7f103
 DIST opera-10.00-4116.gcc4-shared-qt3.ppc.tar.bz2 7979786 RMD160 1425be249e6e75ab80e6c74dda3e79058e9c5782 SHA1 d2c07ba572ff6fb02d2b9a70ee6bfc922325d5d1 SHA256 4c4382e1dd40d1ec6db7993ed0fc744ff7c4edfa4132edb4f1c9ca1ab90776c8
 DIST opera-10.00-4116.gcc4-shared-qt3.x86_64.tar.bz2 8570200 RMD160 fde42f5f1dc1a40ff35bc9c564eb4ccc9e12d91f SHA1 10811e7fca5c2070413a25f34f8011bb81623494 SHA256 f29eba5375fda14e5ca32bb7c00b208f7cf21b4acc5cfca6a76a53b64f87e329
 DIST opera-10.00-4116.gcc4-static-qt3.i386.tar.bz2 9799125 RMD160 ff2c33fd0aa47d44f13f0445edbf4ef3cc892fd8 SHA1 e9ca157e581ac1890d889d4d59efa28191a33974 SHA256 c0b61535e0c9f40015aa793fff032fe255c6670ab73319ad6bb738a5b74eb6cb
+DIST opera-10.00-4126.freebsd6-shared-qt3.i386.tar.bz2 8070360 RMD160 b9a297788829fa8363283b646067bfe3e0d006f1 SHA1 409a27badbc764ec937b2088a5b2d80a7eacf092 SHA256 c5b1ff8569b21abe31cf87a2d5e775332b95ddc2634e2ccd1acae570c6770170
+DIST opera-10.00-4126.gcc4-qt4.i386.tar.bz2 7872941 RMD160 eb577e1cf8fca90d95f6ab14c348a94e480b6d05 SHA1 ded9a4a80ad559bd5bfe31fd46367320cdc9b155 SHA256 87c2e3e7f4e741aa8674ae43db4f013b15ca36fb752755f5444225b32765eb84
+DIST opera-10.00-4126.gcc4-shared-qt3.i386.tar.bz2 7906109 RMD160 70d56f64b03fba07d78207e4b6a839acff67f1d0 SHA1 eb9a46435bdfd21f86ba6f6f6b38a30345cd6691 SHA256 443d2c657e374ad6146793d46b814d41676dcc8f395e49ced93b6073e5a5cc7e
+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-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
@@ -33,7 +39,8 @@ DIST opera-9.63.gcc4-shared-qt3.x86_64.tar.bz2 7972223 RMD160 43c826276d535a74eb
 DIST opera-9.63.gcc4-static-qt3.i386.tar.bz2 9266959 RMD160 f982a5da638ef3b609c1775904929240f4d2542e SHA1 b946933a8d145c61c94181ad4e7a6297cdb4b74e SHA256 0e33b1c2f8154147ce29c4f4ba02c20a76170363cf8f8269b4c047f49378b7d0
 EBUILD opera-10.00_pre4102.ebuild 7667 RMD160 3e0c3a3192f7359463644b4843a1badd8f8e27bc SHA1 705ee849b1fd02cdf0e4104909b8ffb023c87849 SHA256 f34356901eabc74280c3c7f5efc8f21c7b763f3d8066d13834d4a2224a093c84
 EBUILD opera-10.00_pre4116.ebuild 6579 RMD160 fc2520a49abb1433bce37f1da9e754a571b5cdc9 SHA1 7d2d85c9f9f2c786aad14bc9d88c542f632f072a SHA256 e7fa52dc876e24dce0e94e2b48a27371a6ef6a9629b3655bfa984734f7797802
+EBUILD opera-10.00_pre4126.ebuild 6573 RMD160 a98228a08431295a79a190ef40f743dbec37bb1e SHA1 904b94c55da0dd1808c6426f08b539f5685a566e SHA256 ddc49adc45ce4304b972cfe270e3e54d856a643a19a43066186c80540a9013b3
 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 61839 RMD160 ec186830a5ff57c2f238087c56e195d533ed5860 SHA1 948633b65a0d6a6a362e2b2c73d09931d86677f9 SHA256 8e15a9ba0fe54e47eea2bcd512d351e9f580ebf0c0e2321ffd2a7c41df9a5b2c
+MISC ChangeLog 62038 RMD160 70d0790ddfc81514a36b7826de3452feaae7e132 SHA1 2cf5c0202d94da3fe1d7bf59df11d68d4dc6dd8c SHA256 e4d2c191120f6fa506f6942fab81fba912f2340a6c1b8464829d38e57d9c8c19
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4126.ebuild b/www-client/opera/opera-10.00_pre4126.ebuild
new file mode 100644
index 000000000000..2cf890f2e307
--- /dev/null
+++ b/www-client/opera/opera-10.00_pre4126.ebuild
@@ -0,0 +1,231 @@
+# 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_pre4126.ebuild,v 1.1 2009/01/13 16:05:52 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 ~ppc ~x86 ~x86-fbsd"
+
+RESTRICT="mirror strip test"
+
+IUSE="elibc_FreeBSD gnome ia32 qt-static qt3 spell"
+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-4126/"
+O_P="${P/_pre/-}"
+
+SRC_URI="
+	x86-fbsd? ( ${O_U}intel-freebsd/${O_P}.freebsd6-shared-qt3.i386.tar.bz2 )
+	ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.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/libexif
+	media-libs/jpeg
+	>=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? ( !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* )
+	)
+	ppc? ( =x11-libs/qt-3* )
+	spell? ( app-text/aspell )
+	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
+
+	# enable spellcheck
+	if use spell; then
+		if use qt-static; then
+			DIR=${P}.1
+		else
+			use sparc && DIR=${P}.2 || DIR=${P}.5
+		fi
+		echo "Spell Check Engine=/opt/opera/lib/opera/${DIR}/spellcheck.so" >> "${D}"/opt/opera/share/opera/ini/spellcheck.ini
+	fi
+
+	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 non-English simply do"
+	elog "$ emerge app-dicts/aspell-[your language]."
+
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+
+	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
+}