1 |
commit: d37319bd4a5585d149ec07f9daabf72b244e8ccf |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 8 06:49:42 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 16:46:38 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d37319bd |
7 |
|
8 |
net-mail/automx: Switch to PYTHON_MULTI_USEDEP API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
net-mail/automx/automx-0.10.2-r1.ebuild | 18 ++++++++++-------- |
13 |
...tomx-0.10.2-r2.ebuild => automx-0.10.2-r3.ebuild} | 20 +++++++++++--------- |
14 |
2 files changed, 21 insertions(+), 17 deletions(-) |
15 |
|
16 |
diff --git a/net-mail/automx/automx-0.10.2-r1.ebuild b/net-mail/automx/automx-0.10.2-r1.ebuild |
17 |
index 8e254aba86e..272effe3524 100644 |
18 |
--- a/net-mail/automx/automx-0.10.2-r1.ebuild |
19 |
+++ b/net-mail/automx/automx-0.10.2-r1.ebuild |
20 |
@@ -1,4 +1,4 @@ |
21 |
-# Copyright 1999-2015 Gentoo Foundation |
22 |
+# Copyright 1999-2020 Gentoo Authors |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
EAPI=5 |
26 |
@@ -18,13 +18,15 @@ KEYWORDS="amd64 x86" |
27 |
IUSE="ldap memcached sql +tools" |
28 |
|
29 |
DEPEND=" |
30 |
- dev-python/ipaddr[${PYTHON_USEDEP}] |
31 |
- dev-python/lxml[${PYTHON_USEDEP}] |
32 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
33 |
- || ( www-apache/mod_wsgi[${PYTHON_USEDEP}] www-servers/uwsgi ) |
34 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
35 |
- memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] ) |
36 |
- sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] ) |
37 |
+ $(python_gen_cond_dep ' |
38 |
+ dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] |
39 |
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}] |
40 |
+ dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
41 |
+ || ( www-apache/mod_wsgi[${PYTHON_MULTI_USEDEP}] www-servers/uwsgi ) |
42 |
+ ldap? ( dev-python/python-ldap[${PYTHON_MULTI_USEDEP}] ) |
43 |
+ memcached? ( dev-python/python-memcached[${PYTHON_MULTI_USEDEP}] ) |
44 |
+ sql? ( dev-python/sqlalchemy[${PYTHON_MULTI_USEDEP}] ) |
45 |
+ ') |
46 |
tools? ( net-dns/bind-tools net-misc/wget ) |
47 |
" |
48 |
RDEPEND="${DEPEND}" |
49 |
|
50 |
diff --git a/net-mail/automx/automx-0.10.2-r2.ebuild b/net-mail/automx/automx-0.10.2-r3.ebuild |
51 |
similarity index 67% |
52 |
rename from net-mail/automx/automx-0.10.2-r2.ebuild |
53 |
rename to net-mail/automx/automx-0.10.2-r3.ebuild |
54 |
index 83f6b39167b..6c1f32ad9c3 100644 |
55 |
--- a/net-mail/automx/automx-0.10.2-r2.ebuild |
56 |
+++ b/net-mail/automx/automx-0.10.2-r3.ebuild |
57 |
@@ -1,4 +1,4 @@ |
58 |
-# Copyright 1999-2017 Gentoo Foundation |
59 |
+# Copyright 1999-2020 Gentoo Authors |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
|
62 |
EAPI=5 |
63 |
@@ -18,14 +18,16 @@ KEYWORDS="amd64 x86" |
64 |
IUSE="ldap memcached sql +tools" |
65 |
|
66 |
DEPEND=" |
67 |
- dev-python/ipaddr[${PYTHON_USEDEP}] |
68 |
- dev-python/lxml[${PYTHON_USEDEP}] |
69 |
- dev-python/m2crypto[${PYTHON_USEDEP}] |
70 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
71 |
- || ( www-apache/mod_wsgi[${PYTHON_USEDEP}] www-servers/uwsgi ) |
72 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) |
73 |
- memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] ) |
74 |
- sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] ) |
75 |
+ $(python_gen_cond_dep ' |
76 |
+ dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] |
77 |
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}] |
78 |
+ dev-python/m2crypto[${PYTHON_MULTI_USEDEP}] |
79 |
+ dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}] |
80 |
+ || ( www-apache/mod_wsgi[${PYTHON_MULTI_USEDEP}] www-servers/uwsgi ) |
81 |
+ ldap? ( dev-python/python-ldap[${PYTHON_MULTI_USEDEP}] ) |
82 |
+ memcached? ( dev-python/python-memcached[${PYTHON_MULTI_USEDEP}] ) |
83 |
+ sql? ( dev-python/sqlalchemy[${PYTHON_MULTI_USEDEP}] ) |
84 |
+ ') |
85 |
tools? ( net-dns/bind-tools net-misc/wget ) |
86 |
" |
87 |
RDEPEND="${DEPEND}" |