[gentoo-commits] repo/gentoo:master commit in: app-backup/bacula/

[Thomas Beierlein]

commit:     2970b617dd703212a7df15196b109e91f7d71dee
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 04:44:32 2017 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 04:44:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2970b617

app-backup/bacula: Fix overcomplex REQUIRED_USE (bug #622402)

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-backup/bacula/bacula-5.2.13-r5.ebuild | 4 ++--
 app-backup/bacula/bacula-7.0.5-r1.ebuild  | 4 ++--
 app-backup/bacula/bacula-7.0.5-r2.ebuild  | 4 ++--
 app-backup/bacula/bacula-7.4.4-r2.ebuild  | 2 +-
 app-backup/bacula/bacula-7.4.6.ebuild     | 2 +-
 app-backup/bacula/bacula-7.4.7.ebuild     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app-backup/bacula/bacula-5.2.13-r5.ebuild 
b/app-backup/bacula/bacula-5.2.13-r5.ebuild
index 6156233041d..f69c8982110 100644
--- a/app-backup/bacula/bacula-5.2.13-r5.ebuild
+++ b/app-backup/bacula/bacula-5.2.13-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -66,7 +66,7 @@ RDEPEND="${DEPEND}
        )
        vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
                                static? ( bacula-clientonly )
                                python? ( ${PYTHON_REQUIRED_USE} )"
 

diff --git a/app-backup/bacula/bacula-7.0.5-r1.ebuild 
b/app-backup/bacula/bacula-7.0.5-r1.ebuild
index 2c6b14e115c..b1ca466cc16 100644
--- a/app-backup/bacula/bacula-7.0.5-r1.ebuild
+++ b/app-backup/bacula/bacula-7.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
        )
        vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
                                static? ( bacula-clientonly )"
 
 S=${WORKDIR}/${MY_P}

diff --git a/app-backup/bacula/bacula-7.0.5-r2.ebuild 
b/app-backup/bacula/bacula-7.0.5-r2.ebuild
index 5f07f3aaf9f..cd88dc439ad 100644
--- a/app-backup/bacula/bacula-7.0.5-r2.ebuild
+++ b/app-backup/bacula/bacula-7.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
        )
        vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
                                static? ( bacula-clientonly )"
 
 S=${WORKDIR}/${MY_P}

diff --git a/app-backup/bacula/bacula-7.4.4-r2.ebuild 
b/app-backup/bacula/bacula-7.4.4-r2.ebuild
index fa9b3957979..d707c4c8d81 100644
--- a/app-backup/bacula/bacula-7.4.4-r2.ebuild
+++ b/app-backup/bacula/bacula-7.4.4-r2.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND}
        )
        vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
                                static? ( bacula-clientonly )"
 
 S=${WORKDIR}/${MY_P}

diff --git a/app-backup/bacula/bacula-7.4.6.ebuild 
b/app-backup/bacula/bacula-7.4.6.ebuild
index ccbfb526096..8b30c32e777 100644
--- a/app-backup/bacula/bacula-7.4.6.ebuild
+++ b/app-backup/bacula/bacula-7.4.6.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND}
        )
        vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
                                static? ( bacula-clientonly )"
 
 S=${WORKDIR}/${MY_P}

diff --git a/app-backup/bacula/bacula-7.4.7.ebuild 
b/app-backup/bacula/bacula-7.4.7.ebuild
index ccbfb526096..8b30c32e777 100644
--- a/app-backup/bacula/bacula-7.4.7.ebuild
+++ b/app-backup/bacula/bacula-7.4.7.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND}
        )
        vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) )
                                static? ( bacula-clientonly )"
 
 S=${WORKDIR}/${MY_P}