commit:     f8ee426340076215b8d10a5b0fe3e89435575f62
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 12:44:32 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 13:02:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ee4263

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.194.ebuild      | 154 +++++++++++++++++++++
 2 files changed, 158 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index a9fa1f0..8b4c161 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -2,3 +2,7 @@ DIST adobe-flash-24.0.0.186-npapi.i386.tar.gz 9159537 SHA256 
3b5803388f31940484c
 DIST adobe-flash-24.0.0.186-npapi.x86_64.tar.gz 9698084 SHA256 
c721b59102d12597a8592f0e8d2fb3d65ccda33d8e499435fe02871b46874663 SHA512 
c495b2980cc4038fa0144e6acbce4a5faaa3ddbd7f06adfdadc6d359aae9bcacc4b37c503c2ed55e5d5941535205de9e16746a6c5e2561e7a79e7b1e9517f7af
 WHIRLPOOL 
ea06dab827991bbff1aaf6744a7bd191868c29d3a947add50a47d104ada1cd40ded93ae11a6eff4cace75cb0e0275ffe031be8bd001bedb44a8f808d8621751e
 DIST adobe-flash-24.0.0.186-ppapi.i386.tar.gz 8557210 SHA256 
8fff4214db24a07f971455d9363fb210c838a7ca2d469cb5db2eed49d012b446 SHA512 
5db68c0c56855e2c7e401f68797d5b53f3610dbfaecfb25868b06dc774bb9619ce6a10aeb4265487a0765f93516e8cd825652ce66faa3b2e0f5921d2a21635fe
 WHIRLPOOL 
38ff6a2ad6544d9f699c2409edaebede5406ba8dc659ec70dc14fb9fc2ec2dbe5dc0d5bf1f6b5ca1d291bf117b32d632ec2ae9184d326381e86d2bcf3597b092
 DIST adobe-flash-24.0.0.186-ppapi.x86_64.tar.gz 9476879 SHA256 
37ccc51fb61c3f039eca58a34e40f4872a68eea4fe56450c83aeccb0eb08b57d SHA512 
05d2b648651b437bcad4a43e1c28581a5f0895191a44e36381f998f43952984fcc5bfe7225097d3be64d14a895bb28cba633e9c633fb04e88c4d30f6cdadb427
 WHIRLPOOL 
794a6b8bac9aa2f9b76293a30e5e131a3b157bc027d18a4ef4552727867282f1a8b7b8667c3163f1e4852a1cfa337738b6262d6426764cfc84ffb14534cbf9f8
+DIST adobe-flash-24.0.0.194-npapi.i386.tar.gz 9161011 SHA256 
f461cbabc965cb5fa6d2271259e166340e8b20833f6a9ce60a81a04021e72ed3 SHA512 
7eabb3410272247c088142779ed342dfa0a2a5f014f6516c513a6f7a1c142c8fb32880ba9950afffdae1350392b31b48e76638fa62957a4587ced201bbcb2204
 WHIRLPOOL 
3ba77c0b919f24b310415023470f316097543020aa1de2eaa1752b459ccb638ee8aa531af5a557c79e1dde64f985fafe5c63ff70cbef2b3422c508823cd4960f
+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

diff --git a/www-plugins/adobe-flash/adobe-flash-24.0.0.194.ebuild 
b/www-plugins/adobe-flash/adobe-flash-24.0.0.194.ebuild
new file mode 100644
index 00000000..9001ec5
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-24.0.0.194.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