gentoo resync : 04.07.2020

4 files changed, 162 insertions, 2 deletions

diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 20d6da63ac83..9f6d73420d4a 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,5 +1,7 @@
 DIST bind-9.14.12.tar.gz 6318913 BLAKE2B 38cad65923666afa5d83434c43a1b5577fe9555ca637489f780996a1b439955169c859c690f6fb96b003976eca482fe57c9226797cda5b124dc2073a90ef0515 SHA512 f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf
 DIST bind-9.16.3.tar.xz 4573044 BLAKE2B 0630c1225984dbe301ca3e4d768d402e3293eee0ae186257d05e9f9999cdfc9538baf015155471f8abe2e725fe8bdb08c0f45bb8619a4a35b781606ee09e708c SHA512 aded208ab8b10cac275512eb4cb19f4eabd654ef3c14ab0c635f7d09194df4f6dfa84d0b5d69ce93854ceb26a93e21d7122b01ce4f3996da807249ca41d877df
-EBUILD bind-tools-9.14.12.ebuild 3123 BLAKE2B b835f6a2f94f61506b32c27d20d3971141f2f4edbd0a57aa77900375cfbbce52337aeda9fbc042daabc884117bf946b5ea8b7c2b656ef016d52faaab119eff58 SHA512 fa4804481455dd2852284ac0c9f0c50f3348b8a786ac4b45b441265c023d72c61f6a9ad6b2a5627376a4e8eaeed8c8c5d521098f6186c73a2b955aba50010d05
-EBUILD bind-tools-9.16.3.ebuild 3149 BLAKE2B 447f8836c020b27c6a11715572ba0cd1038207e2bf2cd01e34bf00a2dd9403f8108892bc1bd899376979c64d8803af280acc5ac6e35f6f4b8033f32c118ba903 SHA512 ffdce682e5cf47da43ad16e705c2282397b1d9ab0bca22d810d818b129532c68d8b8baf4de1db1bc3dc6b2fcbf987ed49938bc93eb7d88775602b2921703d85d
+DIST bind-9.16.4.tar.xz 3465172 BLAKE2B 0787920793798ecc5d3197e1e51d41c14170f25608077af8275fd60502e2a6f5365670ca9e611a94a53517b6a0bd55cbb37ac37a4f01063fc409def4e34c39a8 SHA512 b1cf0607b0d7569ea594e02848eed601b8faf31c527fc17d379cfff3cd45c0c8b849364af0312e9b65bc14875aad87de379281603c150a07bf021ec740e92860
+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
diff --git a/net-dns/bind-tools/bind-tools-9.14.12.ebuild b/net-dns/bind-tools/bind-tools-9.14.12.ebuild
index e179fdad3264..61d9c2df8c8c 100644
--- a/net-dns/bind-tools/bind-tools-9.14.12.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.12.ebuild
@@ -70,6 +70,7 @@ src_configure() {
 		$(use_with gssapi)
 		$(use_with readline)
 		$(use_enable caps linux-caps)
+		AR="$(type -P $(tc-getAR))"
 	)
 
 	# bug 607400
diff --git a/net-dns/bind-tools/bind-tools-9.16.3.ebuild b/net-dns/bind-tools/bind-tools-9.16.3.ebuild
index 430038762701..3150d630e4db 100644
--- a/net-dns/bind-tools/bind-tools-9.16.3.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.16.3.ebuild
@@ -71,6 +71,7 @@ src_configure() {
 		$(use_with gssapi)
 		$(use_with readline)
 		$(use_enable caps linux-caps)
+		AR="$(type -P $(tc-getAR))"
 	)
 
 	# bug 607400
diff --git a/net-dns/bind-tools/bind-tools-9.16.4.ebuild b/net-dns/bind-tools/bind-tools-9.16.4.ebuild
new file mode 100644
index 000000000000..d304fa4ca626
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.4.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools flag-o-matic python-any-r1 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="${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+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
+}