Version bump (bug #507176).

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

3 files changed, 260 insertions, 5 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 0a1e03fe9bd1..86655ae3bf0d 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.243 2014/03/15 15:02:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.244 2014/04/08 21:18:22 jer Exp $
+
+*adobe-flash-11.2.202.350 (08 Apr 2014)
+
+  08 Apr 2014; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.350.ebuild:
+  Version bump (bug #507176).
 
   15 Mar 2014; Jeroen Roovers <jer@gentoo.org> -adobe-flash-11.2.202.341.ebuild:
   Old.
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 253e0ccd21f7..5d263f364555 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -6,13 +6,17 @@ AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8f
 DIST adobe-flash-11.2.202.346-debug.i386.tar.gz 7403530 SHA256 e3527616501110a6adb1a4a07b34b961d1a416af56ecd58b933743d324794ded SHA512 59361a4c26bb25966d635cf1697cf6bf316800a172fd209f8e72c91bcf853e06879eabfd483f54881d3a41a246c71c7b3ee0168f41522f94fec53e77e1ac21c6 WHIRLPOOL 44ca703d698507640a31beb1bfc65b5e1aad0f09bbe7a7a3169c4ac74d26eee150527a66dfd4dafc384ef8732cc5b9a5ad9c88c1c1865fd681d78b54d5544c24
 DIST adobe-flash-11.2.202.346.i386.tar.gz 6924402 SHA256 2a27d40ae597965c73b40ed5eceaf5918fc0b62e48088c5d2e1664e09bfac405 SHA512 8c3256df60e063c507d5a084b170afc3bfcc8a4584a417291cb4342db4f730aaafcb6e8db6eca15f943580b891179162cf5eea9d6d31fc190de28d8424d47729 WHIRLPOOL 1209d3b4ed276279a5760cee950e8092d0df1343752a8b76a47299505262b0fd51f44a345033299a106cdb9cdc6f9614d1c3fb24e357d1652d9224308e65894c
 DIST adobe-flash-11.2.202.346.x86_64.tar.gz 7236196 SHA256 a56c409b2b14d6b3acc24fde2a93b52ff57730268a4e69e2c35d4fe00a8f4fa6 SHA512 eece74c01705599e62dbd9e29c876f2ff070118c800bb74109dd9bb51d1e083c508689e5a9a38435d1ae75539e3d7f957611b8b9a5c266d2634dac3e2c91bff0 WHIRLPOOL 556c78098676b14a0ed2a5564f521dc7369643a0f7db0b9ffa29c9c970361e98bee3ff965e956ab2f0d430f2bc33499151d57e7c92ae427d3d33f9c57ef94de9
+DIST adobe-flash-11.2.202.350-debug.i386.tar.gz 7403369 SHA256 6095702bb909ad809c277b7fd6a01486fac0f82c86ada59fedfc5962ab901062 SHA512 b6a6dee85426534695795cb382fc2203470151345146058d5c50420ffc5422994c31a5d5ef4c130abc34ae4724c8af053b1fe098713b26df6761257af394a4e5 WHIRLPOOL a5846afa139058bf65e2105c9b39b00de5acef2ed4b278561d45a0634d3a455d30f6503c94ffc437dd2cbd7a0106127376fcf2dc0b5b303e6e9c3dde2640374e
+DIST adobe-flash-11.2.202.350.i386.tar.gz 6924071 SHA256 b4d69e74f6fd40cfe581c0cfb2ac1294a1c116467efd6206c9c8ded54d91595b SHA512 624f5d3cf5920df48451dd83afa0b62c79037672dc88ca9facf7690cf8dccf79c88f64d932002ecd6a3bd2cf3fcb3c69ea07f74057e2a2bb114c18c5bbaf4ff6 WHIRLPOOL b7368236a35022fad7ba9cf02fe2e3e601fd436f434e67dbf922c5d606c8731d310c86800b13f1ec57d4d5be18005b43890777d06468f18c0e2664512c882ea4
+DIST adobe-flash-11.2.202.350.x86_64.tar.gz 7235769 SHA256 f41cae8a60abc09b0badcf54ae93fbcaaf13da1c29e2a34efb6d33055801be38 SHA512 b2f3f3a9a8c161b005d3a88a06d14ad90292086cb22b7c06493b848cece3c106ffbc24432e5a276c1f44067bcf40aea47bcafbee8cac32a5d31225bda89acde3 WHIRLPOOL cda836f4a4db7d63d124e8fd1f77e5577ef1e40d78d25f957646388067623e216342b05debbb90bce01ec4d7f3e0d3b32de06a062e7c5de683bf170a5d1b9d76
 EBUILD adobe-flash-11.2.202.346.ebuild 6823 SHA256 98d554b2ec51bd1bc97f02ef4406ec8e649f89f24a10b3cee9042830fb624222 SHA512 9eb8337471d1d3fafd7942ae57c14ca4028e907f7b80d75e0692b1011880d66a7b2b17afb1cbc1eecd2390570e1ed2e9c70de251af5a4799664acfa08629b359 WHIRLPOOL 22989d64b2888771e37892da979e2cbab20da987077514643e99d1764e99fcfe292f1e14928229d0636e7c12a2965ab7d1e95266c9a5ccc4264ee7fd427a2dd8
-MISC ChangeLog 57264 SHA256 5c8a262e216794db9bb9838a714c46ae7b3de8ee9e01a0fe1ae1ccf5e26d7059 SHA512 813c98e5aebba8bae6d1a6895e7fb08b4e5c479c4f37f6b935039cd8ec64270deaebaf1ff76d344b9debfb64dc5ea7928859f7a3356c104181830e1b0acb71a9 WHIRLPOOL 4ed6ef7f0c5d2ce0e0399f06208afe9cc11be0690686460028887e031547c7eb303fb0ab79dc54473ad3e59e076e1a25e417df57113262b0f46509bdc6247a20
+EBUILD adobe-flash-11.2.202.350.ebuild 6825 SHA256 e1310670430aa17ac32ab6dbde33fc573a502a53a07ee407110c44894e86bf74 SHA512 213d72f14212713b98e54ddb846739493541901bdae1093f76cad5d8792c01babf83aebe0223e22ab1e7d15460581e7845c2b6c6f44d8791d126c7ba7ef11215 WHIRLPOOL 1ed8e03eda9c0f3f03d88a8f765d85b155219963b20676b2d50e41cfd037a9d1a6beaa4c00b771d3ada9a5013bf674c0ebd0b72a806a1891a6d822a238a160ed
+MISC ChangeLog 57419 SHA256 deb3980df5d805e0ea7f60e5aba4bf8508c3cd305f165f20c633a228b8b5aae5 SHA512 b1387e687f8fc81ba7adf51158f7fe921c7e57c7359a780acc63b0f2d9abb5f0268bd2345051fea92499e6db92378601bc35d4d2752456088708689b4d2126c3 WHIRLPOOL 2354f5f84c53262b422dc45d529db1c3f56ff694fa23d34790f30a7acfa4e54785dba4b2f70032ef19f881b9f65b78b90e8a6ecb8436fafcbade651347f1a405
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMka30ACgkQVWmRsqeSphPoPwCbBmK2xoRnmAlPTkco4KruJS4B
-UNkAn2sOm+my5peDfqPzuPnSoRxTE7TE
-=1CDm
+iEYEAREIAAYFAlNEZ6AACgkQVWmRsqeSphM2XQCeKSAE3izEYGnN8cByN02ZAofH
+pjcAnj7fYdCUbywKeSiJqZZ0VXqPvUTE
+=pHyj
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.350.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.350.ebuild
new file mode 100644
index 000000000000..d280f652b7cf
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.350.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.350.ebuild,v 1.1 2014/04/08 21:18:22 jer Exp $
+
+EAPI=5
+inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
+
+DESCRIPTION="Adobe Flash Player"
+HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
+
+AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
+AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters"
+PV_M=$(get_major_version)
+AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
+AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
+
+SRC_URI="
+	abi_x86_32? (
+		!debug? ( ${AF_32_URI} )
+		debug? ( ${AF_32_DB_URI} )
+	)
+	abi_x86_64? ( ${AF_64_URI} )
+"
+IUSE="debug kde selinux sse2"
+REQUIRED_USE="
+	sse2 debug? ( abi_x86_32 )
+	|| ( abi_x86_64 abi_x86_32 )
+"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-11.x"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	kde? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+		kde-base/kdelibs
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXft
+		x11-libs/libXpm
+	)
+	media-libs/fontconfig
+	media-libs/freetype
+	>=sys-libs/glibc-2.4
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+"
+
+DEPEND="
+	amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
+	selinux? ( sec-policy/selinux-flash )
+"
+RDEPEND="
+	${DEPEND}
+	abi_x86_64? ( ${NATIVE_DEPS} )
+	abi_x86_32? (
+		amd64? (
+			|| (
+				(
+					dev-libs/atk[abi_x86_32(-)]
+					x11-libs/cairo[abi_x86_32(-)]
+					x11-libs/gdk-pixbuf[abi_x86_32(-)]
+					x11-libs/gtk+:2[abi_x86_32(-)]
+					x11-libs/pango[abi_x86_32(-)]
+				)
+				app-emulation/emul-linux-x86-gtklibs
+			)
+			|| (
+				(
+					dev-libs/glib:2[abi_x86_32(-)]
+					dev-libs/nspr[abi_x86_32(-)]
+					dev-libs/nss[abi_x86_32(-)]
+				)
+				app-emulation/emul-linux-x86-baselibs
+			)
+			|| (
+				(
+					media-libs/fontconfig[abi_x86_32(-)]
+					media-libs/freetype[abi_x86_32(-)]
+					x11-libs/libX11[abi_x86_32(-)]
+					x11-libs/libXcursor[abi_x86_32(-)]
+					x11-libs/libXext[abi_x86_32(-)]
+					x11-libs/libXrender[abi_x86_32(-)]
+					x11-libs/libXt[abi_x86_32(-)]
+				)
+				app-emulation/emul-linux-x86-xlibs
+			)
+		)
+		x86? ( ${NATIVE_DEPS} )
+	)
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+"
+
+# Ignore QA warnings in these closed-source binaries, since we can't fix them:
+QA_PREBUILT="usr/*"
+
+any_cpu_missing_flag() {
+	local value=${1}
+	grep '^flags' /proc/cpuinfo | grep -qv "${value}"
+}
+
+pkg_setup() {
+	unset need_lahf_wrapper
+	if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then
+		export need_lahf_wrapper=1
+	fi
+}
+
+src_unpack() {
+	local files=( ${A} )
+
+	multilib_src_unpack() {
+		mkdir -p "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		# we need to filter out the other archive(s)
+		local other_abi
+		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
+		unpack ${files[@]//*${other_abi}*/}
+	}
+
+	multilib_parallel_foreach_abi multilib_src_unpack
+}
+
+src_configure() { :; }
+
+multilib_src_compile() {
+	if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \
+			-oflashplugin-lahf-fix.so  "${FILESDIR}/flashplugin-lahf-fix.c"
+		echo "${@}" >&2
+		"${@}" || die "Compile of flashplugin-lahf-fix.so failed"
+	fi
+}
+
+multilib_src_install() {
+	# PLUGINS_DIR comes from nsplugins.eclass
+	exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+	doexe libflashplayer.so
+
+	if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		doexe flashplugin-lahf-fix.so
+	fi
+
+	if multilib_build_binaries; then
+		if use kde; then
+			local pkglibdir=lib
+			[[ -d usr/lib64 ]] && pkglibdir=lib64
+
+			exeinto /usr/$(get_libdir)/kde4
+			doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so
+			insinto /usr/share/kde4/services
+			doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
+		else
+			# No KDE applet, so allow the GTK utility to show up in KDE:
+			sed -i usr/share/applications/flash-player-properties.desktop \
+				-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
+		fi
+
+		# The userland 'flash-player-properties' standalone app:
+		dobin usr/bin/flash-player-properties
+
+		# Icon and .desktop for 'flash-player-properties'
+		insinto /usr/share
+		doins -r usr/share/{icons,applications}
+		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+			/usr/share/pixmaps/flash-player-properties.png
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+unregister_pluginwrapper() {
+	# TODO: Perhaps parse the output of 'nspluginwrapper -l'
+	# TODO: However, the 64b flash plugin makes
+	# TODO: 'nspluginwrapper -l' segfault.
+	local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so"
+	if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then
+		einfo "Removing 32-bit plugin wrapper"
+		nspluginwrapper -r "${FLASH_WRAPPER}"
+	fi
+}
+
+pkg_postinst() {
+	if use amd64 ; then
+		if [[ ${need_lahf_wrapper} ]]; then
+			ewarn "Your processor does not support the 'lahf' instruction which is used"
+			ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
+			ewarn "should allow this plugin to run. If you encounter problems, please"
+			ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
+			ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]"
+			elog
+		fi
+		# needed to clean up upgrades from older installs
+		if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then
+			unregister_pluginwrapper
+		fi
+		if has_version 'www-plugins/nspluginwrapper'; then
+			if use abi_x86_32 && ! use abi_x86_64; then
+				einfo "nspluginwrapper detected: Installing plugin wrapper"
+				local oldabi="${ABI}"
+				ABI="x86"
+				local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so"
+				nspluginwrapper -i "${FLASH_SOURCE}"
+				ABI="${oldabi}"
+			fi
+		elif use abi_x86_32; then
+			elog "To use the 32-bit flash player in a native 64-bit browser,"
+			elog "you must install www-plugins/nspluginwrapper"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	use amd64 && use abi_x86_32 && ! use abi_x86_64 && \
+		unregister_pluginwrapper
+}