Version bump.

Package-Manager: portage-2.2.7/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 8fbe066b835a..c47cb3de039d 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.222 2013/11/14 01:39:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.223 2013/12/10 12:08:21 jer Exp $
+
+*adobe-flash-11.2.202.332 (10 Dec 2013)
+
+  10 Dec 2013; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.332.ebuild:
+  Version bump.
 
   14 Nov 2013; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.310-r1.ebuild, -adobe-flash-11.2.202.310.ebuild,
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 126800826584..c39193ecea52 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.327-debug.i386.tar.gz 7402721 SHA256 11c5c1a5bfacf8de2c7389cef24468cdaf0d5f5652398a4c5078a6d987c95d5e SHA512 b6569068948c857c9e97f4ed0d279563d558bfdc92385b972abcd0d6634b98ba706590abef0e9352b087564ee63b61436648ee21fd98434f8c9159b4fb4cc493 WHIRLPOOL cdf3b954627a24ce9c540e945de7aedea2095285a138d497dc391dce92e96ca55b841845fd0e01f3599fa51f3873deb1657d009008ced222c7a70d12ade71dfe
 DIST adobe-flash-11.2.202.327.i386.tar.gz 6923587 SHA256 1fbbadf17c86b3fd52bbf1df299f52c0b2eb7a0b9aca1d55756bc884c9270f62 SHA512 bc02dba73b337babf989c582a43a4b394294ae131f779a21fa0381ef98ac8f4efa580cf17306daeb364c549af9800ea328fc4a81f6e26e6c0d2e3f9d317b2d9d WHIRLPOOL f58b001878500b338a87a23e6f66cb773520bd7f095266ddd09099ca0b11774196e2e3eb6fa9ccac34312ad7b7398d06c81f49536b637a38da2784afc39d211a
 DIST adobe-flash-11.2.202.327.x86_64.tar.gz 7235065 SHA256 34248b36f4b640c0b3846a334f995414c1bf4c8813ec80e2dbd3028d38bb4235 SHA512 e840b94784ac1e19e127091e6945ee62d5c6128e20e0fe6baaf2c6a0746fd1e3f9fddf3f221d9a46f04f17fb2d9af8aca2c83fbf5350bed05097e56f94144500 WHIRLPOOL 76d243f2bcba115a01c41660ecbf1c38284fdc31027f7bca90e1013f454150c920f90086ffe8f86a90f1ae32300682c4b22491d7d9aec3d77846b5d1c9ff13af
+DIST adobe-flash-11.2.202.332-debug.i386.tar.gz 7402825 SHA256 c6eaf175435e2f327ed757638a8c764f08e178ae901822a08ff8ccb7bc8cd4aa SHA512 5fbe32737a859efd55923826f8135f3711abb9bf1684ac1f5795e4344747a6ee8aa979fd77fc97facc8253f227e343d2a9349f0d9ed745e1d64274276382027d WHIRLPOOL f2c5a2cfe92fe40165a0eb4c07d3f89d57b8fd2f990b6579ff6499446af71f009c69c245b62d45fe9046268121c3b80a29242da494da6e0d6f42463bd25b7211
+DIST adobe-flash-11.2.202.332.i386.tar.gz 6923609 SHA256 01b643f24c129a724f09458c0cedec216e96c8e0dab020e07814304170c21aab SHA512 08bb0b349565e423ff8c62895c2f7b5f0e672afb1055a0d84e82ae0141e332fe39c6ef3c6354e9ac2750eb711af20304d07e1bc9d0490a80365ad10bfba3cadd WHIRLPOOL 9fe894ad44171d764ab6ce1858a86d4a46b42d71173372fa95af3dfc2406303edefd3b4d0fe27ed68d4b867f9c4085119ee5a29703ea49456f3f1de00265a751
+DIST adobe-flash-11.2.202.332.x86_64.tar.gz 7234961 SHA256 52f83893150aec94562a8b8f96cbd8471fa8453de930444fee0d7ee3afbb2530 SHA512 6eb77832306cef71601f40910ecefd5b0dbbe3c835ddc91c14448609c7e488ead5953adfc9ef23f7367045d324566c1bd9ef593e0e35a5a1848b9f11fba8d8d0 WHIRLPOOL 299b73aebea7831c4f8b77488712bdf8cde31c26d9f331afb16e1583cce24fcbe5993635770a1e6b2127d9ff6769c4c3c7d725220b491094b70637032bef38b7
 EBUILD adobe-flash-11.2.202.327.ebuild 6823 SHA256 938be44a62e30784418b46f768b96a5de087d058617012ffe830b301f6105f70 SHA512 e8b33a1411bbcf756f1baa965c6e8b0fbd0eb021cee6a0b5587487f48f2f37613873afabffd23dd843655b48a99ffa986d6d1420da97f60f8084c597c9d82671 WHIRLPOOL f5172272a56b1795996a08fe16e3fa7b21645b94ed5166ad44f277cef36a858966e99f6ef35ce609af19fc2ca4fdfba6c0d104aea1a3aaf10a104e2841d3d178
