Version bump.

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 257 insertions, 6 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index d06500357b71..65982db1d7cf 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # 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.812 2013/05/09 17:12:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.813 2013/07/04 13:02:56 jer Exp $
+
+*opera-12.16_p1860 (04 Jul 2013)
+
+  04 Jul 2013; Jeroen Roovers <jer@gentoo.org> +opera-12.16_p1860.ebuild:
+  Version bump.
 
   09 May 2013; Jeroen Roovers <jer@gentoo.org> opera-12.15_p1748.ebuild:
   Add x11-misc/xdg-utils to RDEPEND (bug #469142 by Dave Kemper).
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 95a8bf68b0ea..c2fdec19de30 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -4,14 +4,18 @@ Hash: SHA256
 DIST opera-12.15-1748.i386.freebsd.tar.xz 13487204 SHA256 654db056fb1d8f3490beaa4e0f6da27e46cd9903c5d34105b279a8e1ad2c2ad2 SHA512 9931bccaa5320500caa393d0c6869340afdc03e64be8fa484f3d86c61bf921da48e6f79555af53eea87e0a86e26a0120a8adac9c3efb0f4c5adcc52af15df28d WHIRLPOOL a526a2e3bb208a0510754148bb2cc19fd124d48308f927ff5d07cd98ef790a385c09a63b235168f0c4b5056481432fce54af28549af66021af5f665f5e177b43
 DIST opera-12.15-1748.i386.linux.tar.xz 13576396 SHA256 602eff2177b42d809c44c832cb961eb5cfad1d502d20af31f082a703bee2eae2 SHA512 684abf020bee234798690d64301c818e0c47f84b6ae8fd6d8ac358ae9429269a36c9970c7a7aef18fac1beddc812a8eb0c5da5181279de3d01dc619d06c34aec WHIRLPOOL 810f2931116d0fc4df87719a25c0c1020386f24015b6e066f7eb281c2fbee73e94ba4c567db28e9b672c4419d38c994b53d7393656617b5a4ddc5df053232f17
 DIST opera-12.15-1748.x86_64.linux.tar.xz 13686680 SHA256 249e74b1fdf0c2d32813f76bd1f54eaf0a41473ee46957924016b604cc16888d SHA512 10f62680b53659c267f8703134ee2924161cda8362533667f73ba1b70f61ca0176b38fc7d02afd250dc26bf0d7fec2dd8d8bf5b2e2a1d2f02397da4430b5508a WHIRLPOOL 9c09a1c82f514d337b9bb67dbff343289e584dd3f506c44ba0349869b8139a4a4dd37cd1a1d4af111c5e1443940ced066ea6b97903a39c9827519e630d25a26d
+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.15_p1748.ebuild 6256 SHA256 2fe9ff3aefd63c6a43f6feffd797f55aac4834f916b8a69538350ed2d05bb700 SHA512 77a79f418a3925de3ac7a7a2e14a427de337d5211480e777df3a68d37661d1ed839f4f6d1e8b4b69878f0c2b758f29f81eb1d40c20fc5416d1beebcc2cf64bf8 WHIRLPOOL ccb905dfaea83754002922ca688c9cd122695e0b9cea117d0f1459fa188387f0b1a2d3b4ca60930fde23710f8ef095e8f54ccce432b3b43d33c3a952f7ab17d6
-MISC ChangeLog 37549 SHA256 dd34ba92ec0cbe03fa6553045a485526c80b4d6d69aaa782cc72a619dcffab3f SHA512 de81bacb7402697b586245f8a7077066ee7ad18130fe51c21ccd5ad6622328da66c1a8d8cf4e7d3717bda2b11d80f41e33933be6ee99fa5ccc739008c522c291 WHIRLPOOL 8afc7070215d183ef00350f0e24df014cc5be2e8199fe6959744bd0663efdb935c962fb69fb04cc457072b98bc7fa85fd76eacb3f7faa884e71db898e7fa109e
+EBUILD opera-12.16_p1860.ebuild 6258 SHA256 36e0d2a10eac52d9e7fcae64a15a850c810db40592d50d338ef031c558ea0400 SHA512 29483500b8ab6efdaa4e74be925f8bcde58a4ca9ea1187cbcee6190ee7edc31996cc5e7dbda7bf6ec7f0cd049942e8bcddfd699c283e6bbffc4d5a7e0eeb1e51 WHIRLPOOL 482673a37178c6d187cf5fb393949284f01b720b2511e60f6f908c933a2786ba7f328614d3464fa5887dce0b144e8b250c11fe4aa650368e127aaa9f6953d9b4
+MISC ChangeLog 37674 SHA256 4806dc1816ac33b0485cfe02180c83f655dfd9da83c275d5d0ae181e089ee2ed SHA512 eea0ae4084c134dd32435752c7569f7a6cf363902eaead0482dd1095b745d6ce8cd7defbc99448b7413c19deab810be73d2a5dd40184f3e94d040053b885f0fa WHIRLPOOL 415e2984054d46793966120040f11504b3d3cbce95e240c4e0639f9dc7f70b211d7a2f54831fa7d0af356d040b1c82cf21ca1c8f2b2f11fff8134357913568ca
 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.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGL2PMACgkQVWmRsqeSphNF5wCcD0fQcnoSQktPJXo1ZkKF1W2c
-tsIAnjbRynMRZHLGFhS/gRLRF8xYYkYy
-=pT5m
+iEYEAREIAAYFAlHVcoIACgkQVWmRsqeSphM4SwCfdUSZRLq5/4rQ6a8E8JBHCEoW
+VnAAn3yeySEv/A708MBYrGcwY6l5vJB6
+=x7fg
 -----END PGP SIGNATURE-----
diff --git a/www-client/opera/opera-12.16_p1860.ebuild b/www-client/opera/opera-12.16_p1860.ebuild
new file mode 100644
index 000000000000..f1714678d75a
--- /dev/null
+++ b/www-client/opera/opera-12.16_p1860.ebuild
@@ -0,0 +1,242 @@
+# 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.1 2013/07/04 13:02:56 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+:3 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-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
+	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
+		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
+	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
+}