gentoo resync : 17.02.2021

41 files changed, 218 insertions, 158 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index be82a0aac662..c8335425b9f6 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index e61dac1aa809..9eb80025fd94 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -1,5 +1,3 @@
 DIST cgminer-4.10.0.tar.bz2 1306225 BLAKE2B 29d34e5d9246fc5b0409a1647e4ddf291f1e7610888110c1917ddbc1c30a9d0301bb70dba187690f2685b2fd476d5c0b0cd65e87fafa56b62a7f3a0202a374de SHA512 ed39bffa51715756875c101f4aaf984cab566fc1c8b657f6da37d0cdf921faee752c3efadf97c98ca6e749175457fbc2c37e9332cd26d2ff1675752250ac21db
-DIST cgminer-4.9.2.tar.bz2 1476371 BLAKE2B 01ff700cb5dc2fb12709da41aeaa22c6fc6b9dc6fb1e12116eef3a382ad328961b8d6ddd6ac6fce47ab8084c96e1a7be74a697b3d885c7e78dfadf07b678ad24 SHA512 48371657c84f09ad8c500a29ca85f35af70eb8720d9d97b565cd8c5356289d889ee60c06f37c0507a53c8f50ae827a77fa0c41609bac6b1e8849ad26b55d67d4
-EBUILD cgminer-4.10.0.ebuild 2535 BLAKE2B 209b11cdd7ea3dea70747378e290ddf89e1d346c67865c68d3f4c280c24464e53af95e8e7fee26753665f764695413d41e3e82ad17669efca3a095a2fe38f2cf SHA512 8c118c370b87d5305b017978c6f2109c1686220408c654815c37bce3889e40c67c1efe04fb19d388bf238e3aeda3b759d1a9f801cb110095e36dc2358d7ec58a
-EBUILD cgminer-4.9.2.ebuild 2392 BLAKE2B 7579e4fd7d03d4dfeb6ad364ee14f64e6aff87cc5736ccaf6f005abd76d669e54b5e5ed1675a1e5b40c6f03a63d5ada7d3b063474007937518a7d8ebc1547216 SHA512 916b5e886acd4643624417b51678913615c5cb05bcdbb735e543a92653e10948720d9cd7e5f7f16b1ffe544e50aaed6115d850460f77f13cc024d3ac10bb47f4
+EBUILD cgminer-4.10.0.ebuild 2561 BLAKE2B c83adfe93051f23be466d8d324da27690ec96dfa6887e93668f510f09f8b43b7c5bb6351a2941b4d02ee67b50965cdf42fb722b49c877ec5e9da5d2683452df6 SHA512 3ad82b78ee9796f264ae259b0b1e60fa95b73c50b772ffa427f113eab9d373723d27592780282a9d1c36f3352e6dad220a56c23b60c4fb7a3d5acd3440e76ee2
 MISC metadata.xml 2137 BLAKE2B 8bb2fd05a390c5c5ec5ca3dde384ab611311d50256668208184dfb978ac5a0debd75ec63cd35159dcde36b2a964d0bedf6aaf3422261f998f2262c1007c3ab29 SHA512 6cf1454188266ffdab67a7caa27ece041cfc4c3cb4fc76b7fe5fa24bed30002df717afe4e8693532a4f78b077374200cb2a9e91b460372193f1b623238d50b38
diff --git a/net-misc/cgminer/cgminer-4.10.0.ebuild b/net-misc/cgminer/cgminer-4.10.0.ebuild
index 1ac87f413dbc..bcfc4b2aa996 100644
--- a/net-misc/cgminer/cgminer-4.10.0.ebuild
+++ b/net-misc/cgminer/cgminer-4.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,8 @@ IUSE="doc examples udev hardened ncurses ${HARDWARE}"
 
 REQUIRED_USE="|| ( ${HARDWARE} )"
 
-RDEPEND="net-misc/curl
+RDEPEND="
+	net-misc/curl
 	>=dev-libs/jansson-2.6
 	virtual/libusb:1[udev]
 	ncurses? ( sys-libs/ncurses:0= )
@@ -29,6 +30,7 @@ BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	use hardened && append-cflags "-no-pie"
+	append-cflags -fcommon
 
 	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
 	export PKG_CONFIG="$(tc-getPKG_CONFIG)"
diff --git a/net-misc/cgminer/cgminer-4.9.2.ebuild b/net-misc/cgminer/cgminer-4.9.2.ebuild
deleted file mode 100644
index 6cf544e6b085..000000000000
--- a/net-misc/cgminer/cgminer-4.9.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer"
-SRC_URI="http://ck.kolivas.org/apps/cgminer/${P}.tar.bz2"
-#SRC_URI="http://ck.kolivas.org/apps/cgminer/4.5/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-HARDWARE="ants1 ants2 ants3 avalon avalon2 avalon4 bab bflsc bitforce bitfury bitmine_A1 blockerupter cointerra drillbit hashfast hashratio icarus klondike knc minion modminer sp10 sp30"
-IUSE="doc examples udev hardened ncurses ${HARDWARE}"
-
-REQUIRED_USE="|| ( ${HARDWARE} )"
-
-RDEPEND="net-misc/curl
-	>=dev-libs/jansson-2.6
-	virtual/libusb:1[udev]
-	ncurses? ( sys-libs/ncurses:0= )
-	udev? ( virtual/libudev )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-src_configure() {
-	use hardened && append-cflags "-no-pie"
-
-	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
-	export PKG_CONFIG=/usr/bin/pkg-config
-	econf $(use_with ncurses curses) \
-		$(use_enable ants1) \
-		$(use_enable ants2) \
-		$(use_enable ants3) \
-		$(use_enable avalon) \
-		$(use_enable avalon2) \
-		$(use_enable avalon4) \
-		$(use_enable bab) \
-		$(use_enable bitmine_A1) \
-		$(use_enable bflsc) \
-		$(use_enable bitforce) \
-		$(use_enable bitfury) \
-		$(use_enable blockerupter) \
-		$(use_enable cointerra) \
-		$(use_enable drillbit) \
-		$(use_enable hashfast) \
-		$(use_enable hashratio) \
-		$(use_enable icarus) \
-		$(use_enable klondike) \
-		$(use_enable knc) \
-		$(use_enable minion) \
-		$(use_enable modminer) \
-		$(use_enable sp10) \
-		$(use_enable sp30) \
-		$(use_enable udev) \
-		--disable-forcecombo \
-		--with-system-libusb \
-		--with-system-jansson
-	# sanitize directories (is this still needed?)
-	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h
-}
-
-src_install() { # How about using some make install?
-	dobin cgminer
-
-	if use udev; then
-		insinto /lib/udev/rules.d
-		use udev && doins 01-cgminer.rules
-	fi
-
-	if use doc; then
-		dodoc AUTHORS NEWS README API-README
-		use icarus || use bitforce || use modminer && dodoc FPGA-README
-		use avalon || use bflsc && dodoc ASIC-README
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc api-example.php miner.php API.java api-example.c example.conf
-	fi
-}
diff --git a/net-misc/connman-ui/Manifest b/net-misc/connman-ui/Manifest
index 34f78cc20314..9951fe2c203e 100644
--- a/net-misc/connman-ui/Manifest
+++ b/net-misc/connman-ui/Manifest
@@ -1,4 +1,4 @@
 DIST connman-ui-0_p20150622.tar.gz 235391 BLAKE2B 93f3afd3e032dceece8b57c7bfbd2de29c321b9c19b9ee6afe162e78dd0fe47cb2e86c49f585970dbb69dddbfdfc0e824cbeaeef61c3ac4809332dbf458f950c SHA512 2cb8d9620e8b695d59782ea6ed0a1f550f61e1ffd2ef5cb3c239b0ed1050432e4b09265e655a41368a933f164df09cd5491dd970a36528c33c0d1b0c4a16128d
