commit:     e1ef970d78c11619c0ba7ea004a9d1df560bfbeb
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  9 06:44:24 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 06:50:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ef970d

www-plugins/adobe-flash: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 www-plugins/adobe-flash/Manifest                   |   4 +
 .../adobe-flash/adobe-flash-26.0.0.151.ebuild      | 133 +++++++++++++++++++++
 2 files changed, 137 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 8294766fde4..ae15c34aea5 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -2,3 +2,7 @@ DIST adobe-flash-26.0.0.137-npapi.i386.tar.gz 8490349 SHA256 
bc703c55973fe79c32a
 DIST adobe-flash-26.0.0.137-npapi.x86_64.tar.gz 9002947 SHA256 
9af20d48fe0f05cead8f6de6c3464e5dfbb1e3d296be69044ee71eaa306b6635 SHA512 
c3db9bbf1e4d448f44ac484ee8492d9a041cc9b3a9f883084ec40f95eafe1a9815622316e28d85a2d37d05dcd067fea899014e7f62e8e1fc76f7d24f456d193f
 WHIRLPOOL 
2c86c9c6c737cfa087d3a23823d3a340286ba2343717e0a525261fa7afe748cfa792cc353b4e846144e4d414dbedec88d34cd65565829721e23568b9fc60117a
 DIST adobe-flash-26.0.0.137-ppapi.i386.tar.gz 8536466 SHA256 
68a4b486e6e127df5bb006667086a0168d9bfa8c2583b9e4136e157cd7e12967 SHA512 
3de31779aac262395951b2a2c2a837705f78a3db4b0345e1fb9ad897f62ea352898400ecef02080e58dd423dfe3009eb22aa40e9dd976f0244015f5b3322bed5
 WHIRLPOOL 
5ed3e31a10dea3a336ca576221b3b9f20e150e818cf759019ff5ad61d0e1ec4c8e7548ac9f381052d1ba304187d41204a10a9c1e9fe26d40c9ef1f64a5aa597d
 DIST adobe-flash-26.0.0.137-ppapi.x86_64.tar.gz 9449400 SHA256 
4fc8ce66561a39fdcffbcd72f6129ebc3fd1f9ab05324d898f6676bdf2c6cde8 SHA512 
637573c0f021c1968aa8aa5cc9c527c191581076bf03b395768144936f3f74228534c1ba5692eeb72f3076cd958bf2e7899e82d67281703745d4b460e5b35c99
 WHIRLPOOL 
3640cd3997f8f57b2604f5a2042a277746629d971c28a9ac05ed4f247424bc7de346be014c53332d4f29fe7e6ac2031c81d4475dac62edfb1701568ea182019f
+DIST adobe-flash-26.0.0.151-npapi.i386.tar.gz 8492462 SHA256 
179a751d1c3624f3a25ec4198a54e6a53023a11de0b24f71c86f5b12fafa2cb8 SHA512 
c59a48b3e4f2cd4f7cf4c2067bbbb499905b509bf11ee517f3b642e6ff36c5f36ca009d2c5c7d3ae55d9359be2f808fb90f1dc46a8dbf18e439d3c07f5c4be9c
 WHIRLPOOL 
c45f892fa3eca7751beac68e1d2ae81e9291dd5e360fcd7db4e4e94b5c65a48524f81ee515d158741c18176bbbd92d4cba5a48f22ebb88180cee11b6381d99ed
+DIST adobe-flash-26.0.0.151-npapi.x86_64.tar.gz 9002831 SHA256 
147d90fa60b8c3831320998ca14c96278c4b6d0e9371617809fd1648b573dcfb SHA512 
c91d28fcf9f7215d88fac6d8011453525e895b97125f14b5782cdbae2a278552962d1185ff19b184a5b9eaff0a6bc63c6a8455fa7988cb3a36e19a1a56e2e0bf
 WHIRLPOOL 
f70af6315c56ec43fefd74206388ae0ca410f6bbf222e4ebc9b3ebad1db2ea94d9e7e11bdc5b48ccc5247fe6e54a0ef9ef241238d2afb397194a2ce44b6a0aa0
+DIST adobe-flash-26.0.0.151-ppapi.i386.tar.gz 8536460 SHA256 
a1801dc2e46104b4cd8ce0e9cee1ff86d307de0044eee67685faddbcb0b847ea SHA512 
c3782f8dac9b5ccc346edc4780c70b8a589ed13413675f928056d98a7ea31adfc652f1d36aaeeb6f282b8c962f322073f12b82d6ac8364392a154e9d2dab8a00
 WHIRLPOOL 
