commit:     90fe8fa090cc73df9a0d783cfc36fdd93f8d3d77
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  8 14:52:45 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 14:52:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90fe8fa0

www-plugins/adobe-flash: Old.

Package-Manager: portage-2.3.2

 www-plugins/adobe-flash/Manifest                   |   5 -
 .../adobe-flash/adobe-flash-11.2.202.643.ebuild    | 235 ---------------------
 .../adobe-flash/adobe-flash-23.0.0.205.ebuild      |  68 ------
 3 files changed, 308 deletions(-)

diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index cd3cc83..0861fe2 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,11 +1,6 @@
-DIST adobe-flash-11.2.202.643-debug.i386.tar.gz 7471672 SHA256 
31f294bde4f7115831e6b83dab54b772b75ada254144b196ab2cb5b0ea69a041 SHA512 
05eeef270e7f9879267f72cbe638ae8fecbc4fadc7910d7f7c5ecb92144e2543d8916d34b4c8178b82cdd831d3c3af31f8116ac4fde0f6439c21b2f6c87853b2
 WHIRLPOOL 
5370e9df48f3d47c17eee7bb3646c9a4fb24fc0f387eda5be1648ea079d27dbf06b4a7ce02b2c782e40101048ab570807550349b67184df8326f70171cef3318
-DIST adobe-flash-11.2.202.643.i386.tar.gz 6991072 SHA256 
b3cb465620b18df1a4cb88427f2e3c7bd080ee23883b05f94245187a783fa25c SHA512 
a8cabbdec79a98e65b5fb05097d0e5e63e69aa555564e0d24f369fba0a9ed854d556cfa822aaa1ac3bca14179b9ca9b77d1f3a08222b3376fca53d6d01a7d9cd
 WHIRLPOOL 
b246882e1a9bc0c5727189ea3d2c76674b7f2442ba55445e319c6e4156408a6f8a71f79d9fb66da77d6f9a95c5d20a915e19dfd409bba0e16d0c1fb0fd476724
-DIST adobe-flash-11.2.202.643.x86_64.tar.gz 7302135 SHA256 
a1bdc2154d888358e86712bdd77ef8f03d144847b0d18cd9f7bfff502f017647 SHA512 
6b909de61705c41d734ef0ae9863d3b413b0af3d05f8b75dd1a05a579ef6a7cbc123d46e8cbcab387e998ff44430468aae2695ae1ac45b9d6c3b3fa4748b14a8
 WHIRLPOOL 
c6607b5eaad61e32987b3ca68d281596c48dc3c39a3b036c81ae0bd5d50b37ba57094cc28a38483464367c45776ef5b10f4ab19ebc1739311350a699f8534f71
 DIST adobe-flash-11.2.202.644-debug.i386.tar.gz 7470879 SHA256 
6554fcad56f63e6b4bdb3d300ce3afbcde839b10a224c993e572646fd69785bc SHA512 
ad6cb79e61fbd0400dfc37ef07a6365bdce3d21aad87eeffac13dd95e692f017c9158ec2c51f83501ca2b07bace53fa8ad24627e4ab863179d43e6d01b20ba74
 WHIRLPOOL 
b25b1d125f6acdcfe4d540ae3fade723273bc95fc4e8a370c43b47ebaa80997342f162585360f1c473fe09786c2465c00e5b9d106ebd226f43e05e0fc3f21b9e
 DIST adobe-flash-11.2.202.644.i386.tar.gz 6992226 SHA256 
63ca6e1ad1e1b39ae6e35265b628a818dfc4544b1aa857b8a8365d056779f297 SHA512 
8a72caf129ba98711d71eb55b7320f8afedb8c06e2d3831f455fea5c7cdaa84f0d4b689b65e1f3f3b045a85e56e35fa7f40a9f95c25b2fac84cc9df4ecd67155
 WHIRLPOOL 
7d98ee1740b17205833bf9d20677e4138bbee16c6e1974956d9e54646b141cbe56425148297404f2716807d844bf775a870ebf003f4653f59801be1d75432b57
 DIST adobe-flash-11.2.202.644.x86_64.tar.gz 7301011 SHA256 
ad2f70c3f1ba41636445de5e4f1243e38fc469288600cdb4ee26765ee391462d SHA512 
e61683ed7c4bd2f15e896eca4ecead279843cb3a6547ea81989d927a61251a8846b10bf35782da21dd2a2ad01e4230f508708f49980d57ccf0d30874b35cebd2
 WHIRLPOOL 
1de557092f3d5b725648b813ecc77a113a95fed404a2f219e44df33049721320be6921b497d52e9557c03ae0b2ed49e0560fd1a1087dd75fcc8d78d68551b312
-DIST adobe-flash-23.0.0.205.i386.tar.gz 6002470 SHA256 
8cdb32aadf5da2e5b7b6a51b60436d25aaa7879f7bd448921416a8f02fcccae0 SHA512 
3426bcaea904921fa1d06cb648e09ab50fdcef15c8f863a53f71b1e0fec61d530e06185a1b7bce5e2e5f4259e875473fc58538e8ebaf334ffbb3b629c6408ecb
 WHIRLPOOL 
