gentoo resync : 01.10.2020

5 files changed, 9 insertions, 6 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 6c88698ca804..bb6aea80aadb 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 0d701ce40710..cc7652f2c58f 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -12,6 +12,6 @@ AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826b
 DIST bind-9.16.6.tar.xz 3228368 BLAKE2B 0c2265fe0e006679733a4f7610b0c33bb8e2bd32caf26dca8cfedbea0e08df9e7665cbbbf5321199bd2e30b97ad5b0146ae4e8a9a78abadbe6d067bbd1ad8a3a SHA512 37f57db6d1633cc85a4d954a69bbb3372c65ac43fef965df5aee8dcdd32153bb5b0c6d0d5f00f353dd4464c71d74dc8e801937b930e2b8f6799fa77af5f243e0
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.6-r2.ebuild 11015 BLAKE2B f33043400501d72dc1f85cdf5c45c9a5b27851d112f21e99c2cc59e31b7b699099c82e13ae08d9331c4f6ac9cfc0d599d42f0162df7bfdd580c525b58c49b53c SHA512 d4454404172a98224d2323dc46e590b61f792b9c6341037d5d3ac03731baba6f8d011c2c2e2c66428734ae836285e076b49531fa7d6d32cb92d0321948cad962
-EBUILD bind-9.16.6-r3.ebuild 11278 BLAKE2B b9caa0f8b32b0145f7ad8b3607d148b67bfd7342453d6de2289856176dc730b6ca5bcf77bb049a63becf619df0a0e9d2d8f203a185beea213feb018bebc3d975 SHA512 fdbdcde04a3cad843cdbd886329184ebfdb52b962800fa620b7624e3338e7164648d48105c716e5508dd6c2d0901809e629f08c1baa728f30dc4e9405b709892
+EBUILD bind-9.16.6-r3.ebuild 11451 BLAKE2B 52b77e388192b61161aadd29a4ff13017d306fc8294ef384d3c363d5fbacce92f0e16c58f86da1b62019bdb35e6095fa5c220483929f472fb360525e89d12a37 SHA512 588292ba1e449d51921df439b03247706a0219a5937d4e5595c4ab97262fbab2b53f10f6ced5beb9cf5a92150847b28a355c7fd74d6d921358832e517d1cdeb1
 EBUILD bind-9.16.6.ebuild 10766 BLAKE2B 83963e592f2ab27789a0f4642ba5dd9d2cd6dab28e444b502962d140694293c4ef7d7bf60c68e709093fd2e9cf34af3f28b3768683e2bde20aaf208abbedefa2 SHA512 5de5ce0d73fba42a52c9e516682f50878033e4a9cdc6866f9b7d159efb640feb29b2643b43bc4542a5e2b46349ba2e11593dac9d767eb37d4ad5dd9e45ba5f2d
 MISC metadata.xml 1043 BLAKE2B 3bf699db16f6883700e32e5f0debc534fa2d763aca0cf8fe3878dedcbb110410d88c2dbb69b4d4df09df62943416de3aaed7d53a2371d004b8c19a2a5a609bc1 SHA512 137093eabcbda1feb7cdac0cb0b2eeb808a47062b4e8d114874ee4019847ecbf5996c7b19055981a5ebffd099b5a96ce6ada919719017d83f93bc679334845b9
diff --git a/net-dns/bind/bind-9.16.6-r3.ebuild b/net-dns/bind/bind-9.16.6-r3.ebuild
index ff2089ac70ad..d23c253ecf1f 100644
--- a/net-dns/bind/bind-9.16.6-r3.ebuild
+++ b/net-dns/bind/bind-9.16.6-r3.ebuild
@@ -152,11 +152,14 @@ bind_configure() {
 	# This is for users to start to migrate back to USE=geoip, rather than
 	# USE=geoip2
 	if use geoip ; then
-		myeconfargs+=( $(use_with geoip maxminddb) )
+		myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip )
 	elif use geoip2 ; then
-		myeconfargs+=( $(use_with geoip2 maxminddb) )
+		# Added 2020/09/30
+		# Remove USE=geoip2 support after 2020/03/01
+		ewarn "USE=geoip2 is deprecated; update your USE flags!"
+		myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip )
 	else
