gentoo resync : 25.08.2020

5 files changed, 181 insertions, 23 deletions

diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 9f6d73420d4a..97418d7b566e 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,7 +1,10 @@
 DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf
-DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df
 DIST bind-9.16.4.tar.xz 3465172 BLAKE2B 0787920793798ecc5d3197e1e51d41c14170f25608077af8275fd60502e2a6f5365670ca9e611a94a53517b6a0bd55cbb37ac37a4f01063fc409def4e34c39a8 SHA512 b1cf0607b0d7569ea594e02848eed601b8faf31c527fc17d379cfff3cd45c0c8b849364af0312e9b65bc14875aad87de379281603c150a07bf021ec740e92860
+DIST bind-9.16.5.tar.xz 3474044 BLAKE2B 6908ba2d86049bc684b4876d09fe799313f0f44cc1f2ed89f0143523b9fd2a863fd8791b650f7001a5be14acde9306b70dee8c0d25b3d0676aea1a4d2878958f SHA512 789fc19f60e81f67ef13ebacd030ea5d8f8cc42cf5f06a01ee2eefe9b7c6d3b10603a3a6a3df85b0e5d770fcf462ce8dddc3a7e5f7f2dab27aa5879ee5380eb7
+DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0
+DIST bind-tools-9.16.4-manpages.tar.xz 54768 BLAKE2B bff3b680673a5ebd7aad151bafb5004ca18b2ecda680320aad8821468aa399f48da20746d0e49cdfc0b431d5aedefa621015430b743968c7967bf2a5e878d1e0 SHA512 1930f4c04ae8dbdf10380082c680d59320f9a3eca3a7cbca2cb4fa83f1d4b6b00cc62a43104deb45cc56fe2e1dcc5902d6176daf1545f35d35fe297676afe6ca
 EBUILD bind-tools-9.14.12.ebuild 3153 BLAKE2B 1bea1fbfc9afcec51d142ec31987f0ddfa4e567dd8f826486abf5a055e3d7490beac8a994796f67025abe777dcfde1578a7ab6aa6213ca98dd3a6870e9167cb1 SHA512 6b0005e2510e5e6bbfdd8aa09b5aa220e79edc375abee84f965bad6f77d4dea4b1bc79724f593a5194c6919226484392ba7b0f381bd6e01754bb8f00821068c6
