Version bump <http://my.opera.com/desktopteam/blog/rc-3>.

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

3 files changed, 241 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 96345d9a5175..330ec7aad7fa 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # 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.415 2009/11/16 01:30:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.416 2009/11/18 01:01:25 jer Exp $
+
+*opera-10.10_pre4728 (18 Nov 2009)
+
+  18 Nov 2009; Jeroen Roovers <jer@gentoo.org> +opera-10.10_pre4728.ebuild:
+  Version bump <http://my.opera.com/desktopteam/blog/rc-3>.
 
 *opera-10.10_pre4725 (16 Nov 2009)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index ba6708271bbe..3a89e42d9877 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -36,9 +36,17 @@ DIST opera-10.10-4725.gcc4-qt4.x86_64.tar.bz2 12603749 RMD160 63db6dba53801070a8
 DIST opera-10.10-4725.gcc4-shared-qt3.i386.tar.bz2 11775669 RMD160 052d63a0b94d262b7f9c02de5b4f45fb6b155b9a SHA1 9b008a543694e12ac6b34371442833bee229f707 SHA256 6a53fa8e7403dcab1d46246a52783dfcbace7c9ddd1081209579551d242135fd
 DIST opera-10.10-4725.gcc4-shared-qt3.ppc.tar.bz2 11924934 RMD160 4e007e5edf16ef7f55d96574232d30a3845012e1 SHA1 ea7fb7e532b3e14514969ea00818ff1b89a22d27 SHA256 897e4284c9407878d9b2f0efc343beea5dd42f0abb6a98b99ae2f8b71f5db1a7
 DIST opera-10.10-4725.gcc4-shared-qt3.x86_64.tar.bz2 12601782 RMD160 0a5083a7be6394cb787278579e90845269c12329 SHA1 a90ad0e44b9cf495aa61fb131f8ef6197772973c SHA256 4649bc92dd323d18c9fce5013004fbb7c2a841725c4a41530c70a26bfc8010f3
