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: Tue, 29 Dec 2015 10:48:39
Message-Id: 1451386107.4c12f0b2e7194bc2218d2b3b2683cf33034b9f6f.jer@gentoo
1 commit: 4c12f0b2e7194bc2218d2b3b2683cf33034b9f6f
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 29 10:47:26 2015 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 29 10:48:27 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c12f0b2
7
8 www-plugins/adobe-flash: Old.
9
10 Package-Manager: portage-2.2.26
11
12 www-plugins/adobe-flash/Manifest | 3 -
13 .../adobe-flash/adobe-flash-11.2.202.554.ebuild | 234 ---------------------
14 2 files changed, 237 deletions(-)
15
16 diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
17 index 1f22593..5057251 100644
18 --- a/www-plugins/adobe-flash/Manifest
19 +++ b/www-plugins/adobe-flash/Manifest
20 @@ -1,6 +1,3 @@
21 -DIST adobe-flash-11.2.202.554-debug.i386.tar.gz 7443385 SHA256 069484562fcf9dc41dd1517e83e3b33d4cdb464ed68a2790249909b7fb994802 SHA512 c38a5320ae8ba5f5397de24bcd471c60ec1d561c7aa5c496032633a9fd3ab6e744ae2d74901603149fafcd2095231ee8baaaf5893a7dea3cf368b55a91552d80 WHIRLPOOL 0ad6f4db68d02a2fac48f5c0bf4c3d7b267c27b762575d7a62204d9a73f6b88bfa4da5d548968c90caf047ba73cf632f032eb16e100967cc9900c0c4a5d27105
22 -DIST adobe-flash-11.2.202.554.i386.tar.gz 6963199 SHA256 dfdfbb529238b966b25776691d0d3c277f30ff35469c4a495fd8d0f2a9a146a8 SHA512 3f76c3eefdc4d09ee4a8b1174e22bbafae9606632bf37b31c447179ac38c63be0a8fcf1384346e5bcb096cab2d044bcfe0ce0f5bbb063b4074fa0ff6fabea5ca WHIRLPOOL 36b2bee2c69fb32eacb787e4bd94c09353ee4b886982f7a08ec6caf8d9e47a63e8bf651f495357d7b7cc2a6a3efe4c7e82f5f054abfd48d143b9347907b5dd15
23 -DIST adobe-flash-11.2.202.554.x86_64.tar.gz 7273685 SHA256 7dd0d790d8b99c07ad9a56f35fef38f698b1075c9fcfe72f074a6fe7288bff97 SHA512 4eed8c083fa9b3655237ae1555688b6b10aa68c545351edafbf23ed966db6ce61ddb5cc887d9ea4ca64f6d28640ed17322c7dc8e3030577799f40e52285e1800 WHIRLPOOL 4c6c0a5d21d738115d6456f1c7683a2aad3b3ef0b2338ec0bde424c884f89a62006678cd4c9a11cb874e9f418753dc49b8d9c742a2af978de3ec3c1f92ca0d41
24 DIST adobe-flash-11.2.202.559-debug.i386.tar.gz 7447011 SHA256 2f3e00891a3b953e0aed5a794a6352733f868a58743a4ab7f1e9a94d26a4d079 SHA512 f4c58f70b30ee5725087344eeee674916f3c5dfba203fe05bc21baff7fe7201d4e77fb1ebe1eb9b671a0f1f7d9c6f970707acd3f43c1c983d7b3728c238d442f WHIRLPOOL 0e90a187c239bc57606831ee7fbcd627106aabdb894c6675a849cc5de51d45ae56ed674c7944b7c351766b72401dc5b6dd450e0e4526e49f71ab8e7bcd9ac739
25 DIST adobe-flash-11.2.202.559.i386.tar.gz 6965297 SHA256 09d4d16f8a508fdb678372ae91ba9ea3c2b22d9c0c72591fd3a2f0d39171a8c5 SHA512 56d01e78b22c3cbd2e7b332c1ff4111f15c40544b57d1bd4761131a7da50dff001174283444352d5e6400a1a6caec16758194a071dedc13f9d1cb9c8bb2d3411 WHIRLPOOL 5acacafd34233f8ec53dec74b938d960ebb1e59931dfd2d39df9bb3a1d12fbc82588bf4054dcb03dfd7ea096fec11ba372af3417aab44ef4df38929aa697303d
26 DIST adobe-flash-11.2.202.559.x86_64.tar.gz 7275447 SHA256 ebba1e03aa2e191811a6165e2dc1b3cdda49cc855399f07bc9786421c40308b6 SHA512 8ef12946aafdaea6f7af16ca4f52c7f0abbf164c1a0539de2631b404112e7fd43bcef295f4fc3cf7b99876c859efc14a9826c2fa81ce23ab8aee237ea882a8e1 WHIRLPOOL 1d77419f6123a5bbf7412591b86d5c72c6733cf76f9f0ce6fbc36bab061c4c85e8315377ba11b1306158c34534a9b96fe6365379277f85419d4a9cd480ed2e54
27
28 diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.554.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.554.ebuild
29 deleted file mode 100644
30 index a77fb11..0000000
31 --- a/www-plugins/adobe-flash/adobe-flash-11.2.202.554.ebuild
32 +++ /dev/null
33 @@ -1,234 +0,0 @@
34 -# Copyright 1999-2015 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=5
39 -inherit nsplugins toolchain-funcs versionator 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 -"
46 -
47 -AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
48 -AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters"
49 -PV_M=$(get_major_version)
50 -AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
51 -AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
52 -AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
53 -
54 -SRC_URI="
55 - abi_x86_32? (
56 - !debug? ( ${AF_32_URI} )
57 - debug? ( ${AF_32_DB_URI} )
58 - )
59 - abi_x86_64? ( ${AF_64_URI} )
60 -"
61 -IUSE="debug kde selinux cpu_flags_x86_sse2"
62 -REQUIRED_USE="
63 - cpu_flags_x86_sse2
64 - debug? ( abi_x86_32 )
65 - || ( abi_x86_64 abi_x86_32 )
66 -"
67 -SLOT="0"
68 -
69 -KEYWORDS="-* amd64 x86"
70 -LICENSE="AdobeFlash-11.x"
71 -RESTRICT="strip mirror"
72 -
73 -S="${WORKDIR}"
74 -
75 -NATIVE_DEPS="
76 - dev-libs/atk
77 - dev-libs/glib:2
78 - dev-libs/nspr
79 - dev-libs/nss
80 - kde? (
81 - dev-qt/qtcore:4
82 - dev-qt/qtdbus:4
83 - dev-qt/qtgui:4
84 - dev-qt/qtsvg:4
85 - kde-base/kdelibs
86 - x11-libs/libICE
87 - x11-libs/libSM
88 - x11-libs/libXau
89 - x11-libs/libXdmcp
90 - x11-libs/libXext
91 - x11-libs/libXft
92 - x11-libs/libXpm
93 - )
94 - media-libs/fontconfig
95 - media-libs/freetype
96 - >=sys-libs/glibc-2.4
97 - x11-libs/cairo
98 - x11-libs/gdk-pixbuf
99 - x11-libs/gtk+:2
100 - x11-libs/libX11
101 - x11-libs/libXcursor
102 - x11-libs/libXext
103 - x11-libs/libXrender
104 - x11-libs/libXt
105 - x11-libs/pango
106 -"
107 -
108 -DEPEND="
109 - amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
110 -"
111 -RDEPEND="
112 - ${DEPEND}
113 - abi_x86_64? ( ${NATIVE_DEPS} )
114 - abi_x86_32? (
115 - amd64? (
116 - >=dev-libs/atk-2.10.0[abi_x86_32(-)]
117 - >=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
118 - >=dev-libs/nspr-4.10.4[abi_x86_32(-)]
119 - >=dev-libs/nss-3.15.4[abi_x86_32(-)]
120 - >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
121 - >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
122 - >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
123 - >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
124 - >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
125 - >=x11-libs/libX11-1.6.2[abi_x86_32(-)]
126 - >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
127 - >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
128 - >=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
129 - >=x11-libs/libXt-1.1.4[abi_x86_32(-)]
130 - >=x11-libs/pango-1.36.3[abi_x86_32(-)]
131 - )
132 - x86? ( ${NATIVE_DEPS} )
133 - )
134 - || ( media-fonts/liberation-fonts media-fonts/corefonts )
135 - selinux? ( sec-policy/selinux-flash )
136 -"
137 -
138 -# Ignore QA warnings in these closed-source binaries, since we can't fix them:
139 -QA_PREBUILT="usr/*"
140 -
141 -any_cpu_missing_flag() {
142 - local value=${1}
143 - grep '^flags' /proc/cpuinfo | grep -qv "${value}"
144 -}
145 -
146 -pkg_setup() {
147 - unset need_lahf_wrapper
148 - if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then
149 - export need_lahf_wrapper=1
150 - fi
151 -}
152 -
153 -src_unpack() {
154 - local files=( ${A} )
155 -
156 - multilib_src_unpack() {
157 - mkdir -p "${BUILD_DIR}" || die
158 - cd "${BUILD_DIR}" || die
159 -
160 - # we need to filter out the other archive(s)
161 - local other_abi
162 - [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
163 - unpack ${files[@]//*${other_abi}*/}
164 - }
165 -
166 - multilib_parallel_foreach_abi multilib_src_unpack
167 -}
168 -
169 -src_configure() { :; }
170 -
171 -multilib_src_compile() {
172 - if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
173 - # This experimental wrapper, from Maks Verver via bug #268336 should
174 - # emulate the missing lahf instruction affected platforms.
175 - set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \
176 - -oflashplugin-lahf-fix.so "${FILESDIR}/flashplugin-lahf-fix.c"
177 - echo "${@}" >&2
178 - "${@}" || die "Compile of flashplugin-lahf-fix.so failed"
179 - fi
180 -}
181 -
182 -multilib_src_install() {
183 - # PLUGINS_DIR comes from nsplugins.eclass
184 - exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
185 - doexe libflashplayer.so
186 -
187 - if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
188 - # This experimental wrapper, from Maks Verver via bug #268336 should
189 - # emulate the missing lahf instruction affected platforms.
190 - doexe flashplugin-lahf-fix.so
191 - fi
192 -
193 - if multilib_is_native_abi; then
194 - if use kde; then
195 - local pkglibdir=lib
196 - [[ -d usr/lib64 ]] && pkglibdir=lib64
197 -
198 - exeinto /usr/$(get_libdir)/kde4
199 - doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so
200 - insinto /usr/share/kde4/services
201 - doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
202 - else
203 - # No KDE applet, so allow the GTK utility to show up in KDE:
204 - sed -i usr/share/applications/flash-player-properties.desktop \
205 - -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
206 - fi
207 -
208 - # The userland 'flash-player-properties' standalone app:
209 - dobin usr/bin/flash-player-properties
210 -
211 - # Icon and .desktop for 'flash-player-properties'
212 - insinto /usr/share
213 - doins -r usr/share/{icons,applications}
214 - dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
215 - /usr/share/pixmaps/flash-player-properties.png
216 - fi
217 -
218 - # The magic config file!
219 - insinto "/etc/adobe"
220 - doins "${FILESDIR}/mms.cfg"
221 -}
222 -
223 -unregister_pluginwrapper() {
224 - # TODO: Perhaps parse the output of 'nspluginwrapper -l'
225 - # TODO: However, the 64b flash plugin makes
226 - # TODO: 'nspluginwrapper -l' segfault.
227 - local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so"
228 - if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then
229 - einfo "Removing 32-bit plugin wrapper"
230 - nspluginwrapper -r "${FLASH_WRAPPER}"
231 - fi
232 -}
233 -
234 -pkg_postinst() {
235 - if use amd64 ; then
236 - if [[ ${need_lahf_wrapper} ]]; then
237 - ewarn "Your processor does not support the 'lahf' instruction which is used"
238 - ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
239 - ewarn "should allow this plugin to run. If you encounter problems, please"
240 - ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
241 - ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]"
242 - elog
243 - fi
244 - # needed to clean up upgrades from older installs
245 - if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then
246 - unregister_pluginwrapper
247 - fi
248 - if has_version 'www-plugins/nspluginwrapper'; then
249 - if use abi_x86_32 && ! use abi_x86_64; then
250 - einfo "nspluginwrapper detected: Installing plugin wrapper"
251 - local oldabi="${ABI}"
252 - ABI="x86"
253 - local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so"
254 - nspluginwrapper -i "${FLASH_SOURCE}"
255 - ABI="${oldabi}"
256 - fi
257 - elif use abi_x86_32; then
258 - elog "To use the 32-bit flash player in a native 64-bit browser,"
259 - elog "you must install www-plugins/nspluginwrapper"
260 - fi
261 - fi
262 -}
263 -
264 -pkg_prerm() {
265 - use amd64 && use abi_x86_32 && ! use abi_x86_64 && \
266 - unregister_pluginwrapper
267 -}