Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/wine: wine-1.3.16.ebuild ChangeLog wine-1.3.17.ebuild
Date: Mon, 04 Apr 2011 04:35:28
Message-Id: 20110404043516.B631020054@flycatcher.gentoo.org
1 vapier 11/04/04 04:35:16
2
3 Modified: ChangeLog
4 Added: wine-1.3.16.ebuild wine-1.3.17.ebuild
5 Log:
6 Version bump #361741 by Jesse Adelman.
7
8 (Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.356 app-emulation/wine/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.356&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.356&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.355&r2=1.356
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v
20 retrieving revision 1.355
21 retrieving revision 1.356
22 diff -u -r1.355 -r1.356
23 --- ChangeLog 27 Mar 2011 17:34:34 -0000 1.355
24 +++ ChangeLog 4 Apr 2011 04:35:16 -0000 1.356
25 @@ -1,6 +1,13 @@
26 # ChangeLog for app-emulation/wine
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.355 2011/03/27 17:34:34 ssuominen Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.356 2011/04/04 04:35:16 vapier Exp $
30 +
31 +*wine-1.3.17 (04 Apr 2011)
32 +*wine-1.3.16 (04 Apr 2011)
33 +
34 + 04 Apr 2011; Mike Frysinger <vapier@g.o> +wine-1.3.16.ebuild,
35 + +wine-1.3.17.ebuild:
36 + Version bump #361741 by Jesse Adelman.
37
38 27 Mar 2011; Samuli Suominen <ssuominen@g.o> metadata.xml:
39 Move USE="hal" description here from use.desc.
40
41
42
43 1.1 app-emulation/wine/wine-1.3.16.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.16.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.16.ebuild?rev=1.1&content-type=text/plain
47
48 Index: wine-1.3.16.ebuild
49 ===================================================================
50 # Copyright 1999-2011 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.16.ebuild,v 1.1 2011/04/04 04:35:16 vapier Exp $
53
54 EAPI="2"
55
56 inherit eutils flag-o-matic multilib
57
58 if [[ ${PV} == "9999" ]] ; then
59 EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
60 inherit git autotools
61 SRC_URI=""
62 #KEYWORDS=""
63 else
64 AUTOTOOLS_AUTO_DEPEND="no"
65 inherit autotools
66 MY_P="${PN}-${PV/_/-}"
67 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
68 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
69 S=${WORKDIR}/${MY_P}
70 fi
71
72 pulse_patches() { echo "$1"/winepulse-{0.39,configure.ac-1.3.10,winecfg-1.3.11}.patch ; }
73 GV="1.1.0"
74 DESCRIPTION="free implementation of Windows(tm) on Unix"
75 HOMEPAGE="http://www.winehq.org/"
76 SRC_URI="${SRC_URI}
77 gecko? (
78 mirror://sourceforge/wine/wine_gecko-${GV}-x86.cab
79 win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.cab )
80 )
81 pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )"
82
83 LICENSE="LGPL-2.1"
84 SLOT="0"
85 IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hal jack jpeg lcms ldap mousewarp mp3 nas ncurses nls openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype +win32 +win64 +X xcomposite xinerama xml"
86 RESTRICT="test" #72375
87
88 MLIB_DEPS="amd64? (
89 truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
90 X? (
91 >=app-emulation/emul-linux-x86-xlibs-2.1
92 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?]
93 )
94 openal? ( app-emulation/emul-linux-x86-sdl )
95 opengl? ( app-emulation/emul-linux-x86-opengl )
96 app-emulation/emul-linux-x86-baselibs
97 >=sys-kernel/linux-headers-2.6
98 )"
99 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
100 perl? ( dev-lang/perl dev-perl/XML-Simple )
101 capi? ( net-dialup/capi4k-utils )
102 ncurses? ( >=sys-libs/ncurses-5.2 )
103 fontconfig? ( media-libs/fontconfig )
104 gphoto2? ( media-libs/libgphoto2 )
105 jack? ( media-sound/jack-audio-connection-kit )
106 openal? ( media-libs/openal )
107 dbus? ( sys-apps/dbus )
108 gnutls? ( net-libs/gnutls )
109 gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
110 hal? ( sys-apps/hal )
111 X? (
112 x11-libs/libXcursor
113 x11-libs/libXrandr
114 x11-libs/libXi
115 x11-libs/libXmu
116 x11-libs/libXxf86vm
117 x11-apps/xmessage
118 )
119 xinerama? ( x11-libs/libXinerama )
120 alsa? ( media-libs/alsa-lib )
121 esd? ( media-sound/esound )
122 nas? ( media-libs/nas )
123 cups? ( net-print/cups )
124 opengl? ( virtual/opengl )
125 pulseaudio? ( media-sound/pulseaudio )
126 gsm? ( media-sound/gsm )
127 jpeg? ( virtual/jpeg )
128 ldap? ( net-nds/openldap )
129 lcms? ( =media-libs/lcms-1* )
130 mp3? ( >=media-sound/mpg123-1.5.0 )
131 nls? ( sys-devel/gettext )
132 samba? ( >=net-fs/samba-3.0.25 )
133 xml? ( dev-libs/libxml2 dev-libs/libxslt )
134 scanner? ( media-gfx/sane-backends )
135 ssl? ( dev-libs/openssl )
136 png? ( media-libs/libpng )
137 !win64? ( ${MLIB_DEPS} )
138 win32? ( ${MLIB_DEPS} )
139 xcomposite? ( x11-libs/libXcomposite ) "
140 DEPEND="${RDEPEND}
141 pulseaudio? ( ${AUTOTOOLS_DEPEND} )
142 X? (
143 x11-proto/inputproto
144 x11-proto/xextproto
145 x11-proto/xf86vidmodeproto
146 )
147 xinerama? ( x11-proto/xineramaproto )
148 sys-devel/bison
149 sys-devel/flex"
150
151 src_unpack() {
152 if use win64 ; then
153 [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
154 && die "you need gcc-4.4+ to build 64bit wine"
155 fi
156
157 if [[ ${PV} == "9999" ]] ; then
158 git_src_unpack
159 else
160 unpack ${MY_P}.tar.bz2
161 fi
162 }
163
164 src_prepare() {
165 use mousewarp && epatch "${FILESDIR}"/${PN}-1.3.16-mouse-warp.patch
166 if use pulseaudio ; then
167 EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
168 eautoreconf
169 fi
170 epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
171 epatch_user #282735
172 sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
173 sed -i '/^MimeType/d' tools/wine.desktop || die #117785
174 }
175
176 do_configure() {
177 local builddir="${WORKDIR}/wine$1"
178 mkdir -p "${builddir}"
179 pushd "${builddir}" >/dev/null
180
181 ECONF_SOURCE=${S} \
182 econf \
183 --sysconfdir=/etc/wine \
184 $(use_with alsa) \
185 $(use_with capi) \
186 $(use_with lcms cms) \
187 $(use_with cups) \
188 $(use_with ncurses curses) \
189 $(use_with esd) \
190 $(use_with fontconfig) \
191 $(use_with gnutls) \
192 $(use_with gphoto2 gphoto) \
193 $(use_with gsm) \
194 $(use_with gstreamer) \
195 $(! use dbus && echo --without-hal || use_with hal) \
196 $(use_with jack) \
197 $(use_with jpeg) \
198 $(use_with ldap) \
199 $(use_with mp3 mpg123) \
200 $(use_with nas) \
201 $(use_with nls gettextpo) \
202 $(use_with openal) \
203 $(use_with opengl) \
204 $(use_with ssl openssl) \
205 $(use_with oss) \
206 $(use_with png) \
207 $(use_with threads pthread) \
208 $(use pulseaudio && use_with pulseaudio pulse) \
209 $(use_with scanner sane) \
210 $(use_enable test tests) \
211 $(use_with truetype freetype) \
212 $(use_with X x) \
213 $(use_with xcomposite) \
214 $(use_with xinerama) \
215 $(use_with xml) \
216 $(use_with xml xslt) \
217 $2
218
219 emake -j1 depend || die "depend"
220
221 popd >/dev/null
222 }
223 src_configure() {
224 export LDCONFIG=/bin/true
225 use custom-cflags || strip-flags
226
227 if use win64 ; then
228 do_configure 64 --enable-win64
229 use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
230 else
231 ABI=x86 do_configure 32 --disable-win64
232 fi
233 }
234
235 src_compile() {
236 local b
237 for b in 64 32 ; do
238 local builddir="${WORKDIR}/wine${b}"
239 [[ -d ${builddir} ]] || continue
240 emake -C "${builddir}" all || die
241 done
242 }
243
244 src_install() {
245 local b
246 for b in 64 32 ; do
247 local builddir="${WORKDIR}/wine${b}"
248 [[ -d ${builddir} ]] || continue
249 emake -C "${builddir}" install DESTDIR="${D}" || die
250 done
251 dodoc ANNOUNCE AUTHORS README
252 if use gecko ; then
253 insinto /usr/share/wine/gecko
254 doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
255 use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
256 fi
257 if ! use perl ; then
258 rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
259 fi
260 }
261
262 pkg_postinst() {
263 paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
264 }
265
266
267
268 1.1 app-emulation/wine/wine-1.3.17.ebuild
269
270 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.17.ebuild?rev=1.1&view=markup
271 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.17.ebuild?rev=1.1&content-type=text/plain
272
273 Index: wine-1.3.17.ebuild
274 ===================================================================
275 # Copyright 1999-2011 Gentoo Foundation
276 # Distributed under the terms of the GNU General Public License v2
277 # $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.17.ebuild,v 1.1 2011/04/04 04:35:16 vapier Exp $
278
279 EAPI="2"
280
281 inherit eutils flag-o-matic multilib
282
283 if [[ ${PV} == "9999" ]] ; then
284 EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
285 inherit git autotools
286 SRC_URI=""
287 #KEYWORDS=""
288 else
289 AUTOTOOLS_AUTO_DEPEND="no"
290 inherit autotools
291 MY_P="${PN}-${PV/_/-}"
292 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
293 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
294 S=${WORKDIR}/${MY_P}
295 fi
296
297 pulse_patches() { echo "$1"/winepulse-{0.39,configure.ac-1.3.10,winecfg-1.3.11}.patch ; }
298 GV="1.1.0"
299 DESCRIPTION="free implementation of Windows(tm) on Unix"
300 HOMEPAGE="http://www.winehq.org/"
301 SRC_URI="${SRC_URI}
302 gecko? (
303 mirror://sourceforge/wine/wine_gecko-${GV}-x86.cab
304 win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.cab )
305 )
306 pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )"
307
308 LICENSE="LGPL-2.1"
309 SLOT="0"
310 IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hal jack jpeg lcms ldap mousewarp mp3 nas ncurses nls openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype +win32 +win64 +X xcomposite xinerama xml"
311 RESTRICT="test" #72375
312
313 MLIB_DEPS="amd64? (
314 truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
315 X? (
316 >=app-emulation/emul-linux-x86-xlibs-2.1
317 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?]
318 )
319 openal? ( app-emulation/emul-linux-x86-sdl )
320 opengl? ( app-emulation/emul-linux-x86-opengl )
321 app-emulation/emul-linux-x86-baselibs
322 >=sys-kernel/linux-headers-2.6
323 )"
324 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
325 perl? ( dev-lang/perl dev-perl/XML-Simple )
326 capi? ( net-dialup/capi4k-utils )
327 ncurses? ( >=sys-libs/ncurses-5.2 )
328 fontconfig? ( media-libs/fontconfig )
329 gphoto2? ( media-libs/libgphoto2 )
330 jack? ( media-sound/jack-audio-connection-kit )
331 openal? ( media-libs/openal )
332 dbus? ( sys-apps/dbus )
333 gnutls? ( net-libs/gnutls )
334 gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
335 hal? ( sys-apps/hal )
336 X? (
337 x11-libs/libXcursor
338 x11-libs/libXrandr
339 x11-libs/libXi
340 x11-libs/libXmu
341 x11-libs/libXxf86vm
342 x11-apps/xmessage
343 )
344 xinerama? ( x11-libs/libXinerama )
345 alsa? ( media-libs/alsa-lib )
346 esd? ( media-sound/esound )
347 nas? ( media-libs/nas )
348 cups? ( net-print/cups )
349 opengl? ( virtual/opengl )
350 pulseaudio? ( media-sound/pulseaudio )
351 gsm? ( media-sound/gsm )
352 jpeg? ( virtual/jpeg )
353 ldap? ( net-nds/openldap )
354 lcms? ( =media-libs/lcms-1* )
355 mp3? ( >=media-sound/mpg123-1.5.0 )
356 nls? ( sys-devel/gettext )
357 samba? ( >=net-fs/samba-3.0.25 )
358 xml? ( dev-libs/libxml2 dev-libs/libxslt )
359 scanner? ( media-gfx/sane-backends )
360 ssl? ( dev-libs/openssl )
361 png? ( media-libs/libpng )
362 !win64? ( ${MLIB_DEPS} )
363 win32? ( ${MLIB_DEPS} )
364 xcomposite? ( x11-libs/libXcomposite ) "
365 DEPEND="${RDEPEND}
366 pulseaudio? ( ${AUTOTOOLS_DEPEND} )
367 X? (
368 x11-proto/inputproto
369 x11-proto/xextproto
370 x11-proto/xf86vidmodeproto
371 )
372 xinerama? ( x11-proto/xineramaproto )
373 sys-devel/bison
374 sys-devel/flex"
375
376 src_unpack() {
377 if use win64 ; then
378 [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
379 && die "you need gcc-4.4+ to build 64bit wine"
380 fi
381
382 if [[ ${PV} == "9999" ]] ; then
383 git_src_unpack
384 else
385 unpack ${MY_P}.tar.bz2
386 fi
387 }
388
389 src_prepare() {
390 use mousewarp && epatch "${FILESDIR}"/${PN}-1.3.16-mouse-warp.patch
391 if use pulseaudio ; then
392 EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
393 eautoreconf
394 fi
395 epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
396 epatch_user #282735
397 sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
398 sed -i '/^MimeType/d' tools/wine.desktop || die #117785
399 }
400
401 do_configure() {
402 local builddir="${WORKDIR}/wine$1"
403 mkdir -p "${builddir}"
404 pushd "${builddir}" >/dev/null
405
406 ECONF_SOURCE=${S} \
407 econf \
408 --sysconfdir=/etc/wine \
409 $(use_with alsa) \
410 $(use_with capi) \
411 $(use_with lcms cms) \
412 $(use_with cups) \
413 $(use_with ncurses curses) \
414 $(use_with esd) \
415 $(use_with fontconfig) \
416 $(use_with gnutls) \
417 $(use_with gphoto2 gphoto) \
418 $(use_with gsm) \
419 $(use_with gstreamer) \
420 $(! use dbus && echo --without-hal || use_with hal) \
421 $(use_with jack) \
422 $(use_with jpeg) \
423 $(use_with ldap) \
424 $(use_with mp3 mpg123) \
425 $(use_with nas) \
426 $(use_with nls gettextpo) \
427 $(use_with openal) \
428 $(use_with opengl) \
429 $(use_with ssl openssl) \
430 $(use_with oss) \
431 $(use_with png) \
432 $(use_with threads pthread) \
433 $(use pulseaudio && use_with pulseaudio pulse) \
434 $(use_with scanner sane) \
435 $(use_enable test tests) \
436 $(use_with truetype freetype) \
437 $(use_with X x) \
438 $(use_with xcomposite) \
439 $(use_with xinerama) \
440 $(use_with xml) \
441 $(use_with xml xslt) \
442 $2
443
444 emake -j1 depend || die "depend"
445
446 popd >/dev/null
447 }
448 src_configure() {
449 export LDCONFIG=/bin/true
450 use custom-cflags || strip-flags
451
452 if use win64 ; then
453 do_configure 64 --enable-win64
454 use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
455 else
456 ABI=x86 do_configure 32 --disable-win64
457 fi
458 }
459
460 src_compile() {
461 local b
462 for b in 64 32 ; do
463 local builddir="${WORKDIR}/wine${b}"
464 [[ -d ${builddir} ]] || continue
465 emake -C "${builddir}" all || die
466 done
467 }
468
469 src_install() {
470 local b
471 for b in 64 32 ; do
472 local builddir="${WORKDIR}/wine${b}"
473 [[ -d ${builddir} ]] || continue
474 emake -C "${builddir}" install DESTDIR="${D}" || die
475 done
476 dodoc ANNOUNCE AUTHORS README
477 if use gecko ; then
478 insinto /usr/share/wine/gecko
479 doins "${DISTDIR}"/wine_gecko-${GV}-x86.cab || die
480 use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.cab || die ; }
481 fi
482 if ! use perl ; then
483 rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
484 fi
485 }
486
487 pkg_postinst() {
488 paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
489 }