commit:     3752282128cc456bd96155cbb377958e54f6551d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 13:32:31 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 13:32:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37522821

www-plugins/adobe-flash: Version bump.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 www-plugins/adobe-flash/Manifest                   |   4 +
 .../adobe-flash/adobe-flash-24.0.0.221.ebuild      | 154 +++++++++++++++++++++
 2 files changed, 158 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index b1466138a5..4d0b08cd56 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -2,3 +2,7 @@ DIST adobe-flash-24.0.0.194-npapi.i386.tar.gz 9161011 SHA256 
f461cbabc965cb5fa6d
 DIST adobe-flash-24.0.0.194-npapi.x86_64.tar.gz 9698184 SHA256 
fd814f9fdf28d366f49ea308e7e45b3f97df2be4a463d26312e9258fe544312f SHA512 
21684cb23d60c42dea62bebe83633a43aa3efd2e8e31d62fe84840fcf401f15c77a36f3d8a7d40e952de8fdbf38772a7e743452be8c4384c7ac8bb5f1fd58e86
 WHIRLPOOL 
3d66d81820d1b2e02ff2cf17f2e8fe40e2395109f6e4103ed6772cffdbf0fe2c6441d21d5c95a0921d8fadfaad5a845bb96f72eff57ebbd3e59ed2c7834687fb
 DIST adobe-flash-24.0.0.194-ppapi.i386.tar.gz 8558381 SHA256 
e755bcffaa9967318b75d68fb8f8c83f6e53457e2a068a94eabb7a7ef69c05b8 SHA512 
1e86c03fe375099e21259b8448c5bbca748f2f25c5149dd6e6ba3ec02c28d6b8750742c05b405582fb17914807b72bdf8f17cf63ed0ac62306cf03f58e1b73c2
 WHIRLPOOL 
3e892b380c42507195e9915ab82a9137de6697f6f6b2121d1a2f5ff5723e622878526c63cc53c28c98ae851533e7cd3cbcff0ece8c2471342c4f6deeacca12ca
 DIST adobe-flash-24.0.0.194-ppapi.x86_64.tar.gz 9476230 SHA256 
6fcd6df319690dc2bc14fc587107f6916e5e36dbf8aaa7aa55a2af6bec666aaa SHA512 
78cd4b9069641350537cd52aaf556d6f62e60601951bf970f5ba75fa9a2df0c09296010b6cb3009807950c154e1b0b0eee957b55ab6c4584121e8254f384a21e
 WHIRLPOOL 
79d84980f012a3871dd183431aafba3b30cf9da4a9ffe14feed9aa3da1d660379034ef70a96b6b4a5ef148499a608b637cc6d2a459b18c7ae2b83a2ecf4af68b
+DIST adobe-flash-24.0.0.221-npapi.i386.tar.gz 9161831 SHA256 
7495689ad778cae778f19ac085d362cbae63c7a4ad806fd9ece1844040ba9eed SHA512 
54595f8baad3f9531e8f261ac89246f6a428b9c7be50019580618a8c14d650d7dea00b602f8b15881a2b8c9749df05fba38231cd7fffcd6eb66427d68539eea8
 WHIRLPOOL 
08a74fdb57fe4fc8d31ea01f27492cede236d7800e6ccaceb9c69cf41118c8c226fd829d0957efbc455e83922238cbfb83adbbd566db50295b950261af0d0a07
+DIST adobe-flash-24.0.0.221-npapi.x86_64.tar.gz 9698349 SHA256 
087048af5fa3c46a8c283403a341d4684ef4b966f4e407195b43c24bf5ae64b1 SHA512 
c3f0702e247488d82543a364cda9d143e0f9f4262b36db1e4bc0d59f2d85f87afe8d741081965056c90de2460e166d93d6f9731043a3afe3ed6953f60225aa6b
 WHIRLPOOL 
ca8a96d411455e503493ad733b28c7dafdd98d00ec08270dd011a28fe452910d3d77bf200bc0da622352e39bbe7b82e3f773dcb9ba8f3b57ca636cca276ee3dc
+DIST adobe-flash-24.0.0.221-ppapi.i386.tar.gz 8561099 SHA256 
4f79523ee10b28e172b93c7e3083604916299f888ed7565bf192484dd410f58e SHA512 
4ff2505990f123aeee6725fcf4031dfee04e8281ecfb6574849884bb26a7d666a1b5d7b269b6b61b27ce3cd0bffc29b8d320676455ea1bc2e40ef441aa0c9863
 WHIRLPOOL 
bb4abe01d967eba88bb357ffa38e953acb7ce3078321610b864c971a6f00fa38df8ba224fbe476600fffdd9aad4b2e29b7eaf7b001adf7d136307878531e0fce
+DIST adobe-flash-24.0.0.221-ppapi.x86_64.tar.gz 9479634 SHA256 
e420f01500273478d95953829d0fdac7225957777f6d682466aadc368c59bfd7 SHA512 
6e39a56957326f8e6a01a14b6e1fc3298b1f6bfd8a14bdd9de11d7f323211b38343d66238b9ffdaa9f2ad685d2bb59c233b7c9b093ac409c5bc06bc871fa84e6
 WHIRLPOOL 
3095ed5ff295ce34d14ab826b63e144295d887a87a51b8d1ddf431e30d1a96d7c16c8d636744d1aa522ccc8019ba3e7f0c35dcc0bf5cec48caae577e970d29ca

diff --git a/www-plugins/adobe-flash/adobe-flash-24.0.0.221.ebuild 
b/www-plugins/adobe-flash/adobe-flash-24.0.0.221.ebuild
new file mode 100644
index 0000000000..9001ec5577
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-24.0.0.221.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="kde +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
+       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-frameworks/kdelibs:4
+               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
+"
+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
+                       if use kde; then
+                               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"
+       fi
+
+       if use ppapi; then
+               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
+       fi
+}

Reply via email to