gentoo resync : 03.03.2019

8 files changed, 20 insertions, 445 deletions

diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index b4556178d95c..df5972ad14f3 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,15 +1,10 @@
 AUX bind-tools-9.5.0_p1-lwconfig.patch 1784 BLAKE2B aaa6e476300872528c1874fd894fd44bd4a58d2e4c8c7c7111273b48fa476892e14b8e0a964064a0bb51003afbb1957e165a18aa95c95be1b014f0624a5e42ba SHA512 2d97ad6ef9f5de1992c2923215117d319c03b393e666bcf7d10684c37130a185a466e0364c22be18cd7c6d5fa362cff4cc8b88b601679ca0f8ffa6e8a11b5ff6
 DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
-DIST bind-9.11.4_p2.tar.gz 9617963 BLAKE2B 409cad7e0976f2e46406d45e87241d61d4d4f00bf08442c4dddbad490ea3d6e42eaad5851fddb83c61a897689a8fdba0cd920aaa0d36329868d26100ba48f946 SHA512 6c01810526fc40485a6c0403d1ddc3b76d2e59b3426b5789436bd671f158d2fa0ea7c0aef2de81998ec715dabd06683fed7b17224d5c794c61e7100a69d4cb60
-DIST bind-9.12.1.tar.gz 9302783 BLAKE2B 731ce67acb22f72e54de1122c5d5c3c1f0663c400bdff9545578a45e5fe3094c6d754351e57dd5c52cdfe1528305dfde25eba7382a723a60b8bfdfeebb9536cd SHA512 701e34a0a3313568c8e5cf76668fefc2a1fceb2ade0de201b8f678401569f1c622c3d1657a71772fa3298efc8b3cdefe974d98432c0087e8b45af3d50a4262fb
-DIST bind-9.12.2_p1.tar.gz 9429002 BLAKE2B 1460b4583a28df21490f71993c8cd595dd8f8ee76727cc8798ee34a6deb1f5a4d39706ec2833a42a7e63ce0dcad917ca975c7d725fc179e2dd0450d8d683ceb4 SHA512 22ce084179439518f7d82f0b80544db929bb4ec71d0e7bd7edad9ae915c903300837d6ead698c9fc23741796f0ba9ed3aa384b752ff65c3b9b20c8969d351cba
 DIST bind-9.12.2_p2.tar.gz 9422128 BLAKE2B c7d56f025f381a0136aa67ccd49a3254fcfe566d5e3601410e5cada26ccab32a901fe6e14bc14e6e287fa2b3904a4eee8e3ef63329f9bc4cb11f204590ff3623 SHA512 458adf6b3d0df286e7d345a21c40b639efcb275e76f9e0bf4e40a5d76dcac875016324393e129f29397be326d1017367c506ec9cbb35871c98fad4281bc4e05a
 DIST bind-9.12.3_p1.tar.gz 8625693 BLAKE2B 1899e04e409d3dafe63494fb7a0d8b813a6487754149bbfd01888cddc5e134ac675e9ac790684fb6fd8de4b1484e23ed7f1881c01234c9f16b27180c9a4594a9 SHA512 c1c91de88e4297e79b527775edd525c6fa948f169977563ab2e6ca93cac7317f8ca85863567f5cc151d4c6e3c081864ab1cf813bcfdd1165b52e9471b8317c28
