gentoo resync : 29.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-29 11:38:31 +0100
commit: 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree: 83fc5facb6b12be510a37bc3d241cc63e965b13a /net-misc
parent: feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)
94 files changed, 1284 insertions, 1477 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 93309f480957..186b6d0e7b2a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index bc9d34e2f877..4c786b880232 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,6 +1,4 @@
 AUX initd-bird-2 1169 BLAKE2B 399481b20099d54f4a4f0cbffa2d9d080f090e15fa1bb9e0613469d94a895fcff3708983defe6d9be181f11ad18598e7e36d411cfc8e07b59c78a74890b5c1c3 SHA512 42224f1ac8ac53be1e0f2d30ecba0fa9ac491494bb6b6147940455538623082f4111731463daec15cbc7c10a90c440d36e27eaab1193f9385488ab6683e15f55
-AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b965d9033e6493df67ea268afba8ab95c46208894f330ff3607d90502653072eb73c130d1841cab9e604c2 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879
-AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
 EBUILD bird-2.0.7.ebuild 764 BLAKE2B 275d827d7462d6b8e8ab027beb275aed312f4eaeb78795ef40364772d4b050dd58f6f9bc35e943c2baf8a87e3b9e955ec90dccb1bb9ffb2c183f193db31a669c SHA512 22528e9a12ca25d83c6231d15b4b16cefa84a3833a7d66726f3cae4208fa99134cab438bec6317e695a21fcbf20f968bcc74c0c6600f27e33ee701b57c0764e7
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/files/initd-v4-bird-1.3.8 b/net-misc/bird/files/initd-v4-bird-1.3.8
deleted file mode 100644
index c7c6a0b63af7..000000000000
--- a/net-misc/bird/files/initd-v4-bird-1.3.8
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-EXE=bird
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ ! -f "/etc/${EXE}.conf" ]; then
-		eerror "Please create /etc/${EXE}.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-	ebegin "Starting BIRD"
-	start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
-	eend $? "Failed to start BIRD"
-}
-
-stop() {
-	ebegin "Stopping BIRD"
-	start-stop-daemon --stop --exec /usr/sbin/${EXE}
-	eend $? "Failed to stop BIRD"
-}
-
-reload() {
-	ebegin "Reloading BIRD"
-	start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
-	eend $? "Failed to reload BIRD"
-}
diff --git a/net-misc/bird/files/initd-v6-bird-1.3.8 b/net-misc/bird/files/initd-v6-bird-1.3.8
deleted file mode 100644
index 94ba4426e5dd..000000000000
--- a/net-misc/bird/files/initd-v6-bird-1.3.8
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-EXE=bird6
-SOCK="/var/run/${EXE}.ctl"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ ! -f "/etc/${EXE}.conf" ]; then
-		eerror "Please create /etc/${EXE}.conf"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-	ebegin "Starting BIRD"
-	start-stop-daemon --start --exec /usr/sbin/${EXE} -- -c "/etc/${EXE}.conf" -s "${SOCK}"
-	eend $? "Failed to start BIRD"
-}
-
-stop() {
-	ebegin "Stopping BIRD"
-	start-stop-daemon --stop --exec /usr/sbin/${EXE}
-	eend $? "Failed to stop BIRD"
-}
-
-reload() {
-	ebegin "Reloading BIRD"
-	start-stop-daemon --stop --signal HUP --oknodo --exec /usr/sbin/${EXE}
-	eend $? "Failed to reload BIRD"
-}
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 6a3a20bb2e95..86a0af6c102d 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -3,5 +3,5 @@ AUX libbridge-substitute-AR-variable-from-configure.patch 942 BLAKE2B e1835eefb9
 DIST bridge-utils-1.5.tar.gz 33243 BLAKE2B 211ecb831f802c119f32c30621daa781056bd9ff2fb5880d328704bd76b5b5b964d0671f77489fb9c71f25a3e073e5e4070cfa759deeba014aa1136ff60b1fdd SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3
 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02
 EBUILD bridge-utils-1.5.ebuild 1319 BLAKE2B fb76d4f17be11bfa531e2f43c2cefa72f5077befdbf2d4ed75f5f7722379fc082810c25d3f360be56ce4e4a69e79a4761343798137d8a34514b466d652ee7f9e SHA512 5d360cfd301b69732fa8a2f713673c776e24a3bf5963044b53ae87e86ca768aebd6c56462083bd33488d5593097bab7a655f5eea70d22a526df0b74e707395f2
-EBUILD bridge-utils-1.6.ebuild 1443 BLAKE2B 411e0487cacd73875ccbdba90d962f298240f04cefeec9a36eb90db23da8b3c51fd8aac8bda73b922d79c18b32d4524d41810dba1fd04cc7f3dc0b0353b48f9c SHA512 05dd684f3309c94cd099c19493a933e75ac7bec7abaad78e7dc91d5d246c0f6d98fb3324a529b7468804e61b4a00d79bc6954dbe10478b52d53e226193ff53bf
+EBUILD bridge-utils-1.6.ebuild 1437 BLAKE2B db6310f76e4b10f54a24bc472aa44c70fa6a9d0b45f2f87850da532b024729bbda3fea181316312d3584fd03104bbff94169f588ea67fadd5faf34f27fceae36 SHA512 324720b237f4b0ebded7892de8f348dbf0080c172aa4d8e4785480bf76a742c397ab0cf8dab12d8f3b03021429b6dde712a1950810b9fc276d119e1b1d357e3e
 MISC metadata.xml 491 BLAKE2B bf2e6636e5cd672907c0fa7a57894aadd2a56c6a86243d6894567e5819684dba5ef73419b9796d3e8e30e5d9048e13f4a11f714400f4b71dc2a61b8fee81467f SHA512 ec5ffecc293290fa0931f16fc447b5f9537d86db112462f6f865b1e4714e95c10d22fef326692d4506958956c3148061beba187e19b8549608f02ef974302bee
diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
index 11f95413077e..47491b009b6a 100644
--- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="selinux"
 
 DEPEND="virtual/os-headers"
diff --git a/net-misc/charm/Manifest b/net-misc/charm/Manifest
deleted file mode 100644
index ff1d5cd2f9d7..000000000000
--- a/net-misc/charm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST charm-1.9.2.tar.gz 84927 BLAKE2B 6c1daea30a8b038a23d82567ba4e00f50a65d8faadd384d25524a29b0c5b1902f18d2d14fb2ef28b78cb1e43cb168704883719c493267a0cdacb348729a8c334 SHA512 9ea4c7411764dd1d1c87a1a19de2de3061e08e030e793ff259e80477aa5880a01f05f8a8d1ecc9b1e696111c3f3f9504f5387f535d9d52d1496d20b04c68835b
-EBUILD charm-1.9.2-r2.ebuild 868 BLAKE2B 5a2a209c913388f4fd2dce2c1a9a2e425adadefa67aaeaa4afa5f2fe8ddaae4c0ceba0f8b3d562946660f33e1c579518bf96075bfa66cd8f0488cf361a721b98 SHA512 12dcac21c72dbf39981ce7ee5febcbbdd759ede3a619f816a80f0607a8a4a3c6cee8281f3b13fe0246481217b692744769493b15aaf5c676431db815a30492e3
-MISC metadata.xml 244 BLAKE2B 06f30181d05c2a8bb01c34cf29bc0b3950a577aa678cf84697633a525f762d229fd0ce32fd1281c8204f89ea47f09d46a3106eb045bc3b3dccdabc588fa07534 SHA512 e563e61a42c0710c2c87775e29ce2804ad1ebe2cf9619f0babf342b72a0a38ff44aa79c6a940b4486b9982cb962d56d12698c3cdc5aa6eecdf515d4a3057bbd0
diff --git a/net-misc/charm/charm-1.9.2-r2.ebuild b/net-misc/charm/charm-1.9.2-r2.ebuild
deleted file mode 100644
index 52c66fb0448f..000000000000
--- a/net-misc/charm/charm-1.9.2-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL="1"
-
-inherit distutils-r1
-
-DESCRIPTION="A text based livejournal client"
-HOMEPAGE="http://ljcharm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ljcharm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/feedparser[${PYTHON_MULTI_USEDEP}]
-	')"
-
-DOCS=( CHANGES.charm sample.charmrc README.charm )
-HTML_DOCS=( charm.html )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e 's/("share\/doc\/charm", .*),/\\/' -i setup.py || die "sed failed"
-}
-
-pkg_postinst() {
-	elog "You need to create a ~/.charmrc before running charm."
-	elog "Read 'man charmrc' for more information."
-}
diff --git a/net-misc/charm/metadata.xml b/net-misc/charm/metadata.xml
deleted file mode 100644
index e7d7e8d65d89..000000000000
--- a/net-misc/charm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">ljcharm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/clockspeed/Manifest b/net-misc/clockspeed/Manifest
index 51a65d8e28b0..5afe918596a2 100644
--- a/net-misc/clockspeed/Manifest
+++ b/net-misc/clockspeed/Manifest
@@ -3,4 +3,5 @@ AUX ntpclockset 1100 BLAKE2B a84e6d6ec78e8d0e9be34640db9f18cb6a15dfe35c583b3f1af
 DIST clockspeed-0.62.tar.gz 25797 BLAKE2B 3e409b09dd426dbe33a1aa27e08313bafb5f682ce4fb42740b88841bad2a88b6095e3b0d178c3d2b0f338a99a8ede03e00e79ce09559dc136addfd1d1e1ceca3 SHA512 4dae1cfcfc5eb1398fd5a7642ff91987487d9828d314d4bd9f93cdadc60fe99889280a7f8e9192674ed19d246bd4a450ad32b1258e450216111c488074db7978
 DIST leapsecs.dat.20081114 192 BLAKE2B 71113068e1fce9a11b9acba1527d90f6977302b6d8042fe83522fc2fea260a15b18226bc34cd84637b00d0e58a24c24d6f9ea537f1064b82655647ad4c58e0b6 SHA512 c85634ce30f40a03ae45983ee29483fe5859f291a0a69835dad1f50459327b212b8187a0c2c18c9a27fd74f2d69ed0d9a556349c8b2833b9a30107ed259aacc7
 EBUILD clockspeed-0.62-r6.ebuild 1193 BLAKE2B 39ef62870f8316af2e7d37f26732ec1e9ed9c6869f59659d1626479e4eeefe590fbfe2c40cbfd3b89089ef7676994dbc94ed4cfa57b1a77ddaa557b361da95f6 SHA512 04c9d9bef35d41402b30b30d5e4a879c1923fa4a0942b24541017e85399ac033f2b96c30956be5da980a70c788ee282036dc4bf207082d7effa001443d85b200
+EBUILD clockspeed-0.62-r7.ebuild 1188 BLAKE2B 9a765b034396f5f77b6468b3da71d43e38e0908d7f39820e18c083d8aa05fc8a0257e51af7a08434e5fe01fcd2f1e0845fa2c980fb2d3c13b98a893510e83723 SHA512 d4f44a48aa0d8cfe88f44c9b3a60f75f7b271ea719b057e398bf5a409d8d688a1f302f51657c944f288f43ca0c478f8e43f323026359f6fcf75ebe1a82fb51e9
 MISC metadata.xml 416 BLAKE2B b11bd8ea02066ba97613146ac7984f394b5fa4e1b34b2781f0e3fb747affebc6f5db19bde801ca0e0465699520561c24293e6855f40df0c93d9e21fd7463f094 SHA512 966f4ad088720ae3da99158933a8344b9f17b7f251ae37562b99ee8cdc9e1fdbb0d530e42703208ed1373932037918e4657bd0663a42f3a3348505ccdcd39d69
diff --git a/net-misc/clockspeed/clockspeed-0.62-r7.ebuild b/net-misc/clockspeed/clockspeed-0.62-r7.ebuild
new file mode 100644
index 000000000000..69bb561244a7
--- /dev/null
+++ b/net-misc/clockspeed/clockspeed-0.62-r7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Simple Network Time Protocol (NTP) client"
+HOMEPAGE="https://cr.yp.to/clockspeed.html"
+
+# this is the trailing part of the name for the latest leapseconds file.
+LEAPSECONDS_DATE="20081114"
+
+SRC_URI="https://cr.yp.to/clockspeed/${P}.tar.gz
+	https://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat."$LEAPSECONDS_DATE""
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="static selinux"
+RESTRICT="mirror bindist test"
+
+DEPEND="sys-apps/groff"
+RDEPEND="selinux? ( sec-policy/selinux-clockspeed )
+	net-dns/djbdns"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} ${ASFLAGS}" > conf-cc || die
+	use static && append-ldflags -static
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
+
+src_install() {
+	dobin clockspeed clockadd clockview sntpclock taiclock taiclockd
+	dosbin "${FILESDIR}"/ntpclockset
+
+	doman *.1
+	dodoc BLURB CHANGES INSTALL README THANKS TODO
+
+	insinto /var/lib/clockspeed
+	newins "${DISTDIR}"/leapsecs.dat."$LEAPSECONDS_DATE" leapsecs.dat
+}
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 5e5c0a78d4c6..c5346ceb6745 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -3,4 +3,4 @@ AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f5
 DIST connman-1.38.tar.xz 749288 BLAKE2B 3f0ec95c87d9b3bf4f188e2523cb8ed97f462953ed95180fadf98bfe0d01c67a3b73e18e39d616e9299fa0251b9a86afea6161b9e280ae6999eb66e6bd5c4406 SHA512 9c8f77c4dd62763ccb9ea5cc5d285a8a1c51bb09a82eafc73246231557a4f627ae1e5e4a9df5e104457390ebba643349d7d67800a4ee4c17c6dceff192afe8d4
 EBUILD connman-1.38.ebuild 2722 BLAKE2B ed9392bee5e97012fe13b77fd3ed5c50f15dd64aeea641695505c7c4f0d575c949e51e04e21ff801de9d8d8609807593b2d7279a5adc6aa87ac99da16473d654 SHA512 829b20d249c16a550819d00cba1b42afa44895f287c48a47176576280d3d6dd231c446c5bcae91ef662f78d0e0e828429377365482426d2b29115494c9247b70
 EBUILD connman-9999.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da
-MISC metadata.xml 1220 BLAKE2B 0d56b48507231a37eed6f84e5875ea55571a8cfc0379b7b16c3d74650fa011876b7466a96bfbcf7a9db9cc931c2662d678d33872082dec7b444dc404430e71bd SHA512 591edad65cd7efc59a63b207c5ea7b60b624ee91b3ab1d4aa165d4b2824640fffeca662d7f6ba34822e38777ceae9aa3caafd39d328294f245e988c77fbede5d
+MISC metadata.xml 1302 BLAKE2B b6cea3b784c7f217c5d0befc833fe573ff68f010f9fb1043b11ce9c70473c45b2a9c03d59495e8a04f58e1657ce6a9ca531da9675bdd545493cd1bab8a583ae9 SHA512 3df49e8184d319601df17ff8238404c673026a6953f0a566c7d9134215841dab8cb6a4ec507e2c6467bfbc463678568696828173b80a96a4035a449ff886bb3f
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index a8e17b602a0e..88deddf40f43 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -20,4 +20,7 @@
 		<flag name="wispr">Enable support for WISPr hotspot logins.</flag>
 		<flag name="wireguard">Enable WireGuard VPN support.</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:intel:connman</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d432bf6f5ac7..842c3e92b94f 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,7 +5,9 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 DIST curl-7.68.0.tar.xz 2442788 BLAKE2B d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269 SHA512 bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c
 DIST curl-7.69.1.tar.xz 2467272 BLAKE2B 71eee2a8f511ea698f4ebf879bcdccabe11439b2f6c7812cde640f944af93b33dc797c6f4990ddd2a7051d33584dacc005ae011c16a6c1f7ab7fc7258c891937 SHA512 dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa
 DIST curl-7.70.0.tar.xz 2348780 BLAKE2B 6b505d87242bcaa554c4ee6994eb97ca70453521c1e77b5e757677475328c70f41e23e22b3a0eb9be7a299a94d4f1f85a46f7f999f3db8439072626320352ecf SHA512 ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6
+DIST curl-7.71.0.tar.xz 2379056 BLAKE2B 50d7369e4335823c3032b8801b270f7d8e687b0552f25ed5f9752549483cf68870e0422132ecf86e756e1c7c27cdf60048a7765850608c3a1b734cffb1fe7b99 SHA512 f1ea045f23b6a7e2c84ea83954d3299c612f57c3b1e5fee0b39493dc92fc4e95e7af2a5424c2e5bc480659e80cf1adce1fc528fc816f8ff2d0e7bfcfe4c5830a
 EBUILD curl-7.68.0.ebuild 7574 BLAKE2B a63f7bd7c6a27f2c67824d2cd2e742bf6d53f2fb004ab7ea6e4aaf0034bb97a5a59a605c133cd3c27ce84114bdc715c873706f757428a8f3ade59516dea1b882 SHA512 a59e3f0ad00bf9becf08fb624e0f634f6bac617b8ba88f751e2a2a78422eb54f294149db7a1cb9fbd25554637335c01c9467d1774a26b9571d413f90a620e491
 EBUILD curl-7.69.1.ebuild 7663 BLAKE2B c3d98ec0d1f9d40d1173cec9f4a8e6198e5da809fe52fe83db75ba3ec68f0f2ca0812fcc90d29004bdcdf874136ac139a130f913899553d5912392b541f612a9 SHA512 c6f542f18802aaf42ac0ca33477f239587bc20afd9462bf931444ee79a8773e0b1fc1cc8ce503157433d6d45f0600b104fd0a0b200de2ffcbd462dc6d2cd784b
 EBUILD curl-7.70.0-r1.ebuild 7735 BLAKE2B 8bb2413f7fead1501f7146b06c0aa15e6c610c1e731c3ffc59d0a8b979b24cbc491d32087315aa0dfa178701a2a8eaee116d41fdbdd321bcee5c6c62e8ad5a0a SHA512 40c3dd6c2e168de6e596fa6e5177cef48be547fa5e76772a46fbbd076b68ddcaca0c9f8c2d1981ad528c900a3624d80dfa87dc077d84c773f21b35a57b568b9b
+EBUILD curl-7.71.0.ebuild 7688 BLAKE2B bc7f9ea325b026c360a9e3dddde33c94a8b2a71dbbbd7d7cb5b28b09c3a8e662db36756ad00b40beb5ba452e71157f4253c7c02c65e9ab981a0c72000d1508df SHA512 9cfd78a000ba73e782b1ee16948d6266c7f9d90059dda2ea43f0450868660e97383802564ab15920b61903d0a2ef70f9101b2395ffd64c6d6b02a996a0a4122f
 MISC metadata.xml 1643 BLAKE2B 269e3f95823a962466081b171d376e1f13cf4e8ac7d440577f704d585d40d0a4e7f496be1860f283f2e118338183210c1a93d3cff24fe517c9fed57dcd8b615c SHA512 ed329ba19ca89372141274e7fcb161e9f825e219d9bf71dc719b1a2bf5deefdecaaab02bb6e5e4c0bd1c87ce16731f7f5137dffb86e65c67381d98eaf72cc2d9
