From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-891848-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 4285C138306
for <garchives@archives.gentoo.org>; Wed, 13 Jul 2016 16:12:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7532621C11C;
Wed, 13 Jul 2016 16:12:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 09C2621C11C
for <gentoo-commits@lists.gentoo.org>; Wed, 13 Jul 2016 16:12:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0EAA3340CEA
for <gentoo-commits@lists.gentoo.org>; Wed, 13 Jul 2016 16:12:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BDE282440
for <gentoo-commits@lists.gentoo.org>; Wed, 13 Jul 2016 16:11:58 +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: <1468426295.6c313cc076e5703818bd6a20bec0a47d64f4b30a.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-11.2.202.626.ebuild
X-VCS-Directories: www-plugins/adobe-flash/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 6c313cc076e5703818bd6a20bec0a47d64f4b30a
X-VCS-Branch: master
Date: Wed, 13 Jul 2016 16:11:58 +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-Archives-Salt: c7a0ced2-f431-4d64-a50b-28b47c868b7a
X-Archives-Hash: dffcd5bbfa932091d21e49fbc5348be6
commit: 6c313cc076e5703818bd6a20bec0a47d64f4b30a
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 16:11:35 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 16:11:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c313cc0
www-plugins/adobe-flash: Old.
Package-Manager: portage-2.3.0
www-plugins/adobe-flash/Manifest | 3 -
.../adobe-flash/adobe-flash-11.2.202.626.ebuild | 235 ---------------------
2 files changed, 238 deletions(-)
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index eb66178..c3c2cb3 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,6 +1,3 @@
-DIST adobe-flash-11.2.202.626-debug.i386.tar.gz 7465648 SHA256 830269b22315898096d45576ecc13ab34f9ecd40e73fa1bc6558a9ca070686fe SHA512 d772c2833065ac26b0253a41d3e9a8c13b9fc342f6698cc88823a7a8989442cc293a8e7493a813cb386c24800999d17549006f35090eac6a3e7f606aa1e450e3 WHIRLPOOL 5369798eb5e2578295de95406c0aa434be9fecbd094c3697d66deb10fba5a62af66af0dba7d77447fe3c6a9f2017db7e8dc36016b039e0633700b9382c87e77c
-DIST adobe-flash-11.2.202.626.i386.tar.gz 6981743 SHA256 1ec079f9d8578255435e15f704f05e4af69e749a480427af2be64fe447e2ca8c SHA512 d88c893cf11bd4d93dc77971e2c0cb50e59ae371b1f4e3dfeda2046b9f571f93ea074b35de9bf824aa67f5bee6cc4ac987a387451457bdc686d0a1d4dee28798 WHIRLPOOL a9c70f90d8c6af66f1bd1c03ebeb8f584bda7b9798daef97b65a6dd2455d018f0dc1a57c373327079eccf911af88cf421fd56faa9e6a47cd6257c41745a3a271
-DIST adobe-flash-11.2.202.626.x86_64.tar.gz 7295646 SHA256 14f6f10c664984302e2cb67bda06b8da8358cf4110235a3ad1dff06df22ad0ad SHA512 13d0f0aa206e4ca3e4e024760574d3e05445d57979a951ae3e5d51b61da8adae2b953f9b642be13c158cbb0fcd824ff4ff6af6636a01b7078a517af84506a595 WHIRLPOOL c465e13280152d809f8bd314257d46581b8828664592da33bef0af471cb98d300324e96e2312dedf86509ab87ebea2d54dbcc8d1bd2b8d45a70b68c9c874b216
DIST adobe-flash-11.2.202.632-debug.i386.tar.gz 7464481 SHA256 a0d82fdfc50912e89e9ee51777947ce02753c5c439a08ace4eccdd3765c57dd9 SHA512 ac16e3cc9d0ffb672b61b246a8ccf4c1211eb1af8fb24d31ad2d995a175cec885c4efc7375b0325ed2221124885c9e22e62c38ace4b29bbc109a8633277acac8 WHIRLPOOL 3f39e91902ff7d9988ab2fc14012a34b396aa76597909e3ea959ff3bda9f675cc13e9a1ec2ee1d25308c646d4b2d144516dacde4d0be6b44ffbae575eb53dbee
DIST adobe-flash-11.2.202.632.i386.tar.gz 6986419 SHA256 c455ba9b72318d87434c7199a94ca15dc0f1c7fca590ee3703e013cbdecce942 SHA512 b33f4fbc888e10ce034cd2236272960bed4c429ee5c6f3f93162bbd1642fd6ee3bb5b0273654818eef5b84540c826e3c3dd039e982b26e93091532e5a30941aa WHIRLPOOL fe7d364442ba5543d4d7f54d0f039c8c8a69d5e72b145d12a0add32ed7635b56abd9966e49d577bc45733c6f81c8b43db20d2a407e188320d6def540d4f17493
DIST adobe-flash-11.2.202.632.x86_64.tar.gz 7296191 SHA256 8a0cea025f854f2c6e139f623851eee60bb3842d5326fb7502644a1a94a6d1d7 SHA512 cdda85ec491d0e3b08333d8547fbb693e342cd73110231b2df8b285424cdf30fe7296892c2744c3a33eac2eb4b4562d08ecb8f80f62f45834e739e0bd13c3da8 WHIRLPOOL 5bc3a9079b18623d2ee227496d91429131075a2ba04d901075a0e83d599031909c2f750fd31e7393409994cd4ff0e164d2e5f67eea82fab4c95849d960d0c1ac
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.626.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.626.ebuild
deleted file mode 100644
index 8904f13..0000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.626.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=5
-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#version11
-"
-
-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
-}