gentoo resync : 28.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-28 20:40:51 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-28 20:40:51 +0000
commit: 9c417bacd51da6d8b57fa9f37425161d30d4b95b (patch)
tree: 47c9d6e4243f39a1f48afd54c969b65b00a5c649 /net-misc
parent: d934827bf44b7cfcf6711964418148fa60877668 (diff)
60 files changed, 197 insertions, 1668 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d3be71d9b6dc..a1fbd6c30acf 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/arpsponge/Manifest b/net-misc/arpsponge/Manifest
index f5701782b056..04c58bb7f5ea 100644
--- a/net-misc/arpsponge/Manifest
+++ b/net-misc/arpsponge/Manifest
@@ -1,7 +1,5 @@
 AUX arpsponge.confd 285 BLAKE2B baf40857becaaf0060845c73dfe96040d1ea6d8383117b94bce246d7f257a75154a3dc0cd90b6f936e3d65a90e3c1e3f40f3c9babd940aab684f9be98156d5be SHA512 fc42640e5e5bfa155050ad289587a9e36909ab1043df210393d90437c22f7e1ecb72cdd7b9e61b1fc13e36f62c2ddac7677b57516b945352af08325090f8c0ca
 AUX arpsponge.initd 396 BLAKE2B bdf60346d600fd0d6f64d8d63d6056ec3b7684d15cc434a07c3845f5569b8b9b61cae3a166c77a4592184a4b20f5f0905c94eca193a35bf7d458db54f1bc23a9 SHA512 cbb775b632ca7e351322edcd1e3258cc45f5f617e3afa7797696756050aa5dc7a7a9abdb58a054f64c5fb3016f2792c017af838ab26462b8ade6c81c5fb40e17
-DIST arpsponge-3.12.2.tar.gz 105507 BLAKE2B 4bed9d81f93eb6412ffe1e7107df9a113880fe5473ce04ca7ef9027b46adc3ab68c056688ad673819a59e2bf0bff298a948b37d1c99f2f0c573083cef1833c0d SHA512 49106e03c03080b45f8c27f483dc2b95d588d156685966acc4e5c28d068a503c98aa3ef16fbdb8a8da6bae5dbe378b92dc82c932201cf5ce48cda4d006245a5b
 DIST arpsponge-3.17.11.tar.gz 103641 BLAKE2B 928ee848f0dc84304d5984ae8216fcc6d348deac03bb0e8e3178c27655d9b1550b426b58a4291c239b913e55316e8ad74519997c5b2a88783391e92e5c37c368 SHA512 70c5f16b568457ec1d88126f981d0c7cd0e85bff902dd3e4a33d9bff90475475231111ead583ded12e30301d185104e4b8119088d52a6c6091f2601822ca83f3
-EBUILD arpsponge-3.12.2.ebuild 1512 BLAKE2B 23d5c2f00808ff433eb123f8befbe8ed67ede797099d4e6110333c820de6b6cbaf4fe852f3321b2bd2525d548d842f3d919e98692024a0eee88269b7f5930021 SHA512 2539f848ab7aca49d2d0e0d4b2b05750e6d06ebfc0b0399cb584999cb9b60bccfa59008557768aceb2d1237474f4d536b5e82a3cd3ff2f68f223bf2935ceaac2
 EBUILD arpsponge-3.17.11.ebuild 1539 BLAKE2B c5a03fcb317203f0b3c87163c65d2740d1671334b9c99d76e93fe092994a5298d5deaeafe3ed7e79fd8392e59915a7ff966586c762b516f976b5bb54cf85fb97 SHA512 50ab37008210bcc645e598ee7c309017535e5463fda194293c34e35053fd87fb029dfb9910c4552a926b450aa320ef79bee1c667bfe1f8c2e1b03327182720c0
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/net-misc/arpsponge/arpsponge-3.12.2.ebuild b/net-misc/arpsponge/arpsponge-3.12.2.ebuild
deleted file mode 100644
index a96713244ae9..000000000000
--- a/net-misc/arpsponge/arpsponge-3.12.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit perl-module
-
-DESCRIPTION="Sweeps up stray ARP queries from a peering LAN"
-HOMEPAGE="https://www.ams-ix.net/downloads/arpsponge/"
-SRC_URI="https://www.ams-ix.net/downloads/${PN}/${PV}/${P}.tar.gz"
-LICENSE="|| ( GPL-1+ Artistic )"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/IO-String
-	dev-perl/NetAddr-IP
-	dev-perl/NetPacket
-	dev-perl/Net-ARP
-	dev-perl/Net-Pcap
-	dev-perl/Readonly
-	dev-perl/TermReadKey
-	dev-perl/Term-ReadLine-Gnu
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Path
-	virtual/perl-Getopt-Long
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/make
-"
-
-src_install() {
-	perl_set_version
-	insinto ${VENDOR_LIB}/M6
-	doins lib/M6/ReadLine.pm
-
-	insinto ${VENDOR_LIB}/M6/ARP
-	doins lib/M6/ARP/Base.pm
-	doins lib/M6/ARP/Const.pm
-	doins lib/M6/ARP/Control.pm
-	doins lib/M6/ARP/Log.pm
-	doins lib/M6/ARP/NetPacket.pm
-	doins lib/M6/ARP/Sponge.pm
-	doins lib/M6/ARP/Table.pm
-	doins lib/M6/ARP/Util.pm
-	doins lib/M6/ARP/Queue.pm
-
-	insinto ${VENDOR_LIB}/M6/ARP/Control
-	doins lib/M6/ARP/Control/Base.pm
-	doins lib/M6/ARP/Control/Client.pm
-	doins lib/M6/ARP/Control/Server.pm
-
-	newinitd "${FILESDIR}/arpsponge.initd" arpsponge
-	newconfd "${FILESDIR}/arpsponge.confd" arpsponge
-	dosbin sbin/asctl sbin/arpsponge sbin/aslogtail
-	doman man/asctl.8 man/arpsponge.8 man/aslogtail.8
-	dodoc doc/command_mapping.txt doc/arpsponge_architecture.txt
-}
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 177734f91ed4..99f663901177 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -7,6 +7,6 @@ AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae197
 DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984
 DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9
 EBUILD chrony-3.5.1-r1.ebuild 4760 BLAKE2B 9764ff19b0a5740e4d535c713fceeecfe8ae11b9f694cb3b736d392a50df46480fea7ad511d39e8719dd4a8311bb101e8ca62940b26bb5b7218dc4d9d5c57bb4 SHA512 b56d4b1362f4b0c6ec71c9690aec2d7106e488cf8af65f04b0c3ab49267a2a1123c178430f1528a91f27f488f9f295d79c0fb3d42e3f247e1e44ca26f84d7796
-EBUILD chrony-4.0.ebuild 4280 BLAKE2B 1d5b51c22d9a321172021ba50ac7129a53c119b7e7027c28489596f15b0365422545d9613c001feee05ae1bdc9e5898e334a787ac91aa9d257986e38bf4146b5 SHA512 09ad193ad9f0504137f9d471557354582c093d65ce1b56468f16192d72da3f17c7e5744d893e8e3cdd7ef68a54e4deaa1d36f06421c996cd9c39b2c56a09cfee
+EBUILD chrony-4.0.ebuild 4279 BLAKE2B b8522b64bc098b45127e3637d6403969f42843e9099ba8acc0a6f39d782295d911993164ade4c766630c128c3ea4f6d8f99e120515b2a5cea0c1bd7552ae4ca1 SHA512 d84e0688e5cfdd8a145e579edbb18395f532c47a6efd75e5e6c15ba91f75d9d9a8383f5231938e7b2a2c911d08cd37ca0aea53f8341bc907617ef6eb52403dd5
 EBUILD chrony-9999.ebuild 4287 BLAKE2B d682d68657aab4b753b21963d0276688a16a84ad37dbafff885a7983cf0eb48bb8493251649feabe493be6393eb48fb68a8140b6459f3d224e078f80ae4ee0dd SHA512 044a352a2afa9e875244e9bfbb7b197bb2693c0ddc52e6d88296536fa6c15fa8811f45684ca8c594f2d1150f46e0ef6178e5e7dbedab4c602f56f7bc5cbd2bca
 MISC metadata.xml 1936 BLAKE2B 46778f29ab04904ff6aa5212e989d1384f40d1923a04323837845af7563cffcc652047dae4ab8c535dcf1d2986e851c96aad4160cd4910934b3ffc347f473a21 SHA512 1094233e25ad5630cf537888304bbfd16fb8c1da36873025b0b937070733d0adbeebedc4c04383f806f2dc825013f53133fb81cef597afad16874510fa45c10f
diff --git a/net-misc/chrony/chrony-4.0.ebuild b/net-misc/chrony/chrony-4.0.ebuild
index efa9bc015ed1..3174632c7149 100644
--- a/net-misc/chrony/chrony-4.0.ebuild
+++ b/net-misc/chrony/chrony-4.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
 else
 	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 fi
 
 S="${WORKDIR}/${P/_/-}"
diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
index ea15d67daf79..45d77ec549f3 100644
--- a/net-misc/csync/Manifest
+++ b/net-misc/csync/Manifest
@@ -1,5 +1,4 @@
 AUX csync-0.50.0-gcc_5_and_8.patch 1346 BLAKE2B 55c78622122e429b5a72790c5db3b0e2e063f419ab85dac460541aac121bf8d957a2be443837023e745c71debfe908a8fd5f75d041b16f7c22610da9e049532b SHA512 fb739031b2eca4f69f1384262214b13d5ccfd0abc64d889bb1b69f3a04473a43129ed26990aebcfd51e5b98b70649d9fac36a7eb116d162631f074d60ea82a41
 DIST csync-0.50.0.tar.xz 2705992 BLAKE2B b59ee573eea9bd7c46302d3db782b46f978d62219e3a3e70e97a012d1ea32681a1aa3133505c3833c5d1e6d0fcb90cc985d21553086ed8de28c7ca9fc8aa0099 SHA512 babe44af3a4f0bf58e011f1c33c7a6df9bc7751e03714dd64d8269c7c51bcc7f2ab32c4d286e5a11465c9498c988d1812c426a4f415f1138a4fb9fa341e1e29a
 EBUILD csync-0.50.0-r1.ebuild 1157 BLAKE2B f33db5654367764c3ea7b38ea00f80551daaf36df59288fd1dfde135fe8dca52ecb836c3171bb85fca5d478b1f73f2a7f2ca7188632f251d81b304498cfabce0 SHA512 86a5f1eef0f446f6def4c2fcbbe38ff74d73ea15c5a4de65e88b33c919475a90b5dc26206de030dd3a108f64f01fc89ddace5514579915ca86f8ee4db5635939
-EBUILD csync-0.50.0.ebuild 1226 BLAKE2B bcbd312e3b7ee18047220fa5a9e842c6de59dc2fe3c9933842b83e53a02446a2e032f77b9b688af4fcce95b9f199cbcaf08ec5c0d720a5f451d7a0029af77149 SHA512 1eddc1503d07bc2d0b43002c9288b260dbe425df100222a613179085e67395f9204ff46e88b5dc83eaba5430df0a5078308ebcf049818c2c287417951b6f67b4
 MISC metadata.xml 354 BLAKE2B 5a0ff4b19f98eefe67e4b6dc04ea59cdb76abfb4f8799163cf2c87a565660e84182ca565eb641b43b66083d9d9dde12cb156edc84b06e889edf0cc9a60e07d68 SHA512 513b19184444fb46882523fc160043d7d530d202aa253f44ace9fc97fad8dda7748083bd992921d93ebd62a12397e69a086932818e317f75fb7dfa478ab3f1ba
diff --git a/net-misc/csync/csync-0.50.0.ebuild b/net-misc/csync/csync-0.50.0.ebuild
deleted file mode 100644
index 188fcabcab5f..000000000000
--- a/net-misc/csync/csync-0.50.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="lightweight file synchronizer utility"
-HOMEPAGE="https://www.csync.org/"
-SRC_URI="https://open.cryptomilk.org/attachments/download/27/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc iconv samba +sftp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
-	net-libs/neon[ssl]
-	iconv? ( virtual/libiconv )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-	!net-misc/ocsync"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cmocka )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s/__FUNCTION__/__func__/" -i \
-		src/csync_log.h tests/csync_tests/check_csync_log.c || die
-	# proper docdir
-	sed -e "s:/doc/${PN}:/doc/${PF}:" \
-		-i doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		$(cmake-utils_use_with iconv ICONV)
-		$(cmake-utils_use test UNIT_TESTING)
-		$(cmake-utils_use_find_package doc Doxygen)
-		$(cmake-utils_use_find_package samba Libsmbclient)
-		$(cmake-utils_use_find_package sftp LibSSH)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/ip-sentinel/Manifest b/net-misc/ip-sentinel/Manifest
index 93dd3169462c..f7f477daf5c7 100644
--- a/net-misc/ip-sentinel/Manifest
+++ b/net-misc/ip-sentinel/Manifest
@@ -3,6 +3,5 @@ AUX ip-sentinel.cfg 278 BLAKE2B bf582820bb9a22a0cb3e5b82ae934697c77d9f777e31ae1b
 AUX ip-sentinel.conf.d 357 BLAKE2B a8f08e6c63e4b1413f9021985086a573c4691c70f3d2f7447e0f23a4bfc80253b32971fff473e7ca1c71ee1f7bed192d2e8cd1ca01385153d156dc4bb1a25e7d SHA512 c35614e812cc0b3caea671cf2703493030f6de96f8b5afc80455c93f3e6181ddaf7eb6c22d8b63244f219b506db4bddfdf9792bf89ec17d7c56d274d003d4506
 AUX ip-sentinel.init 1047 BLAKE2B 3073e1145b94e93b08400a06ed7a0f0ba4a7d11bd996f4daaf3e27ca857dd2b5c74d30e644ebdc3a5fa1911ef378d3a9306a011d293f5d46d25f989c5f3ac44d SHA512 89729f42d31a81902e957e67089c0e3ead7f8e8f9554ef787bd6c05f210f231d56812a5dcf56d5be58c360dd31fa38873dfa17d1ae0423a80d1e93055853ed75
 DIST ip-sentinel-0.12.tar.bz2 165803 BLAKE2B 5b77dc771c432ddb556cc30cc9fce4226fed47958930cad4364af63146f8feeb5177542bccecbd276161acaa2232315022a59b8b83ba7763523886b4cb82b364 SHA512 dfa025fd96260073903ffe33dbaa5a146658dee2b8cb9bc04da0894a8de83207971a7f1e731128e42a0421052cdc352ed43a0298916f521d5f230533266e5077
