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.23.ebuild ChangeLog wine-1.3.22.ebuild
Date: Wed, 29 Jun 2011 05:03:58
Message-Id: 20110629050347.7A38D20054@flycatcher.gentoo.org
1 vapier 11/06/29 05:03:47
2
3 Modified: ChangeLog
4 Added: wine-1.3.23.ebuild wine-1.3.22.ebuild
5 Log:
6 Version bump #373013 by Andrew Savchenko.
7
8 (Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.368 app-emulation/wine/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.368&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.368&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.367&r2=1.368
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v
20 retrieving revision 1.367
21 retrieving revision 1.368
22 diff -u -r1.367 -r1.368
23 --- ChangeLog 29 Jun 2011 04:56:23 -0000 1.367
24 +++ ChangeLog 29 Jun 2011 05:03:47 -0000 1.368
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.367 2011/06/29 04:56:23 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.368 2011/06/29 05:03:47 vapier Exp $
30 +
31 +*wine-1.3.23 (29 Jun 2011)
32 +*wine-1.3.22 (29 Jun 2011)
33 +
34 + 29 Jun 2011; Mike Frysinger <vapier@g.o> +wine-1.3.22.ebuild,
35 + +wine-1.3.23.ebuild:
36 + Version bump #373013 by Andrew Savchenko.
37
38 29 Jun 2011; Mike Frysinger <vapier@g.o> wine-1.2.2.ebuild,
39 wine-1.2.3.ebuild:
40
41
42
43 1.1 app-emulation/wine/wine-1.3.23.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.23.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.23.ebuild?rev=1.1&content-type=text/plain
47
48 Index: wine-1.3.23.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.23.ebuild,v 1.1 2011/06/29 05:03:47 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.40,configure.ac-1.3.22,winecfg-1.3.11}.patch ; }
73 GV="1.2.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.msi
79 win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
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 mp3 nas ncurses nls openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +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 v4l? ( media-libs/libv4l )
138 !win64? ( ${MLIB_DEPS} )
139 win32? ( ${MLIB_DEPS} )
140 xcomposite? ( x11-libs/libXcomposite ) "
141 DEPEND="${RDEPEND}
142 pulseaudio? ( ${AUTOTOOLS_DEPEND} )
143 X? (
144 x11-proto/inputproto
145 x11-proto/xextproto
146 x11-proto/xf86vidmodeproto
147 )
148 xinerama? ( x11-proto/xineramaproto )
149 sys-devel/bison
150 sys-devel/flex"
151
152 src_unpack() {
153 if use win64 ; then
154 [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
155 && die "you need gcc-4.4+ to build 64bit wine"
156 fi
157
158 if [[ ${PV} == "9999" ]] ; then
159 git_src_unpack
160 else
161 unpack ${MY_P}.tar.bz2
162 fi
163 }
164
165 src_prepare() {
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 v4l) \
213 $(use_with X x) \
214 $(use_with xcomposite) \
215 $(use_with xinerama) \
216 $(use_with xml) \
217 $(use_with xml xslt) \
218 $2
219
220 emake -j1 depend || die "depend"
221
222 popd >/dev/null
223 }
224 src_configure() {
225 export LDCONFIG=/bin/true
226 use custom-cflags || strip-flags
227
228 if use win64 ; then
229 do_configure 64 --enable-win64
230 use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
231 else
232 ABI=x86 do_configure 32 --disable-win64
233 fi
234 }
235
236 src_compile() {
237 local b
238 for b in 64 32 ; do
239 local builddir="${WORKDIR}/wine${b}"
240 [[ -d ${builddir} ]] || continue
241 emake -C "${builddir}" all || die
242 done
243 }
244
245 src_install() {
246 local b
247 for b in 64 32 ; do
248 local builddir="${WORKDIR}/wine${b}"
249 [[ -d ${builddir} ]] || continue
250 emake -C "${builddir}" install DESTDIR="${D}" || die
251 done
252 dodoc ANNOUNCE AUTHORS README
253 if use gecko ; then
254 insinto /usr/share/wine/gecko
255 doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
256 use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
257 fi
258 if ! use perl ; then
259 rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
260 fi
261 }
262
263 pkg_postinst() {
264 paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
265 }
266
267
268
269 1.1 app-emulation/wine/wine-1.3.22.ebuild
270
271 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.22.ebuild?rev=1.1&view=markup
272 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.22.ebuild?rev=1.1&content-type=text/plain
273
274 Index: wine-1.3.22.ebuild
275 ===================================================================
276 # Copyright 1999-2011 Gentoo Foundation
277 # Distributed under the terms of the GNU General Public License v2
278 # $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.22.ebuild,v 1.1 2011/06/29 05:03:47 vapier Exp $
279
280 EAPI="2"
281
282 inherit eutils flag-o-matic multilib
283
284 if [[ ${PV} == "9999" ]] ; then
285 EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
286 inherit git autotools
287 SRC_URI=""
288 #KEYWORDS=""
289 else
290 AUTOTOOLS_AUTO_DEPEND="no"
291 inherit autotools
292 MY_P="${PN}-${PV/_/-}"
293 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
294 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
295 S=${WORKDIR}/${MY_P}
296 fi
297
298 pulse_patches() { echo "$1"/winepulse-{0.40,configure.ac-1.3.22,winecfg-1.3.11}.patch ; }
299 GV="1.2.0"
300 DESCRIPTION="free implementation of Windows(tm) on Unix"
301 HOMEPAGE="http://www.winehq.org/"
302 SRC_URI="${SRC_URI}
303 gecko? (
304 mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
305 win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
306 )
307 pulseaudio? ( `pulse_patches http://art.ified.ca/downloads/winepulse` )"
308
309 LICENSE="LGPL-2.1"
310 SLOT="0"
311 IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm gstreamer hal jack jpeg lcms ldap mp3 nas ncurses nls openal +opengl +oss +perl png pulseaudio samba scanner ssl test +threads +truetype v4l +win32 +win64 +X xcomposite xinerama xml"
312 RESTRICT="test" #72375
313
314 MLIB_DEPS="amd64? (
315 truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
316 X? (
317 >=app-emulation/emul-linux-x86-xlibs-2.1
318 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?]
319 )
320 openal? ( app-emulation/emul-linux-x86-sdl )
321 opengl? ( app-emulation/emul-linux-x86-opengl )
322 app-emulation/emul-linux-x86-baselibs
323 >=sys-kernel/linux-headers-2.6
324 )"
325 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
326 perl? ( dev-lang/perl dev-perl/XML-Simple )
327 capi? ( net-dialup/capi4k-utils )
328 ncurses? ( >=sys-libs/ncurses-5.2 )
329 fontconfig? ( media-libs/fontconfig )
330 gphoto2? ( media-libs/libgphoto2 )
331 jack? ( media-sound/jack-audio-connection-kit )
332 openal? ( media-libs/openal )
333 dbus? ( sys-apps/dbus )
334 gnutls? ( net-libs/gnutls )
335 gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
336 hal? ( sys-apps/hal )
337 X? (
338 x11-libs/libXcursor
339 x11-libs/libXrandr
340 x11-libs/libXi
341 x11-libs/libXmu
342 x11-libs/libXxf86vm
343 x11-apps/xmessage
344 )
345 xinerama? ( x11-libs/libXinerama )
346 alsa? ( media-libs/alsa-lib )
347 esd? ( media-sound/esound )
348 nas? ( media-libs/nas )
349 cups? ( net-print/cups )
350 opengl? ( virtual/opengl )
351 pulseaudio? ( media-sound/pulseaudio )
352 gsm? ( media-sound/gsm )
353 jpeg? ( virtual/jpeg )
354 ldap? ( net-nds/openldap )
355 lcms? ( =media-libs/lcms-1* )
356 mp3? ( >=media-sound/mpg123-1.5.0 )
357 nls? ( sys-devel/gettext )
358 samba? ( >=net-fs/samba-3.0.25 )
359 xml? ( dev-libs/libxml2 dev-libs/libxslt )
360 scanner? ( media-gfx/sane-backends )
361 ssl? ( dev-libs/openssl )
362 png? ( media-libs/libpng )
363 v4l? ( media-libs/libv4l )
364 !win64? ( ${MLIB_DEPS} )
365 win32? ( ${MLIB_DEPS} )
366 xcomposite? ( x11-libs/libXcomposite ) "
367 DEPEND="${RDEPEND}
368 pulseaudio? ( ${AUTOTOOLS_DEPEND} )
369 X? (
370 x11-proto/inputproto
371 x11-proto/xextproto
372 x11-proto/xf86vidmodeproto
373 )
374 xinerama? ( x11-proto/xineramaproto )
375 sys-devel/bison
376 sys-devel/flex"
377
378 src_unpack() {
379 if use win64 ; then
380 [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
381 && die "you need gcc-4.4+ to build 64bit wine"
382 fi
383
384 if [[ ${PV} == "9999" ]] ; then
385 git_src_unpack
386 else
387 unpack ${MY_P}.tar.bz2
388 fi
389 }
390
391 src_prepare() {
392 if use pulseaudio ; then
393 EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
394 eautoreconf
395 fi
396 epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
397 epatch_user #282735
398 sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
399 sed -i '/^MimeType/d' tools/wine.desktop || die #117785
400 }
401
402 do_configure() {
403 local builddir="${WORKDIR}/wine$1"
404 mkdir -p "${builddir}"
405 pushd "${builddir}" >/dev/null
406
407 ECONF_SOURCE=${S} \
408 econf \
409 --sysconfdir=/etc/wine \
410 $(use_with alsa) \
411 $(use_with capi) \
412 $(use_with lcms cms) \
413 $(use_with cups) \
414 $(use_with ncurses curses) \
415 $(use_with esd) \
416 $(use_with fontconfig) \
417 $(use_with gnutls) \
418 $(use_with gphoto2 gphoto) \
419 $(use_with gsm) \
420 $(use_with gstreamer) \
421 $(! use dbus && echo --without-hal || use_with hal) \
422 $(use_with jack) \
423 $(use_with jpeg) \
424 $(use_with ldap) \
425 $(use_with mp3 mpg123) \
426 $(use_with nas) \
427 $(use_with nls gettextpo) \
428 $(use_with openal) \
429 $(use_with opengl) \
430 $(use_with ssl openssl) \
431 $(use_with oss) \
432 $(use_with png) \
433 $(use_with threads pthread) \
434 $(use pulseaudio && use_with pulseaudio pulse) \
435 $(use_with scanner sane) \
436 $(use_enable test tests) \
437 $(use_with truetype freetype) \
438 $(use_with v4l) \
439 $(use_with X x) \
440 $(use_with xcomposite) \
441 $(use_with xinerama) \
442 $(use_with xml) \
443 $(use_with xml xslt) \
444 $2
445
446 emake -j1 depend || die "depend"
447
448 popd >/dev/null
449 }
450 src_configure() {
451 export LDCONFIG=/bin/true
452 use custom-cflags || strip-flags
453
454 if use win64 ; then
455 do_configure 64 --enable-win64
456 use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
457 else
458 ABI=x86 do_configure 32 --disable-win64
459 fi
460 }
461
462 src_compile() {
463 local b
464 for b in 64 32 ; do
465 local builddir="${WORKDIR}/wine${b}"
466 [[ -d ${builddir} ]] || continue
467 emake -C "${builddir}" all || die
468 done
469 }
470
471 src_install() {
472 local b
473 for b in 64 32 ; do
474 local builddir="${WORKDIR}/wine${b}"
475 [[ -d ${builddir} ]] || continue
476 emake -C "${builddir}" install DESTDIR="${D}" || die
477 done
478 dodoc ANNOUNCE AUTHORS README
479 if use gecko ; then
480 insinto /usr/share/wine/gecko
481 doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
482 use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
483 fi
484 if ! use perl ; then
485 rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
486 fi
487 }
488
489 pkg_postinst() {
490 paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
491 }