Version bump <http://my.opera.com/desktopteam/blog/2009/06/03/welcome-to-opera-10-beta-1>.

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

3 files changed, 250 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 3ced4da7d8a8..114b917fdc40 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.347 2009/06/02 07:18:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.348 2009/06/03 16:35:16 jer Exp $
+
+*opera-10.00_pre4402 (03 Jun 2009)
+
+  03 Jun 2009; Jeroen Roovers <jer@gentoo.org> +opera-10.00_pre4402.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2009/06/03/welcome-to-opera-10-beta-
+  1>.
 
   02 Jun 2009; Jeroen Roovers <jer@gentoo.org> opera-10.00_pre4394.ebuild:
   Add libXinerama dependency for qt4 build thanks to Piotr Szymaniak (bug
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index a7127c3da62c..a878a2a12682 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -25,6 +25,14 @@ DIST opera-10.00-4394.gcc4-shared-qt3.i386.tar.bz2 7967423 RMD160 49e891777decd4
 DIST opera-10.00-4394.gcc4-shared-qt3.ppc.tar.bz2 8044122 RMD160 6a2fee957296d9da1882630c89037fc468d8abba SHA1 41a99e4ce6f38b7083370816398633d5dbab5ade SHA256 96cc5e38cfa678142d70cf10db53782a3007dde9a58c072882d2b76c83e2e99b
 DIST opera-10.00-4394.gcc4-shared-qt3.x86_64.tar.bz2 8626279 RMD160 62dba7fe1f6f8c15ddc21e2e36129d5d3a9e03e8 SHA1 584523cc6ef612b22f764097bfaaf76a449c376e SHA256 6d6c4538458c5c6114c38e372fbfcd11a86514d98ff0566dd8dc9bce3be8cc3c
 DIST opera-10.00-4394.gcc4-static-qt3.i386.tar.bz2 9876602 RMD160 c21700d44500cb35c549c60578445f17f53c8714 SHA1 f14a0db2b77b50c4b9362d721e947da8c0de0b95 SHA256 ae625865de120a97d4d49b4958c2345fc28d0763d77a005d175f596cdad5ec0a
+DIST opera-10.00-b1-freebsd5-shared-qt3.i386.tar.bz2 6562405 RMD160 235ee2a570a05221c194bbb478bca3b1d8c1b3cb SHA1 ce618794f75438f0d7668b98a312855ea0e1f9ac SHA256 2554f6f68c2e180598ff1c6fc73c64fa1968a374ae62b1d2d540aaa6de6f0b56
+DIST opera-10.00-b1-freebsd5-static-qt3.i386.tar.bz2 8491058 RMD160 7121dfee4c9e94b4d3d40fe0d55d6f4d06bd7a0d SHA1 d0244f6998ffab869baae7c552d774b3d7eec751 SHA256 700a758f14a293e51999a5cad53d30732b99073162672c36b40abc711dca93fb
+DIST opera-10.00-b1.gcc4-bundled-qt4.i386.tar.bz2 11132463 RMD160 704d9df1c3dba8dc5c6a2ef08abc3a18e070d80d SHA1 37a79075d04c4c287ec138bb9def5ab3f791411c SHA256 adec320da74582c63dcd7267e8f6fcab787fab8a59dd00f54b59e4d6ec6d5be3
+DIST opera-10.00-b1.gcc4-qt4.i386.tar.bz2 6347390 RMD160 16576b0f65a06818fbbccb740d587412f9daf877 SHA1 279a8594c1c5804293d6c2671c5e8123f67dfae6 SHA256 736510eed339555fa80fe3957ee1316c8691135c743b1fee0ee0120812cde031
+DIST opera-10.00-b1.gcc4-shared-qt3.i386.tar.bz2 6379639 RMD160 c775f171a17a1aaa4c33aac37bf73ff11f4f8a59 SHA1 f8731f9f89e41da53094853450d18a1c6eb1bdd3 SHA256 dbc8f5815562d2f83e45e77ad121578a8d2d3877adf2bc3e722472eae84408c7
+DIST opera-10.00-b1.gcc4-shared-qt3.ppc.tar.bz2 6448810 RMD160 c333938c51a598fb7620a00f886b46048199ba64 SHA1 c361bc13a76378fe1ae282ae72d35f90b558a38f SHA256 3a9f96e156dafae96987fcd1b217d8e169a6ff6df10df1b4de74f210d4e2c5ca
+DIST opera-10.00-b1.gcc4-shared-qt3.x86_64.tar.bz2 7057976 RMD160 92ce81dd01fe865e895aa416b747032599aa0273 SHA1 246d724d4849d89e6a76464400c14769648c0c77 SHA256 bcf84ff047b592f371028de8ec8f6449fc649d74f69bbc2c1ba7a2dbbf475210
+DIST opera-10.00-b1.gcc4-static-qt3.i386.tar.bz2 8298037 RMD160 15eba42d27ebf5530161c73e726877d28ea33a40 SHA1 16604dd9e71951c49cb9a2a2490ed5b09fc79976 SHA256 468122db4fa8863111f88ea941d149a765154ea43e35b2de02b8dfc811675590
 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
@@ -40,7 +48,8 @@ DIST opera-9.64.gcc4-static-qt3.i386.tar.bz2 9273212 RMD160 338c780de3d9495d3c27
 EBUILD opera-10.00_pre4340.ebuild 6449 RMD160 a3cb684d1ec9038f1d77d913f46eac8ee762789d SHA1 6593a3361f7d77d1aca87adb4fbacc27d75be85c SHA256 dae4cc7e8183d9997ab3f57103531aa18cbc85eb4a8729fa58076bc925485542
 EBUILD opera-10.00_pre4345.ebuild 6361 RMD160 32e809e38f8d64279e4b692ab26c6284173158ba SHA1 61edccab7580e142840b1a6a1e674e4f53c35856 SHA256 b4cf9e3204c216368eb307b5f727b793382e86fddbc283f150818e767d8cdac0
 EBUILD opera-10.00_pre4394.ebuild 6597 RMD160 00dce84b665b0d4787236d8dda89726b3a6e8e47 SHA1 a0da5c0fd86ce2c0fc3384c471354279322b01f3 SHA256 9b259b1b804b68174c566aa5a55218788593df066ae66209c4416c6130b44c3c
+EBUILD opera-10.00_pre4402.ebuild 6652 RMD160 aa49941ff8f73140d9ba666a90a6ba674f5ee215 SHA1 353ca70876a29037e75b1eea83308fcb45b77bd1 SHA256 9430b67ba43d2bf9ec85f2b0ef74c3f8cd281f3a5cc350f5a154d2918c5de790
 EBUILD opera-9.27.ebuild 6053 RMD160 fa86d79c0a1beae6d3605467122c2a5451b21bff SHA1 32d8ea747f757e99ce0af0c456c4aed71a660689 SHA256 4b0d2bb5bbbdc1eb4cee89f717d6bdc556337fb4d7e7973c216292d1f4cd8fee
 EBUILD opera-9.64.ebuild 7896 RMD160 0c981a40e72c64929e06cb3643e0a04ab538202d SHA1 64fcac7617e01be342ac7b0c2c65a38b9a867d92 SHA256 6eb45e59ecf811df18afc8ff52cb48d3608060a5c76c883abfa8772388dd7806
-MISC ChangeLog 67319 RMD160 66157059586754d7e7e44ce37206c1c4549c4a08 SHA1 207280698a3d5c0a35c082c82a6286bf968cc304 SHA256 fa7ab97314660a7499064e6a25463bd236a5e3a890f265df8c6817ec9034bb5b
+MISC ChangeLog 67530 RMD160 43860fbf4856924a4f05fe128de0afab09e05ea2 SHA1 e65b7d9723ee34768f9be2da6b94d7025248454a SHA256 08291d51c203d0e2a985f1abd2e0defcb50bf9d939de04fda6c401e7f4f4fa41
 MISC metadata.xml 697 RMD160 704ad62aa31055fa9c677a77b86ae8aab2a919aa SHA1 809cd142def2fe81ecce28c5d9fb8d54abb52120 SHA256 e65a1cc3846a285fa12fa8a751722c21baa2df029fbdf15b4ec86581dd911657
diff --git a/www-client/opera/opera-10.00_pre4402.ebuild b/www-client/opera/opera-10.00_pre4402.ebuild
new file mode 100644
index 000000000000..785a567ee1d2
--- /dev/null
+++ b/www-client/opera/opera-10.00_pre4402.ebuild
@@ -0,0 +1,232 @@
+# 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_pre4402.ebuild,v 1.1 2009/06/03 16:35:16 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-9.0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RESTRICT="mirror strip test"
+
+IUSE="elibc_FreeBSD gnome ia32 qt-static qt3"
+MY_LINGUAS="en-GB"
+
+for MY_LINGUA in ${MY_LINGUAS}; do
+	IUSE="${IUSE} linguas_${MY_LINGUA/-/_}"
+done
+
+O_U="mirror://opera/"
+
+SRC_URI="
+	ppc? ( ${O_U}linux/1000b1/beta1/en/ppc/shared/opera-10.00-b1.gcc4-shared-qt3.ppc.tar.bz2 )
+	qt-static? (
+		x86-fbsd? ( ${O_U}unix/freebsd/1000b1/en/intel/static/opera-10.00-b1-freebsd5-static-qt3.i386.tar.bz2 )
+		x86? (
+			qt3? ( ${O_U}linux/1000b1/beta1/en/i386/static/opera-10.00-b1.gcc4-static-qt3.i386.tar.bz2 )
+			!qt3? ( ${O_U}linux/1000b1/beta1/en/i386/opera-10.00-b1.gcc4-bundled-qt4.i386.tar.bz2 )
+		)
+		amd64? (
+			ia32? (
+				qt3? ( ${O_U}linux/1000b1/beta1/en/i386/static/opera-10.00-b1.gcc4-static-qt3.i386.tar.bz2 )
+				!qt3? ( ${O_U}linux/1000b1/beta1/en/i386/opera-10.00-b1.gcc4-bundled-qt4.i386.tar.bz2 )
+			)
+			!ia32? ( ${O_U}linux/1000b1/beta1/en/x86_64/opera-10.00-b1.gcc4-shared-qt3.x86_64.tar.bz2 )
+		)
+	)
+	!qt-static? (
+		x86-fbsd? ( ${O_U}unix/freebsd/1000b1/en/intel/shared/opera-10.00-b1-freebsd5-shared-qt3.i386.tar.bz2 )
+		x86? (
+			qt3? ( ${O_U}linux/1000b1/beta1/en/i386/shared/opera-10.00-b1.gcc4-shared-qt3.i386.tar.bz2 )
+			!qt3? ( ${O_U}linux/1000b1/beta1/en/i386/opera-10.00-b1.gcc4-qt4.i386.tar.bz2 )
+		)
+		amd64? (
+			ia32? (
+				qt3? ( ${O_U}linux/1000b1/beta1/en/i386/shared/opera-10.00-b1.gcc4-shared-qt3.i386.tar.bz2 )
+				!qt3? ( ${O_U}linux/1000b1/beta1/en/i386/opera-10.00-b1.gcc4-qt4.i386.tar.bz2 )
+			)
+			!ia32? ( ${O_U}linux/1000b1/beta1/en/x86_64/opera-10.00-b1.gcc4-shared-qt3.x86_64.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
+	x86? (
+		!qt-static? (
+			qt3? ( =x11-libs/qt-3*[-immqt] )
+			!qt3? (
+				x11-libs/qt-core
+				x11-libs/qt-gui
+			)
+		)
+	)
+	ppc? ( =x11-libs/qt-3*[-immqt] )
+	amd64? (
+		ia32? (
+			!qt-static? (
+				qt3? ( =x11-libs/qt-3*[-immqt] )
+				!qt3? (
+					x11-libs/qt-core
+					x11-libs/qt-gui
+				)
+			)
+		)
+		!ia32? ( =x11-libs/qt-3*[-immqt] )
+	)
+	x86-fbsd? ( !qt-static? ( =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
+}
+
+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"
+}
+
+src_configure() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a configure script exists.
+	true
+}
+
+src_compile() {
+	# This workaround is sadly needed because gnome2.eclass doesn't check
+	# whether a Makefile exists.
+	true
+}
+
+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
+}