commit:     908a680cda72c28e5e5b48da684d64e1048888a6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 12:36:47 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 12:38:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=908a680c

www-plugins/adobe-flash: Remove last-rited pkg

Closes: https://bugs.gentoo.org/754192
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 profiles/arch/amd64/package.use.force              |   4 -
 profiles/default/linux/uclibc/package.mask         |   1 -
 profiles/package.mask                              |   6 -
 www-plugins/adobe-flash/Manifest                   |   4 -
 .../adobe-flash/adobe-flash-32.0.0.453.ebuild      | 141 ---------------------
 www-plugins/adobe-flash/files/mms.cfg              | 117 -----------------
 www-plugins/adobe-flash/files/pepper-flash         |   1 -
 www-plugins/adobe-flash/files/pepper-flash-r1      |   1 -
 www-plugins/adobe-flash/metadata.xml               |  12 --
 9 files changed, 287 deletions(-)

diff --git a/profiles/arch/amd64/package.use.force 
b/profiles/arch/amd64/package.use.force
index 1a044e07e74..30b47efb585 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -35,10 +35,6 @@ dev-ml/llvm-ocaml llvm_targets_X86
 sys-devel/clang llvm_targets_X86
 sys-devel/llvm llvm_targets_X86
 
-# Michał Górny <[email protected]> (2013-09-02)
-# Packages with optional 64-bit variant.
-www-plugins/adobe-flash -abi_x86_64
-
 # Diego Elio Pettenò <[email protected]> (2011-04-21)
 # The plugin is 32-bit only (and I'm not even sure if it works with
 # modern iscan); make sure it only installs the firmware for amd64!

diff --git a/profiles/default/linux/uclibc/package.mask 
b/profiles/default/linux/uclibc/package.mask
index b4cb4c5d8a6..97da958c1c0 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -46,7 +46,6 @@ games-simulation/bcs-demo
 games-strategy/defcon-demo
 games-strategy/knights-demo
 games-strategy/majesty-demo
-www-plugins/adobe-flash
 
 # needs boost[nls]
 games-strategy/wesnoth

diff --git a/profiles/package.mask b/profiles/package.mask
index 7753fd18bd1..c14fe195c4b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -339,12 +339,6 @@ app-emulation/qt-virt-manager
 =sys-kernel/gentoo-kernel-bin-5.4.78-r1
 =sys-kernel/gentoo-kernel-bin-5.4.78
 
-# Jonas Stein <[email protected]> (2020-11-12)
-# Adobe will stop distributing Flash Player after 2020-12-31.
-# Masked for removal after 2020-12-31
-# Bug #754192
-www-plugins/adobe-flash
-
 # Michał Górny <[email protected]> (2020-11-10)
 # This old Kodi version requires vulnerable dev-python/pillow
 # and prevents users from upgrading.  Masked for the time being.

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
deleted file mode 100644
index 6e8ad8f9eef..00000000000
--- a/www-plugins/adobe-flash/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST adobe-flash-32.0.0.453-npapi.i386.tar.gz 8548784 BLAKE2B 
9b0944a7a6a1aa958f6fcda0fe4a725c599e6558293594371812299ce788cc9e9ed426dc33f9b1ecb43a59fa3b7104bdee392b44fc243a8b5823e20d1ea6e4f0
 SHA512 
1dcacb25cd20c1d469f2160a40e29f10267c79945a79b583ce65be187a6ada34c269096d0e44d2253492edc51c5110e61c586ee097ff50745f9557c8dac2090e
-DIST adobe-flash-32.0.0.453-npapi.x86_64.tar.gz 9066153 BLAKE2B 
73ee100479b95627af617417d741866a22134a255bbf97692ad1d2d996059702d290fc72ec441e61305d743ad1357bf85011b775b56073beb95f16796ce21328
 SHA512 
