Version bump <http://my.opera.com/desktopteam/blog/2010/05/31/opera-10-60-alpha-1>.

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

3 files changed, 200 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index c2c659265f3d..ffb403a6f926 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.482 2010/05/26 20:27:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.483 2010/05/31 14:32:43 jer Exp $
+
+*opera-10.60_pre6344 (31 May 2010)
+
+  31 May 2010; Jeroen Roovers <jer@gentoo.org> +opera-10.60_pre6344.ebuild:
+  Version bump
+  <http://my.opera.com/desktopteam/blog/2010/05/31/opera-10-60-alpha-1>.
 
 *opera-10.54_pre6340-r1 (26 May 2010)
 *opera-10.53_pre6330-r2 (26 May 2010)
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index c3c2ac39cc0f..4adff96ea67e 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -17,9 +17,14 @@ DIST opera-10.54-6340.i386.freebsd.tar.bz2 13296000 RMD160 90e2ca99f1d3d91b6065c
 DIST opera-10.54-6340.i386.linux.tar.bz2 13278044 RMD160 8a54df28446dfd424565a3b907cd8160c9457c02 SHA1 a55180fcec8dd7d8a893e06ef84ba4ff20e67f84 SHA256 174b31b241242aa08859a1a0696963615d0b19cc49eb3720d4e402d41bc121e2
 DIST opera-10.54-6340.ppc.linux.tar.bz2 13583414 RMD160 f11fcefb09a2c466d8b5aa02f679e485a2522a0a SHA1 e1c52587700f152ec4a855f12056c1a84985e328 SHA256 8bf383fb3bc2a82cc4154527a98fb57057b60f223f7b987648c70a03d1d7ddd4
 DIST opera-10.54-6340.x86_64.linux.tar.bz2 14256069 RMD160 3f2d1c93951733e56227e3e1f1dac8f97d045ffb SHA1 87d9fffa6a75efc6ad5f8928828c3ef0a2554f9d SHA256 8cb4101d3934aa744a484a18795dd21f427a2a20b2d8134406a0b54d1ae414aa
+DIST opera-10.60-6344.i386.freebsd.tar.bz2 13369015 RMD160 5d09d1ec892bcc5f118204cc93e58ba25d0ff6c5 SHA1 7afd0e0ce386c425943ea0d7159637ed41c87179 SHA256 8fb7393ad3958f5d49942025dca66df8f0b956482e34376b32cb156a282a2735
+DIST opera-10.60-6344.i386.linux.tar.bz2 13370466 RMD160 9a08433a53501c82456ea2b9a0b95c802348cdd8 SHA1 f92beb2b1b07f0edec4b781c28fca2b41d48545a SHA256 7b00b77464c386df99b7c968a136d679697d7377091f00dd7d1f248a3c847348
+DIST opera-10.60-6344.ppc.linux.tar.bz2 13724746 RMD160 85b7403e9d742172598f235289e4735cc455e09d SHA1 f8c02c388e11e345de66495570e658b954b7e40c SHA256 72903fd52838873561202505eca35e9e04349c57cdb607518d3c97b3bda93d7a
+DIST opera-10.60-6344.x86_64.linux.tar.bz2 14380587 RMD160 5b5271d3adf15c5bb3a052bf7337cca27d74962c SHA1 78424a10a409f6e350c7bf4ff85413cd4985ab1f SHA256 a03f4d48df38dd3384c34f5475a3f01864f8adde22b8420a969fcda6fe831a6e
 EBUILD opera-10.10-r1.ebuild 4893 RMD160 2733461c1ddbceae8a1177fb931693aedaaf8a2d SHA1 1c95510bf92b10420c5739c1e45cdf80aee07627 SHA256 36e9ec97cb0e8d5b01a0765e56ff7fda46f80e0590ca4342aaada9632bc62d3a
 EBUILD opera-10.10.ebuild 4893 RMD160 6691d79a5f95c3e3d0701b4129a481875399d587 SHA1 2bd8f1a8e97f79607afc1f2ad0edf8a4c80c7f62 SHA256 8dc65519c765759956195bad7bd25bade46c222bfeb10d9e5057bf4f7bb90565
 EBUILD opera-10.53_pre6330-r2.ebuild 4773 RMD160 db11da60763d64681347802d6cb9d34b81e2eeed SHA1 51b73ddd3939cdeb29ecb1a03922f263ce4b092d SHA256 67ab337ffb5a4ed072a206b01814f45de2d7588042d4e4f85533d520a591048e
 EBUILD opera-10.54_pre6340-r1.ebuild 4872 RMD160 279d2b490eee587d06f27b7673804aa4435d4624 SHA1 72ac639230eadf34be9db5235f0c54170841e1e1 SHA256 3f12096d1f3b3fcc79117a99391b49581e62ec895a73547e714200869aca4cda
