gentoo resync : 22.04.2018

14 files changed, 55 insertions, 51 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 0c14cef9eef6..0884c6c2b760 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index fa7a9357ac33..4203d865ba72 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -20,6 +20,6 @@ EBUILD avahi-0.6.31-r11.ebuild 6261 BLAKE2B a11de83cced8adec29e5a3df8ad09fc2dd16
 EBUILD avahi-0.6.32-r1.ebuild 5732 BLAKE2B 6b17c7e9d223e288e309ef3f51326bff5d3e895e12a1db585f0fe3a086ba0a80bfaccb0d9ef79b769200fe985be92826efb64eb071ca93c79d82a4addde91b98 SHA512 d26256a031d5d7ce6cf58ff4c98d5a88ed93498d0383e1a425e88bc9f1de4ee18c0b2ab6e987163b5a27acc807199c8f91276e449dc6d951607c1dfddfaa74c4
 EBUILD avahi-0.6.32-r2.ebuild 5971 BLAKE2B 97aa22378ee9791dddb866a097b4c1fe69152e90939d67b1a95c890488b297dcf80e2df1f4435af0d69f798c9fc7d6365329ff481b6f24af50dbe37dcf2fe1d5 SHA512 e25666354328ba52955b938d4cfd1d0ff661cd6c536fddfc8cfc84afdaaebdafc8091bd99d17d737e79242c45b858df23a3cfbed8cf0c5491bb70ff7ed192b93
 EBUILD avahi-0.6.32.ebuild 5584 BLAKE2B 48672b141bd86b76838acae05f4d6e3f4fffeb686e42e058b8b8c3c771568df7ca12bee6a215079729d585d6415c30146787e73aeb1b84abafbff5da00ec9b48 SHA512 031b6ea7962717de7f984c78a2814312610b86ce391a2474117b34b2e8c542a6de49b75998c99639f866f415b878ed58f807a12ea713d3b1d15ef0657013e4a0
-EBUILD avahi-0.7-r1.ebuild 5131 BLAKE2B 4f8f85c5eeb0df8589a7c534980163ef28974a38de6ac67c8a5396cabc2e3a9f16b42ad25f57f9dce55473260bf04e6df56f0d3179f1eeda0147a06301e3afc7 SHA512 35faed8d2976bedc0db3d1c5926af4150c2054d421f9908a65d35c0ea2b5d254d9d6efe21662daf2f64400e3da0a338820bef61960e4bb3945d8a91c59d2fc2a
+EBUILD avahi-0.7-r1.ebuild 5130 BLAKE2B 936b566d70398f1fd886a2b07865401bb2b8a873ce140e7f667c8b9258b3814bb0004d9f140b57745c18b2a4093de76526a2d957a5bd8dd065f7815c88c06a70 SHA512 9103a228c852f229524fb26f9fb5f8c54f046e70ac63a6798c0730b11282de4f551614a03b679ae7f30f12e72a30966ec458137567c7f4d818c6d5ed6eb7cccc
 EBUILD avahi-0.7.ebuild 5189 BLAKE2B 2ded9ac255310a284f2b1a91a770a9ede5da20b5f351cfeca0908e7b67ec643770e6f6390490524cdb76637bad65abb7e2d0d223c5faeb531b9d48386e34c458 SHA512 60501ee89aedb2733643183793f144c0d6a3409c630fe829180ce6c600847184f5e61dcc049e2e412fad3bb9b2237d8772c506624fabe760ca49245a4cb5fa2c
 MISC metadata.xml 970 BLAKE2B 26904ceb3a89833caa77e2315d99be8ef729277a021faa3800a1cd0abe94c516d53176e65668d00687a6bb6ee807a2011106268f14a4d5012c27132e4fca4f3c SHA512 b9498d4757b6bd793846e4cbdd5c37da601a8e1430cafd1a6039ff54f8ff10576684c58801ebc679061f975cefa5909c94c30976e84354a5fcc7d2a586f7fa8e