-EBUILD connman-ui-0_p20150622.ebuild 674 BLAKE2B 0c8ac2632ecda19eeec1f6daf2961284edad6ee7b02605f99cf51ba63bf6d880378e892464584f7fe2cbec19d30f970c2c523b1f34913f7df5f424cd61558142 SHA512 769defaca0158a60c32566c25d52adb195a247f9b1ef085abbbaaae803b98197a9267c5e9155e8d5af8081f61c23dd56e2b691e6aacb8fff80868ba99d235124
+EBUILD connman-ui-0_p20150622.ebuild 656 BLAKE2B 81f99b8a27dfb137cf82e47323c3ed3a632050e5297071a1a6b364e06cf03ff25eb2794645359df1b9d909ac4f90c1fdf4a0369df739f33814b1a36cc70a9dd2 SHA512 5da02fb4cf12a85036d0df69afb31a26e65242a032c8ddaf4d4c3399c6e956ada6490293772b46000de781311186cc9f844663f9b631f9cba8e3a68e0457ace0
 EBUILD connman-ui-9999.ebuild 578 BLAKE2B 0e72abb0744a70b0b630cc36a40d5c44e464c9f3797561933816e110f659993c5651a06265536b242d8a9bc6e8fcfae74c997c6989c4af2432e52bd3f632d68b SHA512 2d0373cc51dea97eb2fe0898c5a80ab0c736305975ae19f5cc081f52aaeb190261281eb66148f7056a57a0aaf3003eb8bed024f538ad5922fb4f5454351eda12
 MISC metadata.xml 1076 BLAKE2B 74f5f03bbe8d2883fe6321699fc0d6b7efe724458446015c34384d0ab18e09491f3b28436781e3ca7c97c3b829ca6edf7941676174a94d1f68e1e8f55dbacb3b SHA512 acf7e7b3b4dba13c1e7a410ad48adee2a8dd5ff60cb7dd898ead26552c5f6121b9e26180ff1e5cee981ef15185549ac983dbd125027ebfafc2e3616f76ca36bc
diff --git a/net-misc/connman-ui/connman-ui-0_p20150622.ebuild b/net-misc/connman-ui/connman-ui-0_p20150622.ebuild
index a1a5d26d62e8..9edf9267b9d3 100644
--- a/net-misc/connman-ui/connman-ui-0_p20150622.ebuild
+++ b/net-misc/connman-ui/connman-ui-0_p20150622.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,11 +9,10 @@ COMMIT="fce0af94e121bde77c7fa2ebd6a319f0180c5516"
 DESCRIPTION="A full-featured GTK based trayicon UI for ConnMan"
 HOMEPAGE="https://github.com/tbursztyka/connman-ui"
 SRC_URI="https://github.com/tbursztyka/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 CDEPEND="
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 2ffe4c7315db..5de79f2f0467 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -4,6 +4,6 @@ DIST connman-1.38.tar.xz 749288 BLAKE2B 3f0ec95c87d9b3bf4f188e2523cb8ed97f462953
 DIST connman-1.39.tar.xz 755688 BLAKE2B f18018a0c2b58a89e613dba70672c27631ecbb0c0e44c84fe4c9097753aaeb7b278cd3ab0bef9b5e1928c34ee90b287754356e525cc318ecb6347370ee3043b4 SHA512 5bec2830971e34966a7a3a40c505b8a14cf6fa639262d4f1eaeb38f5e602d7a234f7d4f2c4919517b0832664382389e20a59fdb027753cd20059a23589de1764
 EBUILD connman-1.38.ebuild 2722 BLAKE2B ed9392bee5e97012fe13b77fd3ed5c50f15dd64aeea641695505c7c4f0d575c949e51e04e21ff801de9d8d8609807593b2d7279a5adc6aa87ac99da16473d654 SHA512 829b20d249c16a550819d00cba1b42afa44895f287c48a47176576280d3d6dd231c446c5bcae91ef662f78d0e0e828429377365482426d2b29115494c9247b70
 EBUILD connman-1.39-r1.ebuild 2751 BLAKE2B 49d7e875a9ae05a837c328296539b0e22453d795609c257ef6783fc98e8319cfec57fa0837e1ee4373a74c81391f8fa1f7a573a776ba126ac7c073391a25001a SHA512 5a6f306112ec1d1110c78ee7abc12e8638b38e770a593672486175ab881f1c89e8f6d4c43e6e26c417971e2c212b4fe526d82d59811fa1b4b2ccb2fb567a9c50
-EBUILD connman-1.39.ebuild 2724 BLAKE2B 2194ac7e5cfb286b471c29a3d324cdecfbb935b687409d64fe10f9a043a4c9dd75c33ae054bdc35500d8c788e7c38b62fd472d92bc77a412a7d45375ebdd9076 SHA512 055695959ce6ce7ecef68ad2efbb8b9d92ed0694494381e94d78381ef641aaeacbd2b3ae07257eb28d92a8dcd78d73f2eddce221710aa7de957e673c1bce8012
+EBUILD connman-1.39.ebuild 2723 BLAKE2B 1aa2e2c8d2403d90e90cdc4c6aeb101d4a1a2d76e20c7cfc04af49e4f63f5361b2891b4182c3c7921b5b64ed6426ad90af0d5848e6bfb564700d074725b1fe97 SHA512 f8d8b5fc12168bf811e5b5e88dfd4f545f096598af3c8b6fdda0464ca607ecc344951662bc5fef5c42efdad1a8d7f1b0af44f844178a94f3ebcd73bdaa2cb7a3
 EBUILD connman-9999.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da
 MISC metadata.xml 1302 BLAKE2B b6cea3b784c7f217c5d0befc833fe573ff68f010f9fb1043b11ce9c70473c45b2a9c03d59495e8a04f58e1657ce6a9ca531da9675bdd545493cd1bab8a583ae9 SHA512 3df49e8184d319601df17ff8238404c673026a6953f0a566c7d9134215841dab8cb6a4ec507e2c6467bfbc463678568696828173b80a96a4035a449ff886bb3f
diff --git a/net-misc/connman/connman-1.39.ebuild b/net-misc/connman/connman-1.39.ebuild
index bcc06a5beff2..da08cdcd928c 100644
--- a/net-misc/connman/connman-1.39.ebuild
+++ b/net-misc/connman/connman-1.39.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Provides a daemon for managing internet connections"
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 44ebda6ab459..59e9d8166bf1 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -4,5 +4,5 @@ AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a1
 DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3
 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
 EBUILD dropbear-2020.80-r2.ebuild 2727 BLAKE2B e85ffcaeb12d7f15a6ca744a643f6a6aa83400ea40fc2c7faf46d9feb3b5df26efb188792b52a5f6ba5a3cf36c0432c970a726be029e0dd82912270cfcaf1f72 SHA512 0042683e8de737d8b8d9fe96c1ed619785ed2dccb19cf8d646d15839a11bd4c8a9ae5417fb98d21aa9031292edd5ac7ea97492deae119a9c9483f42980f645bd
-EBUILD dropbear-2020.81-r2.ebuild 2968 BLAKE2B b545ebc5560efc07ec82bddbfa7da82e8cbe0ac32a81fd27624e63a3865137fea29319472e20cbbb16f64026340d5d353a730911eef4a0da1443f315c4240648 SHA512 81ef82195ae8888a95ff65aed3cfe530a537508443852e34fcf8ce9cd22af014d3ca052e5c67c14bc6ac2b3743b971b4055497f7b5b559db2dc8273be38924ed
+EBUILD dropbear-2020.81-r2.ebuild 2966 BLAKE2B 4ed298b8a4f86391fd86b3a8105315ed8f47ddf94fd40bcac8a0edad21fe0d2119d26107f30568278a0f14093dfe1041090a6ccc76c6ea910fe65e5f8866ecb1 SHA512 17f3223cf8f868f2490876255c0569517fdb957d6c5573a7e9608be1a5b230f7705aaf17d4f55fcffa9810e4a669786485c88cc6c1dc3e77a72f97c0449c5d2f
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2020.81-r2.ebuild b/net-misc/dropbear/dropbear-2020.81-r2.ebuild
index 2ff85973af9a..d193f9a8b62c 100644
--- a/net-misc/dropbear/dropbear-2020.81-r2.ebuild
+++ b/net-misc/dropbear/dropbear-2020.81-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
 
 LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
 
 LIB_DEPEND="
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 7bc855527cde..c098e1800ad0 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -3,6 +3,6 @@ AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 AUX gerbera-1.5.0-incomplete-type-iohandler.patch 801 BLAKE2B 6b0a24b74d1970c98c3b98600c491775d7c9d9c84f601f85319c53d665bad2ee7d41bfa6a933b96eb9cf6204a920ddf836447b52bbcccb4e8b857a66ac7d4481 SHA512 fdc77063b98fd0adda2d93891fa58fe54c2f96a3e8c3904ec64f6daf387169d765fb499e6cf21141b715d8597b66384cd475456876f0fa4a196f9d007f05009d
 DIST gerbera-1.6.4.tar.gz 3060809 BLAKE2B 1ab10a20803adc84162b35f28b35910dfb2454d57a57ef7ebf9d0049c493892fe28aec7ac38e6b492e35319e3c12f4c7750649ce5d9a7e6e4a0bfcbb47e7983a SHA512 82bf58e22b58039cb1f7eb78b6f519507dc3d8eead4aaeb27764c5ed7926c7d069b854fc9050ef69d1d3982bd06f5a4620eedac9a35c91947e8acfa2b2508b30
