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

Gentoo Archives: gentoo-commits

From: "Christian Ruppert (idl0r)" <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/cfengine: ChangeLog cfengine-3.1.2.ebuild cfengine-3.1.3.ebuild
Date: Sun, 30 Jan 2011 20:39:39
Message-Id: 20110130203930.18EE220054@flycatcher.gentoo.org
1 idl0r 11/01/30 20:39:30
2
3 Modified: ChangeLog cfengine-3.1.2.ebuild
4 cfengine-3.1.3.ebuild
5 Log:
6 QDBM and Tokyo Cabinet can't be used together
7
8 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.126 net-misc/cfengine/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.126&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?rev=1.126&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/ChangeLog?r1=1.125&r2=1.126
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v
20 retrieving revision 1.125
21 retrieving revision 1.126
22 diff -u -r1.125 -r1.126
23 --- ChangeLog 23 Jan 2011 15:35:35 -0000 1.125
24 +++ ChangeLog 30 Jan 2011 20:39:29 -0000 1.126
25 @@ -1,6 +1,10 @@
26 # ChangeLog for net-misc/cfengine
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.125 2011/01/23 15:35:35 idl0r Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.126 2011/01/30 20:39:29 idl0r Exp $
30 +
31 + 30 Jan 2011; Christian Ruppert <idl0r@g.o> cfengine-3.1.2.ebuild,
32 + cfengine-3.1.3.ebuild:
33 + QDBM and Tokyo Cabinet can't be used together
34
35 23 Jan 2011; Christian Ruppert <idl0r@g.o> cfengine-3.1.2.ebuild,
36 cfengine-3.1.3.ebuild:
37
38
39
40 1.6 net-misc/cfengine/cfengine-3.1.2.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.2.ebuild?rev=1.6&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.2.ebuild?rev=1.6&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.2.ebuild?r1=1.5&r2=1.6
45
46 Index: cfengine-3.1.2.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.2.ebuild,v
49 retrieving revision 1.5
50 retrieving revision 1.6
51 diff -u -r1.5 -r1.6
52 --- cfengine-3.1.2.ebuild 23 Jan 2011 15:35:35 -0000 1.5
53 +++ cfengine-3.1.2.ebuild 30 Jan 2011 20:39:30 -0000 1.6
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2011 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.2.ebuild,v 1.5 2011/01/23 15:35:35 idl0r Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.2.ebuild,v 1.6 2011/01/30 20:39:30 idl0r Exp $
59
60 EAPI="3"
61
62 @@ -29,7 +29,7 @@
63 postgres? ( dev-db/postgresql-base )
64 selinux? ( sys-libs/libselinux )
65 tokyocabinet? ( dev-db/tokyocabinet )
66 - qdbm? ( dev-db/qdbm )
67 + !tokyocabinet? ( qdbm? ( dev-db/qdbm ) )
68 !tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
69 >=dev-libs/openssl-0.9.7
70 dev-libs/libpcre"
71 @@ -47,8 +47,16 @@
72 myconf="--without-sql"
73 fi
74
75 + # BDB by default, prefer tokyocabinet above qdbm...
76 if ! use qdbm && ! use tokyocabinet; then
77 myconf="${myconf} --with-berkeleydb=/usr"
78 + elif use qdbm && use tokyocabinet; then
79 + elog "QDBM and Tokyo Cabinet can't be used together, using Tokyo Cabinet by default"
80 + myconf="${myconf} --with-tokyocabinet"
81 + elif use qdbm && ! use tokyocabinet; then
82 + myconf="${myconf} --with-qdbm"
83 + elif ! use qdbm && use tokyocabinet; then
84 + myconf="${myconf} --with-tokyocabinet"
85 fi
86
87 # Enforce /var/cfengine for historical compatibility
88 @@ -61,9 +69,7 @@
89 $(use_with gd) \
90 $(use_with graphviz) \
91 $(use_with ldap) \
92 - $(use_with qdbm) \
93 - $(use_enable selinux) \
94 - $(use_with tokyocabinet)
95 + $(use_enable selinux)
96
97 # Fix Makefile to skip inputs, see below "examples"
98 sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
99
100
101
102 1.5 net-misc/cfengine/cfengine-3.1.3.ebuild
103
104 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.3.ebuild?rev=1.5&view=markup
105 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.3.ebuild?rev=1.5&content-type=text/plain
106 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/cfengine/cfengine-3.1.3.ebuild?r1=1.4&r2=1.5
107
108 Index: cfengine-3.1.3.ebuild
109 ===================================================================
110 RCS file: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.3.ebuild,v
111 retrieving revision 1.4
112 retrieving revision 1.5
113 diff -u -r1.4 -r1.5
114 --- cfengine-3.1.3.ebuild 23 Jan 2011 15:35:35 -0000 1.4
115 +++ cfengine-3.1.3.ebuild 30 Jan 2011 20:39:30 -0000 1.5
116 @@ -1,6 +1,6 @@
117 # Copyright 1999-2011 Gentoo Foundation
118 # Distributed under the terms of the GNU General Public License v2
119 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.3.ebuild,v 1.4 2011/01/23 15:35:35 idl0r Exp $
120 +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.3.ebuild,v 1.5 2011/01/30 20:39:30 idl0r Exp $
121
122 EAPI="3"
123
124 @@ -29,7 +29,7 @@
125 postgres? ( dev-db/postgresql-base )
126 selinux? ( sys-libs/libselinux )
127 tokyocabinet? ( dev-db/tokyocabinet )
128 - qdbm? ( dev-db/qdbm )
129 + !tokyocabinet? ( qdbm? ( dev-db/qdbm ) )
130 !tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
131 >=dev-libs/openssl-0.9.7
132 dev-libs/libpcre"
133 @@ -47,8 +47,16 @@
134 myconf="--without-sql"
135 fi
136
137 + # BDB by default, prefer tokyocabinet above qdbm...
138 if ! use qdbm && ! use tokyocabinet; then
139 myconf="${myconf} --with-berkeleydb=/usr"
140 + elif use qdbm && use tokyocabinet; then
141 + elog "QDBM and Tokyo Cabinet can't be used together, using Tokyo Cabinet by default"
142 + myconf="${myconf} --with-tokyocabinet"
143 + elif use qdbm && ! use tokyocabinet; then
144 + myconf="${myconf} --with-qdbm"
145 + elif ! use qdbm && use tokyocabinet; then
146 + myconf="${myconf} --with-tokyocabinet"
147 fi
148
149 # Enforce /var/cfengine for historical compatibility
150 @@ -61,9 +69,7 @@
151 $(use_with gd) \
152 $(use_with graphviz) \
153 $(use_with ldap) \
154 - $(use_with qdbm) \
155 - $(use_enable selinux) \
156 - $(use_with tokyocabinet)
157 + $(use_enable selinux)
158
159 # Fix Makefile to skip inputs, see below "examples"
160 sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
Report Message
Find on MARC Find on Google Groups