commit:     6cac894400a6d95ead8b8db6343566550dc149de
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 08:06:35 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 08:11:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cac8944

www-plugins/adobe-flash: Version bump.

Package-Manager: portage-2.3.2

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

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 44e7da9..d83af04 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -7,3 +7,7 @@ DIST adobe-flash-24.0.0.154-npapi.i386.rpm 9132957 SHA256 
1a2d552cdbdb52800a9144
 DIST adobe-flash-24.0.0.154-npapi.x86_64.rpm 9671919 SHA256 
db589ee00da05f8ee7730c453d3b4f65e0b7c84cca50d8416a67214d9b06b657 SHA512 
d62a39015f682541dff08edbfd76d70476fbf7d084963d1d3cf50cf080f55dbede1a737326c96ee6215589f41e58a0199fe3d3549c015d2ff7314012d4418129
 WHIRLPOOL 
4da2d657e16441589a9f709ce0c46a4cc890d2f23de270ed09ac9fd66a1f2fc34cb7724a854ac58f897e78193769827e7e6798c97626acd8c43412094de072b9
 DIST adobe-flash-24.0.0.154-ppapi.i386.rpm 8537186 SHA256 
bcce5a9025dbf45f813f156cdd4e2799edbdea6c0f31c0770cf03e3494d6a1b4 SHA512 
110eb6b7de5354721c3b45889f6a6470dce3154f985d03644d99c1a7be6140522945e85ff232493ab59b7890da5acdd19493c198a9d3e8e1ff31bfd2145e2d7b
 WHIRLPOOL 
16e389214af279be0bf76138a9e1da51660e1f8adefd0e8bb5b2dde1de78e98dcd5e05eaae1f12de01e1dcc88ff32d900e81b8f3320b11c53b4e8aeef598a6de
 DIST adobe-flash-24.0.0.154-ppapi.x86_64.rpm 9437119 SHA256 
fd5e0bea2f566f72999c6af76640e35baf8794bf3b38e451bebe78a5f3c4c561 SHA512 
bdb80f700ae53583583c04a82742c1586f36ad8871a34c30867ed48d48e488329f1a87974d843e5a9d2b420cd130ca667f3ab2d7572ee46d854393b1431d1c30
 WHIRLPOOL 
d95c73db8f0f68bc3a2354638e936b40fa9079098d135f51d58074ffe118668d4e6ca1590ae4081b5b3b94d405222f862cd958dcf1a140e76c9dd3f51578792d
+DIST adobe-flash-24.0.0.170-npapi.i386.rpm 9133446 SHA256 
0cf42b37dfb08b8d2f0b2442c4b6382664180fba9afa63be4673913088d8c558 SHA512 
6220dddfab9523aa3a3417495e4780281885689cb1f44005320b779aec83882528eec41af37eb805bf27bb338c80bc99005a182bcf282f8f0d09e97d64926e75
 WHIRLPOOL 
5f6937ff26effcf483fce69fe407e9762f4b7b24dc7f4d3e500e59597b0b3b8bff81e032b42df42abe55c05787e61583a7f8b3067d1a7329da9940ac268a3502
+DIST adobe-flash-24.0.0.170-npapi.x86_64.rpm 9675923 SHA256 
5b663fb88bb78a223148c27a395c19519e091a975135e63d4a0c5a3165f22848 SHA512 
2fd823a901a71aa98693d05d7982a840711fec4daaa4d3c5a8eff41b34b9a9709bba9fb8c8896a54df35d846930fffb2ac832f8681239508db2d1483f9067cee
 WHIRLPOOL 
7382711c69453f36f170a3512f2b7ced8ada84b3e001c9d0512a93baeec07f405430c936052b645170e71ff31ce14a4b68476174b9d3baeff0b6452692d58b2d
+DIST adobe-flash-24.0.0.170-ppapi.i386.rpm 8539220 SHA256 
08285fe1d7b859fef869015f5304b5b1166e238128e4927206ce03deddebc8ac SHA512 
6b741ddc24cfb45846c064756b01d6a3ae56fcb988e7a16b5384dc35b64c268a30016a33272f4d89e297bf011c49a07a0e0d8aa3947342326d437d3006f10d8c
 WHIRLPOOL 
8a6dc26b229768f7dff42c5095eb8057b15f922e04378563a632f53f5d3e4fa382f2df5debb14db9e24e5ec97005eefb0d502da1a8e316d5340a12acb234ae7e
+DIST adobe-flash-24.0.0.170-ppapi.x86_64.rpm 9441180 SHA256 
a9e894c65204df6ddf708ba22704f8153c56b65e01acaa05870bbdd4f38db3e0 SHA512 
76edb7b132a7a62440153557bbb71490c3d660860e77d2fcc9755d565735cddb748420cf73b116e23c438099f821845ec4586b892c72c9f5506dafeff184bd70
 WHIRLPOOL 
abd4aaf0d5e29a3a20c5f7591e3149f5c964ea7056552d5c0e3377c952583954ce5ce37648140211df779c29932048d02175361ed26532b09668fa46d0b80aec

diff --git a/www-plugins/adobe-flash/adobe-flash-24.0.0.170.ebuild 
b/www-plugins/adobe-flash/adobe-flash-24.0.0.170.ebuild
new file mode 100644
index 00000000..90d2caf
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-24.0.0.170.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit nsplugins multilib multilib-minimal rpm
+
+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.macromedia.com/pub/labs/flashruntimes/flashplayer";
+AF_NP_32_URI="${AF_URI}/linux32/flash-player-npapi-${PV}-release.i386.rpm -> 
${P}-npapi.i386.rpm"
+AF_NP_64_URI="${AF_URI}/linux64/flash-player-npapi-${PV}-release.x86_64.rpm -> 
${P}-npapi.x86_64.rpm"
+AF_PP_32_URI="${AF_URI}/linux32/flash-player-ppapi-${PV}-release.i386.rpm -> 
${P}-ppapi.i386.rpm"
+AF_PP_64_URI="${AF_URI}/linux64/flash-player-ppapi-${PV}-release.x86_64.rpm -> 
${P}-ppapi.x86_64.rpm"
+
+IUSE="kde +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-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
+"
+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
+               rpm_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 usr/${pkglibdir}/flash-plugin/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 usr/${pkglibdir}/flash-plugin/libpepflashplayer.so
+               insinto /usr/$(get_libdir)/chromium-browser/PepperFlash
+               doins usr/${pkglibdir}/flash-plugin/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