Stable for AMD64 x86 too.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --ignore-arches
Manifest-Sign-Key: 0xA792A613

4 files changed, 15 insertions, 252 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index e77a681891a1..002d02053eef 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/opera
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.819 2013/08/10 14:43:28 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.820 2014/04/23 14:11:59 jer Exp $
+
+  23 Apr 2014; Jeroen Roovers <jer@gentoo.org> -opera-12.16_p1860.ebuild,
+  opera-12.16_p1860-r1.ebuild:
+  Stable for AMD64 x86 too.
 
   10 Aug 2013; Jeroen Roovers <jer@gentoo.org> opera-12.16_p1860.ebuild,
   opera-12.16_p1860-r1.ebuild:
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 0aaa744b8acd..6453e27eb9c7 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -5,15 +5,14 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 SHA256 ecc001605c45baa4acf60
 DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
-EBUILD opera-12.16_p1860-r1.ebuild 6418 SHA256 5604bda3e8695d75b6c97aae8784e10a7c195e2b9f6fd6d0287efd65c0c2e011 SHA512 085015f322a944c08516d71c15053f9cb705bdaff2cb8a50421526683c67957a4b9a857f5ff20690dc0b9e44f246e0bbbcfb2612830064b0a577d2e8bc9c49e4 WHIRLPOOL 6857d00f9861ef927a6fdd225a5b0ff7d6271f89c4b7e265a21241c64f9f3378f339c039da015cb4b98297fa950073175371f5c04205e9863b014148099f9538
-EBUILD opera-12.16_p1860.ebuild 6174 SHA256 e656fcc3f94a13383076a26f0dbaf93d4458b8cd492d6bd49b443250717a6ed1 SHA512 541f93493f9bd4c6afff86948f233903e73385921dc2413e3204159f63b6af6dc02d38d4ec923808504c6e2a7cf337f3ca6d75b9d755ff6de60ba2cf51a8aa9a WHIRLPOOL b39b0ec2733c5e806b0982e1731fd550e55ef41cdb35887cb8452891d1402b4b1b7fe3897dbf48136ddc59afc6bd91fc7ccc8a11b74d5163d7c23ec5bfa21d58
-MISC ChangeLog 38445 SHA256 bdb4090c3f10fa2fd1268ad10f9b0804336ed004bfea3c9c69847166c8e91a74 SHA512 05c060d84439b09d6e97219d145418e0ebc2f2e48efb07c79516e17cf2486d72d91b8c2d98ae35f278efd7fb8398d7c26c030dc0c5436b056c54f8690ef146ad WHIRLPOOL 77191cffa38bff8a5d7c1ccca3d289be0bcc33639ce9fabc70f82aaca3c23c7e43ac0a8e212bc65efa289b248f07c09fc8a9388e4432702585a518ddd2ef9a7b
+EBUILD opera-12.16_p1860-r1.ebuild 6416 SHA256 c0e6a25423ccf0c023672f8e8363599ac446d203be810f1527a9617e33485f1f SHA512 bdf907e43b5ec76155911873eaf7a3dfab9b501ec7fdaa1c73cbbca4f8e442b46741d9d9e7b06c74483fa755b050430219622f41341eb41bd69c4f9bb56d5829 WHIRLPOOL 7ba553825397e89df91e7931d88c1502acc603bcec5455e531546e0fd75c322884ee5e3a59b54a32c6e9e53e932e20d6cd8ca0aa0e48c4b6fdfcfd1dee8bb3e2
+MISC ChangeLog 38579 SHA256 c2184edbc5f025dfddc53d142043bf18bfaf27ae94bfd4dc6ce7aa05d9b78ba2 SHA512 794f6341399778e788684b650d9ce9843609fd701f74f737620bd9d55ae311976a4217e1bafcf13b168d5b978351f140ee3d45e87f2e4d2c0fa835aa4062a70a WHIRLPOOL 25a7cf2c31eae242893de5ddd9c9da5f37d11b4fe07229501c2e296548db1d82ae9c5fb11c58be2194427c0ac18f4a97b7170212b544851fc090baa35f08fcd8
 MISC ChangeLog-2010 112299 SHA256 5c3b5c58119b4a6b1911d840892c42234f25dae57452287fb0a9e6cca78ed171 SHA512 9dc4dc7e7508bb1621c390837ec2e47d9e96075906b2060be419ee64e505c8f0da9e4d3a8bc7cc2de66c6efc383f026afb8fa5e886afa15da6349514a93c9edb WHIRLPOOL edaf1c2e810e91d37b2d90847640900374b447a12e2e0e927654966cc18c3a14f332ce6daa07c5a0049da06f5e89bfd0daddb5f73a4d79b334ded4397349cf7a
 MISC metadata.xml 672 SHA256 3fdb3d81bfb1c469bdf86811329eb4888ce909cce63d2aa71257b91a6f8f012e SHA512 4aae9fbf8a753b30b7ef5868b0084c1eb55ed34cc9e1ece8814db13230e07b455f45be936c810bc8a9426ce6c9eaa7449612ac50b47aad253dcae57a683b5b6a WHIRLPOOL 9dc490f6cffad6c3ff1beb27a74818fc66a194856b7d5a84972d387a6bcdf81cda95bb2d1f2b5cb9d58f47cf898bcede39b2a68fdaa5405c5efbffaa51986f3d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlIGUZIACgkQVWmRsqeSphP65ACdEPWC9WNGhJNCyeAOMKWbrOWS
