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.1.ebuild ChangeLog wine-1.3.2.ebuild wine-9999.ebuild wine-1.3.0.ebuild
Date: Tue, 07 Sep 2010 17:10:18
Message-Id: 20100907171015.3885120051@flycatcher.gentoo.org
1 vapier 10/09/07 17:10:15
2
3 Modified: wine-1.3.1.ebuild ChangeLog wine-1.3.2.ebuild
4 wine-9999.ebuild wine-1.3.0.ebuild
5 Log:
6 Drop amd64 check with USE=win64 now that it is in x86 use.mask.
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 app-emulation/wine/wine-1.3.1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild?r1=1.1&r2=1.2
15
16 Index: wine-1.3.1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- wine-1.3.1.ebuild 30 Aug 2010 05:20:28 -0000 1.1
23 +++ wine-1.3.1.ebuild 7 Sep 2010 17:10:15 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.1 2010/08/30 05:20:28 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.2 2010/09/07 17:10:15 vapier Exp $
29
30 EAPI="2"
31
32 @@ -94,8 +94,9 @@
33 sys-devel/flex"
34
35 src_unpack() {
36 - if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then
37 - use win64 && die "you need gcc-4.4+ to build 64bit wine"
38 + if use win64 ; then
39 + [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
40 + && die "you need gcc-4.4+ to build 64bit wine"
41 fi
42
43 if [[ ${PV} == "9999" ]] ; then
44 @@ -165,7 +166,7 @@
45 export LDCONFIG=/bin/true
46 use custom-cflags || strip-flags
47
48 - if use win64 && use amd64 ; then
49 + if use win64 ; then
50 do_configure 64 --enable-win64
51 use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
52 else
53
54
55
56 1.325 app-emulation/wine/ChangeLog
57
58 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.325&view=markup
59 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.325&content-type=text/plain
60 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.324&r2=1.325
61
62 Index: ChangeLog
63 ===================================================================
64 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v
65 retrieving revision 1.324
66 retrieving revision 1.325
67 diff -u -r1.324 -r1.325
68 --- ChangeLog 6 Sep 2010 20:38:10 -0000 1.324
69 +++ ChangeLog 7 Sep 2010 17:10:15 -0000 1.325
70 @@ -1,6 +1,10 @@
71 # ChangeLog for app-emulation/wine
72 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
73 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.324 2010/09/06 20:38:10 vapier Exp $
74 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.325 2010/09/07 17:10:15 vapier Exp $
75 +
76 + 07 Sep 2010; Mike Frysinger <vapier@g.o> wine-1.3.0.ebuild,
77 + wine-1.3.1.ebuild, wine-1.3.2.ebuild, wine-9999.ebuild:
78 + Drop amd64 check with USE=win64 now that it is in x86 use.mask.
79
80 *wine-1.3.2 (06 Sep 2010)
81
82
83
84
85 1.2 app-emulation/wine/wine-1.3.2.ebuild
86
87 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild?rev=1.2&view=markup
88 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild?rev=1.2&content-type=text/plain
89 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild?r1=1.1&r2=1.2
90
91 Index: wine-1.3.2.ebuild
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v
94 retrieving revision 1.1
95 retrieving revision 1.2
96 diff -u -r1.1 -r1.2
97 --- wine-1.3.2.ebuild 6 Sep 2010 20:38:10 -0000 1.1
98 +++ wine-1.3.2.ebuild 7 Sep 2010 17:10:15 -0000 1.2
99 @@ -1,6 +1,6 @@
100 # Copyright 1999-2010 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.1 2010/09/06 20:38:10 vapier Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.2 2010/09/07 17:10:15 vapier Exp $
104
105 EAPI="2"
106
107 @@ -94,8 +94,9 @@
108 sys-devel/flex"
109
110 src_unpack() {
111 - if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then
112 - use win64 && die "you need gcc-4.4+ to build 64bit wine"
113 + if use win64 ; then
114 + [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
115 + && die "you need gcc-4.4+ to build 64bit wine"
116 fi
117
118 if [[ ${PV} == "9999" ]] ; then
119 @@ -165,7 +166,7 @@
120 export LDCONFIG=/bin/true
121 use custom-cflags || strip-flags
122
123 - if use win64 && use amd64 ; then
124 + if use win64 ; then
125 do_configure 64 --enable-win64
126 use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
127 else
128
129
130
131 1.59 app-emulation/wine/wine-9999.ebuild
132
133 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?rev=1.59&view=markup
134 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?rev=1.59&content-type=text/plain
135 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?r1=1.58&r2=1.59
136
137 Index: wine-9999.ebuild
138 ===================================================================
139 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v
140 retrieving revision 1.58
141 retrieving revision 1.59
142 diff -u -r1.58 -r1.59
143 --- wine-9999.ebuild 6 Aug 2010 20:54:45 -0000 1.58
144 +++ wine-9999.ebuild 7 Sep 2010 17:10:15 -0000 1.59
145 @@ -1,6 +1,6 @@
146 # Copyright 1999-2010 Gentoo Foundation
147 # Distributed under the terms of the GNU General Public License v2
148 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.58 2010/08/06 20:54:45 vapier Exp $
149 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.59 2010/09/07 17:10:15 vapier Exp $
150
151 EAPI="2"
152
153 @@ -94,8 +94,9 @@
154 sys-devel/flex"
155
156 src_unpack() {
157 - if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then
158 - use win64 && die "you need gcc-4.4+ to build 64bit wine"
159 + if use win64 ; then
160 + [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
161 + && die "you need gcc-4.4+ to build 64bit wine"
162 fi
163
164 if [[ ${PV} == "9999" ]] ; then
165 @@ -165,7 +166,7 @@
166 export LDCONFIG=/bin/true
167 use custom-cflags || strip-flags
168
169 - if use win64 && use amd64 ; then
170 + if use win64 ; then
171 do_configure 64 --enable-win64
172 use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
173 else
174
175
176
177 1.4 app-emulation/wine/wine-1.3.0.ebuild
178
179 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild?rev=1.4&view=markup
180 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild?rev=1.4&content-type=text/plain
181 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild?r1=1.3&r2=1.4
182
183 Index: wine-1.3.0.ebuild
184 ===================================================================
185 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v
186 retrieving revision 1.3
187 retrieving revision 1.4
188 diff -u -r1.3 -r1.4
189 --- wine-1.3.0.ebuild 6 Aug 2010 20:54:45 -0000 1.3
190 +++ wine-1.3.0.ebuild 7 Sep 2010 17:10:15 -0000 1.4
191 @@ -1,6 +1,6 @@
192 # Copyright 1999-2010 Gentoo Foundation
193 # Distributed under the terms of the GNU General Public License v2
194 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.3 2010/08/06 20:54:45 vapier Exp $
195 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.4 2010/09/07 17:10:15 vapier Exp $
196
197 EAPI="2"
198
199 @@ -94,8 +94,9 @@
200 sys-devel/flex"
201
202 src_unpack() {
203 - if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then
204 - use win64 && die "you need gcc-4.4+ to build 64bit wine"
205 + if use win64 ; then
206 + [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
207 + && die "you need gcc-4.4+ to build 64bit wine"
208 fi
209
210 if [[ ${PV} == "9999" ]] ; then
211 @@ -165,7 +166,7 @@
212 export LDCONFIG=/bin/true
213 use custom-cflags || strip-flags
214
215 - if use win64 && use amd64 ; then
216 + if use win64 ; then
217 do_configure 64 --enable-win64
218 use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
219 else