Version bump (bug #446984).

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

4 files changed, 278 insertions, 18 deletions

diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 806a4d11a59e..6fbe6a4228ff 100644
--- a/www-plugins/adobe-flash/ChangeLog
+++ b/www-plugins/adobe-flash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/adobe-flash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.152 2012/11/26 13:34:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.153 2012/12/12 15:45:22 jer Exp $
+
+*adobe-flash-11.2.202.258 (12 Dec 2012)
+*adobe-flash-10.3.183.48 (12 Dec 2012)
+
+  12 Dec 2012; Jeroen Roovers <jer@gentoo.org> -adobe-flash-10.3.183.43.ebuild,
+  +adobe-flash-10.3.183.48.ebuild, +adobe-flash-11.2.202.258.ebuild:
+  Version bump (bug #446984).
 
   26 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Update to global useflag.
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index cb11c3acfe07..1b2cf0fab827 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -4,27 +4,20 @@ Hash: SHA256
 AUX flashplugin-lahf-fix.c 1038 SHA256 52acc6658eb7d49fb167c848345f7dcb49e4057e2872ca8319bccbff6728df6d SHA512 c56082ca6371176a3454f94a7ee5c00aba2d27c969783b26740b6ff61f42e240a34b7eeacc736f035cc101709141c4786f241f98495654a67f61544a10ce478d WHIRLPOOL f43cc3b836c8d43e6d706d847693bd34a212eb4c4ba3ee698db0f752bf36a7029f81e05664ba3ebbb8190fca414dee3fc109e586fe5e02f1c6263cd6e5bbb8b0
 AUX memcpy-to-memmove.sh 1418 SHA256 08a7203d19ca0d1ecbfaf6c46d915a28e2de81da97e42ef3c56e3d370c380096 SHA512 1686108fc6a1f5438e0d054de55e95829f53e551bb11efbc2632e62cd4432edf93a26dced2409512bbc641d61c840e0d5f241c6716811dbff00f32586f4aaeac WHIRLPOOL 28c8d1cc1f557a812c1bfd078068d7e8fb40604e7060705446d6317dc6e76375cec81190ec42e979f2e6a43516466d0454f45152de31d43f7dd5fc9854db9296
 AUX mms.cfg 4420 SHA256 0dd2a9f9aab559243c4d282b5c143ed8876b8d6f8be519bfa8ca6e8fc0c55d9a SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd WHIRLPOOL 915b86d717db181a776eb9392aaae2becac4747bc0e551900bfecdeda17f9d0495f54c7173e47adf2ea92567c193c466e302cac78bd2126f10fd9956c204596a
-DIST adobe-flash-10.3.183.43.i386.tar.gz 5460239 SHA256 b6d01187b6e3090cf2e88820c2ca220ebf8ce14e9febed2259d3ac9a963178cf SHA512 7bc243da636226c8773703a6fe994105bc5072ee2f832feda4285c9b22c2c0a5684f7eb26b22e855f5be6112d11b9cd876cce13186c526b1cd66b9cade4485d4 WHIRLPOOL 8e49d1f9619ba3fcf68c097ccb8e8ec7308b6bea14efa164cb90e17ca7621d9bf87b2d12351dbed343861ae2bbbf825edc28cf2d0100cb6d60b530655849b0f9
+DIST adobe-flash-10.3.183.48.i386.tar.gz 5461025 SHA256 c030cb7e6c364acfc12246e20f68fd4c5616dcaf5e2ca34f9ba76bd1ab890b57 SHA512 da0f9e27c6a30ddcd9b178f798ca6f5813ec13a87b78b243d90ea9485aa27227b9d6e85d233e111569d1f76d9ca459c290e4a17c63c1fc2169c809cc8bb9f09e WHIRLPOOL 33c8daf75f640dee3cab27a47de469ff371489c4e81df2fed0aeb9594867dbda9b2e10a71f4bcb742c1d00b875a40949cfe3a1ab16f7a28aba5d01d9413a0afa
 DIST adobe-flash-11.2.202.251.i386.tar.gz 6917347 SHA256 a3362986fe9cba5628c1b1684707de79f63947623b631c2a42eeea15b420f05a SHA512 3f714b397537401ba92d10a76f7185b02896c3d3064653c6aaaf095450c738139280f412dea07650cb219001d443ea102cf3785d11256812f6cb2174ec23ff7a WHIRLPOOL 7b44e7ec191eae349603c9af703b448a4e122aec8e162d3219ec72b1e60143aeca69e5eb23b8e5d4194e64eb389f76ad3814bc140d67f1fd189b8720af2fd6cd
 DIST adobe-flash-11.2.202.251.x86_64.tar.gz 7228964 SHA256 e267678d480e1f934da738f0e14512bf3adb96425b925c690e62d3882ebe7c5a SHA512 458df3c314bec1dc7cb2af111a7e409b05cbccedb8f98cd8178993f77e55403c54cfc240458cc8916cc34a96c4c782c2a62d8898fc1723ce8475eb71b142f10b WHIRLPOOL 65e081cb8fc03e674646f657ae3b793ee91ca4bfd6a8733abd10509c827615c7635573aa93b47955794c55b202e00ea0c156fe5fbf4552a53a7e0193a1e24bfe
-EBUILD adobe-flash-10.3.183.43.ebuild 3483 SHA256 31759fa409c75efdff44e2e90d69737e4b7a2dbced3657f4096930f825da9f87 SHA512 b2cca19bf3d7918eb8de69bfb23828d150c406496c3261cc2ff7acc00b3609dbe8797d85a186b8f3861c6a78dafd25aa14f46461771a12721029af5ad60e02d3 WHIRLPOOL a3d305220b186ce70d4a587cf95048e88f61deb13fcb92cf001e588900eb18229d27e2977bf7ebd3d1578c24c6a74b6b6c374326ae756a8a3fb07cbd37d53ffa
+DIST adobe-flash-11.2.202.258.i386.tar.gz 6917577 SHA256 6c9a0414b1d7be2b8675267e3b699747a75fa85a663a6ecdaeb72cedf4a6b3cc SHA512 cd8317bdd61333026af1d352285cc1597c2af9e86b1c8b3d575094debe08c24a313ac7dbadc52b81bdc4b5971db742cd4c97bd1032cbbc97ba1b7b00aec75135 WHIRLPOOL 5945d625ea95694ee690bf144c3f8fdef4f20605c935e6883bb222e77cdc9c0bf4e55dcf138128bb59de31eb8ff747360fda16cc373d19c1d5618f91d3e2d4f2
+DIST adobe-flash-11.2.202.258.x86_64.tar.gz 7228746 SHA256 142253638f6c8b021f3c5d811c43881d1f5af104bb563c10fff4b4d856f02dbd SHA512 6462f8bfda34f6bc5890b6f2c445eb7af7d7ad394375de64b99636f710bfc497f3bf0e6869ad053c12ff2584e21e4fb05ebd3aa108407d8ab7231c1bf76b5745 WHIRLPOOL 0040497b46fe94a05819693e837fb71e754798765166208c0af73a4cec991613e8bc1efe702b611ededde1e43a4bb0979b6b133a4bb5c0f2d14f14500808f54e
+EBUILD adobe-flash-10.3.183.48.ebuild 3483 SHA256 5c6a32945a425832cad0e2247ec6ce289e6e7531611686333dbcbadaaf91095a SHA512 498dc661a3ad3aaebdf6bf87d580806ea94082e033ca524137de50f72d7d43b1ec0ceab32b24e28636886850bbdcbcfa8ca1bb7748c861c085256a0a3be0bd70 WHIRLPOOL 4ec2677c65942a505c04d903ccbaf4af40b88e9473bd77af4dc065df8d57c4e009dd4829f15b6c0a896e481409c2d37ca4ad78377f86d527590b88feea607765
 EBUILD adobe-flash-11.2.202.251.ebuild 7992 SHA256 278fc4680f644f832fb52fcdeda903b18367d680b6024358eab3dc42aeef9267 SHA512 de82bc11efb48076133d8bd5741c2e281b847c06e73790525a5904403d6d10abf31955c41045971bfeb669486ce951f2e5f24d8712e4e920b3b2726b132b1381 WHIRLPOOL 0943f236578a9922b7c3f8857c7bdf386b33ffea22ea3c62da4d70b1c24267d1a26cea70c713a2b34eb4cb9a75b8de090feed83fe7741d8a6cb1fa3a634681aa
-MISC ChangeLog 45024 SHA256 c5a7170f3b6d38d04e73177c0046f12c534009864d60f232324da45cd548531a SHA512 51237480e244f7b9d1ac1869a77b4d6b22c9a6bcfaf7716d4e089ed28f7a3b757593cbaf53a97521d37f20a5d24c3cd3c56aa8f5732d3b584f4f216f81221b60 WHIRLPOOL 205ec4e8b9def98bf13b7ecbecc8ef24a3c220fc77b46a5f4f1b2d7a1f2e2f00e54c3a4b5d992c360b8c3650bedfdc0d307ad216b9c935ccff23c4909331954b
+EBUILD adobe-flash-11.2.202.258.ebuild 7994 SHA256 0fd9f703dbf2ed758c29e163e93c53eb2c07ab2d943aeec2bde91e949474bdee SHA512 50c284b4a1baaedf8992f0190c980723b57be362e5d208813488c4f606d0024db26bee81015b652412d43753bae69b2adbcea50ceeda10e4a22ae57ac114b51d WHIRLPOOL 081862dad7b54d6088854c06d2b017888d26f45c0cf79e2c25a3423ec03f77fa314b45ced452fd1b538c4b15bd7f133cc32c22c1ff96f9a3fa6a1eebeb5d6259
+MISC ChangeLog 45278 SHA256 c18ae19dc10a1c32337ed9d8e97962f9e332c883eedd683176d32f9645e13e89 SHA512 e08b628180cf541bba8b31a420772687de4c02466b735def77c00e9e989e330a6813a94305a15c4f94593ccd442fcef3b04aabf8274e74adca1bbe16959cec5d WHIRLPOOL 60bb873d620b8da03caef68582430ccf1de3bf904cb9fd866b97e911ad2dd244490f5c3967d2919e263a15360737862dfba453a5484b1992ca3f20374b84f3e5
 MISC metadata.xml 975 SHA256 c7f61bcfba67a817e96f88f722c6f27c9e651425741b1059c6669b9cfb36fa56 SHA512 243421601866d9eeb5017f22b1c15b4f8834fa8ad9561953f1e05f6c3b02e18b28b9a62dcb4d85f43f38c1fc021221004123cd1930225acaac5b491c2333fc5c WHIRLPOOL 99781ee2984d90ce8fe0c0f37fa91948fe6a843dc9e74ae4a92e645ab5345fc4835b220d4c8156d752787cba8b50a720409a670af7ad2c5c99968934119dd4d2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQs3MjAAoJEOSiRoyO7jvoAPcP/An2kQtFHUOBuriI1eb8F8oZ
-n/tkZPAA/UY5QNO78eIRO5s94bUwp6e6QX+uJS4VJ0FrmQN2LtoNvf10PUVDkELU
-UFpV2oRSzDhJ9ytWq8T0+a9lPKAnnAcnA7Kpj9fHyWgTWiUXULeNcEGffjhGCYwS
-aW5zQoNLbt2/W/3BxbHgnaH041I454tbfgK7RJfWVktK4pYaoUITq9ZcspoGrw39
-njlW/O4xWyxrwtNeVQ1QsUgDjLC87W0aBdapnH8nlhVyeKw1Ma+6ddWiLk2gS9Ko
-sitrbYtWBPrEjmIdLGAjqg9pXsNaR2HqxRdKYQKH6NFpmMcU/1emxxQt9BWle+xF
-QahUXiqc5mrQTzPgfretYlzh2Swl8lFlK7I/B6gEf7pxYMsmo+XxOnT5maL+Oq74
-ECCBV14dY0xsmf6fFKT0sZfb1MRWanXqzfoGy7EHk2APFL3z0GBc/quzzD42MPhE
-eyzAlxWf89ePXobn3hICr3St03LznEzb/why9SfA47q60szS1nCAtFy0r4BARQ78
-uKO/kbmhZjnMZ2dR4z01GYPR26xrMjQo6gcMrn7GqfX8W479qCEciHa3ZQzs5yFX
-fSENuzSesf9VUOOWrQy65IlO/shRy+uN4Ob3fl1m9oVDRGVVdMs9vomjze5emBrT
-xq0okE/g1inEpgplu/aG
-=AMX7
+iEYEAREIAAYFAlDIppMACgkQVWmRsqeSphOI7ACfY0T72vqMHR2lRkTA4N8QQxov
+IEEAnjTXIh+h0GXo2h8TTsAogG4Apjry
+=OV7f
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.43.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.48.ebuild
index 61ed49dff269..89e1b8d10c75 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.3.183.43.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.183.48.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.43.ebuild,v 1.1 2012/11/06 21:38:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.48.ebuild,v 1.1 2012/12/12 15:45:22 jer Exp $
 
 EAPI=4
 inherit nsplugins multilib toolchain-funcs versionator
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.258.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.258.ebuild
new file mode 100644
index 000000000000..2ab33184de0e
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.258.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2012 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.258.ebuild,v 1.1 2012/12/12 15:45:22 jer Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator
+
+AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
+MY_32B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+MY_64B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux.x86_64.tar.gz -> ${P}.x86_64.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/products/flashplayer.html"
+IUSE="multilib -32bit +64bit vdpau kde +sse2check"
+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? ( 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 closed-source binaries, since we can't fix them:
+QA_PREBUILT="opt/*"
+
+any_cpu_missing_flag() {
+	local value=$1
+	grep '^flags' /proc/cpuinfo | grep -qv "$value"
+}
+
+pkg_pretend() {
+	if any_cpu_missing_flag 'sse2'; then
+		eerror "This version of adobe-flash requires a CPU that supports the"
+		eerror "SSE2 instruction set, and at least one of your CPUs does not"
+		eerror "support this feature."
+		eerror ""
+		if use sse2check; then
+			eerror "You should mask this version and use adobe-flash-10.3.* instead."
+			eerror "To do so, add the following line to your package.mask file:"
+			eerror "  =${CATEGORY}/${P}"
+			eerror ""
+			eerror "Or if you are trying to build a binary package for another host"
+			eerror "that does support SSE2 instructions, you may override this"
+			eerror "check by setting USE=\"-sse2check\""
+			eerror ""
+			die "${P} requires CPU with SSE2"
+		else
+			eerror "Continuing anyway due to USE=\"-sse2check\", but be aware that flash"
+			eerror "will not function unless all of the CPUs on the system where it"
+			eerror "is installed support the SSE2 instruction set."
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use x86; then
+		export native_install=1
+	elif use amd64; then
+		# amd64 users may unselect the native 64bit binary, if they choose
+		# TODO: In future revisions, remove this ability now that 64-bit
+		# binaries are officially released and working.
+		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)
+			if any_cpu_missing_flag 'lahf_lm'; then
+				export need_lahf_wrapper=1
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ $amd64_32bit ]]; then
+		# Since the 32-bit and 64-bit packages collide, put the 32-bit one
+		# elsewhere:
+		local my_32b_src=${MY_32B_URI##*>}
+		local my_64b_src=${MY_64B_URI##*>}
+		if [[ $native_install ]]; then
+			unpack $my_64b_src
+		fi
+		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
+		if use x86; then
+			local PKGLIB=lib
+		else
+			local PKGLIB=lib64
+		fi
+		local BASE=${INSTALL_BASE}
+
+		# The plugin itself
+		exeinto /${BASE}/flash-plugin
+		doexe libflashplayer.so
+		inst_plugin /${BASE}/flash-plugin/libflashplayer.so
+
+		# The optional KDE4 KCM plugin
+		if use kde; then
+			exeinto /${BASE}/kde4
+			doexe usr/${PKGLIB}/kde4/kcm_adobe_flash_player.so
+			dosym /${BASE}/kde4/kcm_adobe_flash_player.so \
+				/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 'flash-player-properties' standalone app:
+		exeinto /${BASE}/bin
+		doexe usr/bin/flash-player-properties
+		dosym /${BASE}/bin/flash-player-properties \
+			usr/bin/flash-player-properties
+
+		# Icon and .desktop for 'flash-player-properties'
+		for icon in $(find usr/share/icons/ -name '*.png'); do
+			insinto /$(dirname $icon)
+			doins $icon
+		done
+		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+			  usr/share/pixmaps/flash-player-properties.png
+		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
+}