Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/wine: wine-1.7.19-r1.ebuild wine-9999.ebuild ChangeLog
Date: Sun, 25 May 2014 16:47:59
Message-Id: 20140525164755.E2CDE2004E@flycatcher.gentoo.org
1 mgorny 14/05/25 16:47:55
2
3 Modified: wine-1.7.19-r1.ebuild wine-9999.ebuild ChangeLog
4 Log:
5 Support multilib unixODBC ebuild.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
8
9 Revision Changes Path
10 1.3 app-emulation/wine/wine-1.7.19-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild?r1=1.2&r2=1.3
15
16 Index: wine-1.7.19-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- wine-1.7.19-r1.ebuild 21 May 2014 19:37:13 -0000 1.2
23 +++ wine-1.7.19-r1.ebuild 25 May 2014 16:47:55 -0000 1.3
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 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.7.19-r1.ebuild,v 1.2 2014/05/21 19:37:13 mgorny Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.3 2014/05/25 16:47:55 mgorny Exp $
29
30 EAPI="5"
31
32 @@ -182,7 +182,10 @@
33 app-emulation/emul-linux-x86-baselibs[development]
34 sys-devel/gettext[abi_x86_32]
35 ) )
36 - odbc? ( app-emulation/emul-linux-x86-db[development] )
37 + odbc? ( || (
38 + app-emulation/emul-linux-x86-db[development]
39 + dev-db/unixODBC:=[abi_x86_32]
40 + ) )
41 osmesa? ( || (
42 >=app-emulation/emul-linux-x86-opengl-20121028[development]
43 media-libs/mesa[osmesa,abi_x86_32]
44
45
46
47 1.168 app-emulation/wine/wine-9999.ebuild
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?rev=1.168&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?rev=1.168&content-type=text/plain
51 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-9999.ebuild?r1=1.167&r2=1.168
52
53 Index: wine-9999.ebuild
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v
56 retrieving revision 1.167
57 retrieving revision 1.168
58 diff -u -r1.167 -r1.168
59 --- wine-9999.ebuild 23 May 2014 22:43:05 -0000 1.167
60 +++ wine-9999.ebuild 25 May 2014 16:47:55 -0000 1.168
61 @@ -1,6 +1,6 @@
62 # Copyright 1999-2014 Gentoo Foundation
63 # Distributed under the terms of the GNU General Public License v2
64 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.167 2014/05/23 22:43:05 mgorny Exp $
65 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.168 2014/05/25 16:47:55 mgorny Exp $
66
67 EAPI="5"
68
69 @@ -182,7 +182,10 @@
70 app-emulation/emul-linux-x86-baselibs[development]
71 sys-devel/gettext[abi_x86_32]
72 ) )
73 - odbc? ( app-emulation/emul-linux-x86-db[development] )
74 + odbc? ( || (
75 + app-emulation/emul-linux-x86-db[development]
76 + dev-db/unixODBC:=[abi_x86_32]
77 + ) )
78 osmesa? ( || (
79 >=app-emulation/emul-linux-x86-opengl-20121028[development]
80 media-libs/mesa[osmesa,abi_x86_32]
81
82
83
84 1.511 app-emulation/wine/ChangeLog
85
86 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.511&view=markup
87 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.511&content-type=text/plain
88 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.510&r2=1.511
89
90 Index: ChangeLog
91 ===================================================================
92 RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v
93 retrieving revision 1.510
94 retrieving revision 1.511
95 diff -u -r1.510 -r1.511
96 --- ChangeLog 23 May 2014 22:43:05 -0000 1.510
97 +++ ChangeLog 25 May 2014 16:47:55 -0000 1.511
98 @@ -1,6 +1,10 @@
99 # ChangeLog for app-emulation/wine
100 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
101 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.510 2014/05/23 22:43:05 mgorny Exp $
102 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.511 2014/05/25 16:47:55 mgorny Exp $
103 +
104 + 25 May 2014; Michał Górny <mgorny@g.o> wine-1.7.19-r1.ebuild,
105 + wine-9999.ebuild:
106 + Support multilib unixODBC ebuild.
107
108 23 May 2014; Michał Górny <mgorny@g.o> wine-9999.ebuild:
109 Forward-port the emul-linux dependency changes to the live ebuild.