From: Jeroen Roovers <jer@gentoo.org>
Date: Wed, 9 Nov 2011 16:09:35 +0000 (+0000)
Subject: http://my.opera.com/desktopteam/blog/2011/11/09/closing-in-on-a-tunny-opera-11-60... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=382fdd90c8bb294671cf54b48ff83c097de2e8b0;p=gentoo.git

my.opera.com/desktopteam/blog/2011/11/09/closing-in-on-a-tunny-opera-11-60-beta

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64
---

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 57023946f124..3157bdffc471 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/opera
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.660 2011/11/08 21:20:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.661 2011/11/09 16:09:35 jer Exp $
+
+*opera-11.60.1147 (09 Nov 2011)
+
+  09 Nov 2011; Jeroen Roovers <jer@gentoo.org> +opera-11.60.1147.ebuild:
+  http://my.opera.com/desktopteam/blog/2011/11/09/closing-in-on-a-tunny-opera-1
+  1-60-beta
 
 *opera-11.60.1145 (08 Nov 2011)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index d2b9996a89d0..ef1e0923844d 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -16,17 +16,21 @@ DIST opera-11.60-1144.x86_64.linux.tar.xz 12460648 RMD160 2da55f12b5d80d69b3a1c1
 DIST opera-11.60-1145.i386.freebsd.tar.xz 11514436 RMD160 be5a9134fc8d69ecfdec9bca83024d0baf6b7eb1 SHA1 1dbcaeda0b6addc6bb3e180484ef2d6d28f6caf6 SHA256 29be75ce825141cc6733961cf85af155a74d61327d2c6020f83d107038900289
 DIST opera-11.60-1145.i386.linux.tar.xz 11470368 RMD160 d9781ea2660acc3abaa81b3cfc75b606413bda67 SHA1 28fba00aea39efeb81ee0b61e56303902df84cfc SHA256 1ad8c2ae3f4b949307d61a94ad68d0c92e820938f84818571193f6db6802dbbb
 DIST opera-11.60-1145.x86_64.linux.tar.xz 12320788 RMD160 443954b35acdb95b31afd6866e95f73b6d4f3c62 SHA1 966005e971b2f2258e68ffa93f2f2ad151633a79 SHA256 1898097aa8dc247eefb909489eb36d03ff8bd514ffd2ee652eb816ec62f63ae0
+DIST opera-11.60-1147.i386.freebsd.tar.xz 11514556 RMD160 b5aeb9a2ba2f33d8c3d81351fbdd6e766c78950d SHA1 57271e201a2672fd0dec07e5dd52148274bb28d3 SHA256 f43343b184cfafa8c6347bad68a62b1fcd28775fce44a6304f78554cd3e24167
+DIST opera-11.60-1147.i386.linux.tar.xz 11486472 RMD160 b8aa8f83398dbbf9df2a9d260d807e7500a6e966 SHA1 781abf2c1ae78ebd7f92af9cb4c0ee2b4b43a216 SHA256 62c9ff4ee7849c93b850e2456a2e7707af18a8f9943e8f873f48ca3812702e58
+DIST opera-11.60-1147.x86_64.linux.tar.xz 12324564 RMD160 67c9627b18af59d16752464351224ea31de526ac SHA1 f75e87da34af426b0bc1c9fd5fcb6f9b89a09691 SHA256 1496d07cc58eec1b6209f01c2df6e315e45a1d755e54f2cd877eac89e79c48bc
 EBUILD opera-11.52.1100.ebuild 5700 RMD160 643a472817d7a959cabd8a927de31e17d8815428 SHA1 1709aabca35aee159583918d29572475e1a7764b SHA256 bc156a0c65f58d895c47d71351a42fa48c8ff07c4ef968e1486b4ed1a464a51b
 EBUILD opera-11.60.1134.ebuild 5787 RMD160 aaf27885f0060c39b1f14c0b5ef54d92d13aa46c SHA1 48a748cf01be89f9bd3af2b6d5d07922fdb4f273 SHA256 c9d355b51629ae87088a2e702f827eb73a624e19bf490edb612c458dd68e7d4a
 EBUILD opera-11.60.1139.ebuild 5914 RMD160 67904c987b61c9d93de3b5164207965afd28c30f SHA1 9bb5baa3880c0e4b5c95ff6bd58ecf112c0faac9 SHA256 4bbea81d811af19fa11121e7b057a30bc6ba9d1bc7a041f4f30814c5bba84790
 EBUILD opera-11.60.1144.ebuild 5963 RMD160 29178ad1c8ba112473e3fbbda2c336333c58a31f SHA1 445b0b1a8265ba2fee3b2249ccdcd985691549ce SHA256 02b5e9b9e814101eca0a5e201166989f645c8d0a1abc83cee6016779ad5b75e9
 EBUILD opera-11.60.1145.ebuild 5959 RMD160 e011a9967f4f7f47a77e6724ebd9f38f9d52d0ae SHA1 631d88da648e39e1d63e85649853a2e470128215 SHA256 2fc4a7f320ac8f7ce00635ef78557ea0eb37750b00c50cfd040e0b71fcfd6b99
