From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1137894-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 EBDE5138351
	for <garchives@archives.gentoo.org>; Tue, 14 Jan 2020 10:23:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E4A64E0802;
	Tue, 14 Jan 2020 10:23:13 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(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 B75D2E0802
	for <gentoo-commits@lists.gentoo.org>; Tue, 14 Jan 2020 10:23:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(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 1C32634DECA
	for <gentoo-commits@lists.gentoo.org>; Tue, 14 Jan 2020 10:23:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 9ED83A3
	for <gentoo-commits@lists.gentoo.org>; Tue, 14 Jan 2020 10:23:09 +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: <1578997388.1ec07a227cb483a5bcc392dab14c4046dbca40fb.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.303.ebuild
X-VCS-Directories: www-plugins/adobe-flash/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 1ec07a227cb483a5bcc392dab14c4046dbca40fb
X-VCS-Branch: master
Date: Tue, 14 Jan 2020 10:23:09 +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: 209dee33-fd1d-42a6-a3ab-0b1768d24288
X-Archives-Hash: d263668cfe0673526e723a2e11980fb2

commit:     1ec07a227cb483a5bcc392dab14c4046dbca40fb
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 10:22:43 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 10:23:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec07a22

www-plugins/adobe-flash: Old

Package-Manager: Portage-2.3.84, 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.303.ebuild      | 141 ---------------------
 2 files changed, 145 deletions(-)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 6bbcc41829f..7902ae5f7bd 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,7 +1,3 @@
-DIST adobe-flash-32.0.0.303-npapi.i386.tar.gz 8537265 BLAKE2B 24f3ea4a7d1149c1ac5fecd431a1ada087772575301977c5a77403259013cff2af5cf42f5c11d5f2b8a7449a69c190fab42dfc4efe95c739c0f50792ba929a3e SHA512 989da54079600f304abe91bdf71f079a8b3652a194b621403d061feb55641cfe9a5acb362084cfeeb5c48762aa0847e2298df82ed91fce3b83dd4b2dec6f8dda
-DIST adobe-flash-32.0.0.303-npapi.x86_64.tar.gz 9242954 BLAKE2B 8bd71bffa24753dbd6e0d2177459b30bfbd12d43e4b19162427c08a2f7cf8caa71adc9857b40712553c8073caa660069ed32cd949f91ac07d68763b0e8d549eb SHA512 ee949dfe75eedf0f6e42fbce8d4c9e24f0133a74c339b4f0aae819698a1463907ef124e569dc1fb5994922b6b32d260c293de647b31c56076fcec75d69f4c6a7
-DIST adobe-flash-32.0.0.303-ppapi.i386.tar.gz 8574350 BLAKE2B 710b1188c70687bd8c71483e53a260ee140c8539b85be03e0d0b46c44c51499c5138c5dc39a79c803dabf299f58d889d3e2fd3527c0780293deb127e299e5a2c SHA512 cc829f851b16ee5226e90d3208769598d9835ca3948de0a7a0eee96e03fd00cdfdeeaee4ca0fc82d26e873e71084b77922541c7fbf72118351911f53d573ce4a
-DIST adobe-flash-32.0.0.303-ppapi.x86_64.tar.gz 9491810 BLAKE2B f0ab131045e486c3fe5f1c637277818afe92a2d9495cf477a8e7e8a2f3628cac0b0909e8561cf1879e4e6d0283be83a0b3e2a331cc23f5fa8cc96d76557b1b22 SHA512 a9ce0135a2f0a806a6f20a1f9d279cc9b5c56e739e61adc1237211621e51c5f7fb43fcf128159cf0110070a59712f432c327f2e94f8827caf84a22a5123eb2c8
 DIST adobe-flash-32.0.0.314-npapi.i386.tar.gz 8537211 BLAKE2B 3c16d10039d921659c67c203449258f27f65837f13acfffa8b4b6c73d3543e9bb7f233bdb5ea00cb9bbfdecd3d0505d945a2a5bf151868d5c7e1a5f261c4a015 SHA512 8271fc0062c2fb838c9fb0e6ae5e2cbdd9b314cd1b82304ca88a98151f02be9d67936aa43b7b207a020423240238b501b7ae869eb8470904871cc626ebe07b2d
 DIST adobe-flash-32.0.0.314-npapi.x86_64.tar.gz 9243290 BLAKE2B 86929bdda23d8b747a7c229cb13fa8a2eadcb6df392dea04a6d7db79d4e785b0a24dbaa730e0d1d3eacaa74d8c36da2a0632d20b938a02b8733ca7fc7953a00f SHA512 1d75b37d5f097f91ac1eac44293cb97728c6e50505dcb75e55135b79cb94929908616d51aed34697bf59dc46ffe9b49c2d24bd817c1ee720c0e34390fc6e4678
 DIST adobe-flash-32.0.0.314-ppapi.i386.tar.gz 8574115 BLAKE2B a36ae83bc7cbad7cb1b0828edbce3552a29abc86c13116792b2a3909a80047e9fd1617cdd0136d57b98f86597fa37ca488f85bd7c190c88caa200c36b2c71d6a SHA512 ec2cf8273273f5cdefd800c1555995de2d5ccfc5abd83a7eafa72679a00dab8e283c8bbce35a7e52b20c5d2a7199f2dc33333d8714725b3a74c22c2e8be77b71

diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.303.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.303.ebuild
deleted file mode 100644
index 7fc71ac549d..00000000000
--- a/www-plugins/adobe-flash/adobe-flash-32.0.0.303.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 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
-}