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

Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/wine: ChangeLog wine-1.5.20.ebuild wine-9999.ebuild
Date: Mon, 31 Dec 2012 07:38:57
Message-Id: 20121231073844.7BE4A2171D@flycatcher.gentoo.org
1 tetromino 12/12/31 07:38:44
2
3 Modified: ChangeLog wine-1.5.20.ebuild wine-9999.ebuild
4 Log:
5 Completely disable pulseaudio patches for the live 9999 ebuild since it breaks too often (e.g. bug #448970). Remove the vanilla USE flag since it is now superfluous.
6
7 (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
8
9 Revision Changes Path
10 1.445 app-emulation/wine/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.445&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.445&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.444&r2=1.445
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v
19 retrieving revision 1.444
20 retrieving revision 1.445
21 diff -u -r1.444 -r1.445
22 --- ChangeLog 26 Dec 2012 22:25:05 -0000 1.444
23 +++ ChangeLog 31 Dec 2012 07:38:44 -0000 1.445
24 @@ -1,6 +1,12 @@
25 # ChangeLog for app-emulation/wine
26 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.444 2012/12/26 22:25:05 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.445 2012/12/31 07:38:44 tetromino Exp $
29 +
30 + 31 Dec 2012; Alexandre Rostovtsev <tetromino@g.o> wine-1.5.20.ebuild,
31 + wine-9999.ebuild:
32 + Completely disable pulseaudio patches for the live 9999 ebuild since it
33 + breaks too often (e.g. bug #448970). Remove the vanilla USE flag since it is
34 + now superfluous.
35
36 26 Dec 2012; Mike Frysinger <vapier@g.o> metadata.xml:
37 better wording to warn people off
38
39
40
41 1.4 app-emulation/wine/wine-1.5.20.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild?rev=1.4&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild?rev=1.4&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild?r1=1.3&r2=1.4
46
47 Index: wine-1.5.20.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v
50 retrieving revision 1.3
51 retrieving revision 1.4
52 diff -u -r1.3 -r1.4
53 --- wine-1.5.20.ebuild 26 Dec 2012 22:19:44 -0000 1.3
54 +++ wine-1.5.20.ebuild 31 Dec 2012 07:38:44 -0000 1.4
55 @@ -1,6 +1,6 @@
56 # Copyright 1999-2012 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v 1.3 2012/12/26 22:19:44 vapier Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.20.ebuild,v 1.4 2012/12/31 07:38:44 tetromino Exp $
60
61 EAPI="5"
62
63 @@ -35,18 +35,18 @@
64
65 LICENSE="LGPL-2.1"
66 SLOT="0"
67 -IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink pulseaudio samba scanner selinux ssl test +threads +truetype udisks vanilla v4l +win32 +win64 +X xcomposite xinerama xml"
68 +IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
69 +[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
70 REQUIRED_USE="elibc_glibc? ( threads )
71 mono? ( || ( win32 !win64 ) )
72 - osmesa? ( opengl )
73 - vanilla? ( !pulseaudio )" #286560
74 + osmesa? ( opengl )" #286560
75 RESTRICT="test" #72375
76
77 MLIB_DEPS="amd64? (
78 truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
79 X? (
80 >=app-emulation/emul-linux-x86-xlibs-2.1
81 - >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
82 + >=app-emulation/emul-linux-x86-soundlibs-2.1
83 )
84 mp3? ( app-emulation/emul-linux-x86-soundlibs )
85 odbc? ( app-emulation/emul-linux-x86-db )
86 @@ -95,10 +95,6 @@
87 nls? ( sys-devel/gettext )
88 odbc? ( dev-db/unixODBC:= )
89 osmesa? ( media-libs/mesa[osmesa] )
90 - pulseaudio? (
91 - media-sound/pulseaudio
92 - sys-auth/rtkit
93 - )
94 samba? ( >=net-fs/samba-3.0.25 )
95 selinux? ( sec-policy/selinux-wine )
96 xml? ( dev-libs/libxml2 dev-libs/libxslt )
97 @@ -109,6 +105,11 @@
98 !win64? ( ${MLIB_DEPS} )
99 win32? ( ${MLIB_DEPS} )
100 xcomposite? ( x11-libs/libXcomposite )"
101 +[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
102 + pulseaudio? (
103 + media-sound/pulseaudio
104 + sys-auth/rtkit
105 + )"
106 DEPEND="${RDEPEND}
107 X? (
108 x11-proto/inputproto
109 @@ -144,11 +145,10 @@
110
111 src_prepare() {
112 local md5="$(md5sum server/protocol.def)"
113 - # keep these even if USE=vanilla: they are needed to build
114 epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
115 epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
116 epatch "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
117 - use vanilla || epatch "../${PULSE_PATCHES}"/*.patch #421365
118 + [[ ${PV} == "9999" ]] || epatch "../${PULSE_PATCHES}"/*.patch #421365
119 epatch_user #282735
120 if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
121 einfo "server/protocol.def was patched; running tools/make_requests"
122 @@ -156,7 +156,7 @@
123 fi
124 eautoreconf
125 sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
126 - use vanilla || sed -i '/^MimeType/d' tools/wine.desktop || die #117785
127 + sed -i '/^MimeType/d' tools/wine.desktop || die #117785
128 }
129
130 do_configure() {
131 @@ -164,6 +164,9 @@
132 mkdir -p "${builddir}"
133 pushd "${builddir}" >/dev/null
134
135 + local usepulse
136 + [[ ${PV} == "9999" ]] || usepulse=$(use_with pulseaudio pulse)
137 +
138 ECONF_SOURCE=${S} \
139 econf \
140 --sysconfdir=/etc/wine \
141 @@ -191,7 +194,7 @@
142 $(use_with oss) \
143 $(use_with png) \
144 $(use_with threads pthread) \
145 - $(usex vanilla "" $(use_with pulseaudio pulse)) \
146 + ${usepulse} \
147 $(use_with scanner sane) \
148 $(use_enable test tests) \
149 $(use_with truetype freetype) \
150
151
152
153 1.127 app-emulation/wine/wine-9999.ebuild
154
155 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?rev=1.127&view=markup
156 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?rev=1.127&content-type=text/plain
157 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?r1=1.126&r2=1.127
158
159 Index: wine-9999.ebuild
160 ===================================================================
161 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v
162 retrieving revision 1.126
163 retrieving revision 1.127
164 diff -u -r1.126 -r1.127
165 --- wine-9999.ebuild 26 Dec 2012 22:19:44 -0000 1.126
166 +++ wine-9999.ebuild 31 Dec 2012 07:38:44 -0000 1.127
167 @@ -1,6 +1,6 @@
168 # Copyright 1999-2012 Gentoo Foundation
169 # Distributed under the terms of the GNU General Public License v2
170 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.126 2012/12/26 22:19:44 vapier Exp $
171 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.127 2012/12/31 07:38:44 tetromino Exp $
172
173 EAPI="5"
174
175 @@ -35,18 +35,18 @@
176
177 LICENSE="LGPL-2.1"
178 SLOT="0"
179 -IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink pulseaudio samba scanner selinux ssl test +threads +truetype udisks vanilla v4l +win32 +win64 +X xcomposite xinerama xml"
180 +IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png +prelink samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
181 +[[ ${PV} == "9999" ]] || IUSE="${IUSE} pulseaudio"
182 REQUIRED_USE="elibc_glibc? ( threads )
183 mono? ( || ( win32 !win64 ) )
184 - osmesa? ( opengl )
185 - vanilla? ( !pulseaudio )" #286560
186 + osmesa? ( opengl )" #286560
187 RESTRICT="test" #72375
188
189 MLIB_DEPS="amd64? (
190 truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
191 X? (
192 >=app-emulation/emul-linux-x86-xlibs-2.1
193 - >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
194 + >=app-emulation/emul-linux-x86-soundlibs-2.1
195 )
196 mp3? ( app-emulation/emul-linux-x86-soundlibs )
197 odbc? ( app-emulation/emul-linux-x86-db )
198 @@ -95,10 +95,6 @@
199 nls? ( sys-devel/gettext )
200 odbc? ( dev-db/unixODBC:= )
201 osmesa? ( media-libs/mesa[osmesa] )
202 - pulseaudio? (
203 - media-sound/pulseaudio
204 - sys-auth/rtkit
205 - )
206 samba? ( >=net-fs/samba-3.0.25 )
207 selinux? ( sec-policy/selinux-wine )
208 xml? ( dev-libs/libxml2 dev-libs/libxslt )
209 @@ -109,6 +105,11 @@
210 !win64? ( ${MLIB_DEPS} )
211 win32? ( ${MLIB_DEPS} )
212 xcomposite? ( x11-libs/libXcomposite )"
213 +[[ ${PV} == "9999" ]] || RDEPEND="${RDEPEND}
214 + pulseaudio? (
215 + media-sound/pulseaudio
216 + sys-auth/rtkit
217 + )"
218 DEPEND="${RDEPEND}
219 X? (
220 x11-proto/inputproto
221 @@ -144,11 +145,10 @@
222
223 src_prepare() {
224 local md5="$(md5sum server/protocol.def)"
225 - # keep these even if USE=vanilla: they are needed to build
226 epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
227 epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
228 epatch "${FILESDIR}"/${PN}-1.5.17-osmesa-check.patch #429386
229 - use vanilla || epatch "../${PULSE_PATCHES}"/*.patch #421365
230 + [[ ${PV} == "9999" ]] || epatch "../${PULSE_PATCHES}"/*.patch #421365
231 epatch_user #282735
232 if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
233 einfo "server/protocol.def was patched; running tools/make_requests"
234 @@ -156,7 +156,7 @@
235 fi
236 eautoreconf
237 sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
238 - use vanilla || sed -i '/^MimeType/d' tools/wine.desktop || die #117785
239 + sed -i '/^MimeType/d' tools/wine.desktop || die #117785
240 }
241
242 do_configure() {
243 @@ -164,6 +164,9 @@
244 mkdir -p "${builddir}"
245 pushd "${builddir}" >/dev/null
246
247 + local usepulse
248 + [[ ${PV} == "9999" ]] || usepulse=$(use_with pulseaudio pulse)
249 +
250 ECONF_SOURCE=${S} \
251 econf \
252 --sysconfdir=/etc/wine \
253 @@ -191,7 +194,7 @@
254 $(use_with oss) \
255 $(use_with png) \
256 $(use_with threads pthread) \
257 - $(usex vanilla "" $(use_with pulseaudio pulse)) \
258 + ${usepulse} \
259 $(use_with scanner sane) \
260 $(use_enable test tests) \
261 $(use_with truetype freetype) \
Report Message
Find on MARC Find on Google Groups