gentoo resync : 16.06.2018

19 files changed, 11 insertions, 178 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index d5a8f88fd1b4..7efc4f4e36d4 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 0c689f47b2a2..d3ffe5db27af 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -7,5 +7,5 @@ AUX avahi-0.7-qt5.patch 6033 BLAKE2B 10c7879f6e28942a32497c84dcf523f742cb13112d9
 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 5483 BLAKE2B f7ca98c08196df1b17bc12e8ddec5b9e69625506e7de2459c48a0e7ee744b1b84b5624379612e46feff4ba9e186d621175bad6346cff053e797970e5b675b6a5 SHA512 e7a880c13f38f72b7ed9d1627c13a82873869c2157d001d3af7e9451da486f63c4ad01980ec598652847ffbeec1c001ec9a11fd71e9ba4dbbb5d209f6cfcb153
-EBUILD avahi-0.7-r1.ebuild 5137 BLAKE2B e25de1aba20e1f42e45c4816c7ec8e9e8edc51b5b2d68077419a23672d67656482ecc817140bbe44dc858113a52186f0dad2d6c48a0b0378c8e9cb41b56aba3d SHA512 b2fc8f47a98d255d6db0c7fe1f6da485c1cbd3f043790510c21ce88d7341f15219ea1668830435380c98d676c455ea1b1d4d33a0974b66b77dec84afa894e8ae
+EBUILD avahi-0.7-r1.ebuild 5142 BLAKE2B 2c3fbf3c87b771156363a83add511592a5b602a3cec7ccb816eb1c5800f7bfe6dd0430eac354df6f2ebe850b19f8426312138737920c2f3bc369c4d2aa739251 SHA512 3a98b6118d509ece28a687a87e9382395b103b3ca72f00d9aff74b21028ddab645abd76607df4fe035cfe2748fe67f67dd9fdb2398d2def26477d343dd2b50df
 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 6ca2271cdd84..c250ef8c56c4 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 s390 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/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 03853b969357..59868d98a6eb 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,6 +1,6 @@
 AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 BLAKE2B 3f65aaf584ced53a098cd9536eb4e8fd243b50ef0845be3008066fa0b45915f4e2db585d3f64896782e7bf94362235fc31c1f869169d92996cdaf081935a4047 SHA512 f46290cddfb39b077269cd2198d04eef6a7e680b5f0f8dcf471e551a61b4b7a56871a56cdd20afdeaa86edb790513d8c522032fb725a266c18e0e59eee803dcc
 DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
 DIST bind-9.12.1.tar.gz 9302783 BLAKE2B 731ce67acb22f72e54de1122c5d5c3c1f0663c400bdff9545578a45e5fe3094c6d754351e57dd5c52cdfe1528305dfde25eba7382a723a60b8bfdfeebb9536cd SHA512 701e34a0a3313568c8e5cf76668fefc2a1fceb2ade0de201b8f678401569f1c622c3d1657a71772fa3298efc8b3cdefe974d98432c0087e8b45af3d50a4262fb
-EBUILD bind-tools-9.11.2_p1.ebuild 3151 BLAKE2B 4be82faf1753db2876dbde8e8475c8102ebe0f9b10198e05ea67cfa7c4b7d8de0e1d43befbcb00d6bb5c4f6969f61e45b196a2aea6765c44dfe6aa94055e17cf SHA512 6ba6a77dc6d975319ff047d32276ed67c1e27befbc74e277e28aef96c00bf80807e0b03b0d4c5d01ed9693b0816d5933ce2f50b8f27918a29439f004d51ee372
+EBUILD bind-tools-9.11.2_p1.ebuild 3150 BLAKE2B d27676a209a1c10af67af40fb8e4cca5044a7086e6ba8752a16cd2dbaa6b47e518b3885f2592318364b6dbbb78c7b120aea9da9dae6c05214b1ad6b3d0fba8a8 SHA512 946118c94832fc9583ebcac861b6fa7b9d673c29b744d02af8733732a61dd743ccc289e7f002319e8e351183d0d94a302af00bb0377e08bb433041cde8f455a5
 EBUILD bind-tools-9.12.1.ebuild 3368 BLAKE2B 800b01b9fb04b2729beb94f422b64dbff471e21490a1f70864f2a535426194960430de58e0547e487a8f95b6898f5557a5776bded565aded00b8d50548432c89 SHA512 d787f6ce937c47a94eb9e1e9654647403746056f2b0fd4d8a57615de03bd490fa50ad7651ab7cea6a9818a85de0d4926e6c07f868755c92e551d8734285c3a8b
 MISC metadata.xml 513 BLAKE2B bfb78568f9c2b262000c297e06791ddee8455c24a29e0fc822e272ed7d1cc3b90cd106f4faf3eff1da3824aca8dbe359b7fb3f767d72a967464edc649728066e SHA512 5c817f1afce4f096d912de9f0cd82b92e2b97f86db24de5eae8aa1a877c78e1800582b4615666c43f139049e179dbc30134692d7039517f97cf53ba9a2dcbd4d
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 7393c068c6fc..7cabc13cc48b 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
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 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"
+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
 
