gentoo resync : 18.08.2019

4 files changed, 155 insertions, 42 deletions

diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index a1871271f017..afe13434130c 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,3 +1,5 @@
-DIST bind-9.12.3_p4.tar.gz 8627833 BLAKE2B f7f8b88d8179f2df92b3105a49f30f7de5ccfe78a4a51f6bfa08e732968bf8e4c35f298c4209d8d05bea4d71b8669fd360d4c17193574eda471ba4d7ad742092 SHA512 42c41f47a0282dc08ee875fe098ce84b26384dba5efbaf99b557d34c4271e0d6aac70126f280a3ee157e8604cce16901c8cd51fab791dec82f4a3d00c054f363
-EBUILD bind-tools-9.12.3_p4.ebuild 3564 BLAKE2B 3a6232d97229208746fbb33c2b9c6371a7ce915d495a759bdaed498691d21dd94a39e241ccac308270ace1ad4145c55199b81efd8cb43be91bd6e75d3f1b335c SHA512 7693dc80b416aa7c790f48f8b308a521298ffe9e4486adb78d0cdb0767e17b6d6878d610ff2470eb8562da2429511b42f256dbe823b95190ce65dce42a0a4926
-MISC metadata.xml 640 BLAKE2B e563c600c07069fbcf6b9c6a650c4ea47004973757ee685ef12d88c012d70dc2d50831f238aa0ce557531dc91fe8dbb606e526a3b3a72d56725024d76329bcf7 SHA512 e87aa31e416bf3051f213c22b744262a6f4700254a42ab684da2a99eb2b9efb848ccbd2ec747f7c9f309556e6ba5426edaaf3a877cc620758cbde0b40d8c6b37
+DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932
+DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646
+EBUILD bind-tools-9.14.4.ebuild 3044 BLAKE2B b7695a80cff665209ec6b662398e21cf9bed283e9e5cba40889fa594f9dc8084431518a35de4dfa22680fa8370abfbb66a56428a040c57561440a30cc3a5d0d8 SHA512 48e5022bb9060e7b6214f18c9aa7a1205a1f35cf04d1b7583598c62b822e53e9a9db83a73ac8d30070b670906046e0a9efacb728d4120e7a393c142c0076ea1d
+EBUILD bind-tools-9.15.2.ebuild 2834 BLAKE2B 9d0dd1053c2e177fba876d00ff65006fd0e0c35b90f5f912a0b267361cc3876c1380ad256c50731cad7dd24861fa5af84dd9272ff797796577334dca9a8522d8 SHA512 a8cd57dcd7e925e81a7d11361354410cddddcca4f0813ee5d74c8d3e7d3c721704b7b37e585ee4a8b92645b94b55d12f3338d25a1f8eee4b7d2e506f404bbbb9
+MISC metadata.xml 488 BLAKE2B 44d0112102447f6d6f8c76aa5e3018de5fc4746240a1a7f187cb7bc493e9a442812c5b0f1c4a8a0a3410af12fbd2e390f6291c981440840b42348f403a278e2c SHA512 ac2a79f4622fd4aa957f9ad0618c631d4c68497443015bbd12c1670576d4515649f26c39c555046771b2aadd5f9b53fdc4c478ba7fb07e24f06b3a4f30f071e0
diff --git a/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
index 29540d5b0f5d..489ecbb114fe 100644
--- a/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils autotools flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_PN=${PN//-tools}
 MY_PV=${PV/_p/-P}
@@ -11,42 +11,27 @@ MY_PV=${MY_PV/_rc/rc}
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="http://www.isc.org/software/bind"
-SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.tar.gz"
+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="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml"
+IUSE="doc gssapi idn ipv6 libedit libressl readline ssl xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
-REQUIRED_USE="gost? ( !libressl ssl )
-	idn? ( !libidn2 )
-	libidn2? ( !idn )"
-
 CDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	gost? (
-		|| (
-			=dev-libs/openssl-1.0*[-bindist]
-			(
-				>=dev-libs/openssl-1.1
-				dev-libs/gost-engine
-			)
-		)
-	)
 	xml? ( dev-libs/libxml2 )
-	idn? ( <net-dns/idnkit-2:= )
-	libidn2? ( net-dns/libidn2:= )
+	idn? ( net-dns/libidn2:= )
 	gssapi? ( virtual/krb5 )
 	libedit? ( dev-libs/libedit )
 	!libedit? (
 		readline? ( sys-libs/readline:0= )
-	)
-	seccomp? ( sys-libs/libseccomp )"
+	)"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
@@ -64,10 +49,9 @@ src_prepare() {
 	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
 
 	# bug #220361
-	rm aclocal.m4
-	rm -rf libtool.m4/
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
 
-	mv configure.in configure.ac || die # configure.in is deprecated
 	eautoreconf
 }
 
@@ -78,24 +62,13 @@ src_configure() {
 		--without-libjson
 		--without-zlib
 		--without-lmdb
-		$(use_enable ipv6)
-		$(use_with idn idnkit)
-		$(usex idn --with-idnlib=-lidnkit '')
-		$(use_with libidn2)
-		$(use_enable seccomp)
+		$(use_with idn libidn2)
 		$(use_with ssl openssl "${EPREFIX}"/usr)
 		$(use_with xml libxml2)
 		$(use_with gssapi)
 		$(use_with readline)
-		$(use_with gost)
 	)
 
-	if use urandom; then
-		myeconfargs+=( --with-randomdev=/dev/urandom )
-	else
-		myeconfargs+=( --with-randomdev=/dev/random )
-	fi
-
 	# bug 607400
 	if use libedit ; then
 		myeconfargs+=( --with-readline=-ledit )
@@ -108,6 +81,9 @@ src_configure() {
 	# 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[@]}"
diff --git a/net-dns/bind-tools/bind-tools-9.15.2.ebuild b/net-dns/bind-tools/bind-tools-9.15.2.ebuild
new file mode 100644
index 000000000000..fe96db31c354
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.15.2.ebuild
@@ -0,0 +1,134 @@
+# 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="doc gssapi idn ipv6 libedit libressl readline ssl xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+CDEPEND="
+	ssl? (
+		!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="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	!<net-dns/bind-9.10.2"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# 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
+		$(use_with idn libidn2)
+		$(use_with ssl openssl "${EPREFIX}"/usr)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+	)
+
+	# 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/metadata.xml b/net-dns/bind-tools/metadata.xml
index 89bc2188b1f4..c05099c71b55 100644
--- a/net-dns/bind-tools/metadata.xml
+++ b/net-dns/bind-tools/metadata.xml
@@ -5,11 +5,12 @@
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
 	<use>
-		<flag name="libidn2">Enables IDN support using <pkg>net-dns/libidn2</pkg> rather than using <pkg>net-dns/idnkit</pkg></flag>
-		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
 		<flag name="gssapi">Enable gssapi support</flag>
-		<flag name="gost">Enables gost OpenSSL engine support</flag>
 	</use>
 	<longdescription>ISC's Bind DNS' server tools</longdescription>
 </pkgmetadata>