http://my.opera.com/desktopteam/blog/2010/08/02/second-release-candidate-for-10-61

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

3 files changed, 213 insertions, 2 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index d9904f564d18..90d7aa919851 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.523 2010/07/28 16:21:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.524 2010/08/02 15:16:42 jer Exp $
+
+*opera-10.61_pre6422 (02 Aug 2010)
+
+  02 Aug 2010; Jeroen Roovers <jer@gentoo.org> +opera-10.61_pre6422.ebuild:
+  http://my.opera.com/desktopteam/blog/2010/08/02/second-release-candidate-f
+  or-10-61
 
   28 Jul 2010; Jeroen Roovers <jer@gentoo.org> opera-10.61_pre6415.ebuild:
   Whitespace style.
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 34643b8370b4..e7b82c75bdb2 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -17,6 +17,10 @@ DIST opera-10.61-6415.i386.freebsd.tar.bz2 12738624 RMD160 2911b93b7aac2bd375e47
 DIST opera-10.61-6415.i386.linux.tar.bz2 12662162 RMD160 68a3066702826bf18436e5df4158793041844d91 SHA1 eb27f8d283a8b2078bc67168a7a8b9f3f4ce52c0 SHA256 7714fd417fbfac2efda01a23795d6e9639edd3be3ce26dbe38a2b29150fe9e70
 DIST opera-10.61-6415.ppc.linux.tar.bz2 12998706 RMD160 bdca3ec589aadd8dced75800fa5e954ef5214b90 SHA1 3da2887c80b6e5818ef1fc00a564a701c18e3277 SHA256 eb706141f4ea75d33d3a61df102bf1e9a48356723bb16f0b8d7c94b769badbf4
 DIST opera-10.61-6415.x86_64.linux.tar.bz2 13775986 RMD160 de6f1d39245bc2b944ebebff13d38c59cd070eb7 SHA1 49c32d0ed04e8e38680863b2cb99576e1817e5fc SHA256 8075395de0d09bca32ca5eb19fb2a33a0d651be953d36cb78f3943cf7ef1e2a8
+DIST opera-10.61-6422.i386.freebsd.tar.bz2 12736543 RMD160 9321626456c0ddebd5304a7161df6bb77c77336c SHA1 8ab73d3d852145a0c9a9e7f9f2856022c4bdbef8 SHA256 1076aefde35a2d8d5b2042b2c1ab29c3227db23351f654f1149dbcd346e3a943
+DIST opera-10.61-6422.i386.linux.tar.bz2 12665150 RMD160 a922b3552455fd8872a8355bad6d04ed217b98df SHA1 5d4fecc1f2a321b0b39e1fc36eca85962f59fc34 SHA256 2f37beb37c5a7e5a3de6a56314ee06e9ec44a010a9b9f54ca53f543905907fe2
+DIST opera-10.61-6422.ppc.linux.tar.bz2 12999317 RMD160 6f9f907b75aa4d985c3ba5a21905539250050abc SHA1 fdbe1f745a5694f6ab1f0d322dbc54e222012b7c SHA256 ad48bae6bef7faacfa9a7e4d6222b4f2b844c273ff4dabdb9777f978101909dd
+DIST opera-10.61-6422.x86_64.linux.tar.bz2 13782837 RMD160 93d2c9495d3bf2f6e576214145df79c6ab7d66aa SHA1 773ecc77205ddad96fdf3991ebe48f058818eb72 SHA256 bac2fd55b1ea49357af395b35b7ca9c6d3c49598a306ab949cd3cc232e68f7b4
 DIST opera-10.70-6395.i386.freebsd.tar.bz2 12720918 RMD160 434249a4c937725b2cbf426dd473acf69fb6932e SHA1 f4523d1e78f61d20bb4247fd7534ff09e8073dc6 SHA256 7228d7d2f1d23b9c36f2b560bb20622af775d064b90e7cde76c7aab2e3678184
 DIST opera-10.70-6395.i386.linux.tar.bz2 12652240 RMD160 51ec60ce4e54f2762c4a4d42e25410ae9e706ad1 SHA1 6592178cc9ffbe3ba8cb9ec7e10e0f8e748d5f99 SHA256 d5910317d49e69cb6c392086312209475d39bb45e3f6c87b9f148b8de64d34a6
 DIST opera-10.70-6395.x86_64.linux.tar.bz2 13682093 RMD160 bed6def768f2d7d1381704402238bfe608f8d5e0 SHA1 f74aaf9e447d8448e63bd7ca6833b8372f449622 SHA256 a94de29c06f5ac5d198aaa41d7c8eb02f9a612b783279bbff6ca75a812920096
@@ -27,7 +31,8 @@ EBUILD opera-10.11.ebuild 4931 RMD160 13ff28c49a332f816a6c6977f44b105f6063a7e6 S
 EBUILD opera-10.60-r1.ebuild 5116 RMD160 a2db2551d8231759b16c68d8b987dbb4b9d67105 SHA1 4d5dfd6568e98f345c62bf5c128b5f4dbfcdfaca SHA256 b4a9495b48e6fa1ba17f7e8ebf3a8a331f8ac7c9aa23c2d9e30406ba49a1df10
 EBUILD opera-10.60.ebuild 4884 RMD160 a3125d90cf4bdd16bd80ef36b14eff6a643046bf SHA1 2687a180ea3c9d1c5cbe90815e4a95d0c0cb6d17 SHA256 9b597ed777844ef7c980592d0f8cf703f455cd302620a9c42d6b91f46569173f
 EBUILD opera-10.61_pre6415.ebuild 5076 RMD160 6757c9ee48fed2fe22d7d1184841e7d9f0b55434 SHA1 256490d28648aa8e27f506d4d7a485f2b5014265 SHA256 e4e82494655f29d79046f41dc377dc22373210cd577643458207c9c70c7afe1e
