Version bump.

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

3 files changed, 260 insertions, 17 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index a1ec1e15f9d8..7d52c0077dcd 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.256 2014/06/25 06:32:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.257 2014/07/09 11:53:42 jer Exp $
+
+*adobe-flash-11.2.202.394 (09 Jul 2014)
+
+  09 Jul 2014; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.394.ebuild:
+  Version bump.
 
   25 Jun 2014; Michał Górny <mgorny@gentoo.org> adobe-flash-11.2.202.378.ebuild:
   Lower dev-libs/glib dep to first known EAPI=5 version, requested by Funtoo for
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index e94c33a4726d..7689ea748717 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -6,25 +6,17 @@ AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8f
 DIST adobe-flash-11.2.202.378-debug.i386.tar.gz 7403282 SHA256 67b313d0d2bddebff0394f085a93007be6de90cf5b74e04208571f82e21fffc0 SHA512 c38dc20ecd8c8e07bd6adc2746d1a6d935d5dfd0bcacea53ada2347f7494d5ea092338c975773333f2de7f9a28a853c5f17c4326a5cb807027aaa4d6b5901ce2 WHIRLPOOL 1495be259f7cb9b5ada268b7ed37e58e3a2ac353b812a19001a28787be353c49de1f561bb695d51078980dc4249b227681d936e48fd850db887b0f0d1a08fd0f
 DIST adobe-flash-11.2.202.378.i386.tar.gz 6926052 SHA256 9f8fa4cf965189d421425fc2facc14fcebde1f2374a73bcd9750e407ed155eda SHA512 c7249b3466f86986ba3d5d115fd112ccb18d0a36028a593caf1136f7d9bea44d87741b09e4ced6080268f07ea85262a80a573a280978e73d42923efae832d47f WHIRLPOOL 484ee68ccafb2c82dba7e33454d9ae855cf33701c9c4272438ef963fc1b8b1bfb377d0ba5311eaad7c987c8fff34017e34e5c9be683dbe62325244c9aea7037e
 DIST adobe-flash-11.2.202.378.x86_64.tar.gz 7235503 SHA256 2c294a0c48c2aabe531c766756ccd712b84fa6f8f035e788d1477834c5285c21 SHA512 12a26546421f271001bc5ba0727792f98024d65debb52daaffa1076fa817d4422073303882729c0ca09450bda5f343a7452dedae23082211834f960c898c6297 WHIRLPOOL f02ef30d51215c6b3fea103b13b56c56442af27cbebdd4a97098ab3014d6e1f0e3656b9ec532bd87a4d9a8718cd91af9a1a88d85b3df7fb3bd1444b615d7844a
+DIST adobe-flash-11.2.202.394-debug.i386.tar.gz 7405280 SHA256 7752f485c3fcbeffe5054aa7f741f114c4f334e11f050eaee9aafcfca5ba36b6 SHA512 51713a4e1586f31d24fcc4a22b5e43c14443293b0db9af62e1d80bc6626cae914df58224b6e23d912c0cd441b6b642ed9936b12bccd993ef1de056e663a1c296 WHIRLPOOL e2cbde86f059f7d5fe0ad3c6e75de99f7265aec3732008f978f370e8c5cc31f93876f5b609cb569c9a414341af103c350438a89f7fc6dac87358648d6cf6a536
+DIST adobe-flash-11.2.202.394.i386.tar.gz 6925990 SHA256 273d987a41f7b271b13d90d095269d941f71ce43607518f324424c6331b91c31 SHA512 26c9aa6a2e2db9ab2ff1631b4cc87a2e074518865aaaef1829ba24c44ab22513dd9f16024a6bed0ecd07e5c2d85c97e801ec19b1477a75434bb0531902bd99fb WHIRLPOOL 8b4c0450c77480901175ac5acf34cf62f1042ba3a10050c465aab6944a34a4e4801fd8223959dea9891daaa3b9968b081620876e0dbaae7c6ef192b3485d79b6
+DIST adobe-flash-11.2.202.394.x86_64.tar.gz 7235530 SHA256 ddce56a38e2440e178721ba60efcd76e59ae7f5e6ce57971d6ad87a45a9d02f1 SHA512 14faf00fefc31b5ff0c1d58ac5906641a185436d106cb94e2f808078d5cf38f0890295240f47846cfe2992d75179501e47d2aa5f0bf04fd6a12aa4dcbd909d74 WHIRLPOOL 9885e7efe5532ef15015cd77c0f0a4a7bc9fa5016b409a83472cada95a06a6a3c65e7d45e6af1bd3247cef4daf14274e5366d191b6ceab5bd7c883767048be33
 EBUILD adobe-flash-11.2.202.378.ebuild 6963 SHA256 e39c8c7884075ecf143e16353ef122749b6ea06b84624b221ed73a3283e075ec SHA512 6eb5e734756dcfbcedfaca7961537172fd11f33f4587d91881c053d938b12d7bc07252f78ba597acae0ae947bd767ac2816a2d4d8d3ef221a7839d533f2c5682 WHIRLPOOL 719abf50e46f3bcc4c02cf00c6b321ca216a9a5598d0b0770972f942313c123333e2f072452b6eb06623ac85a7029c56a4ed161738f8b758fd57e5dd6036e196
