Version bump (bug #500313).

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

3 files changed, 259 insertions, 5 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 01465cf6c80a..d0378af06a1f 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,11 @@
 # 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.231 2014/01/17 14:45:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.232 2014/02/04 21:57:43 jer Exp $
+
+*adobe-flash-11.2.202.336 (04 Feb 2014)
+
+  04 Feb 2014; Jeroen Roovers <jer@gentoo.org> +adobe-flash-11.2.202.336.ebuild:
+  Version bump (bug #500313).
 
   17 Jan 2014; Jeroen Roovers <jer@gentoo.org> -adobe-flash-11.2.202.332.ebuild:
   Old.
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 60cc617ed528..961a83240a77 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.335-debug.i386.tar.gz 7402915 SHA256 2733c02b0267a432fbeeeed63d2de2ccd029d0cb88b47a113716f4076ee0d64a SHA512 be35d4c76c3ec742653755903b1289e203951a4a5e2ba8f6e8f8fe30bf7df7e1a52069361d4c947d42e7e1ab23db51795fc72b8f70320cc373a92c39a1807356 WHIRLPOOL dcf187995212ce205891de64ae193711b27f10bc2b533d261f57b75b7162402d8e863563d36386d92760ebc310159ba1d3ef09d4a727e791324c9fdcb5a2eae0
 DIST adobe-flash-11.2.202.335.i386.tar.gz 6923385 SHA256 71d403cdca7a0a13a37c024da28d8e07d765290e1df0e1b1e05482a7d4a27d46 SHA512 48539b4bdac82374391b64b9a26667e0ae3a54518b48851d094e99366c32a0a7bd02506abb52cd64e4567b3248ae2ab2d3784ea3cc259172260f1d8fb670bf62 WHIRLPOOL 512e72f2e42a598dd331e212d00b4dea69f594e2ff9c03653a21b6636a49f409b7718c8d689ed888bfbedbcbc6680ad2d6064265ae3fda1e633c0fe7c36d082b
 DIST adobe-flash-11.2.202.335.x86_64.tar.gz 7234767 SHA256 9362d68a274e8f934e542593a3be30ff760f1141f9b30220ec48d62f20d0eb95 SHA512 2b3127939bff24df2f628810c0a82032e21a248b213e5a0401742ec1f96e393748ef7c9998f34d612540906ce1711afde0811858ae739298437065426a456175 WHIRLPOOL afbe38bde6f6e64fd8b004f8c3db8c147ec416f6c92d6ca02f8699c732eefb6f465091471d0ef2d76252c23a50d58aed7df35868f941eacac97740bab5b31d79
+DIST adobe-flash-11.2.202.336-debug.i386.tar.gz 7403157 SHA256 3b7af12d2821a032053e60c2e9e56add242802912252f463114466fd709740c8 SHA512 06c4e18bccf38bd29aebd16417d63d061dcc96f61eccfd8222d056b167f4578b81a40291cdbbe192b3e5f5e1220a0c7b73752315e3e978c9312b12261f81ac94 WHIRLPOOL 00b806ec22359c53f7c38593c4e1f9005904982bfafe9265a42df0e2ec85ad920600bdbe4b8108b40bfa5935a057a3f9c423463755728a740de15b2e6c5c1f42
+DIST adobe-flash-11.2.202.336.i386.tar.gz 6923195 SHA256 05c1ab26da7089115e5d987154463e9b8b99e9360a7f5c2f7ee4e472e4925d56 SHA512 2289638527b08fb6ff29e4809ef0592035d2ba6895cb30263736e344b7fc80a97448a435dc18313250bd99b63a06fc671c7b793d34beb3337a90f9faf0098a5f WHIRLPOOL b1bb6e95d5b5282917354d639f1c864dd3c062f1a0ac4bdf1229bd3075b93e8bf0996459b7edf932c71dde336d942b11c80a5996d8e5f729bef82398ffc4753f
+DIST adobe-flash-11.2.202.336.x86_64.tar.gz 7234917 SHA256 d1b25e2812f489c58a9d746165a552addc75e6109b4ed74421fa51ba8b3731f3 SHA512 61487228a41751fe19aabe2a98166e6f55cf924a3d2eeaf7b607e0511620de07f95cbeddc73ebf63b7b4292eab04752428f4da084616e5551667f86425ac74cf WHIRLPOOL 483823e67094f2c8d7f99fb2392cb18934f01ee140c735c34843eae251df782c30c5a9c0daff39f4069812bae606f383b1baa8662a0a9245aabe9b23aced44a0
 EBUILD adobe-flash-11.2.202.335.ebuild 6823 SHA256 748b948639b83fb623f6a1c1d9213101ca113f04c595b2195d2205ef7eca5d22 SHA512 df76f7a12fd7fe1c79a19ad6d8e0575b5ad0702e0a012e4f81634399f1de3b01513e2f9c41cf7e876e67eb710ac2d1dbd1e2ea9bc64996333ca238ff699f978b WHIRLPOOL df5320f6372255b1e7510f6d77cffd0e197a36d8998db39163b09a6ac091da06b640e26c6b65950d64116ee8763e6399bb54a58f4045976bd83bc264e9dc636d
-MISC ChangeLog 55797 SHA256 7344507e500c427e01efaaccb508fe9edfe2166449665ed9bed2ced4635aa85f SHA512 78d9a3967bf51513eac605b5af7cf8c4d028310d3a6a74c00676b8f46b2eba0d091f9f6ac92e8dd805826021c6a872bf5cbadcb00e9357ab4ebe55c9f1c31f09 WHIRLPOOL 0f84f2ad1cf6dbbd7eef60dc2b45da9336b2ce8cc22b86cc0b29641811a30d2d80b06b878be7486e721de55ea24b1a3b44bc05c9434e99c50736fd8864a48979
+EBUILD adobe-flash-11.2.202.336.ebuild 6825 SHA256 ca8113537dc459a0cbbb4683576080ffe9afe3f63e665650b746dcac1f87bb77 SHA512 2a7945f0234a30762f6d778986005715e7f4843f8c3094db3798709269b96b427dce71045076e2307760c90727c53a599ed66ea756437c9ef65d46b51d5f71bf WHIRLPOOL 3b33c3c8ade91dfd3bb62904f503c789ce04bbe9c01dbc82c9374ef0c1af25366657cf73c8820342c3ed41a54206b451f8909761024b49630bc69ac18e8469fe
+MISC ChangeLog 55950 SHA256 126bf2325b4f621232a507de5a231ba7fa3177f7904dcfebb21522b438a469df SHA512 39241709c31a9ea04d903fd555651a6f48e4c42a915889a283dedcf6362699ab91863bc9a946a0b207e55c4f6bd0cc7e54a712be5ea969000cce73b3c09dada0 WHIRLPOOL 420a7654360ec8985e1a4fe76777b84f455dfda1b3a668e838ba6a84e7b8b73982c7076e3371b0d14e852f43c2091f0a16f868454b9e201581e90a4d79f9a094
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLZQhwACgkQVWmRsqeSphNn4gCfX9zQPZ9FMJLUzTpvxyv3cp97
-q9oAnAkNW/6HPPWzAzZ52ja4oYQADTZ0
-=t4lF
+iEYEAREIAAYFAlLxYlsACgkQVWmRsqeSphOVggCePYksIdhNoCmCuFqqCCQ0av5O
+wAUAmwTIoel17jts6irZMdCy/XdIOe1n
+=sQ+C
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.336.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.336.ebuild
new file mode 100644
index 000000000000..917406d3d2d2
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.336.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.336.ebuild,v 1.1 2014/02/04 21:57:43 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
+}