+DIST opera-10.10-4728.freebsd7-shared-qt3.i386.tar.bz2 11646296 RMD160 ac4153719ba648656665adea113921b7bd951f10 SHA1 4984c9d73b41e52e437844a300db2f36a5154291 SHA256 c941e5642e67b0561a4c03c18e4bcd609c5228a4a4e2bf9fe8e25ab61a9e4c9d
+DIST opera-10.10-4728.gcc4-bundled-qt4.i386.tar.bz2 16608090 RMD160 eb10fb1aaa6f4829e3f57c1d137949ea3cf37377 SHA1 32d30f3cf14bb87574c7c9071597f00c87f49df1 SHA256 28cffffbd03275899f1729be78f9fe39f59fff4bdd449e5e1863f1a197d0cb0a
+DIST opera-10.10-4728.gcc4-bundled-qt4.x86_64.tar.bz2 17365209 RMD160 52543c9987787cbd03532d72703651517bc7bd8e SHA1 a03071bb83838b7f71812a2c665603eb9d7267a9 SHA256 9a9269baa76e03d3e7a5c44d9e80517b5d4a41d4bec296a30b786aedb05f2813
+DIST opera-10.10-4728.gcc4-qt4.i386.tar.bz2 11759760 RMD160 a3d7f6dfc0de2f9738ed2b70b8761ea674da1b62 SHA1 f7df4c12d1a98afd87f4a5fef94b482fb2e3d539 SHA256 b503fb179f44ade3dea23ed6cd45769d68628f0b1def164075f76d76124ae784
+DIST opera-10.10-4728.gcc4-qt4.x86_64.tar.bz2 12606153 RMD160 b38ad954d579dfa7f8aed109227bdb2e9818bb6e SHA1 04cb7257ea7d484589a9a45c07f7a33201f638c4 SHA256 1da7020cdf5d8731de57664a6a58c80f7a287e84479e1d6d1bc168b57c56bbda
+DIST opera-10.10-4728.gcc4-shared-qt3.i386.tar.bz2 11782934 RMD160 5c4dc0004affd01c202c6e7dbeefb775b5cb1c38 SHA1 ea70d16488b61fe7675857677650d2229cbb1a21 SHA256 0924d5e835a71dc25914ac9e8eff260d5ae7ff832db38be382b89709d9ccc1de
+DIST opera-10.10-4728.gcc4-shared-qt3.x86_64.tar.bz2 12608220 RMD160 33aeb5b7b88800befd0092c35d36ea6b8de8f8a9 SHA1 d7d4844d6570a6cc6fbcb7bede0066815e232dff SHA256 be0ada24cbcc7eb20c9bc0b5f8602ce0cefbfed97b16e1969b09be20399b34f4
 EBUILD opera-10.01.ebuild 6067 RMD160 abd33d810b2b827eb93aee5b324702e88f9131fa SHA1 524031a0a8feac5d08263e6d73820df5aa5297ea SHA256 3aba355de9495e43c4b8f7651d1fcd9d74e6ed6a8828efeee4a410da8b50e6ce
 EBUILD opera-10.10_pre4694.ebuild 6380 RMD160 7fdd332bbf9e0212508af1418dbcffb90fb73139 SHA1 81d400d4c0edb1a13256070a105100d74eb92332 SHA256 4b784676d5ae9de1c082da40a82d75dd74d065a0cdb2836ab5fafd3710cae8fc
 EBUILD opera-10.10_pre4720.ebuild 6380 RMD160 8a866e76d1e4c241d5fccc0c6bb25c25130a571d SHA1 c67c03f55cf0c2dcf39d4873b2a2027dda138b01 SHA256 1c771a52ce222a1cc9ffe5ba1168f6ccf8dcc9bddbe94da56a6c514743acb792
 EBUILD opera-10.10_pre4725.ebuild 6380 RMD160 db670d1f159cbae50a5fba7406f3d7aaeb7490e8 SHA1 76f49e9a3ba40e0b4b3c167f76e21159e517a9b1 SHA256 df42d419de1773e477fdd4ff0da3cbbe912ce1bca0c2abe3c767413f527e671a
-MISC ChangeLog 80117 RMD160 7eeb0a3e9b4edea7c5aab421e0815d3f74e7ee95 SHA1 cdd04983447d3dba2143c9dc0a8470ee29d6d6e2 SHA256 d0b7419ab60517fcbece258f11a57a64ac2d7269119d22deedd2fb78b649bdb5
+EBUILD opera-10.10_pre4728.ebuild 6280 RMD160 8f6c8789ae86b54e078d1c9db049f1d4a78d4116 SHA1 fee89ea74c6316081b1456009f934b616e4cd592 SHA256 cc6791f42246f1827ab80b88f3c7c534c43ed67204a612d3449ba907ac4f2890
+MISC ChangeLog 80290 RMD160 cfce4c60c4bbb4275ba17706010bf94339a2a28e SHA1 81c6297d228f76509945bb96c44646af236193b7 SHA256 32d625dc90494bf5e6c06d6f0ff17ad874e832c3ce157813828f26a9a066dad7
 MISC metadata.xml 623 RMD160 b931e2f0fde75fc6d06f1c4d50306f9290953672 SHA1 2983627e32312dd3a625f0b418057341da220403 SHA256 e35d04f13c0c9a659a804ff0bd241b503fdf153e343bd566422317ddd5f90cdd
diff --git a/www-client/opera/opera-10.10_pre4728.ebuild b/www-client/opera/opera-10.10_pre4728.ebuild
new file mode 100644
index 000000000000..8fea72997687
--- /dev/null
+++ b/www-client/opera/opera-10.10_pre4728.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.10_pre4728.ebuild,v 1.1 2009/11/18 01:01:25 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="4728"
+
+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."
+
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+}
+
+pkg_postrm() {
+	use gnome && gnome2_pkg_postrm
+}