Version bump (bug #501960 by Mike Limansky).

Package-Manager: portage-2.2.8-r1/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 d8b522cf0a45..8d7b1d17a184 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.235 2014/02/06 09:21:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.236 2014/02/21 13:31:53 jer Exp $
+
+*adobe-flash-11.2.202.341 (21 Feb 2014)
+
+  21 Feb 2014; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.341.ebuild:
+  Version bump (bug #501960 by Mike Limansky).
 
   06 Feb 2014; Jeroen Roovers <jer@gentoo.org> -adobe-flash-11.2.202.335.ebuild:
   Old.
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 57a001e95342..868391ee031e 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.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
+DIST adobe-flash-11.2.202.341-debug.i386.tar.gz 7404292 SHA256 323f9bd1519654b7f41e76986f56e51c6b1db7ce827bbcd702c2b58fdf5db88e SHA512 603c8f89ba9fcb124044a6400d2e5f7ed15338b2c2d272991d108122d8ef3ab6acfc53c578c6165670694a4df3b4d75f20b64517c486b51c897cb381883c089e WHIRLPOOL dde56860847ebc1f1f9973eada854a37d506ef84da0e195818f57f9f783d5a9763211e21eabca751c6d12b6bf63135201a86fca254c705047ae192c55cd62228
+DIST adobe-flash-11.2.202.341.i386.tar.gz 6924197 SHA256 4cc1d08661c8b39bd86bc8ad867fcecfd344916ca076e2f9b4b20c405a0cdf2d SHA512 aaf5868a8a7ec7fc8d031ce52df7e807118e4ee40a2eebaa835e10d8e3f626f95ce6ce29c59a5c4720348705ae8a9b2037feebe3c8846e64dbb584888d3e0730 WHIRLPOOL d934ace20d7a5c1681010c6e7619a018035dc73828cf73fcb635981f542724c01cc11b3d340905db1f52e45ed7ab6557d152b4695ba256f46374408923df1b57
+DIST adobe-flash-11.2.202.341.x86_64.tar.gz 7235766 SHA256 32115cbbd22465109f06e32acd6bed88465b2bc275eb94cc062f36aec0613134 SHA512 2971ea0143f0a770f211debe5216d4718363ac501f764a705f087b3609b820d8dc7c8ebf41115ab14e5c88c21bd9460195c9af271ca9d75e5981e286f5276a03 WHIRLPOOL 0017cec85b20d966d2f3e08b835c8ecbd82ec65be6e341cb9b5a032f56c502c58e325be4a0e48f49901b9829f2306c8c222ab98170a88317d51117a5221d4bd6
 EBUILD adobe-flash-11.2.202.336.ebuild 6823 SHA256 fe6a523dfe86a7af53c41b7075e64c455c6a204e62ab2bc2d010cf989901fb94 SHA512 f4abbee7125d9217dde0e818d8691a254b5e7069a25620f8d91b1123d9befd30d3381d5f6fccd19aabb5483d54d7cf60f67a5e9524eb083bc94e83dc5c44cfda WHIRLPOOL f46cfc7b18fe3bc406956f529a5720059ad702dea3881b85468feb6d609f9b90f4510c326e268c48a73ee81e5bcdc3576f22b78ba428100dee48893f67841f25
-MISC ChangeLog 56279 SHA256 bb61ca666f9fa7c540b97764833d583678fbb0b6eeb41144e8a4def6da4341ac SHA512 df7652ab61a1ca4d700f99439333480bfddf1ca76280ddfb80554cc41ee18fa960a49f9bae9a56beeb768457c48df44119d6fe7c71e8f47a2cafcc25d198bc1a WHIRLPOOL ec380f0bd97286b86ddbd8f7ac2cc2ff6877f0c3e4ed39b3d7a8a1e394c1b4b83a0be5a6b5eca57625deeae4c9a95611cb264d23f35e11e24a56be9952f6274b
+EBUILD adobe-flash-11.2.202.341.ebuild 6825 SHA256 0a0d400cea89e9ec01291ab6a03bf25ec0200edab56b1d9f450a0b347b1a5aaa SHA512 513fbc9d4326547db14eec5b1514457007e56e962e88c4f153f27a19e6b0980bd7f9f973e47e32b917334b4567b3467da5116200565c1d9d95b93a3c3184cf2b WHIRLPOOL ac6cce2c97c8642e7f1e41bf0a39eb4aa47c64f41bf7b71a4aff60c0ed14ad34866571031524e0941dd05a9fc56250618b794325c429388664964bb4e647abfe
+MISC ChangeLog 56451 SHA256 bb7affde2b2eed5761781a3155405639c2bf10ca0aba4e4fbb1e70c8c6226638 SHA512 b1d5550ce45a00caf5aab4b70a8cfe8fb31c195541644af985305e486d124e3ccd4eb6f0bf2267fa8e9faa6fe8a327df9d2e1eaaf0431e47ce048c0b349ce857 WHIRLPOOL cb11f065ae310f7ae1b2ab8c7a32bfa6716922b5baaa21cf81b07457a52b4023f9a97b56b224ff60fd5bd2cc740ca91ca2b96300c78def5a0fa64920deabf891
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLzVCkACgkQVWmRsqeSphPhxACdE35vCev80fK+A4kfv77URPd1
-YfAAn2xL+71r935SrCrjWnw1XZ0mbbgy
-=7kL0
+iEYEAREIAAYFAlMHVUsACgkQVWmRsqeSphOH9wCdGoy70aeGlYyusrrvpGSClgou
+32YAnR7S9m1cnnnQjJHuTPaJa/DaIIk4
+=XS1U
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.341.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.341.ebuild
new file mode 100644
index 000000000000..a7ddede862cf
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.341.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.341.ebuild,v 1.1 2014/02/21 13:31:53 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
+}