Version 10.3.183.5 released for security bug #378637, and a new beta of 11 just for fun

Package-Manager: portage-2.1.9.49/cvs/Linux i686

4 files changed, 389 insertions, 6 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index d3f623b72fbe..e56d285b42d5 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.96 2011/07/23 11:29:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.97 2011/08/11 01:18:16 lack Exp $
+
+*adobe-flash-11.0.1.60_beta201108082 (11 Aug 2011)
+*adobe-flash-10.3.183.5 (11 Aug 2011)
+
+  11 Aug 2011; Jim Ramsay <lack@gentoo.org> +adobe-flash-10.3.183.5.ebuild,
+  +adobe-flash-11.0.1.60_beta201108082.ebuild:
+  Version 10.3.183.5 released for security bug #378637, and a new beta of 11
+  just for fun
 
   23 Jul 2011; Markus Meier <maekke@gentoo.org> adobe-flash-10.3.181.34.ebuild:
   x86 stable, bug #375239
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 42c7b4d56e27..39d4fc2cf35c 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,22 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX flashplugin-lahf-fix.c 1038 RMD160 8b4550179b919f82acb67813eff33462bebeeb74 SHA1 628b3d672416d386134f79dbcedba333bd5558a9 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d
 AUX memcpy-to-memmove.sh 1418 RMD160 322005bfe0717630b945eb71ae4aa808a1d14d5e SHA1 72ee58862db06ee235055123137604619273819f SHA256 08a7203d19ca0d1ecbfaf6c46d915a28e2de81da97e42ef3c56e3d370c380096
 AUX mms.cfg 4420 RMD160 b73a91462e1db48fb40983e896cb06b3deb2a51e SHA1 3e56ecb32b938f46eea17a924fa0b006c66a3e6e SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a
 DIST flash-plugin-10.3.181.26-release.i386.rpm 5446759 RMD160 d4a4c0672121930224f774a5e74b9b456d957667 SHA1 16b8e846d425412e05e13d4327b9753ce9af4eb0 SHA256 9357f1f2b5f065548dc82ec705a3eeb946f796b37a18e102d64bc191225f99db
 DIST flash-plugin-10.3.181.34-release.i386.rpm 5446695 RMD160 9d2db378ab8c673aadc38c21108c9ec9730650e6 SHA1 171af4caf86c0d51777d2b99aa4530ec92f61b49 SHA256 db074cb7b38dbc59e1d25f267a45d52dd09ccd85031cc0d01cd77b1420036a2a
+DIST flash-plugin-10.3.183.5-release.i386.rpm 5449527 RMD160 1cd43da1b33686f69d69e2b7ef0e3883c5706961 SHA1 d3607dc100bef1303d4a72cb43a5109973989d3d SHA256 d9398af622e3b62c315e70ea566cb570fbcb2b9792a23de566b860100e650a46
 DIST flashplayer11_b1_install_lin_32_071311.tar.gz 6747871 RMD160 cbfe3943445f5e7b8c5e9288ecdb17c10af0c8d9 SHA1 d3f4417ad8c83afc3089aa6ff8b6c7706a0ef34b SHA256 1ccd71b27ffafc4ffa8cb4e494b972fe73378406a08e5a066d58c5a521fdfeff
 DIST flashplayer11_b1_install_lin_64_071311.tar.gz 7044701 RMD160 ed5d26c0c2f9387ed6ea3d9fdd37aa3c020a608b SHA1 8b7deb398e5e57cf2b8dcd1e498e8da07a8548ed SHA256 46dc0573bdfedc73edf2296be33fb9bfbb6e3238b54438f5b2d91d8ffe82b635