-EBUILD bind-tools-9.11.2_p1.ebuild 3150 BLAKE2B d27676a209a1c10af67af40fb8e4cca5044a7086e6ba8752a16cd2dbaa6b47e518b3885f2592318364b6dbbb78c7b120aea9da9dae6c05214b1ad6b3d0fba8a8 SHA512 946118c94832fc9583ebcac861b6fa7b9d673c29b744d02af8733732a61dd743ccc289e7f002319e8e351183d0d94a302af00bb0377e08bb433041cde8f455a5
-EBUILD bind-tools-9.11.4_p2.ebuild 3208 BLAKE2B 2283d2ace001715cb60542f169c5604fa049b2105a848991b4b7b2a2b66d8630c10e1d65cb832209ff74a26184e1dd93762fbd63348fa9bfe1850cfce1634f4d SHA512 7d5e6d989b952e6400e272fa02383c201342c0373f36a8561f22df549ec12fb7d414adf60689bb9801006e552779b13f5efd1b339ca1a161c1b9166bf4e0f92b
-EBUILD bind-tools-9.12.1.ebuild 3368 BLAKE2B 800b01b9fb04b2729beb94f422b64dbff471e21490a1f70864f2a535426194960430de58e0547e487a8f95b6898f5557a5776bded565aded00b8d50548432c89 SHA512 d787f6ce937c47a94eb9e1e9654647403746056f2b0fd4d8a57615de03bd490fa50ad7651ab7cea6a9818a85de0d4926e6c07f868755c92e551d8734285c3a8b
-EBUILD bind-tools-9.12.2_p1.ebuild 3438 BLAKE2B 8cb59aed873b3c1d460bec195852db75341c45d38737c445e28d33436e5fc81dde4cae32edd78847da259442bf1b6a68f349d6f8f9d72cf1786941db8c4ac146 SHA512 060a78f687599fc7083503030858e0ed25df9ba0edac85a56177676531800ddc4f10d07c4558c711729c684db92f3c71352b517f7bcb202b95420d2c81f0acbf
-EBUILD bind-tools-9.12.2_p2-r1.ebuild 3565 BLAKE2B 52f3490864991f0e54651322f2b7c7eb97d14bbb98a2cba2a6ea3d958cdf7bffac80962536377a8e366db15caa08bed5669cd19f6fcfedc642e8d82db7f99a76 SHA512 0e1428925a44bc6948305737449be883d2936a7f11f5320c351bd322cee00fd45bf3d7d952989ce773c591302f81a858d140322e3a89550aa1557145e3efe385
-EBUILD bind-tools-9.12.2_p2.ebuild 3502 BLAKE2B 5d419e729479f76536bcb23b934a55c208d91ae8ee3e9a89c2252707d1a96b533fbb2379294798c19952079d9367f2a7d236ed4adf4b35b301bdb24f98cab458 SHA512 bf49480f605635ca80d2d89487c12bd275e7e09ad6b661d9c184c262397803c2f6923be9dcce9ee7730e0b4ca25bcf793472a0f2cb6479186478afe8fab64666
-EBUILD bind-tools-9.12.3_p1.ebuild 3573 BLAKE2B 9f3c35a11c6047252ce852cedc471b1b7ea6841ef1d675ad93037fe11d290bba329fe3acc5fcb0e44054abb46690a278d5d1cb095265644b8e174d8d04b850cb SHA512 40bb1e5c5a271baa3b74ef8ce5a7a803deb9405b7f094aabfbefd71fbbb9eb8e02e2705f934c5cec3375ed67ffbd75b9826e1bf1aca58c74461a5a5c2c8deaaa
+DIST bind-9.12.3_p4.tar.gz 8627833 BLAKE2B f7f8b88d8179f2df92b3105a49f30f7de5ccfe78a4a51f6bfa08e732968bf8e4c35f298c4209d8d05bea4d71b8669fd360d4c17193574eda471ba4d7ad742092 SHA512 42c41f47a0282dc08ee875fe098ce84b26384dba5efbaf99b557d34c4271e0d6aac70126f280a3ee157e8604cce16901c8cd51fab791dec82f4a3d00c054f363
+EBUILD bind-tools-9.11.2_p1.ebuild 3150 BLAKE2B b0979f611760b25f7b65f5bf39c07dd244486c62b070c4cb459a7d35334f6484c86cd1eb7780507991bef6400406d9a7c4e4eb2892c94d2328d7ff81c3554eb9 SHA512 d84fd1fcb3576f26f51bd1dd8dc0a5b2174def2db158c6b7723a72eb74bef098031f206d4baf7e1fb8d0d9d0d5c8087f91036a8628e778e72021302e9ace6e45
+EBUILD bind-tools-9.12.2_p2-r1.ebuild 3566 BLAKE2B 152ed3e96ba00148a3655a0cf9afbf58d3ffd9c8fe8376e0128fbe989884b515998cf87a32128dfed507ca378cb8b2a5579069c4de85477ecddde32651d94877 SHA512 63da1ca6cf0db104888603ba0814d26804f73aa5df80b1f08613bc4bb17b1e3e0f9d4eca31d2e8ee16401164784dff6eac79304d9d9d78ebcd00bcf7bb0d32ed
+EBUILD bind-tools-9.12.3_p1.ebuild 3574 BLAKE2B 90185a97864ae966d4d75826d75d98edb6948ed85af077362906acbd737139e379b47997a277190f2e724d41ecaf00419403e7c4e3dafe2bfefe4d45fb86a575 SHA512 307c6d154a73f31f82b4a5019854d78de6d0dc4db945af372fa7125b6e2d478afa6bab52498db05930c8f13383bb5d697d7c52e5c31f0fb955a26ab0f1948c32
+EBUILD bind-tools-9.12.3_p4.ebuild 3574 BLAKE2B 90185a97864ae966d4d75826d75d98edb6948ed85af077362906acbd737139e379b47997a277190f2e724d41ecaf00419403e7c4e3dafe2bfefe4d45fb86a575 SHA512 307c6d154a73f31f82b4a5019854d78de6d0dc4db945af372fa7125b6e2d478afa6bab52498db05930c8f13383bb5d697d7c52e5c31f0fb955a26ab0f1948c32
 MISC metadata.xml 640 BLAKE2B e563c600c07069fbcf6b9c6a650c4ea47004973757ee685ef12d88c012d70dc2d50831f238aa0ce557531dc91fe8dbb606e526a3b3a72d56725024d76329bcf7 SHA512 e87aa31e416bf3051f213c22b744262a6f4700254a42ab684da2a99eb2b9efb848ccbd2ec747f7c9f309556e6ba5426edaaf3a877cc620758cbde0b40d8c6b37