0380d2572b4be66ac9ed74e299194037a52e5c83d21beba3d24b680b7b0fb8ce57dbfe2998d65fc9af5627dc77baff2f449e519e6fc612f7e5b022b7c35d8e53
-DIST adobe-flash-23.0.0.205.x86_64.tar.gz 6921629 SHA256 
5d1fd6f9a598fe901890dd02f5230b705f1c992703a24f62c93c7725c335b90e SHA512 
d2b55c5f113547c6314b3f6896be3cc37ee72bf675b1c0d6859145016e892b106b084234cf3aff671907f45a608a041cbd70aa90b34dc001cae02a613b6c6d41
 WHIRLPOOL 
ac750348d250db2d6100dabee14e32e8a55d572e480543d35c7b2bb0b0a2a63b52d4b2b3126776c94e6e2b020da7a03158f883cdf9853c64b76ab8de53ac1172
 DIST adobe-flash-23.0.0.207.i386.tar.gz 6001506 SHA256 
41a90f239154fe8f0ce9557964f30c9f9921e378e98ae6ec28f7a18d00871317 SHA512 
74c90e553326e5029546a6472ef09ccca9bad1ffdbcc9453dc066880d30f21034a292f9ab6fce235ef3c0b3847489bd33a9b7b8610bcd7c6539ec3d9e4715e49
 WHIRLPOOL 
4dd262b31c9a767432f707ead40fe51e1133cd6297175ef6537d527874c19a1163e66f3f0763e68828c1640d55fc697236ff4509d5f3fb24a2af9ee435ed0a49
 DIST adobe-flash-23.0.0.207.x86_64.tar.gz 6921662 SHA256 
06a7535cd7fcfb5b60512bc38821124f1cb725825ad64578dced86395ff7f1cb SHA512 
bfb79317ee9047ee1b9eb9f797e48b63d6fa6aede2da07d1bb851c310c2da48cb6df9fbaf978f9db65c2fc382bf2c71fd2fd3d832a82e4aba65226f1aa067ece
 WHIRLPOOL 
5014a51027c72ad2465cb29e5e60e482951acbe7be9ccbf741d497bd1a31ac2c91ff2530a8b4b8b2da8adf69c9035d2053395ffea350e0b2e4a5f8bef43494e0
 DIST adobe-flash-24.0.0.145-npapi.i386.rpm 9132701 SHA256 
6c96d5770af22d4b642819f7836174f6ddfaa1d5a324ca602e97432eab501889 SHA512 
24c6d73f8d73c1403ef67400eb694fa54f9d07661f812eb3a83f21ba6b7c82ac68bce381ceb6626a4c53ed48a705b42a510a82384f326e61bbaa7c9b0c0f7ca5
 WHIRLPOOL 
6a0b1a757c8feda3c24da46a88eac3aa3f5ad2ca95c9457329c1621d1d399298af1ee4ed4fabd551427483cfc84ec0c8b23d45d4dcc1defa278e14c6f837b454

diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.643.ebuild 
b/www-plugins/adobe-flash/adobe-flash-11.2.202.643.ebuild
deleted file mode 100644
index 7454867..00000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.643.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit nsplugins toolchain-funcs versionator 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="http://fpdownload.macromedia.com/get/flashplayer/pdc";
-AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters";
-PV_M=$(get_major_version)
-AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> 
${P}.i386.tar.gz"
-AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> 
${P}.x86_64.tar.gz"
-AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz
 -> ${P}-debug.i386.tar.gz"
