Gentoo Archives: gentoo-commits

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/cfengine/
Date: Thu, 10 Aug 2017 17:26:46
Message-Id: 1502385996.31f712e7790d8f6c498a29409bf04f3c53bda8e3.robbat2@gentoo
1 commit: 31f712e7790d8f6c498a29409bf04f3c53bda8e3
2 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 10 17:26:21 2017 +0000
4 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 10 17:26:36 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f712e7
7
8 net-misc/cfengine: cleaner REQUIRED_USE syntax.
9
10 Package-Manager: portage-2.3.6
11
12 net-misc/cfengine/cfengine-2.2.10-r4.ebuild | 2 +-
13 net-misc/cfengine/cfengine-3.3.9.ebuild | 7 ++-----
14 net-misc/cfengine/cfengine-3.4.5.ebuild | 7 ++-----
15 net-misc/cfengine/cfengine-3.5.3.ebuild | 7 ++-----
16 net-misc/cfengine/cfengine-3.6.2.ebuild | 7 ++-----
17 5 files changed, 9 insertions(+), 21 deletions(-)
18
19 diff --git a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
20 index c45cf6eb234..a2f6f9d7afc 100644
21 --- a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
22 +++ b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2013 Gentoo Foundation
25 +# Copyright 1999-2017 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI="2"
29
30 diff --git a/net-misc/cfengine/cfengine-3.3.9.ebuild b/net-misc/cfengine/cfengine-3.3.9.ebuild
31 index ad9bc45b5ec..907365bda35 100644
32 --- a/net-misc/cfengine/cfengine-3.3.9.ebuild
33 +++ b/net-misc/cfengine/cfengine-3.3.9.ebuild
34 @@ -1,4 +1,4 @@
35 -# Copyright 1999-2014 Gentoo Foundation
36 +# Copyright 1999-2017 Gentoo Foundation
37 # Distributed under the terms of the GNU General Public License v2
38
39 EAPI="4"
40 @@ -30,10 +30,7 @@ DEPEND=">=sys-libs/db-4
41 RDEPEND="${DEPEND}"
42 PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
43
44 -REQUIRED_USE="qdbm? ( !tokyocabinet )
45 - tokyocabinet? ( !qdbm )
46 - !tokyocabinet? ( qdbm )
47 - !qdbm? ( tokyocabinet )"
48 +REQUIRED_USE="^^ ( qdbm tokyocabinet )"
49
50 S="${WORKDIR}/${MY_P}"
51
52
53 diff --git a/net-misc/cfengine/cfengine-3.4.5.ebuild b/net-misc/cfengine/cfengine-3.4.5.ebuild
54 index 756554953c2..c377a81c5a5 100644
55 --- a/net-misc/cfengine/cfengine-3.4.5.ebuild
56 +++ b/net-misc/cfengine/cfengine-3.4.5.ebuild
57 @@ -1,4 +1,4 @@
58 -# Copyright 1999-2014 Gentoo Foundation
59 +# Copyright 1999-2017 Gentoo Foundation
60 # Distributed under the terms of the GNU General Public License v2
61
62 EAPI="5"
63 @@ -35,10 +35,7 @@ DEPEND=">=sys-libs/db-4
64 RDEPEND="${DEPEND}"
65 PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
66
67 -REQUIRED_USE="qdbm? ( !tokyocabinet )
68 - tokyocabinet? ( !qdbm )
69 - !tokyocabinet? ( qdbm )
70 - !qdbm? ( tokyocabinet )"
71 +REQUIRED_USE="^^ ( qdbm tokyocabinet )"
72
73 S="${WORKDIR}/${MY_P}"
74
75
76 diff --git a/net-misc/cfengine/cfengine-3.5.3.ebuild b/net-misc/cfengine/cfengine-3.5.3.ebuild
77 index ff3b6cb7a28..8f39bfb0f9b 100644
78 --- a/net-misc/cfengine/cfengine-3.5.3.ebuild
79 +++ b/net-misc/cfengine/cfengine-3.5.3.ebuild
80 @@ -1,4 +1,4 @@
81 -# Copyright 1999-2014 Gentoo Foundation
82 +# Copyright 1999-2017 Gentoo Foundation
83 # Distributed under the terms of the GNU General Public License v2
84
85 EAPI="5"
86 @@ -33,10 +33,7 @@ DEPEND="acl? ( virtual/acl )
87 RDEPEND="${DEPEND}"
88 PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
89
90 -REQUIRED_USE="qdbm? ( !tokyocabinet )
91 - tokyocabinet? ( !qdbm )
92 - !tokyocabinet? ( qdbm )
93 - !qdbm? ( tokyocabinet )"
94 +REQUIRED_USE="^^ ( qdbm tokyocabinet )"
95
96 S="${WORKDIR}/${MY_P}"
97
98
99 diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild
100 index 3d85b439dd0..a4e5ae6c7db 100644
101 --- a/net-misc/cfengine/cfengine-3.6.2.ebuild
102 +++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
103 @@ -1,4 +1,4 @@
104 -# Copyright 1999-2014 Gentoo Foundation
105 +# Copyright 1999-2017 Gentoo Foundation
106 # Distributed under the terms of the GNU General Public License v2
107
108 EAPI="5"
109 @@ -33,10 +33,7 @@ DEPEND="acl? ( virtual/acl )
110 RDEPEND="${DEPEND}"
111 PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
112
113 -REQUIRED_USE="qdbm? ( !tokyocabinet )
114 - tokyocabinet? ( !qdbm )
115 - !tokyocabinet? ( qdbm )
116 - !qdbm? ( tokyocabinet )"
117 +REQUIRED_USE="^^ ( qdbm tokyocabinet )"
118
119 S="${WORKDIR}/${MY_P}"