Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-plugins/adobe-flash/
Date: Wed, 21 Jun 2017 03:51:21
Message-Id: 1498017027.960336d6c17d7aac5d04a774792f493667b6220f.jer@gentoo
1 commit: 960336d6c17d7aac5d04a774792f493667b6220f
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 21 03:50:27 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 21 03:50:27 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960336d6
7
8 www-plugins/adobe-flash: Old.
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 www-plugins/adobe-flash/Manifest | 4 -
13 .../adobe-flash/adobe-flash-25.0.0.171.ebuild | 133 ---------------------
14 2 files changed, 137 deletions(-)
15
16 diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
17 index 4bd0c7954f8..994ad696873 100644
18 --- a/www-plugins/adobe-flash/Manifest
19 +++ b/www-plugins/adobe-flash/Manifest
20 @@ -1,7 +1,3 @@
21 -DIST adobe-flash-25.0.0.171-npapi.i386.tar.gz 8488318 SHA256 83395b43da1689104e569006c2a75d159d6b12f4c07d0d8e4e05e70b233662f4 SHA512 142aa954b21f54e23795880867380e17399247a1f8e44d7077ae9a0231174f8ba66e1d529ed194b315a3146725bada87ed368a57e3b1f66f7affbf41d067b0df WHIRLPOOL ef9cec371bb981fa5d821fabc752c62c82779608db0d0a291fd7525073c7a261efbc45e25a48697fc0f1fb35a92a52b0346d4686aeda8bf1f14076f56f5540ed
22 -DIST adobe-flash-25.0.0.171-npapi.x86_64.tar.gz 8995580 SHA256 60fe4a22278dda4e778f69bd063833fcce778cf21c88ebe4932095ae00c8cce4 SHA512 c4a05df98f1f21069b2ffb8f0e309c364977f2489ed05e66488ffd06fd2b3af3bf807a582c9430c0e7de618da4fbca96bdd589f6690fbf76e230ba80edf0ecc7 WHIRLPOOL ebbf3bb5898a508d4e6564b430f6bd5205cdd0619221020be708f0393496b406f04d8937062a2a211cde815ede754ab4734d6d591ca496b79651a453d08b85cc
23 -DIST adobe-flash-25.0.0.171-ppapi.i386.tar.gz 8530554 SHA256 bd044776ed45b74dba78f6ec0608a857cfab21dccc0c9ace06a7e4b5af8ffd21 SHA512 4eb3dc86901811212bc388b414a9d289a4f31b443ea497569c2bf6deb398914568c937513327a87ba33844c8f846ed594e17bcff56439a03cee29c7ee12623c9 WHIRLPOOL 1348cc483d3bf6cf4ad9b796c20f5746f281fcb93e4d5a03be59bd76727256f441c0485f16d30ea140005d789edddd7a2bb43e0ffab0d94e0a026697f0ad7a9a
24 -DIST adobe-flash-25.0.0.171-ppapi.x86_64.tar.gz 9444396 SHA256 b97e765d75eed61d4703f78af92655d93c80ed07260cdfb07aa6890c30a6dc5a SHA512 d3abde4cd2b88e4e002667a88a9a0906df51268ea602366c915e570851247b2208f3817c38f0e1fa4109222c3b7f10d71dc7323726eaea2d5ee4f46bc19ec107 WHIRLPOOL bbd3c3e18b961a9324d8d55dfbf2915bdfeae370f8b1a60e0e46240873c0721d2dfa68627d4b35b0e22fd640f96a049459b452e927ef855fda107ff76c5652d2
25 DIST adobe-flash-26.0.0.131-npapi.i386.tar.gz 8490534 SHA256 ae301d3885c96a07d342460a9c128ad51fa47067cfb98268bad23d1ca287fb4b SHA512 261ce52483bdfaad8ebf083a81d0df79a83aafab1a6b96972a284f3d7cde6db0dcb434bc179afea384bd51eced01b39092dd0e42af6020ebb3e110f1ca2bb05c WHIRLPOOL 9a09e21c4d08aacf918c1d1defd68bbb62ea6b5429bf0abd8219c75b49f8e9f16131640b46d7fb36ce1e7b2851d29a35c1a227a9f44169ba5fdf34d3c1a11d44
26 DIST adobe-flash-26.0.0.131-npapi.x86_64.tar.gz 9003017 SHA256 1ca9a708413a418f94c912ac240b33d9229191df7f7e6c415ba5a630ca24ff29 SHA512 2f984b75374bba1335e3a3e386d87d1ef4b8c550acd7565d23a73aed0c33d13816c10b32d146e0d4e75481fb2d9b810a1926a66f5e9691da96ea43283711a16b WHIRLPOOL ec0c57c5b8a5f64e55931aa929d7cd36d2c22c3ebe39dfc746e223cf5c7b7c92ecf0f0757d7f36f4f24585d974796992018f615b6967427e2f27b9e0263d6dea
27 DIST adobe-flash-26.0.0.131-ppapi.i386.tar.gz 8536468 SHA256 25497127c725442ab327c6f5bd63b8c44696c9e1427ce7f249f89de86416142f SHA512 99f57751877572615587a7928f61f3c24cff094067e49114126ef01c166f7f063206a29840c85c5c9dc973dc08d0e1aa89d0e0e87b6baa9b269994e22d389627 WHIRLPOOL 8d81024d8393de359613d957ed00afadba92cd96f2bef115f5e7508df7dd10eab8e074a9d8bc750d761c235e9ae1870140eec741a6449f1685b8374462fe8bef
28
29 diff --git a/www-plugins/adobe-flash/adobe-flash-25.0.0.171.ebuild b/www-plugins/adobe-flash/adobe-flash-25.0.0.171.ebuild
30 deleted file mode 100644
31 index d49257cf95f..00000000000
32 --- a/www-plugins/adobe-flash/adobe-flash-25.0.0.171.ebuild
33 +++ /dev/null
34 @@ -1,133 +0,0 @@
35 -# Copyright 1999-2017 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -inherit nsplugins multilib multilib-minimal
40 -
41 -DESCRIPTION="Adobe Flash Player"
42 -HOMEPAGE="
43 - http://www.adobe.com/products/flashplayer.html
44 - http://get.adobe.com/flashplayer/
45 - https://helpx.adobe.com/security/products/flash-player.html
46 -"
47 -
48 -AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc/${PV}"
49 -AF_NP_32_URI="${AF_URI}/flash_player_npapi_linux.i386.tar.gz -> ${P}-npapi.i386.tar.gz"
50 -AF_NP_64_URI="${AF_URI}/flash_player_npapi_linux.x86_64.tar.gz -> ${P}-npapi.x86_64.tar.gz"
51 -AF_PP_32_URI="${AF_URI}/flash_player_ppapi_linux.i386.tar.gz -> ${P}-ppapi.i386.tar.gz"
52 -AF_PP_64_URI="${AF_URI}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}-ppapi.x86_64.tar.gz"
53 -
54 -IUSE="+nsplugin +ppapi"
55 -REQUIRED_USE="
56 - || ( nsplugin ppapi )
57 -"
58 -
59 -SRC_URI="
60 - nsplugin? (
61 - abi_x86_32? ( ${AF_NP_32_URI} )
62 - abi_x86_64? ( ${AF_NP_64_URI} )
63 - )
64 - ppapi? (
65 - abi_x86_32? ( ${AF_PP_32_URI} )
66 - abi_x86_64? ( ${AF_PP_64_URI} )
67 - )
68 -"
69 -SLOT="22"
70 -
71 -KEYWORDS="-* amd64 x86"
72 -LICENSE="AdobeFlash-11.x"
73 -RESTRICT="strip mirror"
74 -
75 -NPAPI_RDEPEND="
76 - dev-libs/atk[${MULTILIB_USEDEP}]
77 - dev-libs/glib:2[${MULTILIB_USEDEP}]
78 - dev-libs/nspr[${MULTILIB_USEDEP}]
79 - dev-libs/nss[${MULTILIB_USEDEP}]
80 - media-libs/fontconfig[${MULTILIB_USEDEP}]
81 - media-libs/freetype[${MULTILIB_USEDEP}]
82 - >=sys-libs/glibc-2.4
83 - x11-libs/cairo[${MULTILIB_USEDEP}]
84 - x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
85 - x11-libs/gtk+:2[${MULTILIB_USEDEP}]
86 - x11-libs/libX11[${MULTILIB_USEDEP}]
87 - x11-libs/libXcursor[${MULTILIB_USEDEP}]
88 - x11-libs/libXext[${MULTILIB_USEDEP}]
89 - x11-libs/libXrender[${MULTILIB_USEDEP}]
90 - x11-libs/libXt[${MULTILIB_USEDEP}]
91 - x11-libs/pango[${MULTILIB_USEDEP}]
92 -"
93 -RDEPEND="
94 - !www-plugins/chrome-binary-plugins[flash(-)]
95 - nsplugin? (
96 - ${NPAPI_RDEPEND}
97 - !www-plugins/adobe-flash:0
98 - )
99 -"
100 -
101 -S="${WORKDIR}"
102 -
103 -# Ignore QA warnings in these closed-source binaries, since we can't fix them:
104 -QA_PREBUILT="usr/*"
105 -
106 -src_unpack() {
107 - local files=( ${A} )
108 -
109 - multilib_src_unpack() {
110 - mkdir -p "${BUILD_DIR}" || die
111 - cd "${BUILD_DIR}" || die
112 -
113 - # we need to filter out the other archive(s)
114 - local other_abi
115 - [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
116 - unpack ${files[@]//*${other_abi}*/}
117 - }
118 -
119 - multilib_parallel_foreach_abi multilib_src_unpack
120 -}
121 -
122 -multilib_src_install() {
123 - local pkglibdir=lib
124 - [[ -d usr/lib64 ]] && pkglibdir=lib64
125 -
126 - if use nsplugin; then
127 - # PLUGINS_DIR comes from nsplugins.eclass
128 - exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
129 - doexe libflashplayer.so
130 -
131 - if multilib_is_native_abi; then
132 - # No KDE applet, so allow the GTK utility to show up in KDE:
133 - sed \
134 - -i usr/share/applications/flash-player-properties.desktop \
135 - -e "/^NotShowIn=KDE;/d" || die
136 -
137 - # The userland 'flash-player-properties' standalone app:
138 - dobin usr/bin/flash-player-properties
139 -
140 - # Icon and .desktop for 'flash-player-properties'
141 - insinto /usr/share
142 - doins -r usr/share/{icons,applications}
143 - dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
144 - /usr/share/pixmaps/flash-player-properties.png
145 - fi
146 -
147 - # The magic config file!
148 - insinto "/etc/adobe"
149 - doins "${FILESDIR}/mms.cfg"
150 - fi
151 -
152 - if use ppapi; then
153 - exeinto /usr/$(get_libdir)/chromium/PepperFlash
154 - doexe libpepflashplayer.so
155 - insinto /usr/$(get_libdir)/chromium/PepperFlash
156 - doins manifest.json
157 -
158 - if multilib_is_native_abi; then
159 - dodir /etc/chromium
160 - sed "${FILESDIR}"/pepper-flash-r1 \
161 - -e "s|@FP_LIBDIR@|$(get_libdir)|g" \
162 - -e "s|@FP_PV@|${PV}|g" \
163 - > "${D}"/etc/chromium/pepper-flash \
164 - || die
165 - fi
166 - fi
167 -}