+DIST flashplayer11_b2_install_lin_32_080811.tar.gz 6757665 RMD160 850f80802b9176ae75208b6b28330c849d610ed0 SHA1 b117ff27111281b58cf4b32efca1505e0ef2ecf9 SHA256 e9780187a1fd0b21a7cac5f0859020b87f9f2355c7810af60dde6436c386f7be
+DIST flashplayer11_b2_install_lin_64_080811.tar.gz 7047824 RMD160 0d92ab6fff1f6b2fdcc57ecede70a3d79337a34b SHA1 fd02c7512a4d56c896ee9213ca09fd484aa325c0 SHA256 5b2d8c3744031adad49121c959f2e899cbca2e91592c6773b1ba61d0ff2bafd1
 EBUILD adobe-flash-10.3.181.26.ebuild 3998 RMD160 4a4210f8a383493dca06163c0e493ce821198b2d SHA1 a9199a959a6146aa2a2b5a2f743cd688f29922e1 SHA256 871c07b8819b717a0fa02c53110370b94ac182abede109839298fce495b81acd
 EBUILD adobe-flash-10.3.181.34.ebuild 4000 RMD160 cfb048f1bc999e59ce5bcfe5d07eae5496f15564 SHA1 c5836a14975592d048da5c071a30b1165e76f72b SHA256 957458c5e5ff7247c082e4c652b2dd4b68972b887fdf62db0644f942767f8337
+EBUILD adobe-flash-10.3.183.5.ebuild 3999 RMD160 e0766b2ded9b33a349b199b431d2cd7596bfbbfb SHA1 eb5270f114deda6d54367b27881e458b4ae9b619 SHA256 f512cb99e9adbab596f27c1227aba7206727a304d09394118395862c6d138723
 EBUILD adobe-flash-11.0.1.60_beta201107131-r1.ebuild 7299 RMD160 14a4730c0dc2403f2740ffaa0f42116233dd2566 SHA1 f03dca6fe138d8f4769b84280afdf5fd74815b14 SHA256 9f3bbb1d846d55f633ce675200cf50652144688c88d767e8f63260a6d5c0d6be
