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

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

commit:     5f78d8a770235cd3af3221128bf5ee758d260fa4
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  7 08:41:32 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Nov  7 08:43:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f78d8a7

www-plugins/adobe-flash: Add NPAPI/PPAPI beta (bug #593650).

Package-Manager: portage-2.3.2

 www-plugins/adobe-flash/Manifest                   |   4 +
 .../adobe-flash/adobe-flash-24.0.0.145.ebuild      | 124 +++++++++++++++++++++
 www-plugins/adobe-flash/metadata.xml               |   2 +
 3 files changed, 130 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index aee3954..f335ef3 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -3,3 +3,7 @@ DIST adobe-flash-11.2.202.643.i386.tar.gz 6991072 SHA256 b3cb465620b18df1a4cb884
 DIST adobe-flash-11.2.202.643.x86_64.tar.gz 7302135 SHA256 a1bdc2154d888358e86712bdd77ef8f03d144847b0d18cd9f7bfff502f017647 SHA512 6b909de61705c41d734ef0ae9863d3b413b0af3d05f8b75dd1a05a579ef6a7cbc123d46e8cbcab387e998ff44430468aae2695ae1ac45b9d6c3b3fa4748b14a8 WHIRLPOOL c6607b5eaad61e32987b3ca68d281596c48dc3c39a3b036c81ae0bd5d50b37ba57094cc28a38483464367c45776ef5b10f4ab19ebc1739311350a699f8534f71
 DIST adobe-flash-23.0.0.205.i386.tar.gz 6002470 SHA256 8cdb32aadf5da2e5b7b6a51b60436d25aaa7879f7bd448921416a8f02fcccae0 SHA512 3426bcaea904921fa1d06cb648e09ab50fdcef15c8f863a53f71b1e0fec61d530e06185a1b7bce5e2e5f4259e875473fc58538e8ebaf334ffbb3b629c6408ecb WHIRLPOOL 0380d2572b4be66ac9ed74e299194037a52e5c83d21beba3d24b680b7b0fb8ce57dbfe2998d65fc9af5627dc77baff2f449e519e6fc612f7e5b022b7c35d8e53
 DIST adobe-flash-23.0.0.205.x86_64.tar.gz 6921629 SHA256 5d1fd6f9a598fe901890dd02f5230b705f1c992703a24f62c93c7725c335b90e SHA512 d2b55c5f113547c6314b3f6896be3cc37ee72bf675b1c0d6859145016e892b106b084234cf3aff671907f45a608a041cbd70aa90b34dc001cae02a613b6c6d41 WHIRLPOOL ac750348d250db2d6100dabee14e32e8a55d572e480543d35c7b2bb0b0a2a63b52d4b2b3126776c94e6e2b020da7a03158f883cdf9853c64b76ab8de53ac1172
+DIST adobe-flash-24.0.0.145-npapi.i386.rpm 9132701 SHA256 6c96d5770af22d4b642819f7836174f6ddfaa1d5a324ca602e97432eab501889 SHA512 24c6d73f8d73c1403ef67400eb694fa54f9d07661f812eb3a83f21ba6b7c82ac68bce381ceb6626a4c53ed48a705b42a510a82384f326e61bbaa7c9b0c0f7ca5 WHIRLPOOL 6a0b1a757c8feda3c24da46a88eac3aa3f5ad2ca95c9457329c1621d1d399298af1ee4ed4fabd551427483cfc84ec0c8b23d45d4dcc1defa278e14c6f837b454
+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

diff --git a/www-plugins/adobe-flash/adobe-flash-24.0.0.145.ebuild b/www-plugins/adobe-flash/adobe-flash-24.0.0.145.ebuild
new file mode 100644
index 00000000..805ee9d
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-24.0.0.145.ebuild
@@ -0,0 +1,124 @@
+# 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
+}
+
+src_prepare() {
+	# XXX: if we find a directory named "lib" we know it should be "lib32"
+	for af_dir in $(find "${WORKDIR}" -name lib); do
+		mv -v ${af_dir} ${af_dir}32
+	done
+
+	default
+}
+
+multilib_src_install() {
+	if use npapi; then
+		# PLUGINS_DIR comes from nsplugins.eclass
+		exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+		doexe usr/$(get_libdir)/flash-plugin/libflashplayer.so
+
+		if multilib_is_native_abi; then
+			if use kde; then
+				local pkglibdir=lib
+				[[ -d usr/lib64 ]] && pkglibdir=lib64
+
+				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/$(get_libdir)/flash-plugin/libpepflashplayer.so
+		insinto /usr/$(get_libdir)/chromium-browser/PepperFlash
+		doins usr/$(get_libdir)/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
+}

diff --git a/www-plugins/adobe-flash/metadata.xml b/www-plugins/adobe-flash/metadata.xml
index a5a64db..49a5591 100644
--- a/www-plugins/adobe-flash/metadata.xml
+++ b/www-plugins/adobe-flash/metadata.xml
@@ -10,5 +10,7 @@
 </maintainer>
 <use>
 <flag name="kde">Install a KCM plugin for configuring flash player preferences</flag>
+<flag name="npapi">Install the Netscape Flash API plugin (for Firefox and similar browsers</flag>
+<flag name="ppapi">Install the Pepper Flash API plugin (for Chrome and similar browsers</flag>
 </use>
 </pkgmetadata>