From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1041988-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 00B2C138334
	for <garchives@archives.gentoo.org>; Wed, 15 Aug 2018 15:38:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E9D17E09E7;
	Wed, 15 Aug 2018 15:38:20 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 4AB13E09E7
	for <gentoo-commits@lists.gentoo.org>; Wed, 15 Aug 2018 15:38:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 8CA01335CDD
	for <gentoo-commits@lists.gentoo.org>; Wed, 15 Aug 2018 15:38:18 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 450372BA
	for <gentoo-commits@lists.gentoo.org>; Wed, 15 Aug 2018 15:38:16 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1534347488.425749dce9f3176d23c5c413a4ff39dd0fb2697f.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-plugins/adobe-flash/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-plugins/adobe-flash/Manifest www-plugins/adobe-flash/adobe-flash-30.0.0.154.ebuild
X-VCS-Directories: www-plugins/adobe-flash/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 425749dce9f3176d23c5c413a4ff39dd0fb2697f
X-VCS-Branch: master
Date: Wed, 15 Aug 2018 15:38:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d540f2b6-6685-4978-aef1-446941dcbc96
X-Archives-Hash: a713201ad788ac09fb70cc4135c3186e

commit:     425749dce9f3176d23c5c413a4ff39dd0fb2697f
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 15 15:30:07 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 15:38:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=425749dc

www-plugins/adobe-flash: Version 30.0.0.154.

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 www-plugins/adobe-flash/Manifest                   |   4 +
 .../adobe-flash/adobe-flash-30.0.0.154.ebuild      | 140 +++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 4d12a34fbf5..7df3f211b04 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -2,3 +2,7 @@ DIST adobe-flash-30.0.0.134-npapi.i386.tar.gz 8523733 BLAKE2B 0c079dbc95e867681b
 DIST adobe-flash-30.0.0.134-npapi.x86_64.tar.gz 9042379 BLAKE2B 31e7e42c9845aa4d5cf2361c95c6d46fa812c7593a269b92f2192ac059bf76fc89fc46683bc78ebe30a8f5e57ee0eabd512ae6c226d134e31a5081227f983231 SHA512 7895ae695fc151c38a5b01ef35b7e81b76b02dba582a1898663b377aaf599187da335d5bbac2fed8cdec424b97ede66b0b5cd642a835989a2f6099f2f690aecc
 DIST adobe-flash-30.0.0.134-ppapi.i386.tar.gz 8562153 BLAKE2B 1741a0c3ac245bfe0916cfe78b24f4f7659773d749634bad16a30420d198787b08239b41c4f8be742a219ccaaf967108f3e430791da70c8929a6e29ee09b4850 SHA512 2a50f1af0424b2f534c1fe8afe839acb87857559e724b5c1fbf0df0ccce8f17df558776942a06a0885727f7704f9db5abde9d77aa053b33fe765437015eb7270
 DIST adobe-flash-30.0.0.134-ppapi.x86_64.tar.gz 9476250 BLAKE2B b840bf4d0d5d462c8367f4fa4cf120bb376aa24b71b28c3e00a82f55015736580a513f13ec8bdc26108e4eb07e728745bf21fc0d0292cd34a31860b1bde754fa SHA512 194f7e0e37a5b44a2f702220cbde2493a910bc0d76f1bd10ff3a6451d2434eb500e694d67b9741c33927a35bcfbfb4e0a4a2d2beb87fca4b7074896c4452141f
+DIST adobe-flash-30.0.0.154-npapi.i386.tar.gz 8529169 BLAKE2B 0a777bd3f04141a9069460e62ee29dc6aaeb5702988a681883aceb56a9463197441b4dbaeed210847ac9cff77dc4f678fe29a997f4e14c321aec7f6e30af25f5 SHA512 7f1cba9d45fa8e3d6cb84b1c0e0b67e0e036e7cd99a7300f4348fd5982855b9e99fa3f38eb8c81f42288f44679af3be0b160ad546c807453a806864bc3dc7392
+DIST adobe-flash-30.0.0.154-npapi.x86_64.tar.gz 9047298 BLAKE2B efbfd432bd224b5be0167d782316c4590461c4e16e15f254a43de6c52b2e85b41f22c7ed5834c6a22a34530f478244759af2c4e295a35467cc7993f6a8c724c2 SHA512 4b280b394169cdb4805f0dcdf0ec98a8f94c6921d78949603a6a14c1dc48537d5db44a360928caabd19b51e6aa16e3766e007e351ce8eb17191a206083965dd7
+DIST adobe-flash-30.0.0.154-ppapi.i386.tar.gz 8562339 BLAKE2B 94fbff82201891122e09f2eb291fd224b321bd7fab133ae25ea3102e505e2d4de19cec9a6e0e14f7199559433bfbd19a15ea6a51b53ea77d1287a81a4b9ee9ea SHA512 e2ff2580fc21c3492bed603e3ff8d787f881b02584983625da51c881cb1d0278827ae6baf1aaa6ffa29150a33c941d169558d151dbe4312e1036fd35dc89f048
+DIST adobe-flash-30.0.0.154-ppapi.x86_64.tar.gz 9478847 BLAKE2B 27a74283f27c00e4b2f6762f18ea1fc785cee7d0576a31e9b97d5cd3e9cfb19a5e744a1b4908a0ca000b3acd5925fa3bb5d6be4d094a09ae0a6cd65b5d347042 SHA512 f4a2b9aeab0aa3d950b17bfc38575a71452e1b608fc4214dc6f6233a1dd042a27c9f2b103adba560f07b468b5197230df46e5d32b7c59eef020181508b42bf72

diff --git a/www-plugins/adobe-flash/adobe-flash-30.0.0.154.ebuild b/www-plugins/adobe-flash/adobe-flash-30.0.0.154.ebuild
new file mode 100644
index 00000000000..edde28781c1
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-30.0.0.154.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils nsplugins multilib multilib-minimal
+
+DESCRIPTION="Adobe Flash Player"
+HOMEPAGE="
+	https://www.adobe.com/products/flashplayer.html
+	https://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
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+pkg_postrm() {
+	gnome2_icon_cache_update
+}