50d6afb9477f31e267dd485caad08cbb6cb4a198403a89c9849012333a35d1e2851137cb6da0d18a87b1e539b6b78246ca689d6cb3dbbcd87432d3183223cd07
-DIST adobe-flash-32.0.0.453-ppapi.i386.tar.gz 8832903 BLAKE2B 
c9423e696437672f21bc2c4fa0a0e2b889260d13bef9cf361b9bb9517abfe35f1e42c13d6e49ee0dcc56beb47832b81842356dd1fc2bd4f608f31ba9023fa23a
 SHA512 
7540fda93e2c7a3d63c79b5b5a5656f1d294e1d06b2f7613436026af961f49707706815cba36cd0531d3eb7dccd5be429ac9c05ff8a5cb0bb21d6ec30811116a
-DIST adobe-flash-32.0.0.453-ppapi.x86_64.tar.gz 9764153 BLAKE2B 
ff890985141f9c1d23fc04e281f91f437e2e7fee165a68cae0f3fcbf1bef7b4c4a19067a887b7542bedf5a5a765a9598c51c598ff34cc4cc6e2308a364d9fb84
 SHA512 
a385b68ace7de021c30ab71fcf84114793bc821863ebbb062c61fb134e13c94402f8b676c723eb2a06fbb0622bba027db438a34c434288b77491dfaca1621b5d

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

diff --git a/www-plugins/adobe-flash/files/mms.cfg 
b/www-plugins/adobe-flash/files/mms.cfg
deleted file mode 100644
index 3d53391eb7b..00000000000
--- a/www-plugins/adobe-flash/files/mms.cfg
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# /etc/adobe/mms.cfg: Adobe Flash privacy and security settings
-#
-# For more details on the meaning of most of these options, please visit:
-# 
http://www.adobe.com/devnet/flashplayer/articles/flash_player_admin_guide.html
-#
-
-# Lets you prevent users from designating any files on the local file system as
-# trusted
-#  0 = Not Allowed, 1 = Allowed (default)
-#AllowUserLocalTrust = 1
-
-# Lets you specify a hard limit on the amount of local storage that Flash 
Player
-# uses for the storage of common Flash components
-#  Size in megabytes (default is 20), 0 = Component storage disabled
-#AssetCacheSize = 20
-
-# Lets you prevent Flash Player from automatically checkingfor and installing
-# updated versions
-#  0 = Not Disabled (default), 1 = Disabled
-AutoUpdateDisable = 1
-
-# Lets you specify how often to check for an updated version of Flash Player
-#  Number of days, 0 = Every startup
-# There is no default value, which falls back to the user's setting (30 days by
-# default)
-#AutoUpdateInterval =
-
-# Lets you prevent SWF files from accessing webcams or microphones
-#  0 = Not Disabled (default), 1 = Disabled
-#AVHardwareDisable = 0
-
-# Lets you prevent information on installed fonts from being displayed
-#  0 = Not Disabled (default), 1 = Disabled
-#DisableDeviceFontEnumeration = 0
-
-# Lets you prevent networking or file system access if any kind
-#  Set to the executable filename, default is empty
-#DisableNetworkAndFilesystemInHostApp = 
-
-# Lets you prevent native code applications that are digitally signed and
-# delivered by Adobe from being downloaded
-#  0 = Not Disabled (default), 1 = Disabled
-#DisableProductDownload = 0
-
-# Lets you enable or disable the use of the Socket.connect() and
-# XMLSocket.connect() methods
-#  0 = Not Disabled (default), 1 = Disabled
-#DisableSockets = 0
-
-# Lets you create a whitelist of servers to which socket connections are 
allowed
-#  Set to hostname or IP address.  This can be specified multiple times in this
-#  file to allow more than one host, and only takes effect if DisableSockets
-#  (above) is set to 1.
-#EnableSocketsTo = localhost.localdomain
-#EnableSocketsTo = 127.0.0.1
-
-# Lets you prevent the ActionScript FileReference API from performing file
-# downloads
-#  0 = Not Disabled (default), 1 = Disabled
-#FileDownloadDisable = 0
-
-# Lets you prevent the ActionScript FileReference API from prerforming file
-# uploads
-#  0 = Not Disabled (default), 1 = Disabled
-#FileUploadDisable = 0
-
-# Lets you disable SWF files playing via a browser plug-in from being displayed
-# in full-screen mode
-#  0 = Not Disabled (default), 1 = Disabled
-#FullScreenDisable = 0
-
-# Lets you specify whether SWF files produced for Flash Player 6 and earlier 
can
-# execute an operation that has been restricted in a newer version of Flash
-# Player
-#  0 = Deny, 1 = Allow
-# There is no default value, which falls back to the user's setting (Defaults 
to
-# "Ask"
-#LegacyDomainMatching =
-
-# Lets you specify how Flash Player should determine whether to execute certain
-# local SWF files that were originally produced for Flash Player 7 and earlier
-#  0 = Deny, 1 = Allow
-# There is no default value, which falls back to the user's setting
-#LocalFileLegacyAction =
-
-# Lets you prevent local SWF files from having read access to files on local
-# drive
-#  0 = Not Disabled (default), 1 = Disabled
-#LocalFileReadDisable = 0
-
-# Lets you specify a hard limit on the amout of local storage that Flash Player
-# uses (per domain) for persistent shared objects
-#  1 = no storage, 2 = 10KB, 3 = 100KB, 4 = 1MB, 5 = 10MB, 
-#  6 = User specified (default)
-# If the user does not specify a limit, the default is 100KB.
-#LocalStorageLimit = 6
-
-# Lets you override GPU validation checks to force hardware acceleration
-# Warning: This may make your player (more) unstable!
-#  0 = Check GPU (default), 1 = Skip checks
-# More details:
-# http://blogs.adobe.com/penguin.swf/2008/08/secrets_of_the_mmscfg_file_1.html
-#OverrideGPUValidation = 0
-
-# Lets you specify whether third-party SWF files can read and write locally
-# persistent shared objects
-#  0 = disabled, 1 = enabled
-# There is no default value, which falls back to the user's setting
-#ThirdPartyStorage = 
-
-# Lets you disable "Windowless" mode, which may cause crashes in firefox
-# version 3.01 and earlier.
-#  0 = Not Disabled (default), 1 = Disabled
-# More details:
-# http://blogs.adobe.com/penguin.swf/2008/08/windowless_mode_fix.html
-#WindowlessDisable = 0