-MISC ChangeLog 59253 SHA256 5a622cda1191ff777426a5b005291a81b48dbe31c6b93e37f3a06fefb02b38bc SHA512 de411a5490d150d89b612c67ee9e2cd7362b8982585516aaec4de133583517952278752752d05334015fe21369f28103c7cd0960e786efdc42170547f3a227e7 WHIRLPOOL 9e33d4c08117fcf12aa9387eaf3eeac2377350c8152b8520faa0f7735f52fcc616ca16940419143e5b93f4c6f48c1ba31b2a5cdcf5550a319604ff21431ed5cf
+EBUILD adobe-flash-11.2.202.394.ebuild 6962 SHA256 cc938cd69dfa6676f2cba092fd51c696df663e59312c031700b6ec9927c1b014 SHA512 349074b77f60d311cde4f4ca7374e4a539352d9b36135265cfc01232897d1483f4b760dbc96fe6b55fc432572fc3245cd6412af582669eae45657e9a69abbd6a WHIRLPOOL 0e14c286b410087f64d83e56f044c909e6de36e6e610bd3abce0a6a383ebcf03cd7670af7b7289957162b3ed562c4155ca578bc415a849a2caa74daa7c2b66e2
+MISC ChangeLog 59391 SHA256 44499df31454036bb76786387870f2245c6a4838602e6177320d1e99a45e002b SHA512 12d1c75fbec359330355c6a363238bb96f4bfcce653b9007a58a09f752f0dec284f4800178d6f5bcba02f971027bffbec8b6503cfa98e4d8c226e5ea78af3a99 WHIRLPOOL 431b8eefa32a347def1a670ba569762fa49a5beb8c1af6115fbef74b271bc286089e0ae74f3beece4b2edf6d241d999645e889ffbba849253d8c561b8559f1c2
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTqm0NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOim4P/jpwPOzvcLtZO+bJeXEoz71W
-yp+ZVu4Gt7nGMCOcEohBhMUihExn5GZBQPZ1H3C7RnqEov4TH4rfvIR+6UvCEluw
-+DoC0KATyuFCrRh7cCn46bDwFQqXxDzb7d/DSm9Kt6fSVZbYf5MKDvPSV1XwaSC7
-dmyWjU+0lkJBD+DORlvXqdroIFpWHdklus4+vr7Tv+BmiPUV3QeK7ByxYBeYUl60
-kBrBFTAILrdkRp+Ee/Oc2QWa0EMl9eEPlkXGiZO86H9GXuEXBDcGmZk1uaCSokHu
-g8lezbHVUmpaqDz6aMj0UimnsE483cQ9DpZMojIv+7g56WH0TovDaGY19VPjb0K9
-8RlfkoqSVOxWad3s5ynX4GO4XSol0kDhqwXcXlSnof8uFY2xwL00D422+9bqtz5E
-NxdJp/vhf124KoVrWQIEjRH50OGmEt0uddqHVcqde9DvUrbdH1oEu+yNr8SWxrkX
-VbNXmQobK6R42Yjxuc/5bofEvxV298+W3EU+N2NfERiUwdls6ca8YxNNjS+FpGkH
-fWQzP7Eu7diCeIb2CKcQg9mNVSSwysEJMicJt/fv2mTNQqOaBeY/ez7fag5zr21f
-Rleli0dcEEbZRvihyXDWFvePMXz+n8qa1BUoEQ7cZKI5nEy7lJsk2nOcwfhS/qBG
-U6kCtjVJDhmzFvS7yf5g
-=XveU
+iEYEAREIAAYFAlO9LUcACgkQVWmRsqeSphOrTACeMm0imUtviFXz88027MAEiYAg
+5NwAni9DuPwSqZCzrqDEXNZmC05yTiB4
+=v9fz
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.394.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.394.ebuild
new file mode 100644
index 000000000000..c2aeeec41894
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.394.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.394.ebuild,v 1.1 2014/07/09 11:53:42 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-2.10.0[abi_x86_32(-)]
+					>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
+					>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
+					>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+					>=x11-libs/pango-1.36.3[abi_x86_32(-)]
+				)
+				app-emulation/emul-linux-x86-gtklibs
+			)
+			|| (
+				(
+					>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+					>=dev-libs/nspr-4.10.4[abi_x86_32(-)]
+					>=dev-libs/nss-3.15.4[abi_x86_32(-)]
+				)
+				app-emulation/emul-linux-x86-baselibs
+			)
+			|| (
+				(
+					>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+					>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+					>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+					>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+					>=x11-libs/libXt-1.1.4[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_is_native_abi; 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
+}