diff --git a/net-misc/curl/curl-7.71.0.ebuild b/net-misc/curl/curl-7.71.0.ebuild
new file mode 100644
index 000000000000..cfcba68debda
--- /dev/null
+++ b/net-misc/curl/curl-7.71.0.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="curl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads"
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable alt-svc) \
+		--enable-crypto-auth \
+		--enable-dict \
+		--disable-esni \
+		--enable-file \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
+		--enable-http \
+		$(use_enable imap) \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-mqtt \
+		--disable-ntlm-wb \
+		$(use_enable pop3) \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		$(use_enable smtp) \
+		$(use_enable telnet) \
+		$(use_enable tftp) \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-dateparse \
+		--enable-dnsshuffle \
+		--enable-doh \
+		--enable-hidden-symbols \
+		--enable-http-auth \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--enable-manual \
+		--enable-mime \
+		--enable-netrc \
+		$(use_enable progress-meter) \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-amissl \
+		--without-bearssl \
+		--without-cyassl \
+		--without-darwinssl \
+		--without-fish-functions-dir \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		--without-libpsl \
+		$(use_with nghttp3) \
+		$(use_with nghttp3 ngtcp2) \
+		$(use_with quiche) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-schannel \
+		--without-secure-transport \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 521482d87752..19dc34131258 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -18,5 +18,5 @@ DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457
 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
 DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
-EBUILD dahdi-3.1.0-r1.ebuild 4372 BLAKE2B 63cc2f665eb0002988e4c6db7e3487eda30e832c2cf75f3811dc4a0fd04c82ef9d7a3d2195af0dd38208dc94fb06e493a198507d7b10907e794d3e32a61c964c SHA512 92291422009eb9c2020f09cc54121039b6ecc38e8978c9ff71fa36c6b0f60c251ca11d2b2753bbc9b9bccb7ad33a1f3f437322a02d5e91d7a1de4fbcceb0f519
+EBUILD dahdi-3.1.0-r1.ebuild 4781 BLAKE2B f317267d87d5d5c6617bd94928196d661ea9bd80dce5f55665baebcd898588e7c1859df4fa66fbcbef124801f44af6d5ee4f0dff4624ea904045286cf48887ff SHA512 6101d70501c8a57b18955824966a7c023d9e88871aa236bf4dc214d66a9b0ab64ae2599b79851812e93d3398ac02bd0bcc10347d554be7fec0a5ed3afd2ee303
 MISC metadata.xml 539 BLAKE2B a0ce99924eb45e3ab924bdf354a54b185775fdf86e412dd53b2f2ad00772376e7e191c9166b9417dc81d0e05dccdaa1e6eb1e72b937a8a125b948f023129624e SHA512 41033deb3d149daf967524383856a8e45eebfc6b6c721ae5a9bb6fcc18c5f1371e49f5f52f403ff9f192911c3345a52ae11b03b4d0fa1d3cf753ec5efd570c5c
diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
index bd1d6c11293c..f69efcbe4185 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
@@ -97,5 +97,11 @@ src_install() {
 		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
 		LDFLAGS="$(raw-ldflags)" install
 
-	rm -r "${ED}"/lib/modules/*/modules.* || die "Error removing bogus modules"
+	# Remove the blank "version" files (these files are all empty, and root owned).
+	find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
+
+	# If the kernel sources have a System.map, and there a suitable depmod
+	# available (seemingly when we're not cross-compiling), then the kernel
+	# sources depmod kicks in.  Remove the files caused by that.
+	find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
 }
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index b21381cb678d..59732f17e75c 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +1,13 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
+DIST dropbox-lnx.x86-100.4.409.tar.gz 96530220 BLAKE2B 392949b19d97bb8d8a63b83e48c03414eec7064f151060ae2ab9f8b852a9bb46710c7ba54440e9242f803de3245c96705255aea8ec1435061282a68e3d27bec2 SHA512 e54e6fdb5cc6eba4267cea60ae7c1dd4a4537de70c430436e7e0f6eaf99e6730bb2a69ffb3e62ff7a7b2fe23301b7c9093143554b5659385e23099d702b057a2
 DIST dropbox-lnx.x86-98.4.158.tar.gz 96568004 BLAKE2B fc9ae4cf5d9ad1798dd5d55bf90cd5e77e7cd7405626fb55d4693e26d028d97a81d2843eb03d60de94f552cc446fffa4caa679ba3a750098a58549fc78ff4c67 SHA512 ce6432bbec1ec024e6753a93f2d0eed3af60de521f411f52efb63767eb500a85da80102a011e077fd9953d4827403d02143b186f30137ef7a338cb01664911a2
 DIST dropbox-lnx.x86-99.4.501.tar.gz 97126978 BLAKE2B 38476b8c0b36c385c69c44588c5b3ea227a8f7db2b1bc08c75558dfae6e962c5f9df4ce82ddb8afaa53b4b6522ec37f2cc5cfffce6d5b293a64b98333c33641b SHA512 01d91cb5be1439fd1d2e47b93da570650cbc21aa4ba0bff05f066ed5c5a60d162a7a5e3eb343e6a2ca48709964b29570b94cc8702a1064a8fce0779acb6ea14e
+DIST dropbox-lnx.x86_64-100.4.409.tar.gz 100580993 BLAKE2B a9e6c4c02bfaac4f27bb0be0369c77af23bb0fe23a5105ed7c46fde699ecde012c31aff015591cad85a3fd4f3bfe58a0281f78efebb9db05fe732bfb0c92a8e2 SHA512 862c289827e3769725242b4973c384ca0ac933a5390641f8eca428a812f66858fc2f0a6ae056305fc17746d1a34ec927d68f9435c3bd47fa1308a0dbcab23e3c
 DIST dropbox-lnx.x86_64-98.4.158.tar.gz 100751556 BLAKE2B 8ebbfa7101852e531edf9c6b3318c14418c95a0e618ce3725411e6fb1dbae70860de9b0daeba4c824fff0b3bd5f9a9347a4fe09c1433f76be3b3cc86184d769e SHA512 00db27742f8dff9d3fb96f06fcefdb30450b675b3c3cd35df717908455a8b1ca0419efff8932022d82c89dd3fccca183bc1bb16a1fb25c0505c49dfd03b06a19
 DIST dropbox-lnx.x86_64-99.4.501.tar.gz 101375862 BLAKE2B 46c03250bd2c2d480b67a645c03fc8fc0343aeb5906afd1807b49bfb44d07606b59a61fa79fcad48cb4029969f457ef347d5f1394dbf53b10586bc05b068295e SHA512 4d8b350aa8cbc9cc5491c8978cbe56eb8e08110f48dd4187d7287a46847d8a4316158ea39e09e707a135a10424e8c6bc2a66b3cf4f9b8529fc0cbf755744a118
+EBUILD dropbox-100.4.409.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
 EBUILD dropbox-98.4.158.ebuild 2546 BLAKE2B 615c2a5848135ecdbae88019b23218acf2114347a931bd345f660f1dc333bbdefbf304ec8c4069947af061e114dea8fe856bffcedbd91437b1300f979f12272f SHA512 88e21dfd4905e1c31114814243cf93b5f6e95302e2f90c7fde2b5c955f0789f1ca66c9b7b7372d2ec5c404d8e6788ce76e66b658151f28ec16020eb3c06aec7e
 EBUILD dropbox-99.4.501.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
diff --git a/net-misc/dropbox/dropbox-100.4.409.ebuild b/net-misc/dropbox/dropbox-100.4.409.ebuild
new file mode 100644
index 000000000000..38f892d3ba40
--- /dev/null
+++ b/net-misc/dropbox/dropbox-100.4.409.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		dev-libs/glib:2
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/libffi-compat:6
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest
index ff6e6263c138..68bcebb5a29b 100644
--- a/net-misc/endlessh/Manifest
+++ b/net-misc/endlessh/Manifest
@@ -1,12 +1,7 @@
 AUX endlessh-1.1-syslog-help.patch 898 BLAKE2B 97d075e3f0e86f560cc57a2227f15ed88bd2081d0d991e2f420c4f57ab37c3f7302bb56a414ef3a799cbae4eb3e8dfe44706bd755680641fae0b14e2ded9ec59 SHA512 b7681e555afbd12745b0c68f34220451dfe4f9c52fd08401c83197f8b2cd22c14115b5e7d5cf421b56f0fe4b3528903f642557ef8f1a34fabb4dec8901934a2b
-AUX endlessh.confd-r1 1334 BLAKE2B 978cb9746acf2ab5aba7bff766a11daa347daee14bb5d6e03f2dcb8dda4ac8e9394b40aec1acd6ed082d0d4bdbd8fa553793bca10791faa7c99994625dd1f51a SHA512 8f54abdd8d4f63153ed1b1653b52d2e2c4a97b68851a9e8c882e7a0ff6c235300b74ca9803c0eb8402c5c4e6d17977ce77860fa5101d7925ff5004cffca92304
-AUX endlessh.confd-r2 1076 BLAKE2B c25a41bfb71eeaa7b6bdfb4651a1e0d8af91fb1fff6aa1c8edcf31917447d69645d9a00f280d5e7ee88c11c071906d306e916bac72061d5cdcb871f55247752d SHA512 6338bd15f0120936a14aec0b4979fd4422a736e5a5eb7428a5e816cfb0671c24764ba2ce4d6bebfc5488fab18ffd8b02b52f778e0a395891da6352e310135bad
-AUX endlessh.initd-r1 657 BLAKE2B 1954581b2434437d1fbac539a4cf0ee7dd8c59f4eab9a5e7f0f2549ead3ecda062810b9ecbc25b4bd8928e9e0aeea42ff6a0e64be2628313fbaa1a55e1feef11 SHA512 0e7e4306a4b9bfde080647ba82e0f0e4b828a787926d6cc78189a25b0f5d2de4d95433c960f23e4c16ceae0d7cf67a8be69323f04d1911393b88400a9498ba48
-AUX endlessh.initd-r2 762 BLAKE2B c5d89221af1a24bf7d0b45785fa2178dbd6dd70fe12d025f54fbb9c65c2d82a3abf2f2ece1cee30541ba05343984af0318e72f932c171a1de9c4a1e58e2fcf86 SHA512 6ecea923bd9e73a082131bae97bac46b5823828bdbcc8301642c17f7eea3f7231fa1a84e03872e841f64b7ec8b818a03ba993a7b1e87df167434bb1ead4d4c4b
-AUX logrotated-r1 181 BLAKE2B 6667824ccd09b277e1c020c68380061cc40f615b29dd5041fe6c9d2c97a5e434302ef1dae8341bf37f9fbdfe1f12bb73a589c0817dac033714d04ccef337cb8f SHA512 4961f3ea7dabb66a0ba6a650ed21bef9d4bd2289d15d5b3367b31524480d4c63275cedcd2f39202353f302fab6310168529560975b23a8699a2b7a4e6bd4abad
-DIST endlessh-1.0.tar.gz 12258 BLAKE2B add6e24568cc94b244aa52bb484d1516210bfaa5a82440e090a89a94d50fbd4805ae004f917af56a7ad82a6502ae97c059d3f1c24b7c3e13ad1bd5a04bcf1c3e SHA512 a7e4e6ac5dc5e9b6e479ac3323b6a3ecec398ea074970de7794c93bd7a1a77c5662bdfa5752217fe552db1b3dbb9f400183114d7399c5a019637cb40756b46a8
+AUX endlessh.confd 1076 BLAKE2B c25a41bfb71eeaa7b6bdfb4651a1e0d8af91fb1fff6aa1c8edcf31917447d69645d9a00f280d5e7ee88c11c071906d306e916bac72061d5cdcb871f55247752d SHA512 6338bd15f0120936a14aec0b4979fd4422a736e5a5eb7428a5e816cfb0671c24764ba2ce4d6bebfc5488fab18ffd8b02b52f778e0a395891da6352e310135bad
+AUX endlessh.initd 767 BLAKE2B fdc7a57dbf9812880ee2b95f3d23350375ae960431929c5823647d052eb38fd6d3bfb87e9a3d33356018d117a73ba1a78a855972d7e4e11d35cf3a8910b2473f SHA512 2deb46cfcdf002408933f8e20287c1be3a0deddf41d97229ec30408e769b0c9a5c8575cb3e43939e385a3187def4451b7f20acf1641da403f335d435ebabf322
 DIST endlessh-1.1.tar.gz 12844 BLAKE2B 8828739844cb03f67067bb020c3da5b5c6610a195202776da1ae184c0ab02c9f2acef32cc6536bbb80a46242251e3425eed2c70b0d1a90b0e73696ac14babc94 SHA512 7df2463425ad1417a2e328eacfb840aed14727168b83b5adf80cf6c5c98a6fc05f96bba9257b543ef60202a74383e4978e92c4a1b959e35d4ab94e0e5bda14fd
-EBUILD endlessh-1.0.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
-EBUILD endlessh-1.1.ebuild 1285 BLAKE2B abc2316e6a0100d31e4072be14167e8ca98344c2c9129da964d0d31ddee8c8ebb4c2483809dfa86b5c34dbe89e25e33c2791ed87591aeabfa8cc0b035087e7d2 SHA512 97de42b47d57f4aecd3ce1b03234a6a54b9655b0047c851364bbc35c4e3a139acbdb73c13d511dca65b7855dc1f284e42d81538adf060d35eca374c660aa30ef
-EBUILD endlessh-9999.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
+EBUILD endlessh-1.1-r1.ebuild 1335 BLAKE2B 7020443bb021f25668b40d923b792a4de32c25f31da9ce1f3fad3d4455fe0c3ba2ef51d046a080b44ef1a3b2fa67e906ff6658eebf4f00548a4e6afc2b45b332 SHA512 9315012e6770a895ad9a8123e3bd5c04632558c6098df0cd8b468360e0915b4c0d9bfa4d817c2028d36be7e5e228429830807a7edecd896b1d23826ff68f41a8
+EBUILD endlessh-9999.ebuild 1281 BLAKE2B 848c81ceca759839ef436cce8c906392a9265cb43dd04e5adff8c2efc8f9a7879e6fe3b0639375c1ccd79489314427d1ae230e4a4a4a41df94c6767dabb6d97b SHA512 01da5e8c76ca8eb794417162537048156ac2772da596ca1ab75641fc57a64a6c3304b56c6c116dd46ff50dd088265f05c9fa81c49a2e1379fcffc70a90750d43
 MISC metadata.xml 1031 BLAKE2B 8f3ec618c1142bbea8f7bc995b0630dedba8391b1b52045f24f3636418bdbdb3a9368e442b177915db8e77291af3c73bb2ee7ad7e3ad596916bcdfde14034ef2 SHA512 2cb9ee586abf06930aa03eb3a536c15d22114a5d3c42c15037cac9f6df6a289bdadcfd83b87f75869be49c22486c11c1e425f67bd982289be0f6130bfb828cbf
diff --git a/net-misc/endlessh/endlessh-1.0.ebuild b/net-misc/endlessh/endlessh-1.0.ebuild
deleted file mode 100644
index c9996640c02b..000000000000
--- a/net-misc/endlessh/endlessh-1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="SSH tarpit that slowly sends and endless banner"
-HOMEPAGE="https://github.com/skeeto/endlessh"
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
-else
-	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="Unlicense"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND=""
-
-src_prepare() {
-	default
-
-	tc-export CC
-
-	sed -i \
-		-e 's/^CC/CC?/' \
-		-e 's/^CFLAGS  =/CFLAGS  +=/' \
-		-e 's/ -Os//' \
-		-e 's/^LDFLAGS/LDFLAGS?/' \
-		-e 's/^PREFIX/PREFIX?/' \
-		Makefile || die
-
-	sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \
-		util/endlessh.service || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/endlessh.initd-r1 endlessh
-	newconfd "${FILESDIR}"/endlessh.confd-r1 endlessh
-
-	systemd_dounit util/endlessh.service
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotated-r1" endlessh
-
-	insinto /usr/share/"${PN}"
-	doins util/{pivot.py,schema.sql}
-}
-
-pkg_postinst() {
-	elog "Log parsing script installed to ${EPREFIX}/usr/share/${PN}"
-	elog "Install dev-python/pyrfc3339 if you are going to use it"
-}
diff --git a/net-misc/endlessh/endlessh-1.1.ebuild b/net-misc/endlessh/endlessh-1.1-r1.ebuild
index 89e86696bb7f..eb2ab463fcba 100644
--- a/net-misc/endlessh/endlessh-1.1.ebuild
+++ b/net-misc/endlessh/endlessh-1.1-r1.ebuild
@@ -24,6 +24,10 @@ DEPEND=""
 RDEPEND=""
 BDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-syslog-help.patch
+)
+
 src_prepare() {
 	default
 
@@ -46,8 +50,8 @@ src_install() {
 
 	einstalldocs
 
-	newinitd "${FILESDIR}"/endlessh.initd-r2 endlessh
-	newconfd "${FILESDIR}"/endlessh.confd-r2 endlessh
+	newinitd "${FILESDIR}"/endlessh.initd endlessh
+	newconfd "${FILESDIR}"/endlessh.confd endlessh
 
 	systemd_dounit util/endlessh.service
 
diff --git a/net-misc/endlessh/endlessh-9999.ebuild b/net-misc/endlessh/endlessh-9999.ebuild
index c9996640c02b..45747936cb6c 100644
--- a/net-misc/endlessh/endlessh-9999.ebuild
+++ b/net-misc/endlessh/endlessh-9999.ebuild
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
 else
 	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 fi
 
 LICENSE="Unlicense"
@@ -31,7 +31,7 @@ src_prepare() {
 
 	sed -i \
 		-e 's/^CC/CC?/' \
-		-e 's/^CFLAGS  =/CFLAGS  +=/' \
+		-e 's/^CFLAGS   =/CFLAGS   +=/' \
 		-e 's/ -Os//' \
 		-e 's/^LDFLAGS/LDFLAGS?/' \
 		-e 's/^PREFIX/PREFIX?/' \
@@ -46,14 +46,11 @@ src_install() {
 
 	einstalldocs
 
-	newinitd "${FILESDIR}"/endlessh.initd-r1 endlessh
-	newconfd "${FILESDIR}"/endlessh.confd-r1 endlessh
+	newinitd "${FILESDIR}"/endlessh.initd endlessh
+	newconfd "${FILESDIR}"/endlessh.confd endlessh
 
 	systemd_dounit util/endlessh.service
 
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/logrotated-r1" endlessh
-
 	insinto /usr/share/"${PN}"
 	doins util/{pivot.py,schema.sql}
 }
diff --git a/net-misc/endlessh/files/endlessh.confd-r2 b/net-misc/endlessh/files/endlessh.confd
index 062e30f0c164..062e30f0c164 100644
--- a/net-misc/endlessh/files/endlessh.confd-r2
+++ b/net-misc/endlessh/files/endlessh.confd
diff --git a/net-misc/endlessh/files/endlessh.confd-r1 b/net-misc/endlessh/files/endlessh.confd-r1
deleted file mode 100644
index 13ba0ef55d2e..000000000000
--- a/net-misc/endlessh/files/endlessh.confd-r1
+++ /dev/null
@@ -1,34 +0,0 @@
-# /etc/conf.d/endlessh: config file for /etc/init.d/endlessh
-#
-#ENDLESSH_ARGS=""
-# Usage: [-vh] [-46] [-d MS] [-f CONFIG] [-l LEN] [-m LIMIT] [-p PORT]
-#   -4        Bind to IPv4 only
-#   -6        Bind to IPv6 only
-#   -d INT    Message millisecond delay [10000]
-#   -f        Set and load config file [/etc/endlessh/config]
-#   -h        Print this help message and exit
-#   -l INT    Maximum banner line length (3-255) [32]
-#   -m INT    Maximum number of clients [4096]
-#   -p INT    Listening port [2222]
-#   -v        Print diagnostics to standard output (repeatable)
-#   -V        Print version information and exit
-
-# EXAMPLE 1: listen on port 22, log all queries and errors in very verbose mode
-#ENDLESSH_ARGS="-p 22 -vv"
-
-# EXAMPLE 2: load settings from config file
-#ENDLESSH_ARGS="-f /etc/endlessh/config"
-
-# EXAMPLE 3: load settings from config file, but override port
-#ENDLESSH_ARGS="-f /etc/endlessh/config -p 22"
-
-
-# LOGGING: is disabled by default, enable this to actually redirect messages
-
-# plain file (preferred), change logrotate file as well if you change this.
-#output_log=/var/log/"${RC_SVCNAME}.log"
-#error_log=/var/log/"${RC_SVCNAME}.error.log"
-
-# syslog support via LOGGER(1). Note this spawns logger processes per io stream
-#output_logger="logger -p daemon.none --"
-#error_logger="logger -p daemon.err --"
diff --git a/net-misc/endlessh/files/endlessh.initd-r2 b/net-misc/endlessh/files/endlessh.initd
index 0b995f683d91..1639c57348c4 100644
--- a/net-misc/endlessh/files/endlessh.initd-r2
+++ b/net-misc/endlessh/files/endlessh.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
diff --git a/net-misc/endlessh/files/endlessh.initd-r1 b/net-misc/endlessh/files/endlessh.initd-r1
deleted file mode 100644
index ea8d830af439..000000000000
--- a/net-misc/endlessh/files/endlessh.initd-r1
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	after bootmisc
-	need localmount
-	use clock logger net
-}
-
-description="Starts endlessh tarpit"
-
-command="/usr/bin/endlessh"
-command_args="${ENDLESSH_ARGS}"
-command_background="true"
-extra_started_commands="dumpstats reload"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-dumpstats() {
-	ebegin "Dumping connection stats of ${RC_SVCNAME} to log"
-	start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${RC_SVCNAME} configuration"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/net-misc/endlessh/files/logrotated-r1 b/net-misc/endlessh/files/logrotated-r1
deleted file mode 100644
index 896e89e6474f..000000000000
--- a/net-misc/endlessh/files/logrotated-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/endlessh.log /var/log/endlessh.error.log {
-	copytruncate
-	missingok
-	notifempty
-	sharedscripts
-	prerotate
-		/etc/init.d/endlessh --ifstarted --quiet dumpstats
-	endscript
-}
diff --git a/net-misc/etherdfs/Manifest b/net-misc/etherdfs/Manifest
index 90da108b76b2..95f20fadd927 100644
--- a/net-misc/etherdfs/Manifest
+++ b/net-misc/etherdfs/Manifest
@@ -4,5 +4,5 @@ AUX etherdfs.initd 242 BLAKE2B b3109ef0534637cecb3d116254457c562e59c44042e94b3cf
 AUX etherdfs.service 210 BLAKE2B 0e3243da13f6be2251239fe43a5c675388175a1e62d4119cba30a2a35f6ca69572ff3176d944e39d55e442cb3cd1b599a8ce6d09bbd5ddefb9bf0c67aff216d5 SHA512 13a555a8c4e82f3b033d946f82064fcb0c3d026393da8abcff9336e6a20d36b2185fac3b3562dde59260c43b8a45b1c6dd1e95faf40abc870605e50f0fc8b381
 DIST etherdfs-20180203.zip 13081 BLAKE2B 53b0d12c272aa8a64a1980b6c4aae8c6789647026590ee948bc4d84be265479a816d8ae4df033a9a8be4038eb10b934b6ee8d188bf88e47c21f2e81123a572f0 SHA512 c254647fb35b7456b08eb27e6bc6b339d65c55ffd28fdc658f54bb1346a94a7056959a6e3e0b1a97add9e7919a224a0cef831ee14fc19219885274c9649a3439
 DIST ethersrv-linux-20180203.tar.xz 18160 BLAKE2B 45293b596489a290146bfb5ec5ca89c06a01bd0377cb29f33f604ac84c3d1d8f18f09058dded28e38f611a19d690c0a190ec38d45498cacd90a4cbff841115e1 SHA512 522f5ce5353c6eabaac2106d43d09cf341a2da96e56ffb06c5b2d705a997986117246cf3cb2b4a4e5b2c6f1caf96dfd68d1ddc56bb6db8140aa3761c7e6e6f7e
-EBUILD etherdfs-20180203-r1.ebuild 1134 BLAKE2B cb68ca9a4dd33fac48543ce3c9d067b6969ecb9b7853287352f0fb775fd573ce80630285476c85ad13433744083535bde76692efe9e050f2baba329e7be7167d SHA512 9242a05f575142e37b376cb04298a81089ed45db5c43b07e63e922e2427c6e4607a341e87d6f536c46d575734f3689123abf7db17adad1a0ba63062909abcb6f
+EBUILD etherdfs-20180203-r1.ebuild 1133 BLAKE2B 385a15bdab6c6948c2b0daa029f149273383f9e51d61617d89e456e4a9c7783ab59a384f5cbf58a1bde5b7454f5cdf9853ea591bc9e729a836ab61d730d5fd51 SHA512 b2d509fe33ac91fcc4945bba0341c6b38a1d4e0a48d6f6ba11079e1cafb889b79d5ab0aa523aa89f2fc2a4553740541034171e42069d8cf24f0e88479fdb9cca
 MISC metadata.xml 628 BLAKE2B 098bc7b2760258e6eb715561d32f0c2674e2e0ceb4a755d1cabf695bd938f68a9a1809f232ce136a395b00b5055b7ea31bbe7db0f1206ae5a435340089a79cf7 SHA512 1a8106a9ce7418f4a118cb143dd8605a84c38376edad4583dbfafab913738dc96e26c6e24cd65e29d408cb975f2741d37303bfbf3c99d2a966376486db526dcd
diff --git a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild b/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
index d5a7bfb7698e..81bf94e65eb9 100644
--- a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
+++ b/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="tsr"
 
 BDEPEND="tsr? ( app-arch/unzip )"
diff --git a/net-misc/fatrat/Manifest b/net-misc/fatrat/Manifest
index aa5d34665c92..4a8bb83b126c 100644
--- a/net-misc/fatrat/Manifest
+++ b/net-misc/fatrat/Manifest
@@ -1,4 +1,5 @@
 AUX fatrat-1.2.0_beta2_p20150803-build.patch 357 BLAKE2B 31a7da4cd3d49f3ebab037bdc8b32708bc7454bd46ee49ee3582ffc0cad9816dc7ca575f63039c17d2e0f06a455204ccf19197a01845231362a8f6e049cb3de0 SHA512 884c79a2b40ce0aa3748df8df7e7ed5050a56cda23922c3cfbae0987a192fe1d2320d059830ed6de88f527dda87ebbc9033a73f5f12d269e93e1c3deffb0fc3e
+AUX fatrat-1.2.0_beta2_p20161204-qt-5.15.patch 297 BLAKE2B 06a07acc7a9c320eb9f52ea039220bebf86bad994d4e599b5bcdcef8f77b11fee4e0ef403397d9efb69eec7b667f90b5e66f36126f270055fab668599c14656d SHA512 ba2035f1f06ea3b36ce616be7a5b7a39c6c83446c1b3c836d4679980647348ad54c31363665428fd7d45435dfb622348be7d25d8dc46fb7ff602771974307f03
 DIST fatrat-1.2.0_beta2_p20161204.tar.gz 4988560 BLAKE2B e55b841bd5741fe81eab79847dddf084a0b193215b791c341d705d840d1658bb7978e53c3de65c23c7c1ac839b29abfceb3b71bcbb124746e841c5fb31ecba14 SHA512 d3a9816cc53fd93ef2ccd3fb5896dde5846382d40e30dc687a14379e6048f8ffc27b40c2b5c3977c6bccc912dcb054426c84c016c319174e2c2a440f9a588063
-EBUILD fatrat-1.2.0_beta2_p20161204.ebuild 1532 BLAKE2B 24d754216aacc9fa26b6b49ec616833c08bc116c3f708956fa14c2f0080cb0d479ca1a06e50c3064fab696f066ebc95ab747f476d33b4242aab2d8ed0ccab320 SHA512 bb2c8966a19f0551546b3a9b3e698676ecf97a7684b8c97aca8b4d5290ca0c5485758c6cb08171b31af44669efc862e08b66545f1c49cf996f7d50b73e041cd3
+EBUILD fatrat-1.2.0_beta2_p20161204.ebuild 1587 BLAKE2B 3a70464d07ad685c29d9e76aeec2193aaa53e4d79a13f939a90812381f9d4f28ded2b4e5f301657825bc525ae60ab59b8b6c842d00bd1be8ce7411f742b655d2 SHA512 96b2068571de2c653eef31e2a9b17b451030f9a4254dd8d6b53ff2c5ecc6bce117e8a02278a0211b4f0e8bd594da866dce7b39d47fded81ba6abdb63e599bf69
 MISC metadata.xml 471 BLAKE2B 7dc41b9e28a689ca2eaa3c68a7227406732a44216916512d0d0e45a88ada0d9e5f624ec548ae7d65c20d7c86775354003ddbe9578843da79746b528969e6d0f6 SHA512 ad697e54c2a17fd924bf31d557a71db942df499da67637e08dd5f2f8c6c5da76ed4eaef209bace83bd833a2694b7ab4956208ff8586a3e14828fd51e7532541b
diff --git a/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild b/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild
index 6a079aa56c89..c82928e3267c 100644
--- a/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild
+++ b/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 SNAPSHOT="14a1a146df76d70c44dcc38363848a5b41a364d5"
-
-inherit cmake-utils vcs-snapshot xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Qt5-based download/upload manager"
 HOMEPAGE="http://fatrat.dolezel.info/"
@@ -16,6 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="bittorrent +curl doc nls xmpp"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -34,12 +38,14 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.2.0_beta2_p20150803-build.patch" )
+S="${WORKDIR}/LubosD-${PN}-14a1a14"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.0_beta2_p20150803-build.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
@@ -50,7 +56,7 @@ src_configure() {
 		-DWITH_JABBER="$(usex xmpp ON OFF)"
 		-DWITH_WEBINTERFACE=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch b/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch
new file mode 100644
index 000000000000..def09bbd7673
--- /dev/null
+++ b/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch
@@ -0,0 +1,12 @@
+diff --git a/src/util/BalloonTip.cpp b/src/util/BalloonTip.cpp
+index c20c0ee..67b5284 100644
+--- a/src/util/BalloonTip.cpp
++++ b/src/util/BalloonTip.cpp
+@@ -2,6 +2,7 @@
+  * Based on Qt source code
+  */
+ 
++#include <QPainterPath>
+ #include "BalloonTip.h"
+ #include <QLabel>
+ #include <QPushButton>
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 54291edae0d1..0dc1f9a4c8b2 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,8 +1,10 @@
 AUX 2.1.1-write_pixel_16-endian.patch 752 BLAKE2B 6a7d28f90819a8f6d578d7c1f305141c5e189937e62bcd704d91041ea71a1121b5c60707b274dd762d524ecc9d198e74333a45f847d93d0139912082cc98196d SHA512 bf5ff1c57867106f19def3ef62da39d74239b8674ea07b8c8f404b9f47f1d9ba28460e04c13c68a19b27f933135688689b8ea4745aa7c82607c5e170da0d6489
 DIST freerdp-2.1.0.tar.gz 6869116 BLAKE2B c9cab4b571b288450efa5c5666f8cb64ca9e37dfd342d5e66c256b0fca151b20b3f9b1027a12f8fe9cbae186d95c8cb4d28c90deeadcacc3c158f50a3e713747 SHA512 86d72419d012c52a3dfa071d50bac96ddb3a1423bf35252fdef72676f8b2830b65c9e0511dea2d7b9a69e7783a3d1eacbd2f868b08836742dec7542c77a39405
 DIST freerdp-2.1.1.tar.gz 6871637 BLAKE2B b0c01fb074f28aa569d934797d4fb8451edcb90d7f5eba9e47b7ec844cc95eda143c3d851b86ef72e233e8bde8ebc3e1c4a7d3d549d0de54f774ec1fee62e8cd SHA512 6f0cff79690ca550237c6e31f5ab361246a6d12ac765e85b752d474aceaf1390d8c5f2b21aba028927459892a045e5073e143705e6f2256a2a7c8744dcf3f95b
+DIST freerdp-2.1.2.tar.gz 6838848 BLAKE2B 2ca0e7f22311b574c09b3040a95133ad99ffa0cb91bc6992bf0fa88f8aebfccda3599f3d7f14a0813256c249c1e90fbd6e907fe36f78627fbd4ab6852353ea49 SHA512 09fbd76512661e077c4baab4056c2e636cfb0067678271c6c87dc19fb035e15a463478f697f7caedc0d650089d520f97f6143e85ef1b29f12c41cbd39b8fff92
 EBUILD freerdp-2.1.0.ebuild 2862 BLAKE2B 8b56772f76dd55965acac75cf9abf4d777a008b9473da979f776f63399e4ed662801ca3490d2675d329cf8a0f4330f99c4ad5000d01372f0041aba7fe7bbd6eb SHA512 e16deeb57e4582d7b81f1824332f1449a1204a096f587ddb6253c47606cf988bf09acd546e26e8509b21beb855034908ea035c61ea2a2894c39076a43d84b96d
 EBUILD freerdp-2.1.1-r1.ebuild 2900 BLAKE2B a9e27e7d78bf14a3ccd6a8ddb74d775d7c7e235a8a7a84d3626b765dd8478a69ce65853b9cf41ed759fc0e88c21cb32c91748b18c30e11a33e5af5cbab3a88bb SHA512 821fb34853a3297a7e21aab476812e87ac9156b000ebf49a46ba484c788c94345cfc37bd784d4c540f530ef3d1805f2c5cbdeacb90101c4578844bae3440c04b
+EBUILD freerdp-2.1.2.ebuild 2945 BLAKE2B cd029f4f0137a482c9c89c096eb42253f2da530dff71411e33dfc71870b31c1ffb92720b568657af372d5c7f138a981e13cec715b5fc8cf694c01e73e5d2e235 SHA512 c30e1340aebbff2cc2c0f0db299508a7f15c905cb98378ee73fcdce60d4edb7006e53a4a358b32f8c762190c436c6337ecea3bd840bf38da279ec3cfd58cbf06
 EBUILD freerdp-2.9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
 EBUILD freerdp-9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
 MISC metadata.xml 481 BLAKE2B b7102d2ff331d4c991dbd2d20b3bd33d375fe5f332ab48f2c3401a579e584cdc4c84795a286c18536b82cd88b7b9991b3559774a937ac59ad8ccc21b91241f60 SHA512 47db413f3b78632acc874d8e67ef8231551a6074cb2269760fb780f1a86dc334bf7675550fed7a95e98a92470e3d70cfedb10f98f6ec686e785dd67615e93db7
diff --git a/net-misc/freerdp/freerdp-2.1.2.ebuild b/net-misc/freerdp/freerdp-2.1.2.ebuild
new file mode 100644
index 000000000000..0370121a8a94
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.1.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+	case ${PV} in
+		2.*) EGIT_BRANCH="stable-2.0";;
+	esac
+else
+	MY_P=${P/_/-}
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	usb? (
+		virtual/libudev:0=
+		sys-apps/util-linux:0=
+		dev-libs/dbus-glib:0=
+		virtual/libusb:1=
+	)
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	!ffmpeg? (
+		x11-libs/cairo:0=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	openh264? ( media-libs/openh264 )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	echo "${PV}" > .source_version || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DCHANNEL_URBDRC=$(usex usb ON OFF)
+		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DWITH_CCACHE=OFF
+		-DWITH_CUPS=$(usex cups ON OFF)
+		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
+		-DWITH_MANPAGES=$(usex doc ON OFF)
+		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
+		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
+		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_PULSE=$(usex pulseaudio ON OFF)
+		-DWITH_SERVER=$(usex server ON OFF)
+		-DWITH_PCSC=$(usex smartcard ON OFF)
+		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
+		-DWITH_X11=$(usex X ON OFF)
+		-DWITH_XINERAMA=$(usex xinerama ON OFF)
+		-DWITH_XV=$(usex xv ON OFF)
+		-DWITH_WAYLAND=$(usex wayland ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index e55f6ea5329a..a2b658f950f1 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -44,5 +44,5 @@ EBUILD geoipupdate-3.1.0.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d
 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
 EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B 52872fcad262f0e579aaaa692f5053756cca952d7992f5e1177a7ada17b1c93b731ca0fcd6b197be697e1fe22104b8621d93e3032ed0b9f70dc560dea6eeb815 SHA512 0dc1ed894f98a840d92f39e0f0f54686ce8742cb83e0c3b69e114e1d6389210794875d2fdc2f7053f2f86bd742536254940e30dd4a2081c9d821352299501678
 EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
-EBUILD geoipupdate-4.3.0.ebuild 2779 BLAKE2B d3ddab0b40e634f1ccc6708bd456bd79187750a675b88ba9bbbcb7f3e5f2ac305d29b18bb42c5458158e3cba9338f3323754542892768b097a95fbf703028328 SHA512 7a668cf18e79b85766a9e418fd688dd0040a68ace4c8af8dbc0256865245156ab1cd55eb66cd2b3665ae9d7a777fccc2149a3042f3f8378be2fdb374b50cd266
+EBUILD geoipupdate-4.3.0.ebuild 2777 BLAKE2B 2376a5aefab92d8a72b4ca6748f54298253c9fe3fe4f3da9febf8d77dfdf8978c6a944b090d97b1d012f56d9147da5d4b4601f54d7e661c37f64a3d780f5ff68 SHA512 a3ce19158c1d4e0ebe8d1ecae3448d4eb8dbfd5a553c8da3e5382a4c848dcf869ab6401723c6fbfabcf108de4a32e71e45162bf264a8064a9e7fd5f5d45a5495
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
index 7b41992866ca..337691eda77d 100644
--- a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-4.3.0.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
@@ -53,7 +53,7 @@ SRC_URI="
 
 LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
 
diff --git a/net-misc/ipx-utils/Manifest b/net-misc/ipx-utils/Manifest
deleted file mode 100644
index 74e7bf57cc60..000000000000
--- a/net-misc/ipx-utils/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX ipx-utils-1.1-gcc-warnings.patch 1817 BLAKE2B c82ee0b8004b1e30ebb88988ac3fcaed7648b52062841ff0cb2ed095cc48d306efa697b7d54afdee2f19fd8363db158c1950dc7e4004c026f771e44791dde61a SHA512 176b72fdabd206ddace98cc9a58b7f0bca51af395b3fd36ec8ba579ab5682d377180edca30062a6834841e556d04462808ef1a8e54bd4f643ef6560b70e8096e
-AUX ipx-utils-1.1-makefile.patch 795 BLAKE2B a476f2a4b2f1c76c91b765e007b45db893f41dc78b4decee003126e8db9f7dd23b9171d0ff3e0bc32296c6f147bdd0ab2c365bf5fae4b94e9b1e8a9a0b9fd303 SHA512 fb5f8d35eb00c762140309031f508ed6fb2591eaf9c3c841565464f1d472f93bcd2404fdb3e85e10e4c4e1652767f9ca9bdbc44c80731ce4ff3939c81f96fd1d
-AUX ipx-utils-1.1-proc.patch 426 BLAKE2B 523d56fe1ea82f18898a6c23903fba01165fc375e95e189b336c1c1c18ccfe5581ceac0bd314867fdeec1b63d73d30a2f13a79e1b6824eb2fa782202146ac407 SHA512 0af00b0ac0e40a3de1788173609a49683ecb33ec6450c296dadfd1736f95f7ae7f94d8c5ef96091c68f6eede799b83fef19a913493acc86fd92d3f9dcf2dde6c
-AUX ipx.confd 552 BLAKE2B e953dfafdec15aed36928133ca9db9bd768112f814534fa1f13ae714af955abf2f7d3ce762e9f4c6f6440f80b2e3726f9d1c435eb8804cb3760e39394deb7be3 SHA512 ba7de25e2ee3b9997d51a4eed0b8eb6ede232b627962cbc0efe6c318c1b34911cb64e4c19786e44800d8b573c8730e355e71f78aaf17391f019cc17a49c6c84d
-AUX ipx.init 868 BLAKE2B fb63b038236b76bd3ea30bc9aaa05730c2ac3a8e7418de030ccf2243d5bddfdf317e059de49b75d34261ad09b71e9d7930ab109e3ace8329728f17a15e21a419 SHA512 afbd7e506c4616cb5ae469e8c818a4ce1ebadf733e43d938d4f1911ce41cd0ffb0e65614b8b230cfffa56163b1975287e1573a70ead6d0d73c5e3c9357689004
-DIST ipx-1.1.tar.gz 8177 BLAKE2B 83eb4f480709b82cac5c83e86db614c99cbc992e9c36421c3c409a4af8d21f45672d2f82cc32b7a6ac304c89632e32ae68fdf97f374eed02f8886543f2c981a0 SHA512 cb1bcf0c28939ab5ff1e1cf36f1cb8cbfcb7c019d65df5fc56a1b43673406cdf4abffa3d6164615e42ce955f078c05f721da90ca54353870e552c01bb3c2973d
-EBUILD ipx-utils-1.1-r4.ebuild 834 BLAKE2B b5e8b6d8796f4f24374807e5a5354f3761f2a5cb0c93f413d85eb4b38fc2bde16bac4cfee743ea77d2efe6876db134859330ce86d5383914ce7fe7341ae80fed SHA512 008011de2d570c03a504b81c5007fc08c8ff487b18b1c66ed1ebd6fb036821e37d2383e0c3719e4c9aa952f0c15feded9ee896608ee228839f14562035b5234b
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch
deleted file mode 100644
index 3fc928f00e2d..000000000000
--- a/net-misc/ipx-utils/files/ipx-utils-1.1-gcc-warnings.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Binary files ipx-1.1.orig/ipx_configure and ipx-1.1/ipx_configure differ
-diff -ur ipx-1.1.orig/ipx_configure.c ipx-1.1/ipx_configure.c
---- ipx-1.1.orig/ipx_configure.c	2016-05-04 21:08:46.606264315 +0000
-+++ ipx-1.1/ipx_configure.c	2016-05-04 21:21:46.139346843 +0000
-@@ -7,6 +7,7 @@
- #include <unistd.h>
- #include <ctype.h>
- #include <getopt.h>
-+#include <stdlib.h>
- #include <strings.h>
- #include <netipx/ipx.h>
- #include <sys/types.h>
-Binary files ipx-1.1.orig/ipx_interface and ipx-1.1/ipx_interface differ
-diff -ur ipx-1.1.orig/ipx_interface.c ipx-1.1/ipx_interface.c
---- ipx-1.1.orig/ipx_interface.c	2016-05-04 21:08:46.606264315 +0000
-+++ ipx-1.1/ipx_interface.c	2016-05-04 21:20:27.414995860 +0000
-@@ -8,7 +8,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <stdlib.h>
--#include <strings.h>
-+#include <string.h>
- #include <netinet/in.h>
- #include <netipx/ipx.h>
- #include <linux/if.h>
-Binary files ipx-1.1.orig/ipx_internal_net and ipx-1.1/ipx_internal_net differ
-diff -ur ipx-1.1.orig/ipx_internal_net.c ipx-1.1/ipx_internal_net.c
---- ipx-1.1.orig/ipx_internal_net.c	2016-05-04 21:08:46.606264315 +0000
-+++ ipx-1.1/ipx_internal_net.c	2016-05-04 21:20:14.814299490 +0000
-@@ -7,7 +7,7 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <errno.h>
--#include <strings.h>
-+#include <string.h>
- #include <netinet/in.h>
- #include <netipx/ipx.h>
- #include <linux/if.h>
-Binary files ipx-1.1.orig/ipx_route and ipx-1.1/ipx_route differ
-diff -ur ipx-1.1.orig/ipx_route.c ipx-1.1/ipx_route.c
---- ipx-1.1.orig/ipx_route.c	2016-05-04 21:08:46.606264315 +0000
-+++ ipx-1.1/ipx_route.c	2016-05-04 21:20:17.954473064 +0000
-@@ -8,7 +8,7 @@
- #include <stdlib.h>
- #include <ctype.h>
- #include <errno.h>
--#include <strings.h>
-+#include <string.h>
- #include <netinet/in.h>
- #include <netipx/ipx.h>
- #include <sys/types.h>
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch
deleted file mode 100644
index 5a596f818d19..000000000000
--- a/net-misc/ipx-utils/files/ipx-utils-1.1-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- ipx-1.1.orig/Makefile
-+++ ipx-1.1/Makefile
-@@ -10,17 +10,8 @@ clean:
- install: $(UTILS)
- 	for i in $(UTILS); \
- 	do \
--		install --strip $$i /sbin; \
--		install $$i.8 /usr/man/man8; \
-+		install $$i ${DESTDIR}/sbin; \
-+		install $$i.8 ${DESTDIR}/usr/share/man/man8; \
- 	done
--	install init.ipx /etc/rc.d/init.d/ipx
--	install -m 0644 config.ipx /etc/sysconfig/ipx
--	rm -f /etc/rc.d/rc2.d/S15ipx
--	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc2.d/S15ipx
--	rm -f /etc/rc.d/rc3.d/S15ipx
--	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc3.d/S15ipx
--	rm -f /etc/rc.d/rc5.d/S15ipx
--	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc5.d/S15ipx
--	rm -f /etc/rc.d/rc6.d/K55ipx
--	ln -sf /etc/rc.d/init.d/ipx /etc/rc.d/rc6.d/K55ipx
--
-+#	install init.ipx /etc/rc.d/init.d/ipx
-+#	install -m 0644 config.ipx /etc/sysconfig/ipx
diff --git a/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch b/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch
deleted file mode 100644
index d82d228ff139..000000000000
--- a/net-misc/ipx-utils/files/ipx-utils-1.1-proc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ipx-1.1/ipx_interface.c.orig	2004-10-16 13:14:40.677964152 -0400
-+++ ipx-1.1/ipx_interface.c	2004-10-16 13:15:18.464219768 -0400
-@@ -191,7 +191,9 @@
- 		exit(-1);
- 	}
- 
--	fp = fopen("/proc/net/ipx_interface", "r");
-+	fp = fopen("/proc/net/ipx/interface", "r");
-+	if (fp == NULL)
-+		fp = fopen("/proc/net/ipx_interface", "r");
- 	if (fp == NULL) {
- 		fprintf(stderr, 
- 			"%s: Unable to open \"/proc/net/ipx_interface.\"\n",
diff --git a/net-misc/ipx-utils/files/ipx.confd b/net-misc/ipx-utils/files/ipx.confd
deleted file mode 100644
index da14fd6e6605..000000000000
--- a/net-misc/ipx-utils/files/ipx.confd
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Config file for /etc/init.d/ipx
-
-# Automatically selecting a primary interface.
-IPX_AUTO_PRIMARY=on
-
-# Automatically creating interfaces.
-IPX_AUTO_INTERFACE=on
-
-# Interface to which IPX sockets are bound.
-IPX_DEVICE=eth0
-
-# The IPX frame type to use
-IPX_FRAME=802.2
-
-# Create a special kind of IPX interface that does not
-# have a physical device or frame type.
-IPX_INTERNAL_NET=no
-
-# Network number
-IPX_NETNUM=1
-
-# Node number
-IPX_NODENUM=1
diff --git a/net-misc/ipx-utils/files/ipx.init b/net-misc/ipx-utils/files/ipx.init
deleted file mode 100644
index 891505926b63..000000000000
--- a/net-misc/ipx-utils/files/ipx.init
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#NB: Config is in /etc/conf.d/ipx
-
-depend() {
-	use net
-}
-
-start() {
-	local retval=0
-	
-	ebegin "Bringing IPX up"
-	if [ ${IPX_INTERNAL_NET} = "yes" ]
-	then
-		/sbin/ipx_internal_net add ${IPX_NETNUM} ${IPX_NODENUM}
-		retval=$?
-	else
-		/sbin/ipx_interface add -p ${IPX_DEVICE} \
-			${IPX_FRAME} ${IPX_NETNUM}
-		retval=$?
-	fi
-	
-	ipx_configure \
-		--auto_primary=${IPX_AUTO_PRIMARY} \
-		--auto_interface=${IPX_AUTO_INTERFACE}
-	retval=$(( $retval + $? ))
-	eend ${retval} "Failed to bring IPX up"
-}
-
-stop() {
-	local retval=0
-	
-	ebegin "Bringing IPX down"
-	/bin/umount -v -a -tncpfs
-	/sbin/ipx_configure --auto_primary=off --auto_interface=off
-	retval=$?
-	/sbin/ipx_interface delall
-	retval=$(( $retval + $? ))
-	eend ${retval} "Failed to down IPX"
-}
diff --git a/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild b/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild
deleted file mode 100644
index ce29d24d766c..000000000000
--- a/net-misc/ipx-utils/ipx-utils-1.1-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils
-
-DESCRIPTION="The IPX Utilities"
-HOMEPAGE="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/"
-SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ncpfs/${P/-utils}.tar.gz"
-
-LICENSE="ipx-utils GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND="!!net-fs/ncpfs" # conflicts on manpages
-
-S=${WORKDIR}/${P/-utils}
-
-src_prepare() {
-	sed -i "s:-O2 -Wall:${CFLAGS}:" "${S}"/Makefile
-	eapply "${FILESDIR}"/${P}-makefile.patch
-	eapply "${FILESDIR}"/${P}-proc.patch #67642
-	eapply "${FILESDIR}"/${P}-gcc-warnings.patch
-
-	default
-}
-
-src_install() {
-	doman *.8
-	newconfd "${FILESDIR}"/ipx.confd ipx
-	newinitd "${FILESDIR}"/ipx.init ipx
-
-	into /sbin
-	default
-}
diff --git a/net-misc/ipx-utils/metadata.xml b/net-misc/ipx-utils/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-misc/ipx-utils/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-misc/knock/Manifest b/net-misc/knock/Manifest
index 5c1ed39756f1..d24f43193556 100644
--- a/net-misc/knock/Manifest
+++ b/net-misc/knock/Manifest
@@ -1,5 +1,5 @@
 AUX knockd.confd.2 189 BLAKE2B 288c5c9e47a3001d83edd0f9d54286754fecd7d8321896370af63c0e3429a2c4004a8e99a835e558878f6b934d8c50f6ecdc5f267cd7608c59de46cfed195162 SHA512 75a483770c31f8de3744c9c3119c5cf818b9ff780bf9cffb49c1f4a78b2f384dc392218ea2a0df9fd7178a19b0b1f5a59d8a81cdb56f952cd4c8e5a91c9cf25a
 AUX knockd.initd.2 527 BLAKE2B 1c0e429d07d4023d34ae129c900161a9a681cd76761e953e3b6416fb3f5ad067b8f2e5c567887ccfc43adaa3b1a1f9e58bcb19ed660b118785db41aa45330107 SHA512 dc66e53bdc42487609d978a538dec26712f25c87b9a2e4a70e1a833fedfbacf3b8618f87cbe110ed54938f6620fd2e5f7a79143d7f8503927686dfa26eb9acff
 DIST knock-0.7.tar.gz 110791 BLAKE2B 19e63854800f4ef77199fb4005dabd749f16681068d205a924fa0bc926d2cc31a69c1f62ffa8ec335209cfa987e7db92d9332b43e971f71528f69740ced06391 SHA512 eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7
-EBUILD knock-0.7.ebuild 1098 BLAKE2B 9a5ada3e3d7ca576a5174c2f783f67b2ad240879f36c3ea399ff8108f1953c64b20af879f47849d78a522cdbd8f4628ad95c8567b3a9f18baf88dc6fa1ba292a SHA512 17d98392fe54b136c0f6adf2c5b64b4bcb2afc3db8c6c28ae11d4cc620f014c00c15839eac2540971913ac5d486bd00253423260bc6fb3d91e42e66728e6928e
+EBUILD knock-0.7-r1.ebuild 1123 BLAKE2B 6342aa37df57028fc75cffde7e6876ebd497d7ab1e1fbcfe8aa303cca3c0c4f86dda259893a4fa3952df189a8c5c22d41b1762cdaa02a7315265b79ac7ac42c0 SHA512 29be59b12c60eb33af2ed64a78fc4df90cd7bb6496f823e14b14c58d9389c3f64fe4cff36adf2572ee936f4518930ea4012a504eff6e8076f3bb0892747e659c
 MISC metadata.xml 246 BLAKE2B dba219f8b59aae4aed3685948a81fc06da8d34cbe8a59fafe7b9c503f63fbcb011514ee8734fd74928ffc93e2ab201902fb28702df8b30be5d8636e4de0ce6d8 SHA512 68d82bf2a215c76134e5dc45ed11f3db4546f21f6989513faa7792e0ba0b706688960710f1d6cee3d2f209636d3552df9ed8120edfc1609b9d7d687883becc84
diff --git a/net-misc/knock/knock-0.7.ebuild b/net-misc/knock/knock-0.7-r1.ebuild
index 2b61ae365f34..117341a6615e 100644
--- a/net-misc/knock/knock-0.7.ebuild
+++ b/net-misc/knock/knock-0.7-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-DESCRIPTION="A simple port-knocking daemon"
-HOMEPAGE="http://www.zeroflux.org/projects/knock"
-SRC_URI="http://www.zeroflux.org/proj/knock/files/${P}.tar.gz"
+DESCRIPTION="Simple port-knocking daemon"
+HOMEPAGE="https://www.zeroflux.org/projects/knock
+	https://github.com/jvinet/knock"
+SRC_URI="https://www.zeroflux.org/proj/knock/files/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="+server"
@@ -16,6 +17,8 @@ DEPEND="server? ( net-libs/libpcap )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
+
 	sed -e "/^AM_CFLAGS/s: -g : :" \
 		-e "/dist_doc_DATA/s:COPYING::" \
 		-i Makefile.in || die
@@ -38,9 +41,7 @@ src_install() {
 
 pkg_postinst() {
 	if use server && ! has_version net-firewall/iptables ; then
-		einfo
 		elog "You're really encouraged to install net-firewall/iptables to"
 		elog "actually modify your firewall and use the example configuration."
-		einfo
 	fi
 }
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 76cfb8c07ce0..753b13fce62c 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -3,5 +3,5 @@ AUX nextcloud-client-2.6.4-qt515.patch 678 BLAKE2B 767ff6f3bb4ecd9ff6e87484d8e2b
 DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
 DIST nextcloud-client-2.6.4.tar.gz 19035129 BLAKE2B 8721737a4e2515996de1910219c2d36b545e068ed5c66b2df85166646c25488f401563e113674254d9d1b1a70c19435c7c0728718e1633e8036ac1e415925b97 SHA512 849bf9bfa6a50342f6b58e805dc72ef342cb5f3e2e27d8f45d6a48759b1956dec194fb376b9a6b760df724f01eec3a22aadaa439f03e5166b1b2afb5454e40f1
 EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17
-EBUILD nextcloud-client-2.6.4.ebuild 2065 BLAKE2B df0c4509008bb3543d7e62a4edba47b0b9a826598b5c1de227a0d958626b24054db79b6664341777bdcf6636a19c0c757a09e0677fdbee561205597c73e9ba06 SHA512 f569089d81fba7bec1c4659ee7776303356283795717a522a6aac8e38e02699ce538d351716e4560b9e4ce9f28834158b0b7d284436cf99b29c022dd22585fc6
+EBUILD nextcloud-client-2.6.4.ebuild 2063 BLAKE2B 8cba515c853082f9295afe9511f59c63a52d71410247df752aa89725c4091bbbd0aeac0e99c553f8e6246076266e398af9bc14329b5d033ed735fdc3d7b6f965 SHA512 b3b809f73652286f2df1c2720b36448e0ab4bcb66485211f1f8c4ca0a404fe31e6d38e70e19a956268050f0919f7cebe671bc1c21109fb55d3f813f4c5df5b68
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
index 655fcb79a2b3..c8d32ee60c14 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc dolphin nautilus shibboleth test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index d0ffc48eab44..df2aeee40d24 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,7 +1,6 @@
 AUX man-pages/genmans.sh 1882 BLAKE2B f2da7801ad33b15486bba29832587281bab0abd472b3645d4c4291701cce041e862eac6b625e3707c872aba3bf59c9223fafc33b7ecd7bc3a50fa517c3ac2fbe SHA512 7f5161c8c25066f1a08e0c228956716aa55e2b5c54e4a67e1d9b18ffcd9bdc56e95c345ffbee9c35d974146652909b80c87a2796053b26dd0b2a0ac40afefd6d
 AUX man-pages/ntp.conf.5.patch 503 BLAKE2B 039ae4ba832249fb47e15d7782644ad8b1bdd0058fbdcb5e22404ac5a51deb9736de9cd840b7eacd4f5bd865de80a83113a898428289aa1c2fb8fda72f038666 SHA512 6e75a7900c2cde0484e57e18b1244ed188b58be54b6622c3777251a2f412a27a98c41a65d6d62d93f9e84856f211bb268bd005aca146bc27aed982daf63f24fe
 AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f177a684cab9fcc9350b225073daee9731a60dd11d712cbebb124a52337cb466174699aab5f8559d53ae1 SHA512 c4fb1333a35a803783dc209186ea9005a0e529aba96103460e23a0eca483414898037802686cfff04bf910b06eb27ba8805c460962c3626af2d0951904484cbd
-AUX ntp-4.2.8-gc-tests.patch 1183 BLAKE2B a92f418a901f65b06e154be27794cc4f8fa99bf0c19f1f8240c79682503bf9742d3ebd00e6d189884db702bb814caee6b197f4be3233eaf01d1d54c40a01e6e0 SHA512 b761776bdb0ea50781c57c19e6f132a7ba596e944e06bef53d1d9a4ab154f6c941ef1dd7b7d7130de546d59d9d6a7df25517590f015f9a91ea7fede41d95b471
 AUX ntp-4.2.8-gcc10-fno-common.patch 729 BLAKE2B 42692a4ae85bbf59d8f9ea22109b189b597234cee236d18229efb4e53181b6288c04a25f77300ca98af10fca9d15cb3df6bd962244eb40047ae6fa345b906b72 SHA512 794a2879a686423609f424fb73b7a1416cb0253b262b4c6b3bd42d9bb46441987daa87873bd343cc2987a9d65da887bb132c95c2bb1515ffb39637f9e64b1569
 AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d463b3b1c686bbdc71a225bdb97ad03703513b112b9509958c687f046df3153baab1d26d019a988c94ede796a8 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f
 AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4
@@ -14,19 +13,16 @@ AUX ntp.conf 1614 BLAKE2B 88158ad4270a7b3f42de7d3dcaa5a2dc5f7900171c0259834ff781
 AUX ntpd.confd 192 BLAKE2B f5387ba2571b238a3e4f78c11151153deb40ad0babe4728942ec0f5f87d405e95047a3a72c7f747fb52e6bfc0dc2e8da10867e83394ff07e8381fbdf0b666c26 SHA512 a9e96a214d3c21a3f4863709c48a11f9dedc73e2d83a9b20761021df44a9acb56757e77f113aa0314f5f3923e9cb26bc6e0147658d20e8a74d078d415a171d91
 AUX ntpd.rc-r1 489 BLAKE2B 6d3fe11a2ba7d04d02b24ca3acbcae5419908d12e94118bf91fca825f7561304a01dc9085cdc371b91498f6b14503c94cddeeb462b23c2b4b1017d3bfd3bd3ba SHA512 d51856ebff9160a01e1331114c5a8ea7337f9c8b570da75f36bbb29dcaf1924a40cdbbbf56e03148fc0f540103846e58d15175acf2e9d83c6b68d55c1e199734
 AUX ntpd.service-r2 207 BLAKE2B 5df5cbdde640e2686b94bf5ae952f257ec6905204aade6e0c482623187456336a5f7e4dc89fe56d929f17b16a8016e775c83f8db0bf8cfc30a819cf79da16b2d SHA512 c6425efdc046f5a8981a2ec97993d65454fe4a0c4162f8e8d873abf91280a4263509657e1d582baf5b02ce0ba536b87ca49158725f69914c9b01502f8c0e97f1
-AUX ntpdate.service-r1 316 BLAKE2B ffa7df1f3cab697bf971545cf1c60394ea456f67e2013adafdab97b4f44f93851705c3bd60e0a075c8c2b3c2f2b5d89440d63db9617dc37ac07bafe015f89e8d SHA512 156a6e48be3534ddd6e699315fa65d7ea0ee070594d7b7049962adeb8b411c0f2b919b93afe3f2976392a300792c6e6139529cc576dab6af3f8b94919af27eab
 AUX ntpdate.service-r2 325 BLAKE2B 807cef41cdaf78e582f6e77b8c992c8fed048ccb64b01152111294e4f281858815d17d90318421ba6dfcfceb49dbbbd8ae691533ff5e06ed972fb298f17d0e02 SHA512 745a9b9dd3a440b41228b1139978782dc1c2dd9a0876b5c4f9b842570fab1a6c6fd8f9e1a8b638aa7113ec863cefc17d578d8497ef4ea685ad984fc4020fb2db
 AUX ntpdate.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 AUX sntp.confd 149 BLAKE2B 8ef1da02161b1b757dcf3f34934f2455499ad1f28b0691e4b49334c5900b936a96eb91bac371e756256678ff4fbcad30239fe8753d605fc8a9c498a2fbad72d3 SHA512 28c8f1fd3a69bbdfacc2379a3ce01f254ae21fd8b91d893600086d27e5fb9cccf05d1bf62022ab26fcb53fa2080d4178961619811fd7a56f4e7502893f8ea13b
 AUX sntp.rc 484 BLAKE2B b8d829c7f1f2f9fc5e4cfd584483f31843d5b5740cf2fd89a9718fc7db86fc540406dfbf1209fbd5a1a44b3c9a2e0ffc92b28d01310a2125507489f0caf3ec10 SHA512 17b48cf31f5b15f5219d4a7f69a5eb84805bea256f8ae5b4888e56ec4de7e9a2640c7a36e236a467ecc7881a1757a12c24124697694730341f24bdeb751d8d7d
-AUX sntp.service-r2 324 BLAKE2B c94e72170f46453e94d6fb48b3ee353ba2db1bdf1903f6521219975e9a456346f8525f8016dfb10779e474e9495d7dc37ebfbf6e23b4482a6ae2396e6456796f SHA512 8626967f3bf9ef01fa5a2b7268b220ed7c518974db450a6f56316ede7b57947351171fb8ae6d28d32599e50c1d5506b4547dfd03cdbd80c5b873efb7d606cf17
 AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b920aa400cbf7db4ecbc874e5cddb778dbdca07da9cb79be327c1c0f8f296d30bb20d6b886b41084e5f SHA512 607322b6b47fc3e64e16a91e8c4114fcc1c565769e08dc872be9d9eb7c747a42c52a3ac855544cd05a3ae232463d612c1e58fcfed2d5b8f6fbdeff076f490380
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
-DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2
-DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075
 DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b338a5a24be5ba95893260c4308e48afc7364630da726d19077a50a607c3a1ac545b76fa6250ac21d18ed08a345624cd65c SHA512 6efeef479b24841dca1db09fbb6e8469cb32ecb3f84f55ac38cc1dbe5fe6354a0842649755bcf7e2cc6151c05d65ffa5445f1fc34a003f6d3df08ec9dbcbe6d1
 DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8
-EBUILD ntp-4.2.8_p13-r2.ebuild 4542 BLAKE2B fb88e178f76f757530d020a9987f8fd3f70b81e22486e8e30c997635c500795b04eb5bcfcd5cd6acfa0db7fd480f3903e65a91763cb68d9b3e3a3b77f3dde2be SHA512 bf5dddbd1d8b3b387864275b70edb49440696e846e2631227f8092e737c97d9346b1b52cbf02033f61833912907a16442fa46464098aed0ff471ba2d1f7c4914
-EBUILD ntp-4.2.8_p13.ebuild 4482 BLAKE2B d1b16d12c8f6229096d925d9764c265e74e84935d55b47c35f3a05d7eb0c68d9c9890c069c078533b61797322bf960c30c7bb8c2caa4726a528c13998bb5ab8d SHA512 d5a96d8e3f1aa99b8bcef1c3d2846e4590f272b343ea7fbd099a332b935429219db5f1320764e2c2072d6b0390ae1917a70d7d331579b5d7b25e7fd8de80a57e
+DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
+DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
 EBUILD ntp-4.2.8_p14-r2.ebuild 4595 BLAKE2B f1e6d0463c435249205a44d6215099e79278172acc560770723b293409432c265a9cb2d0a1733a2331ec453bc03fc8ae6e714aa33d403df3810d72437d12378b SHA512 7badaee6ba22252b003d3345b3cf08d2e9365f0721350279bebda13ec10e1bd8139c413947c45cb0ef63d0acc006f31d597c3cee634b1602f154a71a2daa8175
+EBUILD ntp-4.2.8_p15.ebuild 4554 BLAKE2B 53716498d82265c1db38cff06915df334754d5af5a17b587fb39e3a36ea2c78198a4c6a635e822164458f9b4c8c85cf6c514172a8444ef4fb5fc16b82d59a97c SHA512 8c946674cd2407c27d870e890a575a70cf7866a9a52941f32f599bb8d6153e34a3cfae78d78b9c9f87eaa03267baed7bc241d2e402763a88d01fa34f995a2384
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch b/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch
deleted file mode 100644
index 19f0c0f8bfe4..000000000000
--- a/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Avoid building problematic tests on platforms
-whose linker does not support --gc-sections.
-
-https://bugs.ntp.org/show_bug.cgi?id=3601
-https://bugs.gentoo.org/564018
-
---- a/sntp/m4/ntp_problemtests.m4	2019-09-23 07:19:18.545861137 +0200
-+++ b/sntp/m4/ntp_problemtests.m4	2019-09-23 07:19:18.545861137 +0200
-@@ -33,6 +33,10 @@
-  no:0:*-*-solaris*) ;;
-  *) ntp_test_ntp_restrict="yes" ;;
- esac
-+case "$ntp_cv_gc_sections_runs" in
-+  no) ntp_test_ntp_restrict="no" ;;
-+  * ) ;;
-+esac
- AC_MSG_RESULT([$ntp_test_ntp_restrict])
- AM_CONDITIONAL([BUILD_TEST_NTP_RESTRICT], [test x$ntp_test_ntp_restrict = xyes])
- 
-@@ -43,6 +47,10 @@
-  no:0:*-*-solaris*) ;;
-  *) ntp_test_ntp_scanner="yes" ;;
- esac
-+case "$ntp_cv_gc_sections_runs" in
-+  no) ntp_test_ntp_scanner="no" ;;
-+  * ) ;;
-+esac
- AC_MSG_RESULT([$ntp_test_ntp_scanner])
- AM_CONDITIONAL([BUILD_TEST_NTP_SCANNER], [test x$ntp_test_ntp_scanner = xyes])
- 
-@@ -53,6 +61,10 @@
-  no:0:*-*-solaris*) ;;
-  *) ntp_test_ntp_signd="yes" ;;
- esac
-+case "$ntp_cv_gc_sections_runs" in
-+  no) ntp_test_ntp_signd="no" ;;
-+  * ) ;;
-+esac
- AC_MSG_RESULT([$ntp_test_ntp_signd])
- AM_CONDITIONAL([BUILD_TEST_NTP_SIGND], [test x$ntp_test_ntp_signd = xyes])
- 
diff --git a/net-misc/ntp/files/ntpdate.service-r1 b/net-misc/ntp/files/ntpdate.service-r1
deleted file mode 100644
index f9bc9ddefc90..000000000000
--- a/net-misc/ntp/files/ntpdate.service-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Set time via NTP using ntpdate
-After=network-online.target nss-lookup.target
-Before=time-sync.target
-Wants=time-sync.target
-Conflicts=systemd-timesyncd.service             
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/ntpdate -b -u $SERVER
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/ntp/files/sntp.service-r2 b/net-misc/ntp/files/sntp.service-r2
deleted file mode 100644
index 9bdd578ffbc7..000000000000
--- a/net-misc/ntp/files/sntp.service-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Set time via SNTP
-After=network.target NetworkManager-wait-online.service nss-lookup.target
-Before=time-sync.target
-Wants=time-sync.target
-Conflicts=systemd-timesyncd.service             
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/sntp -s $SERVER
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/ntp/ntp-4.2.8_p13.ebuild b/net-misc/ntp/ntp-4.2.8_p13.ebuild
deleted file mode 100644
index 6656edb76903..000000000000
--- a/net-misc/ntp/ntp-4.2.8_p13.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs flag-o-matic user systemd
-
-MY_P=${P/_p/p}
-DESCRIPTION="Network Time Protocol suite/programs"
-HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-
-LICENSE="HPND BSD ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
-
-CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
-	>=dev-libs/libevent-2.0.9:=[threads?]
-	kernel_linux? ( caps? ( sys-libs/libcap ) )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	parse-clocks? ( net-misc/pps-tools )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-ntp )
-	vim-syntax? ( app-vim/ntp-syntax )
-	!net-misc/ntpsec
-	!openntpd? ( !net-misc/openntpd )
-"
-PDEPEND="openntpd? ( net-misc/openntpd )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
-	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
-	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
-	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
-)
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-	append-cppflags -D_GNU_SOURCE #264109
-	# Make sure every build uses the same install layout. #539092
-	find sntp/loc/ -type f '!' -name legacy -delete || die
-	eautoreconf #622754
-	# Disable pointless checks.
-	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
-}
-
-src_configure() {
-	# avoid libmd5/libelf
-	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
-	export ac_cv_lib_elf_nlist=no
-	# blah, no real configure options #176333
-	export ac_cv_header_dns_sd_h=$(usex zeroconf)
-	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
-	# Increase the default memlimit from 32MiB to 128MiB.  #533232
-	local myeconfargs=(
-		--with-lineeditlibs=readline,edit,editline
-		--with-yielding-select
-		--disable-local-libevent
-		--with-memlock=256
-		$(use_enable caps linuxcaps)
-		$(use_enable parse-clocks)
-		$(use_enable ipv6)
-		$(use_enable debug debugging)
-		$(use_with readline lineeditlibs readline)
-		$(use_enable samba ntp-signd)
-		$(use_with snmp ntpsnmpd)
-		$(use_with ssl crypto)
-		$(use_enable threads thread-support)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# move ntpd/ntpdate to sbin #66671
-	dodir /usr/sbin
-	mv "${ED%/}"/usr/bin/{ntpd,ntpdate} "${ED%/}"/usr/sbin/ || die "move to sbin"
-
-	dodoc INSTALL WHERE-TO-START
-	doman "${WORKDIR}"/man/*.[58]
-
-	insinto /etc
-	doins "${FILESDIR}"/ntp.conf
-	use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726
-	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
-	newconfd "${FILESDIR}"/ntpd.confd ntpd
-	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
-	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
-	newinitd "${FILESDIR}"/sntp.rc sntp
-	newconfd "${FILESDIR}"/sntp.confd sntp
-	if ! use caps ; then
-		sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die
-	fi
-	sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die
-
-	keepdir /var/lib/ntp
-	use prefix || fowners ntp:ntp /var/lib/ntp
-
-	if use openntpd ; then
-		cd "${ED}" || die
-		rm usr/sbin/ntpd || die
-		rm -r var/lib || die
-		rm etc/{conf,init}.d/ntpd || die
-		rm usr/share/man/*/ntpd.8 || die
-	else
-		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
-		if use caps ; then
-			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
-				"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
-				|| die
-		fi
-		systemd_enable_ntpunit 60-ntpd ntpd.service
-	fi
-
-	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
-	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
-	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
-	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
-}
-
-pkg_postinst() {
-	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
-		eerror "The notrust option was found in your /etc/ntp.conf!"
-		ewarn "If your ntpd starts sending out weird responses,"
-		ewarn "then make sure you have keys properly setup and see"
-		ewarn "https://bugs.gentoo.org/41827"
-	fi
-}
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild
index a50710aa1a3e..b2cbb8b926a9 100644
--- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild
@@ -47,7 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
 	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
 	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
-	"${FILESDIR}"/${PN}-4.2.8-gc-tests.patch #564018
+	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
 )
 
 src_prepare() {
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index c5b0860b87a2..87bf8db835ed 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -10,7 +10,9 @@ AUX ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch 536 BLAKE2B cac17041a05d0
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9
 DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e2aab5fb45cc15cabca30462bd03db7b9ecc140826c5d7b5e26f49b48f7f2b6043bdc2ffa1d73167347fb8123f SHA512 0920f25adf68f1b8ccd1734c5d61ba1c858cd86b342db7b5155dd9b58e538aa96aad3fd4058597f079ec3df63cb51d2900ac8e6d9c84d6f2bd4a3a22cc0c967c
+DIST ntpsec-1.1.9.tar.gz 2606066 BLAKE2B bbc482333c7f86936fa20751df1b427bc24be159969050caf5751e26724714bbf6491b120986563497f015c96ac9cdbdf0e999c6446a68798aff23076f631ecc SHA512 e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b
 EBUILD ntpsec-1.1.7-r1.ebuild 4157 BLAKE2B 9c992edfdb1ce011c07190c1f91da6eae3f8dada516587a94ea9a5aa2feedfc904583b63bca288df2301d8b2ae58d7353a822ee9ece4c34c99243076f776b0a2 SHA512 8afda370b45d2048f10c7f3122d67af4c45204b021a5ad62e686c35c79c59fed627cedb6d39653560354b692614222bbafd46938a2620a423defa6816f170f13
 EBUILD ntpsec-1.1.8.ebuild 4345 BLAKE2B 5912cebcb1f7315538293b3c0c332abaa43525b2d78c89d8d1bdda102bdfbcfb2c01a48ce599911952708ffac64a25607844d198d0f2bd43175f749fcf96a3bb SHA512 239de4704281175438c76099ecb03726ce467c811077e2d11b11671ebde6d102ecdf50838eaeae94484daa4af48bee5b2e336df440888f64fc4e599d8da69702
-EBUILD ntpsec-9999.ebuild 4069 BLAKE2B 4ba68e1c227e7baf2b3a9305dae9eb756333bc863ec10a0f0c7b98c91327f6e0727e4cd510ef63f36d93971a004f2cf7e46fde753928456e38eb92d4856b767a SHA512 c9be282b8b99060c6f9ca84c3a07e692b99c0e278e5f6848403f911b1830212f1a67ccb8b1ffe024d9a37efa24e8f1da7fc31271fcdc9415b8799d9845eb1b03
+EBUILD ntpsec-1.1.9.ebuild 4056 BLAKE2B c47d9c0fe4c01f1d66f1dc115f801cf95a6d8a7646f621c6e127b898581eb211520ea63e2eef43999039c32d6cc2eafd15fe8721ef4a5484e3528658ab11385f SHA512 c64b7cac7418191e75aa827e800f535a193165f5395215ffa3aca99a6ed0675d5a5c060eb5a3ed662882f2b3911977b918fe9366b49c7a7053f2f186ec60c1d5
+EBUILD ntpsec-9999.ebuild 4056 BLAKE2B c47d9c0fe4c01f1d66f1dc115f801cf95a6d8a7646f621c6e127b898581eb211520ea63e2eef43999039c32d6cc2eafd15fe8721ef4a5484e3528658ab11385f SHA512 c64b7cac7418191e75aa827e800f535a193165f5395215ffa3aca99a6ed0675d5a5c060eb5a3ed662882f2b3911977b918fe9366b49c7a7053f2f186ec60c1d5
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/ntpsec-1.1.9.ebuild b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
new file mode 100644
index 000000000000..0692e84af87d
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-r1 waf-utils systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+else
+	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
+	RESTRICT="mirror"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea neoclock modem
+	local)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+CDEPEND="${PYTHON_DEPS}
+	sys-libs/libcap
+	dev-python/psutil[${PYTHON_USEDEP}]
+	libbsd? ( dev-libs/libbsd:0= )
+	dev-libs/openssl:0=
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="${CDEPEND}
+	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+	!net-misc/ntp
+	!net-misc/openntpd
+	acct-group/ntp
+	acct-user/ntp
+"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )
+"
+
+WAF_BINARY="${S}/waf"
+
+src_prepare() {
+	default
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript
+	if ! use libbsd ; then
+		epatch "${FILESDIR}/${PN}-no-bsd.patch"
+	fi
+	python_copy_sources
+}
+
+src_configure() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	local myconf=(
+		--nopyc
+		--nopyo
+		--refclock="${CLOCKSTRING}"
+		--build-epoch="$(date +%s)"
+		$(use doc	&& echo "--enable-doc")
+		$(use early	&& echo "--enable-early-droproot")
+		$(use gdb	&& echo "--enable-debug-gdb")
+		$(use samba	&& echo "--enable-mssntp")
+		$(use seccomp	&& echo "--enable-seccomp")
+		$(use smear	&& echo "--enable-leap-smear")
+		$(use tests	&& echo "--alltests")
+		$(use debug	&& echo "--enable-debug")
+	)
+
+	python_configure() {
+		waf-utils_src_configure "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	unset MAKEOPTS
+	python_compile() {
+		waf-utils_src_compile
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+src_install() {
+	python_install() {
+		waf-utils_src_install
+	}
+	python_foreach_impl run_in_build_dir python_install
+	python_foreach_impl python_optimize
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
+	newconfd "${FILESDIR}"/ntpd.confd ntp
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
+
+	# Prepare a directory for the ntp.drift file
+	mkdir -pv "${ED}"/var/lib/ntp
+	chown ntp:ntp "${ED}"/var/lib/ntp
+	chmod 770 "${ED}"/var/lib/ntp
+	keepdir /var/lib/ntp
+
+	# Install a log rotate script
+	mkdir -pv "${ED}"/etc/logrotate.d
+	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+	# Install the configuration file and sample configuration
+	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+	# move doc files to /usr/share/doc/"${P}"
+	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+pkg_postinst() {
+	einfo "If you want to serve time on your local network, then"
+	einfo "you should disable all the ref_clocks unless you have"
+	einfo "one and can get stable time from it.  Feel free to try"
+	einfo "it but PPS probably won't work unless you have a UART"
+	einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index deb37a522fed..0692e84af87d 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -11,12 +11,10 @@ inherit flag-o-matic python-r1 waf-utils systemd
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-	BDEPEND=""
-	KEYWORDS=""
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
-	BDEPEND=""
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
@@ -36,7 +34,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
 CDEPEND="${PYTHON_DEPS}
-	${BDEPEND}
 	sys-libs/libcap
 	dev-python/psutil[${PYTHON_USEDEP}]
 	libbsd? ( dev-libs/libbsd:0= )
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 21f6cac5c3a1..f91e5b0dd3bd 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -3,5 +3,5 @@ AUX oidc-agent-3.3.1_install-perms.patch 1773 BLAKE2B 8fad809127230af52849da4d49
 AUX oidc-agent-3.3.1_makefile-toolchain-vars.patch 722 BLAKE2B b2e00b8b5ef2e70df4878228bc5e690e764052cb34bd8d0db74fc34374e7da4a2924ea3b1d0e422204da2e27a0bbe0baf3b8f1ff683f9b1be2df87ec2efbfc28 SHA512 04975fa76b56b998bdaf9dd1f9f2586a3df5690a318cd7741f3c542f2d9b5dc675e446770de53fb36cce0348d8f57d07618375384dcf11b8712a0608e48c3818
 AUX oidc-agent-3.3.1_test-suite-buffer-overflows.patch 1526 BLAKE2B ec623853da106f60a58814181c80786bea8ec8c02bafbcf7d1ac840723ddbf77aaf810ea5b06a62aaa4268aafd3c6c5a821d25eeb656e66393012c6b338afa18 SHA512 a9f4f50eaff99e077ac3cd1290ba45e59f6a538694919f87b3c2467b498a95fac76b84f875f92d9575516d5581cd2dfbcc9602c978ac2fd591d8dc8aabb7499f
 DIST oidc-agent-3.3.1.tar.gz 764721 BLAKE2B eea09b3b140ca81be0f3dc8f200120287682ddb328275be35bd736249b72eabb40c87ebd168e51c992ccd4b4a02138e17d3e20f3cebfb4d42bde01351aacead1 SHA512 75428bb52c0cf43256fddd3b33895d7c882ced367543763c68a385448dbe29805ee1fc035f3727e743a607ed4af851ae5db24b40cc6801fc31e45b6fec16bd66
-EBUILD oidc-agent-3.3.1.ebuild 1407 BLAKE2B e2cc4ea9c139189da68f908ed87209cb34458cbe188c5acaab5a0de8c4d3def90118ad96fb3438a52abdfc61da98ea248219f943cb8d1702593077b7d3e39a8c SHA512 35ffd6d176f5a6c9c9471e5c226cfe107edfd17b8a64cc6a7f7f9875b2e8c050c8215c1471e41feba49078f560d77f311fe84b654c8ba995f9d19384098bfca5
+EBUILD oidc-agent-3.3.1.ebuild 1480 BLAKE2B 0f4b36ef804e8bcb36f348ce49f2a68a624662eec6458f395e9c8a10ede2af28a6521c41807c42067d8c5dd0aff9e2fa6a7491644a5db082418b11bf9941e362 SHA512 e54e1cfc67d08ff943fcc89f9fa38e9a8f414af084baa8804c0ab2ee6d6a99a084f0a6e7e0be34c8f87ec78ac0a99f6b9ddd4fa80d52ee8f3d273736ada0b10e
 MISC metadata.xml 779 BLAKE2B ef7a040559363a8012380b3f8568f963a612078c2d5e5129f54db724d414d6c7864e79e480eba5574fd36847caa13a09a7ac7013f5ceb406d83e3be5ebdb47e9 SHA512 f9465b4e88418ec276071683b5abbe8f7601e54daf0cb74da2d24d142e2307b1bb994ee4191eee48ed1b3fef724ad49b548cef12cc4c77088c2f2d07e1b8a776
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
index 12161b8e9044..ca748e52e6d0 100644
--- a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit xdg-utils
+inherit flag-o-matic xdg-utils
 
 DESCRIPTION="oidc-agent for managing OpenID Connect tokens on the command line"
 HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
@@ -16,7 +16,8 @@ IUSE="test"
 
 DEPEND="app-crypt/libsecret
 	dev-libs/libsodium
-	net-libs/libmicrohttpd"
+	net-libs/libmicrohttpd
+	sys-libs/libseccomp"
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-libs/check )"
 
@@ -30,6 +31,9 @@ PATCHES=(
 )
 
 src_compile() {
+	# Bug #728840
+	append-flags -fcommon
+
 	# Parallel building doesn't work
 	emake -j1
 }
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index a66d9b5a5d1d..869e227012d1 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -8,4 +8,4 @@ EBUILD openntpd-6.0_p1.ebuild 2964 BLAKE2B 3c46ec39de60ac3b58f52b23f3c196077e6bc
 EBUILD openntpd-6.2_p3-r1.ebuild 1815 BLAKE2B 7122205d5d6cc366b95a7023d475bb6e9bd403f889e02548056aeaa50c29f62bd70e2b5f27414f54a2e5bb34bc27c646cb23c4d631bacb1f9e84316e46e20e1d SHA512 af6eea8a35f132544bcb47d522353230468e395d283e041543cc65f511f06a7235be08d2a7989edf7ab3019128364f55cc52f012c25f79f6dd5130b2c20c494a
 EBUILD openntpd-6.2_p3-r2.ebuild 1884 BLAKE2B 8c88f18c82e3b7062894d4bab696521e0854245ea1042bb83e973b1c1977cf74e5472c501a3ebe211144564b4b59932677e157aadbf7f37d74d2219abde3ca6f SHA512 2c08fc759450c137915e9be6f43e3208e2408171f1a0b71744032e778e7b32fac903a3c8fa631e2e67d77cebbe052b748cd6ff3fb339c83371a5bff0cd7e9c16
 EBUILD openntpd-6.2_p3.ebuild 3135 BLAKE2B ad1cf55027141cfe2e571788802f92844f2792d21dc551119760a72de2b7e41cef7aed7028e1071866de828f9cd5b70cb8a214cb16d87b2db26b9147102d7ee7 SHA512 c2f99c14eff42f9ad674b45636cb7b28686adee52d5037a79694356d18770c6d2d9766eece06efe99272f13356bd944b76db650420c9ed1069ca726c6c9cad8a
-MISC metadata.xml 875 BLAKE2B 896cd59152c8cb04bf21cc8845606dee6b5e59542cbcc386771c8f713ae4cbfcdf63347f5d55854f53b26f1533ad5ecdb5e763a20ec636634361c8634894ef13 SHA512 a7817eb4847542787337abca3d184b396c4ae831aee29edc6cb5f666189da76d9282aa71cea3033261e682eb2cb00fc858f85fc4421f52dae798bec44194e361
+MISC metadata.xml 753 BLAKE2B 7881f37b5fe2009a86939eee0c579be8db7ec7ad63a565318dff4a382ce09ebf47575de20112cae24d16e74b992fe7c70cf129c06ab69af514d0b3aa42b0c2da SHA512 34a656cccd278363c5e08c65d90dd4f36e41414e48fcf924ab41bdee826da358e48b70190a882e21b5eabba8c3ff733f75a384c69013d450fb3d9c0517883b72
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index 1db33088e0cf..f5534c78e2f8 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -5,10 +5,6 @@
 		<email>henson@acm.org</email>
 		<name>Paul B. Henson</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans (proxy)</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 3d67d1d6ab10..3a4d3e0560ac 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1,4 +1,3 @@
-AUX 0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch 3129 BLAKE2B 5beafb31039c384adaae1b8c95077bb9c1af250e78447a1cad78fbd689ee3465fe321a80ca55b91a41e3ca1ef72cda44602dd3494dd5e368e58346e02eb88ed5 SHA512 3153e2335be9dcd4f07e4b7a84d4755d15c4d7e28735016901bb5c63ccf4e4b3c66fa200907720dfd2b4e0a011ed812b5c52bfcf9b38f9aeda5781c0d71ecd9b
 AUX openvswitch.tmpfiles 40 BLAKE2B df482f24d2c48d54b6cabb1f0a37fcb193c9da71d9ae2eab0dd9a15209462e118a7160411d6d0cdb10f1721f0a86b689dd9c286325ed965ac1a510ae0af791a1 SHA512 020aaa9599b853d75a612f7bbd4ef8ea024908f283afe5c727f5d2a1f3a5a98634f82d840b3ebf886b9a82e9c60c237ced2fb13057bc7bb9ab5c449e11b51997
 AUX ovs-delete-transient-ports.service 272 BLAKE2B 4ee3767f84b4f47fe0d01aa9aaff35c9ca2be5afa6ba0f595d37ab0cdb4ccbdd7abcfb2a9c91a04d7820d1819f7757c7de569dd62cdc6c76cf533c27908f3471 SHA512 045f9c59275c555eb83c15e7cc0af4db3e9cd834385b4bbca35f5863e8432a0cf2038d10b8a55ad90a180b386a4bd0962ddcc401b4f3cf55b7e398e0683cc0f8
 AUX ovs-vswitchd-r1 436 BLAKE2B 3660edee0906e3bd7fb1715601eb08567fba2ccb20a9b25b7ef250f130737d903acd187b35cb487a4141396ef3b7746d296ab613477b7fe907f1c6bb4c3da85d SHA512 7a98f85251a7b60d93a28ade482669537585fc05265cc51eb61e283739537df980230bd5f9dccfdb60772afe3f0bf2493eed9a25b289c7ef37d998e8ca5ec4df
@@ -11,10 +10,6 @@ AUX ovsdb-server.service 480 BLAKE2B 5192dfe98551bbd81eead18a7eaba70ff0901bf2cab
 AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2599f5a405f6f7e30e1d550090b9debc2262da674b9d04d3be16aadf375ca2031e74056433c1ce20818 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa
 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
-DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d3af79cce53436d75e0c3d8a38ce408a142f99b936a66c8bf0f3b317970ad8c1ef84bacc2e573e9b8c21b70aab1de485 SHA512 fd64ae814d85d3002d655a330268cfd6be79db6f954c132d3bfafc7dac23533918b642d0ed454e760f5820804bdff64f73ee8c36afc25a6810ef4c7aab748ba1
-DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564fdc890035ce3984e1754b9dd916e0b78bea133331b5f4bc3a85d8b8a902ab210703feb0b7cce279803f642f9ee9f87bf SHA512 de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789
 DIST openvswitch-2.13.0.tar.gz 7233892 BLAKE2B 66dfeb8a5dd61538360b319cfccbe49273298d6cb20df2105d1db7eb4d01f40d54ec8792a7f80d9ffc767f9b28ae09fee6aa76ac3d97be6fc43f3e7f3b2a63bd SHA512 3fcd15d07925273e0c45e6b1e70b2cd9998f753e8d1a11fd0de1d1511ad56dfddedbba436bb1c347b4afb84eb9cd6fc52c3d445b710a89d599d2ff47ed46f17c
-EBUILD openvswitch-2.10.2.ebuild 4396 BLAKE2B 842b1b82753a3b970bcd22848e45d63997546229bb5551a38aaf7f20affdfb71a17fb7bd4b8036e7bc108be6b556f7a630597b63a75f550a2727bb3785f98aa2 SHA512 9bb48966b9fb99d11ec01de2ffd924353a0fef145edeb021ce267708df91c64d57546618a66470494ebbcb950127f5f0cc88f6609004c7f330daa838fbc6b360
-EBUILD openvswitch-2.11.1-r1.ebuild 4480 BLAKE2B 8470a55f5ad20de6dc3c241e19eb0fda32f665eb90f8dc1cbbc0aecca603b902b3eaad696533c00b05b8aa3cc87d2491e31b91ffe5e44b255706a1705c16b90b SHA512 908cba577cab3fcf7abed4f5c277ae3845855ca857704948caa9c7ba3029a2722c8bdb020cf71cedd9cbfe19af94035f325f8a03ca7eecb48ba42d871cd851fe
-EBUILD openvswitch-2.13.0.ebuild 4406 BLAKE2B b06beaded1293f17fcce6e753ebe5e13af064123305cc692b05b57556f971e98dcc821297f46344b79339fb3727318fd8b5641ae627dacc16f80e5135ca10d06 SHA512 2ab26767f98441655658ed2498915232148bc4ddba88f184071c84abf79d1507b6b5dab2d7ea54360c2f1ddea1c0e93ae6481c30aae22d334c9ec33648b0e74a
+EBUILD openvswitch-2.13.0.ebuild 4405 BLAKE2B c526b9667212e53c6ca463403eb69f24750f42c29f91ce0dff2759d22c22b5dcb4a9a25410fbad3690c85dbad4e185297a419b3d0c5c56ee76ad063fc77b7552 SHA512 52c8c6963788f27bf444e342ad370568516a0717466d5e787a3064b07a987a1620dfa4e601ecf927d75b11cdcc6d53d0f2ba1229f49a1e1d796c6a29cb0df5a7
 MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36
diff --git a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
deleted file mode 100644
index 1f77ab54b0ad..000000000000
--- a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <zhouyousong@yunionyun.com>
-Date: Fri, 3 May 2019 15:03:24 +0000
-Subject: [PATCH 5/5] datapath: conntrack: fix include for
- IP6_DEFRAG_CONNTRACK_IN
-
-The enum definition is now inside include/net/ipv6_frag.h since upstream commit
-70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was
-backported to stable trees (4.9, 4.14, 4.19) only these days.
-
-The error message
-
-	  CC [M]  /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c: In function 'handle_fragments':
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:8: error: variable 'user' has initializer but incomplete type
-	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
-		^~~~~~~~~~~~~~~~
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: error: 'IP6_DEFRAG_CONNTRACK_IN' undeclared (first use in this function); did you mean 'IP_DEFRAG_CONNTRACK_IN'?
-	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
-					^~~~~~~~~~~~~~~~~~~~~~~
-					IP_DEFRAG_CONNTRACK_IN
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: note: each undeclared identifier is reported only once for each function it appears in
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: error: storage size of 'user' isn't known
-	   enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
-				 ^~~~
-	/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: warning: unused variable 'user' [-Wunused-variable]
-	scripts/Makefile.build:326: recipe for target '/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o' failed
-
-Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090
-Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com>
----
- datapath/conntrack.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/datapath/conntrack.c b/datapath/conntrack.c
-index a7dc9e0c3..69bda5a9c 100644
---- a/datapath/conntrack.c
-+++ b/datapath/conntrack.c
-@@ -31,6 +31,7 @@
- #include <net/netfilter/nf_conntrack_seqadj.h>
- #include <net/netfilter/nf_conntrack_zones.h>
- #include <net/netfilter/ipv6/nf_defrag_ipv6.h>
-+#include <net/ipv6_frag.h>
- 
- #ifdef CONFIG_NF_NAT_NEEDED
- #include <linux/netfilter/nf_nat.h>
diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild
deleted file mode 100644
index 8a2e1ad91031..000000000000
--- a/net-misc/openvswitch/openvswitch-2.10.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils linux-info linux-mod python-r1 systemd
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="https://www.openvswitch.org"
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
-	dev-python/twisted[conch,${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux[caps]
-	virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		# docs state 4.17.x code states 4.15.x
-		kernel_is le 4 17 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	# monitor is statically enabled for bug 596206
-	# use monitor || export ovs_cv_python="no"
-	# pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	# flake8 is primarily a style guide tool, running it as part of the tests
-	# in Gentoo does not make much sense, only breaks them: bug 607280
-	export ovs_cv_flake8="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	local SCRIPT
-	if use monitor; then
-		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
-			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
-			python_foreach_impl python_doscript utilities/"${SCRIPT}"
-		done
-		rm -r "${ED%/}"/usr/share/openvswitch/python || die
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED%/}"/var/run || die
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
-	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
-	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	# only needed on non-systemd, but helps anyway
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
-	if [[ -e "${db}" ]] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
deleted file mode 100644
index 715a907910b9..000000000000
--- a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils linux-info linux-mod python-r1 systemd
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="https://www.openvswitch.org"
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
-	dev-python/twisted[conch,${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux[caps]
-	virtual/pkgconfig"
-
-PATCHES="
-	"${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-	"${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch"
-"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		# docs state 4.17.x code states 4.15.x
-		kernel_is le 4 18 999 || die "Linux >= 3.10.0 and <= 4.18 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	# monitor is statically enabled for bug 596206
-	# use monitor || export ovs_cv_python="no"
-	# pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	# flake8 is primarily a style guide tool, running it as part of the tests
-	# in Gentoo does not make much sense, only breaks them: bug 607280
-	export ovs_cv_flake8="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	local SCRIPT
-	if use monitor; then
-		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
-			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
-			python_foreach_impl python_doscript utilities/"${SCRIPT}"
-		done
-		rm -r "${ED%/}"/usr/share/openvswitch/python || die
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED%/}"/var/run || die
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
-	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
-	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	# only needed on non-systemd, but helps anyway
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
-	if [[ -e "${db}" ]] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.13.0.ebuild b/net-misc/openvswitch/openvswitch-2.13.0.ebuild
index d55555327d0d..41b9b1b021a5 100644
--- a/net-misc/openvswitch/openvswitch-2.13.0.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug modules monitor +ssl"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 370056995abe..41ba145e4a98 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,7 @@
 DIST putty-0.73.tar.gz 2459115 BLAKE2B 594ad1ebd66bdb27ac8d297525c0c5d846f8a15f7c9c5e750da8a57b08367b5c94a9d1439d6a42862e7e7b7a7d7c0dea285e9197fa45651d9eb12757b57e82a7 SHA512 4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5
+DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5f0e962c472b109afc1a54854d30123c4732f9b9e8ba28d9324508894faaa78f3b484c99c0063d1ea2f499b7 SHA512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.73.ebuild 1582 BLAKE2B 922b7caec11440dc2a07706c8bfd26de95cb91295311736a12df3135aec50873ed1d8d76a0d6dcb447747062b936bff790591a000e24c88dfff1fb895ccc727e SHA512 4275e021f15f898346445fd97563486b6489c478b39a67e106fd2d8d166b6a6036386158c5b42656390dc4743b4b58ec1396c4f76650ae9f83c4182b1d827aa3
+EBUILD putty-0.74.ebuild 1588 BLAKE2B 8945b86e6aeaad3e5c8d0ed2228a4acb873192e0c08727f11037f8ec6f81fdbd0d75c08a19a2bb722f9a90281b926e710a358400f737610b397614c12392daa9 SHA512 b245a8a467f4ede02ed71c185f2c6923bd12cc67db71ea234f982e907441491436c6bdc4d112f7224bb4728359c08071ccd91fc0197e35f91a1d0e24e847385b
 EBUILD putty-9999.ebuild 1693 BLAKE2B 7f8e29cb9624afb649639374e42269c5e72dcb9eb329e1c40d0eac20bb7ca4a0d8bd903a2d71412eb81733167745fabe27f0699627f5f125a128fe1ade7107fa SHA512 16c7df06d0309f1d3c3df3119dcb72c842451e188203a67c2fcf7409e781f2faa9dcd76cfb31b40526b3d3a00ed8e6842d84727d264cac0374ac6aa036e9e505
 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/putty-0.74.ebuild b/net-misc/putty/putty-0.74.ebuild
new file mode 100644
index 000000000000..07d0f147a344
--- /dev/null
+++ b/net-misc/putty/putty-0.74.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gtk gtk2 ipv6 gssapi"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
+	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
+"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/libX11
+		x11-libs/pango
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3[X] )
+	)
+	gssapi? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-Werror||g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	econf \
+		$(use_with gssapi) \
+		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
+}
+
+src_compile() {
+	emake -C "${S}"/doc
+	emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+}
+
+src_install() {
+	dodoc doc/puttydoc.txt
+
+	if use doc; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	cd "${S}"/unix || die
+	default
+
+	if use gtk ; then
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_postinst() {
+	use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && xdg_icon_cache_update
+}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index c47e833559fb..8fb358574e5e 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -15,5 +15,5 @@ EBUILD rabbitmq-server-3.7.13.ebuild 3105 BLAKE2B 61175864b1b7eab693fdfcf16ff117
 EBUILD rabbitmq-server-3.7.24.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2
 EBUILD rabbitmq-server-3.8.2.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2
 EBUILD rabbitmq-server-3.8.3.ebuild 2160 BLAKE2B 1ea1fb4a67301f670fc1c256dc2c32ea3f833e0b02adace4a1e34e03a4d5509d9e3e931385697b9dc749e0f24a70974ef0161798743fcef9106f0395c1953717 SHA512 ab51c206eb5d2d9c395aabc016b691784364b2220fea1feacdbf559ba809402491ba5282c513d312f82b897d36ccad9b8e15837bb6ed69d5f2484315b8959786
-EBUILD rabbitmq-server-3.8.4.ebuild 2369 BLAKE2B 729883c5f0e18572e907f5eacf98af095cf1eb58595e5479ef1e943944bf10e03d0ad026205788ead6882926f9b386028c10a7bb4de8acd5cb02a8ce63bea5bd SHA512 ce48169cda8a45b85bbd2e0937133c2c2bd45e03574d1bc8e5ab0e2713652b63fdad553c4370352d7972cedc5b59751bfc34d8a2561eeb6a877fb780b9b8b01d
+EBUILD rabbitmq-server-3.8.4.ebuild 2376 BLAKE2B af252dc508def8a6902923deccf85a3308de5c10b973d572b5f6d34916c84e5e8f7543acd42237fc586b35ee0ceda3b678880e49fdeae27f2005ec1a43ef3344 SHA512 028fe0378e8ae3aa6ad729d6886359ea69269d5c1d78098f30047c964df88c55badde3e410469acda81c0b2d41d76abaffed41a2079fe6d9a362525f0b98a596
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
index dacf415d4e71..34216e4b9ac2 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/ra
 
 LICENSE="GPL-2 MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 93c7eccda049..18b5e564ba64 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,8 +1,6 @@
-DIST rclone-1.50.0.tar.gz 18566931 BLAKE2B cfaf983ae972606b8ccc56ba505aec65bd7e6427f0b16f7e6187b079116b47eb3d297a99b505782c2bb5b64a5c8bf4e5b7beaee9dad5718ec952033ceca0945c SHA512 df805dc711ecf60b869ec957d224676643bcb6eac756470d2194338b9cc34e2a657d286d4a4308c743847fc11aa821b106888eb6ab9f04677bc70747c73fc5c1
 DIST rclone-1.51.0.tar.gz 18835242 BLAKE2B 5798a844c893e111e73ae409adcb06fd4291df3c0319bf983f2336ada45a60df253e750397bead55278cbb497c541a63498f695ce03af7b6cc1056f022ad2748 SHA512 b0881e09b75093abe4d31e95425a90513aed4a16d9e2dbf79023c9dc68875b90a1332204879530c450a16ab9cac475d967f7657d6f810a1e0f0d84b88d7de916
 DIST rclone-1.52.1.tar.gz 20029046 BLAKE2B 0dc7deebf1d362c1b7ad466991c3fc481c62d4c5803e5fa768dbe09adecfc79c2af9dcc19e7621542b464325b03be1390eff54d165c8c899c48adfac63b6cd7a SHA512 bbd305074071986cf6fb8146c634e35c28e1ea8ce2ce95507c55b95cb19eb3b1453dfb11e365bef5948978328d91df44b936b866c49db26149a17f5ca451ba15
-EBUILD rclone-1.50.0.ebuild 859 BLAKE2B c84444316be2f96809efb9e2ed04eb00e6a83f99f2b41982b96f3cfb9e268fcfd6b5f9a4c615247f026a922644365291b92d9b0327a9814e9a7258f22786b564 SHA512 0bdf451731b68b2a2be681fef6cfdbd58846939fb843310c0a3b59cb402b6cc96075395c1b5ccfb8e4dc3d088b449fcb7f538bed779ba97aa9298db52ba7cdcb
 EBUILD rclone-1.51.0.ebuild 866 BLAKE2B 9e062c50dafd247b9897b976affcf53639c99901e1308b78e23729c3507fad40777d26b45821f4c12fc2b0fe9d0d417874e96678929400a823a610b596026ece SHA512 39e3ed50f22e11abc7c758a27c1d55d470b7909d25725a03b7e9a2757046daee49bab413b20472cf9b0f1703a494740cc960a16688fa25bef282cda16b068e35
-EBUILD rclone-1.52.1.ebuild 866 BLAKE2B 9e062c50dafd247b9897b976affcf53639c99901e1308b78e23729c3507fad40777d26b45821f4c12fc2b0fe9d0d417874e96678929400a823a610b596026ece SHA512 39e3ed50f22e11abc7c758a27c1d55d470b7909d25725a03b7e9a2757046daee49bab413b20472cf9b0f1703a494740cc960a16688fa25bef282cda16b068e35
+EBUILD rclone-1.52.1.ebuild 790 BLAKE2B 8b4dc670c3865d8923c4c03110aa3919d0ce31273bca340d924b3bec89c8e4119fbbc71aaf003d38e34b2ca3cd49f81198d620aba9ccea3f67ebedde436f93ca SHA512 d43a3d54becbdf47c6bee4a70b272bbd7245e266f727880efff1e641a7e0c71085976e7e73fd865e7e758d303d7e3cd20deef759c4a99e661ba2d27d827fce59
 EBUILD rclone-9999.ebuild 861 BLAKE2B e0ad096016a740cadba21135d349fadd8a0dd4860492cb61bb21569c70e84733850707a53328f265faa2363436b0ae65013eea94d0805224087b027a5eac045e SHA512 129b7c912d8fc43fa46f50ca8c2fa02c2fb4abd51b19cb7e7d9173de0832e16c5f854386783435230ea3bb84227b3230ee34aaa9221bcf2ab64a2923414c6171
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.50.0.ebuild b/net-misc/rclone/rclone-1.50.0.ebuild
deleted file mode 100644
index 4166391f5fac..000000000000
--- a/net-misc/rclone/rclone-1.50.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-build bash-completion-r1
-EGO_PN="github.com/rclone/${PN}"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="amd64 ~arm x86"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="A program to sync files to and from various cloud storage providers"
-HOMEPAGE="https://rclone.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin ${PN}
-	doman src/${EGO_PN}/${PN}.1
-	dodoc src/${EGO_PN}/README.md
-
-	./rclone genautocomplete bash ${PN}.bash || die
-	newbashcomp ${PN}.bash ${PN}
-
-	./rclone genautocomplete zsh ${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-}
diff --git a/net-misc/rclone/rclone-1.52.1.ebuild b/net-misc/rclone/rclone-1.52.1.ebuild
index 380576cdebc5..9617d4c91b19 100644
--- a/net-misc/rclone/rclone-1.52.1.ebuild
+++ b/net-misc/rclone/rclone-1.52.1.ebuild
@@ -2,17 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-inherit golang-build bash-completion-r1
-EGO_PN="github.com/rclone/${PN}"
+inherit bash-completion-r1 go-module
 
 if [[ ${PV} == *9999* ]]; then
-	inherit golang-vcs
+	inherit git-r3
 else
 	KEYWORDS="amd64 ~arm ~arm64 x86"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
+	SRC_URI="https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="A program to sync files to and from various cloud storage providers"
@@ -22,13 +18,14 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+src_compile() {
+		go build -mod=vendor . || die "compile failed"
+}
 
 src_install() {
 	dobin ${PN}
-	doman src/${EGO_PN}/${PN}.1
-	dodoc src/${EGO_PN}/README.md
+	doman ${PN}.1
+	dodoc README.md
 
 	./rclone genautocomplete bash ${PN}.bash || die
 	newbashcomp ${PN}.bash ${PN}
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index b89da7098922..23f500dbf081 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -1,5 +1,7 @@
 AUX rdate-confd 509 BLAKE2B 92826ed23b867063c8cf1145e7a2f62fe6a904593eca1add05971f06773ae992f08e58bb4f5367660e93937baf7bf3d0fe35a508bdaea44bca104c0871cf6ba8 SHA512 1ebc27949cf5c68828e00cacb20644b6c6b0e833c23b4f9e31144f0e47c10daa06b82909198227cdc7018939cbae09f2fe53de69aa84c8b9a8ecb0ab9eaf1f8f
 AUX rdate-initd-1.4-r3 525 BLAKE2B 8533f2b589aa860d88a7cdf18931b2a5800a1d82a78db576dfb12189f4b3391535bff5896ef75d6b3ef7373e1ad86c86a82f7422f4c404af8b9b3e414aaad59c SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157
+DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce786dc936370b3fc2122bfe72cc32cb3635a1e77ec663fd44712852ab85d8ba46702d1e222ec63ad46f3bb SHA512 7a7647102b5663218fff6c1364b83250a199a0169adf40db87a49709aa24c3b1fae5acf01732d5432fcb2883d29a24b2ae38cf5333ff75075e5d7a6fd90e7146
 DIST rdate-1.4.tar.gz 11500 BLAKE2B 705324648f30685135d3ba3936b05a82bc6a027d3d1c407950cb7631858f6d9dba34f97f065482988caf4a68addc3ba122fe475cfd1684c526f5224113657ac3 SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996
+EBUILD rdate-1.10.ebuild 751 BLAKE2B 24e52d7a4799cf5740415a87a3244fb188d282e868d3c58dfb05ec64ed607acd2c9a102f6f39a033b356165e419c55ae023981a54f91f8bbbe19f97fb01aafa7 SHA512 ffb7cdf7b406f49b55f97a3bed78da59b2d323797bf63d0717c6241c09ecd72172c7a55d8ebd32cb6a616fb115cd8994c89a5a17efb98d67e42cabae1d9d5cca
 EBUILD rdate-1.4-r4.ebuild 829 BLAKE2B db9a2d14fd6445329e4cf57ad8ae817488f41e790207eb7d5af6d3401db4dfe17cca33e00f600fa5dddcfe04f365856e55e472628e23cfa7aa1b832e16ec5784 SHA512 b3c05b7f419c13d5aba9bb7a567f8c9fa3e075b43dcaf707900d1a5dccfb2cd883cb1fb5d43bce1add6fad45a3a817a971aa649ce6f4a40ac55cbacdf925fc6c
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/rdate/rdate-1.10.ebuild b/net-misc/rdate/rdate-1.10.ebuild
new file mode 100644
index 000000000000..56ca14a4561b
--- /dev/null
+++ b/net-misc/rdate/rdate-1.10.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P=openrdate
+
+DESCRIPTION="Use TCP or UDP to retrieve the current time of another machine"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/openrdate"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libbsd"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}-${PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate
+	newconfd "${FILESDIR}"/rdate-confd rdate
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index bdc49c3377a1..ce62b7f77a42 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,8 +1,8 @@
-AUX remmina-1.4.6-with-examples.patch 1466 BLAKE2B b2291567efa16b13e100d7b21795a497bb93d3839faa776b634e449db133e79d228d973d1d0f0117390e4e5e6b371988ea366d070cd73544f2cddc127cf17fa9 SHA512 9701f769865ecb003aee8fb16c39bb8b7f9bc28039b4f2759ef5bfe33f0c06b3f274c650be332f86d07e99ae14b1b913f89bba4c6e84e04602dedf0180caff3a
+AUX remmina-1.4.5-with-examples.patch 1594 BLAKE2B becf55ac5b0d5d4909dc49da5b43590990ce91de05d5b2c25cc6abbd915b25310866903ac73d79cef3b6971627d59aaed4b64628071d9b41498d767d4f651f26 SHA512 f833872508b01de26dc12fd09370a98415b065e40746a8e0afacf485107e375c21d9566a48adf2128cd828ba8c8006b390e44959df128f9ae2038db026b304bc
 DIST Remmina-v1.4.3.tar.gz 1705751 BLAKE2B 4d49b5d5da4017cc1870a5e37a73db767862997cffdd58b080ab5707eeb293eed7e756ca974a4f4922bb9417e94610fe07b1e774f5ad7e269e797362ff264e83 SHA512 9f555f9ff60e2a136f6379a0f2828d091aa972dcff7ebd09eaf1834dc10f506d218e5cb6856c17f625c1040a11240da2ed5ebe9f4fe32a083494cfcbbdef1a41
 DIST Remmina-v1.4.5.tar.gz 1787506 BLAKE2B 095a01cca168daaef9ef59ff5adb9bb475467e8e8c42cac74a1a605627b09aa7246aa941b514b0de29739516aa988148f377040ed8629df3d5b17f0b1158cf76 SHA512 fec07b488db8d438aa6a0263e13557c10f1401a81b3371a2da03a1037d51f8e58e88652a15c6d6ce9e02535ef93ed0f9c5b674ab5efab430380f4b7dd57c4d9d
-DIST Remmina-v1.4.6.tar.gz 1895441 BLAKE2B 38dbda1976f3af3ad89c84eaecf50c42a2a22186dd013d30ae0cea83f5ee54af1443c196b79c1b4684e6afbc6f3d8fc8461fae18806476b8ae1a79148a2ccb12 SHA512 8b918502622957f6a1637d5d79ec605f7bf1c164f902c76a3a65dc316a8ccd11de63066182ffad4783bcb7f86d5e04ca6462f6a5d2e4256c4ae14c6f483419ea
+DIST Remmina-v1.4.7.tar.gz 1908687 BLAKE2B a6656821d727914f70bafe50d5c3764e3c36a4753c618048b91eadc1fa27b8f03bcd313b99cfd46cadc446b85b583994528895f9fb755d6c8ee28e0b0bab66d1 SHA512 ebe1e62e090062107ed6674d494255bac9e3d175553bc5ae949aa1bfc9e1de4b59f35f523ee36b08bb02580513d3b585344b9864001dd991cac656f1c13116e9
 EBUILD remmina-1.4.3.ebuild 2614 BLAKE2B e87cb2e5c2e626fbc8309bfeaddf385b9dd47fae9d0244ac3a79a631ebda8df235d3dfd59009b5882520fef7e697b6d75fb6fc16204cb6c747608a58b9092684 SHA512 855a700ce278a7385e5240c7767fa37b2478d227aa5fa9f899c08c1012e7669a94efb27a2bbce3d3f25d7fcc3047778141e56739524d4d72960175a5bdb545a3
-EBUILD remmina-1.4.5.ebuild 2477 BLAKE2B f3e4eb101a87010ceaaf2ac7b717885e122cb16f563135224a0b5215ac780de3ca45b3437eba9a24ee5bcc4cac6b93834ed8d63c8a9e1e6bebbc13a35f242e20 SHA512 8d7a30d2a406edbd9928a75fe749decb593393a6e40e498d1b7fda3bfebaa1592296eb3cc3d43cf767270b32c3b55d5b281908aec8e20a5d2a97af8221acd8b3
-EBUILD remmina-1.4.6.ebuild 2576 BLAKE2B e69f281212f854010d576642b5b8de538003c320d9c8ddaebf542e099cd6bd6cf0ba6551d4520c105b5c10a1b0ce79e12e9b768b683bc320c298ef6d53e03ca0 SHA512 457a54501dbedaa6538460710df82c8aa909e35165ed686b32d801385e14a04b9ca1071a4b06325025f1ff9adb5e57ce7e46e430f8d956626c9792ad8fd693b1
+EBUILD remmina-1.4.5.ebuild 2522 BLAKE2B a860efa261252c4c559df6c4977c22bf56fef998b498dceea2e493d650a5ff2085259031c9f23df9d20fc81fc90e8ae85dd950f799213cc30884b4689c9ca5b3 SHA512 74d25d7c19ec7c9d68ce8ba06579d62608d47086874c1a4161ce52a393c7f24414c33033c088d4e41df6ba30e5d9356662c0a56702bc9115ced79af7381b720e
+EBUILD remmina-1.4.7.ebuild 2525 BLAKE2B 6c7d02fa36bb644ac179976d4d624a41deb3dd2c8e0c2d3cb13fa18892bf0cd06c40a64b5bb388146988872ee535a6d446365b7bb45616582169d12b0708b244 SHA512 a8adacebd610b10af5239d1e17ceddcf4763f642a91cb7240f887e76d0d206b80b37296ff85bbef8cf9eeb3651c6fe8c021707ddd8efb735459a893f8db4ec19
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/files/remmina-1.4.5-with-examples.patch b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
new file mode 100644
index 000000000000..10ac35744d7f
--- /dev/null
+++ b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
@@ -0,0 +1,37 @@
+--- /dev/null
++++ b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
+@@ -0,0 +1,34 @@
++diff -Nupr a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c
++--- a/plugins/tool_hello_world/plugin.c	2020-06-08 22:07:44.000000000 +0200
+++++ b/plugins/tool_hello_world/plugin.c	2020-06-10 20:18:48.495507560 +0200
++@@ -42,17 +42,19 @@
++ #include <gdk/gdkx.h>
++ 
++ static RemminaPluginService *remmina_plugin_service = NULL;
+++#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__)
+++
++ 
++ static void remmina_plugin_tool_init(RemminaProtocolWidget *gp)
++ {
++ 	TRACE_CALL(__func__);
++-	remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME);
+++	remmina_plugin_debug("[%s] Plugin init", PLUGIN_NAME);
++ }
++ 
++ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
++ {
++ 	TRACE_CALL(__func__);
++-	remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME);
+++	remmina_plugin_debug("[%s] Plugin open connection", PLUGIN_NAME);
++ 
++ 	GtkDialog *dialog;
++ 	dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR,
++@@ -65,7 +67,7 @@ static gboolean remmina_plugin_tool_open
++ static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
++ {
++ 	TRACE_CALL(__func__);
++-	remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME);
+++	remmina_plugin_debug("[%s] Plugin close connection", PLUGIN_NAME);
++ 	remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect");
++ 	return FALSE;
++ }
diff --git a/net-misc/remmina/files/remmina-1.4.6-with-examples.patch b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
deleted file mode 100644
index 259ef19e0fc8..000000000000
--- a/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nupr a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c
---- a/plugins/tool_hello_world/plugin.c	2020-06-08 22:07:44.000000000 +0200
-+++ b/plugins/tool_hello_world/plugin.c	2020-06-10 20:18:48.495507560 +0200
-@@ -42,17 +42,19 @@
- #include <gdk/gdkx.h>
- 
- static RemminaPluginService *remmina_plugin_service = NULL;
-+#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__)
-+
- 
- static void remmina_plugin_tool_init(RemminaProtocolWidget *gp)
- {
- 	TRACE_CALL(__func__);
--	remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME);
-+	remmina_plugin_debug("[%s] Plugin init", PLUGIN_NAME);
- }
- 
- static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
- {
- 	TRACE_CALL(__func__);
--	remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME);
-+	remmina_plugin_debug("[%s] Plugin open connection", PLUGIN_NAME);
- 
- 	GtkDialog *dialog;
- 	dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR,
-@@ -65,7 +67,7 @@ static gboolean remmina_plugin_tool_open
- static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
- {
- 	TRACE_CALL(__func__);
--	remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME);
-+	remmina_plugin_debug("[%s] Plugin close connection", PLUGIN_NAME);
- 	remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect");
- 	return FALSE;
- }
diff --git a/net-misc/remmina/remmina-1.4.5.ebuild b/net-misc/remmina/remmina-1.4.5.ebuild
index 485866aee596..f10b2bdec825 100644
--- a/net-misc/remmina/remmina-1.4.5.ebuild
+++ b/net-misc/remmina/remmina-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
 
 DEPEND="
@@ -58,6 +58,7 @@ DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-with-examples.patch
 	cmake_src_prepare
 	xdg_src_prepare
 }