-MISC ChangeLog 35821 RMD160 f93887d5a221441dd0669738d2a7ac7ded69e377 SHA1 455b37bbc3a7e9e7564936b8caa04221459671c4 SHA256 a73ec373cafad5eb5f003e94c5e0e70de5f6400ab4e235b87e8aabeb01caa8de
+EBUILD adobe-flash-11.0.1.60_beta201108082.ebuild 7296 RMD160 d0d245ccfb43962b89921ac0859ddd498ee059e4 SHA1 358766565bc123a44328b3c01fd4a8484d296614 SHA256 05126642a4fbaa3a0e2084c0cceb01ccbe55856aa6d2bce9c2d1762581a385ab
+MISC ChangeLog 36125 RMD160 0d5db71a59551fac0c9cd5e9518bf22cb2f640d9 SHA1 0f0396306ebd61c3ebc34bf5b62ee1d7c19c21e6 SHA256 c75ea4cbb583d951ae18af10d84549a243eb142d9f916568907af66a4b19210a
 MISC metadata.xml 1010 RMD160 73dd5ebd0ca15f10489748d441e8f5ad11f86a64 SHA1 83a453fe0b10a603237755eae9b4ff8ee47d438a SHA256 36e47f0f087760202d4ad961f9ec3fbf0bd2dc075f1b34d7d8950b2960409016
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4qsKgACgkQkKaRLQcq0GIRCgCfX3mUr4m++4/YtmkUqYLWxe1I
-FecAnjz0L03vGVeoHgKL9GbfznD/nPBc
-=prkZ
+iQIcBAEBCAAGBQJOQy4hAAoJEA8o5SF9Rr6qBlUQAKzUG5pTSW3L2pPRPP2hZtIU
+YCgslP1aNwSrPIvNRe0lx8SyDUe1cEXx8YLReRVHM4XZi9BKOmJ/rxLO+sQs50fN
+ib9tnBOI42yNXdZ48oayiITWk4TO+T1UHSo1+CD5BkVvKnnUWAYieBabxVD/efSD
+x/BcSyAtF1ODZ6uSkulNQ202DfNgqJh3V0YhsZGM6k0Rw18IAjfAo5xtRwBdUn6G
+PDs6J4Rekypc4W8Tr9xYTn1DPeyIn2amzzklmSZBXP44ZxuIu8bSq7QhviyskJbb
+Uef42dDLXE6COkfBh0AQa51cJ/TcHz0t2sqDHyB38GKQOTKMwGLMuqeR3/iVxKdz
+kxS6iKLfhgIgCrweKsWPol+tsDiGTJjkb1GGLMBSUTKmf2swUQnOg3GkqWWxj4tq
+VZm3mZT4ieQDzglhcV3mjgB+jBPs3MX50hitGOMO5waOAJptxAbB4GpcClbPtz6u
+Xr3JA459Yrjsl/jM5oIcia/zxRDQ++vZCcihrNzp4Je+CwAnsm6E30/2ZoggEB8T
+ABgw1Hk7pbtX9cs/tsKYGay1YHn677AhpYtxbIwgYdZ1SbQHlqicSPmB2w+Py5MK
+6F2OtV8Xbyodz0zYecTJ2FMphRDZUZ/jR6B3WzOckBaAYcph5Nm/zpd2nkOnoPOq
+O7C+h/jVwSN3adq9PGhc
+=kUyq
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.5.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.5.ebuild
new file mode 100644
index 000000000000..e75c8c9efba0
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.183.5.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.5.ebuild,v 1.1 2011/08/11 01:18:16 lack Exp $
+
+EAPI=4
+inherit nsplugins rpm multilib toolchain-funcs
+
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-${PV}-release.i386.rpm"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="${MY_32B_URI}"
+HOMEPAGE="http://www.adobe.com/flashplayer"
+IUSE="vdpau kde"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-10.3"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="x11-libs/gtk+:2
+	media-libs/fontconfig
+	dev-libs/nss
+	net-misc/curl
+	vdpau? ( x11-libs/libvdpau )
+	kde? ( kde-base/kcmshell )
+	>=sys-libs/glibc-2.4"
+
+EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
+	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+	app-emulation/emul-linux-x86-soundlibs"
+
+DEPEND="amd64? ( www-plugins/nspluginwrapper )"
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? ( $EMUL_DEPS )
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+	${DEPEND}"
+
+# Where should this all go? (Bug #328639)
+INSTALL_BASE="opt/Adobe/flash-player"
+INSTALL_BASE32="${INSTALL_BASE}32"
+
+# Ignore QA warnings in these binary closed-source libraries, since we can't fix
+# them:
+QA_EXECSTACK="${INSTALL_BASE}/plugin/libflashplayer.so
+	${INSTALL_BASE32}/plugin/libflashplayer.so"
+
+QA_DT_HASH="${INSTALL_BASE}/plugin/libflashplayer.so
+	${INSTALL_BASE32}/plugin/libflashplayer.so"
+
+src_install() {
+	if use amd64; then
+		local oldabi="${ABI}"
+		ABI="x86"
+		BASE=${INSTALL_BASE32}
+	else
+		BASE=${INSTALL_BASE}
+	fi
+
+	# The plugin itself
+	exeinto /${BASE}/plugin
+	doexe usr/lib/flash-plugin/libflashplayer.so
+	doexe usr/lib/flash-plugin/homecleanup
+	inst_plugin /${BASE}/plugin/libflashplayer.so
+
+	# The optional KDE4 KCM plugin
+	if use kde && ! use amd64; then
+		exeinto /usr/$(get_libdir)/kde4/
+		doexe usr/$(get_libdir)/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 'properties' standalone app:
+	exeinto /${BASE}/bin
+	doexe usr/bin/flash-player-properties
+	for icon in $(find usr/share/icons/ -name '*.png'); do
+		insinto /$(dirname $icon)
+		doins $icon
+	done
+	elog "Done with icons."
+	insinto usr/share/applications
+	sed -i usr/share/applications/flash-player-properties.desktop \
+		-e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
+	doins usr/share/applications/flash-player-properties.desktop
+
+	dodoc "usr/lib/flash-plugin/README"
+	dodoc "usr/share/doc/flash-plugin-${PV}/readme.txt"
+
+	if use amd64; then
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+pkg_postinst() {
+	if use amd64; then
+		elog "Adobe has no stable 64-bit native version at this time."
+		#elog "The beta"
+		#elog "64-bit native release (codenamed \"square\") is installed as part"
+		#elog "of the unstable testing version of this package:"
+		#elog "  ${CATEGORY}/${P}_p...."
+		elog
+		if has_version 'www-plugins/nspluginwrapper'; then
+			elog "nspluginwrapper detected: Installing plugin wrapper"
+			local oldabi="${ABI}"
+			ABI="x86"
+			local FLASH_SOURCE="${ROOT}/${INSTALL_BASE32}/plugin/libflashplayer.so"
+			nspluginwrapper -i "${FLASH_SOURCE}"
+			ABI="${oldabi}"
+			elog
+		else
+			elog "To use the 32-bit flash player in a native 64-bit firefox,"
+			elog "you must install www-plugins/nspluginwrapper."
+			elog
+		fi
+	fi
+
+	ewarn "Flash player is closed-source, with a long history of security"
+	ewarn "issues.  Please consider only running flash applets you know to"
+	ewarn "be safe.  The 'flashblock' extension may help for mozilla users:"
+	ewarn "  https://addons.mozilla.org/en-US/firefox/addon/433"
+}
diff --git a/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201108082.ebuild b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201108082.ebuild
new file mode 100644
index 000000000000..1234ac463ec8
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201108082.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2011 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.0.1.60_beta201108082.ebuild,v 1.1 2011/08/11 01:18:16 lack Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator
+
+# Specal version parsing for date-based 'square' releases
+# For proper date ordering in the ebuild we are using CCYYMMDD,  whereas Adobe
+# uses MMDDYY in their filename.  Plus we tack on the release number, too.
+EBUILD_DATE=$(get_version_component_range $(get_version_component_count))
+DATE_SUFFIX=${EBUILD_DATE: -5:4}${EBUILD_DATE:6:2}
+REL_SUFFIX=${EBUILD_DATE: -1}
+MY_64B_URI="http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer11_b${REL_SUFFIX}_install_lin_64_${DATE_SUFFIX}.tar.gz"
+MY_32B_URI="http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer11_b${REL_SUFFIX}_install_lin_32_${DATE_SUFFIX}.tar.gz"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="x86? ( ${MY_32B_URI} )
+amd64? (
+	multilib? (
+		32bit? ( ${MY_32B_URI} )
+		64bit? ( ${MY_64B_URI} )
+	)
+	!multilib? ( ${MY_64B_URI} )
+)"
+#HOMEPAGE="http://www.adobe.com/"
+HOMEPAGE="http://labs.adobe.com/downloads/flashplayer11.html"
+IUSE="multilib +32bit +64bit vdpau bindist kde"
+SLOT="0"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-11_beta"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="x11-libs/gtk+:2
+	media-libs/fontconfig
+	dev-libs/nss
+	net-misc/curl
+	vdpau? ( x11-libs/libvdpau )
+	kde? ( kde-base/kcmshell )
+	>=sys-libs/glibc-2.4"
+
+EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
+	>=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+	app-emulation/emul-linux-x86-soundlibs"
+
+DEPEND="amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )"
+RDEPEND="x86? ( $NATIVE_DEPS )
+	amd64? (
+		multilib? (
+			64bit? ( $NATIVE_DEPS )
+			32bit? ( $EMUL_DEPS )
+		)
+		!multilib? ( $NATIVE_DEPS )
+	)
+	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
+	${DEPEND}"
+
+# Where should this all go? (Bug #328639)
+INSTALL_BASE="opt/Adobe/flash-player"
+
+# Ignore QA warnings in these binary closed-source libraries, since we can't fix
+# them:
+QA_TEXTRELS="${INSTALL_BASE}/plugin/libflashplayer.so
+	${INSTALL_BASE}32/libflashplayer.so"
+
+pkg_setup() {
+	einfo "Date is $EBUILD_DATE suffix is $DATE_SUFFIX"
+	if use x86; then
+		export native_install=1
+	elif use amd64; then
+		# amd64 users may unselect the native 64bit binary, if they choose
+		if ! use multilib || use 64bit; then
+			export native_install=1
+		else
+			unset native_install
+		fi
+
+		if use multilib && use 32bit; then
+			export amd64_32bit=1
+		else
+			unset amd64_32bit
+		fi
+
+		if use multilib && ! use 32bit && ! use 64bit; then
+			eerror "You must select at least one architecture USE flag (32bit or 64bit)"
+			die "No library version selected [-32bit -64bit]"
+		fi
+
+		unset need_lahf_wrapper
+		if [[ $native_install ]]; then
+			# 64bit flash requires the 'lahf' instruction (bug #268336)
+			# Also, check if *any* of the processors are affected (bug #286159)
+			if grep '^flags' /proc/cpuinfo | grep -qv 'lahf_lm'; then
+				export need_lahf_wrapper=1
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ $amd64_32bit ]]; then
+		# Since the 32-bit and 64-bit tarballs collide, put the 32-bit one
+		# elsewhere:
+		local my_32b_src=${MY_32B_URI##*/}
+		local my_64b_src=${MY_64B_URI##*/}
+		unpack $my_64b_src
+		mkdir 32bit
+		pushd 32bit >/dev/null
+		unpack $my_32b_src
+		popd >/dev/null
+	else
+		default_src_unpack
+	fi
+}
+
+src_compile() {
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		$(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \
+			"${FILESDIR}/flashplugin-lahf-fix.c" \
+			|| die "Compile of flashplugin-lahf-fix.so failed"
+	fi
+}
+
+src_install() {
+	if [[ $native_install ]]; then
+		BASE=${INSTALL_BASE}
+
+		# The plugin itself
+		exeinto /${BASE}/plugin
+		doexe libflashplayer.so
+		inst_plugin /${BASE}/plugin/libflashplayer.so
+
+		# The optional KDE4 KCM plugin
+		if use kde; then
+			exeinto /usr/$(get_libdir)/kde4/
+			doexe usr/lib/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 'properties' standalone app:
+		exeinto /${BASE}/bin
+		doexe usr/bin/flash-player-properties
+		for icon in $(find usr/share/icons/ -name '*.png'); do
+			insinto /$(dirname $icon)
+			doins $icon
+		done
+		insinto usr/share/applications
+		sed -i usr/share/applications/flash-player-properties.desktop \
+			-e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
+		doins usr/share/applications/flash-player-properties.desktop
+	fi
+
+	if [[ $need_lahf_wrapper ]]; then
+		# This experimental wrapper, from Maks Verver via bug #268336 should
+		# emulate the missing lahf instruction affected platforms.
+		exeinto /${INSTALL_BASE}
+		doexe flashplugin-lahf-fix.so
+		inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so
+	fi
+
+	if [[ $amd64_32bit ]]; then
+		# Only install the plugin, nothing else for 32-bit.
+		local oldabi="${ABI}"
+		ABI="x86"
+
+		# 32b plugin
+		pushd "${S}/32bit"
+			exeinto /${INSTALL_BASE}32
+			doexe libflashplayer.so
+			inst_plugin /${INSTALL_BASE}32/libflashplayer.so
+		popd
+
+		ABI="${oldabi}"
+	fi
+
+	# The magic config file!
+	insinto "/etc/adobe"
+	doins "${FILESDIR}/mms.cfg"
+}
+
+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[+32bit -64bit]"
+			elog
+		fi
+		if has_version 'www-plugins/nspluginwrapper'; then
+			if [[ $native_install ]]; then
+				# TODO: Perhaps parse the output of 'nspluginwrapper -l'
+				#       However, the 64b flash plugin makes
+				#       'nspluginwrapper -l' segfault.
+				local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
+				if [[ -f ${FLASH_WRAPPER} ]]; then
+					einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
+					nspluginwrapper -r "${FLASH_WRAPPER}"
+				fi
+			else
+				einfo "nspluginwrapper detected: Installing plugin wrapper"
+				local oldabi="${ABI}"
+				ABI="x86"
+				local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so"
+				nspluginwrapper -i "${FLASH_SOURCE}"
+				ABI="${oldabi}"
+			fi
+		elif [[ ! $native_install ]]; then
+			elog "To use the 32-bit flash player in a native 64-bit browser,"
+			elog "you must install www-plugins/nspluginwrapper"
+		fi
+	fi
+
+	ewarn "Flash player is closed-source, with a long history of security"
+	ewarn "issues.  Please consider only running flash applets you know to"
+	ewarn "be safe.  The 'flashblock' extension may help for mozilla users:"
+	ewarn "  https://addons.mozilla.org/en-US/firefox/addon/433"
+}