Version bump.

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

3 files changed, 249 insertions, 5 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index a49b5d19f323..5739d8d3c518 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.321 2015/07/09 05:04:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.322 2015/07/16 13:50:47 jer Exp $
+
+*adobe-flash-11.2.202.491 (16 Jul 2015)
+
+  16 Jul 2015; Jeroen Roovers <jer@gentoo.org>
+  +adobe-flash-11.2.202.491.ebuild:
+  Version bump.
 
   09 Jul 2015; Jeroen Roovers <jer@gentoo.org>
   -adobe-flash-11.2.202.468.ebuild, adobe-flash-11.2.202.481.ebuild:
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index ca41aa7a02c9..4a9120c4af37 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.481-debug.i386.tar.gz 7416138 SHA256 1efb97a14da8bfc551904218629870280f65c6221263f7cc8c27d1d1b5ebe484 SHA512 a440292dfed87d8394926e2bcb57f18a3f5c8b0fe9f94da5f4e01b3fd5c4b8796c4c2536b239e44dbcff11b2be131aa4c40ee7edca7b03211707d3756931439c WHIRLPOOL fc4bd5ae0c71e14ebbc9f0402357dbd6af172ff61996e79c300b91713b18d52811317171f53669c3ae53d42082c8259bf80b24a66a53d207edc9bd61ae697e7f
 DIST adobe-flash-11.2.202.481.i386.tar.gz 6936529 SHA256 76fbede606e9eda56c73541dd55dede1afe0e08ffbce95005989dce903cfcd17 SHA512 aadf27febdbc3235d779df973106cf0e4bca2bee1a628fe084f4b513b2c886788dd2e254785f94aaec46214efa2ed73b09db23045db405ea9edd38df96017af2 WHIRLPOOL 18f5ca0c92624b7ee152528965de8ca76709871121fb24843d6ae9a836d4ebfc11e1f6f951d14c3bb490be594bdf566b4789da48f4f916263a3135fdb67e0a32
 DIST adobe-flash-11.2.202.481.x86_64.tar.gz 7250105 SHA256 df2711b5bec70cde45625f60894b2fcdcb52b8d30b923d5c94dce31e8e892d94 SHA512 54285653004a93f1099a73d5f1e952072b4f923529b72399547d9be00060c998d0da897ea107bdf994db1c9260ab48677ac83aa3ef812f1a5a797a962fc08d7c WHIRLPOOL d0eb9c274df8078b35b9847fca09dda52e7e3c6dc8a69653b6bb1a3e9432465d0a40619195edc753896371c2f5bbb9aba0550b734b6ccbe42899ea05a2cdd9fc
+DIST adobe-flash-11.2.202.491-debug.i386.tar.gz 7425036 SHA256 5f5d2443f9a9482d26fa8685f5593dd833e4dbd729e41851e41dc1bfbe4276bb SHA512 e2d7291ac41e7bf375d8bcf67bbb0c359ee9481beefc7ee7ab84e66896e0037543cb73c946d0be7829efef1841318b2fdf8669bbef2c931362c5610c50482150 WHIRLPOOL 2fd7d999bf1e83ca51c35978052ad690230bdf53d3a6b8df80b58556819b2a721eafc9cdcb54b710ae243f036c3f3bde3697c37aa13958a0fb18197e10349db5
+DIST adobe-flash-11.2.202.491.i386.tar.gz 6942060 SHA256 be3f277fe1a15e4b082938019b4e0f9fac4336b460b2eb08d8f22bf90c718e53 SHA512 465a17858cd929f46260709061c61ae56b2f7da61722a5fb8eac44e7474ade730c4031631d173c9f42e994f73f82ad8b734bf76fc73294ed8ef55af73c4fcde9 WHIRLPOOL 08856d73968d464893aea7b1d341000c6ff22c47a8175784fe42ac24483276211cc85823f20dfb038eafaefc072cdbd4e14e7601ba362e8427f2cd6ecf9c4feb
+DIST adobe-flash-11.2.202.491.x86_64.tar.gz 7261649 SHA256 f4be14b3da6fd8485292b128d01f8e560b1fe2bbb97d5f1dbc104a84a7a51f94 SHA512 03fb0e445669b20ac0bb87d8ada44dedf191a6b1411461d5b766a1cc6325864ef3df0fdb88a04bfdace152452a52e6cd20ba0e6183a240a44d7fdd708bb9e956 WHIRLPOOL d1fe0578cfe47456d0ee9f3253fadf3aed872cd1af451dd929cad0e3b098543cdc2c4788fc14120b913f52070f7b90e43c662ebc7592b01e1e0a0fac9553c0a6
 EBUILD adobe-flash-11.2.202.481.ebuild 6800 SHA256 10812647bac355aa289134f8d4ad9f75ac1f4c9d3911fcb6384b9d017b9142ce SHA512 a3b78d60fdd6ccb0aac60e5e599a540324b91c88df65d9ad8bf9d66ae1078a1b4899c8e275d399bf0bc954004f585874d888c997db55d8765afba9af53ca9242 WHIRLPOOL c3f495a96707281af39c1c8090e128f6b82a9772402e6679d8f456d3f24bf4041a5d3a246add3e4791a5ab18d8b7893cb23c62a6376e03cf5f2271e6c60e13d5
