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

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

commit:     a4c25107649e3fa9bb8581f4f3ee4776833ea65e
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 08:59:07 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 08:59:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c25107

www-plugins/adobe-flash: Version bump.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-plugins/adobe-flash/Manifest                   |   4 +
 .../adobe-flash/adobe-flash-25.0.0.148.ebuild      | 133 +++++++++++++++++++++
 2 files changed, 137 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 5584e512298..39f0fa6f957 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -2,3 +2,7 @@ DIST adobe-flash-25.0.0.127-npapi.i386.tar.gz 8484560 SHA256 2ddd617be4a970c3a35
 DIST adobe-flash-25.0.0.127-npapi.x86_64.tar.gz 8995820 SHA256 f65b43312429393fb2fe5a3aedd40a39f79f71ae30ac0444f2d4acfa7b925af9 SHA512 0fa38e950e74ec784c8495afc664398b744daf255a3614ab73b3354452aaa5739264c5c03f1b1bd0965ce3cf29ac365629d7aea6019aecc1f11a4906131327b5 WHIRLPOOL 50460b3e1ff5f3c72bfdbcd3fa80d7cadcc2519c4acc276d6ac5bac395a7c6945ea01ed7b7990a61726058a6da36a4f12c0c46bd578bda92d4d88082c6e3fb59
 DIST adobe-flash-25.0.0.127-ppapi.i386.tar.gz 8529290 SHA256 dfa0731c4c8f878b0777665ad1d5d45ae306b8ec3afc8a0d84c1321c4ab7e75b SHA512 296590a9d30610ccb13016e3f4297655827620c81f451ce67c20d69b17a210af26aba8309b8fee6db9c36199803ce2702c9edef1067fd3b99f4beafb60529acd WHIRLPOOL a2af88e3231d7f86d15ba5cce12c01d28c1520c6b914f7377cc90385c7b0a430bd067cbd7d87aed223c93e250608320f242b71e795fe96241bfb5bce0889b16f
 DIST adobe-flash-25.0.0.127-ppapi.x86_64.tar.gz 9444990 SHA256 0d31c78f5e96488e548ce742d3acddf1fe05580a2a2bbc41032196a9f2c4c792 SHA512 a568ae1e3527e8b8e165d2d81a0697da9dce7425b53915098af1bb34261f01145c4b95a221cab80a17635a86b8707dcfef1a7259c9fa7f56159178507ba70f3f WHIRLPOOL 02818c77b68793a58ce8348f877b91405721e98a6d791b3ce3dbe92caafbb44accb492d85ac060f089e0b4336f82805351d4d0c29912362629dae006944bade5
+DIST adobe-flash-25.0.0.148-npapi.i386.tar.gz 8485815 SHA256 7d9ffcdca435429d8578adf348ff6e2c336787d2cfca4d28742c92adce8061b1 SHA512 e70e1e4308d7aa79853fab8de67b568c1972f43132cab0afdd836c8f0c81b241163be3d7ec7e58da7619760085390ecad2d8f4626bced7772e1265c7a5d397a8 WHIRLPOOL b4a8393bae813fb12c07254a3cf84b0696be7ab95d228e0a49918efdd57c620aaa37892f1c54038e95b017ee4b63bac790eabf603f9c115fa4f3626d5e9fa091
+DIST adobe-flash-25.0.0.148-npapi.x86_64.tar.gz 8996004 SHA256 72f93bf2d2f6b6e7ed34321de8324f14d9ddff8bc9f42717691b8904be50e758 SHA512 f0656b4e294736a0a5027692abf5035a7ec67056c8df209e4a61aa24692e0e65eb4da95efa9de5597abb6384fbd0e85d54f87dff3b8871b44986f3a83eac2666 WHIRLPOOL 7034a6b8f393d382db48e697f33825f4497ba68ef3aa62be546b8b019ac50d53d5dad6f54f29620e5ff6fd70420c6e38bcd3c4bd7d9da840d7e0a47095f02a77
+DIST adobe-flash-25.0.0.148-ppapi.i386.tar.gz 8530772 SHA256 4226ba0c0aee1ad7ecd7cc4c7f4519245d76361627df4b52e0f1a9a6ed0db764 SHA512 38ba505aee21b9dae3ec602b6a4ad5adb815d9f296d908dad7cb02985a251b62fec707379b52344da424d2d410aa4d5064ad128b84cdb40222dd8938c5b16db2 WHIRLPOOL f00c5cb873f1eeabed7df96a8129e4d68fd1df205f3aff1a10cdefb171fd7c269016a09d6c4e22fedae9d734228bb329f28c5da3fbc24b1b32df87714d428f2a
+DIST adobe-flash-25.0.0.148-ppapi.x86_64.tar.gz 9441118 SHA256 5cf13ce4eb10534903213ad7ce8a40b0f84c744e705f7d676ca7b75787235de2 SHA512 25b6128f06b1f3ebdb1fdd186b60f9c77f6891271cd7a4433566b735d3650ce469351b4e3b94db6681de7d6307ecb15ca224645f2e4c223a3de896dd09877a65 WHIRLPOOL c9caf71364fac6f38509fa60cf9b9bc58010f857344833b0e68f5c463a4180fa4e4db2953faad1e47b2b7ceaa038b16b2488906713ba3cde32128f4ab3e1a010

diff --git a/www-plugins/adobe-flash/adobe-flash-25.0.0.148.ebuild b/www-plugins/adobe-flash/adobe-flash-25.0.0.148.ebuild
new file mode 100644
index 00000000000..ed3de32b1a7
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-25.0.0.148.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="+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
+	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
+			# 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
+
+			# 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/PepperFlash
+		doexe libpepflashplayer.so
+		insinto /usr/$(get_libdir)/chromium/PepperFlash
+		doins manifest.json
+
+		if multilib_is_native_abi; then
+			dodir /etc/chromium
+			sed "${FILESDIR}"/pepper-flash-r1 \
+				-e "s|@FP_LIBDIR@|$(get_libdir)|g" \
+				-e "s|@FP_PV@|${PV}|g" \
+				> "${D}"/etc/chromium/pepper-flash \
+				|| die
+		fi
+	fi
+}