From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- www-plugins/adobe-flash/Manifest | 12 +- .../adobe-flash/adobe-flash-32.0.0.433.ebuild | 141 --------------------- .../adobe-flash/adobe-flash-32.0.0.453.ebuild | 141 +++++++++++++++++++++ www-plugins/adobe-flash/metadata.xml | 3 - 4 files changed, 147 insertions(+), 150 deletions(-) delete mode 100644 www-plugins/adobe-flash/adobe-flash-32.0.0.433.ebuild create mode 100644 www-plugins/adobe-flash/adobe-flash-32.0.0.453.ebuild (limited to 'www-plugins/adobe-flash') diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index 0aefb20267b8..ea5670a1dae8 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -1,9 +1,9 @@ AUX mms.cfg 4420 BLAKE2B 4557315bfa6f8edb6c8b28907065cdac3771175bd36a8ce2b6e72f0e1f0af20a7bb1ea8abb67f5c7b16fcaa7dd81c3eb89f926957d2ae5fffd499a7e6e709354 SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd AUX pepper-flash 151 BLAKE2B ab58f8d7dd307fea0d53b7f58887e3caeef8913940d6bfb662a42cc1f475ec59009998898e991d7a82d55a26ec1b2fbbc8b2a626fb8c9ba0d2da1e1735ab26ac SHA512 f20176b9567097482c3b1fdd062affb33a69b671f6298a98cd58e03ca80dd01bada4126ac5fd940fddc53a097669f52d4b8bba7850daf211e11dc24cc4d97eb1 AUX pepper-flash-r1 143 BLAKE2B 049f7ec4e3df5fbdaa62e40acf8d21d42f61789c6d9ecde64f300df3d3c51f2b5580fb571ebbf172d590799801c632a2eb4daa01dd86e318441719ff6412f3ed SHA512 e4e1c1f204af1e5ce531dd43a22b4cd08e8def1099bba88ac96af09bd0879dfbb6383653ec85d5d199d418098e4b17d71998bee5a9fb5bb7bd8873432a4f66ee -DIST adobe-flash-32.0.0.433-npapi.i386.tar.gz 8546752 BLAKE2B cd1426ebee07aa4bc81f54214e16481067458cbfc30ad6ecc1e64444692848ad66694f0d3969c8e7b57b6530a1f01ea5f0aaaa19d0b478d7d825e298dd00d27e SHA512 f972a03eeb421772f9da40fac39abe7659e19db9f087b6c66f4f550f7d0b7cc54be52b2d2d54777cbbb2cef4b170dbcf8a189baa7f14dedf0ca690c78d5f8587 -DIST adobe-flash-32.0.0.433-npapi.x86_64.tar.gz 9065643 BLAKE2B bff399e80686511b51fe3da1bff2cf9e7182f116d729da641aa3c82b888745ae7730a598ea572c7f0ebbb703fb79940359c9d3e256142b3a6c8d230c07a80b66 SHA512 536b23a664365ace908372a2dabe393cce4779ad76efe588ebbeafbd80e83cc96f4850033f9e1d530bfdf4c4330e9cfe5cd315a5547febc6ba9b5df97ddad03f -DIST adobe-flash-32.0.0.433-ppapi.i386.tar.gz 8833417 BLAKE2B b02c3c34817eb63398a3ca92607abae5efe0c89382f69c67db7c0b70c59c0495cac93687320399b897642002df3bec4d670327948de9385423991f70ae216b9a SHA512 5111ec3e652748f6d1ef4a0419d33468e11b73b6ebf71c55b3f1396a98467e6e70224c485f83ef328601126171c60cf315c8d5a082dbaea1b67aaf0d7bd86744 -DIST adobe-flash-32.0.0.433-ppapi.x86_64.tar.gz 9764004 BLAKE2B ea25d9a1130b8a0929764e99ffeaf2fe02c51d1233370ef9044bd4c29b3d5267ca1f7c21f562ede6074b0746ead80d2e7ca000cb818f407402ede2921508f118 SHA512 106347f55d57ba63934b8c6cb91fa22b52e538e7e1776e57d31f58d31ef6972f42f08833ef9cd518eeabe7f2cdb71c4b4351ecb11bd3e2bdc9bcd11374e53b3e -EBUILD adobe-flash-32.0.0.433.ebuild 3659 BLAKE2B 7eb3cf6531ea89c5bd0bcb0839d8c061fdcc6ef1f9f96b05ff1a8ec873076f7844a71882a2b7b5975f582544a2878791c04ccdb305e72273d2902e08bb344876 SHA512 cb79e6dbaae54841adea5d780c5e38a4ebb1a0a385961313dc5764c13cd3cb427a0938c3905fb3a7325ca02e5dd85c354fde48899668b0ef7763885750e5311b -MISC metadata.xml 552 BLAKE2B 56ec8c5f43e9624c4102f52834b63855be35d064ce05bfbc866af225fb8e60cf1b83e02c9917b474183b81cad9e4ecfba7595d8de7fa94974824d2a7f4de302d SHA512 0f84cf3e517eb92f73629e6a157a2999f409fa6dea40682e2248edeb957e5bc6f5228c49aebdc3b5d434d0fd8f717a19c793aee8776397871e1bc5ebf8cf7fa1 +DIST adobe-flash-32.0.0.453-npapi.i386.tar.gz 8548784 BLAKE2B 9b0944a7a6a1aa958f6fcda0fe4a725c599e6558293594371812299ce788cc9e9ed426dc33f9b1ecb43a59fa3b7104bdee392b44fc243a8b5823e20d1ea6e4f0 SHA512 1dcacb25cd20c1d469f2160a40e29f10267c79945a79b583ce65be187a6ada34c269096d0e44d2253492edc51c5110e61c586ee097ff50745f9557c8dac2090e +DIST adobe-flash-32.0.0.453-npapi.x86_64.tar.gz 9066153 BLAKE2B 73ee100479b95627af617417d741866a22134a255bbf97692ad1d2d996059702d290fc72ec441e61305d743ad1357bf85011b775b56073beb95f16796ce21328 SHA512 50d6afb9477f31e267dd485caad08cbb6cb4a198403a89c9849012333a35d1e2851137cb6da0d18a87b1e539b6b78246ca689d6cb3dbbcd87432d3183223cd07 +DIST adobe-flash-32.0.0.453-ppapi.i386.tar.gz 8832903 BLAKE2B c9423e696437672f21bc2c4fa0a0e2b889260d13bef9cf361b9bb9517abfe35f1e42c13d6e49ee0dcc56beb47832b81842356dd1fc2bd4f608f31ba9023fa23a SHA512 7540fda93e2c7a3d63c79b5b5a5656f1d294e1d06b2f7613436026af961f49707706815cba36cd0531d3eb7dccd5be429ac9c05ff8a5cb0bb21d6ec30811116a +DIST adobe-flash-32.0.0.453-ppapi.x86_64.tar.gz 9764153 BLAKE2B ff890985141f9c1d23fc04e281f91f437e2e7fee165a68cae0f3fcbf1bef7b4c4a19067a887b7542bedf5a5a765a9598c51c598ff34cc4cc6e2308a364d9fb84 SHA512 a385b68ace7de021c30ab71fcf84114793bc821863ebbb062c61fb134e13c94402f8b676c723eb2a06fbb0622bba027db438a34c434288b77491dfaca1621b5d +EBUILD adobe-flash-32.0.0.453.ebuild 3659 BLAKE2B 7eb3cf6531ea89c5bd0bcb0839d8c061fdcc6ef1f9f96b05ff1a8ec873076f7844a71882a2b7b5975f582544a2878791c04ccdb305e72273d2902e08bb344876 SHA512 cb79e6dbaae54841adea5d780c5e38a4ebb1a0a385961313dc5764c13cd3cb427a0938c3905fb3a7325ca02e5dd85c354fde48899668b0ef7763885750e5311b +MISC metadata.xml 481 BLAKE2B d871797b2c896190a05ff5101e8f695a34bfec3576626710b8f9ef8cd84936abc2f7c0d8dcadab1678262d0407ee96f7ab7dfeff37d411a247f6c6c07074bb5f SHA512 2f50c0cdb3dafdd169281ebe04aa92ed184f5b4f68c0f37e350177091d379c5df86b0addd3111db722a0274cd7435e66cf3c6aa1776d0f029013aa05d26990b7 diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.433.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.433.ebuild deleted file mode 100644 index 577e3861a09e..000000000000 --- a/www-plugins/adobe-flash/adobe-flash-32.0.0.433.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# 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 -} diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.453.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.453.ebuild new file mode 100644 index 000000000000..577e3861a09e --- /dev/null +++ b/www-plugins/adobe-flash/adobe-flash-32.0.0.453.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 +} diff --git a/www-plugins/adobe-flash/metadata.xml b/www-plugins/adobe-flash/metadata.xml index e3e8fa04213f..359704f0a194 100644 --- a/www-plugins/adobe-flash/metadata.xml +++ b/www-plugins/adobe-flash/metadata.xml @@ -1,9 +1,6 @@ - -jer@gentoo.org - desktop-misc@gentoo.org Gentoo Desktop Miscellaneous Project -- cgit v1.2.3