net-dns/bind2nsd: port to python3

Closes: https://bugs.gentoo.org/772596
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>

4 files changed, 34 insertions, 59 deletions

diff --git a/net-dns/bind2nsd/Manifest b/net-dns/bind2nsd/Manifest
index e1b31df..697315a 100644
--- a/net-dns/bind2nsd/Manifest
+++ b/net-dns/bind2nsd/Manifest
@@ -1 +1,2 @@
-DIST bind2nsd-0.7.2.tar.gz 960658 SHA256 88c30b0d05b3cdfce5bb8b51b815df39cdf23b339a50886c15640e268b114d64
+DIST bind2nsd-0.7.2-patches-1.tar.xz 12576 SHA256 35c5273050f3dd13513e097513a6a4ffa34ff944114a307722468334718cc6c8 SHA512 36c6c4a6c1af88b916f626ea8814270582406bb84792f709123e8f5703dd3ad1a8510fb64fc81d7bcbe8eba67afba804f63e219cecaef49a4060fa0be69d0a05 WHIRLPOOL fa9edbec7e8f56966ae625db1971214c0b0a1239c232d3201244dfbb54c7519b029a72f030aa672e6cddf034d225414027cf0ee19fd5f52359740291067ff064
+DIST bind2nsd-0.7.2.tar.gz 960658 SHA256 88c30b0d05b3cdfce5bb8b51b815df39cdf23b339a50886c15640e268b114d64 SHA512 0e89719844299c2576535278b5caa8fe70da1b0c0acd4af7d65e9b0e0343c7404635c2c37767ba2b23a5a51d06254baa7bbc3d67864848a81a773fc1aa9dd97f WHIRLPOOL 68d0d56ae9964a351399b8c964d0e7302f74b3a1b729b357f429295b4ab02c0c6ea9b9813601b05c8c2abea1d8619c7fd39f7484b2f2ad7057d6095de3528351
diff --git a/net-dns/bind2nsd/bind2nsd-0.7.2-r1.ebuild b/net-dns/bind2nsd/bind2nsd-0.7.2-r1.ebuild
deleted file mode 100644
index 68de283..0000000
--- a/net-dns/bind2nsd/bind2nsd-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Program to translate DNS information in BIND format to NSD format"
-HOMEPAGE="http://bind2nsd.sourceforge.net"
-SRC_URI="http://sourceforge.net/projects/bind2nsd/files/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-python/pexpect
-	dev-python/pyDes
-"
-RDEPEND="${DEPEND}
-	net-dns/nsd
-"
-
-PATCHES=( "${FILESDIR}/${P}-bind-sysconfig.patch" )
diff --git a/net-dns/bind2nsd/bind2nsd-0.7.2-r2.ebuild b/net-dns/bind2nsd/bind2nsd-0.7.2-r2.ebuild
new file mode 100644
index 0000000..ba7d537
--- /dev/null
+++ b/net-dns/bind2nsd/bind2nsd-0.7.2-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Program to translate DNS information in BIND format to NSD format"
+HOMEPAGE="http://bind2nsd.sourceforge.net"
+SRC_URI="https://sourceforge.net/projects/bind2nsd/files/${PN}/${P}/${P}.tar.gz
+	https://dev.gentoo.org/~bircoph/patches/${P}-patches-1.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/pexpect
+	dev-python/pyDes
+"
+RDEPEND="${DEPEND}
+	net-dns/nsd
+"
+
+PATCHES=( "${WORKDIR}/patches" )
+
+src_prepare() {
+	rm -rf pexpect-2.1 pyDes-1.2 || die
+	default
+}
diff --git a/net-dns/bind2nsd/files/bind2nsd-0.7.2-bind-sysconfig.patch b/net-dns/bind2nsd/files/bind2nsd-0.7.2-bind-sysconfig.patch
deleted file mode 100644
index 7d06a94..0000000
--- a/net-dns/bind2nsd/files/bind2nsd-0.7.2-bind-sysconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur bind2nsd-0.7.2.orig/bind2nsd/Config.py bind2nsd-0.7.2/bind2nsd/Config.py
---- bind2nsd-0.7.2.orig/bind2nsd/Config.py	2008-06-27 04:22:28.000000000 +0400
-+++ bind2nsd-0.7.2/bind2nsd/Config.py	2010-12-07 12:09:19.000000000 +0300
-@@ -70,7 +70,7 @@
- 	   'masters_for_slaves'	 : '127.0.0.1',
- 	   'named-checkconf'     : '/usr/sbin/named-checkconf',
- 	   'named-checkzone'     : '/usr/sbin/named-checkzone',
--	   'named_root'          : '/etc/bind9',
-+	   'named_root'          : '/etc/bind',
-            'named_conf'          : 'named.conf',
- 	   'named_watchlist'     : '/etc/named.conf',
- 	   'nsd-checkconf'       : '/usr/sbin/nsd-checkconf',
-diff -Naur bind2nsd-0.7.2.orig/etc/bind2nsd.conf bind2nsd-0.7.2/etc/bind2nsd.conf
---- bind2nsd-0.7.2.orig/etc/bind2nsd.conf	2008-06-27 04:22:28.000000000 +0400
-+++ bind2nsd-0.7.2/etc/bind2nsd.conf	2010-12-07 12:09:05.000000000 +0300
-@@ -34,7 +34,7 @@
- 
- #--- parameters for the bind2nsd command ---------------------------------
- 
--# default: named_root = /etc/bind9
-+# default: named_root = /etc/bind
- # default: named_conf = named.conf
- # default: nsd_conf = nsd.conf
- # default: nsd_conf_dir = /etc/nsd/
-@@ -72,7 +72,7 @@
- # default: dnspw = iforgot => dnsconfig password (see s64-mkpw)
- # default: named-checkconf = /usr/sbin/named-checkconf => BIND command location
- # default: named-checkzone = /usr/sbin/named-checkzone => BIND command location
--# default: named_root = /etc/bind9 => default BIND config directory
-+# default: named_root = /etc/bind => default BIND config directory
- # default: named_conf = named.conf => BIND config file name
- # default: named_watchlist = /etc/named.conf => config files to poll
- # default: password_file = /etc/bind2nsd/passwd => encrypted passwords