-EBUILD ip-sentinel-0.12-r1.ebuild 2180 BLAKE2B a848bc02fb3e0e28e3eca77c5303bc6de17b476b82327aa9b7bbb26177441e0ec335316f2d1d7542b6a500511c08a04fc3c5ea6014c98dddda88a1228c6cffd2 SHA512 03f86d872cbafc7c24717c44719e8f468ff4e08748ab7656bb5783f25b803c94ad85736ea454756ff084bbb16084ce60b60c6dbee3d386360e925b19f31f9ae0
-EBUILD ip-sentinel-0.12.ebuild 2077 BLAKE2B aa22163ac0e315512e4a197b36c7b2a464875067ca27256b2e091c00f8b7d0647aa64220ebad81a164fc8deb8f76efe5d3444c9685c5fbb625ef8dab50e699f1 SHA512 09d5f004cc90df5f0460b8dfaddcd32e928d9b86e23e616acc784d02b7d77647d36de332c7f5c07cd784866b6c2926df46608123a4fe61543fa2d0765937b09e
+EBUILD ip-sentinel-0.12-r1.ebuild 2179 BLAKE2B aed07a13e13ad7502d8f7b8675ae23858a49d21466a459f5c3e8d131b803c432883cbdfe93b4d760a357e12d72343819db9ce9361b9651e8e420a13e50ac5796 SHA512 328522239664f4f0f726bd46184e4df20e5d131f3f0de777407c6d6b10253cff3f1c3f5556cfd2efbd5ac2d374418c6389d949e176274c5eaed827bd8f6e7492
 MISC metadata.xml 1303 BLAKE2B 7e42bf502035f8efb315fa524c938ff417f26dd88042ee673ffc9ed7aaa7efa52ef7a7ea08b7576bf32b8e213b6107c85b633967c261ead2349e78674793a36e SHA512 9ca404d2b97faf88cf40cf991584dfb1888e78b41817cc6dacfb2ac2bf13afdbb9c8496f61236e85ce2932c12d889975758108df0229760a16fa4478e5c0ffed
diff --git a/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild b/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild
index 76e2d1db7e7f..2cd5fcce6a09 100644
--- a/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild
+++ b/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.nongnu.org/ip-sentinel/"
 LICENSE="GPL-2"
 SRC_URI="https://savannah.nongnu.org/download/ip-sentinel/${P}.tar.bz2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 PATCHES=(
diff --git a/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild b/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild
deleted file mode 100644
index 97256539afd6..000000000000
--- a/net-misc/ip-sentinel/ip-sentinel-0.12.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Prevent unauthorized usage of IPs in the local ethernet broadcastdomain by answering ARP-requests"
-HOMEPAGE="http://www.nongnu.org/ip-sentinel/"
-LICENSE="GPL-2"
-SRC_URI="https://savannah.nongnu.org/download/ip-sentinel/${P}.tar.bz2"
-SLOT="0"
-KEYWORDS="x86"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/ip-sentinel.init ip-sentinel
-	newconfd "${FILESDIR}"/ip-sentinel.conf.d ip-sentinel
-
-	insinto /etc
-	newins "${FILESDIR}"/ip-sentinel.cfg ip-sentinel.cfg
-}
-
-pkg_setup() {
-	enewgroup ipsentinel
-	enewuser ipsentinel -1 -1 -1 ipsentinel
-}
-
-pkg_postinst() {
-	elog "You can edit /etc/conf.d/ip-sentinel to customize startup daemon"
-	elog "settings."
-	elog
-	elog "Default ip-sentinel config is in /etc/ip-sentinel.cfg"
-	elog
-	elog "The ip-sentinel ebuild has chroot support."
-	elog "If you like to run ip-sentinel in chroot AND this is a new install OR"
-	elog "your ip-sentinel doesn't already run in chroot, simply run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "Before running the above command you might want to change the chroot"
-	elog "dir in /etc/conf.d/ip-sentinel, otherwise /chroot/ip-sentinel will be used."
-	echo
-	ewarn "And please! DO NOT START THIS DAEMON thoughtlessly."
-	ewarn "If you DO this will BLOCK ALL communication inside your ethernet"
-	ewarn "segment!!! If you have any doubts do not start ip-sentinel."
-}
-
-pkg_config() {
-	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/ip-sentinel 2>/dev/null`
-
-	if [ ! -d "${CHROOT:=/chroot/ip-sentinel}" ] ; then
-		ebegin "Setting up the chroot directory"
-			mkdir -m 0755 -p "${CHROOT}/etc"
-			cp -R /etc/ip-sentinel.cfg "${CHROOT}/etc"
-		eend
-
-		if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/ip-sentinel`" ] ; then
-			sed -e '/^#[[:blank:]]\?CHROOT/s/^#[[:blank:]]\?//' \
-				-i /etc/conf.d/ip-sentinel
-		fi
-	else
-		eerror
-		eerror "${CHROOT} already exists. Quitting."
-		eerror
-	fi
-}
diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest
index 17b516cb2e9d..4e64bc2c9920 100644
--- a/net-misc/ipcalc/Manifest
+++ b/net-misc/ipcalc/Manifest
@@ -2,5 +2,5 @@ DIST ipcalc-0.41.tar.gz 21599 BLAKE2B 3b54df9bb38fa42c9b11d1192a8e23e6cd7c9cdadc
 DIST ipcalc_0.42-2.debian.tar.xz 6144 BLAKE2B 7fa1e32f9c713b4f3dfa8636f9bb4b0bd70e09e3d02e71f1f2186e8e2ab381638eb33e63c24f41dfa948db11b7e877a147d22363d105ac26e98ff509d1cd0aa2 SHA512 6b7049bc5e27e22dbbca12913716757cb3f5b91d0a8f729d35a67971c763b0bea8ab65c24fe31ad43755aedb68650c1d8b3f3e770228ed6517b43e83735086ec
 DIST ipcalc_0.42.orig.tar.gz 25903 BLAKE2B 5abff0f234829ef84345645634f1b12287456c26a42cb65856f26ac12699d5f100a2ef432a6d19627f72d800e65257d46bc0edd8ec1bf4054dcdf843d2ee158f SHA512 4e67ccdbb7e42ced39ee8ac83e47585d400c1b0a26e74a909c2e29e7f2256e37b06855cc29f0272b71c5ff6bdd8252e2563ad89562cd8d04ce0fa032f6f3fb34
 EBUILD ipcalc-0.41.ebuild 527 BLAKE2B 667a37107ed4f346d4a4f7b9f9c2b909a38dd90855ed336ffe7766668bba206229a856c2aba26f6edb36e474ecb00a509fc04185f238d72cdb788d6d5f0c75f4 SHA512 10133935b6510c91944acd7ff5b43e5dfce8eda29fc7ebd46aad529537da2d2d9414ddacb0b86d7451e9bfebbc8b8eeb577dbfe7a8631d79e3cc07a7f97101d2
-EBUILD ipcalc-0.42_p2.ebuild 761 BLAKE2B b090c2dd74ae6246ccd081047c9b58ba65a9869ec02d163dd3804d8999f4d50e66b3c7ff2c0852e117cc0d9c8ac2a017cd81a07c9e140df9df59ddf96981d143 SHA512 49ba805421d69ae6a5e59d62b8b56880b676105fa2eaff7ade7a81198b37a858e77670a2486d7a952acad03b1ebb70c3a2c3d5b828210c0eea99cc62d5c105df
+EBUILD ipcalc-0.42_p2.ebuild 760 BLAKE2B 41ea2eced52303ff39d7d3414805ac3a44ba1a5047f16eb6960b7094e8f879cc71df12983702ddb0c8080e724293f13bad52c2095a393fb8cd75cb50ce906161 SHA512 bea4f5a4f01b9ce31bd42f8e5035e39cf7a0a48b7545cd3c9fdb4c00b4a5905af7d7c65c64fe96a66e4a996448a984eac9a48346941808fc9ee3549f2ae9d8d1
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
index 832a7b9c5242..bac7f1cb48fb 100644
--- a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
 "
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 
 RDEPEND=">=dev-lang/perl-5.6.0"
diff --git a/net-misc/lanmap/Manifest b/net-misc/lanmap/Manifest
index eb621edc3068..dc54e24c8db6 100644
--- a/net-misc/lanmap/Manifest
+++ b/net-misc/lanmap/Manifest
@@ -1,6 +1,5 @@
 AUX lanmap-81-make.patch 1930 BLAKE2B 0c4ccc3173e3d5bb9babe39f6ee32f0a5c6f045cebc6d59041af24f51b906dfa4596e0a54270c49b9b6b29813af0d8a4f7f1aa98392cd61dfc2d689879a62c61 SHA512 601a570e55ce987d41106cf1c79a2564e55d8756bf8ec1cd58c63df38ebdccfece6b60d29b24f36aa828289f0762c3c54ae58b30b61355c2479c27fa9322b86c
 AUX lanmap-81-printf-format.patch 303 BLAKE2B 90cfcfc8d3c94e0ef1a3a929500e5d86de51e9c046987a5e68317ec5435a4bdf739a6caf3869fc334561000e0c4cb66c87c95c01c03955499986cefb931e0710 SHA512 644e269b1c3b872f66707d452129033f9f2d67ad895244b5aeb34886f1cf572482a7ad82f97f4d23ac3e652ce64f56f9bdaa8c11aa76cb5d6cac42c170f30285
 DIST lanmap-2006-03-07-rev81.zip 405933 BLAKE2B 6ccf3bd502d7417a4c795ec536e6b970bf0e5c8e0666db45a80e25ced7a27e56e64aec6482cbcf6808d2ee653e7a3a5552dc7215127660cf2c7551f051c3ab9b SHA512 9216d753548fba48f4fcd18a55136a50c0dd01c87f1d5f7736319a7a71b28bd50f082a9aa94d8c426924e0fa4fb6537cd8c8cbd2a289736ede54fd4c6f4679f2
-EBUILD lanmap-81-r1.ebuild 779 BLAKE2B 68d6d67041d341555fce2015fa91e50c3de634a62fb914aa40e42876649c890939045cbf07d9f07cba68d254116029b6358f2ff6f94ddcc6181a5d40447f33f1 SHA512 38b6db639c62ce2fe9988854500eefdb2c6b77392120c4fc587aacce419331ec35e685a19541020945f5d2ff003bae3f4d6c8b591b334b7fb09be0b3029cc5b9
 EBUILD lanmap-81-r2.ebuild 826 BLAKE2B 8779cb8c5bedf3489677e5ec339fb9d63307d2abce70e6cd108a59ce3dc9966447a5c8d126da4dcdac5b9a37f5b9a35e53665161568bfcfb49526963177d236a SHA512 5a73d9fd50ebe21f8e629746527cc1f13689ffb5c39e8dae159ecbb9f549663f93c237e24f574d16289ec108aef8b9fef578de46fc73dea5ef49fe26d08f1bca
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-misc/lanmap/lanmap-81-r1.ebuild b/net-misc/lanmap/lanmap-81-r1.ebuild
deleted file mode 100644
index 7c14fb94965d..000000000000
--- a/net-misc/lanmap/lanmap-81-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="lanmap sits quietly on a network and builds a picture of what it sees"
-HOMEPAGE="http://www.parseerror.com/lanmap"
-SRC_URI="http://www.parseerror.com/${PN}/rev/${PN}-2006-03-07-rev${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-CDEPEND="net-libs/libpcap"
-RDEPEND="
-	${CDEPEND}
-	media-gfx/graphviz
-"
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
-	rm configure || die
-	eautoreconf
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake prefix="${ED}"/usr install
-	dodoc README.txt TODO.txt
-}
diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest
index 9a7e167649fa..40f1e4324a6b 100644
--- a/net-misc/libteam/Manifest
+++ b/net-misc/libteam/Manifest
@@ -1,6 +1,6 @@
 DIST libteam-1.22.tar.gz 544302 BLAKE2B 8c20471506546de6f45989513ed22fe79f694febacbf1a0caeda872e6e8b815f9813cff682eb11060c3bb1b2ef12149f34d15c201a6b50fe438bf9776abda987 SHA512 7f54b7e87c1d3a5150e598052126e1c2f5396096450a68a923c9cfb7bcc48b724cddc61f55e34d1b5df103f5473367eb268877100f10c58d53fc3eaf24749d5b
 DIST libteam-1.31.tar.gz 176331 BLAKE2B 77aae059b37a018e5503642138aa469f0769d305ec2043642fb1d84ff1d05f6eb90083946ca113cf3f9c21a09a17b3fbda327b714eb96743a10e99b89d5d5c83 SHA512 1382cc3b0a2d0211f33e506e8a6fd8a1847398fa5bba56abfc959da70bcc8417cf1dba9e26a777da5729eb237f51a66b3f9cfa33fb830ed684aa076f4c8cec9e
 EBUILD libteam-1.22.ebuild 1278 BLAKE2B 760afca7072e722f981b8a492accd81ca33907389f601a6baa8b74c025c8011c69d5f2ad67d7db1682a6cc9f52edc6158d79743df2090bdd972c2563198e3420 SHA512 b041b9a44a39c69947febd1747d238cc38ebddd4ca55e2032523875d388edbf0d41744d9dab2b6c3a78d76e6c3d286e28ed98fcc325889f770f147224e0f676a
