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

Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-plugins/adobe-flash: adobe-flash-11.2.202.336.ebuild ChangeLog
Date: Tue, 04 Feb 2014 21:57:49
Message-Id: 20140204215743.3A0C02004C@flycatcher.gentoo.org
1 jer 14/02/04 21:57:43
2
3 Modified: ChangeLog
4 Added: adobe-flash-11.2.202.336.ebuild
5 Log:
6 Version bump (bug #500313).
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
9
10 Revision Changes Path
11 1.232 www-plugins/adobe-flash/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.232&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?rev=1.232&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/ChangeLog?r1=1.231&r2=1.232
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v
20 retrieving revision 1.231
21 retrieving revision 1.232
22 diff -u -r1.231 -r1.232
23 --- ChangeLog 17 Jan 2014 14:45:46 -0000 1.231
24 +++ ChangeLog 4 Feb 2014 21:57:43 -0000 1.232
25 @@ -1,6 +1,11 @@
26 # ChangeLog for www-plugins/adobe-flash
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.231 2014/01/17 14:45:46 jer Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.232 2014/02/04 21:57:43 jer Exp $
30 +
31 +*adobe-flash-11.2.202.336 (04 Feb 2014)
32 +
33 + 04 Feb 2014; Jeroen Roovers <jer@g.o> +adobe-flash-11.2.202.336.ebuild:
34 + Version bump (bug #500313).
35
36 17 Jan 2014; Jeroen Roovers <jer@g.o> -adobe-flash-11.2.202.332.ebuild:
37 Old.
38
39
40
41 1.1 www-plugins/adobe-flash/adobe-flash-11.2.202.336.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.336.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.336.ebuild?rev=1.1&content-type=text/plain
45
46 Index: adobe-flash-11.2.202.336.ebuild
47 ===================================================================
48 # Copyright 1999-2014 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.336.ebuild,v 1.1 2014/02/04 21:57:43 jer Exp $
51
52 EAPI=5
53 inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
54
55 DESCRIPTION="Adobe Flash Player"
56 HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
57
58 AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
59 AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters"
60 PV_M=$(get_major_version)
61 AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
62 AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
63 AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
64
65 SRC_URI="
66 abi_x86_32? (
67 !debug? ( ${AF_32_URI} )
68 debug? ( ${AF_32_DB_URI} )
69 )
70 abi_x86_64? ( ${AF_64_URI} )
71 "
72 IUSE="debug kde selinux sse2"
73 REQUIRED_USE="
74 sse2 debug? ( abi_x86_32 )
75 || ( abi_x86_64 abi_x86_32 )
76 "
77 SLOT="0"
78
79 KEYWORDS="-* ~amd64 ~x86"
80 LICENSE="AdobeFlash-11.x"
81 RESTRICT="strip mirror"
82
83 S="${WORKDIR}"
84
85 NATIVE_DEPS="
86 dev-libs/atk
87 dev-libs/glib:2
88 dev-libs/nspr
89 dev-libs/nss
90 kde? (
91 dev-qt/qtcore:4
92 dev-qt/qtdbus:4
93 dev-qt/qtgui:4
94 dev-qt/qtsvg:4
95 kde-base/kdelibs
96 x11-libs/libICE
97 x11-libs/libSM
98 x11-libs/libXau
99 x11-libs/libXdmcp
100 x11-libs/libXext
101 x11-libs/libXft
102 x11-libs/libXpm
103 )
104 media-libs/fontconfig
105 media-libs/freetype
106 >=sys-libs/glibc-2.4
107 x11-libs/cairo
108 x11-libs/gdk-pixbuf
109 x11-libs/gtk+:2
110 x11-libs/libX11
111 x11-libs/libXcursor
112 x11-libs/libXext
113 x11-libs/libXrender
114 x11-libs/libXt
115 x11-libs/pango
116 "
117
118 DEPEND="
119 amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
120 selinux? ( sec-policy/selinux-flash )
121 "
122 RDEPEND="
123 ${DEPEND}
124 abi_x86_64? ( ${NATIVE_DEPS} )
125 abi_x86_32? (
126 amd64? (
127 || (
128 (
129 dev-libs/atk[abi_x86_32(-)]
130 x11-libs/cairo[abi_x86_32(-)]
131 x11-libs/gdk-pixbuf[abi_x86_32(-)]
132 x11-libs/gtk+:2[abi_x86_32(-)]
133 x11-libs/pango[abi_x86_32(-)]
134 )
135 app-emulation/emul-linux-x86-gtklibs
136 )
137 || (
138 (
139 dev-libs/glib:2[abi_x86_32(-)]
140 dev-libs/nspr[abi_x86_32(-)]
141 dev-libs/nss[abi_x86_32(-)]
142 )
143 app-emulation/emul-linux-x86-baselibs
144 )
145 || (
146 (
147 media-libs/fontconfig[abi_x86_32(-)]
148 media-libs/freetype[abi_x86_32(-)]
149 x11-libs/libX11[abi_x86_32(-)]
150 x11-libs/libXcursor[abi_x86_32(-)]
151 x11-libs/libXext[abi_x86_32(-)]
152 x11-libs/libXrender[abi_x86_32(-)]
153 x11-libs/libXt[abi_x86_32(-)]
154 )
155 app-emulation/emul-linux-x86-xlibs
156 )
157 )
158 x86? ( ${NATIVE_DEPS} )
159 )
160 || ( media-fonts/liberation-fonts media-fonts/corefonts )
161 "
162
163 # Ignore QA warnings in these closed-source binaries, since we can't fix them:
164 QA_PREBUILT="usr/*"
165
166 any_cpu_missing_flag() {
167 local value=${1}
168 grep '^flags' /proc/cpuinfo | grep -qv "${value}"
169 }
170
171 pkg_setup() {
172 unset need_lahf_wrapper
173 if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then
174 export need_lahf_wrapper=1
175 fi
176 }
177
178 src_unpack() {
179 local files=( ${A} )
180
181 multilib_src_unpack() {
182 mkdir -p "${BUILD_DIR}" || die
183 cd "${BUILD_DIR}" || die
184
185 # we need to filter out the other archive(s)
186 local other_abi
187 [[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
188 unpack ${files[@]//*${other_abi}*/}
189 }
190
191 multilib_parallel_foreach_abi multilib_src_unpack
192 }
193
194 src_configure() { :; }
195
196 multilib_src_compile() {
197 if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
198 # This experimental wrapper, from Maks Verver via bug #268336 should
199 # emulate the missing lahf instruction affected platforms.
200 set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \
201 -oflashplugin-lahf-fix.so "${FILESDIR}/flashplugin-lahf-fix.c"
202 echo "${@}" >&2
203 "${@}" || die "Compile of flashplugin-lahf-fix.so failed"
204 fi
205 }
206
207 multilib_src_install() {
208 # PLUGINS_DIR comes from nsplugins.eclass
209 exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
210 doexe libflashplayer.so
211
212 if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
213 # This experimental wrapper, from Maks Verver via bug #268336 should
214 # emulate the missing lahf instruction affected platforms.
215 doexe flashplugin-lahf-fix.so
216 fi
217
218 if multilib_build_binaries; then
219 if use kde; then
220 local pkglibdir=lib
221 [[ -d usr/lib64 ]] && pkglibdir=lib64
222
223 exeinto /usr/$(get_libdir)/kde4
224 doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so
225 insinto /usr/share/kde4/services
226 doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
227 else
228 # No KDE applet, so allow the GTK utility to show up in KDE:
229 sed -i usr/share/applications/flash-player-properties.desktop \
230 -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
231 fi
232
233 # The userland 'flash-player-properties' standalone app:
234 dobin usr/bin/flash-player-properties
235
236 # Icon and .desktop for 'flash-player-properties'
237 insinto /usr/share
238 doins -r usr/share/{icons,applications}
239 dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
240 /usr/share/pixmaps/flash-player-properties.png
241 fi
242
243 # The magic config file!
244 insinto "/etc/adobe"
245 doins "${FILESDIR}/mms.cfg"
246 }
247
248 unregister_pluginwrapper() {
249 # TODO: Perhaps parse the output of 'nspluginwrapper -l'
250 # TODO: However, the 64b flash plugin makes
251 # TODO: 'nspluginwrapper -l' segfault.
252 local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so"
253 if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then
254 einfo "Removing 32-bit plugin wrapper"
255 nspluginwrapper -r "${FLASH_WRAPPER}"
256 fi
257 }
258
259 pkg_postinst() {
260 if use amd64 ; then
261 if [[ ${need_lahf_wrapper} ]]; then
262 ewarn "Your processor does not support the 'lahf' instruction which is used"
263 ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
264 ewarn "should allow this plugin to run. If you encounter problems, please"
265 ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
266 ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]"
267 elog
268 fi
269 # needed to clean up upgrades from older installs
270 if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then
271 unregister_pluginwrapper
272 fi
273 if has_version 'www-plugins/nspluginwrapper'; then
274 if use abi_x86_32 && ! use abi_x86_64; then
275 einfo "nspluginwrapper detected: Installing plugin wrapper"
276 local oldabi="${ABI}"
277 ABI="x86"
278 local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so"
279 nspluginwrapper -i "${FLASH_SOURCE}"
280 ABI="${oldabi}"
281 fi
282 elif use abi_x86_32; then
283 elog "To use the 32-bit flash player in a native 64-bit browser,"
284 elog "you must install www-plugins/nspluginwrapper"
285 fi
286 fi
287 }
288
289 pkg_prerm() {
290 use amd64 && use abi_x86_32 && ! use abi_x86_64 && \
291 unregister_pluginwrapper
292 }
Report Message
Find on MARC Find on Google Groups