-		myeconfargs+=( --without-maxminddb )
+		myeconfargs+=( --without-maxminddb --disable-geoip )
 	fi
 
 	# bug #158664
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 743aa9f23dd4..4de5ad6afb59 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -4,5 +4,5 @@ AUX pdns-r1 2535 BLAKE2B 4e718bbba73b20a86dd11acc07ce91d259d82a3fc3e6133cac0d7fb
 DIST pdns-4.3.0.tar.bz2 1211536 BLAKE2B 3291597c4f0c39e23f793b128ef26b1ce3dc77640ddf6979242ab291b0e2780ae5c19b18591ea90f5282810044959feca265a245e27eca1f2ebacbdeeb8a3785 SHA512 0734dbfb83a2e5080dc54cfc016ceb3e1f7e15a2de2f33392b2f3c995357fa97f9e87ff21e969f148c3e881165471d3058eb2b9cf632117ebce0d7818e025fe2
 DIST pdns-4.3.1.tar.bz2 1216876 BLAKE2B 0449835d104ec430329dc88087b489e29f1e1fa0c2a22af8715883a0a80d73f3a4848df207abbf986b946c640c4f1d35a1c8335f13f96a00915e4a40bcbecc9f SHA512 e61e23544f1e57c1ec3a85b4edbc3ff3e8e831410237afdc8896e9f34602774c1dc8bd02eb7440e765262fcc988f98e47b6f1b7945427b1f4a59dd6b84b9437e
 EBUILD pdns-4.3.0.ebuild 4610 BLAKE2B e9780e7d468a487f822c695a9cb590aa687ac1c7cdb40cdab1927ae3f22a273012141bff264320df0cb94060cf474ff2e47b9ff4657c034aa47b0c305032eec0 SHA512 3ba103d2a7ae26e524e56ae7bd01d4f260d9b511eeaf1f46e72c489594a5eb1bcc2ce213f21c0fca518c89841b25ecf0a1a60bc913ff3a60ae8632ef31aaeaf1
-EBUILD pdns-4.3.1.ebuild 4619 BLAKE2B 9fb5559e5fce3c1275fe8dcccb50ca3bc4db91f55ccbb9a610802c765d82c16d96a661c5a642b084e6449d5f28c2222ad7e0e1f5a40d6c631f8309cd9c5482ed SHA512 23ea084439881b6d50535d92eb73b38979c3940936d6b6f8538ef899da24f2f8e1c5f5e1f786cf0bfbccf38621f75edc963579744bfbb42dc6c4016c7b7b803d
+EBUILD pdns-4.3.1.ebuild 4617 BLAKE2B 3d3422c4aaafe2ab67c78e4fb48bee96a8892ae31dc2149651457fdde860958ebd58b996a69a639c9902939f4dc490142f4ce2577e83d565fad96d111bf4da7f SHA512 90a6ac58a451ed37989a4b80d4eb3a1268965cfadb9d4a9437b9b0bf08aecad9c09adb8ef2cac5ea3528d09d04e3a789eadd4d808d254668d3549b530203f6cb
 MISC metadata.xml 1111 BLAKE2B 5a55e94593f1c010f9ee71fa2d3bc887a0eddc8627db36a1792b911a1cfe3fa3d5a33923b95d18a02f36097717d76ed2aae711c2deb793625b1186090ad072c8 SHA512 c010bbd0daa87980a4d9f164fc3d15239251890e56c63b1165d55a92b9c0f24e5f141439bdfc13b4efa4483e0fc199cd6107e2f152d26d4ca954f4c3d0cc4913
diff --git a/net-dns/pdns/pdns-4.3.1.ebuild b/net-dns/pdns/pdns-4.3.1.ebuild
index 7765dcc623c3..edfaa48dfc85 100644
--- a/net-dns/pdns/pdns-4.3.1.ebuild
+++ b/net-dns/pdns/pdns-4.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.powerdns.com/releases/${P/_/-}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # other possible flags:
 # db2: we lack the dep