diff --git a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
index 7cabc13cc48b..d6f84a585276 100644
--- a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,7 +25,7 @@ REQUIRED_USE="gost? ( !libressl ssl )"
 CDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] )
 	xml? ( dev-libs/libxml2 )
diff --git a/net-dns/bind-tools/bind-tools-9.11.4_p2.ebuild b/net-dns/bind-tools/bind-tools-9.11.4_p2.ebuild
deleted file mode 100644
index 667408e82ee8..000000000000
--- a/net-dns/bind-tools/bind-tools-9.11.4_p2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils 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="http://www.isc.org/software/bind"
-SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.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 libressl readline seccomp ssl urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="gost? ( !libressl ssl )"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] )
-	xml? ( dev-libs/libxml2 )
-	idn? ( <net-dns/idnkit-2:= )
-	gssapi? ( virtual/krb5 )
-	readline? ( sys-libs/readline:0= )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<net-dns/bind-9.10.2"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.5.0_p1-lwconfig.patch #231247
-)
-
-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
-	rm -rf libtool.m4/
-
-	mv configure.in configure.ac || die # configure.in is deprecated
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--without-python
-		--without-libjson
-		--without-zlib
-		--without-lmdb
-		--disable-openssl-version-check
-		$(use_enable ipv6)
-		$(use_with idn)
-		$(usex idn --with-idnlib=-lidnkit '')
-		$(use_enable seccomp)
-		$(use_with ssl openssl)
-		$(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 344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# 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.12.1.ebuild b/net-dns/bind-tools/bind-tools-9.12.1.ebuild
deleted file mode 100644
index adc3c8707a45..000000000000
--- a/net-dns/bind-tools/bind-tools-9.12.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils 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="http://www.isc.org/software/bind"
-SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.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 libressl readline seccomp ssl urandom xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-REQUIRED_USE="gost? ( !libressl ssl )"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] )
-	xml? ( dev-libs/libxml2 )
-	idn? ( <net-dns/idnkit-2:= )
-	gssapi? ( virtual/krb5 )
-	libedit? ( dev-libs/libedit )
-	!libedit? (
-		readline? ( sys-libs/readline:0= )
-	)
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<net-dns/bind-9.10.2"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4
-	rm -rf libtool.m4/
-
-	mv configure.in configure.ac || die # configure.in is deprecated
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	if use urandom; then
-		myconf="${myconf} --with-randomdev=/dev/urandom"
-	else
-		myconf="${myconf} --with-randomdev=/dev/random"
-	fi
-
-	# bug 607400
-	if use libedit ; then
-		myconf+=' --with-readline=-ledit'
-	elif use readline ; then
-		myconf+=' --with-readline=-lreadline'
-	else
-		myconf+=' --without-readline'
-	fi
-
-	# bug 344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# localstatedir for nsupdate -l, bug 395785
-	tc-export BUILD_CC
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--without-python \
-		--without-libjson \
-		--without-zlib \
-		--without-lmdb \
-		--disable-openssl-version-check \
-		$(use_enable ipv6) \
-		$(use_with idn) \
-		$(usex idn --with-idnlib=-lidnkit '') \
-		$(use_enable seccomp) \
-		$(use_with ssl openssl "${EPREFIX}"/usr) \
-		$(use_with xml libxml2) \
-		$(use_with gssapi) \
-		$(use_with readline) \
-		$(use_with gost) \
-		${myconf}
-
-	# 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
-	dobin delv
-	doman delv.1
-
-	cd "${S}"/bin/dig
-	dobin dig host nslookup
-	doman {dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate
-	dobin nsupdate
-	doman nsupdate.1
-	if use doc; then
-		dohtml nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman dnssec-"${tool}".8
-		if use doc; then
-			dohtml dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.12.2_p1.ebuild b/net-dns/bind-tools/bind-tools-9.12.2_p1.ebuild
deleted file mode 100644
index 80461a0f46f6..000000000000
--- a/net-dns/bind-tools/bind-tools-9.12.2_p1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils 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="http://www.isc.org/software/bind"
-SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.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"
-# 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:= )
-	)
-	gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] )
-	xml? ( dev-libs/libxml2 )
-	idn? ( <net-dns/idnkit-2:= )
-	libidn2? ( 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}
-	!<net-dns/bind-9.10.2"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
-	# Disable tests for now, bug 406399
-	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
-	# bug #220361
-	rm aclocal.m4
-	rm -rf libtool.m4/
-
-	mv configure.in configure.ac || die # configure.in is deprecated
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	if use urandom; then
-		myconf="${myconf} --with-randomdev=/dev/urandom"
-	else
-		myconf="${myconf} --with-randomdev=/dev/random"
-	fi
-
-	# bug 607400
-	if use libedit ; then
-		myconf+=' --with-readline=-ledit'
-	elif use readline ; then
-		myconf+=' --with-readline=-lreadline'
-	else
-		myconf+=' --without-readline'
-	fi
-
-	# bug 344029
-	append-cflags "-DDIG_SIGCHASE"
-
-	# localstatedir for nsupdate -l, bug 395785
-	tc-export BUILD_CC
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--without-python \
-		--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 ssl openssl "${EPREFIX}"/usr) \
-		$(use_with xml libxml2) \
-		$(use_with gssapi) \
-		$(use_with readline) \
-		$(use_with gost) \
-		${myconf}
-
-	# 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
-	dobin delv
-	doman delv.1
-
-	cd "${S}"/bin/dig
-	dobin dig host nslookup
-	doman {dig,host,nslookup}.1
-
-	cd "${S}"/bin/nsupdate
-	dobin nsupdate
-	doman nsupdate.1
-	if use doc; then
-		dohtml nsupdate.html
-	fi
-
-	cd "${S}"/bin/dnssec
-	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
-		dobin dnssec-"${tool}"
-		doman dnssec-"${tool}".8
-		if use doc; then
-			dohtml dnssec-"${tool}".html
-		fi
-	done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild b/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
index dccc65bc6702..c9ad06bdb880 100644
--- a/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.2_p2-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="gost? ( !libressl ssl )
 CDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	gost? (
 		|| (
diff --git a/net-dns/bind-tools/bind-tools-9.12.3_p1.ebuild b/net-dns/bind-tools/bind-tools-9.12.3_p1.ebuild
index ccf606d76f24..276687b352d9 100644
--- a/net-dns/bind-tools/bind-tools-9.12.3_p1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.3_p1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="gost? ( !libressl ssl )
 CDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	gost? (
 		|| (
diff --git a/net-dns/bind-tools/bind-tools-9.12.2_p2.ebuild b/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
index 3aedc5cc4327..276687b352d9 100644
--- a/net-dns/bind-tools/bind-tools-9.12.2_p2.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.12.3_p4.ebuild
@@ -27,9 +27,17 @@ REQUIRED_USE="gost? ( !libressl ssl )
 CDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	gost? (
+		|| (
+			=dev-libs/openssl-1.0*[-bindist]
+			(
+				>=dev-libs/openssl-1.1
+				dev-libs/gost-engine
+			)
+		)
 	)
-	gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] )
 	xml? ( dev-libs/libxml2 )
 	idn? ( <net-dns/idnkit-2:= )
 	libidn2? ( net-dns/libidn2:= )
@@ -139,7 +147,7 @@ src_install() {
 
 	cd "${S}"/bin/dnssec || die
 	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
+		revoke settime signzone verify; do
 		dobin dnssec-"${tool}"
 		doman dnssec-"${tool}".8
 		if use doc; then