commit: c43cb22de3c27f5ade9692d54bf7899295a06b1c Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Tue Oct 11 18:07:47 2016 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Tue Oct 11 18:07:47 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c43cb22d
www-plugins/adobe-flash: Version bump (bug #596896). Package-Manager: portage-2.3.1 www-plugins/adobe-flash/Manifest | 5 + .../adobe-flash/adobe-flash-11.2.202.637.ebuild | 235 +++++++++++++++++++++ .../adobe-flash/adobe-flash-23.0.0.185.ebuild | 68 ++++++ 3 files changed, 308 insertions(+) diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index 750d0ea..106f814 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -1,5 +1,10 @@ DIST adobe-flash-11.2.202.635-debug.i386.tar.gz 7470860 SHA256 82ce5728503b42795d7e7eb055ac8d784661bcb30ea4bd5f2e278d32b7fb4327 SHA512 bb9fa2f7840d5a45012c73b16f0cf5dc268ec7d3fd610f2ac6df04d216036ee26f036691b7657919aea7887e14e7fc71bd55078aae760b0861e8d3c4c7b11ce5 WHIRLPOOL 44f15d5491f1974574ed41b8defc79bc454c89a54c1e8dcf248f6c4a6e41e3785f4fb81609535f8a0e087db613e8c795d3625f19107fbd3a736f83007380dc3c DIST adobe-flash-11.2.202.635.i386.tar.gz 6991502 SHA256 a55a147bb1e4a3ea594fd140db2cf21fd5c70b8cec66546c3e54f1d256577fea SHA512 38b9392e2f1315fb104f3b258cc212af917d894f31cd3a42c8772d824228bad87c6ee8b010ca71c4e7f5e5d245c22fe7064dc069af117f5631ed5544fe44a295 WHIRLPOOL 9a67879870358f66f6aefa227f1b564a9d25de7bded3b62b6e714f9fa0bfc60e86e3a8dfdadd181ec7261d06b1458b5a305462bef3fa206c77a7b14021dcdb68 DIST adobe-flash-11.2.202.635.x86_64.tar.gz 7300571 SHA256 07913caafa295b90ec2e56d2f2bdf745a90622afac323d75961555e94420c8c7 SHA512 6a9fe142b388cd7b0997aa1c47a7f20d782478118f9d0dbe4572e3b24d7be036672a156c5dbbc2229f96916d7bcb82e1ddd98a86deba3a355fbdee612f6b7865 WHIRLPOOL 99aa83d44efa3fe0e4758c65341f43de7d270f9844429427c4f4479289bc5bc64bee633c883af31ef4b3a2aa04f94b104595988f2128ed26741dd80a7039cc10 +DIST adobe-flash-11.2.202.637-debug.i386.tar.gz 7472956 SHA256 95a08ea4554df9464744d6da8be4d4fe3724bc6468604117f3cbdfda3d1aac92 SHA512 e5d5685df73db2973bce39c954cdd0ba1d78a35b3fdf75dee73aa7892beb21c550d5531837f1391774f1b84237eb2018f92aa8cf0dcca9170c135f4ee0abbbfc WHIRLPOOL f6f46c6a02f5332dc0e463966dcce173474ede2d1b9559c9f9efea681bef30c532931ae6a84695c5e3be6ec85d5e936088371f20b26f3f741ba18e47a32987ea +DIST adobe-flash-11.2.202.637.i386.tar.gz 6990653 SHA256 c319416e17c1d29753a451a63be5834777704bbf1abf2ca748c50dfffb644451 SHA512 f752f00172f0b709d872be1576e9cc3af3167e7d8f26ad637031d4336650ffeca94f7ae71e761aefb32cf7d7737af9978d45cdfe2872208b3a915aa7e849ca5f WHIRLPOOL 244a8ee2c6aa739d94596c5f9a98fd032e5e8a2ab43be151991577d6e69bcb06e90ea63d4993072d272e345680de581361f48f4dbe6849fa89bc84c94e2fb12c +DIST adobe-flash-11.2.202.637.x86_64.tar.gz 7300737 SHA256 7e5a1149f3d8479907a577ccf5194de777c7baa03c4041bac10166e096cd589b SHA512 c75ec4b9a4aeb7ae0ea659093e84228ef68aa3257ad28d813eaa3680e448ed3aebb92c18fc721a464fa5a5ec4710795681d80255097dcbbcd6142338139c4469 WHIRLPOOL 3d0c66b3f876cc2329c24db0f63d2459adebae518ba94e7cabaaa84897060824a4f60f5799dbfa663d778cb5b326ea22c9d0fb5e7f006895e030d193453ea589 DIST adobe-flash-23.0.0.162.i386.tar.gz 6000163 SHA256 d0d2788daff437e7f8d018bc3e10a190776d9bcbef556f6d343c12beee58ce34 SHA512 8857b2fda64d83429727e4f7713f86a3fe1ab7e30ef502b802fde9835bdbbe8819ee4f41deb9e90f6a39cf1ced84fff3f50562bbfe56936b3c1d74d8ba507ee0 WHIRLPOOL d99d99c4ffdcf546bb92c24d9147b6fa9b035515943d5019210dd2407fad806a3225a6acb11909ebde366f5432ff85e9c3e04c9e020e3d9c3364485ff8d55773 DIST adobe-flash-23.0.0.162.x86_64.tar.gz 6923247 SHA256 7467e5401d6cc6bb6f3c9034841aa834ff357d7500fbf2e0adf22d4979668bec SHA512 77ca4c01b439dc6375fc66c345a6f6c79788d851b13622d50303bc83b0ba751f3f6e43722c4476fde219bd9d43458e5da579fc8e6275c74e2514e7a3ccc70361 WHIRLPOOL a048c6372c5d445f325c3271b50748ef14f69e3971dfd9d9c27c6d8fa93215e6e94f53b82b8635c3154d645cba086356496ea0f1259a7aefa24fc61793e0da2c +DIST adobe-flash-23.0.0.185.i386.tar.gz 6002756 SHA256 be68ac108d16dc0f409570d52fc84e341d4e6c7ceb8dab16069ad333e648368b SHA512 7b743063429fa1cb2278e86ff4cbe3a343d7bcdf738d18c487f4a55baea8be73d3aefd576b4bfbf004bdd09da8823524e49af870b1b27514bda6e7b901f15aa0 WHIRLPOOL 7458fd0cc38baa0e6863965c42a6dfc9df223d7b71a039e43a8147e6847dd493963a9e820f4a705f23a16866db6d92e89805568de02240df97b4ef6262a47693 +DIST adobe-flash-23.0.0.185.x86_64.tar.gz 6924432 SHA256 3f7a13a615d3cf19e5feb02485e12e3785a6ef07cd7ae32072cd860468fd322b SHA512 3f2aa18846c6f6ab543a4b1a2ee35cda2f7ac22a7a4ad269ee6a654a3369128843e3ca0f999eece62b102ee88f2e792048badff2108a09de79a188070a355f51 WHIRLPOOL c340f1980c1731faca242ae4c325a157bf1eb8b5ac76140b336a28426c0271df0a54d4f65b3e7c8f5d9a73cccf5aac74f00bf2cddc80e8dd1df11b7888213389 diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.637.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.637.ebuild new file mode 100644 index 00000000..c503fe5 --- /dev/null +++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.637.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +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/ + https://helpx.adobe.com/security/products/flash-player.html +" + +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 +} diff --git a/www-plugins/adobe-flash/adobe-flash-23.0.0.185.ebuild b/www-plugins/adobe-flash/adobe-flash-23.0.0.185.ebuild new file mode 100644 index 00000000..da08d5d --- /dev/null +++ b/www-plugins/adobe-flash/adobe-flash-23.0.0.185.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit multilib multilib-minimal + +DESCRIPTION="Adobe Flash Player" +HOMEPAGE=" + http://www.adobe.com/products/flashplayer.html + http://get.adobe.com/flashplayer/ + https://helpx.adobe.com/security/products/flash-player.html +" + +AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc"; +AF_32_URI="${AF_URI}/${PV}/flash_player_ppapi_linux.i386.tar.gz -> ${P}.i386.tar.gz" +AF_64_URI="${AF_URI}/${PV}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz" + +SRC_URI=" + abi_x86_32? ( ${AF_32_URI} ) + abi_x86_64? ( ${AF_64_URI} ) +" +SLOT="22" + +KEYWORDS="-* ~amd64 ~x86" +LICENSE="AdobeFlash-11.x" +RESTRICT="strip mirror" + +RDEPEND=" + !www-plugins/chrome-binary-plugins[flash] +" + +S="${WORKDIR}" + +# Ignore QA warnings in these closed-source binaries, since we can't fix them: +QA_PREBUILT="usr/*" + +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 +} + +multilib_src_install() { + exeinto /usr/$(get_libdir)/chromium-browser/PepperFlash + doexe libpepflashplayer.so + insinto /usr/$(get_libdir)/chromium-browser/PepperFlash + doins manifest.json + + if multilib_is_native_abi; then + dodir /etc/chromium + sed "${FILESDIR}"/pepper-flash \ + -e "s|@FP_LIBDIR@|$(get_libdir)|g" \ + -e "s|@FP_PV@|${PV}|g" \ + > "${D}"/etc/chromium/pepper-flash \ + || die + fi +}
