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