-MISC ChangeLog 125956 RMD160 df121f98e49b7bbab50b2bd83809923c5550e7c6 SHA1 b3f1bf699e237afec082e653708170cdda279380 SHA256 9ac9cf09481631e66af42ddadc962dd59fdf35630958ebe919579e0679bc3fd7
+EBUILD opera-11.60.1147.ebuild 5961 RMD160 92ff2153f9016439062472489d66d74e9211d692 SHA1 d7dc8341ecb308cef017d817b02660a428f0d5a7 SHA256 b60bf0885a6d0b30839cc4aab6b703f51234510f71200599477043dc176e61de
+MISC ChangeLog 126155 RMD160 0a9b27ac10d8088d3694076a05a5016a24bd2ece SHA1 4771d3c7f4503ca4ec5279f3efe76dace4faed4e SHA256 d3aa5dcb6e7346bad0ab48db0f3a571932b5265440e02d36f14efbf14ef9fbc8
 MISC metadata.xml 732 RMD160 28acd15c216329d807150c88fb0861eb1383c61c SHA1 9ff443c6f422e8b018d29d21948da71eda6a4295 SHA256 bd388fb8f6b0aa2cd98fcfc290b677df712be3ef14537102e02665ea2f0d871a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk65nSMACgkQVWmRsqeSphPklgCfeJpd3o8JFnE3Qt87UFkTcmr3
