From: Jeroen Roovers <jer@gentoo.org>
Date: Tue, 6 Dec 2011 14:03:25 +0000 (+0000)
Subject: http://my.opera.com/desktopteam/blog/2011/12/06/11-60-goes-final (bug #393395)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d91ccdd86d33144426f9f3cb8137291178473bc0;p=gentoo.git

my.opera.com/desktopteam/blog/2011/12/06/11-60-goes-final (bug #393395)

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

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index 153de2172a9d..7d4f2aaabc03 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,13 @@
 # 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.674 2011/12/03 17:36:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.675 2011/12/06 14:03:25 jer Exp $
+
+*opera-11.60.1185 (06 Dec 2011)
+
+  06 Dec 2011; Jeroen Roovers <jer@gentoo.org> -opera-11.60.1181.ebuild,
+  -opera-11.60.1184.ebuild, +opera-11.60.1185.ebuild:
+  http://my.opera.com/desktopteam/blog/2011/12/06/11-60-goes-final (bug
+  #393395)
 
 *opera-11.60.1184 (03 Dec 2011)
 
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index ec9294e35856..204c4334e6ec 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -4,21 +4,17 @@ Hash: SHA1
 DIST opera-11.52-1100.i386.freebsd.tar.xz 11116644 RMD160 7692b599389e2d3e3e6f8c3ad8176d1d3bec6eff SHA1 4335431402fc0aea985c045c818dc23fbe00a6c4 SHA256 ae90c802ba9f1f487df71dddfb538af08265421341cc3146ac80ddfaa6b452d3
 DIST opera-11.52-1100.i386.linux.tar.xz 11083092 RMD160 54252f6f655e2d7f38931ab3338c100e4ed49eca SHA1 3c4a7b36016aa9727cb7805db504d0159fe8ac6e SHA256 ccbfdcd0f9f5e35f64f6b71410b5af7b5e749f0976e530d1543d6cc58b989af9
 DIST opera-11.52-1100.x86_64.linux.tar.xz 11860188 RMD160 dbeb3375eb9443559bbda05fc90a1e00f81df6cf SHA1 69eab27253f7dc9bb1e7ecf57983f0d675ec158e SHA256 9880b91733eddc17b85edba3eef0fe96c7e6a8fb3cc8c802b3719307214cb7a5
-DIST opera-11.60-1181.i386.freebsd.tar.xz 11533308 RMD160 c1d26d3ed16d275158dd32d52faa203725c66ca5 SHA1 5bc82c3e3049ba5851c4d6566378f9514014c2df SHA256 421820958aad4ec1ae79cc4a8cd108a7ef57c6a387faed4ba2efd8460998b378
-DIST opera-11.60-1181.i386.linux.tar.xz 11500756 RMD160 ba8821bc6c348a2dc5c5843931aeb14fd39a3b85 SHA1 0ca97f1669dbb24769d2af50008bac1fb49d163c SHA256 7e23000a58c254fa56843b20cf1669a1298f938e26dd48411918f4d1a3ee867d
-DIST opera-11.60-1181.x86_64.linux.tar.xz 12343788 RMD160 6165af26f31bc375592801331dfffee61119d32b SHA1 bab8b21ddbe6fd39dd2e468e78f6b79bdf9fe1b1 SHA256 02e2767b5e3df9cb4fab0b70516f14183bc462e62d3d20a9b16d53bafdd622b0
-DIST opera-11.60-1184.i386.freebsd.tar.xz 11537424 RMD160 aa58625d9513846db83e3850e06116e3dbd8789a SHA1 d6f7a0463f966e69df4d60becdf47483bc0b2f04 SHA256 3ba71a450951829d79e88ea4e48340f8e20020ff191f03e9b57aaafd281644a7
-DIST opera-11.60-1184.i386.linux.tar.xz 11506772 RMD160 5700a4e9baf876b184d54e2cd025fcaca64d9f0b SHA1 7bdacc76ad9fd73d1dacad9bf0a3d08c82be3d37 SHA256 36539747b681096713dbe4674d64a901a807fb5719200dcdde1d3abb9ceefdb2
-DIST opera-11.60-1184.x86_64.linux.tar.xz 12341524 RMD160 65bbfa427f58ce1a6849dc4a7a76e71fb2a12f6f SHA1 6412e0641aa1e8449c6b292dbea3a92439c49888 SHA256 4f83bac65811f76a2068c6561fe1bca7fc2696b7dfb3adbed8d1e5d2582665f9
+DIST opera-11.60-1185.i386.freebsd.tar.xz 11537236 RMD160 9b8dc467f698cf540c0f537a98677930a077a0c4 SHA1 befc0d908b76d930bf9a0ac753ccfc2b086189fb SHA256 eb38671f9b5e06ba7b905bd9ff22262e9ef335c37414bbb0ea4234aa2b2ba46d
+DIST opera-11.60-1185.i386.linux.tar.xz 11505432 RMD160 f645c292f34a08a2bc44107f3ca57f4f0a1a55bd SHA1 96e3366afff3b738db9fadbd1046623827afaf00 SHA256 a73584938a558d1b9c6f250d1bf127b02fc6ca5c0378c4ee3009c178fe1c8a74
+DIST opera-11.60-1185.x86_64.linux.tar.xz 12347432 RMD160 50de639af506a0493843763cadc2c8e74d201538 SHA1 dc6d2cf74ed98dfb3625529a03a6d9107a4d01cf SHA256 a3ede13b6abe92633e4728773b472c8e0571717161ced7935ac3bc7ff728c642
 EBUILD opera-11.52.1100.ebuild 5695 RMD160 7347ebe510e769a44dc494926ac33e5049561286 SHA1 65f1222bf21cce7524907d77c52d95c933da2678 SHA256 19126014c026a5ca4d89b5d999763c32b9f6ba54e403dc3ca8ea5fbd46d5ddb5
-EBUILD opera-11.60.1181.ebuild 5967 RMD160 4465eafd514deebac4918f60dd45ebcb13dcad3d SHA1 5ba078922422311c756c7b342952860824a83e9a SHA256 6acf6f4cc6b0450a7d41f3c5eb4b32c894726339345734b15cfa3ff2c5956953
-EBUILD opera-11.60.1184.ebuild 5959 RMD160 e44a91467f735aa366fd5d426bd01f03ba9bc0d1 SHA1 6280c3218d2a93d10a79c43e4ec26925d04ca00e SHA256 fd48953d131c82b16a425a60dd77cf27295d542e10074bae7df66d0325a41cf3
-MISC ChangeLog 128707 RMD160 6feb3fc6bff8f93b483f2aecc7d7e9d051776452 SHA1 a913c232b15d37ad4de412d27f65edbd6750c7af SHA256 168a1be162b126e7916ff2741eaf0d86d741706f8e6d28738150b18a8278131a
+EBUILD opera-11.60.1185.ebuild 5952 RMD160 5a1e58602b8d077e75d97d91c5650cf5064eb934 SHA1 ec3c57f530b201c997658bf132a8a109b3a6004c SHA256 44d04a74138bd2229d7c97f5362cf9283fa026f6b0e3f7be2111e1da806cc04e
+MISC ChangeLog 128951 RMD160 168bbaeda75fc8c6e1eb0d06c6accb2da75fef2a SHA1 0ec2c2ddcd76ddd491486b693d6871fc234f5b96 SHA256 02ca80e703551d472d3e7475acc0746785e23f5c52ba693154e898fba5547643
 MISC metadata.xml 732 RMD160 28acd15c216329d807150c88fb0861eb1383c61c SHA1 9ff443c6f422e8b018d29d21948da71eda6a4295 SHA256 bd388fb8f6b0aa2cd98fcfc290b677df712be3ef14537102e02665ea2f0d871a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7aXigACgkQVWmRsqeSphNGHwCdHhMiJ/fhDv/oN+uowmw0qkf4
-XnYAn3eI3V84IXiU98h+GCrt2yzN18oG
-=6PgL
+iEYEARECAAYFAk7eILMACgkQVWmRsqeSphO7kACfbOa9ebJaCQR5571r0g7E3mj4
+2PEAn3V+K+qlgK/gzkvGqkIgKAIGO6u1
+=yBb/
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera/opera-11.60.1181.ebuild b/www-client/opera/opera-11.60.1181.ebuild
deleted file mode 100644
index 15375cf1ad46..000000000000
--- a/www-client/opera/opera-11.60.1181.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# 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.1181.ebuild,v 1.1 2011/12/02 15:57:33 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="earthmother_${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:2
-	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
-}
diff --git a/www-client/opera/opera-11.60.1184.ebuild b/www-client/opera/opera-11.60.1185.ebuild
similarity index 95%
rename from www-client/opera/opera-11.60.1184.ebuild
rename to www-client/opera/opera-11.60.1185.ebuild
index d0c0dbb44183..7b215c964640 100644
--- a/www-client/opera/opera-11.60.1184.ebuild
+++ b/www-client/opera/opera-11.60.1185.ebuild
@@ -1,6 +1,6 @@
 # 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.1184.ebuild,v 1.1 2011/12/03 17:36:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-11.60.1185.ebuild,v 1.1 2011/12/06 14:03:25 jer Exp $
 
 EAPI="4"
 
@@ -17,14 +17,14 @@ 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="rc2_${O_V}-${O_B}"
+O_D="${O_V/./}"
 O_P="${PN}-${O_V}-${O_B}"
-O_U="http://snapshot.opera.com/unix/"
+O_U="mirror://opera/"
 
 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 )
+	amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
+	x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
+	x86-fbsd? ( ${O_U}unix/${O_D}/${O_P}.i386.freebsd.tar.xz )
 "
 
 OPREFIX="/usr/$(get_libdir)"