diff --git a/net-dns/avahi/avahi-0.7-r1.ebuild b/net-dns/avahi/avahi-0.7-r1.ebuild
index 375264481417..6ddada6f2538 100644
--- a/net-dns/avahi/avahi-0.7-r1.ebuild
+++ b/net-dns/avahi/avahi-0.7-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
 
 REQUIRED_USE="
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index eb6a8a9729a1..72e499aee7ce 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,4 +1,4 @@
-AUX config-full-paths-r8.patch 2472 BLAKE2B 41861b0b443c1b31031181b9a36194b7ae06711e6c2ab0547c27359066763fcc0ef673663a5309faf4470340a574ed83d3ae3aefe09941996e37a75b84ee24f5 SHA512 d4c275d9299af90c52dbcd416626fa9c0c5af90aa782d4df38afde7db15abd77ab3dce7dbdc0f2082f9b83624adedb6288e917bf64b082bb1295c301b92be919
+AUX config-full-paths-r10.patch 2487 BLAKE2B a0c7ff420a9000903ec8fdf446c463ef367db2ec934147817f08c12277d5e1704db7c7ec89ec068a5cdc26f88eb794f8caf6d9eb318764783ad62e22ce9a2798 SHA512 15a8af5fff20d9f9d7931faf40d2f9ff1a960a764d7330287af65290e85e986892f0b94a6b311e8ae0be60be3b78caa10c71e438275f20d44706850c2a61d407
 AUX dnscrypt-proxy.conf 8912 BLAKE2B ea1b196528dae0c9536c12e3ed6b9839830ae4f89203ea19332d8238cbeba599a202557c75de1d77e2e4f306db1d2a1dd2bc352891bbc2f8a3595c8aa253fa6d SHA512 1e45f38a46383af14695cd44531335801ae315d819e9593e931be0fd513059c87ddfc9128158a532c6bc26cf113635c9630d8694764dff5a46a6a98c5ea8b42a
 AUX dnscrypt-proxy.confd-r1 41 BLAKE2B e73624ac07b382c9dd66970e12da3e00a669d548a32b16aec6e4227a0af73980f294444507c86fa0ae26e8f9f19c6d533f83ecdcbdcf9d8c28a8c47439844d77 SHA512 2f381c21e92a8f74d47f6c5d3d18bcc32a2713d3b7d82f260d8e2770bfb6aea0a46f8d957796c64d02e6a0445f92c31b83b29724b8004ba9fcc7f6fcc93afaf3
 AUX dnscrypt-proxy.confd-r2 119 BLAKE2B 00c216f87133aaf606c9c753ba5eb3d400363406abb4c25bd8f203aec8b8fe3e5c621deb4dea4f2db801c26ec92b3af609cc5a7bb954181641c1deeefa3aafcb SHA512 b144cd8f67b6ff06156841cf619ab4cd94855104f00fb1877c83308b6bf4d8addfd59ab1134c51855465a6daabbcd445550976c9d956d0795fa09f3b0482ac80
@@ -8,7 +8,7 @@ AUX dnscrypt-proxy.service-r1 445 BLAKE2B f6e6af96d6b11892aa8d7aa111ca42dfe6589a
 AUX dnscrypt-proxy.service-r2 581 BLAKE2B 1d873041005135b5ca01aa2b24f373056a4281604a8e69675912d86ec7de34c318c899a1628bcd758019c8c105179d231630dd6aad520ab5a8e86fe64b8592b7 SHA512 40552beb4f640881bbad0cf0c40406e5c1e4ec236b4e1d89a88af4eef888f91c8170732273990bc4041c39e742516664651cc89f7686fba941697a148b9345d4
 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.8.tar.gz 750606 BLAKE2B 83a9201389061c250e0c6bf535ff2e718aa9f67202887dcad33847160325225ccc1197b98343a8012bc84f5f42f049131b01b78febd7a418d47db946c9f58779 SHA512 c7e7d5d72fa6874b2b6b4deaaf6c80e4a2e812670b71bf7a308535a5773e84e249263bbb66d18fb844d8e440703facb0902f3872b117433582696695cb5a7265
