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: metadata.xml ChangeLog wine-1.3.36.ebuild
Date: Sat, 31 Dec 2011 04:40:26
Message-Id: 20111231044014.05A252004B@flycatcher.gentoo.org
1 tetromino 11/12/31 04:40:14
2
3 Modified: metadata.xml ChangeLog
4 Added: wine-1.3.36.ebuild
5 Log:
6 Version bump, see http://www.winehq.org/announce/1.3.36 for the announcement. Rename dbus USE flag to udisks to reflect what it actually does in >=1.3.36.
7
8 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.16 app-emulation/wine/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/metadata.xml?rev=1.16&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/metadata.xml?rev=1.16&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/metadata.xml?r1=1.15&r2=1.16
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/metadata.xml,v
20 retrieving revision 1.15
21 retrieving revision 1.16
22 diff -u -r1.15 -r1.16
23 --- metadata.xml 2 Dec 2011 23:32:04 -0000 1.15
24 +++ metadata.xml 31 Dec 2011 04:40:13 -0000 1.16
25 @@ -16,6 +16,7 @@
26 <flag name='samba'>Add support for NTLM auth. see
27 http://wiki.winehq.org/NtlmAuthSetupGuide and
28 http://wiki.winehq.org/NtlmSigningAndSealing</flag>
29 + <flag name='udisks'>Support dynamic storage devices using <pkg>sys-fs/udisks</pkg></flag>
30 <flag name='win32'>Build a 32bit version of Wine (won't run Win64 binaries)</flag>
31 <flag name='win64'>Build a 64bit version of Wine (won't run Win32 binaries)</flag>
32 </use>
33
34
35
36 1.392 app-emulation/wine/ChangeLog
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.392&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.392&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.391&r2=1.392
41
42 Index: ChangeLog
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v
45 retrieving revision 1.391
46 retrieving revision 1.392
47 diff -u -r1.391 -r1.392
48 --- ChangeLog 20 Dec 2011 19:35:12 -0000 1.391
49 +++ ChangeLog 31 Dec 2011 04:40:13 -0000 1.392
50 @@ -1,6 +1,13 @@
51 # ChangeLog for app-emulation/wine
52 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
53 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.391 2011/12/20 19:35:12 vapier Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.392 2011/12/31 04:40:13 tetromino Exp $
55 +
56 +*wine-1.3.36 (31 Dec 2011)
57 +
58 + 31 Dec 2011; Alexandre Rostovtsev <tetromino@g.o> +wine-1.3.36.ebuild,
59 + metadata.xml:
60 + Version bump, see http://www.winehq.org/announce/1.3.36 for the announcement.
61 + Rename dbus USE flag to udisks to reflect what it actually does in >=1.3.36.
62
63 20 Dec 2011; Mike Frysinger <vapier@g.o> wine-1.3.9.ebuild,
64 wine-1.3.10.ebuild, wine-1.3.11.ebuild, wine-1.3.12.ebuild,
65
66
67
68 1.1 app-emulation/wine/wine-1.3.36.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.36.ebuild?rev=1.1&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.36.ebuild?rev=1.1&content-type=text/plain
72
73 Index: wine-1.3.36.ebuild
74 ===================================================================
75 # Copyright 1999-2011 Gentoo Foundation
76 # Distributed under the terms of the GNU General Public License v2
77 # $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.36.ebuild,v 1.1 2011/12/31 04:40:13 tetromino Exp $
78
79 EAPI="2"
80
81 inherit eutils flag-o-matic multilib
82
83 if [[ ${PV} == "9999" ]] ; then
84 EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
85 inherit git-2
86 SRC_URI=""
87 #KEYWORDS=""
88 else
89 MY_P="${PN}-${PV/_/-}"
90 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
91 KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
92 S=${WORKDIR}/${MY_P}
93 fi
94
95 GV="1.4"
96 DESCRIPTION="free implementation of Windows(tm) on Unix"
97 HOMEPAGE="http://www.winehq.org/"
98 SRC_URI="${SRC_URI}
99 gecko? (
100 mirror://sourceforge/wine/wine_gecko-${GV}-x86.msi
101 win64? ( mirror://sourceforge/wine/wine_gecko-${GV}-x86_64.msi )
102 )"
103
104 LICENSE="LGPL-2.1"
105 SLOT="0"
106 IUSE="alsa capi cups custom-cflags 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 udisks v4l +win32 +win64 +X xcomposite xinerama xml"
107 RESTRICT="test" #72375
108
109 MLIB_DEPS="amd64? (
110 truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
111 X? (
112 >=app-emulation/emul-linux-x86-xlibs-2.1
113 >=app-emulation/emul-linux-x86-soundlibs-2.1
114 )
115 mp3? ( app-emulation/emul-linux-x86-soundlibs )
116 openal? ( app-emulation/emul-linux-x86-sdl )
117 opengl? ( app-emulation/emul-linux-x86-opengl )
118 scanner? ( app-emulation/emul-linux-x86-medialibs )
119 v4l? ( app-emulation/emul-linux-x86-medialibs )
120 app-emulation/emul-linux-x86-baselibs
121 >=sys-kernel/linux-headers-2.6
122 )"
123 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
124 perl? ( dev-lang/perl dev-perl/XML-Simple )
125 capi? ( net-dialup/capi4k-utils )
126 ncurses? ( >=sys-libs/ncurses-5.2 )
127 fontconfig? ( media-libs/fontconfig )
128 gphoto2? ( media-libs/libgphoto2 )
129 openal? ( media-libs/openal )
130 udisks? (
131 sys-apps/dbus
132 sys-fs/udisks
133 )
134 gnutls? ( net-libs/gnutls )
135 gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
136 X? (
137 x11-libs/libXcursor
138 x11-libs/libXrandr
139 x11-libs/libXi
140 x11-libs/libXmu
141 x11-libs/libXxf86vm
142 x11-apps/xmessage
143 )
144 xinerama? ( x11-libs/libXinerama )
145 alsa? ( media-libs/alsa-lib )
146 cups? ( net-print/cups )
147 opencl? ( virtual/opencl )
148 opengl? ( virtual/opengl )
149 gsm? ( media-sound/gsm )
150 jpeg? ( virtual/jpeg )
151 ldap? ( net-nds/openldap )
152 lcms? ( =media-libs/lcms-1* )
153 mp3? ( >=media-sound/mpg123-1.5.0 )
154 nls? ( sys-devel/gettext )
155 samba? ( >=net-fs/samba-3.0.25 )
156 xml? ( dev-libs/libxml2 dev-libs/libxslt )
157 scanner? ( media-gfx/sane-backends )
158 ssl? ( dev-libs/openssl )
159 png? ( media-libs/libpng )
160 v4l? ( media-libs/libv4l )
161 !win64? ( ${MLIB_DEPS} )
162 win32? ( ${MLIB_DEPS} )
163 xcomposite? ( x11-libs/libXcomposite )"
164 DEPEND="${RDEPEND}
165 X? (
166 x11-proto/inputproto
167 x11-proto/xextproto
168 x11-proto/xf86vidmodeproto
169 )
170 xinerama? ( x11-proto/xineramaproto )
171 !hardened? ( sys-devel/prelink )
172 virtual/yacc
173 sys-devel/flex"
174
175 src_unpack() {
176 if use win64 ; then
177 [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
178 && die "you need gcc-4.4+ to build 64bit wine"
179 fi
180
181 if [[ ${PV} == "9999" ]] ; then
182 git-2_src_unpack
183 else
184 unpack ${MY_P}.tar.bz2
185 fi
186 }
187
188 src_prepare() {
189 epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
190 epatch_user #282735
191 sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
192 sed -i '/^MimeType/d' tools/wine.desktop || die #117785
193 }
194
195 do_configure() {
196 local builddir="${WORKDIR}/wine$1"
197 mkdir -p "${builddir}"
198 pushd "${builddir}" >/dev/null
199
200 ECONF_SOURCE=${S} \
201 econf \
202 --sysconfdir=/etc/wine \
203 $(use_with alsa) \
204 $(use_with capi) \
205 $(use_with lcms cms) \
206 $(use_with cups) \
207 $(use_with ncurses curses) \
208 $(use_with udisks dbus) \
209 $(use_with fontconfig) \
210 $(use_with gnutls) \
211 $(use_with gphoto2 gphoto) \
212 $(use_with gsm) \
213 $(use_with gstreamer) \
214 --without-hal \
215 $(use_with jpeg) \
216 $(use_with ldap) \
217 $(use_with mp3 mpg123) \
218 $(use_with nls gettext) \
219 $(use_with openal) \
220 $(use_with opencl) \
221 $(use_with opengl) \
222 $(use_with ssl openssl) \
223 $(use_with oss) \
224 $(use_with png) \
225 $(use_with threads pthread) \
226 $(use_with scanner sane) \
227 $(use_enable test tests) \
228 $(use_with truetype freetype) \
229 $(use_with v4l) \
230 $(use_with X x) \
231 $(use_with xcomposite) \
232 $(use_with xinerama) \
233 $(use_with xml) \
234 $(use_with xml xslt) \
235 $2
236
237 emake -j1 depend || die "depend"
238
239 popd >/dev/null
240 }
241 src_configure() {
242 export LDCONFIG=/bin/true
243 use custom-cflags || strip-flags
244
245 if use win64 ; then
246 do_configure 64 --enable-win64
247 use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
248 else
249 ABI=x86 do_configure 32 --disable-win64
250 fi
251 }
252
253 src_compile() {
254 local b
255 for b in 64 32 ; do
256 local builddir="${WORKDIR}/wine${b}"
257 [[ -d ${builddir} ]] || continue
258 emake -C "${builddir}" all || die
259 done
260 }
261
262 src_install() {
263 local b
264 for b in 64 32 ; do
265 local builddir="${WORKDIR}/wine${b}"
266 [[ -d ${builddir} ]] || continue
267 emake -C "${builddir}" install DESTDIR="${D}" || die
268 done
269 dodoc ANNOUNCE AUTHORS README
270 if use gecko ; then
271 insinto /usr/share/wine/gecko
272 doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi || die
273 use win64 && { doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi || die ; }
274 fi
275 if ! use perl ; then
276 rm "${D}"/usr/bin/{wine{dump,maker},function_grep.pl} "${D}"/usr/share/man/man1/wine{dump,maker}.1 || die
277 fi
278 }
279
280 pkg_postinst() {
281 paxctl -psmr "${ROOT}"/usr/bin/wine{,-preloader} 2>/dev/null #255055
282 }
Report Message
Find on MARC Find on Google Groups