From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 B257D1382C5 for ; Wed, 10 Jun 2020 09:20:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE1C9E0837; Wed, 10 Jun 2020 09:20:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1044E0837 for ; Wed, 10 Jun 2020 09:20:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DFA6834EE86 for ; Wed, 10 Jun 2020 09:20:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58BAE9C for ; Wed, 10 Jun 2020 09:20:07 +0000 (UTC) From: "Jeroen Roovers" 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" Message-ID: <1591780801.b82553691131c984578f0190e4ee547bcd11b998.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-32.0.0.387.ebuild X-VCS-Directories: www-plugins/adobe-flash/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: b82553691131c984578f0190e4ee547bcd11b998 X-VCS-Branch: master Date: Wed, 10 Jun 2020 09:20:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 87e16681-df12-4bae-8a6c-303dac357d00 X-Archives-Hash: a775114985547832989ee359d2b974dc commit: b82553691131c984578f0190e4ee547bcd11b998 Author: Jeroen Roovers gentoo org> AuthorDate: Wed Jun 10 09:17:24 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed Jun 10 09:20:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8255369 www-plugins/adobe-flash: Version 32.0.0.387 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Bug: https://bugs.gentoo.org/727812 Signed-off-by: Jeroen Roovers gentoo.org> www-plugins/adobe-flash/Manifest | 4 + .../adobe-flash/adobe-flash-32.0.0.387.ebuild | 141 +++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index 69279d2eb1d..a18ea793b82 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -2,3 +2,7 @@ DIST adobe-flash-32.0.0.371-npapi.i386.tar.gz 8545804 BLAKE2B db837eace6b6c6ee0b DIST adobe-flash-32.0.0.371-npapi.x86_64.tar.gz 9064252 BLAKE2B bf4ef5cec99be864e2aec464bff1812789bad49ac8975c2f8e592273460831ccd7e3f94eea52a442d5f930f7cf544daa8ceb45d6700c88a65b0ac8bc91af1206 SHA512 167a50632fc903b9f8f49f2e88ae297fb2eace30c47045299eac44f2883097c79c1c8a251c3fc46e1cb26df6b7153934bb8c4af0fa8f98c0f843d3235dfed0f1 DIST adobe-flash-32.0.0.371-ppapi.i386.tar.gz 8579860 BLAKE2B 93995df47b9ae38ac08353a2828bfeeb5bb1e687a03e547896ac7456d174df14778488a45f01281ad157b634eb2275b45fb9a87a92b6c53c81b1b3498050da2d SHA512 35581e26d44a8d3f4a03afcd1e05ff7b41b8c7c7f0951f723f35208d60af39ad2530707bc1e77a18d66e6fa9c1bbb85bc355c4dc606438865167eab6324615db DIST adobe-flash-32.0.0.371-ppapi.x86_64.tar.gz 9499706 BLAKE2B 2ba9472e0e0a5e3cbe37456b87964a5dfb81c5574212b6cfd7f1acef831626b27899251f9b62fec5d30cdc3a7e5a1bcd417ab098701b4e28d249c86ba236b4ca SHA512 28769c018fec6f89ed310dcfb5a4d734ead463031ce3f99fd465d418be7887017026ae5547101d373130081eae9f0a412f3abbae7d905d9dbddf6e7a32dccb67 +DIST adobe-flash-32.0.0.387-npapi.i386.tar.gz 8546104 BLAKE2B ec878a2150261bc6db11b64d14069d0b3a93fc25fbcb85bff2150c355c5ecdd39b272610b79abda074d1e918538f813ecc889aa88a37d9fc7beb2398ffebc01b SHA512 9e9878e7736a77ba32fa95271e83b995c20058cde1b60c456d0a6dd0594889d6629038f144f5e5867176ed78c296908b911078f3477a1d160b4c690208ffe067 +DIST adobe-flash-32.0.0.387-npapi.x86_64.tar.gz 9065685 BLAKE2B 77dd406107f42c9c8195f33e6b2eb90473dce88aa2756e0fb7c303a6ae3534d0a81a229af3dbec370281658efddd3e00fc620797eabbeaed761183b34c3553c8 SHA512 a72983efd3ef953807be0dfc5c2f22d3f25a059bc2c41b463874d7174eb44ca0dcd4d30ac04054292670e0d1894e7aff9561dbdc18b6856e067c95ef05c44f19 +DIST adobe-flash-32.0.0.387-ppapi.i386.tar.gz 8832916 BLAKE2B cb83cbea7b378117470ad39d3685f01b42d9f1a54c4ab83320769e51258caf65ac0bd536f2d896375074cc5ee3c316b5aa8fb9379f6717455babd5a8dec50aaa SHA512 c28dc82ec987cb74970710f3b2404ab90623030947e57e341b31d853fb28e8a220c7877f331729139ca01b8b0c0a4c29ab4b48c635bcf2417562c842a486dd28 +DIST adobe-flash-32.0.0.387-ppapi.x86_64.tar.gz 9765972 BLAKE2B e6f001cd38f823071190b9773b65cfe68efefe1c6c0f3082ccab3cb57fb9c29bb9974c147f33daa4c6b1499000256568b47f333b951ca19d595844ee03f40b13 SHA512 dd3a26a650a8620ea2aec730f1ae61c1df018461190ee09e2ac783bec79018e649add87b3e2f682fe863fdc8d9be0469fbd563d4e7dbd4d51b164fae2fcf98dd diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.387.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.387.ebuild new file mode 100644 index 00000000000..4bed41bad55 --- /dev/null +++ b/www-plugins/adobe-flash/adobe-flash-32.0.0.387.ebuild @@ -0,0 +1,141 @@ +# 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 +}