commit:     7f337a66fd66591544ea827419acf4c580f15eb3
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 22:30:15 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 22:31:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f337a66

www-plugins/adobe-flash: Version bump (bug #598152).

Package-Manager: portage-2.3.2

 www-plugins/adobe-flash/Manifest                   |   5 +
 .../adobe-flash/adobe-flash-11.2.202.643.ebuild    | 235 +++++++++++++++++++++
 .../adobe-flash/adobe-flash-23.0.0.205.ebuild      |  68 ++++++
 3 files changed, 308 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index a4720a3..6655a68 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,5 +1,10 @@
 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-11.2.202.643-debug.i386.tar.gz 7471672 SHA256 
31f294bde4f7115831e6b83dab54b772b75ada254144b196ab2cb5b0ea69a041 SHA512 
05eeef270e7f9879267f72cbe638ae8fecbc4fadc7910d7f7c5ecb92144e2543d8916d34b4c8178b82cdd831d3c3af31f8116ac4fde0f6439c21b2f6c87853b2
 WHIRLPOOL 
5370e9df48f3d47c17eee7bb3646c9a4fb24fc0f387eda5be1648ea079d27dbf06b4a7ce02b2c782e40101048ab570807550349b67184df8326f70171cef3318
+DIST adobe-flash-11.2.202.643.i386.tar.gz 6991072 SHA256 
b3cb465620b18df1a4cb88427f2e3c7bd080ee23883b05f94245187a783fa25c SHA512 
a8cabbdec79a98e65b5fb05097d0e5e63e69aa555564e0d24f369fba0a9ed854d556cfa822aaa1ac3bca14179b9ca9b77d1f3a08222b3376fca53d6d01a7d9cd
 WHIRLPOOL 
b246882e1a9bc0c5727189ea3d2c76674b7f2442ba55445e319c6e4156408a6f8a71f79d9fb66da77d6f9a95c5d20a915e19dfd409bba0e16d0c1fb0fd476724
+DIST adobe-flash-11.2.202.643.x86_64.tar.gz 7302135 SHA256 
a1bdc2154d888358e86712bdd77ef8f03d144847b0d18cd9f7bfff502f017647 SHA512 
6b909de61705c41d734ef0ae9863d3b413b0af3d05f8b75dd1a05a579ef6a7cbc123d46e8cbcab387e998ff44430468aae2695ae1ac45b9d6c3b3fa4748b14a8
 WHIRLPOOL 
c6607b5eaad61e32987b3ca68d281596c48dc3c39a3b036c81ae0bd5d50b37ba57094cc28a38483464367c45776ef5b10f4ab19ebc1739311350a699f8534f71
 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
+DIST adobe-flash-23.0.0.205.i386.tar.gz 6002470 SHA256 
8cdb32aadf5da2e5b7b6a51b60436d25aaa7879f7bd448921416a8f02fcccae0 SHA512 
3426bcaea904921fa1d06cb648e09ab50fdcef15c8f863a53f71b1e0fec61d530e06185a1b7bce5e2e5f4259e875473fc58538e8ebaf334ffbb3b629c6408ecb
 WHIRLPOOL 
0380d2572b4be66ac9ed74e299194037a52e5c83d21beba3d24b680b7b0fb8ce57dbfe2998d65fc9af5627dc77baff2f449e519e6fc612f7e5b022b7c35d8e53
+DIST adobe-flash-23.0.0.205.x86_64.tar.gz 6921629 SHA256 
5d1fd6f9a598fe901890dd02f5230b705f1c992703a24f62c93c7725c335b90e SHA512 
d2b55c5f113547c6314b3f6896be3cc37ee72bf675b1c0d6859145016e892b106b084234cf3aff671907f45a608a041cbd70aa90b34dc001cae02a613b6c6d41
 WHIRLPOOL 
ac750348d250db2d6100dabee14e32e8a55d572e480543d35c7b2bb0b0a2a63b52d4b2b3126776c94e6e2b020da7a03158f883cdf9853c64b76ab8de53ac1172

diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.643.ebuild 
b/www-plugins/adobe-flash/adobe-flash-11.2.202.643.ebuild
new file mode 100644
index 00000000..c503fe5
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.643.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.205.ebuild 
b/www-plugins/adobe-flash/adobe-flash-23.0.0.205.ebuild
new file mode 100644
index 00000000..1fb04a3
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-23.0.0.205.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
+}

Reply via email to