gentoo resync : 29.05.2018

14 files changed, 22 insertions, 48 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index e5839ab0cf46..c1f5664344c0 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 19b44697928b..0c689f47b2a2 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -6,6 +6,6 @@ AUX avahi-0.6.31-fix-locale-build.patch 866 BLAKE2B 7c33b13670331ed1d89a88653790
 AUX avahi-0.7-qt5.patch 6033 BLAKE2B 10c7879f6e28942a32497c84dcf523f742cb13112d9e9c23f74967c2d6c05e6f463406716c144edc1bd4588c8c76693473765d9d678f6517c4a57615d0364b91 SHA512 cd8b900a5a068add3b7aa9080491938d469795c26e1a1869ee581b95d877ded4d120cb4db768fb4d97535a72e66c3fabf6617cdca2c9bdb50ff54e24d17b1f51
 DIST avahi-0.6.32.tar.gz 934004 BLAKE2B 76bbff65075bbc49d52b1e406373c4856622c22364cb5f1a4ccc0bf04a6dc7d54c58753a8cce6622e4fc62dc22086659ffbd157aeb1a6a30de353d08fd08a307 SHA512 e6dc788cc8691288ef001007006719b5eb022d484ee6fc84e68a7d227af5993e4d09484b824998155e5b25fc0ffc014beb8961d312982f63b82b10a6e2edee18
 DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc86825cae303f94c44482eea07cf6570d970ca286e81a787d6a64598b7123f2ac17a259ddc50ef431b9c94b530 SHA512 61f656da7614d8cca1862180038f571db3474c84f05db4d3509f614cdbf8b1a1047661b7e24d63682d5b48ed1bfa1b08b3c9e6dbe9222bcd62d99bc168a11abe
-EBUILD avahi-0.6.32.ebuild 5537 BLAKE2B 6709f83bb7f9edf048442085d37e6763d895919466efbc8dd129845876a487139e692b1ee129dc0256bb5bec3e8ec98e821abbf4aae025cd14a4b379d6781f14 SHA512 4f22dbf5f1b0ae6a96a84bc03bfaa96a797b686ea1b72e18884989a7f1c16707b6f239b4eb4c367573a6264d40fcc256ca13abb5730c9f31fba82ccbcad2da83
+EBUILD avahi-0.6.32.ebuild 5483 BLAKE2B f7ca98c08196df1b17bc12e8ddec5b9e69625506e7de2459c48a0e7ee744b1b84b5624379612e46feff4ba9e186d621175bad6346cff053e797970e5b675b6a5 SHA512 e7a880c13f38f72b7ed9d1627c13a82873869c2157d001d3af7e9451da486f63c4ad01980ec598652847ffbeec1c001ec9a11fd71e9ba4dbbb5d209f6cfcb153
 EBUILD avahi-0.7-r1.ebuild 5137 BLAKE2B e25de1aba20e1f42e45c4816c7ec8e9e8edc51b5b2d68077419a23672d67656482ecc817140bbe44dc858113a52186f0dad2d6c48a0b0378c8e9cb41b56aba3d SHA512 b2fc8f47a98d255d6db0c7fe1f6da485c1cbd3f043790510c21ce88d7341f15219ea1668830435380c98d676c455ea1b1d4d33a0974b66b77dec84afa894e8ae
 MISC metadata.xml 970 BLAKE2B 26904ceb3a89833caa77e2315d99be8ef729277a021faa3800a1cd0abe94c516d53176e65668d00687a6bb6ee807a2011106268f14a4d5012c27132e4fca4f3c SHA512 b9498d4757b6bd793846e4cbdd5c37da601a8e1430cafd1a6039ff54f8ff10576684c58801ebc679061f975cefa5909c94c30976e84354a5fcc7d2a586f7fa8e
