commit:     84eca1ec47e776dd815c473b1abb4274d9ce2926
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 16:46:54 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 16:47:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84eca1ec

www-plugins/adobe-flash: Old.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 www-plugins/adobe-flash/Manifest                   |   4 -
 .../adobe-flash/adobe-flash-24.0.0.221.ebuild      | 153 ---------------------
 www-plugins/adobe-flash/metadata.xml               |   1 -
 3 files changed, 158 deletions(-)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 1b3c942d55a..5584e512298 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,7 +1,3 @@
-DIST adobe-flash-24.0.0.221-npapi.i386.tar.gz 9161831 SHA256 
7495689ad778cae778f19ac085d362cbae63c7a4ad806fd9ece1844040ba9eed SHA512 
54595f8baad3f9531e8f261ac89246f6a428b9c7be50019580618a8c14d650d7dea00b602f8b15881a2b8c9749df05fba38231cd7fffcd6eb66427d68539eea8
 WHIRLPOOL 
08a74fdb57fe4fc8d31ea01f27492cede236d7800e6ccaceb9c69cf41118c8c226fd829d0957efbc455e83922238cbfb83adbbd566db50295b950261af0d0a07
-DIST adobe-flash-24.0.0.221-npapi.x86_64.tar.gz 9698349 SHA256 
087048af5fa3c46a8c283403a341d4684ef4b966f4e407195b43c24bf5ae64b1 SHA512 
c3f0702e247488d82543a364cda9d143e0f9f4262b36db1e4bc0d59f2d85f87afe8d741081965056c90de2460e166d93d6f9731043a3afe3ed6953f60225aa6b
 WHIRLPOOL 
ca8a96d411455e503493ad733b28c7dafdd98d00ec08270dd011a28fe452910d3d77bf200bc0da622352e39bbe7b82e3f773dcb9ba8f3b57ca636cca276ee3dc
-DIST adobe-flash-24.0.0.221-ppapi.i386.tar.gz 8561099 SHA256 
4f79523ee10b28e172b93c7e3083604916299f888ed7565bf192484dd410f58e SHA512 
4ff2505990f123aeee6725fcf4031dfee04e8281ecfb6574849884bb26a7d666a1b5d7b269b6b61b27ce3cd0bffc29b8d320676455ea1bc2e40ef441aa0c9863
 WHIRLPOOL 
bb4abe01d967eba88bb357ffa38e953acb7ce3078321610b864c971a6f00fa38df8ba224fbe476600fffdd9aad4b2e29b7eaf7b001adf7d136307878531e0fce
-DIST adobe-flash-24.0.0.221-ppapi.x86_64.tar.gz 9479634 SHA256 
e420f01500273478d95953829d0fdac7225957777f6d682466aadc368c59bfd7 SHA512 
6e39a56957326f8e6a01a14b6e1fc3298b1f6bfd8a14bdd9de11d7f323211b38343d66238b9ffdaa9f2ad685d2bb59c233b7c9b093ac409c5bc06bc871fa84e6
 WHIRLPOOL 
3095ed5ff295ce34d14ab826b63e144295d887a87a51b8d1ddf431e30d1a96d7c16c8d636744d1aa522ccc8019ba3e7f0c35dcc0bf5cec48caae577e970d29ca
 DIST adobe-flash-25.0.0.127-npapi.i386.tar.gz 8484560 SHA256 
2ddd617be4a970c3a35c1ab11f95993ca15a824f32d2e0a213f43a5399087a0b SHA512 
d6b21299e2fc22f1bbf0edbb27d821793c5a00613689ae5011bc587be3368a0e14743aa68f3d5803df9e90f0515b710f0a0e38ec121fd6eba5106d9f566b3371
 WHIRLPOOL 
e30945c18386b1168bc140746a77a1f91fae28dd3f0e174f400358d05655dfd566ccf8c446f659f5b81b40693a510bc5b8769fa86fb14df6111501fa993bf457
 DIST adobe-flash-25.0.0.127-npapi.x86_64.tar.gz 8995820 SHA256 
