Version bump <http://my.opera.com/desktopteam/blog/2009/08/25/opera-10-0-release-candidate>.

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

3 files changed, 255 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 6ea29eea0527..5ea8d05abaf3 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,13 @@
 # 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.378 2009/08/22 19:37:04 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.379 2009/08/25 12:03:17 jer Exp $
+
+*opera-10.00_rc4570 (25 Aug 2009)
+
+  25 Aug 2009; Jeroen Roovers <jer@gentoo.org> +opera-10.00_rc4570.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2009/08/25/opera-10-0-release-candid
+  ate>.
 
   22 Aug 2009; William Hubbs <williamh@gentoo.org> opera-9.27.ebuild,
   opera-9.64.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 31f7b07abe50..8539ef3158d4 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -31,6 +31,13 @@ DIST opera-10.00-4562.gcc4-qt4.x86_64.tar.bz2 9253016 RMD160 93a52af5eaa2b3effc1
 DIST opera-10.00-4562.gcc4-shared-qt3.i386.tar.bz2 8449279 RMD160 7de46af7f5369ed1b37066d989b23f5ee91599cf SHA1 016cb7d43415a0151001322d7944db81603a7bfb SHA256 1f038f3126b502901fd0208303d0a4f91678a3971b12bd5502830fc0df99542c
 DIST opera-10.00-4562.gcc4-shared-qt3.ppc.tar.bz2 8640783 RMD160 8ac0d074ecb69e95233e163a189c3238d3d41b0e SHA1 3530a56883d5ddde6f76748f5e70cb18859d13ed SHA256 97b475e30be023922ef240c59ae42e9561c2f8b7d3960069b7c43aeb9ea14616
 DIST opera-10.00-4562.gcc4-shared-qt3.x86_64.tar.bz2 9255790 RMD160 8416ff94b3c73d030cf000ded8de3aeb6d02bac5 SHA1 0efeecd0032d7ee43e809524aafe77aa730f3ac6 SHA256 7e297e795d08bdd7fb9b75e349340ab4926089faeaaa3a89872e6ea960bee8c3
+DIST opera-10.00-4570.freebsd7-shared-qt3.i386.tar.bz2 8583101 RMD160 8ae6845adcbb9e4e412159a0590c8a28354466fb SHA1 e640b6273f63a4d2c438967c488649a619117ef7 SHA256 4066c5fc5bec6556c040e468719d518caf40fe74fb96fe6b0069e2f284d96ddf
+DIST opera-10.00-4570.gcc4-bundled-qt4.i386.tar.bz2 13331263 RMD160 4846be151a5076575bfe2eac199ab50cc2f308b7 SHA1 30ed9ef15abaddc037bcdb586bc3c9eb62dfff46 SHA256 497ec28b7099c201a2665857ea4114c4464cd0bb34053158eac3ed8cbe9b374d
+DIST opera-10.00-4570.gcc4-bundled-qt4.x86_64.tar.bz2 13994365 RMD160 2c8ddafdb101e6b608f755a46e35f6e8e8a929f1 SHA1 b81c6913698b7829de8eba3b11be98cbee6b3410 SHA256 06474fff97853ebfbae4fe69cc333029d6f49b84dc9329ee84535b3c2a67ae62
+DIST opera-10.00-4570.gcc4-qt4.i386.tar.bz2 8528489 RMD160 6c8bf65ad6c6e9ffb243143e5771c53051212ac9 SHA1 09fde891b5e46ff81ba14f5d3287c747272f7683 SHA256 9cebfb0ea2a72ff8fbf2c6ce9f028c43aafb86ddd87b647d29bee0909bbb3035
+DIST opera-10.00-4570.gcc4-qt4.x86_64.tar.bz2 9250183 RMD160 be9ba3040aad22977e553717c9c54a3f032ab50c SHA1 050b4a670050087100c6d5bc9f74cd1605723998 SHA256 1bbf0ce2743257f6e29c1f6831ba807a513afa1c69cfd283afeb7de54ad10406
+DIST opera-10.00-4570.gcc4-shared-qt3.i386.tar.bz2 8445262 RMD160 ea0c97adb6293a51b8d79b4fcec9bdad3804255d SHA1 6fe916ef0e5231d5b23c1f415c941aed2d8e1527 SHA256 26281f09b95435370d36026a60d1524d467f147f0f8eef116acb0634e6c05f7f
+DIST opera-10.00-4570.gcc4-shared-qt3.x86_64.tar.bz2 9250830 RMD160 a252e2e89adb9ed12c2b61ec72129b3e2b8441d7 SHA1 bd15d66bb33259769afc31f9e10cb8277852222d SHA256 8dbd9739f4ff41523fdda7a99e26eed0ad3cef5e3f46fa05ce6db8cc2525107c
 DIST opera-10.00-b3-freebsd7-shared-qt3.i386.tar.bz2 8558598 RMD160 797c756a75df01a425772b88d1acb6e3fa4b5960 SHA1 876230349dc31b9ee6b14122fa3c48b5cbe630ea SHA256 fe4a295eec32acf57c1a8610a56ae01ab8df0f265806f96aa1b6d12ef41de8e1
 DIST opera-10.00-b3.gcc4-bundled-qt4.i386.tar.bz2 13335198 RMD160 80edeb787bf77690b9495eedeb2bbefd9d761da0 SHA1 dc896dfc20d5e13d18ebcb12fd87043a05c92493 SHA256 d99a455d6009cf136a8e8636a5b4f7c9b4734ab69f9723c1d6d9395531c74f90
 DIST opera-10.00-b3.gcc4-bundled-qt4.x86_64.tar.bz2 13998179 RMD160 e56c4cffbdf2df593a4ae534014e867e6cf423e9 SHA1 866e95714fde6bc9a1705d6ff044563b5f2fd5eb SHA256 91c84d61b99129e6398832000747f29e851d68a87bbb998b5118a5944027a7f7
