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

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

commit:     5b86189aab97b4f7817506a342fc8b1c1e8140fa
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 13:06:28 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 13:06:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b86189a

www-plugins/adobe-flash: Version bump.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

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

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index a1fd3a55c63..4bd0c7954f8 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -2,3 +2,7 @@ DIST adobe-flash-25.0.0.171-npapi.i386.tar.gz 8488318 SHA256 83395b43da1689104e5
 DIST adobe-flash-25.0.0.171-npapi.x86_64.tar.gz 8995580 SHA256 60fe4a22278dda4e778f69bd063833fcce778cf21c88ebe4932095ae00c8cce4 SHA512 c4a05df98f1f21069b2ffb8f0e309c364977f2489ed05e66488ffd06fd2b3af3bf807a582c9430c0e7de618da4fbca96bdd589f6690fbf76e230ba80edf0ecc7 WHIRLPOOL ebbf3bb5898a508d4e6564b430f6bd5205cdd0619221020be708f0393496b406f04d8937062a2a211cde815ede754ab4734d6d591ca496b79651a453d08b85cc
 DIST adobe-flash-25.0.0.171-ppapi.i386.tar.gz 8530554 SHA256 bd044776ed45b74dba78f6ec0608a857cfab21dccc0c9ace06a7e4b5af8ffd21 SHA512 4eb3dc86901811212bc388b414a9d289a4f31b443ea497569c2bf6deb398914568c937513327a87ba33844c8f846ed594e17bcff56439a03cee29c7ee12623c9 WHIRLPOOL 1348cc483d3bf6cf4ad9b796c20f5746f281fcb93e4d5a03be59bd76727256f441c0485f16d30ea140005d789edddd7a2bb43e0ffab0d94e0a026697f0ad7a9a
 DIST adobe-flash-25.0.0.171-ppapi.x86_64.tar.gz 9444396 SHA256 b97e765d75eed61d4703f78af92655d93c80ed07260cdfb07aa6890c30a6dc5a SHA512 d3abde4cd2b88e4e002667a88a9a0906df51268ea602366c915e570851247b2208f3817c38f0e1fa4109222c3b7f10d71dc7323726eaea2d5ee4f46bc19ec107 WHIRLPOOL bbd3c3e18b961a9324d8d55dfbf2915bdfeae370f8b1a60e0e46240873c0721d2dfa68627d4b35b0e22fd640f96a049459b452e927ef855fda107ff76c5652d2
+DIST adobe-flash-26.0.0.131-npapi.i386.tar.gz 8490534 SHA256 ae301d3885c96a07d342460a9c128ad51fa47067cfb98268bad23d1ca287fb4b SHA512 261ce52483bdfaad8ebf083a81d0df79a83aafab1a6b96972a284f3d7cde6db0dcb434bc179afea384bd51eced01b39092dd0e42af6020ebb3e110f1ca2bb05c WHIRLPOOL 9a09e21c4d08aacf918c1d1defd68bbb62ea6b5429bf0abd8219c75b49f8e9f16131640b46d7fb36ce1e7b2851d29a35c1a227a9f44169ba5fdf34d3c1a11d44
+DIST adobe-flash-26.0.0.131-npapi.x86_64.tar.gz 9003017 SHA256 1ca9a708413a418f94c912ac240b33d9229191df7f7e6c415ba5a630ca24ff29 SHA512 2f984b75374bba1335e3a3e386d87d1ef4b8c550acd7565d23a73aed0c33d13816c10b32d146e0d4e75481fb2d9b810a1926a66f5e9691da96ea43283711a16b WHIRLPOOL ec0c57c5b8a5f64e55931aa929d7cd36d2c22c3ebe39dfc746e223cf5c7b7c92ecf0f0757d7f36f4f24585d974796992018f615b6967427e2f27b9e0263d6dea
+DIST adobe-flash-26.0.0.131-ppapi.i386.tar.gz 8536468 SHA256 25497127c725442ab327c6f5bd63b8c44696c9e1427ce7f249f89de86416142f SHA512 99f57751877572615587a7928f61f3c24cff094067e49114126ef01c166f7f063206a29840c85c5c9dc973dc08d0e1aa89d0e0e87b6baa9b269994e22d389627 WHIRLPOOL 8d81024d8393de359613d957ed00afadba92cd96f2bef115f5e7508df7dd10eab8e074a9d8bc750d761c235e9ae1870140eec741a6449f1685b8374462fe8bef
+DIST adobe-flash-26.0.0.131-ppapi.x86_64.tar.gz 9449172 SHA256 de696e2bc2cc3025d0158b8d3d74908eb5740ba4cd33d3f2841f0146933b076c SHA512 97739726cd93306eccefb5fc896cee9efd4f6c3cdd8196937b5b90af0cc714dcc0e43e04c0fa2d581b5215ebf3b9f50b2ea880a035a27d39dc492e03d3c1bb10 WHIRLPOOL a106837968be072d206890f2b80389a3798490008b5323dba27a2ffaffd807fdff77aaf95888518ef25f3b79726f64cbff770abf59f6327e773dffbd113ed918

diff --git a/www-plugins/adobe-flash/adobe-flash-26.0.0.131.ebuild b/www-plugins/adobe-flash/adobe-flash-26.0.0.131.ebuild
new file mode 100644
index 00000000000..d8189defa27
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-26.0.0.131.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[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	media-libs/freetype[${MULTILIB_USEDEP}]
+	>=sys-libs/glibc-2.4
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXt[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]
+"
+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
+}