diff --git a/net-dns/dnssec-lookup/Manifest b/net-dns/dnssec-lookup/Manifest
deleted file mode 100644
index 1b1abbbda978..000000000000
--- a/net-dns/dnssec-lookup/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dnssec-lookup-2.2-unused-libs.patch 491 BLAKE2B 8518f18aec8f228e4643d37259fd696b47913b4b47112083e015963dabf6bb4d8dafa690c562bd7d4e8caf32024ead8a419b782b5e711b62eb859f4dfcf361fa SHA512 7e6e23766498f518792702723205ccb67bb51b86f59138d807bb099ca45389c15baebc02dbb3dce6801c238c800b5d54198a5e84c985b2db14f8c90214998b82
-DIST dnssec-lookup-2.2.tar.gz 36181 BLAKE2B 761624b695b895fe9eb72108623631e9f9a21693a3d386052e43a1ee0686ec808346ca5e162df15c99ac067cf0518bddc8280842650aeeb7e5a03a72897c75c4 SHA512 195af13b69681394b6de6ae77b7401f81e6c4005e81e3d95bb97d6821ccdefbd3a119f2c331e7016728fda5b45ce364c9240fffd7623276042c666e5c5d05cba
-EBUILD dnssec-lookup-2.2.ebuild 821 BLAKE2B 8701aa4d870e60e635be5cd867f7936853c041e2bf66bed0daa1a6da9af8c725d92fbd2c94f68c8bbbbc90ba34b126cfa01418481866570d9e665cbf733bac72 SHA512 1d6877c8115a3670be405e374d05f3a59ae2488a6691ea8f2dede7338a0a623121b6d93468353eb246d83aa5aee523bd9760cb91ce1c045cebb194b6e202d6f1
-MISC metadata.xml 594 BLAKE2B 3ad1d9cd548ba0849f607819f11de99a029ffa49d92659a0a00f4fe071cbf94409a1e761fee183872ac78d748594d6c98c23f99d19858e5850cf2c3ff93f5dfb SHA512 04df4471ca57b3e9200d8cf46820dca6932db7e1087084add9e2faa5726fa6e4bede034f685d5b0853761be0d441a00823276e82baa8d36b50189da4f81a7c00
diff --git a/net-dns/dnssec-lookup/dnssec-lookup-2.2.ebuild b/net-dns/dnssec-lookup/dnssec-lookup-2.2.ebuild
deleted file mode 100644
index f3ca3773b579..000000000000
--- a/net-dns/dnssec-lookup/dnssec-lookup-2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-MY_PN=${PN/dnssec-/}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="DNS lookup utility that supports DNSSEC validation"
-HOMEPAGE="https://www.dnssec-tools.org"
-SRC_URI="https://www.dnssec-tools.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="=net-dns/dnssec-validator-${PV}-r1[threads]
-	dev-qt/qtgui:4"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-unused-libs.patch )
-
-src_configure() {
-	eqmake4 ${MY_PN}.pro PREFIX=/usr
-}
-
-src_install() {
-	newbin src/build/${MY_PN} ${PN}
-
-	newicon data/64x64/${MY_PN}.png ${PN}.png
-	newicon data/maemo/${MY_PN}.xpm ${PN}.xpm
-	make_desktop_entry ${PN}
-
-	newman man/${MY_PN}.1 ${PN}.1
-}
diff --git a/net-dns/dnssec-lookup/files/dnssec-lookup-2.2-unused-libs.patch b/net-dns/dnssec-lookup/files/dnssec-lookup-2.2-unused-libs.patch
deleted file mode 100644
index bcefe0f20364..000000000000
--- a/net-dns/dnssec-lookup/files/dnssec-lookup-2.2-unused-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lookup-2.2/src/src.pro
-+++ lookup-2.2/src/src.pro
-@@ -11,7 +11,7 @@
- INCLUDEPATH += /home/hardaker/src/dnssec/dnssec-tools.git/dnssec-tools/validator/include
- 
- isEmpty(ANDROID_PLATFORM) {
--    LIBS        += -lval-threads -lsres -lnsl -lssl -lcrypto -lpthread
-+    LIBS        += -lval-threads -lsres -lssl -lcrypto -lpthread
- } else {
-     LIBS        += -L/opt/android-external-openssl/lib/
-     LIBS        += -L/root/necessitas/android-ndk-r5c/platforms/android-4/arch-arm/usr/lib/
diff --git a/net-dns/dnssec-lookup/metadata.xml b/net-dns/dnssec-lookup/metadata.xml
deleted file mode 100644
index 3d487ce1757c..000000000000
--- a/net-dns/dnssec-lookup/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-<longdescription lang="en">
-	Lookup is a simple graphical utility that can be used to query a network for domain name records. 
-	The tool understands DNSSEC and color-codes the results based on whether 
-	the record has been securely validated (green), is a 'trusted' answer but not validated (yellow), 
-	or fails DNSSEC validation (red).
-</longdescription>
-</pkgmetadata>
diff --git a/net-dns/dnssec-nodes/Manifest b/net-dns/dnssec-nodes/Manifest
deleted file mode 100644
index a4df3a0f50ce..000000000000
--- a/net-dns/dnssec-nodes/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dnssec-nodes-2.2-unused-libs.patch 494 BLAKE2B 7a9543ec0fb5d9285fa52a6bb643e99de964a601bda524f5f87528c7dcac44778e1d5cacca5ba9738dc91b5cbb9b86e0f626e40115c82483ef9dd8ee2024a48e SHA512 9cda4b408c5d1abd246db8675e5613f3ebc834d21983c26dbd79ce0ddd99cc00183016c43e7658e702c9171322cd24271739d64587f60f218e32a5cd00c57451
-DIST dnssec-nodes-2.2.tar.gz 98151 BLAKE2B 03f001b21006334e4080eb8caa897f2cb3a4fadd02aec7d0357b1563d62a7ef9b8a1824e1393940bbd3105b1d44c2573b329346c4ed9cbdb693e76bdc82990d7 SHA512 14f5ae628ceb59a85820c3d578bd1c36e620a17c1bb0a4f8fe440134ec8449adf181b053ea54a1bb321f4aff72014fa6a55a3a5a4d2542c407a3d35cfe4b9554
-EBUILD dnssec-nodes-2.2.ebuild 685 BLAKE2B 4051429aa784fe70364ba668ab6d4e0cec37549eaf73e9ecb5929f6afc6c71397cbabec058d9ea837de5d551f36b8507938620dd34a8825f93ed0d20a3548b95 SHA512 dfc4eae1c968d482a18650e0109e7f2f28d191e5c9191b3029493d800c2ccb7867e60e3f6cf95d41319b3963a9abf4cbd0fbfecefbeaf8ab924d021c252ed111
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-dns/dnssec-nodes/dnssec-nodes-2.2.ebuild b/net-dns/dnssec-nodes/dnssec-nodes-2.2.ebuild
deleted file mode 100644
index e6ba7ee132b5..000000000000
--- a/net-dns/dnssec-nodes/dnssec-nodes-2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-DESCRIPTION="graphically depicts the DNSSEC results from a lookup via logfiles"
-HOMEPAGE="https://www.dnssec-tools.org"
-SRC_URI="https://www.dnssec-tools.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=net-dns/dnssec-validator-${PV}-r1[threads]
-	dev-qt/qtcore:4"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-unused-libs.patch )
-
-src_configure() {
-	eqmake4 ${PN}.pro PREFIX=/usr
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	doicon icons/dnssec-nodes.*
-	make_desktop_entry ${PN}
-
-	doman man/${PN}.1
-}
diff --git a/net-dns/dnssec-nodes/files/dnssec-nodes-2.2-unused-libs.patch b/net-dns/dnssec-nodes/files/dnssec-nodes-2.2-unused-libs.patch
deleted file mode 100644
index 4cb3a7f54dc7..000000000000
--- a/net-dns/dnssec-nodes/files/dnssec-nodes-2.2-unused-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dnssec-nodes-2.2/dnssec-nodes.pro
-+++ dnssec-nodes-2.2/dnssec-nodes.pro
-@@ -70,7 +70,7 @@
- isEmpty(ANDROID_PLATFORM) {
-     QMAKE_LIBDIR     += ../../libval/.libs
-     QMAKE_LIBDIR     += ../../libsres/.libs
--    LIBS        += -lval-threads -lsres -lnsl -lcrypto -lssl -lpthread
-+    LIBS        += -lval-threads -lsres -lcrypto -lssl -lpthread
-     contains(MEEGO_EDITION,harmattan): {
-         QMAKE_LIBDIR += /scratchbox/users/hardaker/targets/HARMATTAN_ARMEL/usr/lib
-     } else:osx {
diff --git a/net-dns/dnssec-nodes/metadata.xml b/net-dns/dnssec-nodes/metadata.xml
deleted file mode 100644
index a535b8852829..000000000000
--- a/net-dns/dnssec-nodes/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-dns/dnssec-system-tray/Manifest b/net-dns/dnssec-system-tray/Manifest
deleted file mode 100644
index ca1d489a8999..000000000000
--- a/net-dns/dnssec-system-tray/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dnssec-system-tray-2.2.tar.gz 15309 BLAKE2B 0cf4535c8c58d85f9b9aa142ec514b3ccc278123f52e70708d34260a410bfc62464e0ca35d8b30754c5933a6f947d7850c8b2d638f25719a9006957aa51943ee SHA512 1c99abc7029232770b1776b57ff014b6b3c10edd4841952b6f7cabea69ad0252911db3f7aa252d53fca7457e8cba8a38665fbb6c05421daea0946622bb13daf9
-EBUILD dnssec-system-tray-2.2.ebuild 606 BLAKE2B 0253e81328bfaf3b85a039fccbfd8ffca597ce80179a510fdce1a5654101ba5a56430afc379a5e512a220dd1cf037f0da71a74f6a306d77aa910ca747e5c080e SHA512 ce289133bc3fac88b2adbfad23b21ccb66546a142fd685c353afbd5e4471f206043c2a909643e87102ef9552afb4638c7c3068816378a6465b3cb6989b9cacab
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/net-dns/dnssec-system-tray/dnssec-system-tray-2.2.ebuild b/net-dns/dnssec-system-tray/dnssec-system-tray-2.2.ebuild
deleted file mode 100644
index 2e0c9099d4ff..000000000000
--- a/net-dns/dnssec-system-tray/dnssec-system-tray-2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils qt4-r2
-
-DESCRIPTION="display DNSSEC resolver logs in system tray"
-HOMEPAGE="http://www.dnssec-tools.org"
-SRC_URI="http://www.dnssec-tools.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	dev-qt/qtcore:4"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	eqmake4 ${PN}.pro PREFIX=/usr
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	newicon	images/justlock.png ${PN}.png
-	make_desktop_entry ${PN}
-
-	doman man/${PN}.1
-}
diff --git a/net-dns/dnssec-system-tray/metadata.xml b/net-dns/dnssec-system-tray/metadata.xml
deleted file mode 100644
index a535b8852829..000000000000
--- a/net-dns/dnssec-system-tray/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index ab91a43ec754..b5e7eaf46523 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,8 +2,8 @@ AUX nsd.initd-r1 1386 BLAKE2B d3a5ca31ffd06d9cf4da09617f523f61e5b8aea4e3217bf114
 AUX nsd.munin-conf 23 BLAKE2B 0b08804b2218d77ea925d4c9e26e73649b453b923d6d7b1e1df39ceb58b92a44c48cb21583a480e622f72d07650f410f2e0703f1d16af08152aed16982ab8da2 SHA512 c06d0b035387e7be79cfa8fedf8afb3900772146c6d4090ac39ea2ef165772d875b222ef467bd73422078ef57818bcc931ca67fa290bd99a7a9456efa5448853
 AUX nsd.service 272 BLAKE2B 66a7d4132246589f71341afd98361f6b02082be3d4e230c86ae690876a797ea0a4580b29892d91feba2785ea933a053f862e0d00f2c8a8c09ab907386c39a03c SHA512 fbca86887bfc36d61af06992cc98b3f3cb33c39274fbdc1e53d489bdcc767993911fab27a20244c3878b36bacbd1644a552364b2f7bf4d48e6eb247d0eecdf0f
 AUX nsd_munin_.patch 542 BLAKE2B 13ff49c41683d5bf505e257cd17bf5f3ad06662c00032d79b36be3f96486eb89fdd62a42b5ed4816ad99835366864603568613e27504894340ebb64057e2b2c3 SHA512 6034086d6b6f6980468766c901e92291fea8a32df179561ede2add5918c37bfe3aabf122735d4ae2e28efece394fd3398f9a0cc4d8fdcc1e5da1ca709d2ba6ae
-DIST nsd-4.1.20.tar.gz 1096797 BLAKE2B aa1415933f8d1d1415349407c54cfdec581304ca27733110b45bc109288506ad2a92c110565695ac7cb4afae3b955fe09fe740196f268c810e0be992e4f55353 SHA512 4e646303d9da920a9ad567ea3e04a06d8b66bc0d84117908ae69126c131321d660548f32e7bb54e248dae4f48d5152c0a204bf8bf9262ac4394371c05305b21e
 DIST nsd-4.1.21.tar.gz 1099021 BLAKE2B 129fd3145308c108ef2bd06b854aaf7cdb7ae7cce7a635c2028d210f87bc9591c89d8724b4d7a23d72e06e2ed73287c1379573f8cb3571cc63a47987db4f6b65 SHA512 1e37f433ff5cd4869145a575a89d6eaca6b17c0e029302e233277b400c5f0f0b76ea018d48178d6b8a75b72328f0ded9e885be836c0bb32367d6861ff11c7150
-EBUILD nsd-4.1.20.ebuild 2794 BLAKE2B 35b9ba3fae0c9bbb5c34877eb810d9b1a45d4b9c386a41a805ea30c4928dfa6cf11157b68b5c8f963300156dd14524be331270d96559ee5b10baf1c6a090e707 SHA512 b4292ebe23c0a887da7a73b6b5af141eaec0aa8eebd0acb75708966ea8d25464a2626365986c6332d0696c529925725830f39e2e3718e19ecaacace2f9f8ea65
-EBUILD nsd-4.1.21.ebuild 2820 BLAKE2B be1a3a1c30a83f42503735efdb81502c3479b9b2d9465dc450e12c1dc6f3cc06fa414fec04cc7503af421e25ae4c434a8098ecef36fd4b3c8764968378823338 SHA512 e55d1a19c16131c14fac2380ca605324ab05795d74c07c91a61ea175d34c0159bebacacc2190c0817490e8e5b856fe6d8668f3c4185bb96881f27f785fbde69c
+DIST nsd-4.1.22.tar.gz 1099463 BLAKE2B 955973e9ee01c1a5ed0a7cff38f881c775785b17452538db468f874d032b426a197b3709693c2df148de4a0f87259754b64c7ea02e53d9d96974f8c723267e19 SHA512 cab025b80955a15d174592ba5f0955c59333a988bf11b094c166a80206b51b6fcef65e2e976cd77009bf3fded257719efa4674a3a3a9d859ebc14e35fca2ecfb
+EBUILD nsd-4.1.21.ebuild 2818 BLAKE2B fe0e9553ff2bec45c43a1d819d18ffa0bd18318937e74fefcd6b213c910c5d39f054ab72a95aea714f963ef933cd51222769a9dd9b836ef1a01be1d69043dbbf SHA512 429e3a1d9da83b7e92633d68e399d75befd44dd10142f491630d865f7229e00f636e05d799b7026bf7119d73925ee8185a901342cf5a14118c5da09f9cc80526
+EBUILD nsd-4.1.22.ebuild 2820 BLAKE2B be1a3a1c30a83f42503735efdb81502c3479b9b2d9465dc450e12c1dc6f3cc06fa414fec04cc7503af421e25ae4c434a8098ecef36fd4b3c8764968378823338 SHA512 e55d1a19c16131c14fac2380ca605324ab05795d74c07c91a61ea175d34c0159bebacacc2190c0817490e8e5b856fe6d8668f3c4185bb96881f27f785fbde69c
 MISC metadata.xml 1013 BLAKE2B b989a1ccafac96d48d6f1b72bace164fcb1c04885ec9436e37fb29d94bf8c5feb4a02a1b4fc04241b6fa3c9d6d89ec993e3a06b6efc7ccd45d4ace3fad16cb18 SHA512 e7c0d6a267fd06546ac58278ffb75280aa0c0ed55ddf0097614906c1863e55cf572ff7660e021ac8861c506ed0de126c0c5e68dd2d88aea1a395be3234607ce5
diff --git a/net-dns/nsd/nsd-4.1.21.ebuild b/net-dns/nsd/nsd-4.1.21.ebuild
index 6e71f765df89..021f321a5af8 100644
--- a/net-dns/nsd/nsd-4.1.21.ebuild
+++ b/net-dns/nsd/nsd-4.1.21.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
 SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-dns/nsd/nsd-4.1.20.ebuild b/net-dns/nsd/nsd-4.1.22.ebuild
index 537cf030813c..6e71f765df89 100644
--- a/net-dns/nsd/nsd-4.1.20.ebuild
+++ b/net-dns/nsd/nsd-4.1.22.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
 SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl libressl"
 
 S="${WORKDIR}/${MY_P}"
@@ -87,6 +87,8 @@ src_install() {
 	# remove the /run directory that usually resides on tmpfs and is
 	# being taken care of by the nsd init script anyway (checkpath)
 	rm -r "${ED%/}"/run || die "Failed to remove /run"
+
+	keepdir /var/db/${PN}
 }
 
 pkg_postinst() {