-EBUILD gerbera-1.6.4.ebuild 2383 BLAKE2B c08200f8772511e87b5ee217d0d773f8767720bbaf05451b7f6c66a5cd5d5748d5ba4bb90e7d7d5b13433dba7d901a48e96a7c7f476db85dd1ee231bec55ae45 SHA512 ce9c73dd12ebbd63bb4883e75b1f8c901218af84ce2a93ace398f2edc18f92f1ce9c1bfa32bfe01d128bb11c20ce72f2afc78cad22e885e93fa00863c5537978
-EBUILD gerbera-9999.ebuild 2312 BLAKE2B e14fa49d9f340222dfe2510d529751d2d9768ef0cbb904d5a80c34870e292979041a63ecea9bd73be9b7623d9e76ff9dbb8015a5aa8af36753ff1c262977ae31 SHA512 8b37c17d9506c62a09b27be189b46b1b8e8711e8a4b499625d55c8af336f61b1b8a8eccb24c3d5eb3d7bda9f918fd1a1b2c667b42ae375030ba6fd422f6fbf86
+EBUILD gerbera-1.6.4.ebuild 2370 BLAKE2B e1e66fe87d5179311ca7368bfc889404ff863c7bf586b8846d08de8ca7f4c5074abe19019cfc639bba070fbc9f76d3804c6f24a44688fbb8ed0f652103e71dac SHA512 388b39d0303a72bea85b195447ccf65975cada83bb82f762cba491d4a60bff2bb67e0f24ba46d32e8e5b499411490503e23cb0263a57306b92609713109ce55d
+EBUILD gerbera-9999.ebuild 2299 BLAKE2B ac17a4ae8a371d35f4ddb6107405559285630f9b989cdec156edb7383a733930b5d78a68646092890a5c7ed068d43aa1962b050e77da275d0a8345906f0db569 SHA512 ddac3d08441b5a3e4797fa69785da72f87175f90a6fccaea23029b6f544af9b0d0d5ecd98375949d4e00354e444445dd33520bd47a92687e0a76b4f9f3c07bb0
 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
diff --git a/net-misc/gerbera/gerbera-1.6.4.ebuild b/net-misc/gerbera/gerbera-1.6.4.ebuild
index 5c8e623be8d1..5c8a5e6ac2fb 100644
--- a/net-misc/gerbera/gerbera-1.6.4.ebuild
+++ b/net-misc/gerbera/gerbera-1.6.4.ebuild
@@ -7,7 +7,6 @@ inherit cmake eutils linux-info systemd tmpfiles
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
-	KEYWORDS=""
 	SRC_URI=""
 	inherit git-r3
 else
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 5f10c8bed087..5757a960069a 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,6 @@ inherit cmake eutils linux-info systemd tmpfiles
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
-	KEYWORDS=""
 	SRC_URI=""
 	inherit git-r3
 else
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 27916eb82c12..03579601c363 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -11,8 +11,8 @@ DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97
 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
 DIST iputils-manpages-20200821.tar.xz 19200 BLAKE2B 7d139ccac181eb3d74e3dcd2ba28cb906a0002aa4922de3e37771e2063234fa12428fa44bab3b50e43c40576a66d585a7460cf550afbeacd665fc41a3333d11a SHA512 0dd385565c9a15dfce668d637e055004a347056ee56260a4e726e7aa5ba5a6374aea8e9fc848dfe36b7609e5d92cb8c21f3e88f2d63e7cfe299489e41a17dc33
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
-EBUILD iputils-20190709-r1.ebuild 4987 BLAKE2B e3eae89daf8659c2b2906f1dd4fa12216b19ac2525fc5e11a7f43fc03794959813442c1a95d5b66dba1adb3850bd8b3022767b677e85e92e116a459cf6c2969a SHA512 e7857644e9f152d1d02e951f113c52bfbd7a21444d8ea302d986cbc777c936a9a687fb7dde8637defe95be71acf19b26bad66b346489db8d01050a795fb4c204
-EBUILD iputils-20200821-r2.ebuild 4413 BLAKE2B 3e4009f9c2aa6ed1f87891b7c5597bfce620d572228c74bb8120a39104cfa47cb8e5e37e7e6ca0df777409f6ad5a0970887df9bdf0361c9059318bd085f31b75 SHA512 cf08485939b2c4ede19f2760a4cbb7399d67cbad5ef9a29aa38ba3c841633df3e8fd0e4ac61713e8c1c15766fd9950a5c7fa8864b9d6cc6b9189984dcd8913ae
-EBUILD iputils-20210202.ebuild 4203 BLAKE2B 5379711947110b3da2765158c848daf9d42bc882fc897f366c1a1e9bc20e32985563e7583dd99cfd8d7a47f155d337daf6a6a1d55df81d076e311e69dc8d61c9 SHA512 0da73cc6802f280955624ad1b83ac945d10a52b0630743a2bd4f5f7b53390439d4676e910c3cafd40f969ad2f470e2f7038a26c2febce5bdfb397899c307e650
-EBUILD iputils-99999999.ebuild 4203 BLAKE2B 5379711947110b3da2765158c848daf9d42bc882fc897f366c1a1e9bc20e32985563e7583dd99cfd8d7a47f155d337daf6a6a1d55df81d076e311e69dc8d61c9 SHA512 0da73cc6802f280955624ad1b83ac945d10a52b0630743a2bd4f5f7b53390439d4676e910c3cafd40f969ad2f470e2f7038a26c2febce5bdfb397899c307e650
+EBUILD iputils-20190709-r1.ebuild 4988 BLAKE2B d4085aef19f926db7fe27a22d0bb4589648ee4450d53df43cd3aeab6571d15891ac9b4a363e3d4c4b7efa80f67fc54a0333a9485f386d5bb3e0ea88531df44a7 SHA512 717eb995035729ab0af20c9e48f9ccebba7ca51ce11d076aee708d381474f99311b00e6fed6eb63e1641e6ca4adce9d3178fb369a2516f32f0a260b7b09f7beb
+EBUILD iputils-20200821-r2.ebuild 4414 BLAKE2B ecde92525c14e7db2cc32bc25b3a305872686c15bb179977d952c3e62d157bdf55ad1ccb0ba7e382ba8311f2345f881358489b1fcd8f0f4410cee123cb28490e SHA512 73cc5597dc932e3bbf7db034497a4e4feb17b937a8ff913500b6ed88fb090b544d8553ac62ce614ff862cf3eb87cb7acd4dac2b55e3b0521cc7f1c25dbc2a585
+EBUILD iputils-20210202.ebuild 4204 BLAKE2B 8fd660bee7be03fa76bc535d9002832934014859dd97f19feff6dbf74e2c0862dac5d2821bcc52dea4d1ce65836c0a473622bb72d58e9bcca9627c91cb63ae56 SHA512 b42c8b00298a7a6e0a94151d1cd06a68a2dc8620c5e6a0180b4b61b860f3360697cb1bf8886ac2e0ed9834c0d7842b3a826a74808343e2801cdc799a270448da
+EBUILD iputils-99999999.ebuild 4204 BLAKE2B 8fd660bee7be03fa76bc535d9002832934014859dd97f19feff6dbf74e2c0862dac5d2821bcc52dea4d1ce65836c0a473622bb72d58e9bcca9627c91cb63ae56 SHA512 b42c8b00298a7a6e0a94151d1cd06a68a2dc8620c5e6a0180b4b61b860f3360697cb1bf8886ac2e0ed9834c0d7842b3a826a74808343e2801cdc799a270448da
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20190709-r1.ebuild b/net-misc/iputils/iputils-20190709-r1.ebuild
index 1ea0909f0b64..45ccb52a468b 100644
--- a/net-misc/iputils/iputils-20190709-r1.ebuild
+++ b/net-misc/iputils/iputils-20190709-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces depedencies.
+# building stages, and reduces dependencies.
 # To regenerate man/html pages emerge iputils-99999999[doc] with
 # EGIT_COMMIT set to release tag and tar ${S}/doc folder.
 
