| 1 |
commit: f8f597406d33f49f5db300bd7b16eabf7751f365 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 8 11:32:13 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 15:54:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8f59740 |
| 7 |
|
| 8 |
net-dns/hash-slinger: Switch to python-single-r1 |
| 9 |
|
| 10 |
Use python-single-r1 since the dep net-dns/unbound is single-r1. |
| 11 |
|
| 12 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 13 |
|
| 14 |
net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild | 18 ++++++++++-------- |
| 15 |
...linger-2.7-r1.ebuild => hash-slinger-2.7-r2.ebuild} | 18 ++++++++++-------- |
| 16 |
2 files changed, 20 insertions(+), 16 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild |
| 19 |
index a2ff821691b..a5e14629412 100644 |
| 20 |
--- a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild |
| 21 |
+++ b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild |
| 22 |
@@ -1,11 +1,11 @@ |
| 23 |
-# Copyright 1999-2015 Gentoo Foundation |
| 24 |
+# Copyright 1999-2020 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=5 |
| 28 |
|
| 29 |
PYTHON_COMPAT=( python2_7 ) |
| 30 |
|
| 31 |
-inherit python-r1 |
| 32 |
+inherit python-single-r1 |
| 33 |
|
| 34 |
DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY" |
| 35 |
HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/" |
| 36 |
@@ -21,12 +21,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 37 |
DEPEND="" |
| 38 |
RDEPEND=" |
| 39 |
${PYTHON_DEPS} |
| 40 |
- dev-python/dnspython[$PYTHON_USEDEP] |
| 41 |
- dev-python/ipaddr[$PYTHON_USEDEP] |
| 42 |
- dev-python/m2crypto[$PYTHON_USEDEP] |
| 43 |
- net-dns/unbound[python,$PYTHON_USEDEP] |
| 44 |
+ net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}] |
| 45 |
+ $(python_gen_cond_dep ' |
| 46 |
+ dev-python/dnspython[${PYTHON_MULTI_USEDEP}] |
| 47 |
+ dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] |
| 48 |
+ dev-python/m2crypto[${PYTHON_MULTI_USEDEP}] |
| 49 |
+ openpgp? ( dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}] ) |
| 50 |
+ ') |
| 51 |
ipsec? ( net-vpn/libreswan[dnssec] ) |
| 52 |
- openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] ) |
| 53 |
ssh? ( net-misc/openssh ) |
| 54 |
" |
| 55 |
|
| 56 |
@@ -38,7 +40,7 @@ src_install() { |
| 57 |
use ipsec && tools+=" ipseckey" |
| 58 |
for tool in $tools ; do |
| 59 |
doman ${tool}.1 |
| 60 |
- python_foreach_impl python_doscript ${tool} |
| 61 |
+ python_doscript ${tool} |
| 62 |
done |
| 63 |
dodoc BUGS CHANGES README |
| 64 |
} |
| 65 |
|
| 66 |
diff --git a/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild |
| 67 |
similarity index 67% |
| 68 |
rename from net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild |
| 69 |
rename to net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild |
| 70 |
index 161c87a31f2..e36c1758e26 100644 |
| 71 |
--- a/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild |
| 72 |
+++ b/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild |
| 73 |
@@ -1,11 +1,11 @@ |
| 74 |
-# Copyright 1999-2019 Gentoo Authors |
| 75 |
+# Copyright 1999-2020 Gentoo Authors |
| 76 |
# Distributed under the terms of the GNU General Public License v2 |
| 77 |
|
| 78 |
EAPI=5 |
| 79 |
|
| 80 |
PYTHON_COMPAT=( python2_7 ) |
| 81 |
|
| 82 |
-inherit python-r1 |
| 83 |
+inherit python-single-r1 |
| 84 |
|
| 85 |
DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY" |
| 86 |
HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/" |
| 87 |
@@ -21,12 +21,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 88 |
DEPEND="" |
| 89 |
RDEPEND=" |
| 90 |
${PYTHON_DEPS} |
| 91 |
- dev-python/dnspython[$PYTHON_USEDEP] |
| 92 |
- dev-python/ipaddr[$PYTHON_USEDEP] |
| 93 |
- dev-python/m2crypto[$PYTHON_USEDEP] |
| 94 |
- net-dns/unbound[python,$PYTHON_USEDEP] |
| 95 |
+ net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}] |
| 96 |
+ $(python_gen_cond_dep ' |
| 97 |
+ dev-python/dnspython[${PYTHON_MULTI_USEDEP}] |
| 98 |
+ dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] |
| 99 |
+ dev-python/m2crypto[${PYTHON_MULTI_USEDEP}] |
| 100 |
+ openpgp? ( dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}] ) |
| 101 |
+ ') |
| 102 |
ipsec? ( net-vpn/libreswan[dnssec] ) |
| 103 |
- openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] ) |
| 104 |
ssh? ( net-misc/openssh ) |
| 105 |
" |
| 106 |
|
| 107 |
@@ -38,7 +40,7 @@ src_install() { |
| 108 |
use ipsec && tools+=" ipseckey" |
| 109 |
for tool in $tools ; do |
| 110 |
doman ${tool}.1 |
| 111 |
- python_foreach_impl python_doscript ${tool} |
| 112 |
+ python_doscript ${tool} |
| 113 |
done |
| 114 |
dodoc BUGS CHANGES README |
| 115 |
} |
Archives