From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1151966-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 87FB3138350
	for <garchives@archives.gentoo.org>; Fri, 13 Mar 2020 07:21:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id A120BE0D8B;
	Fri, 13 Mar 2020 07:21:00 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 78316E0D8B
	for <gentoo-commits@lists.gentoo.org>; Fri, 13 Mar 2020 07:21:00 +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 BEDEC34EF51
	for <gentoo-commits@lists.gentoo.org>; Fri, 13 Mar 2020 07:20:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B8EE164
	for <gentoo-commits@lists.gentoo.org>; Fri, 13 Mar 2020 07:20:57 +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: <1584084054.b9215decc482abac192e7c900096df33e3972e27.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-32.0.0.344.ebuild
X-VCS-Directories: www-plugins/adobe-flash/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: b9215decc482abac192e7c900096df33e3972e27
X-VCS-Branch: master
Date: Fri, 13 Mar 2020 07:20:57 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 09efd577-504a-46cb-9cb2-7a76817e8071
X-Archives-Hash: 2373623a4868b56164098c857a829f8a

commit:     b9215decc482abac192e7c900096df33e3972e27
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 07:18:17 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 07:20:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9215dec

www-plugins/adobe-flash: Version 32.0.0.344

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 www-plugins/adobe-flash/Manifest                   |   4 +
 .../adobe-flash/adobe-flash-32.0.0.344.ebuild      | 141 +++++++++++++++++++++
 2 files changed, 145 insertions(+)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 38d65923ac3..e90133c9a94 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -2,3 +2,7 @@ DIST adobe-flash-32.0.0.330-npapi.i386.tar.gz 8542901 BLAKE2B 5b43a56c8de4462b51
 DIST adobe-flash-32.0.0.330-npapi.x86_64.tar.gz 9062340 BLAKE2B 981becbbddb599c17516f73f3e353618eaafbd06e58b4d091a1af776ec8687778949785214b4834f2e70b437ba6085361907278e6156c7fb59da92fc5941890b SHA512 f8cddc25999574e0a7c29151b06339827caed2df7a7b61b2b625d5fc2f6f5c3583808178a5606c13b8e187bb2a29c1e40d6db15412e8aebe66abcc84b5f25525
 DIST adobe-flash-32.0.0.330-ppapi.i386.tar.gz 8579454 BLAKE2B 2c71ee721caa6e6a98ececa89cfcc14f474ae1c862da42dc340d764d8f8db4b9c23172795a035cf839c77d1bac7753a466e6d802e01af7952af811bb274b7e26 SHA512 dcce6b054ae42b6215e4aa48c60b49722737f35dcafa9bf7313019122603981d7e9ec8105cd8f96d6844fa0dbecd775fa7b5a3789da0a9bd3f258545098da2ea
 DIST adobe-flash-32.0.0.330-ppapi.x86_64.tar.gz 9492629 BLAKE2B 1edb4e7c8a8b234c7dbd4a403c9af8046b812b1cc088e1645d4feaf37083215c5436495eff1f6dee2713904bd93e0ced6ba419a44acb22ecb24f7353cd2a5e72 SHA512 0fb58106319fdd0e2483fffe38099d88e470409adedb9b0d54fc9b88c98e66e5f05a2dfb958b10c14a1438e55d5380f397f29bb265dbbf313e10e7c2b66bdaad
+DIST adobe-flash-32.0.0.344-npapi.i386.tar.gz 8543568 BLAKE2B f734671e7a3e0d45c896d33d9f5cf7715a3aca42774558075b3cd72f720a446e2a5cc8d8dd3d5d00c63b2dec93654dbefe3e5c6ba865c49c529fc87bb99c9122 SHA512 5b52b4198fea66ca5db40b716a98d452b274ee5252f40ff4c316a7fd50a4177ad1dfd83b1bb5b3dc4ec9290760dcf76dbbd80139f808e2a3adb12a7c38f37613
+DIST adobe-flash-32.0.0.344-npapi.x86_64.tar.gz 9062923 BLAKE2B 0dbe8e2ac099c41c2a135a8d37901752c5571d1c79fe5a5cbdeaa124a654a2fbff4b40e090e8083cb04406e1796f18e9d1a9b7000efeeb2c8f537e403d39d198 SHA512 4cf57daff5ef3435f277f77bcff6c34887a7ebeaf68346ac818797b07ef418fadfe091edea606a2a44fc8d3973377bc04e924ab0028d8b36c012edf2459db27f
+DIST adobe-flash-32.0.0.344-ppapi.i386.tar.gz 8579804 BLAKE2B 7f34e4441877a6155d32ad1d29a3c04600aa150deb8ec1a34c7277d2ee431f09be9f5440f1d55799e9dbc1514249804492b3b2fad6b1db911716650ff86bb876 SHA512 6143aa76823e0377833e6dd0142492819b49dae72691f74924cdab5cea98e2d42d9a74958bce49913568ea2ec44ca0b306e82204254f276e7d3067fa21bd2909
+DIST adobe-flash-32.0.0.344-ppapi.x86_64.tar.gz 9492669 BLAKE2B 04d6c27cc985e999e87a33905ebffec4394391f21b4e458aa293050ddf868a45167c8e7b0cc4be8c2b2a65520c6c2d65edea5bef3489c76cdb240adb520e4202 SHA512 d209c083b01198e41834f840b602dd26ef50f1c8894b872ee41df8f2f667244e3e58296ba46e4ae379130ea266d07635d21f2eff185402c3fcb82d6c13a0226b

diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.344.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.344.ebuild
new file mode 100644
index 00000000000..4bed41bad55
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-32.0.0.344.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit xdg-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="bindist mirror strip"
+
+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() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}