Version bump.

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 7c40acee1c3b..620e9f1be000 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.251 2014/05/14 15:20:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.252 2014/06/10 13:49:12 jer Exp $
+
+*adobe-flash-11.2.202.378 (10 Jun 2014)
+
+  10 Jun 2014; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.378.ebuild:
+  Version bump.
 
   14 May 2014; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.356.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 294d5341523d..8363beb6c677 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.359-debug.i386.tar.gz 7404160 SHA256 b435414b79589f81846e5e8ffcb831bdd1c9011661e8845675823c83010f7dc7 SHA512 74328f05caca10c32d34ff7b5c56a86dbb11f272a2b45119ebfc33da5b427824b7bd6ca51bbf35ab714a007324f330453cfa74d8abf60504cd7c4d588017e583 WHIRLPOOL 7d253b1486967ad902051eef5cf4761497314f78a2a29350d2a1d7f5a4de76d43cbf0d893e3965c4f64cc064e5c6808c4fd83127fe41163c31821e0e908e7374
 DIST adobe-flash-11.2.202.359.i386.tar.gz 6924219 SHA256 15adcd18f039a00e87c8ef02be93e11c5ab9c585bdeb9ddba8e732bd240a9013 SHA512 717ff4693b626b5de2472ad882d6bc639b785c3c2db161911384b30299e0f3a676f1edddddf5efe3d290917c8ab0ddf4144fa1521682d199ffdeb4c903bd5df7 WHIRLPOOL 99e6b6d5c3a7c9dedbf850886fa5ba731b21ef2e46d165c60277acec04483a818967a6a304239c314854a96d190cff9b44349ae56148f26e8a7275bc53a170b9
 DIST adobe-flash-11.2.202.359.x86_64.tar.gz 7236046 SHA256 6ade0c217d7c5d5ebb6fce4529a256bbf5dc94ed6f9cfa960c1ea7949cc1be8e SHA512 040c2ed2a0510b1c6a1b5054352ebc0c8f435aa4776989fb47ebaa8afb507c87a316d7202c092093f77481ec0a5105be984900f8648fe45891ee4f99f494f05d WHIRLPOOL c947cb77841c1aad7b2b750a9a9d5625279003ed9c6ceee41fcbc11f958c2c3ad48f5df4a9c24cb53ece45cb285e2f15317d297c0c9fb1b8249a843bc85b55de
+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
 EBUILD adobe-flash-11.2.202.359.ebuild 6826 SHA256 f932f681733b1ee8eebbe073494cd1b778a062a583bd53b16f0c03d617ad062d SHA512 d0bad6c6d65b338f797c08a3b6d9b754190729933b041bc4a8e90dc4cc22ba96e4fcd67c17ed69eff238170cb2f2b1102e73787a357eadee2f34f3de3cbbaace WHIRLPOOL 2ff9d25f45a5a4c02d86b54cb0362f71ee664c0cb7fec7130104f442307d967aa10191c5969d78b2c9b052535e963c9b81cdacf6047a5313dee4ec2aed5be588
-MISC ChangeLog 58550 SHA256 84449843a5c5a2dfda02a5923cd7e8267d4a6ec1e0c4ab4832275c0dc3768cdc SHA512 2993c815f7f4308cfdb441fb260030f85d7fe37a003999c9405b5ea099346cb5a55b1825c51c4a0b4cc8c5d9e2d55c91c3ba50279abf783533cc86969f8461fe WHIRLPOOL 88d7834d814905de8ab02fee92df9c656289faa2cb31635704b7bbe9f2f5b7d8ef558e43011dd6824518eb27acf53fbe44be22cd3e88f99d228b19295c8d560a
+EBUILD adobe-flash-11.2.202.378.ebuild 6824 SHA256 d94a8d98cfc229c62891dc89ba0fe3bd2baaac10f847dd42fcb1e3f196f62575 SHA512 aee33694a2bc9bf8a7bdd73f506373e0b1dcfd5fe4679d5d6e676c1dcfd518060fd22ab9fbcc087a94bcc4a6dd491d6599187ecb515bae308f0540590f0f510b WHIRLPOOL 5ad46f65fc472d0831cafa70ece541536b3d61d228f83b0276d6c45565c9c6fcb69ef07e361051eaf721c9c255e1411a27320890ce7065eb9d5d63d249e260ff
+MISC ChangeLog 58691 SHA256 216080afec5bd9f332e60980828298d4aeb81f8581a3ef9625a5cdd0a9f7f519 SHA512 afe79a4926209f9dfa79c07b0ad659032106704046c2b2103f5c2c508390595075c7b9aaf429db9410f34ecbfc0eb954a3192c203183a7e733f7c2d61054b8e3 WHIRLPOOL dacc48ce2cae787e3fbd343f3841019279fc9f18da5476c684b17bb3acf227edee0541ad0d63a241c37dae03e23a3cb9cc120831f5bb2a2cb83895e6696a8799
 MISC metadata.xml 321 SHA256 eadabc4103a5ba288719b67839637948b095e5bbc296d83a6c057e882a0e17f4 SHA512 9d9e0e1433e484aa398dcd4f8d4ce757afc4ffbe66136ac7b68b6d04c23d4d5f0e876d330273fd474d4e61e4df9d1c0227d45cb5eb94d250c97b4a46753c0a28 WHIRLPOOL ff2f1f3732c97ab3400d016e3ddd2004b9f40e2bbb76a0b12812a6b9b050614c17393eab8dbae8bc1065f40268acd1ef19130a35814c0f1645ba6b6b28a65ac4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNzicoACgkQVWmRsqeSphPJsACfTlOlQmb6hGbyAkgxZdOgiyPG
-DdAAnRcwEjZIFRz5FIVoxUH2jDUA/8l/
-=RxCg
+iEYEAREIAAYFAlOXDNoACgkQVWmRsqeSphP9owCeJggitQJSFjXBC1DwLY/wXfEe
+5RcAn3XQfYl1XHofOuhYLA10MyuJNSJc
+=3aOO
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.378.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.378.ebuild
new file mode 100644
index 000000000000..474b6444323f
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.378.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.378.ebuild,v 1.1 2014/06/10 13:49:12 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_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
+}