gentoo resync : 25.09.2019

6 files changed, 287 insertions, 3 deletions

diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 696ee03f7c74..4ef5d607d145 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,8 +1,12 @@
 AUX sparc-pause-instruction.patch 4109 BLAKE2B e0a705c5b29033f54ae5d707a0159d8814fb15be4fdc33f91834f2aa50c3c37ca2d653d17222f16bb4e45f8d2e6a983f15ef70ebcd07f579426d3d97b5d78ecf SHA512 590fa784999692700db796291236ce9436e775b16cb737f853d2b5e0b9433f2993682edad2e9f25be140d6fe00edc3768947670a404079b603f8e93651d6da84
 DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932
 DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084
+DIST bind-9.14.6.tar.gz 6314291 BLAKE2B f114cf3516e863656d1b0f3bbc634c5b5f5c539ffa4591cbe09f7cc1e26f30b0bff2d4913297b73304387944ba249b847b7983d4279d625645ec64387a0121ed SHA512 129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366
 DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646
-EBUILD bind-tools-9.14.4.ebuild 3195 BLAKE2B d1c2e157df3e38c512e3fddc3c6da2149b960cd4ea68e7127463e8518cc681b7a872b7500c0e6bdec9c9d9739d115c4289907a39ab4b5787504d1b43a6ca834d SHA512 180240d41e9bc9d9057ecc19d5d82886f7dd5e0f80f5841d9371b44048904322fb9a985633a20b0e1a1faef15ef74ae9fd8d0e1b34ea9b5dbc316f7c22005b62
-EBUILD bind-tools-9.14.5.ebuild 3148 BLAKE2B 5399c325ed33fc10c9aeb2bd1c2a2e5cbecbc5beee693b8fbdf4620aba7fec57764636f6ba99600599f91cbf6c9266b9701d3c0eece2590f841df38847320c59 SHA512 5d5ae428ae45da3e7af8b7d657054025858af9ce08dec4fa1098d7446f1bee09ce5bc5968937c2d1196d8a494ff78ad938b0bedb0f1ff45bae9f7ce466295f6e
-EBUILD bind-tools-9.15.2.ebuild 2930 BLAKE2B a08144a58d307eef0ad98ce59b91f8dd2f439f982132df6cab8b3c2f23c652a0333b307beba6e21966b23681ca4462a43ad7ab27da88f0b0490b07e1d14278be SHA512 a5b22961bc788d1b2b89c8ae16722675ff193ef0089cd9c7956d100f1dd38cc0888b01e32a0b85ec9fff43eeff5ffe7875b8b7ed807853f90b51170fcb06271e
+DIST bind-9.15.3.tar.gz 6296471 BLAKE2B 30815330f4273b7b6df34857fdd7d03490e03e3d340986c01c1d382927480bcd6c01cefdb689c7c397cbb1495b1f06503dbeb425a823a5c676211d45b7b6663a SHA512 2c594c48f1e06c6ab2e0977473fbdb8d3bdbf089bc5c727424510f1bec3fc6dac9a21206724e886f6a88d1e8098aa3b03aed226a92ae91a6c7f3528187288cc0
+EBUILD bind-tools-9.14.4.ebuild 3229 BLAKE2B cb70c1a055c7a51fd1be5ce461fc50f327ac7f283f46cc07c5687b90dd82667d3e5aa205590031d80fddb3ffa9eebd560995fcebdde05511a75b93465b2bd84f SHA512 81fa51660bb87b57a013d075275cad7efaa373c8896eeb4069991a2470318d4b8f32a6e8af8646062a477d38e5ae764ef8cdffc4eb1fc843ddc6c6d10dade19a
+EBUILD bind-tools-9.14.5.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908
+EBUILD bind-tools-9.14.6.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908
+EBUILD bind-tools-9.15.2.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8
+EBUILD bind-tools-9.15.3.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8
 MISC metadata.xml 488 BLAKE2B 44d0112102447f6d6f8c76aa5e3018de5fc4746240a1a7f187cb7bc493e9a442812c5b0f1c4a8a0a3410af12fbd2e390f6291c981440840b42348f403a278e2c SHA512 ac2a79f4622fd4aa957f9ad0618c631d4c68497443015bbd12c1670576d4515649f26c39c555046771b2aadd5f9b53fdc4c478ba7fb07e24f06b3a4f30f071e0
diff --git a/net-dns/bind-tools/bind-tools-9.14.4.ebuild b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
index fd6ff9184d41..31924994d66e 100644
--- a/net-dns/bind-tools/bind-tools-9.14.4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
@@ -67,6 +67,7 @@ src_configure() {
 		--without-libjson
 		--without-zlib
 		--without-lmdb
+		--with-openssl="${EPREFIX}"/usr
 		$(use_with idn libidn2)
 		$(use_with xml libxml2)
 		$(use_with gssapi)
diff --git a/net-dns/bind-tools/bind-tools-9.14.5.ebuild b/net-dns/bind-tools/bind-tools-9.14.5.ebuild
index cccff23c8588..135ea809d2a3 100644
--- a/net-dns/bind-tools/bind-tools-9.14.5.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.5.ebuild
@@ -65,6 +65,7 @@ src_configure() {
 		--without-libjson
 		--without-zlib
 		--without-lmdb
+		--with-openssl="${EPREFIX}"/usr
 		$(use_with idn libidn2)
 		$(use_with xml libxml2)
 		$(use_with gssapi)
diff --git a/net-dns/bind-tools/bind-tools-9.14.6.ebuild b/net-dns/bind-tools/bind-tools-9.14.6.ebuild
new file mode 100644
index 000000000000..135ea809d2a3
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.14.6.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 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.gz"
+
+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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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="
+	caps? ( sys-libs/libcap )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/libidn2:= )
+	gssapi? ( virtual/krb5 )
+	libedit? ( dev-libs/libedit )
+	!libedit? (
+		readline? ( sys-libs/readline:0= )
+	)"
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_EPEND}
+	!<net-dns/bind-9.10.2"
+
+BDEPEND="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
+		--with-openssl="${EPREFIX}"/usr
+		$(use_with idn libidn2)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+	)
+
+	# 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/
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman {dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc 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
+		if use doc; then
+			docinto html
+			dodoc dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind-tools/bind-tools-9.15.2.ebuild b/net-dns/bind-tools/bind-tools-9.15.2.ebuild
index cb870329d1a3..5a710f6efc50 100644
--- a/net-dns/bind-tools/bind-tools-9.15.2.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.15.2.ebuild
@@ -66,6 +66,7 @@ src_configure() {
 		--without-libjson
 		--without-zlib
 		--without-lmdb
+		--with-openssl="${EPREFIX}"/usr
 		$(use_with idn libidn2)
 		$(use_with xml libxml2)
 		$(use_with gssapi)
diff --git a/net-dns/bind-tools/bind-tools-9.15.3.ebuild b/net-dns/bind-tools/bind-tools-9.15.3.ebuild
new file mode 100644
index 000000000000..5a710f6efc50
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.15.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 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.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS=""
+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="
+	caps? ( sys-libs/libcap )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/libidn2:= )
+	gssapi? ( virtual/krb5 )
+	libedit? ( dev-libs/libedit )
+	!libedit? (
+		readline? ( sys-libs/readline:0= )
+	)"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	!<net-dns/bind-9.10.2"
+
+BDEPEND="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
+		--with-openssl="${EPREFIX}"/usr
+		$(use_with idn libidn2)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+	)
+
+	# 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/
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman {dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc 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
+		if use doc; then
+			docinto html
+			dodoc dnssec-"${tool}".html
+		fi
+	done
+}