diff --git a/www-plugins/adobe-flash/files/pepper-flash 
b/www-plugins/adobe-flash/files/pepper-flash
deleted file mode 100644
index 31b55752e1a..00000000000
--- a/www-plugins/adobe-flash/files/pepper-flash
+++ /dev/null
@@ -1 +0,0 @@
-CHROMIUM_FLAGS="${CHROMIUM_FLAGS} 
--ppapi-flash-path=/usr/@FP_LIBDIR@/chromium-browser/PepperFlash/libpepflashplayer.so
 --ppapi-flash-version=@FP_PV@"

diff --git a/www-plugins/adobe-flash/files/pepper-flash-r1 
b/www-plugins/adobe-flash/files/pepper-flash-r1
deleted file mode 100644
index b70c40c9183..00000000000
--- a/www-plugins/adobe-flash/files/pepper-flash-r1
+++ /dev/null
@@ -1 +0,0 @@
-CHROMIUM_FLAGS="${CHROMIUM_FLAGS} 
--ppapi-flash-path=/usr/@FP_LIBDIR@/chromium/PepperFlash/libpepflashplayer.so 
--ppapi-flash-version=@FP_PV@"

diff --git a/www-plugins/adobe-flash/metadata.xml 
b/www-plugins/adobe-flash/metadata.xml
deleted file mode 100644
index 359704f0a19..00000000000
--- a/www-plugins/adobe-flash/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
-<email>[email protected]</email>
-<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
-<use>
-<flag name="nsplugin">Install the Netscape Flash API plugin (for Firefox and 
similar browsers)</flag>
-<flag name="ppapi">Install the Pepper Flash API plugin (for Chrome and similar 
browsers)</flag>
-</use>
-</pkgmetadata>

Reply via email to