-EBUILD libteam-1.31.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653
+EBUILD libteam-1.31.ebuild 1373 BLAKE2B 36c7791e28110fce03efb8e4f812c42ef8ce56d10556e27d2d4b4f1546568f4684415146ed0fee2b5c42600e5835d2b0babe1669924bb3c6e06a2985a0e26007 SHA512 eee04cd5ee120125476697b1f6e8eb1ca29f17366d2853c729e19337d1f3e78c239b2f5fb91ffa92343e8158936d710979645051361daa3b02ed006ec222009d
 EBUILD libteam-9999.ebuild 1374 BLAKE2B cb8c50775142338159d2c2082c749b850d4774b9ed7d6f4f6369ef07e9f82b5290720f1a8aafd8228ff5f13b0abfd76371f724f207583a032237c97258c21948 SHA512 334bc0f0733dba9b08967426aa8f1d6c3509d3a0dd27195290258a3db5a23c2225f3d8719d5b8f4ebf74429c616ce9daedda804d4c35bbc844425e14d9067653
 MISC metadata.xml 334 BLAKE2B c4d7a143b2617bc5896b42db67b45115231eef0177c1bd6d4878fcce85b1db00085153aff0a51b7e4b877b2bc68aeeb7769f8360042a6e6e21d5c9371bcc2e03 SHA512 0cdfae73365dfd53d676ae7ab8e9a0689f0a117542d5fb99e1c5987ae41388f8f8c54b37829915035f417b7e9ac30b6f2abccf95b8a3202c7a6731530201d2d4
diff --git a/net-misc/libteam/libteam-1.31.ebuild b/net-misc/libteam/libteam-1.31.ebuild
index d4c4a38f6d61..48dbecbb6983 100644
--- a/net-misc/libteam/libteam-1.31.ebuild
+++ b/net-misc/libteam/libteam-1.31.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Library and tools set for controlling team network device"
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index dc0acd2e7f85..58251156ebe8 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -7,13 +7,11 @@ AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034
 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
-DIST memcached-1.6.6.tar.gz 543661 BLAKE2B 04de48d6450961585ac3b1c8ae6f803c59e5bbf34e45aa27c9e53309350608dc3c899cf169095361c4ccdc44e0bcc2860662d7066477abd7fdc8e80e34d22d36 SHA512 dfd19bf42d35fff391bb479338706a83082e3cdd3ff6e225d3d4da9df01b0a1f659a012dc30766651ffd57f0c19128fc4c3df29b721e588c909656d02cfdaa0a
 DIST memcached-1.6.7.tar.gz 547791 BLAKE2B 7ee39a5867cfaa52eb5cfb947ce42f711e030422b03b5c5547284d5cab91c044d04293cc355da3b868fb0ca02e151aec5980e455c1bb8067e38682209b1e3e4e SHA512 8b4c44ae4da8577cc5431aaca6118fdba27c42418a51a6d319d9040a975371a2fda9fcea2cb44c3d20c92f08961cb5f0ddd28c2f4cd12986b73c9342d91ea2c8
 DIST memcached-1.6.8.tar.gz 548024 BLAKE2B ab20f2c2e5a8f6cc4e0e1ef26e21f5d5b0baae35df887abd427d460591f9eadebbc08217a52e153c60b98098051ef855b918b74983bcb26f50b413caf508dca8 SHA512 256dd2b62fe9365183a44d9df99510f99f2fbb01d2afdf1558987331e7e746407f1caf5b93c82cb3e9b22ca8f8bc3d021706faf3849e60e43d9fdf7c1ec7cdcb
 DIST memcached-1.6.9.tar.gz 556137 BLAKE2B 429d0d5de480d0a17a2c9942f595fab125d60ef1f3ff88754ab6e97eb9acdb71b26e40323babc7197e41d1605a82d2f094ce5638d2f4442467c8f652e20aaa44 SHA512 2169225aefe6bd7481d919ae3ef95ed85d2ed595f49daceeb13d2dc268097d4aee98cf604824fca103efcdffa7461bb26814209906a5dabf1a5d30af43f6a66c
 EBUILD memcached-1.5.22.ebuild 2945 BLAKE2B 0c4c35283d3974009dbd401699b8bb10e695b9d608daceb87402316b083772c2f1ef932d9ccf72ca17bc895602e7ac032fcd215bf7a40a9d29d8843ef774b01c SHA512 a22de0a032ffd098a4283ebf97aefc0e315744d59893c61110a46eba734f78ec4f98d1c8968756471811244fd02c38b7d17f83a385aeb1117aec0dee9a977618
-EBUILD memcached-1.6.6.ebuild 2879 BLAKE2B f544543fa423ec039db5de7f4833e827e751abe31c7238ccd8449dc1ec9d04e793acccd892b03b2251e1ee72232983211c4185d55b0dc66bd09124b97c77c0de SHA512 e89bbf64686b0edd4514f42707ecec7aac5dd34e4a6892052b51d0408d71c42ba14fe9a56eec83556d1a4664cb19fbbe638b2cf77a6c78e332edc05a745c4121
 EBUILD memcached-1.6.7.ebuild 2879 BLAKE2B f544543fa423ec039db5de7f4833e827e751abe31c7238ccd8449dc1ec9d04e793acccd892b03b2251e1ee72232983211c4185d55b0dc66bd09124b97c77c0de SHA512 e89bbf64686b0edd4514f42707ecec7aac5dd34e4a6892052b51d0408d71c42ba14fe9a56eec83556d1a4664cb19fbbe638b2cf77a6c78e332edc05a745c4121
