gentoo resync : 15.12.2019

3 files changed, 16 insertions, 16 deletions

diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 07aacaf6c64a..68de73786dd3 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -7,9 +7,9 @@ AUX named.conf-r8 4020 BLAKE2B beb900a89be0f2acc1b08a8d29443c87b098e5ac1f1de9c63
 AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f5bae6c2313485808b99a1a46fc10431913d187ed67cc1e6bad019a9192638bc7fdf97c951e2326ce SHA512 68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a
 AUX named.init-r13 6202 BLAKE2B 1968806c9580517b8443a08b90f7b425913b2dc17d9503834c0d7d7d56f1a987175cb413bc7fec10249002b84b6580d87cb61d2b6a1965cd34d05807abe0390c SHA512 c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
-DIST bind-9.14.7.tar.gz 6320994 BLAKE2B 7f21f856c9cc8a85d7757dc58ca8063faeb5a227ea65502e0385f09874cabaecae6c6bb4e9c7ed1f72db9191688a940202448d2a9fd6b0ab7ef04acb9d362e39 SHA512 e1837ebfbbc60487f5f0e67fb9e935588fd6e5ffe55cdc9dc77e3ce63cd6fc4f076f4eb282cc4f51701ddda3e51e8f15255db5a3841f9fe92a4fb4207d806740
-DIST bind-9.15.5.tar.gz 6303092 BLAKE2B 82bc078a6540d8847ecf39c8b29a58175db2ed7017c8cfd9a40a88292ece0935d532ea02fea09143c48e2949c912eab90d41d199cf8acdb3d69b13bf6aa669c7 SHA512 7632402dfe30c83c732ea6a4079a36e8529e4dd0541d794167d43103e8cd5257709af74d5823c65f4fe4c8fe5ca80c514e66fafbb2302ccd94973b86c67a1978
+DIST bind-9.14.8.tar.gz 6403140 BLAKE2B 45cb06ce8564880d501c63d25c7af8567184e4e4293e01886620cf655449c972ab55c77c7aded07838c61557bc56d9edac26097715c1121fcfb6b606d7a29365 SHA512 eb52760982ebd246e6e1945684771193fc7364324a6d6a95a0cae33afa0a4fa24ffe8313b5f9094420c7c2ec932b1b1a9fb19f6e673ff3c5583ab5e3ff04eb6a
+DIST bind-9.15.6.tar.gz 6432248 BLAKE2B c6dbaeeafdad3e2c7dd30ed1e5121c961829af8d82b9b93dd4eca34d96dfc2854e302068987dcd30ab88c768f6328c81bf81b348a698ceb11001d4d700ef374f SHA512 3bf7ebde706a6771606fda675c60daccbb22c2dc9551a8f361fe102b59e342ded99568b27bca7d7fa32d3f2be3811f38ec014f4ad0c281b590b7b69967395cb7
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
-EBUILD bind-9.14.7.ebuild 11300 BLAKE2B 27c161fbca4aee4970cbfa59937d4fc211863c55c0b060d0933b65e45ae07ddef4ce026aad6cf1db330b28d909b227c1d0f67d6fbc7d5bb1ca0d24097da6645b SHA512 4951b23e8765bae8414de4e012306c5facf4825af949a48e1d02048f6c28fb4426d0a0ea3281b59ae606bd8f0c9b70a7549648c82da790bfa9209154884e9a47
-EBUILD bind-9.15.5.ebuild 10907 BLAKE2B 5291d61252d9f95fd80ffa0c74f0c146746551129ae20ae57b3b89ece4a4166c21dd29abc1bbbe0d31ab4e8a7e4fcd3456dd60369518d211093f6c03cc372f42 SHA512 524850fe8b371f815cb98c2347c063aac0e222e33c02f1e2f6e26afb39b9fe8380cff99e5f8386a3bcb81c9fb4c6d260e6b0e4aa296d8d531030f9c2c38653e2
+EBUILD bind-9.14.8.ebuild 11292 BLAKE2B 8029b0b3f0cfec9e39006f4ecd4bd3b2af668e22d7824707092a9970886d59aa4ad2cc11887ce909552e19976f8e1978c7fac0c2cca111ed606a8ed639474d94 SHA512 bf0cdd2c993ce1909439da92064f643e4c266b059b0c2fb315a1e6bf3aaebf3df820f14c87f78c794c81ad34aa5d968eabbc70f45483f6f8f0c76d8740715561
+EBUILD bind-9.15.6.ebuild 10897 BLAKE2B 59f50b0e5db6d33135dc98fafe8567a714ad1ae847b379a4b55e9a68c3a717626de8a0d8b4d1e07e9404e309ec74afbd5d22ff57b71273ec9a2228b645d84d97 SHA512 daa3cd1ebfd36c1699ddacfc2ecd9dbc927bf07ac9485b876d3b21cdc7079f02cd3fcec3edc85f5deea41ae7ef9006d95c4577b1929d10ec520c7e63294baf24
 MISC metadata.xml 1125 BLAKE2B 930164a56df7b9d5c790887910cc208335d05d763fc612595dc60413010e18268ee47831cd5b67cf9a1b7e0b1c730639404a7550b390c46cbdacd8ea11fe0ca1 SHA512 183029922f164fb03f6d781fbfb7298d6a5a73153dac1aad4eb78e9fe2f87f596fd408cfddd220dcf9e861cdb6d72d0c00dab0d9dfb5040ce366308c338e2365