f65b43312429393fb2fe5a3aedd40a39f79f71ae30ac0444f2d4acfa7b925af9 SHA512 
0fa38e950e74ec784c8495afc664398b744daf255a3614ab73b3354452aaa5739264c5c03f1b1bd0965ce3cf29ac365629d7aea6019aecc1f11a4906131327b5
 WHIRLPOOL 
50460b3e1ff5f3c72bfdbcd3fa80d7cadcc2519c4acc276d6ac5bac395a7c6945ea01ed7b7990a61726058a6da36a4f12c0c46bd578bda92d4d88082c6e3fb59
 DIST adobe-flash-25.0.0.127-ppapi.i386.tar.gz 8529290 SHA256 
dfa0731c4c8f878b0777665ad1d5d45ae306b8ec3afc8a0d84c1321c4ab7e75b SHA512 
296590a9d30610ccb13016e3f4297655827620c81f451ce67c20d69b17a210af26aba8309b8fee6db9c36199803ce2702c9edef1067fd3b99f4beafb60529acd
 WHIRLPOOL 
a2af88e3231d7f86d15ba5cce12c01d28c1520c6b914f7377cc90385c7b0a430bd067cbd7d87aed223c93e250608320f242b71e795fe96241bfb5bce0889b16f

diff --git a/www-plugins/adobe-flash/adobe-flash-24.0.0.221.ebuild 
b/www-plugins/adobe-flash/adobe-flash-24.0.0.221.ebuild
deleted file mode 100644
index a32d9a44911..00000000000
--- a/www-plugins/adobe-flash/adobe-flash-24.0.0.221.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit nsplugins multilib multilib-minimal
-
-DESCRIPTION="Adobe Flash Player"
-HOMEPAGE="
-       http://www.adobe.com/products/flashplayer.html
-       http://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="kde +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
-       dev-libs/glib:2
-       dev-libs/nspr
-       dev-libs/nss
-       kde? (
-               dev-qt/qtcore:4
-               dev-qt/qtdbus:4
-               dev-qt/qtgui:4
-               dev-qt/qtsvg:4
-               kde-frameworks/kdelibs:4
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libXau
-               x11-libs/libXdmcp
-               x11-libs/libXext
-               x11-libs/libXft
-               x11-libs/libXpm
-       )
-       media-libs/fontconfig
-       media-libs/freetype
-       >=sys-libs/glibc-2.4
-       x11-libs/cairo
-       x11-libs/gdk-pixbuf
-       x11-libs/gtk+:2
-       x11-libs/libX11
-       x11-libs/libXcursor
-       x11-libs/libXext
-       x11-libs/libXrender
-       x11-libs/libXt
-       x11-libs/pango
-"
-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
-                       if use kde; then
-                               exeinto /usr/$(get_libdir)/kde4
-                               doexe 
usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so
-                               insinto /usr/share/kde4/services
-                               doins 
usr/share/kde4/services/kcm_adobe_flash_player.desktop
-                       else
-                               # 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 "sed of 
.desktop file failed"
-                       fi
-
-                       # 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-browser/PepperFlash
-               doexe libpepflashplayer.so
-               insinto /usr/$(get_libdir)/chromium-browser/PepperFlash
-               doins manifest.json
-
-               if multilib_is_native_abi; then
-                       dodir /etc/chromium
-                       sed "${FILESDIR}"/pepper-flash \
-                               -e "s|@FP_LIBDIR@|$(get_libdir)|g" \
-                               -e "s|@FP_PV@|${PV}|g" \
-                               > "${D}"/etc/chromium/pepper-flash \
-                               || die
-               fi
-       fi
-}

diff --git a/www-plugins/adobe-flash/metadata.xml 
b/www-plugins/adobe-flash/metadata.xml
index 4c23d1fc01d..e3e8fa04213 100644
--- a/www-plugins/adobe-flash/metadata.xml
+++ b/www-plugins/adobe-flash/metadata.xml
@@ -9,7 +9,6 @@
 <name>Gentoo Desktop Miscellaneous Project</name>
 </maintainer>
 <use>
-<flag name="kde">Install a KCM plugin for configuring flash player 
preferences</flag>
 <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>

Reply via email to