-EBUILD memcached-1.6.8.ebuild 2881 BLAKE2B 46e83166f00bda0762f966c90b943260d2e648ae57cf1bfa48e750367fbe7c7e4dc8e52906f17f4c12085ac50a72ac471e87fb958eb777fbf7b4d1728acfb0e7 SHA512 342fdc991a53c4dfb58b54682384cfa7c803a26d435f01dbf06cd23688fae99ab4d2736024c0d3bf0df596beb74326be262f7147a88965f590257dc3a08bacbb
+EBUILD memcached-1.6.8.ebuild 2879 BLAKE2B f544543fa423ec039db5de7f4833e827e751abe31c7238ccd8449dc1ec9d04e793acccd892b03b2251e1ee72232983211c4185d55b0dc66bd09124b97c77c0de SHA512 e89bbf64686b0edd4514f42707ecec7aac5dd34e4a6892052b51d0408d71c42ba14fe9a56eec83556d1a4664cb19fbbe638b2cf77a6c78e332edc05a745c4121
 EBUILD memcached-1.6.9.ebuild 2881 BLAKE2B 46e83166f00bda0762f966c90b943260d2e648ae57cf1bfa48e750367fbe7c7e4dc8e52906f17f4c12085ac50a72ac471e87fb958eb777fbf7b4d1728acfb0e7 SHA512 342fdc991a53c4dfb58b54682384cfa7c803a26d435f01dbf06cd23688fae99ab4d2736024c0d3bf0df596beb74326be262f7147a88965f590257dc3a08bacbb
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.6.6.ebuild b/net-misc/memcached/memcached-1.6.6.ebuild
deleted file mode 100644
index 563ec54b1aea..000000000000
--- a/net-misc/memcached/memcached-1.6.6.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils flag-o-matic systemd
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-	https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-	dev-lang/perl
-	sasl? ( dev-libs/cyrus-sasl )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-	acct-user/memcached
-	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-)
-
-src_prepare() {
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.6.8.ebuild b/net-misc/memcached/memcached-1.6.8.ebuild
index d1349f310a79..563ec54b1aea 100644
--- a/net-misc/memcached/memcached-1.6.8.ebuild
+++ b/net-misc/memcached/memcached-1.6.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 8cb0748fd408..02e8f8400a44 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -2,7 +2,10 @@ AUX minidlna-1.0.25.confd 313 BLAKE2B f08adcd103be5fcffa02d2c62ca85537cb5803336b
 AUX minidlna-1.1.2.service 230 BLAKE2B 13db2b522a5c27143106f7d45410f94c657133440a5e352794cc4fc48c818865b28087c666911c905efd3fb9c00b6aa9f79f9d0b014eae9130db0d40b5a0ec20 SHA512 0cfa770c43097007dce2c440512e4ca27e02678a08299c8343c91d2e9f70d4756bfd9527c6747a484c639e0e8467cad3d5f2f5a216684ce75495be084e6ac5df
 AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb263d87ef4ab18a128f55117929c6d244de72e5e663e06579a551ff1aa9df385afd277135aa1a2ed0201bbb SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2
 AUX minidlna-1.2.1-fno-common.patch 1209 BLAKE2B 51994c0cfafd354745ddf83fa3a134a661459bdbc9661007f1ed3e056e6b9b89a44649496f83841ee83e454b1664594d34bae3757f2af582811e2ca2c8c4a77a SHA512 67ee0b86dc639b65d912cef96c617652d349d49e32a89538c2dd7a340e58a657b471cd6155aca8656cca44599d75ca96016d29a9a8107501870e511251782384
+AUX minidlna-1.3.0-fno-common.patch 602 BLAKE2B dca6dff5dd0d2b7eafa5d58b8879d4f0f28ff8cbe7fe8d31d97a3078c5c6eecbf0462b10fb646f57ecc734e0102a9010f6f66142774f32d69d9b6a7c09b5d17c SHA512 a02c78cdac03884115f5fffc85cedf92c13687fad002a82c9497b63d394d53020bb4ab5e04e2d6a27b662b93153c6244576559a425ed67de849cecb7f7e5a9b8
 DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b
+DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
 EBUILD minidlna-1.2.1-r1.ebuild 2785 BLAKE2B 313911fc6b289e4912d7d431ff14ed26ccc657d298241df4229c6fb462ea7aa848e72bbfcdfaf1bd2a7c20e5617c8b6f07476c5535f65796bae430a32170b7e9 SHA512 ae59f442bac0748275b767239be6ccc216ce33bfdde623b3daadb09dce08a7825f9ad1747195cd21ae8b44c205398c2d968f7ee3074a0275f7abda3f95aa3347
+EBUILD minidlna-1.3.0.ebuild 2096 BLAKE2B 9d6f7ba17228d9e7938feced57fd436798d751015c1ab1583862d49813df801551c0532281a1636e15f8fbfee1376272825709957f6377d704b74e9f1a61f264 SHA512 c61018f7d289af8604e61f5d15cf136140796add1c831ff99bf3de497765612a1f7a2bc24d14fd5e8ae05c02256c6f0eb657250b3116fb1d266a8c1380b0bd46
 MISC metadata.xml 512 BLAKE2B 4f4f646b79a65b8563381b6534b8cc51d3731f529b3eb2352ed19032123a9e3801c23fde576dab0467e04f9eef4ffa8bf89171ed3929fc808c9a4b08122bfaad SHA512 571087e06e7d8d32ea6923043738b5f36eadd60880a49260ada78416bb8b2c56a3756408bea161d0292ccfa92acad6322a1f5c960afd0930fc2187f941d9dfc4
diff --git a/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch b/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch
new file mode 100644
index 000000000000..50da196377f1
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.3.0-fno-common.patch
@@ -0,0 +1,23 @@
+--- a/tivo_utils.c
++++ b/tivo_utils.c
+@@ -27,6 +27,7 @@
+ #include <sqlite3.h>
+ #include "tivo_utils.h"
+ 
++struct sqlite3PrngType sqlite3Prng;
+ /* This function based on byRequest */
+ char *
+ decodeString(char *string, int inplace)
+--- a/tivo_utils.h
++++ b/tivo_utils.h
+@@ -30,7 +30,9 @@ struct sqlite3PrngType {
+   unsigned char isInit;          /* True if initialized */
+   unsigned char i, j;            /* State variables */
+   unsigned char s[256];          /* State variables */
+-} sqlite3Prng;
++};
++
++extern struct sqlite3PrngType sqlite3Prng;
+ 
+ char *
+ decodeString(char *string, int inplace);
diff --git a/net-misc/minidlna/minidlna-1.3.0.ebuild b/net-misc/minidlna/minidlna-1.3.0.ebuild
new file mode 100644
index 000000000000..c5e9ef5fa6b4
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.3.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="https://sourceforge.net/projects/minidlna/"
+SRC_URI="
+	https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz
+	https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm x86"
+IUSE="elibc_musl netgear readynas zeroconf"
+
+RDEPEND="
+	acct-group/minidlna
+	acct-user/minidlna
+	dev-db/sqlite:3
+	media-libs/flac:=
+	media-libs/libexif:=
+	media-libs/libid3tag:=
+	media-libs/libogg:=
+	media-libs/libvorbis:=
+	media-video/ffmpeg:0=
+	virtual/jpeg:0=
+	elibc_musl? ( sys-libs/queue-standalone )
+	zeroconf? ( net-dns/avahi:= )"
+DEPEND=${RDEPEND}
+BDEPEND="
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+PATCHES=(
+	"${WORKDIR}"/minidlna-gentoo-artwork.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	sed -e "/log_dir/s:/var/log:/var/log/minidlna:" \
+		-e "/db_dir/s:/var/cache/:/var/lib/:" \
+		-i minidlna.conf || die
+
+	default
+}
+
+src_configure() {
+	local myconf=(
+		--with-db-path=/var/lib/minidlna
+		--with-log-path=/var/log/minidlna
+		--enable-tivo
+		$(use_enable netgear)
+		$(use_enable readynas)
+	)
+	use zeroconf || myconf+=(
+		ac_cv_lib_avahi_client_avahi_threaded_poll_new=no
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	default
+
+	#bug 536532
+	dosym ../sbin/minidlnad /usr/bin/minidlna
+
+	insinto /etc
+	doins minidlna.conf
+
+	newconfd "${FILESDIR}"/minidlna-1.0.25.confd minidlna
+	newinitd "${FILESDIR}"/minidlna-1.1.5.initd minidlna
+	systemd_newunit "${FILESDIR}"/minidlna-1.1.2.service minidlna.service
+	newtmpfiles - minidlna.conf <<-EOF
+		d /run/minidlna 0755 minidlna minidlna -
+	EOF
+
+	keepdir /var/{lib,log}/minidlna
+
+	doman minidlnad.8 minidlna.conf.5
+}
+
+pkg_preinst() {
+	local my_is_new=yes
+	[[ -d ${EROOT}/var/lib/minidlna ]] && my_is_new=no
+
+	fowners minidlna:minidlna /var/{lib,log}/minidlna
+	fperms 0750 /var/{lib,log}/minidlna
+}
+
+pkg_postinst() {
+	tmpfiles_process minidlna.conf
+}
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index 44e777d7a0a5..a803df4a5ae6 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -3,7 +3,7 @@ AUX netifrc-0.7.1-dhcpcd_pidfile_location.patch 1580 BLAKE2B c1fa6aeedf5964b41a0
 DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0351cc210ea0134e654cd44f90cba0390014412f6b45ff4d337d3aaeb5e739553231305846351452aebac870e1 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710
 DIST netifrc-0.7.1.tar.gz 82393 BLAKE2B a1d147db2a4e4ff7d360bf5140ccf060283dbcbfde7100f1d193c783f1da540574e1342b4d7f3f9ee011628f9f113fc751416805f35678a1093e0cc0014f5eb9 SHA512 407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057
 EBUILD netifrc-0.5.1.ebuild 2101 BLAKE2B fa748e43c948521df151189006cb9a45db49e1904074dcf71941aeb98aa878155dc5a0a341800c6bb27155caf4342b3fefe9a18edecd9b397244e7b293a5842a SHA512 bf1e0d20256138853b3508f2c88c67c33c14301325492542c3c7497d343c02b2a8ae0095bb0d0e4c0e33199b350429147349f231bdc2d1f1a3ad106e5fbf6a7e
-EBUILD netifrc-0.7.1-r1.ebuild 2171 BLAKE2B f9e1e3df03d9da5bf679d647104f6afc926b988aef95d5a74cd1a9cc6715919da52ff12e25e120724faf19529d880e95c31957b1633532a3cdc6929c70344e97 SHA512 f8919e3fcc6c36c401ad90088dc9b8d8e9995766a1b2aca2afc5f3f3304820eff5d6e2bf63a5e96a300aa82a8b574fe744a7c8ad4c8d6cc2d29547c5b3a73fc6
+EBUILD netifrc-0.7.1-r1.ebuild 2170 BLAKE2B b22bfbaf233e1a0d3661b13a9ded17f5ff8e3eb1090ad4f40c652f64657d46ac512a5ce5790a5b2efa0c102f2e0adfce7ac7cdc3fe142b9c36e04b0d9aa39692 SHA512 ea41b89123dec35c40836ef56768357dfaf0274a786db66c594b4774a2edb85694da8c95e7396777c39e2d60d825e64e24b64494823876b8588282d1f531f670
 EBUILD netifrc-0.7.1.ebuild 2099 BLAKE2B a8469f41f1feb23313425d4f4224fe4c93a73d226667bfb2965940491b71bb9d7272a0feaf76eaf820a56b4e69c2d2975833d55aa715e5f8e9365e38c641d4d0 SHA512 4d344118f4d6878a3e6b2461ce013457b211103248b8d8945e76559300e29544012c28d087a0f2f855a8f6bff960b9cc1b99fd0216d945e228770c2c7b6196ba
 EBUILD netifrc-9999.ebuild 2047 BLAKE2B decbe78b5ac86f957ee27f203b0af14d8e4e022bc326891b5f990849c5817e9fec3a07ad0409fd3619b07a3a3683fbf6c9aef8f0c39f378a7e7276a7a5c6e80a SHA512 0b3d9ea722a45d91a9edc38616ee239910df1c8bf8c5ada1e75f78842c07e89756da519e46132cabd18b705b51c52a3dabfa3ed8ef196e156e34364ec8733a23
 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5
diff --git a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
index a5c2b998bd7a..4fc9c170622c 100644
--- a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index fe0dd79322e0..19edd1e47175 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -4,5 +4,5 @@ DIST ofono-1.30.tar.xz 1030428 BLAKE2B 94248b7eb7b48000333fdee38eaecf13c259adf2c
 DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20
 EBUILD ofono-1.16.ebuild 1624 BLAKE2B 1948438d3150f5cdc848ce72c10fcd70105d1854bec2f0e941d5eb24aaf869826e6e7de8b7b46c92d4f9a5a56a537baacaecce29d406abf1302964b4ab46a2e7 SHA512 fafe6075e7c1abb6b513c0a09620c61ce8e1472b6972d69ec23bfc652b7b63d2e983affe67bad31a5160e885e40576d3c67230e4f67ab0c989714ece954457bd
 EBUILD ofono-1.30.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
-EBUILD ofono-1.31.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
+EBUILD ofono-1.31.ebuild 1641 BLAKE2B 9fc5e13784d35b164610244212e2e6db2c83be8d97ec0cad2c9f81fb3d1f017231139c1b8e938f6d94f2ce9fc1de6bded261eff9723cec3cb911b1e3702b4894 SHA512 4a78a5d43969746fb4f577b7ab42d67b14c88294dbe8eda7cad9d744bb1ecf756ac91059443868f7e7842741d4dd591293c42db0d88e9cadc6ed6ba25647f878
 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e
diff --git a/net-misc/ofono/ofono-1.31.ebuild b/net-misc/ofono/ofono-1.31.ebuild
index 406ed49a7a36..f668af5ddef8 100644
--- a/net-misc/ofono/ofono-1.31.ebuild
+++ b/net-misc/ofono/ofono-1.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
 
 REQUIRED_USE="dundee? ( bluetooth )"
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 0a25c07f15d5..242e190a9751 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -2,10 +2,7 @@ AUX openntpd-6.2p3-fno-common.patch 2084 BLAKE2B 3fbff2d88260f7dc5435c8f1ab7df16
 AUX openntpd.conf.d-20080406-r6 255 BLAKE2B cdbfd0de5a238216efbf64c8ef9c5db891380d7352dd0864e631816411954e9b335b715f8bf6b66f0f2ce0c6f050e4c166b946f1d235509a130fc024c5b960b7 SHA512 016094e0ac80817c8c1eb8a52a527c8a673b3ee904f2c04bef0304b5dfe1c778a34a2d5321cc5540a1dfe2e14dc878c44a1e54fd0263aca3917600827c6d9059
 AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f01bfd112bdeab3f7199775237c92726120ba7763f5584a21c4b3b18d7b27c4c28311202ee9c18b9259b0e853ee24d SHA512 eff7820dea7f79420ddc78fc744a34f6f5cedbf167d7ce98ed35d4ae0b1dab6cae026d5255a6cc428cdbc8f51784ed149c5ec8011ab72c31c65a5bfc6664b94f
 AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237ce8e12a47bf5c681a9274acab9bcd5ad0e97708aa99f8d2df92a0fa57828fb747f220c038f83c54f30084a154c7bb SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e
-DIST openntpd-6.0p1.tar.gz 432696 BLAKE2B 331214c5a77adf99974a665a157255857b295f49409721d8530fdd2eb6c00e458a2e6395105a527a4a8603e65efb33e16f752c70222e9f7697f8c871d51cffda SHA512 a71c516dbe7596cbcb3a385112a59a82185b7e3d93a52eda695cea5a0a599ba7fbf58daa81da55d608255cb6950398123fa7d71663604a4c3bcbee949711296d
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
-EBUILD openntpd-6.0_p1.ebuild 2964 BLAKE2B 3c46ec39de60ac3b58f52b23f3c196077e6bcd2e0c05f5f1f8a218d4a0b64ee87d00db003b2913939df7bcdd5558c2e9c054ecb11cfd648697080e047876ca94 SHA512 b211e867e39bd9b0a52c43cab7f33aece4ca257c18b50d50f3c73a4d87b1d5fb06f3f2a20e55a3c7628d66d12e23fad0740457d5099188f2c06231b7598f1fc7
 EBUILD openntpd-6.2_p3-r1.ebuild 1815 BLAKE2B 7122205d5d6cc366b95a7023d475bb6e9bd403f889e02548056aeaa50c29f62bd70e2b5f27414f54a2e5bb34bc27c646cb23c4d631bacb1f9e84316e46e20e1d SHA512 af6eea8a35f132544bcb47d522353230468e395d283e041543cc65f511f06a7235be08d2a7989edf7ab3019128364f55cc52f012c25f79f6dd5130b2c20c494a
 EBUILD openntpd-6.2_p3-r2.ebuild 1875 BLAKE2B 97cca192fad2b6da1dede9659ab276a5f94b19be7302ddc1c7f377782c5936688af2c7a0d4c6f99efc2e9b5c637aecf2ba01cec79335d8ed7e12c2cd4cd9c134 SHA512 031159fd3892f291f2480b04c875b7a3ed612d8150898a808e04a41d28772205e87f0458e306e8d1c7a4defe51439a5b703ddaec986a2b69623c0e478e3d46da
-EBUILD openntpd-6.2_p3.ebuild 3135 BLAKE2B ad1cf55027141cfe2e571788802f92844f2792d21dc551119760a72de2b7e41cef7aed7028e1071866de828f9cd5b70cb8a214cb16d87b2db26b9147102d7ee7 SHA512 c2f99c14eff42f9ad674b45636cb7b28686adee52d5037a79694356d18770c6d2d9766eece06efe99272f13356bd944b76db650420c9ed1069ca726c6c9cad8a
 MISC metadata.xml 753 BLAKE2B 7881f37b5fe2009a86939eee0c579be8db7ec7ad63a565318dff4a382ce09ebf47575de20112cae24d16e74b992fe7c70cf129c06ab69af514d0b3aa42b0c2da SHA512 34a656cccd278363c5e08c65d90dd4f36e41414e48fcf924ab41bdee826da358e48b70190a882e21b5eabba8c3ff733f75a384c69013d450fb3d9c0517883b72
diff --git a/net-misc/openntpd/openntpd-6.0_p1.ebuild b/net-misc/openntpd/openntpd-6.0_p1.ebuild
deleted file mode 100644
index eeb3ff507f8c..000000000000
--- a/net-misc/openntpd/openntpd-6.0_p1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd user
-
-MY_P="${P/_p/p}"
-DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/"
-SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="libressl selinux"
-
-DEPEND="!<=net-misc/ntp-4.2.0-r2
-	!net-misc/ntp[-openntpd]
-	libressl? ( >=dev-libs/libressl-2.3.2 )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-ntp )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	export NTP_HOME="${NTP_HOME:=/var/lib/openntpd/chroot}"
-	enewgroup ntp
-	enewuser ntp -1 -1 "${NTP_HOME}" ntp
-
-	# make sure user has correct HOME as flipping between the standard ntp pkg
-	# and this one was possible in the past
-	if [[ $(egethome ntp) != ${NTP_HOME} ]]; then
-		ewarn "From this version on, the homedir of the ntp user cannot be changed"
-		ewarn "dynamically after the installation. For homedir different from"
-		ewarn "/var/lib/openntpd/chroot set NTP_HOME in your make.conf and re-emerge."
-		esethome ntp "${NTP_HOME}"
-	fi
-}
-
-src_prepare() {
-	# fix /run path
-	sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
-	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die
-	# fix ntpd.drift path
-	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8 || die
-	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
-	# fix default config to use gentoo pool
-	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
-	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
-}
-
-src_configure() {
-	econf --with-privsep-user=ntp --with-privsep-path=${NTP_HOME} $(use_enable libressl https-constraint)
-}
-
-src_install() {
-	default
-	rm -r "${ED}"/var
-
-	newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd
-	newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd
-	keepdir "${NTP_HOME}"
-
-	systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service
-}
-
-pkg_postinst() {
-	# Clean up chroot localtime copy from older versions
-	if [ -d "${EROOT%/}${NTP_HOME}"/etc ] ; then
-		if [ -f "${EROOT%/}${NTP_HOME}"/etc/localtime ] ; then
-			rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime
-		fi
-
-		rmdir "${EROOT%/}${NTP_HOME}"/etc ||
-			ewarn "Unable to remove legacy ${EROOT%/}${NTP_HOME}/etc directory"
-	fi
-
-	# Fix permissions on home directory
-	chown root:root "${EROOT%/}${NTP_HOME}" || die
-
-	[[ -f ${EROOT}var/log/ntpd.log ]] && \
-		ewarn "Logfile '${EROOT}var/log/ntpd.log' might be orphaned, please remove it if not in use via syslog."
-
-	if [[ -f ${EROOT}var/lib/ntpd.drift ]] ; then
-		einfo "Moving ntpd.drift file to new location."
-		mv "${EROOT}var/lib/ntpd.drift" "${EROOT}var/lib/openntpd/ntpd.drift"
-	fi
-}
diff --git a/net-misc/openntpd/openntpd-6.2_p3.ebuild b/net-misc/openntpd/openntpd-6.2_p3.ebuild
deleted file mode 100644
index 2250abea65c1..000000000000
--- a/net-misc/openntpd/openntpd-6.2_p3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-NTP_HOME="${NTP_HOME:=/var/lib/openntpd/chroot}"
-MY_P="${P/_p/p}"
-
-DESCRIPTION="Lightweight NTP server ported from OpenBSD"
-HOMEPAGE="http://www.openntpd.org/"
-SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="libressl selinux"
-
-DEPEND="
-	!<=net-misc/ntp-4.2.0-r2
-	!net-misc/ntp[-openntpd]
-	libressl? ( dev-libs/libressl:0= )"
-
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-ntp )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ntp
-	enewuser ntp -1 -1 "${NTP_HOME}" ntp
-
-	# make sure user has correct HOME as flipping between the standard ntp pkg
-	# and this one was possible in the past
-	if [[ $(egethome ntp) != ${NTP_HOME} ]]; then
-		ewarn "From this version on, the homedir of the ntp user cannot be changed"
-		ewarn "dynamically after the installation. For homedir different from"
-		ewarn "/var/lib/openntpd/chroot set NTP_HOME in your make.conf and re-emerge."
-		esethome ntp "${NTP_HOME}"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# fix /run path
-	sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
-	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die
-
-	# fix ntpd.drift path
-	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8 || die
-	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
-
-	# fix default config to use gentoo pool
-	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
-	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
-
-	# disable constraint config if libressl not enabled
-	use libressl || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
-}
-
-src_configure() {
-	econf \
-		--with-privsep-user=ntp \
-		--with-privsep-path=${NTP_HOME} \
-		$(use_enable libressl https-constraint)
-}
-
-src_install() {
-	default
-
-	rm -r "${ED}"/var || die
-
-	newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd
-	newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd
-	keepdir "${NTP_HOME}"
-
-	systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service
-}
-
-pkg_postinst() {
-	# Clean up chroot localtime copy from older versions
-	if [[ -d "${EROOT%/}${NTP_HOME}"/etc ]]; then
-		if [[ -f "${EROOT%/}${NTP_HOME}"/etc/localtime ]]; then
-			rm -v "${EROOT%/}${NTP_HOME}"/etc/localtime || die
-		fi
-
-		rmdir "${EROOT%/}${NTP_HOME}"/etc ||
-			ewarn "Unable to remove legacy ${EROOT%/}${NTP_HOME}/etc directory"
-	fi
-
-	# Fix permissions on home directory
-	chown root:root "${EROOT%/}${NTP_HOME}" || die
-
-	[[ -f ${EROOT}var/log/ntpd.log ]] && \
-		ewarn "Logfile '${EROOT}var/log/ntpd.log' might be orphaned, please remove it if not in use via syslog."
-
-	if [[ -f ${EROOT}var/lib/ntpd.drift ]]; then
-		einfo "Moving ntpd.drift file to new location."
-		mv "${EROOT}var/lib/ntpd.drift" "${EROOT}var/lib/openntpd/ntpd.drift" || die
-	fi
-}
diff --git a/net-misc/packETH/Manifest b/net-misc/packETH/Manifest
index 1f23bc7753b2..d49e3ef4d45d 100644
--- a/net-misc/packETH/Manifest
+++ b/net-misc/packETH/Manifest
@@ -8,5 +8,5 @@ DIST packETH-2.1.tar.gz 458750 BLAKE2B c08096e0781fc0174922d2eece31fa5e789ccfd77
 EBUILD packETH-1.7.3.ebuild 560 BLAKE2B 27a2ace9442a787bd95f72e6714ad49a92c73d630ff3920b1052fac4689a51bcc90ea51511e672688174b24fe36fc2a1bf682a99085905cec06c5718e45a011d SHA512 c07a137b43016c4b8f7ba290e1e639324bf3e637212ec6a58f2e9c883998eec0a90f92c1532763a0445c90aba79182bef1669cf3d87ea9c97f4651d70e85440e
 EBUILD packETH-1.8.1.ebuild 581 BLAKE2B 1186c54a0b83364459e874f3c719cfd9fab902243b86de9efc6a23489446b25b59c5f13e072837dba81f0d5d19e687c800d77506abe1dd2c5d1791165101385f SHA512 729ced9c9c86d7136ff99d2bf3c0f323fc4b16e149dedd35114c52c55036a3a34791e3d6f2ae6be9c51f77f178f86c862d292a279f997038b3d7a51c2e38139f
 EBUILD packETH-1.9.ebuild 581 BLAKE2B 1186c54a0b83364459e874f3c719cfd9fab902243b86de9efc6a23489446b25b59c5f13e072837dba81f0d5d19e687c800d77506abe1dd2c5d1791165101385f SHA512 729ced9c9c86d7136ff99d2bf3c0f323fc4b16e149dedd35114c52c55036a3a34791e3d6f2ae6be9c51f77f178f86c862d292a279f997038b3d7a51c2e38139f