-MISC ChangeLog 93730 RMD160 15ee092dc42e66be18355fef484a280d0c69c7e0 SHA1 8f7a191be363244ccdecd56f82c4a988ab211706 SHA256 0835ce2979d65ab741742b12a50fbebad4c9d1e18d9eb3abdebda63f34d7a28d
+EBUILD opera-10.60_pre6344.ebuild 4856 RMD160 40535d5411d8ffc3dbd013bb436e3adb61d36f47 SHA1 eb3fce046a7581be3ff7bd221d6cd63b87659ca0 SHA256 15db21e3b3fbf491ff51703b423b1f00794e731c63e7b7448744b34bba168921
+MISC ChangeLog 93931 RMD160 c06424e21af9c7df808b3ed8390eeccafefe5fd3 SHA1 84a22a10df564ac25cf6ee75b914fdb06fd92113 SHA256 7bf468150f15d756cde2ed0858161e9894abd85ffaa8b70d94662884d5b8c41d
 MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a
diff --git a/www-client/opera/opera-10.60_pre6344.ebuild b/www-client/opera/opera-10.60_pre6344.ebuild
new file mode 100644
index 000000000000..78b174b2efd3
--- /dev/null
+++ b/www-client/opera/opera-10.60_pre6344.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.60_pre6344.ebuild,v 1.1 2010/05/31 14:32:43 jer Exp $
+
+EAPI="2"
+
+inherit eutils multilib
+
+DESCRIPTION="A standards-compliant graphical Web browser"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-10.53 LGPL-2 LGPL-3"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk kde"
+
+RESTRICT="mirror test"
+
+OPREFIX="/usr/$(get_libdir)"
+
+QA_DT_HASH="${OPREFIX}/${PN}/.*"
+QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+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 vi 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/10.60a1/"
+O_P="${P/_pre/-}"
+
+SRC_URI="
+	amd64? ( ${O_U}${O_P}.x86_64.linux.tar.bz2 )
+	ppc? ( ${O_U}${O_P}.ppc.linux.tar.bz2 )
+	x86? ( ${O_U}${O_P}.i386.linux.tar.bz2 )
+	x86-fbsd? ( ${O_U}${O_P}.i386.freebsd.tar.bz2 )
+"
+
+DEPEND=">=sys-apps/sed-4"
+
+RDEPEND="
+	gtk? (
+		=x11-libs/gtk+-2*
+		dev-libs/atk
+		dev-libs/glib
+		media-libs/glitz
+		media-libs/libpng
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/pixman
+	)
+	kde? (
+		kde-base/kdelibs
+	)
+	dev-libs/expat
+	media-libs/fontconfig
+	media-libs/freetype
+	media-plugins/gst-plugins-meta
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	"
+
+opera_linguas() {
+	# Remove unwanted LINGUAS:
+	local LINGUA
+	local LNGDIR="${D}usr/share/${PN}/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() {
+	echo -e \
+		" ${GOOD}****************************************************${NORMAL}"
+	elog "If you seek support, please file a bug report at"
+	elog "https://bugs.gentoo.org and post the output of"
+	elog " \`emerge --info =${CATEGORY}/${P}'"
+	echo -e \
+		" ${GOOD}****************************************************${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_install() {
+	# Remove "license directory" (bug #315473)
+	rm -rf "share/doc/opera"
+
+	# We install into usr instead of opt as Opera does not support the latter
+	dodir /usr
+	mv lib/  "${D}/${OPREFIX}" || die "mv lib/ failed"
+	mv share/ "${D}/usr/" || die "mv share/ failed"
+
+	# Unzip the man pages before sedding
+	gunzip "${D}"/usr/share/man/man1/* || die "gunzip failed"
+
+	# Replace PREFIX and SUFFIX in various files
+	sed -i \
+		-e "s:@@{PREFIX}:/usr:g" \
+		-e "s:@@{SUFFIX}::g" \
+		-e "s:@@{_SUFFIX}::g" \
+		-e "s:@@{USUFFIX}::g" \
+		"${D}"/usr/share/mime/packages/opera-widget.xml \
+		"${D}"/usr/share/man/man1/* \
+		"${D}"/usr/share/applications/opera-browser.desktop \
+		"${D}"/usr/share/applications/opera-widget-manager.desktop || die "sed failed"
+
+	# Sed libdir in opera script
+	sed "${FILESDIR}"/opera \
+		-e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \
+		|| die "sed opera script failed"
+
+	# Sed libdir in defaults/pluginpath.ini
+	sed -i \
+		-e "s|/usr/lib32|${OPREFIX}|g" \
+		"${D}"/usr/share/opera/defaults/pluginpath.ini \
+		|| die "sed pluginpath.ini failed"
+
+	# Install startup scripts
+	dobin ${PN} ${PN}-widget-manager || die "dobin failed"
+
+	# Stop revdep-rebuild from checking opera binaries
+	dodir /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" > "${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}"${OPREFIX}/${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
+
+	[[ -z MY_LINGUAS ]] || opera_linguas
+}
+
+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 /usr/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
+}