diff --git a/net-dns/avahi/avahi-0.6.32.ebuild b/net-dns/avahi/avahi-0.6.32.ebuild
index 6e42b980484e..218142b2a49d 100644
--- a/net-dns/avahi/avahi-0.6.32.ebuild
+++ b/net-dns/avahi/avahi-0.6.32.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="hppa"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
+IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python selinux test utils"
 
 REQUIRED_USE="
 	utils? ( || ( gtk gtk3 ) )
@@ -34,7 +34,6 @@ COMMON_DEPEND="
 	dev-libs/expat
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
 	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
 	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
 	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
@@ -177,7 +176,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable introspection) \
 		$(multilib_native_use_enable utils gtk-utils) \
 		--disable-qt3 \
-		$(use_enable qt4) \
+		--disable-qt4 \
 		$(use_enable gdbm) \
 		$(systemd_with_unitdir) \
 		"${myconf[@]}"
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index fbbb7c449bd7..9620772e9fbc 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -13,5 +13,5 @@ DIST bind-9.12.1_p2.tar.gz 9305005 BLAKE2B 6be328e9e14a26d17c2f789aafc1f83a4690d
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.11.2_p1.ebuild 12446 BLAKE2B fe6955788d154964b51fa1fc891070dad6183da778f10d0fb9d0089032e3fe55b7aaf814aacff6de1685c447b44717827a765e47e347bd9c4d1e692e4aebbeb5 SHA512 10bd18014db1837d12398d1978c65a20595de1fed0227b5117c702cc749fbf5b19a37f236e4fe8907e7d50868e4d88fa28103b5c9e7a6c447836c9ddfa658862
 EBUILD bind-9.11.3.ebuild 12103 BLAKE2B 5ee8ee281a2d38c2785330c60e1c0ed434f7d4cc056a8eff93f6b2f0ba7ad4c4a96a2fd0843cbf0fe7f72d90a0f770add672c73a1fe6c90736d364acf25a1383 SHA512 4a09d416fa01b6f41a531908e9615180d4175311b7e7fa7190faa59edd84ab53ed736108598fb464dfc80985f9ed9e40c19444f15d5cc9953ab0a82b9b9b7f55
-EBUILD bind-9.12.1_p2.ebuild 12450 BLAKE2B 92f3c547215163472a67707574344066420cf9886eae118938fef4a65d5d827d24135fc89540222ffa084aca260f12ff2df31472fe94324ae6d2030300faab47 SHA512 cb0d10176ede36db3ab4111b39f2e7bd95d77dd08acc668c8d4357aa4770f3df5696cc8ba0bd5edea7ebefd6a8bea0dbde38ae9956c49e34201de1b9589bb919
+EBUILD bind-9.12.1_p2.ebuild 12062 BLAKE2B d9acac75ce778b1d30df9751b919160dd5b62dd729376471ef4f28625e236aced68958291e3a38ef3a5e7ec9417c189dad45285895049b6c3d2c064ba9b130b9 SHA512 5841daabf646ec8dc333e1df81b392b1ba7a22022a8c7905fe0cf677cdd5d8a98bcfd573cc261f1fc6d6b5da18e9b46137a9e7a9609694a148470fa622317a80
 MISC metadata.xml 1225 BLAKE2B 731eb2beeb78b21f6dfd01ad2ea13ca45cc26b34e767a0776ef6c6c5370cd7389a9a2670ada393977a9cd887c9e7f09bb64ade83dec6e131a0f7db293a515d7d SHA512 a2e7cc788973055c0aad540eaf2f0bacdc552299ae74e0f80a04bff091e457abd9386aa2a84b7b71fd4f612f960114c5a9c1cc9057bbabff3398737e064d42b8
diff --git a/net-dns/bind/bind-9.12.1_p2.ebuild b/net-dns/bind/bind-9.12.1_p2.ebuild
index c4deb0224834..a8a7a130b53b 100644
--- a/net-dns/bind/bind-9.12.1_p2.ebuild
+++ b/net-dns/bind/bind-9.12.1_p2.ebuild
@@ -24,8 +24,6 @@ SDB_LDAP_VER="1.1.0-fc14"
 
 RRL_PV="${MY_PV}"
 