-EBUILD packETH-2.1.ebuild 1058 BLAKE2B 0cb8897039e981419d2890a892b7eb3a8295cb8f52fb17574e638b67756866c1a784f636cef6e05f1e738aa3565923b8bbd18cbef49e12fcfaf65e3179a61f3f SHA512 e491dd967dc85fe8c86a8df0919d1d7438f444bca00e7ed3e9b8f2e0c145018ffce609cf54554b99c09b7f74a930cbeecf8e608978331ef0a98e17f322cdbc2b
+EBUILD packETH-2.1.ebuild 1057 BLAKE2B 258ad14950f81de4baaeb54e0b3a5257aaa32a30503c59c78dcd0cbd842b7c2073af9f60ac7a7e7b81ece454e8acafabcbc5252d2c90e64af042a7b09febd054 SHA512 028f717ed52e7f7843fa3e3b2cbbcd8ddd6faabdd88154412d2a75c9a9fb9af06d68371da13bd52bf90947172671c1701b70c0c7d07cd00ad60ec5d7d8212150
 MISC metadata.xml 413 BLAKE2B 8d0f984cc4740f606b9dd7633dc126f2dc57a7f07930a8a6f554e254df9f54eee1405179f61b14dec8ecf02bcd13019575c55abeccf404011b97b9aacdd4d7e3 SHA512 5dd67301ca215d9f3d0695d530e137cadec338c90996c0119deea631ac1d3a2219320229556b265fda561e02aba43d9cdf2169725559f95dc40de15951fa6adb
diff --git a/net-misc/packETH/packETH-2.1.ebuild b/net-misc/packETH/packETH-2.1.ebuild
index 75ec8e7348eb..83d236e26bd6 100644
--- a/net-misc/packETH/packETH-2.1.ebuild
+++ b/net-misc/packETH/packETH-2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jemcek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="cli +gtk"
 REQUIRED_USE="
 	|| ( cli gtk )
diff --git a/net-misc/pipes/Manifest b/net-misc/pipes/Manifest
index 3b0aeb29ba26..6ddd05fe909c 100644
--- a/net-misc/pipes/Manifest
+++ b/net-misc/pipes/Manifest
@@ -1,5 +1,5 @@
 AUX pipes-1.16.1-execlp.patch 603 BLAKE2B fb36b8f00c05b8f0fef930757da458d1f571ecda4487cf5641417d9a79548e28212c1a12599b69a068d55a2e5cb991de0c37b787e13516965122e949bac5db40 SHA512 ad28dab392c962fc476ca6596a0609dbee2a3f6300b27daaaae5b5e44c3c94154b682bc749697be20373b530b228d45170193e085e96bbcbfeff7190746767d7
 DIST pipes-1.16.1.tar.bz2 21642 BLAKE2B c5725244f7ac0b77ff3ac3d753ff96ac7d853cd1e7cb0ab82a14decc6ad6ec94503426be712e1b9117a6e95a95939c5d9e91d9f31eb397c96182fac8f7148100 SHA512 ff8f6cf7934149c3d8a6e0443a06840863313acccd31791913fa25b086173e834d8f357212811e5e1ddb62148d3e687858e8956065734f11d7fc729f2a64b0a3
-EBUILD pipes-1.16.1-r1.ebuild 657 BLAKE2B 64845e9d87e9b791720bb3c857f9341c760aca6fa4de58c94dbb3dc6369390d168cc8e5ea21f3a4f345aa38109fae1ccab5c81b246d0b69acdda4a3ff6504920 SHA512 0016c7a59f8369c60a9eb21bb48f1233acc6718bd2a8344d1afa0dbaefdd493e66e9952e26df75a39423a2917405e518984b098c92fa69f2dbc3d6fc2fd7c436
+EBUILD pipes-1.16.1-r1.ebuild 653 BLAKE2B c85189119d410fc1a6ccb8a1cb8d6e0334c78de0f4860542322b52ffdbdf83b6ce95424d6b61c95100b859aacba6915dd65bc9249de95a0b85363da28d1c13c4 SHA512 7ca3efd197ecc1178046d8cd0266df1ac657f8d123ffcb242d89e1b631de441ac466b9766e5712f2479d2567c18bd0bb85f939b711d19dedb9af733d80cb5d5f
 EBUILD pipes-1.16.1.ebuild 651 BLAKE2B 1d3813f820580d35973a0e894fe5292f8f306e8290ed46b76b43abbfb09b4e258250d658d6daa28f5c8814c867830f9d99834d0cce1b0d2a643c5847c36ae5c6 SHA512 4bcb6448d66a00fc8fc2148100dd08608faef613208036272eb8e412592496da13887a15251694d9626a9149b0b7820f08a9a1d5cdbaa41e6c207a02422032f0
 MISC metadata.xml 1243 BLAKE2B 018079999961b4720d9f6999852b0c6d90ed32d08ac9a2084659d35ccccfd9db602a5ea6540928e1dbf0f942ea06f9cc9358231a0d041eea5aa8620f6a61079b SHA512 64f85cdfbd01bc948cc78a5b0a7816d45583c861cc45144ff0b4547b704516a5151d18b19a99be58ad666f3dcbcd866c215e5a24c237c7b97a35e689841316e0
diff --git a/net-misc/pipes/pipes-1.16.1-r1.ebuild b/net-misc/pipes/pipes-1.16.1-r1.ebuild
index 7f0bb0e9c86f..1e29bc9099ee 100644
--- a/net-misc/pipes/pipes-1.16.1-r1.ebuild
+++ b/net-misc/pipes/pipes-1.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~x86"
+KEYWORDS="~amd64 ~ppc ~s390 x86"
 PATCHES=(
 	"${FILESDIR}"/${P}-execlp.patch
 )
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index d9ef29d63150..faaf15c477a6 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -5,10 +5,8 @@ AUX radvd-2.17-nd_opt_6co.patch 2240 BLAKE2B 45c096fc406d31d9a9edca64c6e24005ac0
 AUX radvd.conf 337 BLAKE2B 67d50a761449b35389580ac956758f5c8c9373a14294a9e98e8238cce4ef2847694712e12296197ff196d58a9e5123aa6e27044a2137c36c34c6e2342ee7db63 SHA512 303a79c6e60293571f5cc868ba36f48a98658be8b6a9596c007461cbef2775d7deb67950fdacb3f37765cffdda164bc386e23bbb512cbabebd5173245841e401
 AUX radvd.service 603 BLAKE2B fb573b528050d772926f3cb3cf82984b946345f636b661583f3aa5ef720a664cc13b20b8435ad2bcdd5bbdbad6451530384cd869f6d33d4e6f2ccf014ff9871b SHA512 3371d18e71ddb7672e929152d9f93201b49c1ce08c77d59cbcac7654362690a9ab97db08519f5fbe210738595aa52f30f5972cacca988b9274e2218c21bc7dd2
 AUX radvd.tmpfilesd 30 BLAKE2B a1c207296debe31a4fb25c7ec52202b679e41fb9b73658d278e5e2599cc12b2b1b48ce53043ef89210cc18ef445c8c952e498bed43cc474b698581777843017f SHA512 d126bc90083e0f8aefda8cbd3cd01ecc9beb0eb05713c2d9fb5315bc10337d927b3c9e52c390e35799d1421078b365793772a712c33028be35280cd083cf65c3
-DIST radvd-2.14.tar.gz 211461 BLAKE2B 0acdd23d1606d7dc5df3a8c8e2d3be7f6178bde866b9463b2a645a78b4ed710e8c60bcd32eff9456b80a993c3544a71721199298fccb184b357bc2ac51651f55 SHA512 8fdfd776f998b82e9dcbb29a13e44b1ba060f2e4b03bae0167549fb58731f16e80e980f9636e0d7614270b8e6457779ac044b433c5c5d26d9fb72ea9e2d3cb02
 DIST radvd-2.17.tar.gz 214937 BLAKE2B 1eec22e09607c0396f9539aef203b76d5beca18d1fdf5aa0ff202dcb2ff0e36ed8af74fc7900eb7b16012bfb0672f9660f17c88c222ac0269947d3cf4a270db3 SHA512 117a42c2c007d730b956cf999ac281f50a1a9b57c9428fe0f860cb211ac234ec62f59fead244a80191aaa15ef4ce96fb7dba9bd1a3cb6c3b29f1b6897d7a6132
 DIST radvd-2.18.tar.gz 224183 BLAKE2B 4bacf9e17b78286a032ca5e6b6424aa8742d2e42b3a00a67e5d8beeda139a70a574e69c0d8fde2c2754b6e9c9e92a97dfb6a2a67b4b3ce91740aa8edee994c5e SHA512 b66068ec40d4f228f679946039d7c696bf611eb55b88cb37bbea5e748cf7cdda796dc0b12e0f1e54b26a6af21750c8714ea18a152ef932741c0f0a6a7a9de59a
