1 |
commit: 2970b617dd703212a7df15196b109e91f7d71dee |
2 |
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 11 04:44:32 2017 +0000 |
4 |
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 11 04:44:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2970b617 |
7 |
|
8 |
app-backup/bacula: Fix overcomplex REQUIRED_USE (bug #622402) |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
app-backup/bacula/bacula-5.2.13-r5.ebuild | 4 ++-- |
13 |
app-backup/bacula/bacula-7.0.5-r1.ebuild | 4 ++-- |
14 |
app-backup/bacula/bacula-7.0.5-r2.ebuild | 4 ++-- |
15 |
app-backup/bacula/bacula-7.4.4-r2.ebuild | 2 +- |
16 |
app-backup/bacula/bacula-7.4.6.ebuild | 2 +- |
17 |
app-backup/bacula/bacula-7.4.7.ebuild | 2 +- |
18 |
6 files changed, 9 insertions(+), 9 deletions(-) |
19 |
|
20 |
diff --git a/app-backup/bacula/bacula-5.2.13-r5.ebuild b/app-backup/bacula/bacula-5.2.13-r5.ebuild |
21 |
index 6156233041d..f69c8982110 100644 |
22 |
--- a/app-backup/bacula/bacula-5.2.13-r5.ebuild |
23 |
+++ b/app-backup/bacula/bacula-5.2.13-r5.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2016 Gentoo Foundation |
26 |
+# Copyright 1999-2017 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
EAPI="5" |
30 |
@@ -66,7 +66,7 @@ RDEPEND="${DEPEND} |
31 |
) |
32 |
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" |
33 |
|
34 |
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly ) |
35 |
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) |
36 |
static? ( bacula-clientonly ) |
37 |
python? ( ${PYTHON_REQUIRED_USE} )" |
38 |
|
39 |
|
40 |
diff --git a/app-backup/bacula/bacula-7.0.5-r1.ebuild b/app-backup/bacula/bacula-7.0.5-r1.ebuild |
41 |
index 2c6b14e115c..b1ca466cc16 100644 |
42 |
--- a/app-backup/bacula/bacula-7.0.5-r1.ebuild |
43 |
+++ b/app-backup/bacula/bacula-7.0.5-r1.ebuild |
44 |
@@ -1,4 +1,4 @@ |
45 |
-# Copyright 1999-2016 Gentoo Foundation |
46 |
+# Copyright 1999-2017 Gentoo Foundation |
47 |
# Distributed under the terms of the GNU General Public License v2 |
48 |
|
49 |
EAPI="5" |
50 |
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND} |
51 |
) |
52 |
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" |
53 |
|
54 |
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly ) |
55 |
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) |
56 |
static? ( bacula-clientonly )" |
57 |
|
58 |
S=${WORKDIR}/${MY_P} |
59 |
|
60 |
diff --git a/app-backup/bacula/bacula-7.0.5-r2.ebuild b/app-backup/bacula/bacula-7.0.5-r2.ebuild |
61 |
index 5f07f3aaf9f..cd88dc439ad 100644 |
62 |
--- a/app-backup/bacula/bacula-7.0.5-r2.ebuild |
63 |
+++ b/app-backup/bacula/bacula-7.0.5-r2.ebuild |
64 |
@@ -1,4 +1,4 @@ |
65 |
-# Copyright 1999-2016 Gentoo Foundation |
66 |
+# Copyright 1999-2017 Gentoo Foundation |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
|
69 |
EAPI="5" |
70 |
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND} |
71 |
) |
72 |
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" |
73 |
|
74 |
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly ) |
75 |
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) |
76 |
static? ( bacula-clientonly )" |
77 |
|
78 |
S=${WORKDIR}/${MY_P} |
79 |
|
80 |
diff --git a/app-backup/bacula/bacula-7.4.4-r2.ebuild b/app-backup/bacula/bacula-7.4.4-r2.ebuild |
81 |
index fa9b3957979..d707c4c8d81 100644 |
82 |
--- a/app-backup/bacula/bacula-7.4.4-r2.ebuild |
83 |
+++ b/app-backup/bacula/bacula-7.4.4-r2.ebuild |
84 |
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND} |
85 |
) |
86 |
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" |
87 |
|
88 |
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly ) |
89 |
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) |
90 |
static? ( bacula-clientonly )" |
91 |
|
92 |
S=${WORKDIR}/${MY_P} |
93 |
|
94 |
diff --git a/app-backup/bacula/bacula-7.4.6.ebuild b/app-backup/bacula/bacula-7.4.6.ebuild |
95 |
index ccbfb526096..8b30c32e777 100644 |
96 |
--- a/app-backup/bacula/bacula-7.4.6.ebuild |
97 |
+++ b/app-backup/bacula/bacula-7.4.6.ebuild |
98 |
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND} |
99 |
) |
100 |
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" |
101 |
|
102 |
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly ) |
103 |
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) |
104 |
static? ( bacula-clientonly )" |
105 |
|
106 |
S=${WORKDIR}/${MY_P} |
107 |
|
108 |
diff --git a/app-backup/bacula/bacula-7.4.7.ebuild b/app-backup/bacula/bacula-7.4.7.ebuild |
109 |
index ccbfb526096..8b30c32e777 100644 |
110 |
--- a/app-backup/bacula/bacula-7.4.7.ebuild |
111 |
+++ b/app-backup/bacula/bacula-7.4.7.ebuild |
112 |
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND} |
113 |
) |
114 |
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" |
115 |
|
116 |
-REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly ) |
117 |
+REQUIRED_USE="!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) |
118 |
static? ( bacula-clientonly )" |
119 |
|
120 |
S=${WORKDIR}/${MY_P} |