-
-SRC_URI="
-       abi_x86_32? (
-               !debug? ( ${AF_32_URI} )
-               debug? ( ${AF_32_DB_URI} )
-       )
-       abi_x86_64? ( ${AF_64_URI} )
-"
-IUSE="debug kde selinux cpu_flags_x86_sse2"
-REQUIRED_USE="
-       cpu_flags_x86_sse2
-       debug? ( abi_x86_32 )
-       || ( abi_x86_64 abi_x86_32 )
-"
-SLOT="0"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-11.x"
-RESTRICT="strip mirror"
-
-S="${WORKDIR}"
-
-NATIVE_DEPS="
-       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-base/kdelibs
-               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
-"
-
-DEPEND="
-       amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
-"
-RDEPEND="
-       ${DEPEND}
-       abi_x86_64? ( ${NATIVE_DEPS} )
-       abi_x86_32? (
-               amd64? (
-                       >=dev-libs/atk-2.10.0[abi_x86_32(-)]
-                       >=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-                       >=dev-libs/nspr-4.10.4[abi_x86_32(-)]
-                       >=dev-libs/nss-3.15.4[abi_x86_32(-)]
-                       >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-                       >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-                       >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
-                       >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
-                       >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
-                       >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-                       >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-                       >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-                       >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-                       >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
-                       >=x11-libs/pango-1.36.3[abi_x86_32(-)]
-               )
-               x86? ( ${NATIVE_DEPS} )
-       )
-       || ( media-fonts/liberation-fonts media-fonts/corefonts )
-       selinux? ( sec-policy/selinux-flash )
-"
-
-# Ignore QA warnings in these closed-source binaries, since we can't fix them:
-QA_PREBUILT="usr/*"
-
-any_cpu_missing_flag() {
-       local value=${1}
-       grep '^flags' /proc/cpuinfo | grep -qv "${value}"
-}
-
-pkg_setup() {
-       unset need_lahf_wrapper
-       if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then
-               export need_lahf_wrapper=1
-       fi
-}
-
-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
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-       if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
-               # This experimental wrapper, from Maks Verver via bug #268336 
should
-               # emulate the missing lahf instruction affected platforms.
-               set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \
-                       -oflashplugin-lahf-fix.so  
"${FILESDIR}/flashplugin-lahf-fix.c"
-               echo "${@}" >&2
-               "${@}" || die "Compile of flashplugin-lahf-fix.so failed"
-       fi
-}
-
-multilib_src_install() {
-       # PLUGINS_DIR comes from nsplugins.eclass
-       exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
-       doexe libflashplayer.so
-
-       if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
-               # This experimental wrapper, from Maks Verver via bug #268336 
should
-               # emulate the missing lahf instruction affected platforms.
-               doexe flashplugin-lahf-fix.so
-       fi
-
-       if multilib_is_native_abi; then
-               if use kde; then
-                       local pkglibdir=lib
-                       [[ -d usr/lib64 ]] && pkglibdir=lib64
-
-                       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"
-}
-
-unregister_pluginwrapper() {
-       # TODO: Perhaps parse the output of 'nspluginwrapper -l'
-       # TODO: However, the 64b flash plugin makes
-       # TODO: 'nspluginwrapper -l' segfault.
-       local 
FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so"
-       if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} 
]]; then
-               einfo "Removing 32-bit plugin wrapper"
-               nspluginwrapper -r "${FLASH_WRAPPER}"
-       fi
-}
-
-pkg_postinst() {
-       if use amd64 ; then
-               if [[ ${need_lahf_wrapper} ]]; then
-                       ewarn "Your processor does not support the 'lahf' 
instruction which is used"
-                       ewarn "by Adobe's 64-bit flash binary. We have 
installed a wrapper which"
-                       ewarn "should allow this plugin to run. If you 
encounter problems, please"
-                       ewarn "adjust your USE flags to install only the 32-bit 
version and reinstall:"
-                       ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]"
-                       elog
-               fi
-               # needed to clean up upgrades from older installs
-               if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then
-                       unregister_pluginwrapper
-               fi
-               if has_version 'www-plugins/nspluginwrapper'; then
-                       if use abi_x86_32 && ! use abi_x86_64; then
-                               einfo "nspluginwrapper detected: Installing 
plugin wrapper"
-                               local oldabi="${ABI}"
-                               ABI="x86"
-                               local 
FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so"
-                               nspluginwrapper -i "${FLASH_SOURCE}"
-                               ABI="${oldabi}"
-                       fi
-               elif use abi_x86_32; then
-                       elog "To use the 32-bit flash player in a native 64-bit 
browser,"
-                       elog "you must install www-plugins/nspluginwrapper"
-               fi
-       fi
-}
-
-pkg_prerm() {
-       use amd64 && use abi_x86_32 && ! use abi_x86_64 && \
-               unregister_pluginwrapper
-}

diff --git a/www-plugins/adobe-flash/adobe-flash-23.0.0.205.ebuild 
b/www-plugins/adobe-flash/adobe-flash-23.0.0.205.ebuild
deleted file mode 100644
index 44893e2..00000000
--- a/www-plugins/adobe-flash/adobe-flash-23.0.0.205.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit 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";
-AF_32_URI="${AF_URI}/${PV}/flash_player_ppapi_linux.i386.tar.gz -> 
${P}.i386.tar.gz"
-AF_64_URI="${AF_URI}/${PV}/flash_player_ppapi_linux.x86_64.tar.gz -> 
${P}.x86_64.tar.gz"
-
-SRC_URI="
-       abi_x86_32? ( ${AF_32_URI} )
-       abi_x86_64? ( ${AF_64_URI} )
-"
-SLOT="22"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-11.x"
-RESTRICT="strip mirror"
-
-RDEPEND="
-       !www-plugins/chrome-binary-plugins[flash(-)]
-"
-
-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() {
-       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
-}

Reply via email to