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

Package-Manager: Portage-2.3.6, Repoman-2.3.3

diff --git a/app-backup/bacula/bacula-5.2.13-r5.ebuild b/app-backup/bacula/bacula-5.2.13-r5.ebuild
index 6156233041dee8e997da4a45677b244d2a08fd96..f69c8982110e8773c12294b37ababb44e4c43f2c 100644 (file)
--- 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 2c6b14e115cf15655fed418d962fbdc6b65595f1..b1ca466cc162b6a518f9c379c0c6131181fad574 100644 (file)
--- 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 5f07f3aaf9f57328fdfe0eee59269c17a86df72c..cd88dc439ad2399950c03e3eea513c5dac08b0f3 100644 (file)
--- 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 fa9b395797963d1c6c128c2c554ce8b12a422ea5..d707c4c8d815d9bd99a3714059f3e5d7adb03230 100644 (file)
--- 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 ccbfb526096742539645adba53315911882aeb8a..8b30c32e77787b524bfb945f1d8bc0339d810bbd 100644 (file)
--- 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 ccbfb526096742539645adba53315911882aeb8a..8b30c32e77787b524bfb945f1d8bc0339d810bbd 100644 (file)
--- 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}