Gentoo Archives: gentoo-commits

From: "Ryan Hill (dirtyepic)" <dirtyepic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-backup/bacula: bacula-2.4.1-r1.ebuild bacula-3.0.3.ebuild ChangeLog bacula-3.0.2.ebuild bacula-2.4.4.ebuild
Date: Wed, 10 Feb 2010 06:12:09
Message-Id: E1Nf5nx-0005vz-5l@stork.gentoo.org
1 dirtyepic 10/02/10 06:12:05
2
3 Modified: bacula-2.4.1-r1.ebuild bacula-3.0.3.ebuild
4 ChangeLog bacula-3.0.2.ebuild bacula-2.4.4.ebuild
5 Log:
6 Make conditional so we don't die w/ USE="-wxwidgets" when wxGTK
7 was built with USE="-X".
8 (Portage version: 2.2_rc62/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.11 app-backup/bacula/bacula-2.4.1-r1.ebuild
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild?rev=1.11&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild?rev=1.11&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild?r1=1.10&r2=1.11
16
17 Index: bacula-2.4.1-r1.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild,v
20 retrieving revision 1.10
21 retrieving revision 1.11
22 diff -u -r1.10 -r1.11
23 --- bacula-2.4.1-r1.ebuild 10 Feb 2010 01:24:19 -0000 1.10
24 +++ bacula-2.4.1-r1.ebuild 10 Feb 2010 06:12:03 -0000 1.11
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2010 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild,v 1.10 2010/02/10 01:24:19 dirtyepic Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.1-r1.ebuild,v 1.11 2010/02/10 06:12:03 dirtyepic Exp $
30
31 #
32 # TODO:
33 @@ -23,7 +23,6 @@
34 #
35
36 EAPI="1"
37 -WX_GTK_VER=2.6
38 inherit eutils wxwidgets
39
40 IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd doc gnome ipv6 logrotate logwatch mysql postgres python qt4 readline sqlite sqlite3 ssl static tcpd wxwidgets X"
41 @@ -194,6 +193,10 @@
42 eerror "the qt4 USE flag to disable building 'bat'."
43 die "incompatible slotted qwt version found"
44 fi
45 + if useq wxwidgets; then
46 + WX_GTK_VER=2.6
47 + need-wxwidgets ansi
48 + fi
49 myconf="${myconf} \
50 $(use_with X x) \
51 $(use_enable gnome) \
52
53
54
55 1.4 app-backup/bacula/bacula-3.0.3.ebuild
56
57 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild?rev=1.4&view=markup
58 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild?rev=1.4&content-type=text/plain
59 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild?r1=1.3&r2=1.4
60
61 Index: bacula-3.0.3.ebuild
62 ===================================================================
63 RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v
64 retrieving revision 1.3
65 retrieving revision 1.4
66 diff -u -r1.3 -r1.4
67 --- bacula-3.0.3.ebuild 10 Feb 2010 01:24:19 -0000 1.3
68 +++ bacula-3.0.3.ebuild 10 Feb 2010 06:12:03 -0000 1.4
69 @@ -1,9 +1,8 @@
70 # Copyright 1999-2010 Gentoo Foundation
71 # Distributed under the terms of the GNU General Public License v2
72 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v 1.3 2010/02/10 01:24:19 dirtyepic Exp $
73 +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.3.ebuild,v 1.4 2010/02/10 06:12:03 dirtyepic Exp $
74
75 EAPI="2"
76 -WX_GTK_VER=2.6
77 inherit eutils wxwidgets
78
79 IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd gnome ipv6 logwatch mysql postgres python qt4 readline sqlite +sqlite3 ssl static tcpd wxwidgets X"
80 @@ -171,6 +170,10 @@
81 eerror "the qt4 USE flag to disable building 'bat'."
82 die "incompatible slotted qwt version found"
83 fi
84 + if useq wxwidgets; then
85 + WX_GTK_VER=2.6
86 + need-wxwidgets ansi
87 + fi
88 myconf="${myconf} \
89 $(use_with X x) \
90 $(use_enable gnome) \
91
92
93
94 1.81 app-backup/bacula/ChangeLog
95
96 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.81&view=markup
97 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/ChangeLog?rev=1.81&content-type=text/plain
98 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/ChangeLog?r1=1.80&r2=1.81
99
100 Index: ChangeLog
101 ===================================================================
102 RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v
103 retrieving revision 1.80
104 retrieving revision 1.81
105 diff -u -r1.80 -r1.81
106 --- ChangeLog 10 Feb 2010 01:24:19 -0000 1.80
107 +++ ChangeLog 10 Feb 2010 06:12:03 -0000 1.81
108 @@ -1,6 +1,11 @@
109 # ChangeLog for app-backup/bacula
110 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
111 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.80 2010/02/10 01:24:19 dirtyepic Exp $
112 +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/ChangeLog,v 1.81 2010/02/10 06:12:03 dirtyepic Exp $
113 +
114 + 10 Feb 2010; Ryan Hill <dirtyepic@g.o> bacula-2.4.1-r1.ebuild,
115 + bacula-2.4.4.ebuild, bacula-3.0.2.ebuild, bacula-3.0.3.ebuild:
116 + Make conditional so we don't die w/ USE="-wxwidgets" when wxGTK
117 + was built with USE="-X".
118
119 10 Feb 2010; Ryan Hill <dirtyepic@g.o> bacula-2.4.1-r1.ebuild,
120 bacula-2.4.4.ebuild, bacula-3.0.2.ebuild, bacula-3.0.3.ebuild:
121
122
123
124 1.6 app-backup/bacula/bacula-3.0.2.ebuild
125
126 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild?rev=1.6&view=markup
127 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild?rev=1.6&content-type=text/plain
128 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild?r1=1.5&r2=1.6
129
130 Index: bacula-3.0.2.ebuild
131 ===================================================================
132 RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild,v
133 retrieving revision 1.5
134 retrieving revision 1.6
135 diff -u -r1.5 -r1.6
136 --- bacula-3.0.2.ebuild 10 Feb 2010 01:24:19 -0000 1.5
137 +++ bacula-3.0.2.ebuild 10 Feb 2010 06:12:03 -0000 1.6
138 @@ -1,9 +1,8 @@
139 # Copyright 1999-2010 Gentoo Foundation
140 # Distributed under the terms of the GNU General Public License v2
141 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild,v 1.5 2010/02/10 01:24:19 dirtyepic Exp $
142 +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-3.0.2.ebuild,v 1.6 2010/02/10 06:12:03 dirtyepic Exp $
143
144 EAPI="2"
145 -WX_GTK_VER=2.6
146 inherit eutils wxwidgets
147
148 IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd gnome ipv6 logwatch mysql postgres python qt4 readline sqlite +sqlite3 ssl static tcpd wxwidgets X"
149 @@ -171,6 +170,10 @@
150 eerror "the qt4 USE flag to disable building 'bat'."
151 die "incompatible slotted qwt version found"
152 fi
153 + if useq wxwidgets; then
154 + WX_GTK_VER=2.6
155 + need-wxwidgets ansi
156 + fi
157 myconf="${myconf} \
158 $(use_with X x) \
159 $(use_enable gnome) \
160
161
162
163 1.6 app-backup/bacula/bacula-2.4.4.ebuild
164
165 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild?rev=1.6&view=markup
166 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild?rev=1.6&content-type=text/plain
167 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild?r1=1.5&r2=1.6
168
169 Index: bacula-2.4.4.ebuild
170 ===================================================================
171 RCS file: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild,v
172 retrieving revision 1.5
173 retrieving revision 1.6
174 diff -u -r1.5 -r1.6
175 --- bacula-2.4.4.ebuild 10 Feb 2010 01:24:19 -0000 1.5
176 +++ bacula-2.4.4.ebuild 10 Feb 2010 06:12:03 -0000 1.6
177 @@ -1,6 +1,6 @@
178 # Copyright 1999-2010 Gentoo Foundation
179 # Distributed under the terms of the GNU General Public License v2
180 -# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild,v 1.5 2010/02/10 01:24:19 dirtyepic Exp $
181 +# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-2.4.4.ebuild,v 1.6 2010/02/10 06:12:03 dirtyepic Exp $
182
183 #
184 # TODO:
185 @@ -21,7 +21,6 @@
186 #
187
188 EAPI="2"
189 -WX_GTK_VER="2.6"
190 inherit eutils wxwidgets
191
192 IUSE="bacula-clientonly bacula-console bacula-nodir bacula-nosd doc gnome ipv6 logrotate logwatch mysql postgres python qt4 readline sqlite sqlite3 ssl static tcpd wxwidgets X"
193 @@ -182,6 +181,10 @@
194 eerror "the qt4 USE flag to disable building 'bat'."
195 die "incompatible slotted qwt version found"
196 fi
197 + if useq wxwidgets; then
198 + WX_GTK_VER=2.6
199 + need-wxwidgets ansi
200 + fi
201 myconf="${myconf} \
202 $(use_with X x) \
203 $(use_enable gnome) \