-EBUILD radvd-2.14.ebuild 1753 BLAKE2B 7b78a71a957572ab3680c901174e63b142671998f77f9f0211ad0ed85fc39864f43ce074e7e5111e4f942d27b2f5448188bff7595b7951cdaac3cc7588ed6478 SHA512 cad3e22ac355c612b578634f0d3a5feaf54910ed86494c503d3df016a7831fd299c6530159c6a1caf06d2c93bb70461cc46db35f32d62f19f6961846b31c8782
 EBUILD radvd-2.17-r1.ebuild 1562 BLAKE2B 75040b986dbbe14656b4ab69aba82c99d2b85b6ca8f5968fa363bc123cb09acfea1d2864a8a2ded6ed767941e552ffdce7c77ecbe032c313e480003eb4304996 SHA512 fd3f2fe16b9f726a2d42bd3dd6abdf6d42fb62f58b48bbb375cb8a4f6e010247b2ea447b7f378e421cca2ec319d5ea2a0150a78ddf7aaabd5488ca467607e4da
 EBUILD radvd-2.17-r2.ebuild 1618 BLAKE2B 05259d6d5c99d5cc261e750a99dbaa42bbc96f40cb9e7d601ad0795dfab99fc345910d1be7462704f7c190bcfeb37dec3ffe5439f46cb4c27fe3770f986fe5f7 SHA512 d08531d71eb7129ad205104fa2dd3ef6fbaae3ecc309beab55affbaca4974a6b1b90c3db4891852970fe7260be7d9a8b1d5c816fe4b3dc303d2b118d6802e83f
 EBUILD radvd-2.18-r1.ebuild 1647 BLAKE2B 364c3fedeeae8a531fd53dfbb7590901c202cf9bd13d36e29301ffc52c93bf2f1bdfaa05936de43b4578ef02a8728a100915af0f04b4639bc435ddc2be195933 SHA512 06a1d255577bfa41b2cf3e56ecf6eeb848c040677c6a47d5f5f34590f211a70b057a77dcd1631ccd21af7301283a2a5d7891d7079916ea548d2d8cdb30feeffc
