1 |
commit: b235c6b17ab73a9caa4d663b74f2887ef95e4a5a |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 27 16:35:04 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 27 20:27:53 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b235c6b1 |
7 |
|
8 |
mail-mta/courier: [QA] Fix USE=libressl semantics |
9 |
|
10 |
Closes: https://bugs.gentoo.org/684002 |
11 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
mail-mta/courier/courier-0.75.0-r1.ebuild | 14 ++++++++------ |
15 |
mail-mta/courier/courier-0.75.0.ebuild | 7 ++++--- |
16 |
mail-mta/courier/courier-0.76.4.ebuild | 16 +++++++++------- |
17 |
mail-mta/courier/courier-0.78.2.ebuild | 16 +++++++++------- |
18 |
mail-mta/courier/courier-1.0.5.ebuild | 14 ++++++++------ |
19 |
5 files changed, 38 insertions(+), 29 deletions(-) |
20 |
|
21 |
diff --git a/mail-mta/courier/courier-0.75.0-r1.ebuild b/mail-mta/courier/courier-0.75.0-r1.ebuild |
22 |
index 7a2173aee9f..2fe60c5412c 100644 |
23 |
--- a/mail-mta/courier/courier-0.75.0-r1.ebuild |
24 |
+++ b/mail-mta/courier/courier-0.75.0-r1.ebuild |
25 |
@@ -5,23 +5,25 @@ EAPI=5 |
26 |
inherit eutils flag-o-matic multilib |
27 |
|
28 |
DESCRIPTION="An MTA designed specifically for maildirs" |
29 |
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
30 |
HOMEPAGE="http://www.courier-mta.org/" |
31 |
-SLOT="0" |
32 |
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
33 |
+ |
34 |
LICENSE="GPL-2" |
35 |
+SLOT="0" |
36 |
# not in keywords due to missing dependencies: |
37 |
# ~s390 ~ppc64 ~alpha ~ia64 ~sparc ~x86 |
38 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86" |
39 |
IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \ |
40 |
fam web webmail gnutls" |
41 |
-REQUIRED_USE="?? ( gnutls libressl )" |
42 |
|
43 |
DEPEND=" |
44 |
>=net-libs/courier-authlib-0.66.3 |
45 |
>=net-libs/courier-unicode-1.3 |
46 |
- !gnutls? ( !libressl? ( dev-libs/openssl:0= ) ) |
47 |
- libressl? ( dev-libs/libressl:= ) |
48 |
- gnutls? ( net-libs/gnutls ) |
49 |
+ gnutls? ( net-libs/gnutls:= ) |
50 |
+ !gnutls? ( |
51 |
+ !libressl? ( dev-libs/openssl:0= ) |
52 |
+ libressl? ( dev-libs/libressl:0= ) |
53 |
+ ) |
54 |
>=sys-libs/gdbm-1.8.0 |
55 |
dev-libs/libpcre |
56 |
app-misc/mime-types |
57 |
|
58 |
diff --git a/mail-mta/courier/courier-0.75.0.ebuild b/mail-mta/courier/courier-0.75.0.ebuild |
59 |
index 3e048db1fd8..6d13f06826b 100644 |
60 |
--- a/mail-mta/courier/courier-0.75.0.ebuild |
61 |
+++ b/mail-mta/courier/courier-0.75.0.ebuild |
62 |
@@ -5,10 +5,11 @@ EAPI=5 |
63 |
inherit eutils flag-o-matic multilib |
64 |
|
65 |
DESCRIPTION="An MTA designed specifically for maildirs" |
66 |
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
67 |
HOMEPAGE="http://www.courier-mta.org/" |
68 |
-SLOT="0" |
69 |
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
70 |
+ |
71 |
LICENSE="GPL-2" |
72 |
+SLOT="0" |
73 |
# not in keywords due to missing dependencies: |
74 |
# ~s390 ~ppc64 ~alpha ~ia64 ~sparc ~x86 |
75 |
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc s390 sparc x86" |
76 |
@@ -19,7 +20,7 @@ DEPEND=" |
77 |
>=net-libs/courier-authlib-0.66.3 |
78 |
>=net-libs/courier-unicode-1.3 |
79 |
!gnutls? ( dev-libs/openssl:0= ) |
80 |
- gnutls? ( net-libs/gnutls ) |
81 |
+ gnutls? ( net-libs/gnutls:= ) |
82 |
>=sys-libs/gdbm-1.8.0 |
83 |
dev-libs/libpcre |
84 |
app-misc/mime-types |
85 |
|
86 |
diff --git a/mail-mta/courier/courier-0.76.4.ebuild b/mail-mta/courier/courier-0.76.4.ebuild |
87 |
index f1b0aa79e0c..afb85de4a68 100644 |
88 |
--- a/mail-mta/courier/courier-0.76.4.ebuild |
89 |
+++ b/mail-mta/courier/courier-0.76.4.ebuild |
90 |
@@ -1,25 +1,27 @@ |
91 |
-# Copyright 1999-2017 Gentoo Foundation |
92 |
+# Copyright 1999-2019 Gentoo Authors |
93 |
# Distributed under the terms of the GNU General Public License v2 |
94 |
|
95 |
EAPI=5 |
96 |
inherit eutils flag-o-matic multilib |
97 |
|
98 |
DESCRIPTION="An MTA designed specifically for maildirs" |
99 |
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
100 |
HOMEPAGE="http://www.courier-mta.org/" |
101 |
-SLOT="0" |
102 |
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
103 |
+ |
104 |
LICENSE="GPL-2" |
105 |
+SLOT="0" |
106 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
107 |
IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \ |
108 |
fam web webmail gnutls" |
109 |
-REQUIRED_USE="?? ( gnutls libressl )" |
110 |
|
111 |
DEPEND=" |
112 |
>=net-libs/courier-authlib-0.66.3 |
113 |
>=net-libs/courier-unicode-1.4 |
114 |
- !gnutls? ( !libressl? ( dev-libs/openssl:0= ) ) |
115 |
- libressl? ( dev-libs/libressl:= ) |
116 |
- gnutls? ( net-libs/gnutls ) |
117 |
+ gnutls? ( net-libs/gnutls:= ) |
118 |
+ !gnutls? ( |
119 |
+ !libressl? ( dev-libs/openssl:0= ) |
120 |
+ libressl? ( dev-libs/libressl:0= ) |
121 |
+ ) |
122 |
>=sys-libs/gdbm-1.8.0 |
123 |
dev-libs/libpcre |
124 |
app-misc/mime-types |
125 |
|
126 |
diff --git a/mail-mta/courier/courier-0.78.2.ebuild b/mail-mta/courier/courier-0.78.2.ebuild |
127 |
index 9c648ef0233..e289ecf157e 100644 |
128 |
--- a/mail-mta/courier/courier-0.78.2.ebuild |
129 |
+++ b/mail-mta/courier/courier-0.78.2.ebuild |
130 |
@@ -1,25 +1,27 @@ |
131 |
-# Copyright 1999-2018 Gentoo Foundation |
132 |
+# Copyright 1999-2019 Gentoo Authors |
133 |
# Distributed under the terms of the GNU General Public License v2 |
134 |
|
135 |
EAPI=6 |
136 |
inherit eutils flag-o-matic multilib |
137 |
|
138 |
DESCRIPTION="An MTA designed specifically for maildirs" |
139 |
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
140 |
HOMEPAGE="http://www.courier-mta.org/" |
141 |
-SLOT="0" |
142 |
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
143 |
+ |
144 |
LICENSE="GPL-2" |
145 |
+SLOT="0" |
146 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
147 |
IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \ |
148 |
fam web webmail gnutls" |
149 |
-REQUIRED_USE="?? ( gnutls libressl )" |
150 |
|
151 |
DEPEND=" |
152 |
>=net-libs/courier-authlib-0.68.0 |
153 |
>=net-libs/courier-unicode-2.0 |
154 |
- !gnutls? ( !libressl? ( dev-libs/openssl:0= ) ) |
155 |
- libressl? ( dev-libs/libressl:= ) |
156 |
- gnutls? ( net-libs/gnutls ) |
157 |
+ gnutls? ( net-libs/gnutls:= ) |
158 |
+ !gnutls? ( |
159 |
+ !libressl? ( dev-libs/openssl:0= ) |
160 |
+ libressl? ( dev-libs/libressl:0= ) |
161 |
+ ) |
162 |
>=sys-libs/gdbm-1.8.0 |
163 |
dev-libs/libpcre |
164 |
app-misc/mime-types |
165 |
|
166 |
diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild |
167 |
index 66a941947aa..f0b3ece74ea 100644 |
168 |
--- a/mail-mta/courier/courier-1.0.5.ebuild |
169 |
+++ b/mail-mta/courier/courier-1.0.5.ebuild |
170 |
@@ -5,22 +5,24 @@ EAPI=7 |
171 |
inherit eutils flag-o-matic multilib |
172 |
|
173 |
DESCRIPTION="An MTA designed specifically for maildirs" |
174 |
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
175 |
HOMEPAGE="http://www.courier-mta.org/" |
176 |
-SLOT="0" |
177 |
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" |
178 |
+ |
179 |
LICENSE="GPL-2" |
180 |
+SLOT="0" |
181 |
KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" |
182 |
IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \ |
183 |
fam web webmail gnutls" |
184 |
-REQUIRED_USE="?? ( gnutls libressl )" |
185 |
|
186 |
DEPEND=" |
187 |
>=net-libs/courier-authlib-0.69.0-r1 |
188 |
>=net-libs/courier-unicode-2.1 |
189 |
net-dns/libidn:= |
190 |
- !gnutls? ( !libressl? ( dev-libs/openssl:0= ) ) |
191 |
- libressl? ( dev-libs/libressl:= ) |
192 |
- gnutls? ( net-libs/gnutls ) |
193 |
+ gnutls? ( net-libs/gnutls:= ) |
194 |
+ !gnutls? ( |
195 |
+ !libressl? ( dev-libs/openssl:0= ) |
196 |
+ libressl? ( dev-libs/libressl:0= ) |
197 |
+ ) |
198 |
>=sys-libs/gdbm-1.8.0 |
199 |
dev-libs/libpcre |
200 |
app-misc/mime-types |