-EBwAn0ui9vOCYFcIWimnpCqWRYWzKEtg
-=pvYE
+iEYEAREIAAYFAlNXyjAACgkQVWmRsqeSphNJEQCfWToMWwiWmJWPE7/edAjALviQ
+ZfAAnj5l/2X6ziIZF5gMzji3cu09ZjG8
+=1GSJ
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera/opera-12.16_p1860-r1.ebuild b/www-client/opera/opera-12.16_p1860-r1.ebuild
index a16de7f44d2a..16d0073a8505 100644
--- a/www-client/opera/opera-12.16_p1860-r1.ebuild
+++ b/www-client/opera/opera-12.16_p1860-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.16_p1860-r1.ebuild,v 1.2 2013/08/10 14:43:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.16_p1860-r1.ebuild,v 1.3 2014/04/23 14:11:59 jer Exp $
 
 EAPI=4
 inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.opera.com/"
 
 SLOT="0"
 LICENSE="OPERA-12 LGPL-2 LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
 
 O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00
diff --git a/www-client/opera/opera-12.16_p1860.ebuild b/www-client/opera/opera-12.16_p1860.ebuild
deleted file mode 100644
index 2688f62ef0ea..000000000000
--- a/www-client/opera/opera-12.16_p1860.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-12.16_p1860.ebuild,v 1.5 2013/08/10 14:43:28 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-12 LGPL-2 LGPL-3"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
-
-O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00
-O_B="$(get_version_component_range 3)"   # Build number, i.e. 1156
-
-# == Variables that often change ==
-# All other variables should be accounted for by _pre/_p
-
-O_K="noserch" # The key to the snapshot URL
-
-O_LINGUAS="
-	af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
-	hi hr hu id it ja ka kk ko lt lv me mk ms nb nl nn pa pl pt pt-BR ro ru sk
-	sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
-" # Supported linguas
-
-# == End of variables that often change ==
-
-if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then	# snapshot: _pre
-	HOMEPAGE="http://my.opera.com/desktopteam/blog/"
-
-	O_D="${O_K}_${O_V}-${O_B/pre}"			# directory string
-	O_P="${PN}-${O_V}-${O_B/pre}"			# package string
-	O_U="http://snapshot.opera.com/unix/"	# base URI
-
-	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 )
-	"
-else							# release: _p
-	O_D="${O_V/./}"				# directory string
-	O_P="${PN}-${O_V}-${O_B/p}"	# package string
-	O_U="mirror://opera/"		# base URI
-
-	SRC_URI="
-		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 )
-	"
-fi
-
-for O_LINGUA in ${O_LINGUAS}; do
-	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 )
-	x11-libs/pango
-	x11-libs/pixman
-"
-KDERDEPEND="
-	kde-base/kdelibs
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-GSTRDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-libs/gst-plugins-base:0.10
-	media-libs/gstreamer:0.10
-	media-plugins/gst-plugins-meta:0.10
-"
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	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
-	x11-misc/xdg-utils
-	gtk? ( ${GTKRDEPEND} )
-	kde? ( ${KDERDEPEND} )
-	gstreamer? ( ${GSTRDEPEND} )
-"
-
-OPREFIX="/usr/$(get_libdir)"
-QA_PREBUILT="*"
-
-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
-	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 kde; then
-		rm lib/${PN}/liboperakde4.so || die
-	fi
-	if ! use gstreamer; then
-		rm -r lib/${PN}/gstreamer || die
-	fi
-	if use amd64 && ! use multilib; then
-		rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
-	fi
-
-	# Unzip the man pages before sedding
-	gunzip share/man/man1/* || die
-
-	local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
-	if [[ ${PN} = opera-next ]]; then
-		OPERA_SUFFIX="-next"
-		OPERA__SUFFIX=" Next"
-		OPERA_USUFFIX="-NEXT"
-	fi
-
-	# Replace PREFIX, SUFFIX and PN in various files
-	sed -i \
-		-e "s:@@{PREFIX}:/usr:g" \
-		-e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
-		-e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
-		-e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
-		share/man/man1/* \
-		share/mime/packages/* \
-		share/applications/${PN}-*.desktop \
-		|| die
-
-	# 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 '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
-	rm lib/${PN}/opera_autoupdatechecker || die
-	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 $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) )
-}
-
-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
-}