-MISC ChangeLog 67296 SHA256 616788f279fae01c8940f76cdca8f7bf1df92f52796a2da867cd32d63c655d49 SHA512 de2ad46f8b94be94ca2663deae296be62cb3f73c8f062c27856a6a24e27476550dca6881472a8cee7af0bc22c5241fcac60767d6248463cfb3991c2e5357de9e WHIRLPOOL 1980a8d856f1ea7b2c7e31d50ca54654c121422e9030f2a16706eb4bc11ef58959dd71304575816e298d8e396800b5a882971e0203a31945c818676299e6ce4b
+EBUILD adobe-flash-11.2.202.491.ebuild 6802 SHA256 5fc0767a15ebf072837454cc4c653300c6b6e16b596a063bc9c339c187bafcd5 SHA512 8cbf0cfa5b1394949767bbdd977783a8d35854cfc6de6d8dae6f77ed59b613df5ebd4f21e5ae43f17ad48fcb836110173d5bad625fcab27112f7b92b95d0773d WHIRLPOOL e17339162ed66d1f0d96d1316b3e278e8ac7d4839c28ac3108d3fc2ac09614a64b5a29c0f9a752e94385e224b5ccc554d8f831180073edcfd62db10170c64b8b
+MISC ChangeLog 67437 SHA256 cca17c7fa9dec66729f6df5f5a152cbbbc6f4ca7972c034a6d16b8f18ea3aff9 SHA512 319cc276aefa18c54e0d33b682daae51e9cc0ff1f928ba33e3b952df22518173df4f5a48d740a04a5158e87a1290e079aac787b7abd3af44305f3e48e1554663 WHIRLPOOL 168e36db6b83cf7cf61842659013cbf1d9dc8223ed2f03d11908649f6c4c15fcddddc6deb37de15adf71dc1cabb7bab003498bdf3963cf38a861ece078748713
 MISC metadata.xml 321 SHA256 8deb56ef6832b7228800012723bae22d3eca62c387a3080bca3a98010767e00d SHA512 a728e401d2210342cc1747de4291136d3fbe25060eb0dec35a3b7c8ca5c082acd95780ef5b8d33d5d0a98f372367b5424b6dd777902d4387188758ad8dc0a09a WHIRLPOOL 5ab060286049fb7bbb0e9461561c2f29cbaa5c42bb9d44901bcf6a0a56726879c6f2a65ee08b9c278441a072addcf09f6c2f481b5c008818c25c9911dbf95a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWeAOgACgkQVWmRsqeSphNQGQCfXB5UdIUNbJT1Ir1rM74iuDKs
-4kAAn1fAbTpU05f2fjKuOBOKV1R1o5Hz
-=lqig
+iEYEAREIAAYFAlWntrgACgkQVWmRsqeSphMP3wCdE7dmHd9NngSb2fK8sme1bLJE
+zfMAn0/7jyWDz8Z5IARgB8qgGHfLfObZ
+=tYN9
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.491.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.491.ebuild
new file mode 100644
index 000000000000..245faabaaf6d
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.491.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2015 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.491.ebuild,v 1.1 2015/07/16 13:50:47 jer Exp $
+
+EAPI=5
+inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
+
+DESCRIPTION="Adobe Flash Player"
+HOMEPAGE="
+	http://www.adobe.com/products/flashplayer.html
+	http://get.adobe.com/flashplayer/
+"
+
+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 cpu_flags_x86_sse2"
+REQUIRED_USE="
+	cpu_flags_x86_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 ) ) )
+"
+RDEPEND="
+	${DEPEND}
+	abi_x86_64? ( ${NATIVE_DEPS} )
+	abi_x86_32? (
+		amd64? (
+			>=dev-libs/atk-2.10.0[abi_x86_32(-)]
+			>=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(-)]
+			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+			>=media-libs/freetype-2.5.0.1[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/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(-)]
+			>=x11-libs/pango-1.36.3[abi_x86_32(-)]
+		)
+		x86? ( ${NATIVE_DEPS} )
+	)
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+	selinux? ( sec-policy/selinux-flash )
+"
+
+# 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
+}