diff --git a/net-misc/remmina/remmina-1.4.6.ebuild b/net-misc/remmina/remmina-1.4.7.ebuild
index 8902bb75ac42..f73e076ebcd8 100644
--- a/net-misc/remmina/remmina-1.4.6.ebuild
+++ b/net-misc/remmina/remmina-1.4.7.ebuild
@@ -54,7 +54,6 @@ RDEPEND="
 "
 
 DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-PATCHES=( "${FILESDIR}"/${P}-with-examples.patch )
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index b26de190f860..7be624736157 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -6,9 +6,11 @@ AUX rsyncd.init.d-r1 247 BLAKE2B ec4f7a875a51bae10cff7e15df18d285b01dddaa99a0312
 AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968909e9ee0f109b9151de8157427b0aa8fb0ed89fa6cc4cab6ac6e0a9986c076531cd4aa87bea4e2d25 SHA512 b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5
 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
-DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
 DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2
-EBUILD rsync-3.1.3.ebuild 2791 BLAKE2B c5996386d1e0adf52de159361d1efe245e63abe68fc44febb11b2ec607e27210c572bd4da2045142b4cc4fc5f9efd6a750da9aa4b38f6b1d194cf551e112f48d SHA512 2ef8ea9bfba4df20680d1b83aa121df54d27736c2cd7f65d04df8737bb36c2641e4f087f4b90724567d10b1262de8f6671aa80856982f74c15d28e42437fd6e7
-EBUILD rsync-3.2.0-r1.ebuild 4511 BLAKE2B 68012e3bfee86051abca8db34ed80bc6e35886e16e23f16e63b9dbb22637d46e66a2123bf21703bc78a8a229ed9d6b797ee8fa53a27883f36bff26df0f0b7188 SHA512 3b441789634815f311ed77760a4ca030c8b20568d8f5e3cd5f638c05743bf6e762de2b0fb30b64252c95a0db8d5c43e86ee7e9ef4c4261640af28e6cd66eee47
-EBUILD rsync-9999.ebuild 4455 BLAKE2B cbbc9b23733d1cca2d6d313b7438aec818199b4a85872ca5ece00d79e7932c3d037f5fafcc48313c3f56f8ecded946bb4abfe61763769e11c336cb30b2a6b5f2 SHA512 77e391b19108f82d1722e62f34619e1469d33d4c0420a683ca719c748473ec42335f2dc54c8422783ec0171ba165c6e6e2ad04b5ae9adb4bd5407e506f8ed732
+DIST rsync-3.2.1.tar.gz 1051665 BLAKE2B de1ee047b9a378cd16fceb188d0a2e14e78751c8295263e183888b464ced9263be600bbb04b7793d48e7aa1fd2ab0709d717234f346cc6a5a028c3daddcb019e SHA512 80d639ab56a993de8016115fe15794bb9aa7012e4a8300402954760566a821c230af9dcdb19143d70663497a830289212ce329fb0c4fd5c4b6f392d850e5fd8c
+DIST rsync-3.2.2pre2.tar.gz 1056347 BLAKE2B 648a5cd120cf6468e4009d766a92e91da51d142ff814abdd7db362c7170d36cd0bd7a1ff6672eed79ec2d37b2ec18a40bb18b0fee6f8610cff57f3bb5d029e60 SHA512 7427d6929b0b7eff8632db20049cb74fbb31c295e059b86dc92e3fce5c1d260ec1e9c2ec9615d985d55f0d6b22c89410fd61148b26a3eda56b6518efb8ad6518
+EBUILD rsync-3.2.0-r1.ebuild 4509 BLAKE2B ab0897f40b2f7ea13a8a841892ba5eca647befe4f8be98d6440ed9f1cdb7addc13d548a45660c4295472b116517b8c41b30f35e01b37227a1ede1b507a45fa20 SHA512 89ad2d62e3b764e8283dc41899b54ecb93d69f16e9ab4e7e859d0c45bd108bff744776fee114cbca2c4ea85e944ae53e6b5d068b809253aea482cca002ebe5a7
+EBUILD rsync-3.2.1.ebuild 4451 BLAKE2B 2723d6e0d31fcff19340fd410f678fb86d2200561e12c86eeee03cdee6a8100fee23226c37baa23c82b0099120fe428b3a959af7c331f78823889399e1c2d5ae SHA512 d0c6f34bfe52b5e1a40829db31e097e4e91f8595757867eb738bff75f15d50f59a8dcefbb038a3761c8dba7cb9056b7a70f4aad83bbacb3fa0e2dccc0d2addf9
+EBUILD rsync-3.2.2_pre2.ebuild 4451 BLAKE2B 2723d6e0d31fcff19340fd410f678fb86d2200561e12c86eeee03cdee6a8100fee23226c37baa23c82b0099120fe428b3a959af7c331f78823889399e1c2d5ae SHA512 d0c6f34bfe52b5e1a40829db31e097e4e91f8595757867eb738bff75f15d50f59a8dcefbb038a3761c8dba7cb9056b7a70f4aad83bbacb3fa0e2dccc0d2addf9
+EBUILD rsync-9999.ebuild 4444 BLAKE2B 9ebb509b7fd4ca4e77eec489a5b8f628bee745d12a8828c54f8887d81b2a79d77e65333b65491041b26efd40cec3dc6dc44d99b590b99eaa1b5f1d80fe8815bc SHA512 0437f7264cd62f2a77a4d0c81cb6135451fc705901ab658f1fd1e4b8ad4d199c096c02fab605781fd6b203caf3c0fd9a1edbaf3588a4d76548709b96a5bc3f1d
 MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
