summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-08-17 02:18:53 +0000
committerTim Harder <radhermit@gentoo.org>2012-08-17 02:18:53 +0000
commit6bd52623d149160a0a8daf9b8b7806364e5c9950 (patch)
tree618ffa9838ee4ddebb73319d8ef0034f6b84bd3a /www-plugins
parentVersion bump. (diff)
downloadhistorical-6bd52623d149160a0a8daf9b8b7806364e5c9950.tar.gz
historical-6bd52623d149160a0a8daf9b8b7806364e5c9950.tar.bz2
historical-6bd52623d149160a0a8daf9b8b7806364e5c9950.zip
Security bump (bug #431432).
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'www-plugins')
-rw-r--r--www-plugins/adobe-flash/ChangeLog8
-rw-r--r--www-plugins/adobe-flash/Manifest33
-rw-r--r--www-plugins/adobe-flash/adobe-flash-11.2.202.238.ebuild259
3 files changed, 286 insertions, 14 deletions
diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog
index 46b3103ea504..b54825ef75d8 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.138 2012/06/20 13:41:37 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.139 2012/08/17 02:18:53 radhermit Exp $
+
+*adobe-flash-11.2.202.238 (17 Aug 2012)
+
+ 17 Aug 2012; Tim Harder <radhermit@gentoo.org>
+ +adobe-flash-11.2.202.238.ebuild:
+ Security bump (bug #431432).
19 Jun 2012; Jim Ramsay <jim_ramsay@gentoo.org>
adobe-flash-10.3.183.18.ebuild, -adobe-flash-11.2.202.228.ebuild,
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 86021a54f956..0095924fef8b 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,20 +1,27 @@
-----BEGIN PGP SIGNED MESSAGE-----
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 adobe-flash-10.3.183.18.i386.tar.gz 5459173 RMD160 15e27e8a595b945260bb9b41b1145888d0ccc1a8 SHA1 94cfed04bbf04977c16f90d1cbbdd0dae91d56c9 SHA256 49596b20f5bf659a772110e88b9e5990ecb20306dcfb2daba8917b6367184dc9
-DIST adobe-flash-11.2.202.236.i386.tar.gz 6916648 RMD160 41c2d8a36ab944f44c2215df223c3a6746509fbc SHA1 3f8ecfa1b9990ee4c8d47a83a6a6011283eaaa62 SHA256 c24d9ecda151bd571360eb4988bb743fb956b2674016755cbe8205b7f99cb3a8
-DIST adobe-flash-11.2.202.236.x86_64.tar.gz 7224685 RMD160 3535ae9502efc19f45d4afb9af3b21c7acf01c19 SHA1 94760b74505ed07e8c9089590fb0fb345b23de36 SHA256 3e1f930f15c7f85bb8c7a766ae2418b3539df13f3e668866ae8ea27681e036f2
-EBUILD adobe-flash-10.3.183.18.ebuild 3484 RMD160 242291bcad76782b428195d2d3bbe6dfbcaff977 SHA1 158b236f504daca6a6be743ed5159d62b75f80ae SHA256 ca83d68101539a792107a10a5899ababdcf71d4a63ff0f0fd5db1e8706dbb332
-EBUILD adobe-flash-11.2.202.236.ebuild 8017 RMD160 719021de18c4ab24dd1beb6ad4bb3b0ad9504ce3 SHA1 1442178987353371e490d7d4f5111ee375b0af92 SHA256 6c033b2ae6ece18b34377b7a2cef786e7aab07f9a4cbf9ed83b6794974e85c2d
-MISC ChangeLog 43222 RMD160 798bd5e58f66b3dada192b8dc10d2fd566fed560 SHA1 b0a96d77208283a5873383b5ba7b80307329a952 SHA256 cd52b932bf938407a63fb7f7eb913e00260210f7d38fe00877c7368ccf5ac192
-MISC metadata.xml 1084 RMD160 01945abbb11a137e8ad64088f16ba4368c241878 SHA1 94a7b3fdfe2e35e2eb6233f326ae8391f48c8fc7 SHA256 20d7dd4b855c8a6d441febca72a4c5ed1605db2fe884c11dbf3b129b02556552
+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.18.i386.tar.gz 5459173 SHA256 49596b20f5bf659a772110e88b9e5990ecb20306dcfb2daba8917b6367184dc9
+DIST adobe-flash-11.2.202.236.i386.tar.gz 6916648 SHA256 c24d9ecda151bd571360eb4988bb743fb956b2674016755cbe8205b7f99cb3a8 SHA512 ae3b31d32ceb94ce1c543a3e1413b58e474db3390e2e3eb5b0106a784f74310629e1f9324a3dee9d9c92c25b9d51e5108b4df26629e0f5c804739fcb320689ac WHIRLPOOL 83e3d5875f525af769db28a5db3c60e7431e43394a934636760e9234bd93e65dc05879f94faeb95dbf5df14bc975850a1edfdad0cf1edad2843ed1bd72ad7042
+DIST adobe-flash-11.2.202.236.x86_64.tar.gz 7224685 SHA256 3e1f930f15c7f85bb8c7a766ae2418b3539df13f3e668866ae8ea27681e036f2 SHA512 2c9d687768de175fd89fd9810fc5447baba37795a0f966024686aceef5aae0baf7bb38f33766eaa832ab18201eaf6a1092257d17d7343bd98b2ec53cc6591654 WHIRLPOOL 1314e7b2beb1215b136706be3ec3c35c7b1bd2ba9eae70a274687e99c38c89e764df8a481651e041fdbefe8d7253ab0503e6be9f939784b826f754dbffc39b33
+DIST adobe-flash-11.2.202.238.i386.tar.gz 6917475 SHA256 8a9deb57288208d9d0300f6545358c04ff886187927ad9951985b0ba49be055c SHA512 19f60803713b3081e52820bb91705aeb7174d1de0142f997c604deb1b3eb5546c5f48c9d41b75cb1b70a9b98800e130c90ee3feb378f29ca543e47016118066d WHIRLPOOL 5fff3172c5fb867edda260d141c2a8208fc622338adc4eb8a937c551951e2a05799f145ad5c41bfeea06564c7a479305deea63c2fc22a2efe4f04b63144ac8d6
+DIST adobe-flash-11.2.202.238.x86_64.tar.gz 7225304 SHA256 f61b26afcc96abe905be0a5c2278872f3a46985169577dcf41150a6b654fa01d SHA512 d86c344ba915e6a10c1d823bc6fa10f09be43bd66315bfeab8d732e405389b397d372763880541c727b681a8c18e4463fc45f3c63dc574044009f5241bfc8d10 WHIRLPOOL 9dc70b3246fb3de6da75aec270a06e5c377f65c8e42a8a3326cad0c703b802f43f5a164a84e5b2c78bf30685d04cf82902ddab627de818a08794ba5ee00bc4ab
+EBUILD adobe-flash-10.3.183.18.ebuild 3484 SHA256 ca83d68101539a792107a10a5899ababdcf71d4a63ff0f0fd5db1e8706dbb332 SHA512 459d4167f6607a5ee14573270f0aca95e744014391bdd10025d68681abdfb2282c34c3a5f55661709739bd979f6c2152886906ab92ad899a5b0372281227b8bf WHIRLPOOL 1656715c87e3c3f6a5bf041175ab0c247cc04107cbe74046896a03a0c1987376209621139b355aac5ef2393b8028e84334d3c5d7e93077e4274afa2fd1090030
+EBUILD adobe-flash-11.2.202.236.ebuild 8017 SHA256 6c033b2ae6ece18b34377b7a2cef786e7aab07f9a4cbf9ed83b6794974e85c2d SHA512 c810aced65c1252e0e12bbd977dd9189b204e3db554207ecd9ada8968deba6ef6385a1955cdd7de627c67315dd2bb4e73f66dfca51954b66fb106345394cbe19 WHIRLPOOL 93df33279e7b9a882c5014eb3538955c76092c491de05f793a5799db4f359ccacd9d3b75c1e880092f2f0322480eb5a1dc4bec65eb71d20505dc1ba8e26291a9
+EBUILD adobe-flash-11.2.202.238.ebuild 8024 SHA256 c75d178a5e5b9471d7761168dedf657a88ed301b91a57ea9d96e7c229bca0c94 SHA512 29738fffb9d6d4aaf3e5e99a8dd25f81e33d141e83981c6a6ebd12186497a69c2e91c94160fb38cc23b9fc8f0b6a33baecc98537d4a356ab30fc6664eea6baa9 WHIRLPOOL 313af7908066707330b05fb18e95c4da7a5a3e2e24197ada5938a934bafde1c5bb0865c4a3e498af81b9a6ef3244f4b14f2d93b05f7df80cd0d23fe148db8e3e
+MISC ChangeLog 43385 SHA256 c6b6b00cc00c3024e6a1d36c0864ea1a4abf159072a51f9f8a29740c591f7721 SHA512 ec20d092bd8ce8968d289fae33933e5b698cb9f6147a960d7abbc08bbf2d46b94d07dfa990580307c2a3dc5cd1b6b2281891c0eb6db4b7eacd29ee9dc74eb30b WHIRLPOOL 6dca8b82ba46bb57a9c5dd380cf50f8d0b05d032777d6ad9807f87b8142320a05601cfc0f64cdbf7caf4741a738759c7ef4abbfb668cfa7761f7be16b84a2be3
+MISC metadata.xml 1084 SHA256 20d7dd4b855c8a6d441febca72a4c5ed1605db2fe884c11dbf3b129b02556552 SHA512 46832c87dcc6ffa683fe99293547695e75a2bacef7534aa0f084b6fa3b50073d6498660a2142a100b17d97c1b8cfc5a55e4c3f8869785f3282bfa084f7ba4306 WHIRLPOOL 63ad404c407b53a7df7cdbb74203872ce85282eaaeb529d83ab6a7a17f757874b26e92aab065fc799a908fd681ff8af82092b927079dbb8eb77b3ddf5e7760df
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAk/h0xcACgkQV3J2n04EauzqUgCeKhS7kCKR6kwnRq3zBUJpGUhM
-yfcAoJs4MPFdqKLATeBeEfQSuh2YGzMw
-=t22H
+iQEcBAEBCAAGBQJQLaoTAAoJEEqz6FtPBkyjvJIH/3YMyzZZIYbZcP6tDNwZkoBA
+VfZ7mP8F1TjT7UIdL6SoJQtETRD/U9pKrtkb6td9t1CaeDU1KLIDtgCZ3LEipr7y
+9kuop8ux8AHOl3JDY24owA5aZwL/2Z0IbeA6iK/QkPFVkon6pbgnEVhpWCcNHsSV
+GUSp5r5wARCbXcNRSw6fSh2qsXhb2rvlkv9McaxL7iZIIYvlBZL0vPcZ4Tu73XFJ
+iD5w2AyBCvUmGyii6si6llLcmL9F1duBxguUDc1jmTELOaSa2sEVJa6qDXtdysB/
+yb5V2QGzPJO0uTvh5GNvrDv8xbbLVwewQf2aW5LlW8NqDnWXu6DD/xggkAHnY8Q=
+=PrhY
-----END PGP SIGNATURE-----
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.238.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.238.ebuild
new file mode 100644
index 000000000000..cf7dc44b7aac
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.238.ebuild
@@ -0,0 +1,259 @@
+# 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.238.ebuild,v 1.1 2012/08/17 02:18:53 radhermit Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator
+
+MY_32B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+MY_64B_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc/${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
+}