@@ -70,9 +77,10 @@ EBUILD opera-10.00_pre4537.ebuild 6922 RMD160 5054701101cc377555637e144a97a870f5
 EBUILD opera-10.00_pre4538.ebuild 6880 RMD160 414c406fffd76957e34764f4ac0a2c2c42a8f289 SHA1 addf340a2f40c3ce73fdc6101a2383efc15158ce SHA256 7cea2b31f57dd9c29fe4805d8d7a828dfa398b577eeca9441eb2836fe20a9a8a
 EBUILD opera-10.00_pre4546.ebuild 6780 RMD160 466be2c492a4a667e35f83a27eb046762d745669 SHA1 faf4d793413b3e2033f52c7283df2306608c190e SHA256 2c2efdb452db3d59ba636342e1133ea5627fb1bbce81fed399786944b8bc9938
 EBUILD opera-10.00_pre4562.ebuild 6880 RMD160 477267303e4fcc4b0232bf84da52f66c03cb6340 SHA1 9e42324d5ad447a744fe6a5ed4ed6177b9b8fbd8 SHA256 7c44630c4eab68d3088a86f4ec8b29986abad2eae75be2d8849682bf1a75b84a
+EBUILD opera-10.00_rc4570.ebuild 6776 RMD160 aa2ae20542dfef838a6b90557850d355ec07411c SHA1 4668bb3ec9b08c8965b0d369b30bd23e8b430860 SHA256 a9047abe5a0d4340c8c3535b93abd4addc558de18db7ec0a728d21aeed01bcb4
 EBUILD opera-10.10_pre4563.ebuild 6880 RMD160 d5c60836546ecfc6f3f8034578c0f0ac399e2058 SHA1 25b156a2cb708f6a7e90a9870566b620e38e9fc1 SHA256 77a69cdf5eadd8d6741205c37df6d06ac252cd87b2916adad31641e0ddbef0ca
 EBUILD opera-10.10_pre4566.ebuild 6780 RMD160 39d0da4ffd7af9488fd101e6aff93599903ceb7d SHA1 d84bd7f3cca58c1e67e95affbda8d04e2da32cc8 SHA256 6543bcdb935a4dc1457070f717db8faefc021e4c2171d14b43d9ad268c19f168
 EBUILD opera-9.27.ebuild 6059 RMD160 a7039fa7189f982ad70819084fd6484fe8cc57ab SHA1 cea7764eac5c5aadd0adb850c4c4e3db2fca90e5 SHA256 e9ef717789ae7d7233cfe9795845724632817ac9a657d2a72d75093ed6c03dd1
 EBUILD opera-9.64.ebuild 7902 RMD160 08d5562a596d80c82effa2433350f3cf94f91afc SHA1 b1f834e80e417c5483cfd1c67173a06c497cffa4 SHA256 077e1678c7047369d0166cf5a996fc116eb88a0f2f67f5846b240689f8831377
-MISC ChangeLog 73479 RMD160 b7d62ff782ef17718b7c0237a9098a8ded295171 SHA1 949b8c24fbaa12117e79ab36b579d571186f3f58 SHA256 bd099b9867efdd9bee9ce25bb98d07ce36e79eb53a9a68c3aae5cf1068a37362
+MISC ChangeLog 73685 RMD160 9361fe3d2b07b75e786e5e1e14a8aef65b611982 SHA1 05639c774b103cd6e0f7f605244334fa4ce1c0a6 SHA256 d80f1ea0e6adec2c80c1269a3da89ddafc7691bb4ff15af03e5ce22b8c1b6c82
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_rc4570.ebuild b/www-client/opera/opera-10.00_rc4570.ebuild
new file mode 100644
index 000000000000..fdf8350077ba
--- /dev/null
+++ b/www-client/opera/opera-10.00_rc4570.ebuild
@@ -0,0 +1,238 @@
+# 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_rc4570.ebuild,v 1.1 2009/08/25 12:03:17 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/*_rc}/"
+
+# 1) Please check for missing (qt3/qt-static) builds
+# 2) and only then update the build number manually
+OPERABUILD="4570"
+
+if [ "${PV/*_rc}" = "${OPERABUILD}" ]; then
+	O_P="${P/_rc*/}-${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."
+
+	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 "www-plugins/adobe-flash. See also https://bugs.gentoo.org/198162"
+}
+
+pkg_postrm() {
+	use gnome && gnome2_pkg_postrm
+}