-MISC ChangeLog 54732 SHA256 9899ea26f5060a18eea494cf77438dcbad1dc495db36da79a1dd6d1a5734d1ba SHA512 8fb0e90e4672d56a1f90564c9680707052c3c28c00902df037f8f5fb8748584dbf0d1963fc1a001bab9035bf4b90bde40f1c909187651a0a3e50252a8e03ee6c WHIRLPOOL 13f6b64672a413c0817d8957035113ac36e3e36e6900d1fa9923469c11e76f932811489516da1144fa9afdc7b4474348881635cbc31ddfc4242da1253c2305f6
+EBUILD adobe-flash-11.2.202.332.ebuild 6825 SHA256 52d8a1021fb71be1906a394576509499aecc105c765d9d1ff2f9a340d438031a SHA512 21ef4f7df4cbf4e9a0f84ead6600b029caf76f045ce4e7e1eabbb804374191bc87567d4e5ae42885b010cbaabf345c63769efad58bcefe095572e98704b72742 WHIRLPOOL 06f938d8a1ed63e5df866ef73083883fb4eb8841cac8aed711a473bfe08ca9fed15c6ab6198fed4f0865ee5c3ad47e7b8e713412758d9cb0667f4a2b81485648
+MISC ChangeLog 54873 SHA256 11ce0320c52b1de895f301ce6517f8fa0902cf94fe9f9ec01267f7937ab08eed SHA512 cf42173d036e55a805923c4911d18b0fac9e8796b5fd308294444fcccdad4f69ba3409e89fa61a1fdd196a8d7d6e3a1a9856b60309cb2268656624c05d88d7ad WHIRLPOOL ede519d042dcf63fd7ad0f64de8db44dfc05c0d1af664d8a6f369a9236a7bd0eeff19f45373e088382ea524c06479c12fb746969d6171611e3b3e7b247101a7b
 MISC metadata.xml 463 SHA256 b42ba14144af57dcb595c527bd42b8909850abc7c86672bc5e9c5157f8733232 SHA512 f284ea03b79798577e1adede1247c6eab48a1296a79955079f78c222951710cb227d181bd703e36aeccceb76066f17e4ae9ec8fa796e50fed2639d905d472c6e WHIRLPOOL 13e8def3da7e22c809307ab2002ebd7ed6d715fd676b8c99c0d08c9ed7420531eb4f50cddacea250b21346699479ee0e0f57f69bcb76166dbfec072cce024a74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKEKdwACgkQVWmRsqeSphOjLACfQQfI+kUXpun1ZuqWtehrUgDG
-HuEAn3NdXvJlphOFKiIbBtAZGXAKtzFj
-=cr2W
+iEYEAREIAAYFAlKnBDYACgkQVWmRsqeSphNm4QCfR9I/SsAwsujLF27VZoqri8NJ
+gs4An1M6eQsQjjuFqQ1zFf3Fe5kKnaWV
+=YPIu
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.332.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.332.ebuild
new file mode 100644
index 000000000000..4a58de6df550
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.332.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2013 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.332.ebuild,v 1.1 2013/12/10 12:08:21 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
+}