From f400cb42867f777c7a219f2dacfc47bad918da43 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sun, 23 Apr 2017 21:43:36 +0200 Subject: [PATCH] net-dns/rbldnsd: [QA] Add missing python metadata variables Package-Manager: Portage-2.3.5, Repoman-2.3.2 --- net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild | 10 +++++----- net-dns/rbldnsd/rbldnsd-0.998.ebuild | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild b/net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild index d84c64c3a9598..04537f3057566 100644 --- a/net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild +++ b/net-dns/rbldnsd/rbldnsd-0.998-r2.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit toolchain-funcs user python-single-r1 +inherit toolchain-funcs user python-any-r1 DESCRIPTION="DNS server designed to serve blacklist zones" HOMEPAGE="https://rbldnsd.io/" @@ -15,12 +15,12 @@ SLOT="0" KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x86-fbsd" IUSE="ipv6 test zlib" -REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )" - RDEPEND="zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} - test? ( ${PYTHON_DEPS} - dev-python/pydns:2[${PYTHON_USEDEP}] )" + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]') + )" PATCHES=( "${FILESDIR}/rbldnsd-0.997a-robust-ipv6-test-support.patch" diff --git a/net-dns/rbldnsd/rbldnsd-0.998.ebuild b/net-dns/rbldnsd/rbldnsd-0.998.ebuild index 536c8b74e4941..8c559177fb0e7 100644 --- a/net-dns/rbldnsd/rbldnsd-0.998.ebuild +++ b/net-dns/rbldnsd/rbldnsd-0.998.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit eutils toolchain-funcs user python-single-r1 +inherit eutils toolchain-funcs user python-any-r1 DESCRIPTION="DNS server designed to serve blacklist zones" HOMEPAGE="http://www.corpit.ru/mjt/rbldnsd.html" @@ -15,12 +15,12 @@ SLOT="0" KEYWORDS="amd64 hppa ~sparc x86 ~x86-fbsd" IUSE="ipv6 test zlib" -REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )" - RDEPEND="zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND} - test? ( ${PYTHON_DEPS} - dev-python/pydns:2[${PYTHON_USEDEP}] )" + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]') + )" src_prepare() { epatch "${FILESDIR}/rbldnsd-0.997a-robust-ipv6-test-support.patch"