-NSgAmgI/DNLVZTeSui3LNvPSXg7qSvlJ
-=C8Q8
+iEYEARECAAYFAk66pcgACgkQVWmRsqeSphMGpgCfW0yuelJDS18tiGwY9/zESq94
+8M0An0DWPPPeKFLKzFmNKiROhVAXHSPD
+=5Ozv
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera/opera-11.60.1147.ebuild b/www-client/opera/opera-11.60.1147.ebuild
new file mode 100644
index 000000000000..20d0ed84191c
--- /dev/null
+++ b/www-client/opera/opera-11.60.1147.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.60.1147.ebuild,v 1.1 2011/11/09 16:09:35 jer Exp $
+
+EAPI="4"
+
+inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
+
+DESCRIPTION="A fast and secure web browser and Internet suite"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-11 LGPL-2 LGPL-3"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk gtk3 kde +gstreamer"
+
+O_V="$(get_version_component_range 1-2)" # Major version, i.e. 11.00
+O_B="$(get_version_component_range 3)"   # Build version, i.e. 1156
+
+O_D="betarc1_${O_V}-${O_B}"
+O_P="${PN}-${O_V}-${O_B}"
+O_U="http://snapshot.opera.com/unix/"
+
+SRC_URI="
+	amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
+	x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
+	x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
+"
+
+OPREFIX="/usr/$(get_libdir)"
+
+QA_DT_HASH="${OPREFIX}/${PN}/.*"
+QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+O_LINGUAS="af az be bg bn cs da de el en-GB es-ES es-LA et fi fr fr-CA fy gd hi
+hr hu id it ja ka ko lt me mk ms nb nl nn pa pl pt pt-BR ro ru sk sr sv sw ta te
+th tl tr uk uz vi zh-CN zh-TW zu"
+
+for O_LINGUA in ${O_LINGUAS}; do
+	IUSE="${IUSE} linguas_${O_LINGUA/-/_}"
+done
+
+DEPEND="
+	>=sys-apps/sed-4
+	app-arch/xz-utils
+"
+GTKRDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	x11-libs/pango
+	x11-libs/pixman
+"
+KDERDEPEND="
+	kde-base/kdelibs
+	x11-libs/qt-core
+	x11-libs/qt-gui
+"
+GSTRDEPEND="
+	dev-libs/glib
+	dev-libs/libxml2
+	media-libs/gst-plugins-base
+	media-libs/gstreamer
+	media-plugins/gst-plugins-meta
+"
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXrender
+	x11-libs/libXt
+	gtk? ( ${GTKRDEPEND} )
+	gtk3? ( ${GTKRDEPEND} )
+	kde? ( ${KDERDEPEND} )
+	gstreamer? ( ${GSTRDEPEND} )
+"
+
+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}
+	mv -v ${PN}* "${S}" || die
+}
+
+src_prepare() {
+	local LNGDIR="share/${PN}/locale"
+
+	# Count linguas
+	count() { echo ${#}; }
+	local lingua_count=$(count ${O_LINGUAS} en)
+	local locale_count=$(count ${LNGDIR}/*)
+	[[ ${lingua_count} = ${locale_count} ]] \
+		|| die "Number of LINGUAS does not match number of locales"
+	unset count
+
+	# Remove unwanted linguas
+	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}" || die "The list of linguas needs to be fixed"
+		fi
+	done
+
+	# Remove doc directory but keep the LICENSE under another name (bug #315473)
+	mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
+	rm -rf share/doc
+	for locale in share/${PN}/locale/*; do
+		rm -f "${locale}/license.txt"
+		ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
+			|| die
+	done
+
+	# Remove package directory
+	rm -rf share/${PN}/package
+
+	# Optional libraries
+	if ! use gtk; then
+		rm lib/${PN}/liboperagtk2.so || die
+	fi
+	if ! use gtk3; then
+		rm lib/${PN}/liboperagtk3.so || die
+	fi
+	if ! use kde; then
+		rm lib/${PN}/liboperakde4.so || die
+	fi
+	if ! use gstreamer; then
+		rm -r lib/${PN}/gstreamer || die
+	fi
+
+	# Unzip the man pages before sedding
+	gunzip share/man/man1/* || die
+
+	# Replace PREFIX, SUFFIX and PN in various files
+	sed -i \
+		-e "s:@@{PREFIX}:/usr:g" \
+		-e "s:@@{SUFFIX}::g" \
+		-e "s:@@{_SUFFIX}::g" \
+		-e "s:@@{USUFFIX}::g" \
+		-e "s:opera:${PN}:g" \
+		share/man/man1/* \
+		share/applications/${PN}-*.desktop \
+		|| die
+
+	# Replace "Opera" with "Opera Next"
+	if [[ ${PN} = opera-next ]]; then
+		sed -i share/applications/${PN}-*.desktop \
+			-e "/^Name=Opera\|^ Next/s:Opera:& Next:" || die
+	fi
+
+	# Create /usr/bin/opera wrapper
+	echo '#!/bin/sh' > ${PN}
+	echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
+	echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
+		>> ${PN}
+	echo 'export LD_PRELOAD="/usr/'$(get_libdir)'/libgtk-x11-2.0.so"' >> ${PN}
+	echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
+
+	# 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
+	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 share/ "${D}/usr/" || die
+
+	# Install startup scripts
+	dobin ${PN}
+
+	# Stop revdep-rebuild from checking opera binaries
+	dodir /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
+		> "${D}"/etc/revdep-rebuild/90${PN}
+
+	# Set PaX markings for hardened/PaX (bug #344267)
+	pax-mark m \
+		"${D}/${OPREFIX}/${PN}/${PN}" \
+		"${D}/${OPREFIX}/${PN}/operaplugincleaner" \
+		"${D}/${OPREFIX}/${PN}/operapluginwrapper"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use elibc_FreeBSD; then
+		elog
+		elog "To improve shared memory usage please set:"
+		elog "$ sysctl kern.ipc.shm_allow_removed=1"
+	fi
+
+	# Update desktop file database and gtk icon cache (bug #334993)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug #334993)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}