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

[Jeroen Roovers]

commit:     c560d2ae45303b5bbb571750113a0b5e77706211
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed May  9 10:06:50 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed May  9 10:06:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c560d2ae

www-plugins/adobe-flash: Old.

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 www-plugins/adobe-flash/Manifest                   |   4 -
 .../adobe-flash/adobe-flash-29.0.0.140.ebuild      | 140 ---------------------
 2 files changed, 144 deletions(-)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 66fd45c5aa3..c19b5ad78af 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,7 +1,3 @@
-DIST adobe-flash-29.0.0.140-npapi.i386.tar.gz 8520298 BLAKE2B 81fbfa2a82702314f06196ca346dbfe768c4c0ae6512c012fb1b5c2323385c58d64ca87a3c6f7745c2840832c7e0e9e7fe500c1974786b7f835f454aac64b1b8 SHA512 0b478fdc4d606bfa3b1a379dd5d84aaee9ac1fe6f66acd2d79e787f8590f5140c1c6c48c26e3679375910f197945728625944963f1081a1e324b49add2a6d6dc
-DIST adobe-flash-29.0.0.140-npapi.x86_64.tar.gz 9036010 BLAKE2B d1c25e93740cf53f0d551ba859cb4a23ba61fb2816e30d7f8ce503d11cb56ad8058e1bc2259b6bb2986ff751b45b2c2f2a8d63fbf6503e64df1342b73e2976a7 SHA512 acd2ea77a8e7baf4dc473f6301e7ca3df633fd0e61815b99fa16204b574409190811daeb31a936fdc8187f1a7da4e5014ab1a95572b6fb3d2b2276498fa8bcc8
-DIST adobe-flash-29.0.0.140-ppapi.i386.tar.gz 8554989 BLAKE2B 7c662ce66f6d0079f673b28691afea5cca6276a934b851d0d91fcbc4e81320eedf8ee4bf6bf909a8909a76c83a3e6839cb3d521813891f9a7675f69c17da79f1 SHA512 979fc4d626449e0caa350fd8d8ec2a023e72089aaa9ce1a828e1bb37b0bb1431653642c30e0aaef30df8a0d7c8633b232d7f6525f6dc8df2a708f8af7c46e1b9
-DIST adobe-flash-29.0.0.140-ppapi.x86_64.tar.gz 9471488 BLAKE2B 94d3a3fd549cf0f6e9358f153c665160ddc2e4366b92370f615fb328c422e990f9b9785218a0fe0ba998089f5bc3fd241bfd58dd40b210ba05aabc01bfba6602 SHA512 7af12d05a0043d67c6db71b0f4f3797330b4fa27da75877ee7ac9371f80f67131fa499f5cb4f271b80e30cd02845d7ab40a68c7e8dffa0a769f89b1d9b393cc2
 DIST adobe-flash-29.0.0.171-npapi.i386.tar.gz 8520030 BLAKE2B 7a9512dea7dcf769f090ea179482bfccd2c59cab0e3660425bf4642bd688b497b21d95a17b4dcdbe57fda6d3c13d6ab71285dd94ba72a30b086390bd4bf64ebd SHA512 911237ffcad3b582ff4090de63a90ec8b7793390dae39cea644f1508a49ae6c00c7477b695e9afb19dcbef4ec475eac42f0494e75a45df5973af0f481ba32d87
 DIST adobe-flash-29.0.0.171-npapi.x86_64.tar.gz 9036933 BLAKE2B 11a873b8611327c224f3501e976cd3ce3480a81f306f7175d9e15c6178b2eb195f5c1276d4b84201532f4ac74584420a0f2ec488a159f084bd58c3a433345dec SHA512 0489682989b17686f6de4786f9a7394b5bdd8a7465f624d1682db06b223effb4bf47670abd74b38a7b9e8fd2535660f1fb06435796f1d875001cdc667a8452b4
 DIST adobe-flash-29.0.0.171-ppapi.i386.tar.gz 8554691 BLAKE2B 4b9c0bd8bfdaa09d7a126a1ab02914322983dd366a3edaeea3ff481569597d38d510dabbc90def1b8b9f480598f891467e7465b8dc5fe67ec556416820f8d156 SHA512 efa5898bdbbfc23017b01e5fbee964d1728f22297fb0f29d82f2b02da84a5d0ceb70cc079312fcd4fe77deb112ddf9670ccd475177c33a316d271f4c8b501154

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