From 31f712e7790d8f6c498a29409bf04f3c53bda8e3 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Thu, 10 Aug 2017 10:26:21 -0700 Subject: [PATCH] net-misc/cfengine: cleaner REQUIRED_USE syntax. Package-Manager: portage-2.3.6 --- net-misc/cfengine/cfengine-2.2.10-r4.ebuild | 2 +- net-misc/cfengine/cfengine-3.3.9.ebuild | 7 ++----- net-misc/cfengine/cfengine-3.4.5.ebuild | 7 ++----- net-misc/cfengine/cfengine-3.5.3.ebuild | 7 ++----- net-misc/cfengine/cfengine-3.6.2.ebuild | 7 ++----- 5 files changed, 9 insertions(+), 21 deletions(-) diff --git a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild index c45cf6eb234a..a2f6f9d7afc1 100644 --- a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild +++ b/net-misc/cfengine/cfengine-2.2.10-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="2" diff --git a/net-misc/cfengine/cfengine-3.3.9.ebuild b/net-misc/cfengine/cfengine-3.3.9.ebuild index ad9bc45b5ec5..907365bda35c 100644 --- a/net-misc/cfengine/cfengine-3.3.9.ebuild +++ b/net-misc/cfengine/cfengine-3.3.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -30,10 +30,7 @@ DEPEND=">=sys-libs/db-4 RDEPEND="${DEPEND}" PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" -REQUIRED_USE="qdbm? ( !tokyocabinet ) - tokyocabinet? ( !qdbm ) - !tokyocabinet? ( qdbm ) - !qdbm? ( tokyocabinet )" +REQUIRED_USE="^^ ( qdbm tokyocabinet )" S="${WORKDIR}/${MY_P}" diff --git a/net-misc/cfengine/cfengine-3.4.5.ebuild b/net-misc/cfengine/cfengine-3.4.5.ebuild index 756554953c2d..c377a81c5a5f 100644 --- a/net-misc/cfengine/cfengine-3.4.5.ebuild +++ b/net-misc/cfengine/cfengine-3.4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -35,10 +35,7 @@ DEPEND=">=sys-libs/db-4 RDEPEND="${DEPEND}" PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" -REQUIRED_USE="qdbm? ( !tokyocabinet ) - tokyocabinet? ( !qdbm ) - !tokyocabinet? ( qdbm ) - !qdbm? ( tokyocabinet )" +REQUIRED_USE="^^ ( qdbm tokyocabinet )" S="${WORKDIR}/${MY_P}" diff --git a/net-misc/cfengine/cfengine-3.5.3.ebuild b/net-misc/cfengine/cfengine-3.5.3.ebuild index ff3b6cb7a28e..8f39bfb0f9b0 100644 --- a/net-misc/cfengine/cfengine-3.5.3.ebuild +++ b/net-misc/cfengine/cfengine-3.5.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -33,10 +33,7 @@ DEPEND="acl? ( virtual/acl ) RDEPEND="${DEPEND}" PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" -REQUIRED_USE="qdbm? ( !tokyocabinet ) - tokyocabinet? ( !qdbm ) - !tokyocabinet? ( qdbm ) - !qdbm? ( tokyocabinet )" +REQUIRED_USE="^^ ( qdbm tokyocabinet )" S="${WORKDIR}/${MY_P}" diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild index 3d85b439dd09..a4e5ae6c7db9 100644 --- a/net-misc/cfengine/cfengine-3.6.2.ebuild +++ b/net-misc/cfengine/cfengine-3.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -33,10 +33,7 @@ DEPEND="acl? ( virtual/acl ) RDEPEND="${DEPEND}" PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" -REQUIRED_USE="qdbm? ( !tokyocabinet ) - tokyocabinet? ( !qdbm ) - !tokyocabinet? ( qdbm ) - !qdbm? ( tokyocabinet )" +REQUIRED_USE="^^ ( qdbm tokyocabinet )" S="${WORKDIR}/${MY_P}" -- 2.26.2