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