diff --git a/net-misc/radvd/radvd-2.14.ebuild b/net-misc/radvd/radvd-2.14.ebuild
deleted file mode 100644
index 10c95d877f76..000000000000
--- a/net-misc/radvd/radvd-2.14.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd user eutils readme.gentoo
-
-DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="http://v6web.litech.org/radvd/"
-SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc sparc x86"
-IUSE="kernel_FreeBSD selinux test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/libdaemon"
-DEPEND="${CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-radvd )
-"
-DOCS=( CHANGES README TODO radvd.conf.example )
-
-pkg_setup() {
-	enewgroup radvd
-	enewuser radvd -1 -1 /dev/null radvd
-
-	# force ownership of radvd user and group (bug #19647)
-	[[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-headers.patch
-}
-
-src_configure() {
-	econf --with-pidfile=/var/run/radvd/radvd.pid \
-		$(use_with test check)
-}
-
-src_install() {
-	default
-
-	dohtml INTRO.html
-
-	newinitd "${FILESDIR}"/${PN}-1.9.1.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd  "${FILESDIR}"/${PN}.tmpfilesd ${PN}.conf
-
-	if use kernel_FreeBSD ; then
-		sed -i -e \
-			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
-			"${D}"/etc/init.d/${PN} || die
-	fi
-
-	readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
-See ${ROOT}usr/share/doc/${PF} for an example.
-
-grsecurity users should allow a specific group to read /proc
-and add the radvd user to that group, otherwise radvd may
-segfault on startup."
diff --git a/net-misc/sipsak/Manifest b/net-misc/sipsak/Manifest
index f16049529ee1..250ba58faf09 100644
--- a/net-misc/sipsak/Manifest
+++ b/net-misc/sipsak/Manifest
@@ -1,6 +1,4 @@
 AUX 0.9.6_p1-callback.patch 490 BLAKE2B 398728ea4fb79a0c8ab2e1920f08186df358bb7924674a38526432c487d453b4a679b731692cc06cff0e10b76b3558462901bf367993d0dbe90bb0d9dd8e739a SHA512 c10dec8410143ae5fee3b78fb65a83494e5b2539c41f2424455fdabce73a780e78ca159ce2e579db5e2344882e7472abd3f884f76863241218745451108fce4a
-DIST sipsak-0.9.6-1.tar.gz 158776 BLAKE2B c8bd37d63d55bc593a57455171ed2dd26c8a4e87746be7075af7c2912b400d49a44f25fad694e296c75ea9aa3e7b10cc81a457c448a3a9429a41d22b84fb794c SHA512 c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe
 DIST sipsak-0.9.7.tar.gz 199074 BLAKE2B c99bc7ace4eb5f1af193d64d156243904300e1f5fc66d1a44f578970e0d8242be3c8fa82804bfc975efcaaf6b5289c0b09b22b8d5c069fc81a16c343136be49b SHA512 695ba6e596411fdda14e6800163b934dba2dc6ee661ebc91a9f3d3509b9568d0482108fb50503953f7f9186cf11724c0faf4660436aad1929f4a70dc41286402
-EBUILD sipsak-0.9.6_p1-r2.ebuild 758 BLAKE2B 865664393847d687882c8d49b2bc833aa614afe0d5ef3aaa1633c591d791f02c08bdf72339c4a249f34810cef55028f5dd58fb3543b49e8ac31e46810eba41c8 SHA512 4503bf957062070935e67e2814d9d4f06731b81171865ff7ce09895e1d23ac85ca59ddc0cb8705b4dfb2b096f719c4fde1b446fe42f02ee23b6e7a4b6f73289b
 EBUILD sipsak-0.9.7.ebuild 642 BLAKE2B 6c85a165082b82feec2bf82b160bba7e64a669937a143b336e00975210770dab26be1bd89c2f21c0279a686526f5bcf892de8c890e165c208aad86f37970612f SHA512 155b33b914e3ba9b2719c9a6784dd97947e0c220b11f373f1306f7496b18d1c9684244bc5af420010afe7f32e7802b0d13bcad1824c3da9e46d0c80404ecf5fe
 MISC metadata.xml 303 BLAKE2B cc764a44b688e208776c7e99220318ff09e0cafc4b49a9b8e1d105766425f7c4fe59d85fdee39601ef066d59669eb8e6259cb755f997d400e1a8e13366a2bc55 SHA512 82474d39e280eff65aee9c5d4ccb9bb513d56bb2d55b10b8f49b161d505387ab351d3228d0253a40c01a9c4f5f2c5104bb7f2c41b227b0aa653350e6facf07d4
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
deleted file mode 100644
index 8b19b230546d..000000000000
--- a/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="small command line tool for testing SIP applications and devices"
-HOMEPAGE="https://sourceforge.net/projects/sipsak.berlios/"
-SRC_URI="mirror://sourceforge/sipsak.berlios/${P/_p/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE="gnutls"
-
-RDEPEND="gnutls? ( net-libs/gnutls )
-	net-dns/c-ares"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P/_p1}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-callback.patch"
-}
-
-src_configure() {
-	append-cflags -std=gnu89
-
-	econf \
-		$(use_enable gnutls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index c8d2f1809900..66dc88c9a693 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,20 +1,5 @@
 AUX teamviewerd15.init 282 BLAKE2B eaa5844606cab7942d8117a7f62687f1ba2b3ff5deecf61903d9c01ea5434c8104eceb2e50d1c7a4b93089df53c98fab38da6e6e5f4ee8c18426a7165b9cc465 SHA512 bc2271c1fb360129bf0452950340389e434e420830d7d3f47dcd248151dbbadf798c025d4e47fe311857c070f3dd7b12f0092fa09508f0300963c6e04d8ed7c8
-DIST teamviewer_15.0.8397_amd64.tar.xz 12532076 BLAKE2B a66cc74961edb1eb28b38a77aa29a18c91c86703334903f33e6a7d9cd4dcedcfd92d51636c2908eaa38ff0f024eca97f8b1ad63c396f033efa5039b9fccff5a9 SHA512 f4c9fb9da1b7af9fa1d798c67eb014e906684dab05b41d5618ec21732a4b9b917e7d51e185ca58bc811c8e869f7171136e5a405f9ffd7e8fa5d0b2c7952ed68a
-DIST teamviewer_15.0.8397_i386.tar.xz 13019240 BLAKE2B b14dc20b31d888297602baae65c9ec802e5104f8169090ca3f88b87814f58b81585b9d5b89bfe8478d767b30612ad05ccf2d6a659046c0c5e75bfa287436e06c SHA512 4e1d6101ae8a91e03c6580407857df76505dd216baf172de6a7d00ea308318b8b326f0d15e1d8819ede4d7d758c65608c4446abcfc52ba224e56ab11a623aa65
-DIST teamviewer_15.1.3937_amd64.tar.xz 12898448 BLAKE2B fea1d64c04c5c4f04237ab639b1faf1c6fb027fa5f4824f8a9c0ed31b52894c7a22130d0871dba98388ccf073a5393973350a3e3ea88f94bc5958196a6bb8934 SHA512 23fc65a676570c291184a5c89ce05998cb70ec822d764264de7afaffa47a862e3eb0a4ae9364064fa831165be901dc0b85cb5b79181b8b833638d720504dee5c
-DIST teamviewer_15.1.3937_i386.tar.xz 13443796 BLAKE2B aa9c5f3cd42a123c38a567a117c919c829e089e4c81cf4b6fca0559351895c3824b7a117ac7dc64c9f1129e0cd44dd2347e57644080559a86640a9d8bffbe62a SHA512 8054e5e3901d60bbf210b03209da8afaab03ba95529d1a107a23401a7561c5ee0c33a43837f84490667f0fa282fe8a74087473b7f51f604b675e87d87522302d
-DIST teamviewer_15.2.2756_amd64.tar.xz 12925536 BLAKE2B 94029edb0c333bbab3dc8ed0ad881fc5e5de820a4a92f578781456315d746d1fbf94e7b4d1b651c250c23a32247d2ccf9ba9f9fe839ba188e572ffacebd71630 SHA512 9227388efd819689bd852de62b1dbe122e7081cbec19ba4c96546dd8f889c8b87884fe53231f00f39030882bc150aefaaeedab7d9b3ff28315273d95303eaf78
-DIST teamviewer_15.2.2756_i386.tar.xz 13456056 BLAKE2B cd41db000d5d7fe67f888026146affcfd08495c4e275b1e66ffcc71224b75643713a6f59598eb94aae473d1ec3e9dd500c40e28017bec1f2d50f27f182a01ed7 SHA512 17c0da4599ae1c111ff1ac3069bbb7b613175253a13086c1d564e0ab268317e6249daa3453d686379b3c29cc5cd76a74c2e6654bed8326ee1c8f46e40cbb4888
-DIST teamviewer_15.3.2682_amd64.tar.xz 13066268 BLAKE2B 701a1c53486b186ebdeee8c4611aba5a96155345e2aa484c8aa1c917d6ef12297ae45946604ba23332e3ce40ec60ea5f85b272289630dc27782122b7c4bd87f2 SHA512 27ac18336339406d7aec30a8765ca61fad45756580e82cb506b52b9fb6f94aea96c67065750c2573430704247be93dca757526a97a7d9b41ade9c88fb66dd267
-DIST teamviewer_15.3.2682_i386.tar.xz 13602852 BLAKE2B 4a3ec9062dd2c670395953bdcc5beb923e37ed00ee315c1a051d10b15e16dfe9fcf00f6b1308180a007257edff931c9a210da4b8520963f2ef0df9406e27b9e8 SHA512 bc599059f5d2b9178db39c1d9cb55303493bd734642bc0aecceb8bbe025056a4a61a50055cfb4ed5841787bdf41a6c544603cde13a724f737677d0710157f077
-DIST teamviewer_15.4.4445_amd64.tar.xz 13056296 BLAKE2B f96bfa24fecec42cd591db8e1e4c471d02fa3de927169e449689507694d162d9b2dd0dce252699c81d18a83a5d58f33f70189cfe824e5388b391ed9b198b4459 SHA512 1fc2ff655f7455d3b11a913ef2342539c5845e0490f26c51e9cb4437185b1d0bd4371c9be3b8c4931ee0f1e97c59bbd06414788af6f8cce80579edf2e11a53b7
-DIST teamviewer_15.4.4445_i386.tar.xz 13631276 BLAKE2B f836e68c96d5b0e05c7033504c4b3624d7ab4eed4e0506535ab23e18d2611a506cdc57128bca1b27db3ecb8d4dcdda917f74deacefdd52a0ffc5626417ce62c6 SHA512 d4181241f2732310e9cb2fb7cfda3b9679b26bd9c11a8934d5c528878cb703611b86d95edb44e928b72ee5c127888aa7e27a466698d1ca5515e2a1077a921d52
 DIST teamviewer_15.5.3_amd64.tar.xz 13028200 BLAKE2B 12eec74d2e737d8d091fa100f3a6ff56926257ddd7757f649d2acaacac55c29724690a9bc52bef9c9b966692f8d28d352dc5002b815b4b7e3fd535bb1b250105 SHA512 36a758759e1f0ebfc1e7cd559d5326f51704307373a96d4df1fae5d4e467cd638a9d2c7f4d40c7b2ad47ec4fc66e0f5b432596569b2226d92c18abe67ab01b50
 DIST teamviewer_15.5.3_i386.tar.xz 13562544 BLAKE2B 55d16574968943ae5dd52d523b63ceadd1f74ec7a4440dc476e6498bb3c05cda395524af4d4d4b3b1b94eae5ea22b70bc91ee63c27be90986589d7a8ec50393e SHA512 4022d179aedf8050ddb07f6ae44cac1a08f8f3e8a3b2593c2c3d97ba87f02d6b24db0247b173f64f38ed6128b148c025e0941e2695cf5fdbb443768e93dfd797
-EBUILD teamviewer-15.0.8397.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
-EBUILD teamviewer-15.1.3937.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
-EBUILD teamviewer-15.2.2756.ebuild 4095 BLAKE2B e8a01b0e7e749396705fafd6c178d8e85159a9e4a282ea8ea74c0279e39dc7c5933f8f07883cb57d788cbddf7efb33aebf299c2ee23555fac30fbb6a17b47864 SHA512 177d58dc814db1a593af2f1f64871d8964d4bbdf67f56017dfe0ba60b12fe5f9225e9ff72320f0e0b5e18cb767db814b4ab30f9945729cc3b9bac1d83c20a3de
-EBUILD teamviewer-15.3.2682.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736
-EBUILD teamviewer-15.4.4445.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736
 EBUILD teamviewer-15.5.3.ebuild 4086 BLAKE2B c3093c33cc700ee4e58cc2e99a133b6fc7234254db8f890ef5a0593910f189a0e3286d8cf7bc4feb0a5335f24960568dd6520bd9959b97fc3fe57420e6743bf6 SHA512 c25d94347c9eee586f117b2a90bf858972d79b9a60e0e9317ad59b2f711e817703ca7f27af4e8e05543188c3dc60fd5c414986612e095581bf8bf7536c720126
 MISC metadata.xml 249 BLAKE2B 11f9a85069860d951af16d4536b4dcb5808a383e12932121c0344d7df116522d143eb5e5ccb10ab69c7d6a27ee4d421f4a34557eb02b8b9926d7ef34f3efef10 SHA512 876b15663b8f716c63393d90ad0c78d96088f53a2b2add76b0b749bf69e75be84ef58184f148c70ec2669b773f4dd2e37d045fe72429a6ddd2086b691a553047
diff --git a/net-misc/teamviewer/teamviewer-15.0.8397.ebuild b/net-misc/teamviewer/teamviewer-15.0.8397.ebuild
deleted file mode 100644
index 7c717766d4a1..000000000000
--- a/net-misc/teamviewer/teamviewer-15.0.8397.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-15.1.3937.ebuild b/net-misc/teamviewer/teamviewer-15.1.3937.ebuild
deleted file mode 100644
index 7c717766d4a1..000000000000
--- a/net-misc/teamviewer/teamviewer-15.1.3937.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-15.2.2756.ebuild b/net-misc/teamviewer/teamviewer-15.2.2756.ebuild
deleted file mode 100644
index 96d0e2cc15fc..000000000000
--- a/net-misc/teamviewer/teamviewer-15.2.2756.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-15.3.2682.ebuild b/net-misc/teamviewer/teamviewer-15.3.2682.ebuild
deleted file mode 100644
index 3441acea1e60..000000000000
--- a/net-misc/teamviewer/teamviewer-15.3.2682.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-15.4.4445.ebuild b/net-misc/teamviewer/teamviewer-15.4.4445.ebuild
deleted file mode 100644
index 3441acea1e60..000000000000
--- a/net-misc/teamviewer/teamviewer-15.4.4445.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/udpcast/Manifest b/net-misc/udpcast/Manifest
index 7b121b0dbbaa..c7a4e46d86e9 100644
--- a/net-misc/udpcast/Manifest
+++ b/net-misc/udpcast/Manifest
@@ -5,5 +5,5 @@ DIST udpcast-20120424.tar.bz2 138955 BLAKE2B 4ba16b9ff86f32bf1f2b07d521fbe1ef057
 DIST udpcast-20200328.tar.gz 169252 BLAKE2B df760dea814fabf951a65dc191a88355dec864d9c0f1be99ea60c742862d0b9944e51a45dd462ffce5c4b56a8d94f719796e3c725b42edae8cb9a19b1d3bc147 SHA512 b1ce4f0cade5db6bc69d3a154c354565675f44e97f9e3d90152f9594fd4f17fff2891eb1cb8d73c59e0d24eeb85e485e96b7a64fa9f1b6d2f005c4cece377bc7
 EBUILD udpcast-20120424-r1.ebuild 598 BLAKE2B 1c86d03e35f7345ef838ca843d31ae8b2ffc4c06df44395568253dbba8de6c2d10ceceebe08cdd951cbb4acfe169f348ae28321c0b870d10019578fabb50da88 SHA512 bf5a998a79b9bbf83d90f45175147514f68d901dea0c664b06ff1293b41025de87a31dd65bf066880ae3366e00d628d504c22fc7bf476d27c42236e367949827
 EBUILD udpcast-20120424.ebuild 489 BLAKE2B 1bc79fff06727ea1875a93e0b02358fe1349c345c086472f86101a2e1f4f528fbb8f64e427e93985f518b9e99524cef9a065619146885faf8b4fcaa0d7f51d11 SHA512 7737a85d20b1023059ea3ddbb4b2403ab70d1dd4fd87cf3c0cd2efb576330bd63132a10b3c917429fa1ce10a7254f38fa00c1f18d5c314a4178a13e64149710e
-EBUILD udpcast-20200328.ebuild 551 BLAKE2B affe726116075a52ac7dbcdc0a0bf8095a8d5eae46fb78c208d9656254fc9440788a5622abb2c43a6d3f011826df09e2b99a44698c171c5b0724caaf9e47fb51 SHA512 26d10b788112e26e6d2258e2406f174bf5622a6e457da1a0cdd8989ad2998d59f182a2253d87ff413a00e226d5ccebdb1a174078cf0be0164ef51f0c3da04d44
+EBUILD udpcast-20200328.ebuild 550 BLAKE2B 62fd74aaf81d8bc604b80bbf8dfcebc67920b8699d60f5066e7c1b04641e665f67fe004159fac5b5bf58891cc7cdcd3244160f78f7e64fb8e875341ff6928123 SHA512 6654b61ddec029a90e831a38bc6cc553c977e7026e38eed51d6a800075a79d40a468338cfc87af3ec3c1aaf1fca0f901ae0fb083ad316bb305ffbaf27bcdc99f
 MISC metadata.xml 692 BLAKE2B 05fdf36d745cd86ccea0a735e3a87fa51d1582f6b47131fbac37607bbf2f874ce813afaf2743f24b454bd4c880332ca9481c3bc0ab03b085e4a09cdc9a490c69 SHA512 7bca2ea7d909286fc510e6ac35ba860ec20a46093b4dc93ac74b29bdb9fdf8acdd8af9111a6614fff15247cd7f739281d12bc19755958dee2c0a20e22cdb43f5
diff --git a/net-misc/udpcast/udpcast-20200328.ebuild b/net-misc/udpcast/udpcast-20200328.ebuild
index ecb6e1be2332..09fdba474f86 100644
--- a/net-misc/udpcast/udpcast-20200328.ebuild
+++ b/net-misc/udpcast/udpcast-20200328.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.udpcast.linux.lu/download/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="hardened"
 
 BDEPEND="
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index be083cf7b175..97a9903b5a46 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,5 +5,5 @@ DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
 EBUILD unison-2.48.15_p4-r2.ebuild 3009 BLAKE2B c6d6f34bb42d24e4045040a02cf4e5f83e4fe803b1d68b539dce3b723d0ee7d45d14543657e9ded729eafda23bb02bfa347645d35384c511aa55ff8c2d1f0f8c SHA512 5debbdb871a92943168ee1d204518f69a0902be6d2f8f918533b492b8b3cd0e84e6409a7e6a7159e8b2843a10e2e1104ad3c38aa099fd7f2fefdcf39856b7307
-EBUILD unison-2.51.3_p20201024.ebuild 2786 BLAKE2B 9cda5f7c4a19868d445e3a7aba95b31fb41f7ed8605d81a12364503dd2250173a7814bafe01107d82fd2330078e52bafeb91d7d8e64897e2ae69c9615f19517d SHA512 ad00ac0fa08372a2b203c63514b8109e4f91c4c8b41ccf9f60cd8862a91f51e3d978228897b433ee5a1775d775d427e4c417d93747dc1fa4ff000de86303a7f8
+EBUILD unison-2.51.3_p20201024.ebuild 2783 BLAKE2B cd624dda358fae814145828dfa9af9dc40a0aad64d41d2bcb36f68af72be046a0efe755c1d7433d9d3ddfdb6dcde05fe8646780c3a1592218c9ca6102b312c13 SHA512 222888178e3c4163ca1c9ae3360caeb382929e53b2c3221a8cebc59fdb862e83838fce24136eeac38a97a3fe11af7c335818e59d004abe4f1518e3f606b4dea0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild b/net-misc/unison/unison-2.51.3_p20201024.ebuild
index f0744e723563..36616120b23c 100644
--- a/net-misc/unison/unison-2.51.3_p20201024.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
 
diff --git a/net-misc/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest
index 190ca03c76bd..1a5dbdf8cf54 100644
--- a/net-misc/wakeonlan/Manifest
+++ b/net-misc/wakeonlan/Manifest
@@ -2,5 +2,5 @@ AUX wakeonlan-0.41-ethers-lookup-r1.patch 2287 BLAKE2B 95bacd277caff21b056f3a8c1
 AUX wakeonlan-0.41-ethers-lookup.patch 2284 BLAKE2B fa45175d623a3e4cfb5b79ec4f499401b798a8fc3e4dd10a8d580f02083334db32ff5f925defb72b71d6ceceee3017d3bf9a4c2ef2559c9eb8e9d92e6e25a63e SHA512 39cdee0f2732f4d09822cbb82e4674e966b1648fbdd84b4a8adaf3b734ea2e8e4b5f0d535f7d70dbf3608c23ddc0761de9c5892a5c6c73613f322dc4e71db3d2
 DIST wakeonlan-0.41.tar.gz 6028 BLAKE2B d560c7dd830daf596ffd7d797d1908d1fc90d20c6861a0e341b20eb38137b809fe1a78819f9ca729fa06f88285cfb22d0719092bed1d49d9763a7e2bb8a986bf SHA512 192ed2ad157e3f5af01632b8f2b727e232448e5a9bff6aec25298fa9913ec38f1036b665b141b5299994c88b1941d9896b6eaa92cfdb44d65db3628f50e3824f
 EBUILD wakeonlan-0.41-r2.ebuild 656 BLAKE2B d54b3d423bdc9e563beb94b7ff7a8bd11e15c2db232125966ce2f3036efec681d521f230b71cb245503ad890a8b4c606c7e59357370009d04d5f335a8628e670 SHA512 f1d799b8372909276834149a272340471e8a97312d4c5821f53c2382159dc160f8d2b4ab8ae60f9764fddbb5ee88df0703452a532b76571a4b099241b62b93cb
-EBUILD wakeonlan-0.41-r3.ebuild 649 BLAKE2B 85edf6292cab6564eeb3c799e263e81df5724d78e371763295aeccda87e688e11d9c834cac99f86be86d19a1bc8a25b08f16b1733d8fb35509c08bcef76330e4 SHA512 c698e9b4f308a9e2e9013232cd920baabf22698d562ef3b4ff7ed44b5277b338696652503b7821d0f1b74e256ea7e22f9badaf8f88d35550aed56f9ffab2120e
+EBUILD wakeonlan-0.41-r3.ebuild 648 BLAKE2B 7b2adad378c0ea62b111f78593c84997a8b6321ecf5d5162d77423a3efb7e79156e2a308d6ee597bcadec0bc7fe4377e3086d7f9d7f2479f396701ddf09360b4 SHA512 ba655f402532977613f2bc38ef999dce34900f56dcf456e4f017944dde54f977f49722c23231785a1d63b269786730dad95c6adb84cab575d68934b20ccbdab1
 MISC metadata.xml 252 BLAKE2B d5ae1c6434a18a4052d21b9d34d573fceda4a6a37f4f0f1001fcd8c5d7d179d6f6d7df0f611b7129eddeb894dbcbf573d9c22f25dfc12fcd989900efe48b3512 SHA512 84cb947f6732467eb3137a917ea484aed7b45f56115790f8fb6595b73d0a558e03f379e239db903e4741934744c8eb10237382be10788787c684fafc854527d3
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
index c61e6f722759..2ac0dc29d53b 100644
--- a/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jpoliv/wakeonlan/archive/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index a6bbe2bf6872..c53686c2f79c 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,15 +1,7 @@
+AUX youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch 854 BLAKE2B 31c948c2fa82ba431c2b31eab9c29a55cbf5bb59ee2eff7a683c5549d30935bbf96be479cc920196408027c34dff818d409e5aee875855ba56be42aa879f5079 SHA512 7bb9a264dcf4a5691460fe537fcb64e11f7f02a54d29590375e5630489688ae940d66818966690916aa0b6ec8b54be730b0f39efa168554e644a1b68bcba33a6
 DIST youtube-dl-2020.09.20.tar.gz 3188480 BLAKE2B c12ee589d112155207b59da9f710b2c776c07464d5c64a5d8355b963a81765b0dbc65df4f9564504fb963f30d5a11dc7e662c14d58ddf9fe6347352363cf70a5 SHA512 ed511016d0cfcbbee0cd651f793cb31cdb46d80243f86186de1cc54cb2a2055fae2f5cc3e16f838fc2ba47f3ff6f3b484219c8a707904fbc30193a2b28a1e30c
-DIST youtube-dl-2020.11.01.1.tar.gz 3190146 BLAKE2B 9f0a6d5041f12881d0f028459054e9cd6fbb91de35dc3d61782889f97611a39fe4a8e1c28fd45585d638ec179f6d9cd6587b06ee2d268a9f44f83f282961f367 SHA512 2c84305a71776808797a651e22690a396c1bd4c922ab6f15b086516b836aa6ac3acf5b08f556567b11f470c0d972adbf67fb110dc34ccfc5c0897e576e42ebab
-DIST youtube-dl-2020.11.12.tar.gz 3188015 BLAKE2B 17267ce8c3068f3a1aca20b23a77a964b005fe4a64a5c37fd3f1d97e4daae4978379ff81b6e4ac4b86fa1f3d27f01b1742dc26e42ea5b8522e3408bfe9f9e944 SHA512 7db373f6cc252635a3613ffe0b3b10640e262778105ebbd78b837fe019b0a2609032d2aeb81b239e000a86220aff99d2c018a9a6325adad6981a8ab64048131c
-DIST youtube-dl-2020.11.18.tar.gz 3186065 BLAKE2B 1c27ffc59bbf7793c58e554923ea7ef8a528191e896f64e39ecb181582bcd9bfecf6de5622e70c873528b1b0b3a8335a12ab6a7b3ac71d603391ebbf83110b89 SHA512 110de857759b4c4bd0160242adebb3d8690bda2203a28a7b1a2ac1cdd9bca058702fd0b323010629e74bbb2df38f50c67b710bc2a6ad4cc907827ee013d0dbcf
-DIST youtube-dl-2020.11.19.tar.gz 3188309 BLAKE2B 775700f26491257125eb68ce49c1ec062ae21568cb3f20463330430d225e2af4e02daed839e5c29cded9b92921a16f0a9611fedc748ca1cd6152c33a131d1503 SHA512 042b0fbe0f1100c338924c9278d4071aaf4cd27dfc7c9d951244aec91a9168358e7463352548a5b7c6a567b077a9db69776790c3a35e08bdf6552f465b4f735f
-DIST youtube-dl-2020.11.21.1.tar.gz 3193010 BLAKE2B a7c04f83815e5b7b6b75109863cf470ca2f756523c08fdfb65386756c9cbfea80e9ee2583f26cb41aa382f747b125543b86bf521a7c0973632a3ca331f48499c SHA512 8f9b77eabe7821f952b706fff4db7ef4e0627dc8333fdfb5cfd0d1dfe4f3bab9ca54525c8c9ed7c285d75fe08c02060dd05744a9a82a526789c67040f8cbcd09
-DIST youtube-dl-2020.11.24.tar.gz 3207954 BLAKE2B 9c1382b73018fc366b4dfbc077be4bdc673812b7073c4e2e79159ccdf5d05443f0b07def13187f1a01e6ed36fc57a29c69d6c1a11c3670bbad3774e8f7f54f4f SHA512 51e29b00fe69a53b957b2108940d9fbe374aadf835e4449b15e799be59858f5273934fccf930701c2eb1c867c65b3b921a55f98b83088f9f0e01541f6fa7a90c
+DIST youtube-dl-2020.11.26.tar.gz 3218922 BLAKE2B 4e8ac926a7cef9d8a9f53de1002464e4d3a632d09c6564e1451a7bc49fe4cdf72e206f98df58a4025d55718f46d84fe4f1f6e23268ef19ad3ebd11725d5a0fcc SHA512 126c299c3db654ad3c88ced44bfc1a34bd73a439d8d3fd64720bb5d06fe84df817182a9e0b38d1def2eb4f1de26c7e2b8b6d3d6b4282f973db548c9868938a41
 EBUILD youtube-dl-2020.09.20.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
-EBUILD youtube-dl-2020.11.01.1.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
-EBUILD youtube-dl-2020.11.12.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
-EBUILD youtube-dl-2020.11.18.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
-EBUILD youtube-dl-2020.11.19.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
-EBUILD youtube-dl-2020.11.21.1.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
-EBUILD youtube-dl-2020.11.24.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
+EBUILD youtube-dl-2020.11.26.ebuild 2234 BLAKE2B b77ce7a214ccaf5b4512402f406cecf6f770832cb1ac99fb9ad3f7d087b985a0c9d4db1de7e661e9a0bc583d2548286221c6402911d190f8ac77d0ea8065136c SHA512 e7416bca93ff11567f98bf293a1adc66bfcc9dbd6c9be39c6e292b46cdadc96e68ae03710cb42cd521e0893793e19db86e4e90e5376c37ef5172be464226e3cc
+EBUILD youtube-dl-99999999.ebuild 2074 BLAKE2B 7eb91fceeba248ff2a1b40ab97139da9a33211b2fe79c66ae6aa29a2b6fe1f2b4e400f4dcc655573d46b6fa9a7f3cb7baddc75a32739b89507db9d4f4f96eba3 SHA512 f9768251f05033b9df5a0ea82d9e62f6d8fcf651dbbcf72a300bba4caf22ca5b99af73b830eba2d5483ae9b227d99f02bfa015319303f7f7300e6106f1e0b342
 MISC metadata.xml 353 BLAKE2B 53a5a71088d6c6ba1785f245c36c8c7551eb800b308313a053cfb5f292df1adce321383522528a06742aabee8f5d7fe8d2d9805c28632fce1d50f6a938b163a0 SHA512 01570d01232abde7a0d3983e307197cd07ad010f57f5df49048405b45fe2e1f2aeb0594260014bd4d95a6f234885e29ac802111402df3707d41b4b0f75b7457b
diff --git a/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch b/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch
new file mode 100644
index 000000000000..c48760a4c41c
--- /dev/null
+++ b/net-misc/youtube-dl/files/youtube-dl-2020.11.26-fix_spreakershowie_test_url.patch
@@ -0,0 +1,22 @@
+From 99de2f38d375f794ffdc4f5a110a5227310f3ab0 Mon Sep 17 00:00:00 2001
+From: Remita Amine <remitamine@gmail.com>
+Date: Wed, 25 Nov 2020 21:39:17 +0100
+Subject: [PATCH] [spreaker] fix SpreakerShowIE test URL
+
+---
+ youtube_dl/extractor/spreaker.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/youtube_dl/extractor/spreaker.py b/youtube_dl/extractor/spreaker.py
+index beee6670c..6c7e40ae4 100644
+--- a/youtube_dl/extractor/spreaker.py
++++ b/youtube_dl/extractor/spreaker.py
+@@ -126,7 +126,7 @@ def _real_extract(self, url):
+ class SpreakerShowIE(InfoExtractor):
+     _VALID_URL = r'https?://api\.spreaker\.com/show/(?P<id>\d+)'
+     _TESTS = [{
+-        'url': 'https://www.spreaker.com/show/3-ninjas-podcast',
++        'url': 'https://api.spreaker.com/show/4652058',
+         'info_dict': {
+             'id': '4652058',
+         },
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.12.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.12.ebuild
deleted file mode 100644
index 0839988f367d..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.11.12.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.18.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.18.ebuild
deleted file mode 100644
index 0839988f367d..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.11.18.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.21.1.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.21.1.ebuild
deleted file mode 100644
index 0839988f367d..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.11.21.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.24.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.24.ebuild
deleted file mode 100644
index 0839988f367d..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.11.24.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. ${PN} will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.01.1.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
index 0839988f367d..82be3f810520 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.11.01.1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.11.26.ebuild
@@ -22,6 +22,11 @@ RDEPEND="
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
 "
 
+# Only needed by this specific release, already fixed upstream
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.11.26-fix_spreakershowie_test_url.patch
+)
+
 distutils_enable_tests nose
 
 src_prepare() {
@@ -34,7 +39,6 @@ python_test() {
 }
 
 python_install_all() {
-	dodoc README.txt
 	doman ${PN}.1
 
 	newbashcomp ${PN}.bash-completion ${PN}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.19.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 0839988f367d..5c8d50fa92c2 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.11.19.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -7,15 +7,13 @@ PYTHON_COMPAT=(python3_{6..9})
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
 HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
+EGIT_REPO_URI="https://github.com/ytdl-org/${PN}.git"
 
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
@@ -29,13 +27,18 @@ src_prepare() {
 	distutils-r1_src_prepare
 }
 
+src_compile() {
+	distutils-r1_src_compile
+
+	emake ${PN}.{bash-completion,fish,zsh}
+}
+
 python_test() {
 	emake offlinetest
 }
 
 python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
+	# no manpage because it requires pandoc to generate
 
 	newbashcomp ${PN}.bash-completion ${PN}
 
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index 6b17b97547d4..dc3f166f5757 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,4 +1,4 @@
 DIST youtube-viewer-3.7.4.tar.gz 281921 BLAKE2B dac2cbf76f3d0939f79fa875652680e197f41bf09769585894147dfe433db72a94d59309237f5ce5398753a39e2cf2cf83ae3f4f6987f5a4b49d806de2598e2c SHA512 4584821fb0ae3ec7e5f9c3b2e887b1fa158fb74a82be07698277e12d3762fd3b8f0557baddb9e08fe485f322b44b91adc2feaaba46227e0c519a516b54bbc4e8
-EBUILD youtube-viewer-3.7.4-r1.ebuild 2498 BLAKE2B f8fbe135fd3fafa0f9ec88c97114e71d2096b2499852e32ac302b550cef8ff2a2fd14013ccaf5eee587bcc71bb1534ad2caf2d64639690fa238d62a95d7827cc SHA512 e0ffbfc731ede1be7835dd11c868047ef845958f761528e94b1371dfabcd1926229dfabb1c99c25c93d44efffece8e69d8cc20cbc782743287d42a3297fb82ae
-EBUILD youtube-viewer-9999.ebuild 2367 BLAKE2B 0187a538d9564ad30cad14012cb3144edb32e047704e13f9b5c3dd3c4cddfbef1a0607497cee1359452c5f1a4f20aba2c4bed5c1ba406662897880c769377e78 SHA512 ce84638d477f7073e7568b4c13fd69b62a6955511d5c34868c43dcf4fd9ef500c63e8c9a8142ab9b52e4af05d08d50eaeb6d7c28fb0f720ff721f72100bbe219
+EBUILD youtube-viewer-3.7.4-r2.ebuild 2496 BLAKE2B 8f68df730d535d31a435c332022ac90eb02f990b49942fe1780b32c76108a131bfede4d6f9e44f54ff87a9caab742324e54a2c93c41a56643637ae853825ac5f SHA512 e1b1d03160e0021dd2b139a2c53725f5f469b39c21f0a2450fa681ea646e19f08e36b9d6caadd45e14c4f8bc429ff178cd3048d077b5cb0a615a57b79997d1f2
+EBUILD youtube-viewer-9999.ebuild 2258 BLAKE2B d7a281333c56a1057b610436a20cc779b794759b2bc4656187920c5d87c91ca2360f87156f8bfd1e9db7821480efcd9a8daf7bdd082c019f0690b0539f86be9f SHA512 240f495d4aa0e541c13e23bf2f468291097c3a76225d79567ad9074a0b5ec4044ae48af5c0f4eece10fdd090a0c35a5ad20a70295611f889bedfc698effe290a
 MISC metadata.xml 847 BLAKE2B 212670f9fc51ecba97d723572602f0e38021712746db20248e084549c0d574388bcf94139a1bed4cd2255dace6fdfd2e2dd31103ef88144b4bd6b9f740085bd9 SHA512 84ca1c094706ebbf570e9eed2d8142f80b0eea012eeda6f972ab99bd17c802babee5a5a5109ddbfe2837e0c6faacf30dfdd4d54d95e23099966f83f485d1893d
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.7.4-r1.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild
index 486d85acd243..8d782d9fcc96 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.7.4-r1.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.7.4-r2.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 		)
 		dev-perl/File-ShareDir
 		virtual/freedesktop-icon-theme
-		x11-libs/gdk-pixbuf:2[X,jpeg]
+		x11-libs/gdk-pixbuf:2[jpeg]
 	)
 	|| ( >=media-video/ffmpeg-4.1.3[openssl,-libressl] >=media-video/ffmpeg-4.1.3[-openssl,libressl] >=media-video/ffmpeg-4.1.3[gnutls] )
 	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
index b12e7f4829df..3115b5726ecf 100644
--- a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
@@ -17,11 +17,6 @@ IUSE="gtk gtk2"
 
 REQUIRED_USE="gtk2? ( gtk )"
 
-GTK_COMMON_DEPS="
-	dev-perl/File-ShareDir
-	virtual/freedesktop-icon-theme
-	x11-libs/gdk-pixbuf:2[X,jpeg]
-"
 RDEPEND="
 	dev-perl/Data-Dump
 	dev-perl/JSON
@@ -46,7 +41,7 @@ RDEPEND="
 		)
 		dev-perl/File-ShareDir
 		virtual/freedesktop-icon-theme
-		x11-libs/gdk-pixbuf:2[X,jpeg]
+		x11-libs/gdk-pixbuf:2[jpeg]
 	)
 	|| ( >=media-video/ffmpeg-4.1.3[openssl,-libressl] >=media-video/ffmpeg-4.1.3[-openssl,libressl] >=media-video/ffmpeg-4.1.3[gnutls] )
 	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-28 20:40:51 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-28 20:40:51 +0000
commit	9c417bacd51da6d8b57fa9f37425161d30d4b95b (patch)
tree	47c9d6e4243f39a1f48afd54c969b65b00a5c649 /net-misc
parent	d934827bf44b7cfcf6711964418148fa60877668 (diff)