diff --git a/net-dns/bind/bind-9.14.7.ebuild b/net-dns/bind/bind-9.14.8.ebuild
index 0aee6aaf90d0..fdf0e802d343 100644
--- a/net-dns/bind/bind-9.14.7.ebuild
+++ b/net-dns/bind/bind-9.14.8.ebuild
@@ -54,8 +54,8 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )"
 # sdb-ldap? ( dlz )
 
-DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] )
-	libressl? ( dev-libs/libressl )
+DEPEND="!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
@@ -193,7 +193,7 @@ src_install() {
 		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
 
 		# some handy-dandy dynamic dns examples
-		pushd "${ED%/}"/usr/share/doc/${PF} 1>/dev/null || die
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
 		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
 		popd 1>/dev/null || die
 	fi
@@ -219,7 +219,7 @@ src_install() {
 	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
 	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
 	for tool in dsfromkey importkey keyfromlabel keygen \
-	  revoke settime signzone verify; do
+	revoke settime signzone verify; do
 		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
 		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
 	done
@@ -245,9 +245,9 @@ src_install() {
 	# bug 450406
 	dosym named.cache /var/bind/root.cache
 
-	dosym "${ED}"/var/bind/pri /etc/bind/pri
-	dosym "${ED}"/var/bind/sec /etc/bind/sec
-	dosym "${ED}"/var/bind/dyn /etc/bind/dyn
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/dyn /etc/bind/dyn
 	keepdir /var/bind/{pri,sec,dyn}
 
 	dodir /var/log/named
diff --git a/net-dns/bind/bind-9.15.5.ebuild b/net-dns/bind/bind-9.15.6.ebuild
index 1d80f2f56f56..03873a3a2128 100644
--- a/net-dns/bind/bind-9.15.5.ebuild
+++ b/net-dns/bind/bind-9.15.6.ebuild
@@ -235,16 +235,16 @@ src_install() {
 		}
 		python_foreach_impl install_python_tools
 
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds"
-		python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage"
+		python_replicate_script "${ED}/usr/sbin/dnssec-checkds"
+		python_replicate_script "${ED}/usr/sbin/dnssec-coverage"
 	fi
 
 	# bug 450406
 	dosym named.cache /var/bind/root.cache
 
-	dosym "${ED}"/var/bind/pri /etc/bind/pri
-	dosym "${ED}"/var/bind/sec /etc/bind/sec
-	dosym "${ED}"/var/bind/dyn /etc/bind/dyn
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/dyn /etc/bind/dyn
 	keepdir /var/bind/{pri,sec,dyn}
 
 	dodir /var/log/named