diff --git a/net-misc/iputils/iputils-20200821-r2.ebuild b/net-misc/iputils/iputils-20200821-r2.ebuild
index fa217aca4c76..393c3b812973 100644
--- a/net-misc/iputils/iputils-20200821-r2.ebuild
+++ b/net-misc/iputils/iputils-20200821-r2.ebuild
@@ -3,7 +3,7 @@
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces depedencies.
+# building stages, and reduces dependencies.
 # To regenerate man/html pages emerge iputils-99999999[doc] with
 # EGIT_COMMIT set to release tag, all USE flags enabled and
 # tar ${S}/doc folder.
diff --git a/net-misc/iputils/iputils-20210202.ebuild b/net-misc/iputils/iputils-20210202.ebuild
index 61132b5fea46..5d5e0b6aa022 100644
--- a/net-misc/iputils/iputils-20210202.ebuild
+++ b/net-misc/iputils/iputils-20210202.ebuild
@@ -3,7 +3,7 @@
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces depedencies.
+# building stages, and reduces dependencies.
 # To regenerate man/html pages emerge iputils-99999999[doc] with
 # EGIT_COMMIT set to release tag, all USE flags enabled and
 # tar ${S}/doc folder.
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 61132b5fea46..5d5e0b6aa022 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -3,7 +3,7 @@
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces depedencies.
+# building stages, and reduces dependencies.
 # To regenerate man/html pages emerge iputils-99999999[doc] with
 # EGIT_COMMIT set to release tag, all USE flags enabled and
 # tar ${S}/doc folder.
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 8f55b64b67e8..ac909146f9a0 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -6,5 +6,5 @@ DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2
 EBUILD ipv6calc-1.0.0.ebuild 1546 BLAKE2B 5dbfbd9a1c5954e104ed571625e8b34e3c2901e0695fa832695110e2d11969fc0ca7546ed61569f51af8cc11f1d03b88f6e8470cdbc7ee49cb6937cc37582a20 SHA512 635473dad2289ad635734e063b20838e42d21e67e59bb425bbb40a30b479bfdf094cfb78c465ed3035a20a70df1460c35d068d6841eec786706c8741fea18079
 EBUILD ipv6calc-2.1.0.ebuild 1584 BLAKE2B ae3bb846df423a60cbae3b1eeecb3cad8457ae7deb438f66003b3d6b60f7ba2619fbf92b1e0e316e2467069bebfa79a01eff90e49cc0da851b5e8ad21a0e60b9 SHA512 0597cd98ff378014e90500c15a99feac6a1318d70c37211c2303f854e5b39a5994f9c308586f060da60adf18363dea7f2c29ae108bbb8a9b2a8f9f4edcb4f1e9
 EBUILD ipv6calc-2.1.1.ebuild 1587 BLAKE2B 1321402a089cd45d8e042f97f1a308dcd812ce556beb927954542bcada2f05775a940d1f746a279a6ae8b9610bc439d84c119402a9d6ef8da7105e83719d39b0 SHA512 a544c4bdb1cccfd97e6887d4ec2dc15e87cb92d8710cc3a5bbc1c5429f20dbc64f67d4488b8eb44ed353d9c521c4404b3463b9a2b8e4e76d966a3f2f4de89f25
-EBUILD ipv6calc-2.2.0.ebuild 1635 BLAKE2B bcc72456461791fccae520323d0f3cef4187f72c2748b8bb26067c8544ca2bbb26fb724e58b698e2f1563771049e35600afcd0fad323c81394e9c97fc48137de SHA512 f03262a417fde02cb6be8ae8996cb810d9fb8f721f53c9fe262f40d89e7edeecf0b24e0ce74feb7ccbdd27a53f5060da32c1d608827246cbc23600254f3c133b
+EBUILD ipv6calc-2.2.0.ebuild 1634 BLAKE2B 728d49812921764bc7f3a82e638eba6f1c6acc5fff3e9a727be56406d6ff0f4594929d8d9a1e614767698f5625da27628cfd27714a95d4ec65977fabf3897064 SHA512 95bb4a37f9287e0076a4bf72efa947123c5651bd84ec6a663df67ab25a0cbb28d4408c4c60bf241b1574ff39ac38e687354abe43c2ae4effffa2ee0b14db65a1
 MISC metadata.xml 334 BLAKE2B 78e76af76293fbb24c7ad6bd4f884a67d449c26d4fd7b4ff220a324f5d421c51d56d53800b2116a02777e59c3d6f4a353823c3df31073c9676443c9816fadfe3 SHA512 ef70d2c2da48d173396b2dbb2e13104ca57e7c9ab81150c07c3c166604168984d37934815eb34a4e26c2cadbdbdcaea8983141c6eea6a36b26dfb4e89157ae6e
diff --git a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
index bfca2214fdc1..271380bb2ef2 100644
--- a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="geoip libressl test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 8c7a73b37b7b..ac8d98190793 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -2,7 +2,9 @@ AUX kea-confd-r1 289 BLAKE2B da62fc34c87d791f765a7077020f7ca1c224c2b2bc86880e4ba
 AUX kea-initd-r1 2210 BLAKE2B 052fbbf03c6c1e8c66beb3161dbc8d46c6c704b7d931438039321177e792e1d7f08ccf17acb87d7c36af1878413c2f17cd00b951d4076c3be049cbe31de3e32a SHA512 051f4b86f083931c3934e2c63aeb45409bae5d50e6a91b29e642bf4cb609a539e2c23029b8dc70b48517a4646fa3db06961c823d804c514f05213be0b172cf9d
 DIST kea-1.8.1.tar.gz 9001243 BLAKE2B f121c173b915b82055048fb05dcde622ef3f7ee1d113604d94c7df737f9de1b15e5cedbe414ea583f6a6c9e9ceca615eaad2778a2736addc21b27fe45521aa3e SHA512 0f0972d63a1e146623dd30b8acab9a72af2d10c25fbdf9cf31e66ed25dee14f6b7602226c475f574a723415ba5569b04e13a97711bd933448e1045636ca6b96f
 DIST kea-1.8.2.tar.gz 9005645 BLAKE2B fec1118ca34adc4bdafea13dd6c1c3abcd42df80043b621d1ed994e7ec6906a5d13e86a1bbb6dcbdfee32a4d70281c751b46c57d4866bd92557448ab7c602c30 SHA512 7bea9eb30ee819bd350ba3f64da7dc46d1176363e7243e934ff0f0498fcd47ef4eccb7fe8d8dd4f883ab9e376174aaba4fae06b20405181d46b6b12cfbdf7dd0
+DIST kea-1.9.4.tar.gz 9280374 BLAKE2B 8fa3917ac9d3a95524b89474ac6ed09bc3b118b349a192a69a68bc7638295bd4b3e9bba532d4baba5575140d3b76f7d319a1ae4275d781ce6ffe9f931127f3bb SHA512 1808583194d426cf3881426a4d2c2f4134c463c6804648e2b1baa6a8ae48bca8b12ee2bc230349c785aff385a05a98a943d1c6ba09565e2204f262a2255be911
 EBUILD kea-1.8.1-r1.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
 EBUILD kea-1.8.2.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