+DIST dnscrypt-proxy-2.0.10.tar.gz 2773118 BLAKE2B 331b62c84cf84f26757dd5e663d5ea8fa59b90a2b149cac5e795b6f7edad810b7dcd0fa2e6e9ce77d6d19d9d708a9ed7d30a7e8d43986545c6f38c3e623e3681 SHA512 b28bbce986bace9c4ee1acfe5b372b9f847d5a0a199b085ead31813ad697753b6a25cead72a90a1967bd473bb4bcb591a384765b2de9af817af0dde3d33dcb58
 EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
-EBUILD dnscrypt-proxy-2.0.8.ebuild 2448 BLAKE2B e520cea047806e87cc1db8f108d515bbf7ed97c9aaeba303a8790d15708dce69e88c477bcc1a336dba3b1fe067eadd8e35b5325cefd7fc1f9d2cbe30a87ea629 SHA512 a42228d24b808b3f531be5801671fe41d71bafbd885a1ad4805c9753f8d0786336c3b908403388a30b3be000bec001b7ef3be70d4cd21a8e043557ecc8f6ea3a
+EBUILD dnscrypt-proxy-2.0.10.ebuild 2692 BLAKE2B 72884728ad3012578ac8b1eb3799c5cca44ec8daeef67f045409e6ddd99a9dcd58ab2bec22a0cc47a74e3ef4e8ac09325ebc99e881dcc69b162bc60b75ab0c63 SHA512 330ecba2bf86b48b3308decbb5464d9572d5522d65188ab9de2f12b39ec5dc24870b39c81706cc62e7aab57073c1193a708e11a63f5a65ef66eea58c45fc614b
 MISC metadata.xml 941 BLAKE2B 234421b342985e6980a870bc0f7e4dc96e2867d89aa589ac23723a7a7cc4767109de7f046c817c3a21ea1bab23d352210941dc092b002dd3a7374be6c459877c SHA512 6bad822978132f7467756a88695e9e87a3ec2c007af04b423496f7befc1fc4de781a78bac17167b6de6682688e3ef445e5dce7f6f3f3e9c25a632e6222268918
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.10.ebuild
index b162076d23a3..948f785d3d5f 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.10.ebuild
@@ -14,21 +14,27 @@ SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
+IUSE="systemd"
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r8.patch )
+PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
 
 pkg_setup() {
 	enewgroup dnscrypt
 	enewuser dnscrypt -1 -1 /var/empty dnscrypt
 }
 
