[gentoo-commits] repo/gentoo:master commit in: www-plugins/adobe-flash/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     6e585ce15c4732f8a07b2ae25508678d769c4e1f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 10:08:23 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 10:09:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e585ce1

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

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 0861fe2..94c4d3d 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -7,3 +7,7 @@ DIST adobe-flash-24.0.0.145-npapi.i386.rpm 9132701 SHA256 6c96d5770af22d4b642819
 DIST adobe-flash-24.0.0.145-npapi.x86_64.rpm 9671416 SHA256 e7d3b5300dd7bbd389882bcee9a333685407271092a28607c36efd8e55ddabb2 SHA512 ec3f1af4136f5e7a72be7deb2dee6a3bf265f073f269b48dddbe6730717dd1ce19fe7a7bca8416434cfbf4daaa700e1720bfb041ba320f6c1ae99f568a8c3d9b WHIRLPOOL d66a4ef25743d12bea60207e1c45f480d9da22c4be111550db89269c2a27769eff98ef91e3ede3e7ee9721a30f1c201e5c50652f8362f1885b28989b899ccad4
 DIST adobe-flash-24.0.0.145-ppapi.i386.rpm 8536987 SHA256 89c1a1fb3ebe0a9d5cdd7ec8b1a0be812a182f25188fe03e751a09f838ca7d3f SHA512 698e8bd207240c3f29c96224866e4772e4940ffaa105d800077de85ab6006e91467bdf472bcd251a1c860a5e00a32c35739ae562ce50b3f1ad6029bf26278c8d WHIRLPOOL b18b04ea9f6c3b0efaef2ecef5e955cbca50161d3b0a0d08d0ee593c816d88efc5b03ad412fa04b20473d82bb743e571743ea3d51dee62ec596b0a92cdeef74e
 DIST adobe-flash-24.0.0.145-ppapi.x86_64.rpm 9436089 SHA256 c68ba52695ba855b5fd95cdc1330b2ff97d8a2fbf90bad715ce43c7d8a817c83 SHA512 f746b9abefe9784086ad158f23ef796deaeba751401bc96b63f4fc200776d0a0ad2b4a88da987d556857708487568e17a3ce09dd7ad36c2d621b19caa455927e WHIRLPOOL 71994c304eedb394a9cda75ecd626c125165c32279b1287a0dabad6b53276a5c1c1842713343499d9f3fc58d5576cdf6220e942c6e720d47db5f2f4ca3e5d4f0
+DIST adobe-flash-24.0.0.154-npapi.i386.rpm 9132957 SHA256 1a2d552cdbdb52800a9144ca8f3e492cfae086e4398d72adf0997721ad7e3631 SHA512 98291e9ab9d74c382504315ee7d5380e49879f6651bac174b1497db6288561d657b2b1af85e19f3e8cedb42a75aee3735d890899b38d74e9f8ebe7e7bb529043 WHIRLPOOL 1648efaed360ca1af9bc4d621e9114a33736058b4f7e2194f73ddcffb6129ca8a8b0d89d1a6330ee205f56dc2e11e57d423192bf9b3045f62690258493675269
+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

diff --git a/www-plugins/adobe-flash/adobe-flash-24.0.0.154.ebuild b/www-plugins/adobe-flash/adobe-flash-24.0.0.154.ebuild
new file mode 100644
index 00000000..7c835c4
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-24.0.0.154.ebuild
@@ -0,0 +1,115 @@
+# 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 +npapi +ppapi"
+SRC_URI="
+	npapi? (
+		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"
+
+RDEPEND="
+	!www-plugins/chrome-binary-plugins[flash(-)]
+	npapi? ( !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 npapi; 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
+}