Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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, 26 Oct 2016 22:32:02
Message-Id: 1477521117.7f337a66fd66591544ea827419acf4c580f15eb3.jer@gentoo
1 commit: 7f337a66fd66591544ea827419acf4c580f15eb3
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 26 22:30:15 2016 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 26 22:31:57 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f337a66
7
8 www-plugins/adobe-flash: Version bump (bug #598152).
9
10 Package-Manager: portage-2.3.2
11
12 www-plugins/adobe-flash/Manifest | 5 +
13 .../adobe-flash/adobe-flash-11.2.202.643.ebuild | 235 +++++++++++++++++++++
14 .../adobe-flash/adobe-flash-23.0.0.205.ebuild | 68 ++++++
15 3 files changed, 308 insertions(+)
16
17 diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
18 index a4720a3..6655a68 100644
19 --- a/www-plugins/adobe-flash/Manifest
20 +++ b/www-plugins/adobe-flash/Manifest
21 @@ -1,5 +1,10 @@
22 DIST adobe-flash-11.2.202.637-debug.i386.tar.gz 7472956 SHA256 95a08ea4554df9464744d6da8be4d4fe3724bc6468604117f3cbdfda3d1aac92 SHA512 e5d5685df73db2973bce39c954cdd0ba1d78a35b3fdf75dee73aa7892beb21c550d5531837f1391774f1b84237eb2018f92aa8cf0dcca9170c135f4ee0abbbfc WHIRLPOOL f6f46c6a02f5332dc0e463966dcce173474ede2d1b9559c9f9efea681bef30c532931ae6a84695c5e3be6ec85d5e936088371f20b26f3f741ba18e47a32987ea
23 DIST adobe-flash-11.2.202.637.i386.tar.gz 6990653 SHA256 c319416e17c1d29753a451a63be5834777704bbf1abf2ca748c50dfffb644451 SHA512 f752f00172f0b709d872be1576e9cc3af3167e7d8f26ad637031d4336650ffeca94f7ae71e761aefb32cf7d7737af9978d45cdfe2872208b3a915aa7e849ca5f WHIRLPOOL 244a8ee2c6aa739d94596c5f9a98fd032e5e8a2ab43be151991577d6e69bcb06e90ea63d4993072d272e345680de581361f48f4dbe6849fa89bc84c94e2fb12c
24 DIST adobe-flash-11.2.202.637.x86_64.tar.gz 7300737 SHA256 7e5a1149f3d8479907a577ccf5194de777c7baa03c4041bac10166e096cd589b SHA512 c75ec4b9a4aeb7ae0ea659093e84228ef68aa3257ad28d813eaa3680e448ed3aebb92c18fc721a464fa5a5ec4710795681d80255097dcbbcd6142338139c4469 WHIRLPOOL 3d0c66b3f876cc2329c24db0f63d2459adebae518ba94e7cabaaa84897060824a4f60f5799dbfa663d778cb5b326ea22c9d0fb5e7f006895e030d193453ea589
25 +DIST adobe-flash-11.2.202.643-debug.i386.tar.gz 7471672 SHA256 31f294bde4f7115831e6b83dab54b772b75ada254144b196ab2cb5b0ea69a041 SHA512 05eeef270e7f9879267f72cbe638ae8fecbc4fadc7910d7f7c5ecb92144e2543d8916d34b4c8178b82cdd831d3c3af31f8116ac4fde0f6439c21b2f6c87853b2 WHIRLPOOL 5370e9df48f3d47c17eee7bb3646c9a4fb24fc0f387eda5be1648ea079d27dbf06b4a7ce02b2c782e40101048ab570807550349b67184df8326f70171cef3318
26 +DIST adobe-flash-11.2.202.643.i386.tar.gz 6991072 SHA256 b3cb465620b18df1a4cb88427f2e3c7bd080ee23883b05f94245187a783fa25c SHA512 a8cabbdec79a98e65b5fb05097d0e5e63e69aa555564e0d24f369fba0a9ed854d556cfa822aaa1ac3bca14179b9ca9b77d1f3a08222b3376fca53d6d01a7d9cd WHIRLPOOL b246882e1a9bc0c5727189ea3d2c76674b7f2442ba55445e319c6e4156408a6f8a71f79d9fb66da77d6f9a95c5d20a915e19dfd409bba0e16d0c1fb0fd476724
27 +DIST adobe-flash-11.2.202.643.x86_64.tar.gz 7302135 SHA256 a1bdc2154d888358e86712bdd77ef8f03d144847b0d18cd9f7bfff502f017647 SHA512 6b909de61705c41d734ef0ae9863d3b413b0af3d05f8b75dd1a05a579ef6a7cbc123d46e8cbcab387e998ff44430468aae2695ae1ac45b9d6c3b3fa4748b14a8 WHIRLPOOL c6607b5eaad61e32987b3ca68d281596c48dc3c39a3b036c81ae0bd5d50b37ba57094cc28a38483464367c45776ef5b10f4ab19ebc1739311350a699f8534f71
28 DIST adobe-flash-23.0.0.185.i386.tar.gz 6002756 SHA256 be68ac108d16dc0f409570d52fc84e341d4e6c7ceb8dab16069ad333e648368b SHA512 7b743063429fa1cb2278e86ff4cbe3a343d7bcdf738d18c487f4a55baea8be73d3aefd576b4bfbf004bdd09da8823524e49af870b1b27514bda6e7b901f15aa0 WHIRLPOOL 7458fd0cc38baa0e6863965c42a6dfc9df223d7b71a039e43a8147e6847dd493963a9e820f4a705f23a16866db6d92e89805568de02240df97b4ef6262a47693
29 DIST adobe-flash-23.0.0.185.x86_64.tar.gz 6924432 SHA256 3f7a13a615d3cf19e5feb02485e12e3785a6ef07cd7ae32072cd860468fd322b SHA512 3f2aa18846c6f6ab543a4b1a2ee35cda2f7ac22a7a4ad269ee6a654a3369128843e3ca0f999eece62b102ee88f2e792048badff2108a09de79a188070a355f51 WHIRLPOOL c340f1980c1731faca242ae4c325a157bf1eb8b5ac76140b336a28426c0271df0a54d4f65b3e7c8f5d9a73cccf5aac74f00bf2cddc80e8dd1df11b7888213389
30 +DIST adobe-flash-23.0.0.205.i386.tar.gz 6002470 SHA256 8cdb32aadf5da2e5b7b6a51b60436d25aaa7879f7bd448921416a8f02fcccae0 SHA512 3426bcaea904921fa1d06cb648e09ab50fdcef15c8f863a53f71b1e0fec61d530e06185a1b7bce5e2e5f4259e875473fc58538e8ebaf334ffbb3b629c6408ecb WHIRLPOOL 0380d2572b4be66ac9ed74e299194037a52e5c83d21beba3d24b680b7b0fb8ce57dbfe2998d65fc9af5627dc77baff2f449e519e6fc612f7e5b022b7c35d8e53
31 +DIST adobe-flash-23.0.0.205.x86_64.tar.gz 6921629 SHA256 5d1fd6f9a598fe901890dd02f5230b705f1c992703a24f62c93c7725c335b90e SHA512 d2b55c5f113547c6314b3f6896be3cc37ee72bf675b1c0d6859145016e892b106b084234cf3aff671907f45a608a041cbd70aa90b34dc001cae02a613b6c6d41 WHIRLPOOL ac750348d250db2d6100dabee14e32e8a55d572e480543d35c7b2bb0b0a2a63b52d4b2b3126776c94e6e2b020da7a03158f883cdf9853c64b76ab8de53ac1172
32
33 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
34 new file mode 100644
35 index 00000000..c503fe5
36 --- /dev/null
37 +++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.643.ebuild
38 @@ -0,0 +1,235 @@
39 +# Copyright 1999-2016 Gentoo Foundation
40 +# Distributed under the terms of the GNU General Public License v2
41 +# $Id$
42 +
43 +EAPI=6
44 +inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
45 +
46 +DESCRIPTION="Adobe Flash Player"
47 +HOMEPAGE="
48 + http://www.adobe.com/products/flashplayer.html
49 + http://get.adobe.com/flashplayer/
50 + https://helpx.adobe.com/security/products/flash-player.html
51 +"
52 +
53 +AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
54 +AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters"
55 +PV_M=$(get_major_version)
56 +AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
57 +AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
58 +AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
59 +
60 +SRC_URI="
61 + abi_x86_32? (
62 + !debug? ( ${AF_32_URI} )
63 + debug? ( ${AF_32_DB_URI} )
64 + )
65 + abi_x86_64? ( ${AF_64_URI} )
66 +"
67 +IUSE="debug kde selinux cpu_flags_x86_sse2"
68 +REQUIRED_USE="
69 + cpu_flags_x86_sse2
70 + debug? ( abi_x86_32 )
71 + || ( abi_x86_64 abi_x86_32 )
72 +"
73 +SLOT="0"
74 +
75 +KEYWORDS="-* ~amd64 ~x86"
76 +LICENSE="AdobeFlash-11.x"
77 +RESTRICT="strip mirror"
78 +
79 +S="${WORKDIR}"
80 +
81 +NATIVE_DEPS="
82 + dev-libs/atk
83 + dev-libs/glib:2
84 + dev-libs/nspr
85 + dev-libs/nss
86 + kde? (
87 + dev-qt/qtcore:4
88 + dev-qt/qtdbus:4
89 + dev-qt/qtgui:4
90 + dev-qt/qtsvg:4
91 + kde-base/kdelibs
92 + x11-libs/libICE
93 + x11-libs/libSM
94 + x11-libs/libXau
95 + x11-libs/libXdmcp
96 + x11-libs/libXext
97 + x11-libs/libXft
98 + x11-libs/libXpm
99 + )
100 + media-libs/fontconfig
101 + media-libs/freetype
102 + >=sys-libs/glibc-2.4
103 + x11-libs/cairo
104 + x11-libs/gdk-pixbuf
105 + x11-libs/gtk+:2
106 + x11-libs/libX11
107 + x11-libs/libXcursor
108 + x11-libs/libXext
109 + x11-libs/libXrender
110 + x11-libs/libXt
111 + x11-libs/pango
112 +"
113 +
114 +DEPEND="
115 + amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
116 +"
117 +RDEPEND="
118 + ${DEPEND}
119 + abi_x86_64? ( ${NATIVE_DEPS} )
120 + abi_x86_32? (
121 + amd64? (
122 + >=dev-libs/atk-2.10.0[abi_x86_32(-)]
123 + >=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
124 + >=dev-libs/nspr-4.10.4[abi_x86_32(-)]
125 + >=dev-libs/nss-3.15.4[abi_x86_32(-)]
126 + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
127 + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
128 + >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
129 + >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
130 + >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
131 + >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
132 + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
133 + >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
134 + >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
135 + >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
136 + >=x11-libs/pango-1.36.3[abi_x86_32(-)]
137 + )
138 + x86? ( ${NATIVE_DEPS} )
139 + )
140 + || ( media-fonts/liberation-fonts media-fonts/corefonts )
141 + selinux? ( sec-policy/selinux-flash )
142 +"
143 +
144 +# Ignore QA warnings in these closed-source binaries, since we can't fix them:
145 +QA_PREBUILT="usr/*"
146 +
147 +any_cpu_missing_flag() {
148 + local value=${1}
149 + grep '^flags' /proc/cpuinfo | grep -qv "${value}"
150 +}
151 +
152 +pkg_setup() {
153 + unset need_lahf_wrapper
154 + if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then
155 + export need_lahf_wrapper=1
156 + fi
157 +}
158 +
159 +src_unpack() {
160 + local files=( ${A} )
161 +
162 + multilib_src_unpack() {
163 + mkdir -p "${BUILD_DIR}" || die
164 + cd "${BUILD_DIR}" || die
165 +
166 + # we need to filter out the other archive(s)
167 + local other_abi
168 + [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
169 + unpack ${files[@]//*${other_abi}*/}
170 + }
171 +
172 + multilib_parallel_foreach_abi multilib_src_unpack
173 +}
174 +
175 +src_configure() { :; }
176 +
177 +multilib_src_compile() {
178 + if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
179 + # This experimental wrapper, from Maks Verver via bug #268336 should
180 + # emulate the missing lahf instruction affected platforms.
181 + set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \
182 + -oflashplugin-lahf-fix.so "${FILESDIR}/flashplugin-lahf-fix.c"
183 + echo "${@}" >&2
184 + "${@}" || die "Compile of flashplugin-lahf-fix.so failed"
185 + fi
186 +}
187 +
188 +multilib_src_install() {
189 + # PLUGINS_DIR comes from nsplugins.eclass
190 + exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
191 + doexe libflashplayer.so
192 +
193 + if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
194 + # This experimental wrapper, from Maks Verver via bug #268336 should
195 + # emulate the missing lahf instruction affected platforms.
196 + doexe flashplugin-lahf-fix.so
197 + fi
198 +
199 + if multilib_is_native_abi; then
200 + if use kde; then
201 + local pkglibdir=lib
202 + [[ -d usr/lib64 ]] && pkglibdir=lib64
203 +
204 + exeinto /usr/$(get_libdir)/kde4
205 + doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so
206 + insinto /usr/share/kde4/services
207 + doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
208 + else
209 + # No KDE applet, so allow the GTK utility to show up in KDE:
210 + sed -i usr/share/applications/flash-player-properties.desktop \
211 + -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
212 + fi
213 +
214 + # The userland 'flash-player-properties' standalone app:
215 + dobin usr/bin/flash-player-properties
216 +
217 + # Icon and .desktop for 'flash-player-properties'
218 + insinto /usr/share
219 + doins -r usr/share/{icons,applications}
220 + dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
221 + /usr/share/pixmaps/flash-player-properties.png
222 + fi
223 +
224 + # The magic config file!
225 + insinto "/etc/adobe"
226 + doins "${FILESDIR}/mms.cfg"
227 +}
228 +
229 +unregister_pluginwrapper() {
230 + # TODO: Perhaps parse the output of 'nspluginwrapper -l'
231 + # TODO: However, the 64b flash plugin makes
232 + # TODO: 'nspluginwrapper -l' segfault.
233 + local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so"
234 + if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then
235 + einfo "Removing 32-bit plugin wrapper"
236 + nspluginwrapper -r "${FLASH_WRAPPER}"
237 + fi
238 +}
239 +
240 +pkg_postinst() {
241 + if use amd64 ; then
242 + if [[ ${need_lahf_wrapper} ]]; then
243 + ewarn "Your processor does not support the 'lahf' instruction which is used"
244 + ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
245 + ewarn "should allow this plugin to run. If you encounter problems, please"
246 + ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
247 + ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]"
248 + elog
249 + fi
250 + # needed to clean up upgrades from older installs
251 + if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then
252 + unregister_pluginwrapper
253 + fi
254 + if has_version 'www-plugins/nspluginwrapper'; then
255 + if use abi_x86_32 && ! use abi_x86_64; then
256 + einfo "nspluginwrapper detected: Installing plugin wrapper"
257 + local oldabi="${ABI}"
258 + ABI="x86"
259 + local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so"
260 + nspluginwrapper -i "${FLASH_SOURCE}"
261 + ABI="${oldabi}"
262 + fi
263 + elif use abi_x86_32; then
264 + elog "To use the 32-bit flash player in a native 64-bit browser,"
265 + elog "you must install www-plugins/nspluginwrapper"
266 + fi
267 + fi
268 +}
269 +
270 +pkg_prerm() {
271 + use amd64 && use abi_x86_32 && ! use abi_x86_64 && \
272 + unregister_pluginwrapper
273 +}
274
275 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
276 new file mode 100644
277 index 00000000..1fb04a3
278 --- /dev/null
279 +++ b/www-plugins/adobe-flash/adobe-flash-23.0.0.205.ebuild
280 @@ -0,0 +1,68 @@
281 +# Copyright 1999-2016 Gentoo Foundation
282 +# Distributed under the terms of the GNU General Public License v2
283 +# $Id$
284 +
285 +EAPI=6
286 +inherit multilib multilib-minimal
287 +
288 +DESCRIPTION="Adobe Flash Player"
289 +HOMEPAGE="
290 + http://www.adobe.com/products/flashplayer.html
291 + http://get.adobe.com/flashplayer/
292 + https://helpx.adobe.com/security/products/flash-player.html
293 +"
294 +
295 +AF_URI="https://fpdownload.adobe.com/pub/flashplayer/pdc"
296 +AF_32_URI="${AF_URI}/${PV}/flash_player_ppapi_linux.i386.tar.gz -> ${P}.i386.tar.gz"
297 +AF_64_URI="${AF_URI}/${PV}/flash_player_ppapi_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
298 +
299 +SRC_URI="
300 + abi_x86_32? ( ${AF_32_URI} )
301 + abi_x86_64? ( ${AF_64_URI} )
302 +"
303 +SLOT="22"
304 +
305 +KEYWORDS="-* ~amd64 ~x86"
306 +LICENSE="AdobeFlash-11.x"
307 +RESTRICT="strip mirror"
308 +
309 +RDEPEND="
310 + !www-plugins/chrome-binary-plugins[flash(-)]
311 +"
312 +
313 +S="${WORKDIR}"
314 +
315 +# Ignore QA warnings in these closed-source binaries, since we can't fix them:
316 +QA_PREBUILT="usr/*"
317 +
318 +src_unpack() {
319 + local files=( ${A} )
320 +
321 + multilib_src_unpack() {
322 + mkdir -p "${BUILD_DIR}" || die
323 + cd "${BUILD_DIR}" || die
324 +
325 + # we need to filter out the other archive(s)
326 + local other_abi
327 + [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
328 + unpack ${files[@]//*${other_abi}*/}
329 + }
330 +
331 + multilib_parallel_foreach_abi multilib_src_unpack
332 +}
333 +
334 +multilib_src_install() {
335 + exeinto /usr/$(get_libdir)/chromium-browser/PepperFlash
336 + doexe libpepflashplayer.so
337 + insinto /usr/$(get_libdir)/chromium-browser/PepperFlash
338 + doins manifest.json
339 +
340 + if multilib_is_native_abi; then
341 + dodir /etc/chromium
342 + sed "${FILESDIR}"/pepper-flash \
343 + -e "s|@FP_LIBDIR@|$(get_libdir)|g" \
344 + -e "s|@FP_PV@|${PV}|g" \
345 + > "${D}"/etc/chromium/pepper-flash \
346 + || die
347 + fi
348 +}
Report Message
Find on MARC Find on Google Groups