-src_compile() {
+src_prepare() {
+	default
 	# Create directory structure suitable for building
 	mkdir -p "src/${EGO_PN%/*}" || die
 	mv "${PN}" "src/${EGO_PN}" || die
 	mv "vendor" "src/" || die
-	golang-build_src_compile
+
+	if use systemd; then
+		sed -i 's|\['\''127\.0\.0\.1:53'\'', '\''\[::1\]:53'\''\]|\[\]|' \
+			"src/${EGO_PN}"/example-dnscrypt-proxy.toml || die
+	fi
 }
 
 src_install() {
@@ -36,18 +42,17 @@ src_install() {
 
 	insinto /etc/dnscrypt-proxy
 	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins "src/${EGO_PN}"/example-{blacklist.txt,cloaking-rules.txt,forwarding-rules.txt}
+	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
+	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
 
 	insinto "/usr/share/dnscrypt-proxy"
 	doins -r "utils/generate-domains-blacklists/."
 
 	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r2 dnscrypt-proxy
 	newconfd "${FILESDIR}"/dnscrypt-proxy.confd-r2 dnscrypt-proxy
-	systemd_newunit "${FILESDIR}"/${PN}.service-r2 dnscrypt-proxy.service
+	systemd_dounit systemd/dnscrypt-proxy.service
 	systemd_dounit systemd/dnscrypt-proxy.socket
 
-	keepdir /var/log/dnscrypt-proxy
-
 	einstalldocs
 }
 
@@ -72,10 +77,15 @@ pkg_postinst() {
 	done
 
 	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "To use systemd socket activation with ${PN} you must"
-		elog "set listen_addresses setting to \"[]\" in the config file"
+		elog "Starting with version 2.0.9 ${PN} unit changed:"
+		elog "It now runs as an unprivileged user with dynamic UID/GID"
+		elog "and privately stores log and cache files"
+		elog
+		elog "See man:systemd.exec, man:nss-systemd"
+		elog
 		elog "Edit ${PN}.socket if you need to change port and address"
 		elog
+
 	fi
 
 	elog "After starting the service you will need to update your"
diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch
index a5e9a7c21171..aba278c221a2 100644
--- a/net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch
@@ -1,6 +1,6 @@
---- dnscrypt-proxy-2.0.8/dnscrypt-proxy/example-dnscrypt-proxy.toml	2018-04-04 17:23:33.607326639 -0700
-+++ dnscrypt-proxy-2.0.8/dnscrypt-proxy/dnscrypt-proxy.toml	2018-04-04 17:26:18.174044063 -0700
-@@ -86,7 +86,7 @@
+--- dnscrypt-proxy-2.0.9/dnscrypt-proxy/example-dnscrypt-proxy.toml  2018-04-11 05:05:16.000000000 -0700
++++ dnscrypt-proxy-2.0.9/dnscrypt-proxy/dnscrypt-proxy.toml 2018-04-11 22:29:21.810501858 -0700
+@@ -96,7 +96,7 @@
  
  ## log file for the application
  
@@ -9,7 +9,7 @@
  
  
  ## Use the system logger (syslog on Unix, Event Log on Windows)
-@@ -215,7 +215,7 @@
+@@ -254,7 +254,7 @@
  
    ## Path to the query log file (absolute, or relative to the same directory as the executable file)
  
@@ -18,7 +18,7 @@
  
  
    ## Query log format (currently supported: tsv and ltsv)
-@@ -241,7 +241,7 @@
+@@ -280,7 +280,7 @@
  
    ## Path to the query log file (absolute, or relative to the same directory as the executable file)
  
@@ -27,13 +27,7 @@
  
  
    ## Query log format (currently supported: tsv and ltsv)
-@@ -270,12 +270,12 @@
- 
-   ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
- 
--  # blacklist_file = 'blacklist.txt'
-+  # blacklist_file = '/etc/dnscrypt-proxy/blacklist.txt'
- 
+@@ -315,7 +315,7 @@
  
    ## Optional path to a file logging blocked queries
  
@@ -42,7 +36,7 @@
  
  
    ## Optional log format: tsv or ltsv (default: tsv)
-@@ -303,7 +303,7 @@
+@@ -343,7 +343,7 @@
  
    ## Optional path to a file logging blocked queries
  
@@ -51,7 +45,16 @@
  
  
    ## Optional log format: tsv or ltsv (default: tsv)
-@@ -373,7 +373,7 @@
+@@ -371,7 +371,7 @@
+ 
+   ## Optional path to a file logging whitelisted queries
+ 
+-  # log_file = 'whitelisted.log'
++  # log_file = '/var/log/dnscrypt-proxy/whitelisted.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -441,7 +441,7 @@
  
    [sources.'public-resolvers']
    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
@@ -60,12 +63,10 @@
    minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
    refresh_delay = 72
    prefix = ''
-@@ -383,7 +383,7 @@
+@@ -451,7 +451,7 @@
  
    #  [sources.'parental-control']
    #  urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md']
 -  #  cache_file = 'parental-control.md'
 +  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
    #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
- 
- 
diff --git a/net-dns/dnsimple-dyndns/Manifest b/net-dns/dnsimple-dyndns/Manifest
index 7be6993de73a..9060186e6d3e 100644
--- a/net-dns/dnsimple-dyndns/Manifest
+++ b/net-dns/dnsimple-dyndns/Manifest
@@ -1,3 +1,3 @@
 DIST dnsimple-dyndns-0.1.tar.gz 4453 BLAKE2B 8d3a6280ff38d1e45477b3b1800c345cebb5653598a9b7d85bd0e4f14114a1b45097d9eb3997864334d180af842cb61d14a01d7cb33155c800004f20ddaefcad SHA512 1dc7cdb968cd9303b922f0537fb5e63e5f16ed86d53506b47311d11f554f8e8332b989206c4947be75a07d576c98f4766dc9350ffbb30a31fa3581ded8a2b64e
-EBUILD dnsimple-dyndns-0.1.ebuild 708 BLAKE2B 7f749ddf5d159080de2d83d1049ca8911f725bc3140849ec584d6c0df7578fd4ce5b12c9ced6fe0da397db19c2b9928153a7a66af64e9c01011ee2cc568aeab9 SHA512 fe3706cc4c977f399d27b673927855e4ed8b411385d3ad9577099bfe18ac535ebd324fde864f55a078cc2f0c005e5ebe4dc79e07fb8e630ad245d97c8f59ba67
+EBUILD dnsimple-dyndns-0.1.ebuild 704 BLAKE2B 12065c1e392c406f3760f66222c5953f006262f28c5cfecbf4a911c83ec9c8133bf904c5fe28065ea88f07c57bc2041e8ad001263b749d5a61ae9512fcac8b49 SHA512 7363f86ffebce0ad14d5a14dcb9d2ac53d73dc05e8878432806b97cfca2889405ffc245a8b7c7f00dbc6ebae5c8835da6b8d71ec1948191f17bca2c9b114a60d
 MISC metadata.xml 635 BLAKE2B 20e82d1b694bcba9bb882ed5d6b29071b271e2f0bcd9627290f0201a2bf697f3a93cbac2303aa0312fe99ea8e4bc947f3741b056cbfd6c5d63f22b0179b56e16 SHA512 9c654d8bc5e478794cab70653be29ea03a4df2b4f515e62974a9cb64d45f6db9b004b477b66d66ec1efbb1e425d85de88d7b1ab690d200d19a3957519e4f4df0
diff --git a/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild b/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild
index c7a62597feac..ce5bdf611c80 100644
--- a/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild
+++ b/net-dns/dnsimple-dyndns/dnsimple-dyndns-0.1.ebuild
@@ -14,7 +14,7 @@ fi
 inherit distutils-r1 ${GIT_ECLASS}
 
 DESCRIPTION="Dynamic DNS implementation, that relies on DNSimple.com"
-HOMEPAGE="https://pypi.python.org/pypi/dnsimple-dyndns
+HOMEPAGE="https://pypi.org/project/dnsimple-dyndns
 	https://github.com/rafaelmartins/dnsimple-dyndns"
 
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 3a6b3893429a..5072657bfab3 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,5 +1,5 @@
 AUX stubby.confd 123 BLAKE2B f948e41ad6acbf19bda137fb26fc284651681b45ec7421160946c86c97089fb411cf3611853dbf9c92dfdde26814eab085cb971b552d5459ebe99828b4e4d278 SHA512 698cd718f3acf4a99399a57a7eb80e93ee50489eb1e31ffd485312b86307ece05775f4bbe9a49b3117f6a96f507e6314d9d47a7c23c828a5b231ab8e770e8bef
 AUX stubby.initd 462 BLAKE2B 0825fe3762256377c5ce6c66e982f67fee0edf9b685b51ae8538af0592966f26388776fe079aed31983a110c09b230b7dabada4949a105c83700c699fdd2c82c SHA512 26932bf845e02117bc41e907e0877b0231a9bde83cdea605f5b7a8ea514aea27a412d110e591ce794bd1574ce871a1d4b02847af4f1e58e249432007b7a769d0
 DIST getdns-1.4.1.tar.gz 1055348 BLAKE2B 3b664e669327f5d866e6b40defb3ee4b62a09be228cac726478dbc6843b64aaf49faa328e1013700daf554c4df1144a8d56cca9d9405057d35b89b8ab7ae1f43 SHA512 b15da1c898d4bb4e5dcd93b47f481696dd456d8a841b02122c46035f3da27ca13b5513e7b6a00e943d1a5f5cec8c5ce1f13729d3ce0c887d8faa31d201864b27
-EBUILD getdns-1.4.1.ebuild 1586 BLAKE2B 5d6662e6e37f8aa35f2ffcdb4a4085cce961de9bea8de5be81ccbff6f8edd3e5251eecda8f60e0fdc625e2e1c18874ebdf2cba2629b93f88cb46eb4e71899e32 SHA512 786ae123546cc5df67f13ad902e6c9523b3fe2cb7800cc79afd7b1bbad87c94ee8af4aec824698dee711ba42c37fbfabcdae3a0fe92539ca20660d6476b25f96
+EBUILD getdns-1.4.1.ebuild 1686 BLAKE2B 2316987f39500375c89cfd921ff15c1a3cc22dd7e5adfc0f390f811f6cecb5802596dec4e3dc4097814f1982fe3d16bb6c2b02e0cefa6ac75392892009909cc5 SHA512 debe904e9ff32f60def169c92f224ace0dbc5a57f1751a78ee3cdc07194c6d81119acae0eb30808190bacbae0fc0819e3c354511cdee4938d6f55594b5b21be3
 MISC metadata.xml 857 BLAKE2B 25a516aa2d67d8ce5961b8a99d71f355fb99f163ccbbeee29c7c505729ba76735b7d6977f5aa8cb60b328943c715a9dbb4652b4e3133009e220c1db0de9cf875 SHA512 33065cbe6ddfa2b0382d55a0441a819f2d4795cd458fe6b53d4da444b9542d49781d7dcf7b11615c46e3157bdc1deab89c765a24ee100c67687fb64cd2099bd1
diff --git a/net-dns/getdns/getdns-1.4.1.ebuild b/net-dns/getdns/getdns-1.4.1.ebuild
index 13ab6bc3b156..699abdbc82fa 100644
--- a/net-dns/getdns/getdns-1.4.1.ebuild
+++ b/net-dns/getdns/getdns-1.4.1.ebuild
@@ -12,9 +12,10 @@ SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="stubby +getdns_query +getdns_server_mon libressl +idn +unbound libevent libev libuv +threads"
+IUSE="stubby +getdns_query +getdns_server_mon libressl +idn +unbound libevent libev libuv +threads static-libs"
 
 DEPEND="
+	dev-libs/libbsd:=
 	dev-libs/libyaml:=
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
@@ -24,7 +25,10 @@ DEPEND="
 	libev? ( dev-libs/libev:= )
 	libuv? ( dev-libs/libuv:= )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	stubby? ( sys-libs/libcap:= )
+"
 
 src_configure() {
 	econf \
@@ -40,6 +44,7 @@ src_configure() {
 		$(use_with libev) \
 		$(use_with libuv) \
 		$(use_with threads libpthread)
+		$(use_enable static-libs static)
 }
 
 src_install() {
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index a188a388fae9..ed63eb5f503b 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -3,7 +3,7 @@ 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.34.tar.gz 3691634 BLAKE2B 4a121c7152543ffd2237e66e69a2bf31042837684cd864fdabb7d9e60700f05c8b909bb8bd5ca7d13449939f3989ef5c88dccb303854b8a540b93e8f2979aae0 SHA512 1a9b5f2554d3953591b92010fa0fdedc438ca8bc31d2bc06c621eb5d423e81656607f09ac75bb02e1a5420459f69e82b5fb82987afa50db69793f9cd7a08365a
-EBUILD libidn-1.33-r2.ebuild 3012 BLAKE2B c450d564fcd9cbf91120ec52cd5f39cfa1e8efd79c27c09401a8a6b55190c63b303db67d643756a0e4901502fdfb087083af0683bdb3d42076bc007e2dd381ee SHA512 7ff90ce5292cb43dca7e14e2c7e169893f9593dc748c6123f810c24639996eb8b48adabb63ad2249106fcd814fe203b5a5b334a27a2427689ef501c4a721c414
-EBUILD libidn-1.33.ebuild 2793 BLAKE2B 0d451ba20b772d3343503a122c92a5de5f98a67e3e95246adb2220f03ec9a96b887704c0bfd40fab0eecec3839f43705e00c19949fe7760a187b4d0a49b7b71f SHA512 56ea6fce689533f562410a2a3e15328873c76c6b1e231a3272162ea7c786369fec86e0332785d0170b81632126c75c2adbf880da7e9ee9152eb4548eb3b0ca5d
-EBUILD libidn-1.34.ebuild 2791 BLAKE2B 485846b7b12cc43baba0c4cda00802050b03d45ec87748036770214ff81c181b8062bdba803bd44e5e143d99cb935337dc98afea8e671d1ba7c26701146273e0 SHA512 123442737e1f3458e3bb61301fc5bd06c11332b1df43d8d387abdda1b69331447f44686a606103425ffc14b101d0877132eb23b37b140be3e238616738714e81
+EBUILD libidn-1.33-r2.ebuild 2882 BLAKE2B 882b4421c020f431c6c3be5f0e64ea1f2b0111c2214b49d7940f9a9dff54f6780a4efef71f6469e1d02aa0e4300d4fc5ef13911f4b10ddc4090a3e1f0c925356 SHA512 b91e73753ee12dc9d73b455f962010716cde98a56b9b8c436350383ced5bd4095ded41ba804723cdc7d2cc0e107f57ea840385c0d2110e5e43016d454031208e
+EBUILD libidn-1.33.ebuild 2663 BLAKE2B 72ac3df1929e2a8a30ecbcb53dd4293b72c5583eb8996f76f31735a13114d33cb7ceefe52a14e0c3fb994bae9bce27062c2134bd2927ea6c21229f6fa4df2c5c SHA512 341670045698b9d7a45e6d08708aa54aea59355ffd0a1c3c26bf4e76159e6fa619502e6e06a450560f2135744e89e1bc14289d07e8a984b83868fe9aadf7f2e3
+EBUILD libidn-1.34.ebuild 2661 BLAKE2B a03825b63c58ecdd80d09ef7db3829b570edc73f7c34d596d7c1c5e8f4ada6da4669a2ce823b0395a38885f82dc0f53cbc5451d8bc9ced8d5a17a98105f5c015 SHA512 61a6d0f67d919860b70131eff9ae569490fad5f0e37d00ca8a7674ef0fde2e21fab20cabdb983e2a97fd48d8ddd65b9390245ed36ed3d5e4b6d9c1c57ff3e355
 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 03d490b1a431..abbb94b63817 100644
--- a/net-dns/libidn/libidn-1.33-r2.ebuild
+++ b/net-dns/libidn/libidn-1.33-r2.ebuild
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}
 	java? (
 		>=virtual/jre-1.5
 	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.33-CVE-2017-14062.patch
diff --git a/net-dns/libidn/libidn-1.33.ebuild b/net-dns/libidn/libidn-1.33.ebuild
index 9d732304a1f0..9e70e212809a 100644
--- a/net-dns/libidn/libidn-1.33.ebuild
+++ b/net-dns/libidn/libidn-1.33.ebuild
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}
 	java? (
 		>=virtual/jre-1.5
 	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
 "
 
 pkg_setup() {
diff --git a/net-dns/libidn/libidn-1.34.ebuild b/net-dns/libidn/libidn-1.34.ebuild
index 5ab3e8e681d3..b8f545507a9d 100644
--- a/net-dns/libidn/libidn-1.34.ebuild
+++ b/net-dns/libidn/libidn-1.34.ebuild
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}
 	java? (
 		>=virtual/jre-1.5
 	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
 "
 
 pkg_setup() {