deleted file mode 100644
index b5837aee1603..000000000000
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
-[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl examples iconv ipv6 static stunnel xattr"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
-	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
-	>=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${P/_/}"
-
-src_configure() {
-	use static && append-ldflags -static
-	local myeconfargs=(
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-		--without-included-popt
-		$(use_enable acl acl-support)
-		$(use_enable iconv)
-		$(use_enable ipv6)
-		$(use_enable xattr xattr-support)
-	)
-	econf "${myeconfargs[@]}"
-	touch proto.h-tstamp #421625
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
-	dodoc NEWS OLDNEWS README TODO tech_report.tex
-
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-client
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		exeinto /usr/share/rsync
-		doexe support/*
-		rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
-	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild
index 672e23e2d33b..d74e0fca5bbc 100644
--- a/net-misc/rsync/rsync-3.2.0-r1.ebuild
+++ b/net-misc/rsync/rsync-3.2.0-r1.ebuild
@@ -16,7 +16,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
 	S="${WORKDIR}/${P/_/}"
diff --git a/net-misc/rsync/rsync-3.2.1.ebuild b/net-misc/rsync/rsync-3.2.1.ebuild
new file mode 100644
index 000000000000..c02794fd0b9b
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ "${PV}" == *9999 ]] ; then
+	PYTHON_COMPAT=( python3_{6,7,8} )
+	inherit autotools git-r3 python-any-r1
+	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_DIR="src-previews"
+	else
+		SRC_DIR="src"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
+	S="${WORKDIR}/${P/_/}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE_CPU_FLAGS_X86=" sse2"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+	lz4? ( app-arch/lz4[static-libs(+)] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	system-zlib? ( sys-libs/zlib[static-libs(+)] )
+	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+	xxhash? ( dev-libs/xxhash[static-libs(+)] )
+	zstd? ( app-arch/zstd[static-libs(+)] )
+	>=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+if [[ "${PV}" == *9999 ]] ; then
+	BDEPEND="${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+		')"
+fi
+
+# Only required for live ebuild
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		eaclocal -I m4
+		eautoconf -o configure.sh
+		eautoheader && touch config.h.in
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable ipv6)
+		$(use_enable lz4)
+		$(use_enable ssl openssl)
+		$(use_with !system-zlib included-zlib)
+		$(use_enable xattr xattr-support)
+		$(use_enable xxhash)
+		$(use_enable zstd)
+	)
+
+	if [[ "${ARCH}" == "amd64" ]] ; then
+		# SIMD is only available for x86_64 right now (#728868)
+		myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
+	else
+		myeconfargs+=( --disable-simd )
+	fi
+
+	econf "${myeconfargs[@]}"
+	[[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+	dodoc NEWS.md README.md TODO tech_report.tex
+
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		exeinto /usr/share/rsync
+		doexe support/*
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+	if use system-zlib ; then
+		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
+		ewarn "using the --compress option."
+		ewarn
+		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+		ewarn "and the --compress option, add --new-compress (-zz)."
+		ewarn
+		ewarn "For syncing the portage tree, add:"
+		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+	fi
+}
diff --git a/net-misc/rsync/rsync-3.2.2_pre2.ebuild b/net-misc/rsync/rsync-3.2.2_pre2.ebuild
new file mode 100644
index 000000000000..c02794fd0b9b
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.2_pre2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ "${PV}" == *9999 ]] ; then
+	PYTHON_COMPAT=( python3_{6,7,8} )
+	inherit autotools git-r3 python-any-r1
+	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_DIR="src-previews"
+	else
+		SRC_DIR="src"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	fi
+	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
+	S="${WORKDIR}/${P/_/}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE_CPU_FLAGS_X86=" sse2"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+	lz4? ( app-arch/lz4[static-libs(+)] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	system-zlib? ( sys-libs/zlib[static-libs(+)] )
+	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+	xxhash? ( dev-libs/xxhash[static-libs(+)] )
+	zstd? ( app-arch/zstd[static-libs(+)] )
+	>=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+if [[ "${PV}" == *9999 ]] ; then
+	BDEPEND="${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+		')"
+fi
+
+# Only required for live ebuild
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		eaclocal -I m4
+		eautoconf -o configure.sh
+		eautoheader && touch config.h.in
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable ipv6)
+		$(use_enable lz4)
+		$(use_enable ssl openssl)
+		$(use_with !system-zlib included-zlib)
+		$(use_enable xattr xattr-support)
+		$(use_enable xxhash)
+		$(use_enable zstd)
+	)
+
+	if [[ "${ARCH}" == "amd64" ]] ; then
+		# SIMD is only available for x86_64 right now (#728868)
+		myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
+	else
+		myeconfargs+=( --disable-simd )
+	fi
+
+	econf "${myeconfargs[@]}"
+	[[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+	dodoc NEWS.md README.md TODO tech_report.tex
+
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		exeinto /usr/share/rsync
+		doexe support/*
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+	if use system-zlib ; then
+		ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
+		ewarn "using the --compress option."
+		ewarn
+		ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
+		ewarn "and the --compress option, add --new-compress (-zz)."
+		ewarn
+		ewarn "For syncing the portage tree, add:"
+		ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+	fi
+}
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index 38d7035321aa..7bd6a4121f2d 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -98,7 +98,7 @@ src_install() {
 	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
 	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
 
-	dodoc NEWS.md OLDNEWS.md README.md TODO tech_report.tex
+	dodoc NEWS.md README.md TODO tech_report.tex
 
 	insinto /etc
 	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index dc45065e16b1..4ccf68a994cb 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,8 +1,3 @@
-AUX smb4k-3.0.4-qt-5.15.patch 689 BLAKE2B 1c7d40e8dcbdc9b41380640b648860852bb8381b2f45d61a7d221f4ad7966c1e12f7cefb9c0a9bffc7a691ab97222f44f6fae587828c2bda7e395399c4fdef5d SHA512 f2f60e30991b24f68a9a84160ba935db4d20719e515cbb47eaf0576a3303bf1b549c1dd740cbb3a283eb03781820adef09199a1b9cf23f60c0b880483209ebd6
-DIST smb4k-3.0.4.tar.xz 3824508 BLAKE2B 98d9e66a577e40e734421cf46d72ebf010fa1d2161d411dbd5382af8fd84f2578a086f0425e576508aed0ed549940cf4b7f688c527f42218dd781006d2460204 SHA512 bd3b53f6f8e9ee3dd6fc8c0ab31b877fc89a887837b7bd91eef410b6dff81960ada872bada074638c8b7d204c638564a70568e87cc874e146508241e071665a3
-DIST smb4k-3.0.5.tar.xz 3841924 BLAKE2B 98bc44ed33b60fb983db34d39ed7bd51f9fab8c4594e81c9f3d6275c4b6f49822902d12da59cb777754febd839c37d42d6623cb42ae03385a5187e063790a872 SHA512 913e69ba30b4d7294e4436648fcebd54173cc0c32a712824218aee7c276dc0d8eea0a2e4a14648cd55c99424b80512e01c5a1929ce38a9f83d3dfb9c24601af1
 DIST smb4k-3.0.6.tar.xz 3842424 BLAKE2B 7c42007a00b3da07bdc1629360bb8640c66ac7332fefca82698664cf197d4061d6c4419ab99ebd29e6515dace194973be2c179fa3c422820716fc5e5e1b8591f SHA512 993f669c12db30dd78f9f6cc694dfe563958407582f65ff64b6ada36cf4372ad6bb5addecc93970ce6750d031bf4ee9dfefa362e13100d2ce8d3e848a0d89382
-EBUILD smb4k-3.0.4.ebuild 1932 BLAKE2B 38084c5e9420ade82d3ea8b245fee26c068e678724f38c5576d75cd4bc8652b6b7189d3466242fb8f90b800f8bf735dab4f4e3fa3120339dc5a00fda1e63eb31 SHA512 ec2d341b877717a47529096db938096f84a9b5d08802034a36c9bf9b403eff9eea8a28bff90d963d715f4ee63c6e28b4a2eda605fdcf9590281fc5b02726aa84
-EBUILD smb4k-3.0.5.ebuild 1888 BLAKE2B 4bd8f4e49305481f5c0522760f7e9b07daa2cc0234cfeaa28240eebe02c3d83462a6cfca13b7cfb191493c12b294896b1970a15155768f1635118fa8bd4fe9da SHA512 5e1f6b51eea2f35b9785c2885a23ed027a975d6afa41302d51568d3948f5bbf98b2c1fe09b81721d70fd8d03308d8c87a7c1da8982683c904a50bb51d79d5d01
-EBUILD smb4k-3.0.6.ebuild 1888 BLAKE2B 4bd8f4e49305481f5c0522760f7e9b07daa2cc0234cfeaa28240eebe02c3d83462a6cfca13b7cfb191493c12b294896b1970a15155768f1635118fa8bd4fe9da SHA512 5e1f6b51eea2f35b9785c2885a23ed027a975d6afa41302d51568d3948f5bbf98b2c1fe09b81721d70fd8d03308d8c87a7c1da8982683c904a50bb51d79d5d01
+EBUILD smb4k-3.0.6.ebuild 1886 BLAKE2B e3db0902dea23a31824f963850c243693aea932d8804a0f92126b072e790595e5d41e9a1b226c88fce83e0975e97c9b5183df8a69db9bb91caaed96672f280bb SHA512 76fd0d9aa5695751ef1fa43ad6add6613e515dc85e9537507fb2d0c313b66df0ce3544e2776b573fe20cc77ecca4e5685e1ca8c3cd5295dbaf81d6a8686d09ea
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch b/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch
deleted file mode 100644
index 8948e30dfa12..000000000000
--- a/net-misc/smb4k/files/smb4k-3.0.4-qt-5.15.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 009ebe0224f7e236837741a1b35f0c572024e8b3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 21 Apr 2020 10:27:28 +0200
-Subject: [PATCH] Fix build with Qt-5.15 (missing header)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- smb4k/smb4ktooltip.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/smb4k/smb4ktooltip.cpp b/smb4k/smb4ktooltip.cpp
-index de07a1d..b1064f7 100644
---- a/smb4k/smb4ktooltip.cpp
-+++ b/smb4k/smb4ktooltip.cpp
-@@ -43,6 +43,7 @@
- #include <QToolTip>
- #include <QApplication>
- #include <QDesktopWidget>
-+#include <QPainterPath>
- #include <QStylePainter>
- #include <QStyle>
- #include <QStyleOptionFrame>
--- 
-2.26.1
-
diff --git a/net-misc/smb4k/smb4k-3.0.4.ebuild b/net-misc/smb4k/smb4k-3.0.4.ebuild
deleted file mode 100644
index dfe247ddeca5..000000000000
--- a/net-misc/smb4k/smb4k-3.0.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.0.5.ebuild b/net-misc/smb4k/smb4k-3.0.5.ebuild
deleted file mode 100644
index a7ff9e7f655d..000000000000
--- a/net-misc/smb4k/smb4k-3.0.5.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
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k
-https://sourceforge.net/p/smb4k/home/Home/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="plasma"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-fs/samba[cups]
-"
-RDEPEND="${DEPEND}
-	plasma? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_PLASMOID=$(usex plasma)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "Users of Samba 4.7 and above please note that for the time being,"
-	elog "the following setting has to be added to or changed in the [global]"
-	elog "section of the smb.conf file:"
-	elog
-	elog "[global]"
-	elog "client max protocol = NT1"
-}
diff --git a/net-misc/smb4k/smb4k-3.0.6.ebuild b/net-misc/smb4k/smb4k-3.0.6.ebuild
index a7ff9e7f655d..169b71b8637d 100644
--- a/net-misc/smb4k/smb4k-3.0.6.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.6.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 48b263c51be1..cb820e229213 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -17,4 +17,4 @@ EBUILD teamviewer-15.2.2756.ebuild 4095 BLAKE2B e8a01b0e7e749396705fafd6c178d8e8
 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 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736
-MISC metadata.xml 353 BLAKE2B 6b23f0ea5f9e3bc076641d6991535e7069dab3abd3f30e1d1052580223ec1f2ad94a8b0f6dfc6ee0019cdb3f1b3ea31edc5bbd04579da77f866291922f4c675a SHA512 bb21752978f1cf4c9cabf6b5fad33e0dbb820d27a5dd3ef40fd54f4a86893b77cd994dfe77395ff8fdd69f4e0f805bca622486538a4781b0f30b55ffdcf1540d
+MISC metadata.xml 249 BLAKE2B 11f9a85069860d951af16d4536b4dcb5808a383e12932121c0344d7df116522d143eb5e5ccb10ab69c7d6a27ee4d421f4a34557eb02b8b9926d7ef34f3efef10 SHA512 876b15663b8f716c63393d90ad0c78d96088f53a2b2add76b0b749bf69e75be84ef58184f148c70ec2669b773f4dd2e37d045fe72429a6ddd2086b691a553047
diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
index 0034f0d370dd..025344585474 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/metadata.xml
@@ -5,9 +5,5 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 </maintainer>
-<maintainer type="person">
-	<email>zlogene@gentoo.org</email>
-	<name>Mikle Kolyada</name>
-</maintainer>
 </pkgmetadata>
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-29 11:38:31 +0100
commit	90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch)
tree	83fc5facb6b12be510a37bc3d241cc63e965b13a /net-misc
parent	feb0daf81d888e9160f9f94502de09b66f2a63fd (diff)