commit: f8f597406d33f49f5db300bd7b16eabf7751f365 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Feb 8 11:32:13 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Feb 9 15:54:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8f59740
net-dns/hash-slinger: Switch to python-single-r1 Use python-single-r1 since the dep net-dns/unbound is single-r1. Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild | 18 ++++++++++-------- ...linger-2.7-r1.ebuild => hash-slinger-2.7-r2.ebuild} | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild index a2ff821691b..a5e14629412 100644 --- a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild +++ b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit python-r1 +inherit python-single-r1 DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY" HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/"; @@ -21,12 +21,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="" RDEPEND=" ${PYTHON_DEPS} - dev-python/dnspython[$PYTHON_USEDEP] - dev-python/ipaddr[$PYTHON_USEDEP] - dev-python/m2crypto[$PYTHON_USEDEP] - net-dns/unbound[python,$PYTHON_USEDEP] + net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/dnspython[${PYTHON_MULTI_USEDEP}] + dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] + dev-python/m2crypto[${PYTHON_MULTI_USEDEP}] + openpgp? ( dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}] ) + ') ipsec? ( net-vpn/libreswan[dnssec] ) - openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] ) ssh? ( net-misc/openssh ) " @@ -38,7 +40,7 @@ src_install() { use ipsec && tools+=" ipseckey" for tool in $tools ; do doman ${tool}.1 - python_foreach_impl python_doscript ${tool} + python_doscript ${tool} done dodoc BUGS CHANGES README } diff --git a/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild similarity index 67% rename from net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild rename to net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild index 161c87a31f2..e36c1758e26 100644 --- a/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild +++ b/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit python-r1 +inherit python-single-r1 DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY" HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/"; @@ -21,12 +21,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="" RDEPEND=" ${PYTHON_DEPS} - dev-python/dnspython[$PYTHON_USEDEP] - dev-python/ipaddr[$PYTHON_USEDEP] - dev-python/m2crypto[$PYTHON_USEDEP] - net-dns/unbound[python,$PYTHON_USEDEP] + net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/dnspython[${PYTHON_MULTI_USEDEP}] + dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] + dev-python/m2crypto[${PYTHON_MULTI_USEDEP}] + openpgp? ( dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}] ) + ') ipsec? ( net-vpn/libreswan[dnssec] ) - openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] ) ssh? ( net-misc/openssh ) " @@ -38,7 +40,7 @@ src_install() { use ipsec && tools+=" ipseckey" for tool in $tools ; do doman ${tool}.1 - python_foreach_impl python_doscript ${tool} + python_doscript ${tool} done dodoc BUGS CHANGES README }
