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

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