-EBUILD bind-tools-9.16.3.ebuild 3179 BLAKE2B b35de17b1a66f5e788cb683c080df412b625f903111513b877b85c88a1262c3434307ad9a40b729432665df031ebe4a71c2053575787fe2b9228d072d37646bf SHA512 9ff56fe1718b59982e9fd08d7ca0c5135118b34560ff0c48ee7230bee54e3a1e943ac9e4bea2679db8959544923776959e8d8c4f15a5a8516dc9e91c4ce7183e
-EBUILD bind-tools-9.16.4.ebuild 3650 BLAKE2B 01b8e1ad6c57c1937e2564618936864818ee29d339291cccfd1d5f22f82bdb4e55541059e43b8f193bdfab47d9c89e9702397680944e4d5f9f4d445490f905bb SHA512 2994ba796fde3c66ea1b229d9bb9f4411159f17cd82dadfa036a336ad0793fd2a2b53644500ec70e2b100f262ce2fadb694a1db76ecf42f6de53d9f9edf5d570
-MISC metadata.xml 423 BLAKE2B 6424fc07b8bba765fa045750b1de629ae57a7004ef10839a3069dab45f20e01e6b50ae755e344f77130edc639aee17c9320dcbb64ed5289fb86a9fb129967617 SHA512 1ec81bf782ad0014c890349248d8ec0302c1940fb13953754ee03f8ea907b0edae79b436e7983982e8f273d04112c8263c416b06e973eba22ac179dd9c68f649
+EBUILD bind-tools-9.16.4.ebuild 3544 BLAKE2B b9d393382aed0512b2346902dc48140f814916dbce717dd8fd296832e514dcd9840b7296ed2f9e5031e465cdae4caadc7f49e4624f72add97482d5cfb236272b SHA512 54d581b04746cae974f2047bf03d7f27b372249a64ace537a4653757ada3220572232a6a5992d78dc24955def05793ce55493e776bc1554d32367ea9b2680eba
+EBUILD bind-tools-9.16.5.ebuild 3473 BLAKE2B 4dbd640258e65af4514593a7b19eb3a02265c5e8793017373b43fae18b81369ee7eb3696e52f3699c307e6c1d1eabcab5437a6522e9f9304170e7f51f5c41d27 SHA512 a96bd8e9dd72f473cd1e3576f17063c9a8870779f48c001b0f71b3f005e77aafc85fb6ed24b41dda3add1daf43602d97e614c3d962dbdb4c87fa013062992366
+EBUILD bind-tools-9.16.6.ebuild 3472 BLAKE2B 08fa97526cd385fb7ad43be53ec6fb6be09d8ceae9f4f817dcf5a8c538c85be5facae714aafb59c19ed849446f2db035663c10425a26986a99e464204198ad0e SHA512 859f0f9bcb688410813eb103e4a1dc72beaa407b99f76826ec28a129b69a02415a2d7b8c0e0442f17d56548ea1846c11e5411645ea89a0fb2a69fddad06e5cc7
+MISC metadata.xml 533 BLAKE2B d04998d5522ccca610384cf5d46f955831d4fdd9da02266680aed6ed680bdd1bd92262fb0c31f6b0c27b15f1b987058c13260d43bb4313b23e5bd288e5f812e9 SHA512 ba16d092633db22a6f419ef4dfdacf3a1c3037dcbe764bbf525f5708f74a1d6857de5cb8fd740dc7309f085360dc3222f949476fd3e2ebb6a8dbce4fb6c08ab4
diff --git a/net-dns/bind-tools/bind-tools-9.16.4.ebuild b/net-dns/bind-tools/bind-tools-9.16.4.ebuild
index d304fa4ca626..decfea598161 100644
--- a/net-dns/bind-tools/bind-tools-9.16.4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.4.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools flag-o-matic python-any-r1 toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_PN=${PN//-tools}
 MY_PV=${PV/_p/-P}
@@ -14,11 +12,12 @@ MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
 HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~chutzpah/dist/misc/${P}-manpages.tar.xz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
@@ -40,9 +39,7 @@ RDEPEND="${COMMON_DEPEND}"
 
 # sphinx required for man-page and html creation
 BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	')
+	doc? ( dev-python/sphinx )
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
@@ -50,10 +47,6 @@ S="${WORKDIR}/${MY_P}"
 # bug 479092, requires networking
 RESTRICT="test"
 
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
 src_prepare() {
 	default
 
diff --git a/net-dns/bind-tools/bind-tools-9.16.3.ebuild b/net-dns/bind-tools/bind-tools-9.16.5.ebuild
index 3150d630e4db..a881baa86982 100644
--- a/net-dns/bind-tools/bind-tools-9.16.3.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.5.ebuild
@@ -36,7 +36,10 @@ DEPEND="${COMMON_DEPEND}"
 
 RDEPEND="${COMMON_DEPEND}"
 
-BDEPEND="virtual/pkgconfig"
+# sphinx required for man-page and html creation
+BDEPEND="
+	doc? ( dev-python/sphinx )
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -65,6 +68,8 @@ src_configure() {
 		--without-libjson
 		--without-zlib
 		--without-lmdb
+		--without-maxminddb
+		--disable-geoip
 		--with-openssl="${EPREFIX}"/usr
 		$(use_with idn libidn2)
 		$(use_with xml libxml2)
@@ -105,35 +110,39 @@ src_compile() {
 	emake AR="${AR}" -C bin/dig/
 	emake AR="${AR}" -C bin/nsupdate/
 	emake AR="${AR}" -C bin/dnssec/
+	emake -C doc/man/ man $(usev doc)
 }
 
 src_install() {
+	local man_dir="${S}/doc/man"
+	local html_dir="${man_dir}/_build/html"
+
 	dodoc README CHANGES
 
 	cd "${S}"/bin/delv || die
 	dobin delv
-	doman delv.1
+	doman ${man_dir}/delv.1
 
 	cd "${S}"/bin/dig || die
 	dobin dig host nslookup
-	doman {dig,host,nslookup}.1
+	doman ${man_dir}/{dig,host,nslookup}.1
 
 	cd "${S}"/bin/nsupdate || die
 	dobin nsupdate
-	doman nsupdate.1
+	doman ${man_dir}/nsupdate.1
 	if use doc; then
 		docinto html
-		dodoc nsupdate.html
+		dodoc ${html_dir}/nsupdate.html
 	fi
 
 	cd "${S}"/bin/dnssec || die
 	for tool in dsfromkey importkey keyfromlabel keygen \
 		revoke settime signzone verify; do
 		dobin dnssec-"${tool}"
-		doman dnssec-"${tool}".8
+		doman ${man_dir}/dnssec-"${tool}".8
 		if use doc; then
 			docinto html
-			dodoc dnssec-"${tool}".html
+			dodoc ${html_dir}/dnssec-"${tool}".html
 		fi
 	done
 }
diff --git a/net-dns/bind-tools/bind-tools-9.16.6.ebuild b/net-dns/bind-tools/bind-tools-9.16.6.ebuild
new file mode 100644
index 000000000000..dac1696a0b7c
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.6.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+COMMON_DEPEND="
+	dev-libs/libuv:=
+	caps? ( sys-libs/libcap )
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/libidn2:= )
+	gssapi? ( virtual/krb5 )
+	libedit? ( dev-libs/libedit )
+	!libedit? (
+		readline? ( sys-libs/readline:= )
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# sphinx required for man-page and html creation
+BDEPEND="
+	doc? ( dev-python/sphinx )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--without-python
+		--without-libjson
+		--without-zlib
+		--without-lmdb
+		--without-maxminddb
+		--disable-geoip
+		--with-openssl="${EPREFIX}"/usr
+		$(use_with idn libidn2)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+		AR="$(type -P $(tc-getAR))"
+	)
+
+	# bug 607400
+	if use libedit ; then
+		myeconfargs+=( --with-readline=-ledit )
+	elif use readline ; then
+		myeconfargs+=( --with-readline=-lreadline )
+	else
+		myeconfargs+=( --without-readline )
+	fi
+
+	# bug 344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# to expose CMSG_* macros from sys/sockets.h
+	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
+
+	# localstatedir for nsupdate -l, bug 395785
+	tc-export BUILD_CC
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+	local AR=$(tc-getAR)
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+	emake -C doc/man/ man $(usev doc)
+}
+
+src_install() {
+	local man_dir="${S}/doc/man"
+	local html_dir="${man_dir}/_build/html"
+
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman ${man_dir}/delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman ${man_dir}/{dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman ${man_dir}/nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc ${html_dir}/nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+		revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman ${man_dir}/dnssec-"${tool}".8
+		if use doc; then
+			docinto html
+			dodoc ${html_dir}/dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind-tools/metadata.xml b/net-dns/bind-tools/metadata.xml
index b77b2edd2d7f..c5cf275de105 100644
--- a/net-dns/bind-tools/metadata.xml
+++ b/net-dns/bind-tools/metadata.xml
@@ -9,6 +9,10 @@
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
 	<use>
 		<flag name="gssapi">Enable gssapi support</flag>
 	</use>