9083c71777e3b88e7f25f4954da2316ad209a7398d9f68296ef0675a2468a63a242b2b13a5e0275e82892c600bc778a88fb6f58baa1f815697710b1a70c5e111
+DIST adobe-flash-26.0.0.151-ppapi.x86_64.tar.gz 9449331 SHA256 
d5a392869276b957e4b66eac205bb76fbf30bcb4ae246a7d23383f8525f6fb2f SHA512 
1d75f4b451faca4482f6435fa53b4f8ac0f9437ddba027fe22daa7dc6102bc9f7e9e4af7e80618e6a518117fa599c652cc9dc21622b9cd15863b44c9bbc9db1a
 WHIRLPOOL 
0e0af0eea9895053339b2b3cac564297c67bee81e63034835298f9ebd7d94a2e23cfb884f1a818eebd1b553597dfb109228f53cd5486509e8dfe286ea8a188f6

diff --git a/www-plugins/adobe-flash/adobe-flash-26.0.0.151.ebuild 
b/www-plugins/adobe-flash/adobe-flash-26.0.0.151.ebuild
new file mode 100644
index 00000000000..d8189defa27
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-26.0.0.151.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit nsplugins 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/${PV}";
+AF_NP_32_URI="${AF_URI}/flash_player_npapi_linux.i386.tar.gz -> 
${P}-npapi.i386.tar.gz"
+AF_NP_64_URI="${AF_URI}/flash_player_npapi_linux.x86_64.tar.gz -> 
${P}-npapi.x86_64.tar.gz"
+AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> 
${P}-ppapi.i386.tar.gz"
+AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> 
${P}-ppapi.x86_64.tar.gz"
+
+IUSE="+nsplugin +ppapi"
+REQUIRED_USE="
+       || ( nsplugin ppapi )
+"
+
+SRC_URI="
+       nsplugin? (
+               abi_x86_32? ( ${AF_NP_32_URI} )
+               abi_x86_64? ( ${AF_NP_64_URI} )
+       )
+       ppapi? (
+               abi_x86_32? ( ${AF_PP_32_URI} )
+               abi_x86_64? ( ${AF_PP_64_URI} )
+       )
+"
+SLOT="22"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="AdobeFlash-11.x"
+RESTRICT="strip mirror"
+
+NPAPI_RDEPEND="
+       dev-libs/atk[${MULTILIB_USEDEP}]
+       dev-libs/glib:2[${MULTILIB_USEDEP}]
+       dev-libs/nspr[${MULTILIB_USEDEP}]
+       dev-libs/nss[${MULTILIB_USEDEP}]
+       media-libs/fontconfig[${MULTILIB_USEDEP}]
+       media-libs/freetype[${MULTILIB_USEDEP}]
+       >=sys-libs/glibc-2.4
+       x11-libs/cairo[${MULTILIB_USEDEP}]
+       x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+       x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+       x11-libs/libX11[${MULTILIB_USEDEP}]
+       x11-libs/libXcursor[${MULTILIB_USEDEP}]
+       x11-libs/libXext[${MULTILIB_USEDEP}]
+       x11-libs/libXrender[${MULTILIB_USEDEP}]
+       x11-libs/libXt[${MULTILIB_USEDEP}]
+       x11-libs/pango[${MULTILIB_USEDEP}]
+"
+RDEPEND="
+       !www-plugins/chrome-binary-plugins[flash(-)]
+       nsplugin? (
+               ${NPAPI_RDEPEND}
+               !www-plugins/adobe-flash:0
+       )
+"
+
+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() {
+       local pkglibdir=lib
+       [[ -d usr/lib64 ]] && pkglibdir=lib64
+
+       if use nsplugin; then
+               # PLUGINS_DIR comes from nsplugins.eclass
+               exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+               doexe libflashplayer.so
+
+               if multilib_is_native_abi; then
+                       # 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
+
+                       # 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"
+       fi
+
+       if use ppapi; then
+               exeinto /usr/$(get_libdir)/chromium/PepperFlash
+               doexe libpepflashplayer.so
+               insinto /usr/$(get_libdir)/chromium/PepperFlash
+               doins manifest.json
+
+               if multilib_is_native_abi; then
+                       dodir /etc/chromium
+                       sed "${FILESDIR}"/pepper-flash-r1 \
+                               -e "s|@FP_LIBDIR@|$(get_libdir)|g" \
+                               -e "s|@FP_PV@|${PV}|g" \
+                               > "${D}"/etc/chromium/pepper-flash \
+                               || die
+               fi
+       fi
+}

Reply via email to