-EBUILD kea-9999.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
+EBUILD kea-1.9.4.ebuild 1687 BLAKE2B fbc35228e78f1588c94dec8903b6af6be614a73f8bde3e097374a652db656e9f1a8f28495e22aca7d4c2398d21b06c6b704bfa238dc9fa6ef7c310bd90884387 SHA512 95b7879dae4b8fd42b6025effd3db251d61d7cf44c4c4f6aa39f8d572d9116975fdc405bff99516be143af81152bf6b288d2c6d155f61441b1f40edb11db67f3
+EBUILD kea-9999.ebuild 1687 BLAKE2B fbc35228e78f1588c94dec8903b6af6be614a73f8bde3e097374a652db656e9f1a8f28495e22aca7d4c2398d21b06c6b704bfa238dc9fa6ef7c310bd90884387 SHA512 95b7879dae4b8fd42b6025effd3db251d61d7cf44c4c4f6aa39f8d572d9116975fdc405bff99516be143af81152bf6b288d2c6d155f61441b1f40edb11db67f3
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.9.4.ebuild b/net-misc/kea/kea-1.9.4.ebuild
new file mode 100644
index 000000000000..f693a2e9d6d1
--- /dev/null
+++ b/net-misc/kea/kea-1.9.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_p/-P}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
+HOMEPAGE="http://www.isc.org/kea/"
+if [[ ${PV} = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
+else
+	SRC_URI="https://downloads.isc.org/isc/kea/${MY_PV}/${PN}-${MY_PV}.tar.gz"
+	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+		KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+IUSE="mysql +openssl postgres samples"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-cpp/gtest
+	dev-libs/log4cplus
+	mysql? ( dev-db/mysql-connector-c )
+	!openssl? ( dev-libs/botan:2= )
+	openssl? ( dev-libs/openssl:0= )
+	postgres? ( dev-db/postgresql:* )
+"
+RDEPEND="${DEPEND}
+	acct-group/dhcp
+	acct-user/dhcp"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	[[ ${PV} = *9999 ]] && eautoreconf
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--enable-perfdhcp
+		--localstatedir="${EPREFIX}/var"
+		--without-werror
+		$(use_with mysql)
+		$(use_with openssl)
+		$(use_with postgres pgsql)
+		$(use_enable samples install-configurations)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
+	keepdir /var/lib/${PN} /var/log
+	rm -rf "${ED}"/var/run || die
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index 3e20776fe7e7..f693a2e9d6d1 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,10 +15,9 @@ if [[ ${PV} = 9999* ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
 else
-	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
-		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+	SRC_URI="https://downloads.isc.org/isc/kea/${MY_PV}/${PN}-${MY_PV}.tar.gz"
 	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~x86"
+		KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 688821d8e327..ea86c0d014c8 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,6 +1,6 @@
 AUX mikutter 137 BLAKE2B f76eb22d6492f8737ce7de92068f551ece304a7d983a922555db1d6bd36ad895376c7812840afe579959a122c7619ef02c209cb7dc06da1011bc95b9b8d9fe74 SHA512 bbf70ab03b994f9593ea3854d1911f23d1a78d155e6aa755b2456f138ef6f7f2ca5ad7aea477beca487dac43a2e5472ca7f2e7d1503a57aaa93f41f06cafccba
 DIST mikutter-4.0.6.tar.gz 2322108 BLAKE2B 46d0cda2bc173ee971e516f017f66e26e9f7a4abd7330111ef66cd40bd0c6dd407b3d6988fa5955ca33a2c375cb77b4c234c8439dc27b6baf43dfcc9a34f4052 SHA512 16dca21bf7f989d2af71a8acc26816dbd7ebff7866b65d4c376b87cf2ba7757d8978a25483cb548448e3341c51d7767b638775e2696f64484b4f5ec8cdce050e
 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
-EBUILD mikutter-4.0.6.ebuild 2862 BLAKE2B 720272f3cfc41e607f91d2c56248375334bc8fc14d019c26f842fa4d0e4f6f27be19167f769cf049031f34ecd8ad2ad02606ef66b08193e161e0de55320998b0 SHA512 4f652a5a216fbdf263de46222bcedb8dca03bbae32d1574af42d5f90bbff663e26d4e8aa2a086c52c69f7edbbbf39b845e95e4a15fb0df6531a7038cc0a5dd3f
-EBUILD mikutter-9999.ebuild 2862 BLAKE2B 720272f3cfc41e607f91d2c56248375334bc8fc14d019c26f842fa4d0e4f6f27be19167f769cf049031f34ecd8ad2ad02606ef66b08193e161e0de55320998b0 SHA512 4f652a5a216fbdf263de46222bcedb8dca03bbae32d1574af42d5f90bbff663e26d4e8aa2a086c52c69f7edbbbf39b845e95e4a15fb0df6531a7038cc0a5dd3f
+EBUILD mikutter-4.0.6.ebuild 2849 BLAKE2B f1a05119fc79ce24110179f61bf783476e94886e48e8af5addc7470a745edf081cba9785e30408a671b83a6a9dcdfd50d7d2a59f4cab616f1e009b75017165ff SHA512 74680cc443eb90919e21e9ff0c485fe8addda6d2713157d30ff816ae80d32474d41d3cbbcb3a03adc5593e7ce1100f35c83641d6e9b52e269a5307c88387d854
+EBUILD mikutter-9999.ebuild 2849 BLAKE2B f1a05119fc79ce24110179f61bf783476e94886e48e8af5addc7470a745edf081cba9785e30408a671b83a6a9dcdfd50d7d2a59f4cab616f1e009b75017165ff SHA512 74680cc443eb90919e21e9ff0c485fe8addda6d2713157d30ff816ae80d32474d41d3cbbcb3a03adc5593e7ce1100f35c83641d6e9b52e269a5307c88387d854
 MISC metadata.xml 214 BLAKE2B 8c736c7fcedf2d2c712e43cb3a7850254057fca17f9ec3647598d76e726cd4eea542ce40b339abb3f96a56b17a3f355d9508a5980dd7c7e243bbc19b68a6a5b7 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3
diff --git a/net-misc/mikutter/mikutter-4.0.6.ebuild b/net-misc/mikutter/mikutter-4.0.6.ebuild
index 2eefb272d4e6..b42af1d0340a 100644
--- a/net-misc/mikutter/mikutter-4.0.6.ebuild
+++ b/net-misc/mikutter/mikutter-4.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,6 @@ if [ "${PV}" = "9999" ]; then
 		https://github.com/toshia/twitter_api_keys.git"
 	inherit git-r3
 	SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
-	KEYWORDS=""
 	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
 else
 	SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index 2eefb272d4e6..b42af1d0340a 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,6 @@ if [ "${PV}" = "9999" ]; then
 		https://github.com/toshia/twitter_api_keys.git"
 	inherit git-r3
 	SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
-	KEYWORDS=""
 	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
 else
 	SRC_URI="http://mikutter.hachune.net/bin/${P}.tar.gz
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index dcc4b0d742de..aef31052c7ef 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -2,5 +2,5 @@ AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a94
 DIST mrouted-3.9.8.tar.bz2 112863 BLAKE2B 4a7defbb1b97be8e452881a689d99742df2878dc9c2613c79e1bdc33af398c2be1b2d21de94e90592877ee5b6aa6b2f0c64948193eda9005c828a6cc84e492c0 SHA512 50abf2271c76b604d1e356ca5c0b62a7f07487f364991502326bbee169c451b43b3dbf01b88340d6b406f16d86a6d6fd9e7bb03c6e76d6af463b46d8423a41f4
 DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131
 EBUILD mrouted-3.9.8.ebuild 1081 BLAKE2B f6f973db6a7eb7e1a93998b58c2b8d9948a14682f9f6435fb25efe3f2dbcf44d3bfeb0e48332d3d9d66475f566dde4eaf27b4a5fe6395813a56cf2729a830798 SHA512 cdba5ee8434981a69ffe2b586b6f99febaf5f5ab948e995a458ac828f906e0af41ca5fc9e81268c2a5c312289c579152cf6799da673b73abd477692cd01b5865
-EBUILD mrouted-4.2.ebuild 740 BLAKE2B 13641fc77a4cbc4d870faefb3bbe8a0175e866ce701abfb302762235268ab3af5d7f42ae0c10f6dd8756d496d4db228ed42419f897d8497ee9d81bd7bb3c5c2d SHA512 19f242e0e9858b1e40262aebed2dca772b96bbb07bafdc340b93b3c574587f862c28d3b049c1cd97b40e5a9238d7bd039182684d7e8c2d1badad128b2cd7bac7
+EBUILD mrouted-4.2.ebuild 739 BLAKE2B 0600285e2c195f010ce90cff56552869a018ee311c238aacd22f4e13ae50dd80c794fa1925922aca99e087b4163b1328115ad85bbd4b4e9b33b54031a1f2453a SHA512 ce61708bdaadeec297a442fd5d9059af362786b47f6e7539f2ced24a86200633f5d206da7e031ffa1e3263bfcc7471d4efe2d971c7b7ed7d1d1f46a7be1b72ca
 MISC metadata.xml 350 BLAKE2B c177ffe2f3f3c6192b293561683d2bfea170030dbe31004c6d3a253440ba17a82dcdfc4426a0e5fedddbcd56bbd95a6bee3b24431efba133c1b1c0c0db821917 SHA512 19085d3b736466a73795c3f1ecf39b039453702c220a58ffcdbdd6425c94b9a6c4aa8339a7447a7430c158e06f9030c138417362b3de43b01dedd95401a16099
diff --git a/net-misc/mrouted/mrouted-4.2.ebuild b/net-misc/mrouted/mrouted-4.2.ebuild
index 6b2a90fd9b63..8db1215d3f2f 100644
--- a/net-misc/mrouted/mrouted-4.2.ebuild
+++ b/net-misc/mrouted/mrouted-4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="Stanford GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="rsrr"
 
 BDEPEND="
diff --git a/net-misc/netevent/Manifest b/net-misc/netevent/Manifest
index 4852bdbc2ba0..fb688e7ff17d 100644
--- a/net-misc/netevent/Manifest
+++ b/net-misc/netevent/Manifest
@@ -1,3 +1,3 @@
 DIST netevent-2.0_p20200217.tar.gz 39237 BLAKE2B 543456de89c6c57c7fe086d6697ca687ce0a04fce67efda7162e516eb1dca3f31b6ce31e1f5d7481fe538364f9f597103e3b77f3864c41456c6fe9080bfb424a SHA512 921982c8d9153e627c7931059e6163213ba2ac907f4ae98bcde62645e774cc41077ee728b698f3fad6a639fda19f99f9e43103006abe645f1a4ac4d68cf393c7
-EBUILD netevent-2.0_p20200217.ebuild 670 BLAKE2B ec4534fac8e8bf584485a90f7ba6d1c0af8a88700b961afabf41e1aecd16d921120415ced33bdc48788e5702f1d41a11797f5ec682470f159366dcb97e2cfb2e SHA512 6136d97214a2fb8d5b76d986624fc8768a63f83f770cde890a7fa1830b8d6626e48d42e6bb8f1e54bc3151e4825ce2fff02a8163dba675b31628d80dd19041d1
+EBUILD netevent-2.0_p20200217.ebuild 734 BLAKE2B ec372d3fb1e866c093ca753d0465c8b26fe9c2e51e0f2ef8d46005f33a2c0a2ed37a7436d6803cbb32b3dd3814b0f846c37a1f8356cd1b1047a0de471c185dfe SHA512 db53c8b6c2288b838d8ac62cb6b99d1b566375a74cb451bf7f9564b19dd78f547e51888006f5361534cae3c59275e7d9fc7eff1f8063a6f2996bb0396f5ad4c3
 MISC metadata.xml 325 BLAKE2B ea7c4382cb7e4e91b04a2b75f7af1924126d4a4592929dd19cc1f8d52b2cb81688c378f75dc12f08edaa12900c2577eec1fcb7f429e351e57bfe40ce525485b0 SHA512 22059c02dc58321f5d7d8dc7ea53ca486c4ff8949ace93f86da6d7d8d173988785590f3983bde637a4f6d511a28b301abb3c76254a113645314cf2f46843517d
diff --git a/net-misc/netevent/netevent-2.0_p20200217.ebuild b/net-misc/netevent/netevent-2.0_p20200217.ebuild
index f9936ce3b145..40a7e879dc5d 100644
--- a/net-misc/netevent/netevent-2.0_p20200217.ebuild
+++ b/net-misc/netevent/netevent-2.0_p20200217.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,3 +30,7 @@ src_configure() {
 		$(use_enable doc) \
 		|| die
 }
+
+src_compile() {
+	emake CPPFLAGS="-Wall -Wno-unknown-pragmas"
+}
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index deaf365c8845..a7e9bd089a2b 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,5 +1,5 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
 DIST pulseaudio-dlna-0.6.0_pre20200114.tar.gz 709196 BLAKE2B 3113d34eaadf735646f7e421e8271fcac02ea4faed76676d5a70e05c8a26745ffd1ae135d2c5186d9db7ad146d166535a1c901927d24ae2a1a4d08720a4f78d2 SHA512 9c97d160116acf07325b18f35000b58a042243345f98cb1c9e42848e39ef3ef32a9199e31044a758a0a5ec81176be651fa3ef2917a227347017fe375e27385c7
 EBUILD pulseaudio-dlna-0.6.0_pre20200114.ebuild 1930 BLAKE2B 604544a600229a79813012483c7ee5e5ddd3281bcf21b63ea028051338b686e8e9b217f84eb630c8a808a2c8b381252378ed61248d9d518deaa183ed63c0bdfd SHA512 8767e4612b60734ba617bfdc59218da3c35350dd7d64d4820f69bb3c6a227c4f3f46a2d330e20540ada211a18f01ec81450b13ee4af9f9398912070bc10111e4
-EBUILD pulseaudio-dlna-9999.ebuild 2060 BLAKE2B d5a96abb4eaa9daf513016bdbbb64d6f9c7b8eec5df3eee9bb011ab23ce51eb29ff80fc106407d0745ae3e6402bab7cb72a7bfee7894ef7075336231a78737c4 SHA512 ad4830800693f4dbb81a37115eac8d1874659d3ae3b787829dc1c727ebc47e67647a9266fd879918d4d5c0434b09f528d8e47336470158392ca2f9120055abdb
+EBUILD pulseaudio-dlna-9999.ebuild 2047 BLAKE2B 843cd815020ce22692edda72d1a97d9299f52594ff18cf629426d966310d84fc85c629d4c4c88a36b5ff5519f9835a5bb5d74c1ef2c1aaebf165ff3d9d692c40 SHA512 b9fba3cf64f9f574641ef9716b7c6a3243333139c7e4566cb79a24cea210028582b4c85eeac98abf67ab90e71867c5e5dae3f18c51e7a6f1a1ca52ba737e8af9
 MISC metadata.xml 340 BLAKE2B b7b3ce106203873c919144347d33bb3fea82da6d163d15bb6adba027a8230353976862fb3dc16592d15db37954356e240278d1677bfddd4037d7f42b6834b241 SHA512 43640a91e95c2ec3969e19341e64dd653e8e00136c03e98119e4d5f357a3f79754a49d17837326dcb8f10023ec0fc6ad3bde80f0912d532db77f3fb7727d4493
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
index ab637abd14f1..27c53833cce4 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,6 @@ if [[ ${PV} == *9999 ]];then
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/masmu/pulseaudio-dlna"
 	EGIT_BRANCH="python3"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/masmu/pulseaudio-dlna/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/net-misc/sobby/Manifest b/net-misc/sobby/Manifest
index 0b732ff51960..788fe29f1473 100644
--- a/net-misc/sobby/Manifest
+++ b/net-misc/sobby/Manifest
@@ -2,5 +2,5 @@ AUX sobby-conf-0.4.7 193 BLAKE2B 82cb4d2d2310b81d6e6c69358d493282ce459a9adea11d3
 AUX sobby-init-0.4.7 560 BLAKE2B f21863f4df71918beb29497207d2ace23acfcd4a21e3f945e34d56f79e4c0d3a6c21d57ac1f690e8377db0fe0a1f03abc55e56f1c56cd4b12dea5f7d6cb3cd65 SHA512 2c6254db40b628148591cc1a89b41962db23afcb9dd24d54d702f6bdf97c9976ef7ddc88ed93b7e6572b313f07d4410596e57c0b3b7f1ab866f930a9b0174c4c
 AUX sobby.xml 451 BLAKE2B 75ac409597a9e369f63aaa91f45bf18a33d11077445c3c2a53ed8d8bddb0d0f6cf38da91d1002403c8a5d26729958d4956967229524aca6d29bfd55025297516 SHA512 5ef02607a1e60a801036ad57b59d79fa1adff128da857491e0a149dd0b3a14c7244f263e7c916a1f9b08fba49597a02a11b8ff3924b278031d570679fa9eb8e3
 DIST sobby-0.4.8.tar.gz 134766 BLAKE2B 2406f4e71615cd00de7a5dc1b00734d26b96f577d7bfd3bfd56746c63b26fdc089a1560fbbea78b5863ce1755b81c0e0787cab0d6c3c476b1ab2b35bb6df084a SHA512 b946fc5c15257f74213fd6418933f8f4970ca58213a4c5bb33e1110f85964ce137eb5a9fdd0a601d8838310315241b9c29065493f4c9b33a8dbe09e77cc25492
-EBUILD sobby-0.4.8-r1.ebuild 1255 BLAKE2B d74e22051bf09518372fc25c16fb78011129459e90844e1aac1b16410c31d383de75c68754a6ab4c1b7fd4b14ffc3358d1ac149a4e853c42224ac0c36f086feb SHA512 9905003ce6942c2bd3632a0a4b7449a396de3ce32f0a318b9f2000e6e79d688e56ea6e3aeb76ea9cf5b1babe7923cb189d81c9d4d792f7481b7a2474130f3bb0
+EBUILD sobby-0.4.8-r2.ebuild 1155 BLAKE2B f7d3486c8fa54ebdea41fbc62586cda1a06a2a305cff23462922db0190cb080a3e003cc72e6437d6beee73479c4ee840a7cd9f8176d1213e9758f585049bcc68 SHA512 07375097470055f2cdc6be16e395f621cdbd5b2d5bd1b54fc4487dfbc3cf9f8c3d157da6cdbf7c83e72a44d246e73c68e47b570d752030528a67aa1e89614ab2
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-misc/sobby/sobby-0.4.8-r1.ebuild b/net-misc/sobby/sobby-0.4.8-r2.ebuild
index 551d727f0525..ce4e8e8f322b 100644
--- a/net-misc/sobby/sobby-0.4.8-r1.ebuild
+++ b/net-misc/sobby/sobby-0.4.8-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic user
+EAPI=7
+inherit flag-o-matic
 
 DESCRIPTION="Standalone Obby server"
 HOMEPAGE="http://gobby.0x539.de/"
@@ -12,23 +12,24 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="zeroconf"
 
-RDEPEND="
-	>=dev-cpp/glibmm-2.6
-	>=dev-libs/libsigc++-2.0
+DEPEND="
+	>=dev-cpp/glibmm-2.6:2
+	>=dev-libs/libsigc++-2.0:2
 	>=dev-libs/gmp-4.1.4:0
 	>=dev-cpp/libxmlpp-2.6:2.6
 	>=net-libs/net6-1.3.12
 	>=net-libs/obby-0.4.6[zeroconf=]
 "
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
+	acct-group/sobby
+	acct-user/sobby
+"
+BDEPEND="
+	acct-group/sobby
+	acct-user/sobby
 	virtual/pkgconfig
 "
 
-pkg_setup() {
-	enewgroup sobby
-	enewuser sobby -1 -1 /var/lib/sobby sobby
-}
-
 src_configure() {
 	append-cxxflags -std=c++11
 	econf $(use_enable zeroconf)
@@ -43,12 +44,7 @@ src_install() {
 	insinto /etc/sobby
 	doins "${FILESDIR}/sobby.xml"
 
-	keepdir /var/lib/sobby
-
-	fperms -R 0700 /var/lib/sobby
 	fperms -R 0700 /etc/sobby
-
-	fowners sobby:sobby /var/lib/sobby
 	fowners -R sobby:sobby /etc/sobby
 }
 
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index e4a649b5bde4..415bcd249492 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -6,7 +6,7 @@ DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e9
 DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568 SHA512 7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
 EBUILD socat-1.7.3.4.ebuild 1586 BLAKE2B 7dfdd2075cee949d3252488fb60a5d3370bf540463857521a06b5e3fc32ae75195a4383e8dc18673322ef3db9ab2f25209ac638e67e7ad65bc113a3d4285b50b SHA512 716db6a19271e18a9f08386ef2906f55d7c483186e3622fca19075b2fbcbb57c3f22fc7adf62398528b576afff040aa6bef3dbf6d6ccd9f0fc919dc1f9faaa07
-EBUILD socat-1.7.4.1.ebuild 1530 BLAKE2B b7ff17c6b73340d224bc04d660621d0277380c159446027bba426f87d598ce5400c01385648ca0c434428e18619269c7a4e3d93142fd30d2eb79e372863945fd SHA512 aa3c5397e838a7ee1876330eb52ebc6769ae287e829d165481aac5b4f0e27a4b2dc0919659f8f1dea67531e1ff70b9a385c984aea02026ef085414a89b9ef149
+EBUILD socat-1.7.4.1.ebuild 1527 BLAKE2B 86e3e04f423fe199cae6ee0017d66aa0765f4bca095f1f02eec979760a0cd61205f36907e5ce9b83d2e9558bdf391afe5e305e2c937c9e7e65059658139f2668 SHA512 578929ddc138d0e0df22275f2351454bdbd1152d6e3deeb82e74e438a3b0abfdf8ef8960412054a20df92e80638310bf4bd4844b791899e1f1583a7fec66b76c
 EBUILD socat-2.0.0_beta9.ebuild 1684 BLAKE2B 8b12d6c8f85d1f3d161238100f994c1f85862b1abc0d5759eca22d5e743821d1cccd2e1f505b19faf8ad4d65803fe26fd1a388b8a21802f000ec94d9f145a360 SHA512 5c3c58e869b297dfffded35ff69b6f34574901472196863bd8f29d52e4957129923c2f0738dc0a0b64c6cebbcb421be20ff008561ab53bfc91f543a0f96726d1
 EBUILD socat-9999.ebuild 1406 BLAKE2B c68fd7bf03d58f1bd16266304afab4cc73e2e129be5facb7416ed0a765fd198b02a76e5459b4dda831e2c4765c6cd9d4e0669dd024795161f38909c62d882116 SHA512 6ab7b9aa353e917b8aa46f2179bbcff95fa03e1e59ff4a8f68c512cbc8a582d5e288bd79a2a251c47837b60318640a1005392e0ebc72844a08327e41effdcc18
 MISC metadata.xml 467 BLAKE2B c95bf4d69aaf5077911ffc97657ec511286dd4f524fa4b9a1d537cba55d6fbc6ed2bdebf5379daa7c340a2f56538a2546971b39e7915baed943b177e7813b781 SHA512 2eb27fc5699059cecf00fa097c2e09440d5efd5a3b851631818d965bbda6767bfcc60a663d24569ab8b89a2e60bac9a5aead5fb3ca52d15e1d250140e7b70514
diff --git a/net-misc/socat/socat-1.7.4.1.ebuild b/net-misc/socat/socat-1.7.4.1.ebuild
index b825d44a0c82..d064243f99d2 100644
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 2b4435984776..60da5331c998 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -6,6 +6,6 @@ AUX vde.init-r1 1022 BLAKE2B 3859d94c2e0871998eda1ccdddf88ab01a00a67c86ec9c28710
 DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971
 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
 EBUILD vde-2.3.2-r6.ebuild 1491 BLAKE2B 25089bade969f2bcde7f4c16e85cf049d84b21a21ee073bac1fcfcd504889c82cb15dcc17c4ecad53016733231d7a47cc501e3b5a57985d4bcda6798d9ee603f SHA512 66e5797b6da812bcf167f528fe2cb3a5291a86973f1571c5e1a0274327f29eadc0baa4b3086081e071555f9213c15a127043964c20c2bec07e5e72f835157a19
-EBUILD vde-2.3.2_p20191011.ebuild 2190 BLAKE2B e0484281c05d992c02fb27c908a05eddd0b4a62a6cacb7331add7ea5c53702cd3e0006e1c5db17db5df7a54051b5198ad12953f3b1922f44d4acd8387073b34d SHA512 5068cbddcd630a5c87bc021cde9e4fe2a102d997c4bdb7e131ce1d6e8602cf13511e887d45520ace6e1fe74e6e80b327426fb1edc9a04384b5019f5983cbecee
-EBUILD vde-9999.ebuild 2190 BLAKE2B e0484281c05d992c02fb27c908a05eddd0b4a62a6cacb7331add7ea5c53702cd3e0006e1c5db17db5df7a54051b5198ad12953f3b1922f44d4acd8387073b34d SHA512 5068cbddcd630a5c87bc021cde9e4fe2a102d997c4bdb7e131ce1d6e8602cf13511e887d45520ace6e1fe74e6e80b327426fb1edc9a04384b5019f5983cbecee
+EBUILD vde-2.3.2_p20191011.ebuild 2177 BLAKE2B f7f717b46c2cab78b94b35b90d0803b0bc0d03b103feaefed2b8fdc41dbb0e7b8b966f4372d8000b3d2444e93a12a49a09dcdfb30bf766c8fb713e369e1d8cba SHA512 282b24866c4be23e2dd2c1f12c7cbfc594c016893c3ec192735d6460646868e7ad84bd8f0890e2104e62ca8ad96fb2de87de83ccdb558a3be844e5f4ac60aa2c
+EBUILD vde-9999.ebuild 2177 BLAKE2B f7f717b46c2cab78b94b35b90d0803b0bc0d03b103feaefed2b8fdc41dbb0e7b8b966f4372d8000b3d2444e93a12a49a09dcdfb30bf766c8fb713e369e1d8cba SHA512 282b24866c4be23e2dd2c1f12c7cbfc594c016893c3ec192735d6460646868e7ad84bd8f0890e2104e62ca8ad96fb2de87de83ccdb558a3be844e5f4ac60aa2c
 MISC metadata.xml 955 BLAKE2B 6e199d64f0af38e233d31f2f91e364f7f01910b9a450d215abc6ad4b5aad0a8d639d7dabea4d76cdf4d8730b4969a0466aa07496cb858ca9581c3c20bd837191 SHA512 06ac79d51fd38f77e4f3840995d228c61923d512e023ab74915030d9ee4ec628669c52d99fb040021ed1452fc5e4ba459a7a29e08fb898b44bd99642e1d7a6d6
diff --git a/net-misc/vde/vde-2.3.2_p20191011.ebuild b/net-misc/vde/vde-2.3.2_p20191011.ebuild
index b8bb5681a369..fd3cbf31c768 100644
--- a/net-misc/vde/vde-2.3.2_p20191011.ebuild
+++ b/net-misc/vde/vde-2.3.2_p20191011.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,6 @@ inherit flag-o-matic
 if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN"
-	KEYWORDS=""
 elif [[ ${PV} = *_p* ]]; then
 	inherit autotools
 	MY_PN="vde-2"
diff --git a/net-misc/vde/vde-9999.ebuild b/net-misc/vde/vde-9999.ebuild
index b8bb5681a369..fd3cbf31c768 100644
--- a/net-misc/vde/vde-9999.ebuild
+++ b/net-misc/vde/vde-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,6 @@ inherit flag-o-matic
 if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN"
-	KEYWORDS=""
 elif [[ ${PV} = *_p* ]]; then
 	inherit autotools
 	MY_PN="vde-2"
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 647d68981594..2bc64d3ebd3a 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -3,7 +3,9 @@ AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82
 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305
 DIST whois-5.5.6.tar.gz 103581 BLAKE2B 7e4aebeb440b95a278a0f0d0e51dbec2003599ee9f6e6355f29a5b043ba5cbad19310058964120142d417e6a5df86bd68d03d7ac4358be488538584c2a56740f SHA512 97a139a8e24b9a92c5597bc31e1b8d5d5bcab1ec4cc53f80cbdb7f2e5b7e54f36b3a8a8d90fd7b86452aad36adc0ba2015aaf936643b290c8a777f5f6cb27ef3
 DIST whois-5.5.7.tar.gz 102666 BLAKE2B 33ead2ffdeef4ccb838eb0401cbd774837b58cbf0e9d0e079a89b1e0d29ec2303022d442c5e5bbe5c7f16099b0e1525e0d1144f0f7a6f362545d89e4990c3f8d SHA512 a0b3f1ce46dfaa165c765b8d39d33d026842c74d26aec35bbe9d6b9e12364b37065f5799913f32da04f1896c9b69a6932ad70975c91e0b51ac9d4d30679e1c2c
+DIST whois-5.5.8.tar.gz 102750 BLAKE2B 87225c4472d4ac26b44f25773b5c2ec3696b8e00cf8ad48f551fcb0b1aa96b5d2b59cf09067a43f78af44caaf20bbd072c4a19f12bffee9d5566524bb21df763 SHA512 80f748f34aae9bd6053bc5c9357b7ffa8d713972486b2bf091b04378082dfe13e368de6873fc1de647527e74b07ff5a4198ff1bbd10152097341534668b5cdb7
 EBUILD whois-5.5.6-r1.ebuild 1928 BLAKE2B 5aa622f1ac91de01bcef9c8e08cac3ae74234374ecfe1ae2a4e76a8e701c7302f10a9987085de8d69cb46dd6af1fe162181910bfcdb5f281c6c75fe2f0ea1e5e SHA512 5592a7ac22c49ee6ead6c2617b001087db5095127fb76df0b26fac1a2cfcf275228c598df1fe246a9eb3ebd0f8ced7dc6b8a0009ecd0830ca2b08ccbfe43da2c
 EBUILD whois-5.5.7.ebuild 1913 BLAKE2B 1b7be0cc8b1d074cbe507e9dee7c0d1deba0e1b4389980a2c29026d37b51abd21dd1b52213f381eeccca69787580e8a4b72fc572ab2fbdc51ed91fcd185ad217 SHA512 1f365041a0b643011257e9edeb0f036f045fdfbd1018c2eb8ecea6e7839839e55817fad892c213c7d7364776dd8dbe33152fa16587bd7b94300ca8cdb3ce0828
+EBUILD whois-5.5.8.ebuild 1913 BLAKE2B fba85f7bcc9bd4132a95dd3cbe7070bfd6fef092626ef54f704b3978a2198c0a1b5e60451bf3bfcc080a1001ea319b8733c40f4e8aa430158a8cd455e9efd00d SHA512 4028276f4513a5a03fddb0eae2af822d1727a90baa11dc4728d97e7902220863fb9b99f566ff5e65d0a2a5ae2f4d80fa39e3a10cc9960033c73c062411837d15
 EBUILD whois-9999.ebuild 1913 BLAKE2B 1b7be0cc8b1d074cbe507e9dee7c0d1deba0e1b4389980a2c29026d37b51abd21dd1b52213f381eeccca69787580e8a4b72fc572ab2fbdc51ed91fcd185ad217 SHA512 1f365041a0b643011257e9edeb0f036f045fdfbd1018c2eb8ecea6e7839839e55817fad892c213c7d7364776dd8dbe33152fa16587bd7b94300ca8cdb3ce0828
 MISC metadata.xml 438 BLAKE2B 3c2de7b15d6973ef59d174c857597c7f320176305e7f37df85694b87874f9590f37b75402b9ce273c20855a67c54e47f64cc5c0f0cd77a5baeb348bab5c44356 SHA512 cbe1e74802cc8810ebe72d9daf7a3863bec49f70c0ac17c09c5616cb3dd5074ecf1e53172b522f30197f7e994ae7596f830dbf4c791c86083727d8b452db309e
diff --git a/net-misc/whois/whois-5.5.8.ebuild b/net-misc/whois/whois-5.5.8.ebuild
new file mode 100644
index 000000000000..4420819a3d8a
--- /dev/null
+++ b/net-misc/whois/whois-5.5.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls xcrypt"
+RESTRICT="test" #59327
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	xcrypt? ( >=sys-libs/libxcrypt-4.1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
+)
+
+src_prepare() {
+	default
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	use xcrypt && export HAVE_XCRYPT=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}