From d57d774b7face78932af37f20ed81793f1583365 Mon Sep 17 00:00:00 2001 From: Jim Ramsay Date: Mon, 18 Jul 2011 18:00:01 +0000 Subject: Now installs flash-player-properties.desktop (Bug #375509) Package-Manager: portage-2.1.9.49/cvs/Linux i686 --- www-plugins/adobe-flash/ChangeLog | 9 +- www-plugins/adobe-flash/Manifest | 30 +-- .../adobe-flash-11.0.1.60_beta201107131-r1.ebuild | 229 +++++++++++++++++++++ .../adobe-flash-11.0.1.60_beta201107131.ebuild | 228 -------------------- 4 files changed, 252 insertions(+), 244 deletions(-) create mode 100644 www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131-r1.ebuild delete mode 100644 www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild (limited to 'www-plugins') diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog index e62958de9693..daa5729ece26 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.94 2011/07/17 03:46:46 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.95 2011/07/18 18:00:00 lack Exp $ + +*adobe-flash-11.0.1.60_beta201107131-r1 (18 Jul 2011) + + 18 Jul 2011; Jim Ramsay + -adobe-flash-11.0.1.60_beta201107131.ebuild, + +adobe-flash-11.0.1.60_beta201107131-r1.ebuild: + Now installs flash-player-properties.desktop (Bug #375509) 17 Jul 2011; Jim Ramsay adobe-flash-10.3.181.34.ebuild: Marking amd64 stable (Bug #375239) diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index d5b739c9fba5..f58c9c88c347 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -10,23 +10,23 @@ DIST flashplayer11_b1_install_lin_32_071311.tar.gz 6747871 RMD160 cbfe3943445f5e DIST flashplayer11_b1_install_lin_64_071311.tar.gz 7044701 RMD160 ed5d26c0c2f9387ed6ea3d9fdd37aa3c020a608b SHA1 8b7deb398e5e57cf2b8dcd1e498e8da07a8548ed SHA256 46dc0573bdfedc73edf2296be33fb9bfbb6e3238b54438f5b2d91d8ffe82b635 EBUILD adobe-flash-10.3.181.26.ebuild 3998 RMD160 4a4210f8a383493dca06163c0e493ce821198b2d SHA1 a9199a959a6146aa2a2b5a2f743cd688f29922e1 SHA256 871c07b8819b717a0fa02c53110370b94ac182abede109839298fce495b81acd EBUILD adobe-flash-10.3.181.34.ebuild 3999 RMD160 4ed9284325d44b0562dcb7803cb11ccbbaf9f606 SHA1 9c7f299c63d63ce30327ded8845615e1597de440 SHA256 ee282c0b5eca9a0c63e59f62a18b212d4d6bb3282b7fb820d560883a650fcea1 -EBUILD adobe-flash-11.0.1.60_beta201107131.ebuild 7233 RMD160 1f47b4244c0fc37de8011e6b8564d4a2aad5a22b SHA1 d92b8bcb670133c6b75c64f2a116cdd8706dfe8a SHA256 b4d660391653b1b1f4f9cf17f6ff2a509919d282cabcdd60e04454ba5ee53179 -MISC ChangeLog 35454 RMD160 5105b34d4f59639c2b2f56e926f4468cf212948c SHA1 9e39565098096d6042ef6d7a1628cd57347b2565 SHA256 7566e322e27142a9255c9bdf744559d8b6a3ae14fc1293c19b270e7a70d4b119 +EBUILD adobe-flash-11.0.1.60_beta201107131-r1.ebuild 7299 RMD160 14a4730c0dc2403f2740ffaa0f42116233dd2566 SHA1 f03dca6fe138d8f4769b84280afdf5fd74815b14 SHA256 9f3bbb1d846d55f633ce675200cf50652144688c88d767e8f63260a6d5c0d6be +MISC ChangeLog 35712 RMD160 d33a890d8542e753f77f8153415dd685d31fe7b1 SHA1 210fd213d0f086ea13dad5110420416970fdf149 SHA256 deb2151bdb8b1c5cedbab38c374791edb1ae6abe01d42a73a2296be4f9740866 MISC metadata.xml 1010 RMD160 73dd5ebd0ca15f10489748d441e8f5ad11f86a64 SHA1 83a453fe0b10a603237755eae9b4ff8ee47d438a SHA256 36e47f0f087760202d4ad961f9ec3fbf0bd2dc075f1b34d7d8950b2960409016 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCAAGBQJOIlvQAAoJEA8o5SF9Rr6qVv8QAKX5MyiNPFyXqFDvxtqHl4ZP -91A20ClNXzZes2+Ts4d39MLPmco715G3i4pXAsRTugiIpostzVPd96FoG1skFMje -6OBfJdiNj8VEQd250+hCvAFbXw2DqWivxHeh4W0XjnJuE1QncA9ahRt6zMYhGSsA -krjS6PgHnXMNqmLQrP8jM78gSnJ+m78kOOCbn7BEw6PqghIW+wk+mEFCdvgg/nXT -P/UWQ/aHExfyl+KOOgBAyQrqd/kdV0RjNLT0PZF0RpJ06Ys/aZ68zk7/pljW2rKM -LXUDQoUM9p53apCtivYMsttJ9E5JdJPHOA+xBkzJX5pGn9QH8ozQHOb7DUCEfwzr -3uvNbSHeQteyOcddQgCFV/zI8m3V40jZs5s0dih0RXcSYm6TSbJr54Xc+mbpJElP -YZt45mcE6KF9GY2jGXJgFFhsk8ulbg4kDx0bVHqF41JUYbqtZ/7J2Cnb5HJViGhh -HA7X8fEXkqO9acNen4glY4t/OiYq1tJrZSxdbKMIZqhcWJnGPjzduO63iufeAKBy -bS7AeuCbgllsw++hmAxNBXf8EFNxJhxtILorWaGR8ds2CBykiBDYG21doEgXmxKO -Rk6sz2fqUiRPS3VMw84GuEsJaHr2AIfwEF2SlWLxFcwmNaxm917faqlzuAigC6RG -mbEkD2l/KH/fpsL1Vml4 -=pI7f +iQIcBAEBCAAGBQJOJHSyAAoJEA8o5SF9Rr6qpM0P/235WQQSC1ohhJGawERfUdnY +/uEGD0EdJ32t3qHvsulEQl1qZsws0xkh8gW9pvjLLTU2BitK5GkHTotWD36rv8g3 ++URCQC4CVylBpE3WZkwLB0mh+wPlHKF1wsL4YCmL0DWhub3YZSWdg5aYbtKk4fYj +oAstQyCIu6gX4m0EMNT4LBcZQGABD//5hipHlKYkDUsAYsU6tWTbQObSNa43YvDM +5FEGXl2kAGAs2anlTsTy0ZoZARWuPB+iKJzYYYtuX7ScQ7rXMR3QSChZQ7OOWWk7 +iPJbj2gFVUjkCtm/v39dlPiNCGaChmzNreDRgX5jPBvYMoEvgItBVaojtDFb7W6n +IHf3VG0YRDF4/L8uaEyry9TQ+EAx99jGktqoGFM5COPeoDXnqts8U6vMKfN2Ohdz +cxbh57gOPQXjZLHL1P2NzeCfhMzlH6dAtnwkIdZMqjNJ0rd5QpzsMWFT7uTcr8Ri +B5Vgp6S1a/W1yZSVMca29wHXmyFF9KlA8t5/0gz6oprOqeAlrVQMxdCRMLxMqmXx +V4lY1P/BaBV5wQDvM4rH/qgmV9XY6qYXv76bMmdlGpauhv1najJLMpPoS9t7+d6m +x1XYdcuA/G5mEc+LL55Bcgp2dYc4BQrD/A+WQnAD88JWO3JRXTsk3dnIot7opLOo +vI7DrI1F7Kb9QRtqv+U2 +=gdgo -----END PGP SIGNATURE----- diff --git a/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131-r1.ebuild new file mode 100644 index 000000000000..f109d3c7a451 --- /dev/null +++ b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131-r1.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_beta201107131-r1.ebuild,v 1.1 2011/07/18 18:00:00 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" +} diff --git a/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild b/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild deleted file mode 100644 index e933795b4158..000000000000 --- a/www-plugins/adobe-flash/adobe-flash-11.0.1.60_beta201107131.ebuild +++ /dev/null @@ -1,228 +0,0 @@ -# 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_beta201107131.ebuild,v 1.3 2011/07/17 02:41:35 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" - 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" -} -- cgit v1.2.3-65-gdbad