-NSLINT_DIR="contrib/nslint-3.0a2/"
-
 # SDB-LDAP: http://bind9-ldap.bayour.com/
 
 DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
@@ -41,7 +39,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # -berkdb by default re bug 602682
 IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi idn ipv6
-json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux ssl static-libs
+json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
 +threads urandom xml +zlib"
 # sdb-ldap - patch broken
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
@@ -127,10 +125,6 @@ src_prepare() {
 	# Disable tests for now, bug 406399
 	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
 
-	if use nslint; then
-		sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:' ${NSLINT_DIR}/nslint.{c,8} || die
-	fi
-
 	# bug #220361
 	rm aclocal.m4
 	rm -rf libtool.m4/
@@ -193,31 +187,11 @@ src_configure() {
 
 	# bug #151839
 	echo '#undef SO_BSDCOMPAT' >> config.h
-
-	if use nslint; then
-		cd $NSLINT_DIR
-		econf
-	fi
-}
-
-src_compile() {
-	emake
-
-	if use nslint; then
-		emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
-	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
-	if use nslint; then
-		cd $NSLINT_DIR
-		dobin nslint
-		doman nslint.8
-		cd "${S}"
-	fi
-
 	dodoc CHANGES README
 
 	if use idn; then
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 3b6f27c9ab3e..5c0c9d0fc35c 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -9,7 +9,7 @@ AUX dnscrypt-proxy.initd-r1 258 BLAKE2B 86ceff0c2affc0508cafa782803498be680f4652
 AUX dnscrypt-proxy.service-r1 445 BLAKE2B f6e6af96d6b11892aa8d7aa111ca42dfe6589abbb6e5e214253fdc4f6d6686484e22dc24f45f05b23223bb8ada91e594bd0d015d35ed4850ce47e90d778a7867 SHA512 ff226e1f6416de04b42828ab89a0df48b4eac1385f489ccad594b5e07cbceb57249006951f25237a55effdd2acaf8ce7e0fb2c36fc17799f963d506696b0cb4f
 AUX dnscrypt-proxy.socket-r1 152 BLAKE2B e4eb7875f749646f77675b39c7c74f57d5674d825329891b0f128e190ac3625d28f81df8004975828080c6eb9665a8c0825826b5ccf305694c03c2e196da3dd7 SHA512 920014c202344726e645f3bfa5def0f194c215cc0ce6e45750e82cee3434399497b9ad3fb5268afb1823689ced0fa8d177d6411b3153661b97fbd55984752a87
 DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
-DIST dnscrypt-proxy-2.0.12.tar.gz 2775112 BLAKE2B c3a1085c7c4d005d323d2d3e803b7bce447b86a8f2e9bff0eb7e5e145d275dd19fe6913c805be9469ba0a492f7a479a146af56a769432d8120790375628bb936 SHA512 757a7a88e8f6ed61462736184f0ca8426c40f800f54727881412de44c527e4334a6b42aa6906c19ecf9287d462a1ec7bd55cb471781bd94c2a0faa8ad7055137
+DIST dnscrypt-proxy-2.0.14.tar.gz 2876583 BLAKE2B f93b2ba8991668691d503a5c039c4bb8eee0f474893c99ebd68067faa2a530832434c08654f61482a9d5b876ecf10329117b76a20b837fde00d72521170a1d86 SHA512 2574f900b6e2f75eeeee2f634e22df41145243c23cd9a890fcfa73f13b7d032bc2b029cbb6498f5c2cd33e212392ca2298a1dce6bb369be5c9afccc21a706613
 EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
-EBUILD dnscrypt-proxy-2.0.12.ebuild 2876 BLAKE2B 1d8617576f87525d517f7a32be2d4f044fdcfc865cc11278a4469c1c2ff9c6f550f8d244adc97852ca48d03388845259335f9d837e5e40d2893bbe74cf7e47d3 SHA512 f77bb0d9cb3bea881c4bb15cf027564937bfbde26fbcaad3e58ceefc39dfb935dc165428b9365810af1e4df7a7d00526a41d6b2d749ad357fcab1273d0006cbf
+EBUILD dnscrypt-proxy-2.0.14.ebuild 2876 BLAKE2B 1d8617576f87525d517f7a32be2d4f044fdcfc865cc11278a4469c1c2ff9c6f550f8d244adc97852ca48d03388845259335f9d837e5e40d2893bbe74cf7e47d3 SHA512 f77bb0d9cb3bea881c4bb15cf027564937bfbde26fbcaad3e58ceefc39dfb935dc165428b9365810af1e4df7a7d00526a41d6b2d749ad357fcab1273d0006cbf
 MISC metadata.xml 941 BLAKE2B 234421b342985e6980a870bc0f7e4dc96e2867d89aa589ac23723a7a7cc4767109de7f046c817c3a21ea1bab23d352210941dc092b002dd3a7374be6c459877c SHA512 6bad822978132f7467756a88695e9e87a3ec2c007af04b423496f7befc1fc4de781a78bac17167b6de6682688e3ef445e5dce7f6f3f3e9c25a632e6222268918
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.12.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild
index 0b64d8b992e3..0b64d8b992e3 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.12.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.14.ebuild
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index a90143971d0c..e6083b8285eb 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -2,6 +2,6 @@ AUX idnkit-1.0-autotools.patch 1843 BLAKE2B 75043eeccb34f00b9faab57d7db7ec608119
 AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e7b604c14a5680e24b80f5d9188413fe4e8f5dbbc55e72fe5d4c453c94efd231110238f68ced316986abeb6134f8173 SHA512 63d76f9ad95fc83c00259d41dcfdd47442bfda6f1dfe861a824146ded113d18284c1fe6f0f5ff1eba05a9a38055e7e8fdc3579fc14a3b441d831a9bd5b75af7a
 DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
 DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
-EBUILD idnkit-1.0-r2.ebuild 1058 BLAKE2B 11b1bd1d8baa95dfa3483fe482938a37871cb347bcff34943554a7c490af71fba29a457acb8dd5f97237ec8685599c6e187a3c088db4d32d218a09d2ee2972f1 SHA512 03a7a1c838acf7c90bec72ecbdd6901bc97cbc9d8ed85c6180329f2672f7e4a0cdd941d64384fbddc6697e5976f849f3f5cd428e347df47f969431bd4db00270
+EBUILD idnkit-1.0-r2.ebuild 1060 BLAKE2B 9cf072504d7e4c0c47eef5127ee0b6427e4505711ac7615227da3d513c444b90e12bc1a73ad1904d9d6780c11b3ed04b502531723f3b7e9edc2f590399ea3ed9 SHA512 cd865b076767cc07f65e56cfead10ddfa3f11c2e99eec844000b7bcd7e91cb739190a723f38c11771c10fe8317c543a91d8d64810b8402b5f7917f6ec979bae4
 EBUILD idnkit-2.3.ebuild 628 BLAKE2B b0cf5e2cd4a27b504426899ca89cfd71d2f4556912e97e361c5c48d3548b81401e23f08f6bb7da626b7dab15b34dc982c643b77b1c1d9e0348a5c6ef1c847fed SHA512 66a21b3b8bbb5997decf4ab8b0218db8165e31f59ca36d2310bc33c08485a5e8d91885ca48d1889b38d7d7e87a4d453598e28fd991cf3f3322c68e875b108ec7
 MISC metadata.xml 290 BLAKE2B 9b8f414f2eb140cd1c4c9b290bbd4f3d36e58649b68a9ed478ba55661df34bd1f8e1ea9c6d132e2edc4365bb8d4abd5f78d9b0f24e588d548354f63057da0b78 SHA512 5ae703d1a74d5fe45ac66f8f4922b754999932112931b8ba1f46d4a2e769a5d7130b4a418bf687d857a89f20e287d85e384236848c0e01747d0aa1c1ea350492
diff --git a/net-dns/idnkit/idnkit-1.0-r2.ebuild b/net-dns/idnkit/idnkit-1.0-r2.ebuild
index d49a09a1fa6f..09be15ba9d37 100644
--- a/net-dns/idnkit/idnkit-1.0-r2.ebuild
+++ b/net-dns/idnkit/idnkit-1.0-r2.ebuild
@@ -6,8 +6,8 @@ EAPI="5"
 inherit autotools eutils
 
 DESCRIPTION="Toolkit for Internationalized Domain Names (IDN)"
-HOMEPAGE="http://www.nic.ad.jp/ja/idn/idnkit/download/"
-SRC_URI="http://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz"
+HOMEPAGE="https://www.nic.ad.jp/ja/idn/idnkit/download/"
+SRC_URI="https://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz"
 
 LICENSE="JNIC"
 SLOT="0"
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index fcb399eb7cbf..706165d57b23 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -3,6 +3,6 @@ AUX libidn-1.33-CVE-2017-14062.patch 2348 BLAKE2B 4f9606d25405d950f23444886e4230
 AUX libidn-1.33-parallel-make.patch 3584 BLAKE2B fbd1f372b11bc1da38bdeb3a8c0f01708339e0a7c23da7f22b450985a2b69c31887a5f686430e5014d1a5c116ae7e03b922c0350f3926e5a43e5cbc6cdbbfb83 SHA512 de98b4122c272bcd38a673beab8da56fac5b4c877d4bc0930505979addf4cc4e85fcf065ee9044d1196e83b1d2d5389ee8dceac4ffe7bf623a3f3c7bc7aca4f1
 DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
 DIST libidn-1.35.tar.gz 4169217 BLAKE2B 809f9e854a4f2fcd3b2d5f7cdb34e2c68a0f00f5fcffc9002ead2d2d3dcee38022b3288f29716437f65f09e259e35cc98679d9c9d943423190cebb76fcbc94fa SHA512 782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09
-EBUILD libidn-1.33-r2.ebuild 2882 BLAKE2B 882b4421c020f431c6c3be5f0e64ea1f2b0111c2214b49d7940f9a9dff54f6780a4efef71f6469e1d02aa0e4300d4fc5ef13911f4b10ddc4090a3e1f0c925356 SHA512 b91e73753ee12dc9d73b455f962010716cde98a56b9b8c436350383ced5bd4095ded41ba804723cdc7d2cc0e107f57ea840385c0d2110e5e43016d454031208e
-EBUILD libidn-1.35.ebuild 2655 BLAKE2B 3a19295760a5f8c145db6bad8895e9b0d47d832b0619425451d48745d9743e36fcedadc3fc9a4a41b9039215c0184037eee854acfabbc170ce59750240f62e29 SHA512 861eae15baaa87789ffd2a8a4d62b9316f4631f48f490fa915973162acc6d2ca741e94804de963d64f20a77922f72d64bba5f2880cddab4434d1d6fb4ac33837
+EBUILD libidn-1.33-r2.ebuild 2879 BLAKE2B c57bb01c91e3a82c5f68961ab0df8e12aba16781d59800fa82440e507555b996fa04da2c386a36d5021f06f6fa28a52afb93133d863d22b3f18b98ebe811af2a SHA512 965d7cc368ef053ab4cfeb9f7fcab9a1f9a618e2242810585950dca0a7266947ecd5ecec69be747c0db07872e5d90f39300c577ccb28b324b6017a9531e4c11f
+EBUILD libidn-1.35.ebuild 2654 BLAKE2B 3de2aa84ba4b997c1e2955d6c88f54b55b85e2ffcad5514129d99421ae27da763c963de215caaae57dad8a27e77b72be481922b890d7c4e8f68a1d1bd85dad71 SHA512 6fbf0397ff674d6a06f1f302e6c1fb9110ac4b19dc0d47436f1375fba61a7c50cd0623d57e6e6bb9cc88fec7fb1b0dddf53187de5da9fb02dc8571ceceb1fbda
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/net-dns/libidn/libidn-1.33-r2.ebuild b/net-dns/libidn/libidn-1.33-r2.ebuild
index abbb94b63817..16e6204ad397 100644
--- a/net-dns/libidn/libidn-1.33-r2.ebuild
+++ b/net-dns/libidn/libidn-1.33-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/libidn/libidn-1.35.ebuild b/net-dns/libidn/libidn-1.35.ebuild
index f08a6c65b429..abe22a2db2c2 100644
--- a/net-dns/libidn/libidn-1.35.ebuild
+++ b/net-dns/libidn/libidn-1.35.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0/12"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-dns/odsclient/Manifest b/net-dns/odsclient/Manifest
index 56dbeb9a7597..e4d83ca40600 100644
--- a/net-dns/odsclient/Manifest
+++ b/net-dns/odsclient/Manifest
@@ -1,4 +1,4 @@
 AUX 1.03-gentoo.patch 461 BLAKE2B c022e88c4dcd4b10c6207cd25555f1bef861589ca965251b219bd2cfbfe650460305323f3058d0ed56ca8ee05ca6ccb6b0972678e2b1b6a662bb8110a1cba07b SHA512 6a567daef79997488ac328f31b3f1cb8bd299399a6bf831bd19591f2ebd9d94d94a5949baefbfa98031aa6eadf34cfa6192b1e0bcd3282bad1acb05a4e8b9e03
 DIST odsclient-1.03.tar.gz 4263 BLAKE2B b4d04133b9ab837cd3df06cf331aeb5b0987d370d27e824776374135e0340e42449fa24027eaaed2a4921b82abc9a61e4f750fdf1aba1a33b91780a4662704dd SHA512 12cc8b734314ec23432fc7ca980e099eee04be84134740460b7ab3edcff1abfb116794504653ef0af72b27fdc2b074633b96196e1894092152e1bd0e8300ab11
-EBUILD odsclient-1.03-r1.ebuild 626 BLAKE2B b45562e1a4ae625200c5d6e52b100dc38f6da498afc287f2941dcee84c0e48ecd746067ef29560b1b7520dc92fb6265a4d156060509b5a2236880bd3b185a9d9 SHA512 80e7e6df66f8ad354ffa865e04ddca3f9a310c7c2104f0c637f1332aaaeb36c6493b5e2d7997972f3b4a7430212ffb741c215897681bb0432737b7224939b2f9
+EBUILD odsclient-1.03-r1.ebuild 630 BLAKE2B 6e000d80862a85e1dde174f468cdd7f8486e6ef15bb45fa5fc70d5bcef7d16a39898c2497027f716087319511c56cae6175481c4f32348df9a2f7ced0e3912a3 SHA512 1ec71dc18374d4595141f22981bb849a8d3e1f568b68e1cf84a46b1a443133d944ce3b30a15d8e7235eb74d75e318e2f18b5bbb17a53f4bf2edf6b396724b84f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dns/odsclient/odsclient-1.03-r1.ebuild b/net-dns/odsclient/odsclient-1.03-r1.ebuild
index d679353f7246..4f928f134a1e 100644
--- a/net-dns/odsclient/odsclient-1.03-r1.ebuild
+++ b/net-dns/odsclient/odsclient-1.03-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Client for the Open Domain Server's dynamic dns"
 HOMEPAGE="http://www.ods.org/"
@@ -14,10 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${PV}-gentoo.patch" )
+
 src_prepare() {
+	default
 	sed -i Makefile -e 's| -o | $(LDFLAGS)&|g' || die "sed failed"
-
-	epatch "${FILESDIR}"/${PV}-gentoo.patch
 }
 
 src_compile() {
@@ -30,5 +31,5 @@ src_compile() {
 
 src_install() {
 	dosbin odsclient
-	dodoc README
+	einstalldocs
 }