+EBUILD opera-10.61_pre6422.ebuild 5076 RMD160 f7204695306b4f741de58b42fce1eaec9c94d350 SHA1 95a701176ffecab66885e05cc6db7a22b56d1ae1 SHA256 37c69b1a7ed444b61444adfcb04c8e76179230585fd5d7e8c237598fbc85ffc1
 EBUILD opera-10.70_pre6395.ebuild 5058 RMD160 7e66ac013104dab2576c8d406fd6d2b9d0a7dd8f SHA1 8c94c2b4554f89ea60afdc26baf80b1aa254aff0 SHA256 6ea0df548d871838e331fda6c6e146885b5dac02374d5d413bbb6a4f04dff07c
 EBUILD opera-10.70_pre6396.ebuild 5031 RMD160 cfc69f32c6198d42ebe932974cdbcdafc43e1d7d SHA1 0a774997faa7ca7378656685bb9f7481f5455b01 SHA256 0b9d023fa0ffae9a5b7c6e2dbdc3a0bca8b08a6d0249477ec8861ab1fd7b1401
-MISC ChangeLog 100575 RMD160 9298a7366001d9d47855323530a86756bffc56de SHA1 ca126040e2392982bcb8dbd23b062103e1c1079a SHA256 433e39bb54db3cdfcda245d99344ced891d14ad2e99af32e544ed1fc63b16b0c
+MISC ChangeLog 100776 RMD160 ce76175a3bb52cc19c7f53e023cede4b5690e019 SHA1 157e2da81f61d3d809afa2438623c4b0127bf288 SHA256 578822e3da8d389fd718927b7535047d7a83e3051a98eeded838c394a4a5b106
 MISC metadata.xml 722 RMD160 f424184eb789ae7afcf8c19a74de21a6029366d2 SHA1 5726f20bc46f15fd7a769293bda721afd2d3df8c SHA256 415493d83f3ebe328fd8a4038f90833cbcc0f983b43c01d9440782bbcfeb4e3a
diff --git a/www-client/opera/opera-10.61_pre6422.ebuild b/www-client/opera/opera-10.61_pre6422.ebuild
new file mode 100644
index 000000000000..ca740b5a29c1
--- /dev/null
+++ b/www-client/opera/opera-10.61_pre6422.ebuild
@@ -0,0 +1,200 @@
+# 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.61_pre6422.ebuild,v 1.1 2010/08/02 15:16:42 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 +gstreamer"
+
+RESTRICT="mirror test"
+
+OPREFIX="/usr/$(get_libdir)"
+
+QA_DT_HASH="${OPREFIX}/${PN}/.*"
+QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+O_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 O_LINGUA in ${O_LINGUAS}; do
+	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
+done
+
+O_V="${PV/_pre/-}"
+O_P="${PN}-${O_V}"
+O_U="http://snapshot.opera.com/unix/15204_${O_V}/"
+
+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
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/pixman
+	)
+	kde? (
+		kde-base/kdelibs
+	)
+	dev-libs/expat
+	media-libs/fontconfig
+	media-libs/freetype
+	gstreamer? ( 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
+"
+
+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_prepare() {
+	# Remove "license directory" (bug #315473)
+	rm -rf share/doc/opera
+
+	# Remove package directory
+	rm -rf share/opera/package
+
+	# Leave libopera*.so only if the user chooses
+	if ! use gtk; then
+		rm lib/opera/liboperagtk.so || die "rm liboperagtk.so failed"
+	fi
+	if ! use kde; then
+		rm lib/opera/liboperakde4.so || die "rm liboperakde4.so failed"
+	fi
+
+	# Unzip the man pages before sedding
+	gunzip 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" \
+		share/mime/packages/opera-widget.xml \
+		share/man/man1/* \
+		share/applications/opera-browser.desktop \
+		share/applications/opera-widget-manager.desktop \
+		|| die "sed failed"
+
+	# Fix libdir in opera script
+	sed \
+		"${FILESDIR}"/opera \
+		-e "s|OPERA_LIBDIR|${OPREFIX}|g" > opera \
+		|| die "sed opera script failed"
+
+	# Fix libdir in defaults/pluginpath.ini
+	sed -i \
+		share/opera/defaults/pluginpath.ini \
+		-e "s|/usr/lib32|${OPREFIX}|g" \
+		-e '/netscape/{s|[0-1]|2|g}' \
+		|| die "sed pluginpath.ini failed"
+
+	# Remove unwanted linguas
+	LNGDIR="share/${PN}/locale"
+	einfo "Keeping these locales (linguas): ${LINGUAS}."
+	for LINGUA in ${O_LINGUAS}; do
+		if ! use linguas_${LINGUA/-/_}; then
+			LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+			rm -r "${LINGUA}"
+		fi
+	done
+
+	# Change libz.so.3 to libz.so.1 for gentoo/freebsd
+	if use elibc_FreeBSD; then
+		scanelf -qR -N libz.so.3 -F "#N" lib/${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 \
+				"$i" \
+				-e 's/libz\.so\.3/libz.so.1/g'
+		done
+		[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
+	fi
+}
+
+src_install() {
+	# 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"
+
+	# 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
+}
+
+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
+}