From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 32F3E138350 for ; Sat, 4 Apr 2020 14:23:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71C70E0C34; Sat, 4 Apr 2020 14:23:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 42FE4E0C34 for ; Sat, 4 Apr 2020 14:23:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC51434EF33 for ; Sat, 4 Apr 2020 14:23:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 051B4154 for ; Sat, 4 Apr 2020 14:23:28 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1586010138.eae8433d995137aa66c7a62e8f4ca81ae73108d5.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/rbldnsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/rbldnsd/rbldnsd-0.998b-r1.ebuild net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild X-VCS-Directories: net-dns/rbldnsd/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: eae8433d995137aa66c7a62e8f4ca81ae73108d5 X-VCS-Branch: master Date: Sat, 4 Apr 2020 14:23:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 316176ba-da7d-40e2-93b8-2ff026144b0f X-Archives-Hash: 4974f2c5a395b039dd5b2b966ef56332 commit: eae8433d995137aa66c7a62e8f4ca81ae73108d5 Author: Michael Orlitzky gentoo org> AuthorDate: Sat Apr 4 14:16:49 2020 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Sat Apr 4 14:22:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eae8433d net-dns/rbldnsd: drop the python-2.7 test suite. The test suite for rbldnsd uses python-2.7 (only), and realistically that's not going to change any time soon. This commit drops the test suite from the ebuild so that the python team isn't blocked on me at some later point. If upstream ever migrates the test suite to python-3.x and makes a release, I can put it back easy enough. Bug: https://bugs.gentoo.org/715180 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Michael Orlitzky gentoo.org> ...d-0.998b-r1.ebuild => rbldnsd-0.998b-r2.ebuild} | 28 +++++----------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/net-dns/rbldnsd/rbldnsd-0.998b-r1.ebuild b/net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild similarity index 70% rename from net-dns/rbldnsd/rbldnsd-0.998b-r1.ebuild rename to net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild index c73e294de9e..a95bcde36f7 100644 --- a/net-dns/rbldnsd/rbldnsd-0.998b-r1.ebuild +++ b/net-dns/rbldnsd/rbldnsd-0.998b-r2.ebuild @@ -2,9 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) -inherit toolchain-funcs python-any-r1 +inherit toolchain-funcs DESCRIPTION="DNS server designed to serve blacklist zones" HOMEPAGE="https://rbldnsd.io/" @@ -13,23 +12,18 @@ SRC_URI="https://github.com/spamhaus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~hppa ~sparc ~x86" -IUSE="ipv6 test zlib" -RESTRICT="!test? ( test )" +IUSE="ipv6 zlib" RDEPEND="zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND}" BDEPEND=" acct-group/rbldns acct-user/rbldns - test? ( - ${RDEPEND} - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]') - )" +" -PATCHES=( - "${FILESDIR}/rbldnsd-0.997a-robust-ipv6-test-support.patch" -) +# The test suite was dropped from the ebuild because it requires +# python-2.7, and it will crash if you try to run it now. +RESTRICT=test src_configure() { # The ./configure file is handwritten and doesn't support a `make @@ -48,12 +42,6 @@ src_compile() { RANLIB="$(tc-getRANLIB)" } -src_test() { - emake check \ - CC="$(tc-getCC)" \ - PYTHON="${PYTHON}" -} - src_install() { einstalldocs dosbin rbldnsd @@ -63,7 +51,3 @@ src_install() { diropts -g rbldns -o rbldns -m 0750 keepdir /var/db/rbldnsd } - -python_check_deps() { - ! use test || has_version "dev-python/pydns:2[${PYTHON_USEDEP}]" -}