gentoo resync : 02.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
commit: b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree: 9026dffec53f92cba48ca9a500a4f778e6304380 /net-misc
parent: 3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)
56 files changed, 284 insertions, 446 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 86f3bf28c74e..8615cad1feb4 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index deb23d4ce7a6..1fd98404a712 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -16,4 +16,4 @@ EBUILD anydesk-5.5.1.ebuild 2588 BLAKE2B aa17a6f0655dc06d9183d8b4699fa58e6147f9b
 EBUILD anydesk-5.5.4.ebuild 2588 BLAKE2B c4a1c8fe8f9a3a146353bd21f5b3d4361ee27f1fcf26ccc71dd3dee31f8116ecbd91df5821baab064edd350d5758bd6bd4ab21776ff4546bda5a232aa6c845dc SHA512 af8e75d059d8f6c0c5bb5f2a2252d7d413afab9439982ae00b8998cd89700edb0078095b1369e4153353376926634a017689d2a5f8207831a3067968ea2aa862
 EBUILD anydesk-5.5.6.ebuild 2588 BLAKE2B c4a1c8fe8f9a3a146353bd21f5b3d4361ee27f1fcf26ccc71dd3dee31f8116ecbd91df5821baab064edd350d5758bd6bd4ab21776ff4546bda5a232aa6c845dc SHA512 af8e75d059d8f6c0c5bb5f2a2252d7d413afab9439982ae00b8998cd89700edb0078095b1369e4153353376926634a017689d2a5f8207831a3067968ea2aa862
 EBUILD anydesk-6.0.0.ebuild 2588 BLAKE2B c4a1c8fe8f9a3a146353bd21f5b3d4361ee27f1fcf26ccc71dd3dee31f8116ecbd91df5821baab064edd350d5758bd6bd4ab21776ff4546bda5a232aa6c845dc SHA512 af8e75d059d8f6c0c5bb5f2a2252d7d413afab9439982ae00b8998cd89700edb0078095b1369e4153353376926634a017689d2a5f8207831a3067968ea2aa862
-MISC metadata.xml 886 BLAKE2B 9cad890e470555034e22adec55e4aa5dd047289e054e708cbe9f6338f97440913fa63618a5a362a90749c17bb0f78b712af090c013da001b2e547733f6faac89 SHA512 897b088c714bf32fa0810c94c97131b5ebb00bffba3bf1b0e846064c83f0b65c3a0d52048a74ee27ae4ad1a12f1ea758a69f49185ddfba9a5b8c285be8f32ea3
+MISC metadata.xml 677 BLAKE2B f5b86851aaa83fc0f0a22739416e5d6fa06e4f8bdd14ed33660219774e1179a9df5e08440e99a3b75f156b72835a6a2c9742ba176828ac6caea9f7d564ebca87 SHA512 824b2ba8de1e03f3089a248226612505b2d0e172443fadc488a45d8f5a4eaa26e8acb8c67f27476dc0d7d8dd8de25950a87225f8495cd1b38c573308c3d1fc3c
diff --git a/net-misc/anydesk/metadata.xml b/net-misc/anydesk/metadata.xml
index d9c4330ac25f..1312e9b08f6e 100644
--- a/net-misc/anydesk/metadata.xml
+++ b/net-misc/anydesk/metadata.xml
@@ -1,25 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>jmbsvicetto@gentoo.org</email>
-	<name>Jorge Manuel B. S. Vicetto</name>
-</maintainer>
-<maintainer type="person">
-	<email>cb-gentoo@guya.de</email>
-	<name>Christian Buchinger</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<upstream>
-	<changelog>https://download.anydesk.com/changelog.txt</changelog>
-	<bugs-to>mailto:support@anydesk.com</bugs-to>
-</upstream>
-<longdescription lang="en">
-	Connect to a computer remotely, be it from the other end of the office
-	or halfway around the world. AnyDesk ensures secure and reliable remote
-	desktop connections for IT professionals and on-the-go individuals alike.
-</longdescription>
+	<maintainer type="person">
+		<email>jmbsvicetto@gentoo.org</email>
+		<name>Jorge Manuel B. S. Vicetto</name>
+	</maintainer>
+	<upstream>
+		<changelog>https://download.anydesk.com/changelog.txt</changelog>
+		<bugs-to>mailto:support@anydesk.com</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		Connect to a computer remotely, be it from the other end of the office
+		or halfway around the world. AnyDesk ensures secure and reliable remote
+		desktop connections for IT professionals and on-the-go individuals alike.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 3aeed31b4c50..958d694219de 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -3,15 +3,15 @@ AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1
 AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 933a8fb5dc5225d86aa1a97083755607df76e767c38c58ead1e1ed5e4c180502b31edfbc8c045f976d0b511d60d35562b53d1f0a5ab0ba8b306843cd95b8a9f7 SHA512 e2be0c5cf68cd899a3fd15bf129e664e795883f9912b300e2a1fa0a01f7ca9faea32edd3f1232c9be91e629d5fbbc3a58ec793bf6a73108fa0e58e40c861a0c9
 AUX chrony-3.5-systemd-gentoo.patch 297 BLAKE2B b7a8502ede5886b7e51fbaf43d62b59bdb43d8c5059d1ee0c8a14de843d58d576efd6b5c53cb3cbdd1c4583b787a8c180bea93a97a997349d97f652b7b4f1fbb SHA512 ecf0eda8de2c36f14a6d3dac8b7b688b06f46516ae064513314cc46323962147b29f13a57beb34cc7d2664b967b5f0eee26a00ddeac63d88dda59fc196f1aec1
 AUX chronyd.conf 378 BLAKE2B b5c07f873640d78e26d23206b253b8c85ceb2a3d89f1dfb3686ea0012fb38ae30b323ceceffac43c0a8168b3e2d288714297a0905e60779d00161e93d8f5773b SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640
-AUX chronyd.conf-r1 389 BLAKE2B 12ce24ef0455876ca9b74c5fb03000d720526c4da7dabf1dffb3c959861d5b0f677e2efb96bb5c00f7cc26b79cc77c0b6dfa161551bda5506a5eaac8d16dc46e SHA512 81400fb47fdac472c7508bb301e0dd662429c6ac3243e13d2719b1d237057a8b996163fbc14fa85a498144728d9ddf78275251d630e6800b0144a43792d8c414
+AUX chronyd.conf-r1 389 BLAKE2B e8048c21f025ea04478f824aee39d1e6f18e94845775e99d20a15a0f5dacf01e3c795eef8b3e52aecd544011dc957075f0ee1af125341d0ac52ef3f725f9f0f2 SHA512 7829f7766749f14de834f633b41483545f7a75e7a039daeef695da9268307957a483f42896ca7967ec98d393140b90e6868642eed43f6daa392c6e88d9871c08
 AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984
 DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3518c953591f43224dc3da79f627027a6cd4bf9c4227e9f8659a69adbdb634252ff3920d2ef677e32012456 SHA512 c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c
-DIST chrony-4.0-pre2.tar.gz 512765 BLAKE2B bfcac8564b05ed3cb6a67230746ec83d3f00192bd1d5e623ee12068bf3b7ca55e169a0228a13b62339be6a1c237199cd73186b1962ba51b445a56040560917fb SHA512 be3ca7c57c62c9ecf8d20d0b8d7b5a34ac455fb333be0587eabd5dfd7eebbcb3a3601ad161554a62098a9ca8d6530bee2900e9e7476bf477c3cb11907091dbd2
+DIST chrony-4.0-pre3.tar.gz 539117 BLAKE2B f26fcac8e29322151251e60b385a815c53155f163d7ed1e1269f90f3418c59ec8f4952b1bba1203549607c63bb373cbaab17af933e02e659eced91827519bc6b SHA512 e52f2454b0cbe60ab7c8975deba499f1ff2e84cd1c3d0a0fb208f11f12ca762f2d0cd74af7aacc8022e628cdeaa4ac388fdd134715cc3e274b3818d5c12da460
 EBUILD chrony-3.5-r2.ebuild 3035 BLAKE2B 3567ca621e71777dc34c90b77005e192f564bb8dba5f0705711eaa720262bebafde656da678b2d47130dee19caf8d2e52106ae27a0ee81e292b2defe1dadf5fa SHA512 2c8799bc3ac6e1759e048e37e6e4765d5a199fff043954e19a2640a060609c6281b397dc2834d10ecb34e5bb09b7b80c55b5bc96d0fa10a43b451799a1d53f3a
 EBUILD chrony-3.5-r4.ebuild 4241 BLAKE2B c56c8d39161dec4ce49c3685e191c70efa5b0b9d82f42066cdcb41345126782e7c1ecaadba13967d6364b5b00bc949cb1e8cf2c2ebd57525b24c0f68ae022442 SHA512 617ab48f3792344be704e90808b53d1af30829678fa9644de03a43bcc693d54979010d30415d6ef5c9dc626fa55554bc3b0a4a9ef0a41151b1a3a7925aee5fd6
-EBUILD chrony-3.5.1.ebuild 4241 BLAKE2B c56c8d39161dec4ce49c3685e191c70efa5b0b9d82f42066cdcb41345126782e7c1ecaadba13967d6364b5b00bc949cb1e8cf2c2ebd57525b24c0f68ae022442 SHA512 617ab48f3792344be704e90808b53d1af30829678fa9644de03a43bcc693d54979010d30415d6ef5c9dc626fa55554bc3b0a4a9ef0a41151b1a3a7925aee5fd6
-EBUILD chrony-4.0_pre2-r1.ebuild 4636 BLAKE2B 39a67901f7237c0c91653f14038fdd4d8fb5739d4760d970559264c32a93cd02d61163002da7149b0dec6c9d36ceaa52bcf29954391087854d33d39ded9bb109 SHA512 10a5183f3351677bdcb4f6c54b23267e51f8053b8eacb8876e288b806cbfea31b83f8fd29b2e4747d218355876fc787a0a3158ba1f5efc567df97a4a8d6909ef
-EBUILD chrony-9999.ebuild 4636 BLAKE2B 39a67901f7237c0c91653f14038fdd4d8fb5739d4760d970559264c32a93cd02d61163002da7149b0dec6c9d36ceaa52bcf29954391087854d33d39ded9bb109 SHA512 10a5183f3351677bdcb4f6c54b23267e51f8053b8eacb8876e288b806cbfea31b83f8fd29b2e4747d218355876fc787a0a3158ba1f5efc567df97a4a8d6909ef
+EBUILD chrony-3.5.1-r1.ebuild 4846 BLAKE2B 4b07ee8134c845659bba38e0e1a69ee2a4395bfe2ccc930e694960cb0a1d7e1615f420aabca51842f015b9f4dd3969730a1d21cd7f627a6096b22eac8b579945 SHA512 8937a0924efc6f82c23c1e9089efff081b975ce59621cbb6f46adb73089e41793ef1d7d4d9c6ccdc677395d295a2d207426bf13df1e466acb734d3fd35c66ec3
+EBUILD chrony-4.0_pre3.ebuild 4852 BLAKE2B c633edfa6531237729c9b23459b8041f2c0bb531c9c3f8c028df8023657014b40b4f670e056a72e5daa6f71c8e0c4943b982dd756be775dc7e0df5bfb6cb9a91 SHA512 b87e4bc35673d31a137aec94487f24f9defae1ca253d18d3fd58bc93728688274061d27008c48b8fe12f29270d18d2d8b54d24190ed17f8eabc47448410e0472
+EBUILD chrony-9999.ebuild 4852 BLAKE2B c633edfa6531237729c9b23459b8041f2c0bb531c9c3f8c028df8023657014b40b4f670e056a72e5daa6f71c8e0c4943b982dd756be775dc7e0df5bfb6cb9a91 SHA512 b87e4bc35673d31a137aec94487f24f9defae1ca253d18d3fd58bc93728688274061d27008c48b8fe12f29270d18d2d8b54d24190ed17f8eabc47448410e0472
 MISC metadata.xml 1798 BLAKE2B c301fd829833515a78800677c498632a46ea968ad82f726b288ee3ec6bf79c733fcaea0b9a1777cf93e2a858da40beb105a301dca580e37e01b91111a38bdc17 SHA512 8609f9cb055d5de0a293cc78060101cbc30be4d3db6d7a8d751fa2bf416758e4c9d6509ce1890861c87d2e863e325051e68aadb4d621937f586e83ef585145e7
diff --git a/net-misc/chrony/chrony-3.5.1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild
index fa28cf690097..ed8ec05dd522 100644
--- a/net-misc/chrony/chrony-3.5.1.ebuild
+++ b/net-misc/chrony/chrony-3.5.1-r1.ebuild
@@ -6,22 +6,31 @@ inherit systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="NTP client and server programs"
 HOMEPAGE="https://chrony.tuxfamily.org/"
-SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
+fi
+
 LICENSE="GPL-2"
 SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="
-	+adns +caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc
-	+seccomp selinux
+	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
+	+rtc samba +seccomp +sechash selinux
 "
 REQUIRED_USE="
 	?? ( libedit readline )
+	sechash? ( nettle )
 "
-
+RESTRICT=test
 CDEPEND="
 	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
 	libedit? ( dev-libs/libedit )
+	nettle? ( dev-libs/nettle:= )
 	readline? ( >=sys-libs/readline-4.1-r4:= )
 	seccomp? ( sys-libs/libseccomp )
 "
@@ -34,27 +43,39 @@ RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-chronyd )
 "
-
-RESTRICT=test
-
-S="${WORKDIR}/${P/_/-}"
-
+BDEPEND="
+	nettle? ( virtual/pkgconfig )
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
 	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
 )
+S="${WORKDIR}/${P/_/-}"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" virtual/w3m"
+fi
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
 		doc/* examples/* || die
 
-	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
-	cp examples/chronyd.service "${T}"/chronyd.service
+	sed -i \
+		-e 's|RELOADDNS||g' \
+		-e 's|pkg-config|${PKG_CONFIG}|g' \
+		configure || die
+
+	sed \
+		-e 's/-F 1/-F 0/' \
+		examples/chronyd.service > "${T}"/chronyd.service || die
+
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die
+}
 
-	# Set config for privdrop
+src_configure() {
 	if ! use caps; then
 		sed -i \
 			-e 's/-u ntp//' \
@@ -63,13 +84,11 @@ src_prepare() {
 
 	if ! use seccomp; then
 		sed -i \
-			-e 's/-F 1//' \
+			-e 's/-F 0//' \
 			"${T}"/chronyd.conf "${T}"/chronyd.service || die
 	fi
-}
 
-src_configure() {
-	tc-export CC
+	tc-export CC PKG_CONFIG
 
 	local CHRONY_EDITLINE
 	# ./configure legend:
@@ -83,37 +102,46 @@ src_configure() {
 		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
 	fi
 
+	# Note: ncurses and nss switches are mentioned in the configure script but
+	# do nothing
 	# not an autotools generated script
 	local myconf=(
 		$(use_enable seccomp scfilter)
-		$(usex adns '' --disable-asyncdns)
 		$(usex caps '' --disable-linuxcaps)
 		$(usex cmdmon '' --disable-cmdmon)
 		$(usex ipv6 '' --disable-ipv6)
+		$(usex nettle '' --without-nettle)
 		$(usex ntp '' --disable-ntp)
 		$(usex phc '' --disable-phc)
 		$(usex pps '' --disable-pps)
 		$(usex refclock '' --disable-refclock)
 		$(usex rtc '' --disable-rtc)
+		$(usex samba --enable-ntp-signd '')
+		$(usex sechash '' --disable-sechash)
 		${CHRONY_EDITLINE}
 		${EXTRA_ECONF}
 		--chronysockdir="${EPREFIX}/run/chrony"
-		--disable-sechash
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--mandir="${EPREFIX}/usr/share/man"
 		--prefix="${EPREFIX}/usr"
 		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
 		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
 		--without-nss
 		--without-tomcrypt
 	)
 
-	# print the ./configure call to aid in future debugging
-	echo bash ./configure "${myconf[@]}" >&2
-	bash ./configure "${myconf[@]}" || die
+	# print the ./configure call
+	echo sh ./configure "${myconf[@]}" >&2
+	sh ./configure "${myconf[@]}" || die
 }
 
 src_compile() {
+	if [[ ${PV} == "9999" ]]; then
+		# uses w3m
+		emake -C doc man txt
+	fi
+
 	emake all docs $(usex html '' 'ADOC=true')
 }
 
diff --git a/net-misc/chrony/chrony-4.0_pre2-r1.ebuild b/net-misc/chrony/chrony-4.0_pre3.ebuild
index 0338e59678bc..8ff387f448ec 100644
--- a/net-misc/chrony/chrony-4.0_pre2-r1.ebuild
+++ b/net-misc/chrony/chrony-4.0_pre3.ebuild
@@ -18,21 +18,15 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-
 IUSE="
-	+adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc
-	+seccomp +sechash selinux
+	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
+	+rtc samba +seccomp +sechash selinux
 "
-
 REQUIRED_USE="
 	?? ( libedit readline )
 	sechash? ( nettle )
 "
-
 RESTRICT=test
-
-BDEPEND=""
-
 CDEPEND="
 	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
 	libedit? ( dev-libs/libedit )
@@ -40,28 +34,27 @@ CDEPEND="
 	readline? ( >=sys-libs/readline-4.1-r4:= )
 	seccomp? ( sys-libs/libseccomp )
 "
-
 DEPEND="
 	${CDEPEND}
 	html? ( dev-ruby/asciidoctor )
 	pps? ( net-misc/pps-tools )
 "
-
 RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-chronyd )
 "
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" virtual/w3m"
-fi
-
-S="${WORKDIR}/${P/_/-}"
-
+BDEPEND="
+	nettle? ( virtual/pkgconfig )
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
 	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
 )
+S="${WORKDIR}/${P/_/-}"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" virtual/w3m"
+fi
 
 src_prepare() {
 	default
@@ -70,11 +63,19 @@ src_prepare() {
 		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
 		doc/* examples/* || die
 
-	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
-	cp examples/chronyd.service "${T}"/chronyd.service
+	sed -i \
+		-e 's|RELOADDNS||g' \
+		-e 's|pkg-config|${PKG_CONFIG}|g' \
+		configure || die
 
-	# Set config for privdrop
+	sed \
+		-e 's/-F 1/-F 0/' \
+		examples/chronyd.service > "${T}"/chronyd.service || die
+
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die
+}
+
+src_configure() {
 	if ! use caps; then
 		sed -i \
 			-e 's/-u ntp//' \
@@ -83,13 +84,11 @@ src_prepare() {
 
 	if ! use seccomp; then
 		sed -i \
-			-e 's/-F 1//' \
+			-e 's/-F 0//' \
 			"${T}"/chronyd.conf "${T}"/chronyd.service || die
 	fi
-}
 
-src_configure() {
-	tc-export CC
+	tc-export CC PKG_CONFIG
 
 	local CHRONY_EDITLINE
 	# ./configure legend:
@@ -103,10 +102,11 @@ src_configure() {
 		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
 	fi
 
+	# Note: ncurses and nss switches are mentioned in the configure script but
+	# do nothing
 	# not an autotools generated script
 	local myconf=(
 		$(use_enable seccomp scfilter)
-		$(usex adns '' --disable-asyncdns)
 		$(usex caps '' --disable-linuxcaps)
 		$(usex cmdmon '' --disable-cmdmon)
 		$(usex ipv6 '' --disable-ipv6)
@@ -116,6 +116,7 @@ src_configure() {
 		$(usex pps '' --disable-pps)
 		$(usex refclock '' --disable-refclock)
 		$(usex rtc '' --disable-rtc)
+		$(usex samba --enable-ntp-signd '')
 		$(usex sechash '' --disable-sechash)
 		${CHRONY_EDITLINE}
 		${EXTRA_ECONF}
@@ -124,14 +125,15 @@ src_configure() {
 		--mandir="${EPREFIX}/usr/share/man"
 		--prefix="${EPREFIX}/usr"
 		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
 		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
 		--without-nss
 		--without-tomcrypt
 	)
 
-	# print the ./configure call to aid in future debugging
-	echo bash ./configure "${myconf[@]}" >&2
-	bash ./configure "${myconf[@]}" || die
+	# print the ./configure call
+	echo sh ./configure "${myconf[@]}" >&2
+	sh ./configure "${myconf[@]}" || die
 }
 
 src_compile() {
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 0338e59678bc..8ff387f448ec 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -18,21 +18,15 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-
 IUSE="
-	+adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc
-	+seccomp +sechash selinux
+	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
+	+rtc samba +seccomp +sechash selinux
 "
-
 REQUIRED_USE="
 	?? ( libedit readline )
 	sechash? ( nettle )
 "
-
 RESTRICT=test
-
-BDEPEND=""
-
 CDEPEND="
 	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
 	libedit? ( dev-libs/libedit )
@@ -40,28 +34,27 @@ CDEPEND="
 	readline? ( >=sys-libs/readline-4.1-r4:= )
 	seccomp? ( sys-libs/libseccomp )
 "
-
 DEPEND="
 	${CDEPEND}
 	html? ( dev-ruby/asciidoctor )
 	pps? ( net-misc/pps-tools )
 "
-
 RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-chronyd )
 "
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" virtual/w3m"
-fi
-
-S="${WORKDIR}/${P/_/-}"
-
+BDEPEND="
+	nettle? ( virtual/pkgconfig )
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
 	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
 )
+S="${WORKDIR}/${P/_/-}"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" virtual/w3m"
+fi
 
 src_prepare() {
 	default
@@ -70,11 +63,19 @@ src_prepare() {
 		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
 		doc/* examples/* || die
 
-	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
-	cp examples/chronyd.service "${T}"/chronyd.service
+	sed -i \
+		-e 's|RELOADDNS||g' \
+		-e 's|pkg-config|${PKG_CONFIG}|g' \
+		configure || die
 
-	# Set config for privdrop
+	sed \
+		-e 's/-F 1/-F 0/' \
+		examples/chronyd.service > "${T}"/chronyd.service || die
+
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf || die
+}
+
+src_configure() {
 	if ! use caps; then
 		sed -i \
 			-e 's/-u ntp//' \
@@ -83,13 +84,11 @@ src_prepare() {
 
 	if ! use seccomp; then
 		sed -i \
-			-e 's/-F 1//' \
+			-e 's/-F 0//' \
 			"${T}"/chronyd.conf "${T}"/chronyd.service || die
 	fi
-}
 
-src_configure() {
-	tc-export CC
+	tc-export CC PKG_CONFIG
 
 	local CHRONY_EDITLINE
 	# ./configure legend:
@@ -103,10 +102,11 @@ src_configure() {
 		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
 	fi
 
+	# Note: ncurses and nss switches are mentioned in the configure script but
+	# do nothing
 	# not an autotools generated script
 	local myconf=(
 		$(use_enable seccomp scfilter)
-		$(usex adns '' --disable-asyncdns)
 		$(usex caps '' --disable-linuxcaps)
 		$(usex cmdmon '' --disable-cmdmon)
 		$(usex ipv6 '' --disable-ipv6)
@@ -116,6 +116,7 @@ src_configure() {
 		$(usex pps '' --disable-pps)
 		$(usex refclock '' --disable-refclock)
 		$(usex rtc '' --disable-rtc)
+		$(usex samba --enable-ntp-signd '')
 		$(usex sechash '' --disable-sechash)
 		${CHRONY_EDITLINE}
 		${EXTRA_ECONF}
@@ -124,14 +125,15 @@ src_configure() {
 		--mandir="${EPREFIX}/usr/share/man"
 		--prefix="${EPREFIX}/usr"
 		--sysconfdir="${EPREFIX}/etc/chrony"
+		--with-hwclockfile="${EPREFIX}/etc/adjtime"
 		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
 		--without-nss
 		--without-tomcrypt
 	)
 
-	# print the ./configure call to aid in future debugging
-	echo bash ./configure "${myconf[@]}" >&2
-	bash ./configure "${myconf[@]}" || die
+	# print the ./configure call
+	echo sh ./configure "${myconf[@]}" >&2
+	sh ./configure "${myconf[@]}" || die
 }
 
 src_compile() {
diff --git a/net-misc/chrony/files/chronyd.conf-r1 b/net-misc/chrony/files/chronyd.conf-r1
index c04f3525f0b7..2783f29e6844 100644
--- a/net-misc/chrony/files/chronyd.conf-r1
+++ b/net-misc/chrony/files/chronyd.conf-r1
@@ -9,4 +9,4 @@ CFGFILE="/etc/chrony/chrony.conf"
 # The combination of "-s -r" allows chronyd to perform long term averaging of
 # the gain or loss rate across system reboots and shutdowns.
 
-ARGS="-u ntp -F 1"
+ARGS="-u ntp -F 0"
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 6cdf7617c9a3..8d2289b1ee40 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST cni-plugins-0.8.6.tar.gz 1993056 BLAKE2B 89276e0f7fdbc782b30ff675abcb0f92f210771bb772269210416e17d6da443fe732774d9af8ae66f69847c8b48ee4dc6485f51e2156814cfd7e3ca8b455428f SHA512 8815de8b375c737c3a1951b0a7ef5786209fdcf723aa1bc7c2dab7e1bbdee4933a7237f41bdee4208828b457bc79ec69ff68db060c52bab13863f42b042480c8
-EBUILD cni-plugins-0.8.6.ebuild 880 BLAKE2B 596189a6c130c67c2308bc5922d5604b52ae4c688372354d40c31d6d67c66a6b45a6f0f8158dbc9681f407bf16c1dd8683d6b6b87a2da9ec7aa65e3fb210c66e SHA512 a5c9f30b7dcfd0bf18b864d615dea6cf92721599ac50ec131a262b66b0524919e05369b51290e31ec925ff16aa49701f426a456f1e4d2463d2818ff4446b01bb
+DIST cni-plugins-0.8.7.tar.gz 1965945 BLAKE2B 592b1f126547363877c657e03d69fcb25874e6d472d731861a1a03e3933901bd618a5097f3d91f6ca7fbedce29a0ff0076a65be1a528a2584a7dcb5940a4b010 SHA512 1b11b080b1f54a8a792b1048573d7d882603b76929f0c9343eeb2e010f97700c0deea4489faeb493a1aeac12557b6847b26784c378d0430c47de6bdaca6aa70f
+EBUILD cni-plugins-0.8.6.ebuild 887 BLAKE2B 22a40a3a3e6269454c8393f45af4c03fb75d100f1976a89b58e56ee3add1e22d4b60aa4858bc49bdf663369df1f5ffe77e49b727df65efa8aec31e81cf46e917 SHA512 64f51abba277243b73f48e14abfeca29c6c68a1c74acd2023c58c27608ce7b7257102380926bfd982661325b668eb9ae3532cf2e1b64b80fc3a1c70603f19e8a
+EBUILD cni-plugins-0.8.7.ebuild 888 BLAKE2B 79bf0e6b70ca215ab02e203393dc0d1da9fbe67f5e1b2553fdda95a65083a5e974560e513d29c633a95b6823700052ed516efdb206b7ef87fd850dde26696a36 SHA512 2e183a9fd0587c39803d63eeaf25a04441776ddd993ce2b94167e0bf024c41b333ab4336670dc3ede154b4ac0983c6e8e59fa186378c19661d64cea4f4adad96
 MISC metadata.xml 350 BLAKE2B 9cd61d5f345c1e1967db0576296baf94bf06a59709485d150052af880eaef6a453ec0dd1cbf5003657ceb00bfba60c05e8225b9fa27828a7b6c377149ca23d0e SHA512 99cd00c8a61afa34a7a974eb9663314fa8abe0c61a384b222cb27f57aefd8116c450143f0e7c65f52d4cff1ee9852ed72f8efd13d548d2e0bc41475bf4dc2e2b
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild
index 631097f1de60..5bf8dc6faddd 100644
--- a/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild
+++ b/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz ->
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="hardened"
 
 CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.7.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.7.ebuild
new file mode 100644
index 000000000000..838f8dc46a57
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.8.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info
+
+DESCRIPTION="Standard networking plugins for container networking"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
+S="${WORKDIR}/plugins-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 17b28419b724..002884aaf0cc 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -6,6 +6,6 @@ DIST curl-7.71.1.tar.xz 2387660 BLAKE2B 47b3a4704ae8b09b37f7a9d8850fd7d692d91db3
 DIST curl-7.72.0.tar.xz 2390040 BLAKE2B 8f20efe7255ffe6d68619645b634b9cb10557ba0ca458904e99105133fb54cfafe4cafa0e7a1c5e20bbf5b5d24c8c44670cb5ddc1a2035ca43eadd24899ea953 SHA512 e5025a32eac6108ccb13d1fcce9c2de28b3a6d6e9a258a647c4be45d71718f75653e1ccd477ef5f29242a15588255c4ef43fe47bf9908b938b6769fccfaac107
 EBUILD curl-7.71.0.ebuild 7692 BLAKE2B a2114c226d010472ced5ed0a4d25feeba6d820defc786c49022c74dd0eb72a56015086fb549d3187dcd01f6cead02da6f9668a3442c833a6f52b8e76419d5bae SHA512 0d10f62aeb9a91c6199034060295064621ece66181019b7530b98d38bd36d31c0d404d1a92a4245cab7386363c84c6bf3c054b977ea07e3a8fb5aa541b877f28
 EBUILD curl-7.71.1-r1.ebuild 8734 BLAKE2B 748f1f1564ee84bd716679a8b336f324d325c51e74efe8db34797a9deecbc153a4158fb5c563076f5b8459798b9a3ebd4f2a6851ea71d9fa2f5da40de716d5cc SHA512 dbf4dc6fcb9ca884d36373661242558ba2240f6d9b88c1cf1a4285cebd06425d3fce7c38f52eb3b1cbf832e3cd3712d76d214824fefb6040168f9475081a00a6
-EBUILD curl-7.71.1.ebuild 7696 BLAKE2B 720b9d08868acb07d342791f87bb7c73a4d865aaabb771c2990aa7e4724dc974e2c73ad9b33fb718a3ea826856d89a2a91a5e329fbaabdf3f5f3bbcf6d8a8724 SHA512 b4df2c9e8d6541ae6b70a27f47ed44bbec27519123b1a2dc87761df657c30d0c3b49dd584501fca5d6fb7b870b1346747e36d08b664ecdac423500b1f6da61b1
-EBUILD curl-7.72.0.ebuild 8734 BLAKE2B 748f1f1564ee84bd716679a8b336f324d325c51e74efe8db34797a9deecbc153a4158fb5c563076f5b8459798b9a3ebd4f2a6851ea71d9fa2f5da40de716d5cc SHA512 dbf4dc6fcb9ca884d36373661242558ba2240f6d9b88c1cf1a4285cebd06425d3fce7c38f52eb3b1cbf832e3cd3712d76d214824fefb6040168f9475081a00a6
+EBUILD curl-7.71.1.ebuild 7695 BLAKE2B d47481a0edef1362479059a346768e2c2ad9a9059591e8f73c69bb545cf5c825b04a7049ba36849a34dbf8ecb8d8d41fd2da8ebc5e497b9b8b8da2568abc34a7 SHA512 8a7cf22108e3bffdc3f89adcf3d292f62200e562596253c920890356ff82f697a391f17f8a18f02bda4678e224d2927b42e969887975253245af5a7d972375a2
+EBUILD curl-7.72.0.ebuild 8729 BLAKE2B e45a9727ba5e45d740ee2777fe1aace9c2dc536e6432d8353a144e785fa01bbd5b196b14ae778c1d8100ec68eab7c7c858e03cc81a761b08cb04c7b62f5711a1 SHA512 3b5d5cd0147069f1274baa8ed451ddb111120feb9ee319859dbc397a5cc1e5774256dffb0432bb94198697304c84646ebb43f0a5f552e67514896dd17bb72732
 MISC metadata.xml 1916 BLAKE2B 8907ea9d5ded3fadb233b056b41b3daeb00bba44caa631a77fbd07215a5a9fd1bf47b4751485a59c6b41684e4b14e0abb99b5d79566e2dc8f21a3d749f0d5d20 SHA512 8e52e382804b4d2f10de345240f7cb46203e454dd3cab31ff92be3d2d9ce2d1ae8f36d95546061208205c330c58ece1d19fb08c257da683342b484b2e53f3ed1
diff --git a/net-misc/curl/curl-7.71.1.ebuild b/net-misc/curl/curl-7.71.1.ebuild
index 0cec1ab0a84f..8805a6ae3fc9 100644
--- a/net-misc/curl/curl-7.71.1.ebuild
+++ b/net-misc/curl/curl-7.71.1.ebuild
@@ -11,7 +11,7 @@ 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"
+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"
diff --git a/net-misc/curl/curl-7.72.0.ebuild b/net-misc/curl/curl-7.72.0.ebuild
index 598b09eed1c4..251398fe87c7 100644
--- a/net-misc/curl/curl-7.72.0.ebuild
+++ b/net-misc/curl/curl-7.72.0.ebuild
@@ -12,7 +12,7 @@ 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"
-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 ~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 gnutls gopher +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest
index 42774c821834..c177ccfc5212 100644
--- a/net-misc/efax/Manifest
+++ b/net-misc/efax/Manifest
@@ -6,5 +6,5 @@ DIST efax_0.9a-19.1.diff.gz 18698 BLAKE2B 4b0a97e39f65009ff0f295cd4f573a919580ef
 DIST efax_0.9a-19.diff.gz 18178 BLAKE2B d3dca49db55a52839c88c52c8934976fd56e32fb9501c27fe211b4bd4ed4b85014915f2e0785f7668cfc9743262ee6232af92c477386cc32f2b57e336aa4354e SHA512 8b1a2d007ebba73b772400eb1e0ccc61d832775590ac4fd6e171008c9741409118db099b444dc8da04dd87f1cb7025a9af62f60b2c3ccba21cc89863a2909735
 DIST efax_0.9a.orig.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b64a4677f0f717d03ea53710df1944db07514d01c18f9bf0d2c64642a2b7ca0416a7571a6f4b880ad8098a919c5e SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b
 EBUILD efax-0.9a-r4.ebuild 999 BLAKE2B a877183b0f65ef3c92d58c464caf046b55880b146c610c34bcfa9cf43f4551ce7188b8681e0ce26e060ba9a9f8c93bae3d0d2e60d0db8cd979e534d1b844594f SHA512 5a8fe1b68505af8798fd785704f26b6a73d261591b08298bf6adfaf2da2dd6bd6ce4c944b2090ce95227c746c50e443c32399ff6b349dde16cd24feac5bedb74
-EBUILD efax-0.9a_p19_p1.ebuild 1245 BLAKE2B 5dc8bddd77555c3b94ef88dce2bded1c90109abf2ec51a022de1d419398003680e87fba6547bb11b02f5a18594fe99366d6e61c69199ef4ee5c9f6509b3ffc1c SHA512 866efb0d92baf2e94e00881e07a6799f7202d54ecc24ba92bef69e3e2c39fc7ebbd3beddf62504eab8990a990a6d43551c631f347f216972fade8ae8f406362e
+EBUILD efax-0.9a_p19_p1.ebuild 1244 BLAKE2B ab11a208fc1782a873fb83a9b2bd609ed4212076ce1ed12b75337f05ece82254e5db02eb0bed0fa5b6ac600c4f0344802a50b3fe5f45759c430f4da1d48ed847 SHA512 6f7e6c3ec39d370d0c20b28629d119f8f302cf8c982b79bc5bef08a93a852a8b7c213710d32076852062ca13239f1dff888b4e74ca20f72ab2eb92269627dd7e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/efax/efax-0.9a_p19_p1.ebuild b/net-misc/efax/efax-0.9a_p19_p1.ebuild
index 7e3a909cb4f2..f95c8c52897a 100644
--- a/net-misc/efax/efax-0.9a_p19_p1.ebuild
+++ b/net-misc/efax/efax-0.9a_p19_p1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).diff.gz
 "
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 PATCHES=(
diff --git a/net-misc/etherdfs/Manifest b/net-misc/etherdfs/Manifest
index 311005ef941b..7f2c5fbf102d 100644
--- a/net-misc/etherdfs/Manifest
+++ b/net-misc/etherdfs/Manifest
@@ -1,8 +1,9 @@
 AUX etherdfs-20180203-makefile.patch 578 BLAKE2B 2d62c0f3ebca6915293f97028cd008fde57fadc490804d2acd92458ffa5479e3cf4fe4af907a938207bfc03cd269cce570a293ec06c53083a57032c259049e83 SHA512 88eb8922684645205250b96dc265fd23262e448c53b94a80c1b68d282b980abbcbc01d612098e4c8e670d98973982d6a10b2739ae043876c2436934b4b25102c
+AUX etherdfs-20180203-musl.patch 332 BLAKE2B 6667c63ab0a24b9921b850b3a0f7134670c93dd46a0a0dfd08e74b27800f3aa0e37e37f6c6f68c10e1cfabb0c692edaa290e1c503db3d78a72ab985a5425ec22 SHA512 3a18ebfe29de28779ba0991544a637647a2531a0c0ab425665bdc1d93d9dfde41f677d000011343684a309744a72b5da611651cdd90cfc3d9e2792214c62f69c
 AUX etherdfs.confd 345 BLAKE2B 4e299984a7680aca036a80e5e0c5efa5ae699de0726dca8ae7368e214a0d3b4f6d90b10ac46f29d8d29d4f6b5aa7547e38d6371fc95d63bc0488a1d4d88b72a1 SHA512 41f2425c6ed387414a9ccdacfa259b55f9089effff4028e849a897a13e92013fcf705e50120d88cc7af183f3af3dc4a2359b0f6516c677298a31201ffcfdb6ea
 AUX etherdfs.initd 242 BLAKE2B b3109ef0534637cecb3d116254457c562e59c44042e94b3cfa6579e0cf84f9365f47dda26a7c84a0989312e9384befe8131b97259845e38cdf2bd84056c855f0 SHA512 b30385aa569831ba0989cf73bd35321577116a77014bcf1d6235b7ddde039ccbe822b590bd8b2da2ffccf5c9161cb977aaea810f8b49126e64265ca77b82c20b
 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 1132 BLAKE2B 4656a0f606452a533155148bf384a4a0f356afd381517c935248c6b694fc2392a21fd08a62a381544adb0ced96f64bffb77013a25557bb39b0ea3cd389da5d4f SHA512 e0f07ab81c8a40434a20745e8dedcb84d68ddbf9b453eb5e0b3b02b2456fdf43bca8c7989a3db6d9a451add49244b6ed61715729c82df5bc13d2fad087b08067
+EBUILD etherdfs-20180203-r1.ebuild 1164 BLAKE2B 960bb72bbc35547f40c12c84e35ceebaf64d7f892c971cd992b20279851547981acc791b1fd05a8fcb16bceb32b947d89625f7906a130643b4b793d210c1af7d SHA512 498f706beb677a3cc38e7ab271b8a3845e56f99c6668d9e2e192d52591c23ad4bcca16471a1f92a9f7f5f3c2768356d7cb1c6785f8804f7736a103ad6ac4accd
 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 91c6282c51a8..0245ab3d16a3 100644
--- a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
+++ b/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
@@ -25,7 +25,10 @@ BDEPEND="tsr? ( app-arch/unzip )"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-musl.patch"
+)
 
 DOCS=( "ethersrv-linux.txt" "history.txt" )
 
diff --git a/net-misc/etherdfs/files/etherdfs-20180203-musl.patch b/net-misc/etherdfs/files/etherdfs-20180203-musl.patch
new file mode 100644
index 000000000000..b0fdb532f20f
--- /dev/null
+++ b/net-misc/etherdfs/files/etherdfs-20180203-musl.patch
@@ -0,0 +1,10 @@
+--- a/ethersrv-linux.c
++++ b/ethersrv-linux.c
+@@ -31,7 +31,6 @@
+ #include <arpa/inet.h>       /* htons() */
+ #include <errno.h>
+ #include <endian.h>          /* le16toh(), le32toh() */
+-#include <linux/if_ether.h>
+ #include <linux/if_packet.h>
+ #include <limits.h>          /* PATH_MAX and such */
+ #include <net/ethernet.h>
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 86a0c73a5798..2a1b8a4d5f40 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,7 +1,4 @@
-AUX 2.1.2-mask-cached_brush.patch 691 BLAKE2B c7dd4dd9ec92958de6e2979446bc62e60ecd1fc729154deeff6c69614d9793bbc162d13cbb04e245faf2a237ffebcdaf3138ad5354573db903dc33a57fe7598e SHA512 33e75cf31f1922cc3e16c02e2a0f946c5c7c1268586952558a432119ffda4d18700967b223703c55ccb3bbfd01ee01e941d5ea70bd2e1d16be84cc93de91cb7d
-DIST freerdp-2.1.2.tar.gz 6877052 BLAKE2B f58e7efa03fb1184aa3ebfe42214668f8372613237571ec2cc21c3d15c30df4ab3b11ac6050eb4ab87af988341f12b0a78e451da967615bc88b3257c253146dc SHA512 6d72b9138b4a4ae6a0a092371624b5a9b73ff914a4c42c73ace63e3f794f6bbca9a84e03d5e92c89bdb945ba2cc8200b4790b685f59d115d67b78a87a6ecab96
 DIST freerdp-2.2.0.tar.gz 6878427 BLAKE2B 0a2a4e4724e9875ce5d975b2c9a0b89ce9467e5950ee4d2d007596269683fa834bfce83e2bf92558887e4fe9418186a5e69708e859649cd0ed095029167a7e12 SHA512 8917378f74b5fee1ddc607b152b29783855f7e1e838fde68bf4d55177295c15fdccece02356d83f998e3bef2abd75b8354d4bbd26a7631ed296a1daf46864aae
-EBUILD freerdp-2.1.2-r1.ebuild 2920 BLAKE2B 335e28b7a8877a6ca2acb59ba0794810bf2bd167e7b3ebad3f92755e0ed58fbf85ff1b690409b67139578e1b9e897eb6508db17ea3faaea61552e25cf7724942 SHA512 29a41334af123c568bd3e258dd7136351995ea73f929413304e8164680880b216a65da63ed31239797af2306cd9361b784257de43acfdeaca47c314c83e33d43
 EBUILD freerdp-2.2.0.ebuild 2865 BLAKE2B 6bb4ca8c1241827ae05fb47ab2b7d8f78075e6fff03773540d913397339532f5726c1c670e6b59cd7dbe427109cbfff7bc8b45af782cc59f832410e354216a0a SHA512 7b39663c760b4517ae82acce05d9934f2da0776e85b4fa9c7ce90a72bdd135a9cf004eda5d525b76b55d60f5eeda6af65ceb722661a51c8dc85efa4e463f62cd
 EBUILD freerdp-2.9999.ebuild 2871 BLAKE2B b265024d8b9f410f79fb5a4789f69b8f4e42e489c018e40d21b2a6bcb4442f821897f0a7575d712fc03e7e8c9a84850e9fd519c6134d46337ed5fa39b44b05f6 SHA512 749dca9f0824f5c9ec0196254ced9f1dce0cfc7a5acd08302b1559c52661f5d1c76a364e10eefec2ae0eb42acf5ffd0d836114b1a1ddd058ee7c8cf8bc2784dc
 EBUILD freerdp-9999.ebuild 2871 BLAKE2B b265024d8b9f410f79fb5a4789f69b8f4e42e489c018e40d21b2a6bcb4442f821897f0a7575d712fc03e7e8c9a84850e9fd519c6134d46337ed5fa39b44b05f6 SHA512 749dca9f0824f5c9ec0196254ced9f1dce0cfc7a5acd08302b1559c52661f5d1c76a364e10eefec2ae0eb42acf5ffd0d836114b1a1ddd058ee7c8cf8bc2784dc
diff --git a/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch b/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch
deleted file mode 100644
index bb8fedb19926..000000000000
--- a/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ce1a9d8d1969ecbb4d24b9f4812654638a44abc2 Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Tue, 23 Jun 2020 09:24:35 +0200
-Subject: [PATCH] Fixed #6298: Mask CACHED_BRUSH when checking brush style
-
----
- libfreerdp/core/orders.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c
-index dc4e51a873..537e694264 100644
---- a/libfreerdp/core/orders.c
-+++ b/libfreerdp/core/orders.c
-@@ -139,7 +139,8 @@ static BYTE get_bmf_bpp(UINT32 bmf, BOOL* pValid)
- {
- 	if (pValid)
- 		*pValid = TRUE;
--	switch (bmf)
-+	/* Mask out highest bit */
-+	switch (bmf & (~CACHED_BRUSH))
- 	{
- 		case 1:
- 			return 1;
diff --git a/net-misc/freerdp/freerdp-2.1.2-r1.ebuild b/net-misc/freerdp/freerdp-2.1.2-r1.ebuild
deleted file mode 100644
index 41f40c416651..000000000000
--- a/net-misc/freerdp/freerdp-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}/2.1.2-mask-cached_brush.patch"
-)
-
-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/grdesktop/Manifest b/net-misc/grdesktop/Manifest
index 8c97667fedee..9343cf0e09f9 100644
--- a/net-misc/grdesktop/Manifest
+++ b/net-misc/grdesktop/Manifest
@@ -3,5 +3,5 @@ AUX grdesktop-0.23-format-security.patch 856 BLAKE2B e5f8c03ce0b7639d0662295d826
 DIST grdesktop-0.23-patchset.tar.xz 17912 BLAKE2B 0252f3c7fa1779df05d1f7d4315e18e4cce5d4acf69e2a914805d072de25730206bf906b9fe767b777fdfde701ce033563f96087bdc2d85d11271b835947f029 SHA512 0327a17b48ff0f5eb8ab88c683f91deec612cf202cabcde3f150b4be5b19afb612a83ff9dcb965b29899a35c214a7334603263b42c0d2605b48209018845b04b
 DIST grdesktop-0.23.tar.gz 299914 BLAKE2B 0a00c721c8d962dd1ad885f4d85130486b3ad9973d21817068f4147ade03d59a2d13dd5e5b26376a0415120521e283a20d79627b62a8bcca15fb2f0213c05bc4 SHA512 a0993d7589d0b22b26535de0cf562604c89ce580fede076c15d8d7f2e7a3bd2fd5ec0a35c6a8ec07fcc8f53a0635381fefe9c2e67d9ff75cec7af47cdd25732f
 EBUILD grdesktop-0.23-r1.ebuild 950 BLAKE2B 7f142f234235a9c5063e26c882d64dac69a9914b2a0fa72f52162e7b8fc5f2ce6bf70a3bd838a395e5debc7e5be678e272f8fa4f066ebdde402d702bf939dcf9 SHA512 1377d544d03f32707e11a9c6a72cf40865151edd727b189b922770fce3ffe87b6e31fec03110c48f1f60fcc5b4292c5e2f240d910a29b11494d0e50b41c5a310
-EBUILD grdesktop-0.23-r2.ebuild 1084 BLAKE2B 0d755a7bd5fb9e44b65b6d56612eb6bd637cd96e3ab92a8419429867450ed9bfb50b461d54db9d87f00993b24954d658a98b67ee850d2cdc919cd34a81894fb1 SHA512 9a8f58b10af6b201de0bf0d7e454e9c16a806ad182694216bcaef6500a70533f261db6d20692ff9f684da3a0e47d60a9c973f167f6a2649af177f06bfa492bab
+EBUILD grdesktop-0.23-r2.ebuild 1080 BLAKE2B b2d8544a08e70f5aadc352406c5496370ef903149a1674ae5ff00d26734090661fbbe874944d0fd15fda3b78a59518462a349e8cc7b452f7953972ddfa95fbc1 SHA512 3ccf3f08814b8ae47089e98e2a8df4701702988bf4fd9f18a8db367c33858583df26dbb914bf5bd46d9606c624cff264819b30011dbe38c3a1826bacd5afd028
 MISC metadata.xml 429 BLAKE2B 117737367d74f70cbd717e361f2179150a8c9d3a156338464d5c6388ec226adf568fa3866e46937dc83465d0afa55caf2ac5b2c2806227892c60eb936728c284 SHA512 359d469647e065e6b771ce02442ce3789d8e67708679d07b5a3d0cb5fc76a5bd16af0483b37d3a5c593d1660d1e58d4ecc97cbe0c26659cfc6a3b6e7ce863a7d
diff --git a/net-misc/grdesktop/grdesktop-0.23-r2.ebuild b/net-misc/grdesktop/grdesktop-0.23-r2.ebuild
index 640c10447e95..15edde92c9a0 100644
--- a/net-misc/grdesktop/grdesktop-0.23-r2.ebuild
+++ b/net-misc/grdesktop/grdesktop-0.23-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/linux-eoip/Manifest b/net-misc/linux-eoip/Manifest
index 51247c378625..56405153ae58 100644
--- a/net-misc/linux-eoip/Manifest
+++ b/net-misc/linux-eoip/Manifest
@@ -1,3 +1,4 @@
+AUX linux-eoip-0.5-sbin-automake.patch 246 BLAKE2B 0ecd83c8d11a22dfd3e7204c08c2851cf642e310f77634dd7c2cb6e6a6eb7175a6553b9297e61cea2d479f122d135853ae00a6182891b6960830696fd5d66f80 SHA512 8c658c75a137104bf3bf903dd87b44635885ed35ba5c17bb4e33b0b7201b73cbf9d9be5de9afa0cd49fb1a01c987c1461f17ed87606b6376105de56dc5048993
 DIST linux-eoip-0.5.tgz 657013 BLAKE2B a6e49d2c342c94b354e1bb35950b3cfd815c8063854a836c1a8bded7ff8b0c745f8d244f34b671843e48a8867f4a0e2df808412066871d0cc1986ec19631ce25 SHA512 a8ed24a0bc4bf6dc97b125ece4ec6b46d20ee1aa09a21f7127854394c085143d4cf1d973e544869bbe6da6de86df7ee6c6901ca1e0dcf9c1610d5d35fdeea7c0
-EBUILD linux-eoip-0.5.ebuild 706 BLAKE2B 26c86fff637f352e3528714109273eb7fcb09975bac17b95280aee632e2daa931897226ed5a9b4f6c1077c78a547bf729c5ce17e6674bc7b1d585ffd63181b5d SHA512 ce42632e8e60a0442eea4685906c437624d90ba692f72e3a3be22ee9591b00aa67c99e290bc4bd24b5480c209c43960864505ad9f49c38bbf066fe25af247a4d
+EBUILD linux-eoip-0.5.ebuild 584 BLAKE2B ce4f3da6a401f16f4de230f8d27276f1df55e50423f3eec2dbd1fc5d9a5a9fb2cf8f5e6c2e050d1b3ee930b64014fd26a440904045c4c75e0c94ac8f00d64c23 SHA512 11eeb55509c520b82a13d5eaa5e6d55b35da170121fe928415c04ea3f92b989e9f5ddc2bbdfb32a8b989dc3ced29478f8132b8760aca0f3fb582e03bd3e05184
 MISC metadata.xml 374 BLAKE2B b86ee967f256dbc5d33fe73314a2ac75e75b74e363457a2183c32d0a887d063067eb6f07565f430a99a563c6e6f37b7aa0e303c1fead29ee4fcbaf069f1e9ebb SHA512 04c13ccf8492060efa30661a15a80d93655aaf5dafc3135734b3f229912ea5dd52ab0b51fe370e05881a26d6c65514bf5edf9ee547a6ed1b0bf4763dd89fef42
diff --git a/net-misc/linux-eoip/files/linux-eoip-0.5-sbin-automake.patch b/net-misc/linux-eoip/files/linux-eoip-0.5-sbin-automake.patch
new file mode 100644
index 000000000000..e350544fe09f
--- /dev/null
+++ b/net-misc/linux-eoip/files/linux-eoip-0.5-sbin-automake.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = subdir-objects
+ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
+ 
+-bin_PROGRAMS = eoip vip
++sbin_PROGRAMS = eoip vip
+ 
+ eoip_SOURCES = eoip.c minIni.c
+ vip_SOURCES = vip.c minIni.c
diff --git a/net-misc/linux-eoip/linux-eoip-0.5.ebuild b/net-misc/linux-eoip/linux-eoip-0.5.ebuild
index 715474cb94c2..a98facb6429e 100644
--- a/net-misc/linux-eoip/linux-eoip-0.5.ebuild
+++ b/net-misc/linux-eoip/linux-eoip-0.5.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
+EAPI=7
 
-inherit eutils autotools-utils vcs-clean
+inherit autotools vcs-clean
 
 DESCRIPTION="Linux support for proprietary MIkrotik EoIP protocol"
 HOMEPAGE="https://code.google.com/p/linux-eoip/"
@@ -14,23 +12,21 @@ SRC_URI="https://linux-eoip.googlecode.com/files/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="
-	dev-libs/lzo:2
-	"
+RDEPEND="dev-libs/lzo:2"
+DEPEND="${RDEPEND}"
 
-RDEPEND="${DEPEND}"
-DOCS=( README )
+PATCHES=( "${FILESDIR}"/${P}-sbin-automake.patch )
 
 src_prepare() {
+	default
 	esvn_clean
-	sed -e 's/bin_PROGRAMS/sbin_PROGRAMS/g' -i Makefile.am
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
+
 	insinto /etc
 	doins vip.cfg eoip.cfg
 }
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index a7b8b16fe2fa..53d545e3a150 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -6,6 +6,6 @@ DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78
 DIST nextcloud-client-3.0.0.tar.gz 19060293 BLAKE2B 80c53e2db30c9a3a8bae8673a937448915010f9d736836a99660c498c0afe0f3e5d78faf80df4c2214f452c41c9d92357a341f00ecb8f4720f6c459a9d2ccb30 SHA512 5b03ad99feeb16dd7d22399df624da98bf6f2e758337aad5b4ff21f25e39e44d94fe0451101cbc8100e43adbd4a39f8d1bac64881d9e39ef3de58b018ccd35d6
 EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17
 EBUILD nextcloud-client-2.6.4.ebuild 2063 BLAKE2B 8cba515c853082f9295afe9511f59c63a52d71410247df752aa89725c4091bbbd0aeac0e99c553f8e6246076266e398af9bc14329b5d033ed735fdc3d7b6f965 SHA512 b3b809f73652286f2df1c2720b36448e0ab4bcb66485211f1f8c4ca0a404fe31e6d38e70e19a956268050f0919f7cebe671bc1c21109fb55d3f813f4c5df5b68
-EBUILD nextcloud-client-2.6.5.ebuild 2014 BLAKE2B 3e3a102ee3043cf2d1335b31814e4dd31e2a52c85f5b8753b86deecf78e2bafe1734d0267b9752dc6e922b777450d5ccafaef91cb9b4635816462f19a031e911 SHA512 b4c283cb3afa9e33909b3656bc0192eb8e6abe3ec9aca58ecabc4a645a7900da114443cc08f84e385aebee19abf19eab224a6c573818131a2473aa38292f6bd4
+EBUILD nextcloud-client-2.6.5.ebuild 2013 BLAKE2B d2108ce06b9c25a56a13852fa5c8809217db7537346bb803311f5c034f483bcd050b8cb617c9bacde98b9e012cd91a2f130aa471b4190e013dca263080bef290 SHA512 338a289d30bbfb89619805425032142052860d86f415338d5e66e13ca05d6ca02d0ef0a41a41e5d889ce7ced734dc9a5ac50bfad6d00ed8b1e9fdaa0fc05df4d
 EBUILD nextcloud-client-3.0.0.ebuild 2022 BLAKE2B 7ee522c834b3e1ce046177e40c071cb15fdd940fd55b9124e22d9849f8ebf5c70c7a2a97003e1c707508b532c6c551dc7c6a11989182a2ad51b22fbdc07de1db SHA512 33858e8b186394ec736534eda2f972ce72c2c4fa57e489c2aeb78f70115d8f0bbb05ebf66c8fc5084af4539cd383981ce4264987297eed689dc3497e7e271a41
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
index 164f2273dd1f..52cdf94f2165 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.5.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/openssh/Manifest b/net-misc/openssh/Manifest
index a141888c3b03..8cf41ee202fb 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -26,7 +26,7 @@ AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1
 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
 AUX sshd.service 242 BLAKE2B e77eb1e0adad0641b60a59d243e911e0a6286a87acda25f3e478582068d8a7a2a12ec88e14bf2c01c7f4c2025ce2d2ce1b1273a93c096bc96da47a69878a823e SHA512 77f50c85a2c944995a39819916eb860cfdc1aff90986e93282e669a0de73c287ecb92d550fd118cfcc8ab538eab677e0d103b23cd959b7e8d9801bc37250c39c
 AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42
-AUX sshd_at.service 176 BLAKE2B 316c2de6af05e97ad2271dfda9fc3276b5c049aa1e56ea7c4acc20d5dd6f4444b0ed3122db90959dc8c009e36f59dbe8e8b969f21eaca98c513ac46b4f80f46e SHA512 662a9c2668902633e6dbcb9435ac35bec3e224afdb2ab6a1df908618536ae9fc1958ba1d611e146c01fddb0c8f41eefdc26de78f45b7f165b1d6b2ee2f23be2a
+AUX sshd_at.service 177 BLAKE2B 0e78184f58cb4c68fb834953fac3ce01f9e39e9eb1a84c03f720205f5b611365c9a48fba445962c06c7e18bdb310cdb9ffe4fc49e95f69608922d224b00c890b SHA512 423120ea2e1ac0b92575ce4eb05347483f902238dc104848e74088f49483c37d30c27364e7fe8599b3e85562159c69284ecf25a4c5394b4cfa18c5c77c6beacd
 DIST openssh-8.1_p1-glibc-2.31-patches.tar.xz 1752 BLAKE2B ccab53069c0058be7ba787281f5a1775d169a9dcda6f78742eb8cb3cce4ebe3a4c506c75a8ac142700669cf04b7475e35f6a06a4499d3d076e4e88e4fc59f3e6 SHA512 270d532fc7f4ec10c5ee56677f8280dec47a96e73f8032713b212cfad64a58ef142a7f49b7981dca80cbf0dd99753ef7a93b6af164cad9492fa224d546c27f14
 DIST openssh-8.1p1+x509-12.3.diff.gz 689934 BLAKE2B 57a302a25bec1d630b9c36f74ab490e11c97f9bcbaf8f527e46ae7fd5bade19feb3d8853079870b5c08b70a55e289cf4bf7981c11983973fa588841aeb21e650 SHA512 8d7c321423940f5a78a51a25ad5373f5db17a4a8ca7e85041e503998e0823ad22068bc652e907e9f5787858d45ce438a4bba18240fa72e088eb10b903e96b192
 DIST openssh-8.1p1-sctp-1.2.patch.xz 7672 BLAKE2B f1aa0713fcb114d8774bd8d524d106401a9d7c2c73a05fbde200ccbdd2562b3636ddd2d0bc3eae9f04b4d7c729c3dafd814ae8c530a76c4a0190fae71d1edcd2 SHA512 2bffab0bbae5a4c1875e0cc229bfd83d8565bd831309158cd489d8b877556c69b936243888a181bd9ff302e19f2c174156781574294d260b6384c464d003d566
diff --git a/net-misc/openssh/files/sshd_at.service b/net-misc/openssh/files/sshd_at.service
index 2645ad047cc6..ec2907b3b1ac 100644
--- a/net-misc/openssh/files/sshd_at.service
+++ b/net-misc/openssh/files/sshd_at.service
@@ -5,4 +5,4 @@ After=syslog.target auditd.service
 [Service]
 ExecStart=-/usr/sbin/sshd -i -e
 StandardInput=socket
-StandardError=syslog
+StandardError=journal
diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest
index 16c446d3afdf..0bac8e5d6c16 100644
--- a/net-misc/pcapfix/Manifest
+++ b/net-misc/pcapfix/Manifest
@@ -1,5 +1,3 @@
-DIST pcapfix-0.7.tar.gz 25753 BLAKE2B 75a8bca8e5c0f7b6604a9c2202116f3fd18917bb98797b401618d32861a14e2bc7f7a1fe684d2e057c4314de72bbbb825dc3142ea93bd8dea0b1bc4716e240e0 SHA512 254eb5803bbcff4249f20af4cd1afa5b300eefb3448e3650899fa94329f38e298e4e7b1033836aa04434b1eadc67611204e3f67d41917c761d5cba424d789298
 DIST pcapfix-1.1.4.tar.gz 52184 BLAKE2B 4def04cebc9144af86d43c28892575627ed98bf14fa99e5e4fe5181a406871ceeac1f431c73d90daae151bb8b6e5315e8bc47c430d2ed55f9e0c3de1decbe0e9 SHA512 6203e9032d2f24fe5d4aaefd9cfd57ece97a318af3ecd8da7171307a59c2a10b2e92206d5cf96e2dd9bfafc239dd9bc95a224bf5fef9e0c0432a6e76ff10d1da
-EBUILD pcapfix-0.7.ebuild 471 BLAKE2B cfa77f05f1b78c54b56487430ca864779c973564baef93f84cb394c5823260baf107035e75084111eeed08c874cd2582f157f41883244e54a7dcd3b06fb0d31c SHA512 15f97ba4b4f1c1cb5e50c3d15a5f340b3a23cb1ed0c505f0c244941b6964c9c891e43a59f8c188273ac0f3b1474d9d1a39e2d3d4d48627c3b28caf923a113b54
 EBUILD pcapfix-1.1.4.ebuild 550 BLAKE2B f772b0e00db6e31efd7626ce918e32065783a15c844fde801b504275c79a150b98eb0c5e999814a3a9451539694c7eeadc5c2af827a045e3860d2bf22b16454b SHA512 3072edc7108cb41c016b16b4fe4a05386c87bed96eeba1dff0312bf2609c500a13b3d79f245218c53428de3ceb58bae670f11d56c81e046ec3a4a775882f7264
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/pcapfix/pcapfix-0.7.ebuild b/net-misc/pcapfix/pcapfix-0.7.ebuild
deleted file mode 100644
index a0ef34d64263..000000000000
--- a/net-misc/pcapfix/pcapfix-0.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Repair and fix broken pcap files"
-HOMEPAGE="http://f00l.de/pcapfix/"
-SRC_URI="http://f00l.de/pcapfix/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile
-}
-
-src_install() {
-	doman pcapfix.1
-	dobin pcapfix
-	dodoc README TODO Changelog
-}
diff --git a/net-misc/pimpd/Manifest b/net-misc/pimpd/Manifest
index beea554fe763..b50677847ce9 100644
--- a/net-misc/pimpd/Manifest
+++ b/net-misc/pimpd/Manifest
@@ -1,3 +1,4 @@
 DIST pimpd_0.8.tar.gz 6763 BLAKE2B 4a9119a0f96b208551a61cc9c3e0ff2e278d7483e57baa0968f9e0949f23d824f75270c3fbc463f9af3e4760ae99e8f8b52fcedf5a2c3d86040486396acb819e SHA512 cb9a60386d5071e21feacf991bb1b2d3d0cb681561a04dc3b9e830336b9d63b4c7026e0a1e43d5276895c733cc0c7d9e072ce1e13ae4b26e83543c53c8147dbe
+EBUILD pimpd-0.8-r1.ebuild 505 BLAKE2B ab28ef60d6f045a5757738ca3dbe8ab52c397eda7f91cc4f1432887380f8a165ce6bd42f123d27dbc91900068c15ac74d04c481256c7948d4a63b948cd957ba6 SHA512 b169a9f597880a0103cb9880bb2c338111ebf829fc5e10794235d8017018156e31c9e39797777778975a33cfbfca58d426584e46b4d77d66664c64a0422c50cd
 EBUILD pimpd-0.8.ebuild 502 BLAKE2B 2dc0b588b80c1b16483ea1500dee2bf79bc5ac6cffa612c006362102743d35e89ec580471900ceda5d71c0574c26a9d7a6d4566f57f678892eff27ac4e5c3186 SHA512 d1161161cc4f2223aead8397de6064bebd37eb820585ebdd90dd3845249fa0862aeada927e83064eac2e1620ff3d5f4ebf83a3ebce635195e4d723fca71d513b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/pimpd/pimpd-0.8-r1.ebuild b/net-misc/pimpd/pimpd-0.8-r1.ebuild
new file mode 100644
index 000000000000..8fca8381c8f0
--- /dev/null
+++ b/net-misc/pimpd/pimpd-0.8-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="RFC1413-compliant identd server supporting masqueraded connections"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="http://cats.meow.at/~peter/pimpd_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dosbin pimpd
+	dodoc README
+}
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index e132477d9f45..c4b80d7df405 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,5 @@
 DIST rygel-0.38.3.tar.xz 4106460 BLAKE2B 38547cd28b0039440cf5e4a7381914c606479c1f26f91eb8af14276a6aa7d6267f0fba5b2af374ca3f0b933c683d569e26cbcec8cbdd15d620d57bd1ecf32c48 SHA512 787508f809e473dccc8461128c1b3b9d71b118008fa13660144f32ccb4b1ad02f41866ddf00343e102ed6f13552d34278917e14cf50c57ea3ffb6cf474f0ce58
 DIST rygel-0.38.4.tar.xz 4123464 BLAKE2B b807dd7fd20c0fd77da6af49cb32399d3e83cd45f1eed121d9b16f201aff260eb4a381ec47774c638a274e83a9b4a1c10d6d317374891ffdb792217e2693fdb5 SHA512 791dcc624f90cdc77bd00e9513c15998d42979e0b3255dcfda771e1d9d718fe4a0127ba0d18e69b6f4e9259c9e691e187b69c6c55c5c35ccefaf5daf65a1f447
 EBUILD rygel-0.38.3.ebuild 2209 BLAKE2B 7e40c88afe41dadb3ecdd5469688436b015bdd5f43651f904bac5f682cc77a9e4579505861533f346d73f747251d81e5545cafcae7fb4f8cb73870c48d560006 SHA512 7d50000a2b16ecd28cb5a4f69b7e6280f741e74f5e935296008de23df9865479a0e6bead86b096514c3dac4150fbbbd20d96c407d2720acb5cf5b2038a81abc3
-EBUILD rygel-0.38.4.ebuild 2211 BLAKE2B 7bd7f9e0685fd3a30276b6f8aa7bef83ec4e35d8217391bffedadffc4b1060c009e9125e56dc1355d57a6019660b70a6092a11793b74df167fd7ee0e5390718d SHA512 7272d3d8e46bac598a771c4aa75d2044601969f1ca8c2e82d72de6b8897cb486119390abfc5b025ac68e5aaabb014086fb2df3b59527d2aba484c4c031af685d
+EBUILD rygel-0.38.4.ebuild 2209 BLAKE2B 7e40c88afe41dadb3ecdd5469688436b015bdd5f43651f904bac5f682cc77a9e4579505861533f346d73f747251d81e5545cafcae7fb4f8cb73870c48d560006 SHA512 7d50000a2b16ecd28cb5a4f69b7e6280f741e74f5e935296008de23df9865479a0e6bead86b096514c3dac4150fbbbd20d96c407d2720acb5cf5b2038a81abc3
 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.38.4.ebuild b/net-misc/rygel/rygel-0.38.4.ebuild
index fdf2b4325976..7471a81e1649 100644
--- a/net-misc/rygel/rygel-0.38.4.ebuild
+++ b/net-misc/rygel/rygel-0.38.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X +introspection +sqlite tracker test transcode"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 43d217f2a769..0672ca223840 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -7,4 +7,4 @@ EBUILD seafile-client-6.2.11.ebuild 1089 BLAKE2B ab172b2b57637d926129dc403a5ff15
 EBUILD seafile-client-7.0.2.ebuild 1099 BLAKE2B 0051351914b9f34ccd1c8a178fb09ae6b1d6abc2c7d7fe5ea02c591ef973066ce81377dfdb3219bca2be55a202607d45cedf210f09861f1ec85a91f6c0785ebe SHA512 a5710b1936d123a71106ee966cdf1a6f47f00d2c4c9bc07d9e348cfc6c7539037f95c73212286254f25fa6a46d11c9db98f583a82ca9953caf6bb258bd6ca4f6
 EBUILD seafile-client-7.0.4.ebuild 1099 BLAKE2B 0051351914b9f34ccd1c8a178fb09ae6b1d6abc2c7d7fe5ea02c591ef973066ce81377dfdb3219bca2be55a202607d45cedf210f09861f1ec85a91f6c0785ebe SHA512 a5710b1936d123a71106ee966cdf1a6f47f00d2c4c9bc07d9e348cfc6c7539037f95c73212286254f25fa6a46d11c9db98f583a82ca9953caf6bb258bd6ca4f6
 EBUILD seafile-client-7.0.5.ebuild 1062 BLAKE2B 6554b553c116a436521026bac9e4d5bd45eea8f919dec85b9e55b4e9ff629523d0ae4076c12c94e8f1af135fa314b927d37cc739b571b92c377cc03b18f30f80 SHA512 f6a0e1ca65fb6d673fbbb3beb384b4d689335d65af051de610fa2a7cb8fabeff5d3db2e5a30014dbf911566eeda9b084901dc50c74e72f4adc49008a8a8b5400
-MISC metadata.xml 541 BLAKE2B 994b8936e2a25627989635426eb7f2e3a23f1943b2c5908f50a789bc1f5f84753efe6e305effb1046bb4948224c068233079fac0003e3f5b2beb507aafdac9f8 SHA512 4ce109a926de9d456bf209ff539f57e15f11c8bd486ea1984658383f5435fbec3ae7b8a77cef45409f5fc6a7e4c6c91b7890bccb6e8ccf3eaa721b92d916a33f
+MISC metadata.xml 345 BLAKE2B 5bb1b4c7f29473d3796c8c466c2ed836b01251edcbabe2b1800e19be723e206810ea9fd9f1ae9426d7bade242c31c677c9ccffb9c0fa2874c0f852c194980710 SHA512 6365751dd09e9f9caf9441e3c9235e39a47c80daa36697aa8c96ab9015029565ac0ae308916625549115a9a8ed0e5544e584e46928ae44a55aa9d88e5d00c1cb
diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml
index b8aedb1fc8fa..f8cd338dfd6d 100644
--- a/net-misc/seafile-client/metadata.xml
+++ b/net-misc/seafile-client/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>efremov@linux.com</email>
-		<name>Denis Efremov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
 	</use>
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 95518f092ede..41b7fa493d57 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -6,4 +6,4 @@ EBUILD seafile-6.2.11.ebuild 1056 BLAKE2B 279d62d80210e1112f63b975a032628da38946
 EBUILD seafile-7.0.2.ebuild 1057 BLAKE2B 440195844dcbf7b5e5ea800ea1d6a07b051ef2cb744d24a6c7059ea25f29d276649dd06117cf765e9c66e0f3c05788ec4b770c250127b07240566ff9488247d0 SHA512 a2c3e18063f7d01966ae0eb0339a5edbf45b6ca2299b7a95be1b5111d23242abb4f67371299ac76544c223f4fcd7added5039eab6e8d9bb678dbb0c8f3f415ae
 EBUILD seafile-7.0.4.ebuild 1093 BLAKE2B 46879e54739245bd99bc7e0ba179c2d73ed005b4a4dc9e63646dd9e77852f4949165578a6c3805c2b8595ebfdb0008c4a42d033a1cd580d4142be515bf167545 SHA512 7399a6e9da43f618b66d3a1d8fbb608e9c3d318a40abadf28baac63f5a4404b9a44a465ce68cdb21eb85d21ec62a2d332808db59938ef00ada40df50c787f238
 EBUILD seafile-7.0.5-r1.ebuild 1070 BLAKE2B 630903597a5ac4f4ac6f198e4ce2ecdf105f07c9f8f34e98435a7b546decec5db448796b227a3265ef0bb60781b5c5e686244eed355b59b2e6b8299c087a5412 SHA512 4f1008cfee991a89a778ab614d7d08babc38248422a80b22a8ae544008e480f5cf55bd460bba4d66242d9ade3a8b10c2689646d3ec14b2afe46876fcb9cd4b24
-MISC metadata.xml 442 BLAKE2B 46c5da41a70765d782fa536789caa196545f800145ad109df96cc0cc819e41411aae7e0beec1161e09a37479ec9e6c79ff08395fe73eba8a092c07ed40a37f41 SHA512 b134c065c3c389e0db935094b7efbed1eb82e09be3ab83b31b2b84c3c6860c7fe002554e1ee817f69c8f873a67a352127b8d8e663a5088f5a38255ef15f2e20b
+MISC metadata.xml 246 BLAKE2B 982e99661e8894a8808c39c6ee396fbe1fcf4430ad6a4c820b357c5e96f45e008d92d3319734f94c7403b926bc7befaf231037e832bc3521952ecf9bc42f51bf SHA512 71bf99d5820faaf9004a517dffec80e1a2240e31b0db7449f672b68926c0e229cd710670468e95cf305d6136edc5e2d825e597d4648a90f68929bf8d82a1d61a
diff --git a/net-misc/seafile/metadata.xml b/net-misc/seafile/metadata.xml
index f2d263d441e9..36923d5c8719 100644
--- a/net-misc/seafile/metadata.xml
+++ b/net-misc/seafile/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>efremov@linux.com</email>
-		<name>Denis Efremov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">haiwen/seafile</remote-id>
 	</upstream>
diff --git a/net-misc/sntpd/Manifest b/net-misc/sntpd/Manifest
index f798293cbaae..0367781edab0 100644
--- a/net-misc/sntpd/Manifest
+++ b/net-misc/sntpd/Manifest
@@ -1,8 +1,8 @@
 AUX ntpclient-2018.244-linux-headers-5.2.patch 298 BLAKE2B bf39e7f0300b925a468c423d2ed6d41bb646ff4b034e264784e64fc6aeb9497c40154e21b1a76930104d2f62b8cdfa3d17ba3abdbbfefe95a3329438a009938d SHA512 dc92198426f3a859c5ff2618f754c279aa24e147ec0b165baa85af213c42bf011e7f2f13e33116839fc5b8fdc7e79405f113cee253bc5adbfb2fa40cbc6c3596
 AUX sntpd.confd 243 BLAKE2B fc2d82b48e8b57e346ebe5fc65750368b09dce96dadbc159033d7181e9bf0a71794969b24310975b72d10faa22753ca3cc751c03b3f0775aa085f39d87f695f0 SHA512 b2ecb3e96418d36504c8ceab5ec88f7415e7fc32c00bd9fee0eb6fb643f207b5c0e481427e1fdb7a3e52a5bc2619b67363e7c27dd48e67eab61910906b86df3f
-AUX sntpd.initd 252 BLAKE2B b574c0e208548dc960a8dcef5998fc44246c77972a7d09938c775b54beffdcb39cfd300b7d72c502f16c9382b30c8aab65881386bb027ab4d5969e3bf7a5abd3 SHA512 7bc79fe425d078309c1b064e365ec6ff02880f97a05c83607bd4ebcd747be1d11e9f26d64408edfff53044555fa6fb828887f1902d09c69e7d03c148bac588d1
+AUX sntpd.initd-r1 281 BLAKE2B e16573772a24d6c6380dcb769a2f87f73249aff34c4bc6ffa67700374ede21ba318d0d5c0c444f304cbea5feb613a2eb70d07e8aebf5fe291f3da0358becc487 SHA512 38d3950d774132114fe7270c8c39a44428e89372bcdb7833cef75e5775579dc88679b9f167ed29e3e7e620927a0365d2de7c94fb263b414439deb061a8c1db9d
 DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc
 DIST sntpd-3.0.tar.gz 151995 BLAKE2B a67615c874fd119e083d99d269a92a550d875a18a973e0b2904cab1fe6631b6c4e98d86959fbd9c1a387396f1854ed1c264920e2b40e6355871cbc8a4e40a4b5 SHA512 664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea
 EBUILD sntpd-2.2018.244-r1.ebuild 861 BLAKE2B 453645dce4a010fa7b58164ee9229204e5b697754320e5b31c0d8fa27229fbe2e21022343585e2503e8074e40fd4d278ec6e7288285e8de428e857631066c05f SHA512 4062ce0572a597f336009fd11104f7f6aaac43aef17b41ab77978089aacdb780245bf96d5aa2125a68cab41b13753593257462eb4fbd6ba078eb3f1f0cdc9d70
-EBUILD sntpd-3.0.ebuild 803 BLAKE2B 78a4ebd3e706f02548695580e29582c18162cf2e2ee037d54d3f10b9de0689ca816eac72ac2bf25004f235c52f077e289951588778a42f3866996d407fe41956 SHA512 5df2212d0c740738b5ff1fe74932ea64cf62b71862f16bdb89c3d665ac30d1c017534979c8424fea809a668da26b94cbfa355166dc237fb370e6f6c719a49b05
+EBUILD sntpd-3.0-r1.ebuild 823 BLAKE2B 2e314e506b3a825efa31f5471cbedad7c3f9bd9b66212a32d9d0eaedd112e1851615ccd644ea52164ca0451e54e81aed1cb83bd45c69cf71ca79d14fb9a3f71c SHA512 09e33d85196ee16be8fd04a68c99ccf745167d6a0eedf322a145e46488c916b2240ded3d268beee4ac77d2857eb0c4cad7cf2c9718910d2a7737a268ffc7f5d7
 MISC metadata.xml 1215 BLAKE2B ea6284bde03ea2157cd105851ad90a1a2cf379bc6b5f0742866d25fdb2997e0875dcb350984daa79b63625b525d1b53cde28b3fa47220591540a165955273fc4 SHA512 eba1d1787f52e8101cb64df313df7eb3ddc2e6b593d9acbc8b5a8accacdd6d7b0fd02c4b73e65ffd73fce1bbbd10f3d206989e5b2d5280ad84aac97506568659
diff --git a/net-misc/sntpd/files/sntpd.initd b/net-misc/sntpd/files/sntpd.initd-r1
index 2e4c0652c940..ebe857af4afd 100644
--- a/net-misc/sntpd/files/sntpd.initd
+++ b/net-misc/sntpd/files/sntpd.initd-r1
@@ -6,7 +6,8 @@ name="sntpd"
 pidfile="/run/sntpd.pid"
 
 command="/usr/sbin/sntpd"
-command_args="${SNTPD_OPTS}"
+command_args="-n ${SNTPD_OPTS}"
+command_background="true"
 
 depend() {
 	use net dns logger
diff --git a/net-misc/sntpd/sntpd-3.0.ebuild b/net-misc/sntpd/sntpd-3.0-r1.ebuild
index 4b7079d372b3..5edf61d7f025 100644
--- a/net-misc/sntpd/sntpd-3.0.ebuild
+++ b/net-misc/sntpd/sntpd-3.0-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit systemd
+
 DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client and server for unix-alike systems"
 HOMEPAGE="https://github.com/troglobit/sntpd"
 SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.gz"
@@ -28,6 +30,6 @@ src_configure() {
 src_install() {
 	default
 
-	newinitd "${FILESDIR}"/sntpd.initd sntpd
+	newinitd "${FILESDIR}"/sntpd.initd-r1 sntpd
 	newconfd "${FILESDIR}"/sntpd.confd sntpd
 }
diff --git a/net-misc/socket-burst-dampener/Manifest b/net-misc/socket-burst-dampener/Manifest
index 6651f19f3d9c..5202dcba7c09 100644
--- a/net-misc/socket-burst-dampener/Manifest
+++ b/net-misc/socket-burst-dampener/Manifest
@@ -1,5 +1,3 @@
-DIST socket-burst-dampener-1.2.0.tar.gz 3823 BLAKE2B 44a24eb357647873e328bad302e89cb08ec48389deb0e2abb9b7cfcba32001805929b3e5df0045ca38e64d51fce0784e9bafd17b9f840d65e0114c25a4228592 SHA512 e2130abf33c95255dc4249fb82a628b2569a0db8582f4b42b07b0c2c88d7f3968634062a4befc9ab4a257c750e31dbc5ffc5512a9b1ab2e34c8f660f598da080
 DIST socket-burst-dampener-1.2.1.tar.gz 4438 BLAKE2B 5fc8a52370c3314f625f71f1ddf816300c4aa423b09c2ec8501372246dd982d4166dbe47260c5a44675c26afb1f83f0ae9d696950b4c754c17303481a5d536a0 SHA512 297c4371700508091850e7022f8a1f245fb90720ec5fb2b482dc8bc2aa2a47a0c9087c91827cc4a95ef1cbd546cdf005e61a160c9f78ec2d7849ec83f79ac77f
-EBUILD socket-burst-dampener-1.2.0.ebuild 645 BLAKE2B f09e23bf7f5aa9a9ee2690a8c046330f025604e3506c81873c13df58b48475180116fdba09b77c304170c06d571e86ff392d657a18140e561dee666882bbd7d0 SHA512 9301ba29269c28435fdc7c439cb9bc7fec3e044c258db6ff42b6de864326785bd2dd172e2911ad52d87100e203e17d5d9881a2c09ca27978b0d174c129ad1d0c
-EBUILD socket-burst-dampener-1.2.1.ebuild 651 BLAKE2B f419b9ddc5401f31d3a55465d39b03bfb4b1566e6817774494fe25f9e139dccafa7aa757b00d09e73ce32630686e0b8d98bea66d5cc25323146f02d130691886 SHA512 65fc4724dc5beecbe5da7b8ec24650a430bde2062a79c761135349f6d707766ec75906fb147d4f7231cd61fe02925db359c2cf80d97c235f384f6559201da018
+EBUILD socket-burst-dampener-1.2.1.ebuild 653 BLAKE2B 736cb0b247a72a7385ab31a3c55234517d4c74d24696cc216c53432e0f6d41977dbd49f13c666ae797b3a2b09bb3481452c34fdcea2286a36b18017a50356439 SHA512 defc3379e106c274d7436d692cfbe8e1e806ddb41d121f38c9a01a796ef6576dedc1951662501bae2a15a468ab58e25b2dd6c4ed4c15dd4db4ccb75b6626dc39
 MISC metadata.xml 312 BLAKE2B af48a35f7fa9f645522293faddb615bea586daf209350d9697863ddc979f489863cbad923786c8dde79284d103110347f095ca0dfe8913ea328dbd9d142255bc SHA512 ba8571dd5e13df29810fdc4fc852da5bc40fc5e4c6b58fe94b85801b678c768ed2c0a7908303a46307351ee282705fd547e4b0e92b3ab8fd18338d819a0cf4b1
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild
deleted file mode 100644
index 961f97283cfb..000000000000
--- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +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 distutils-r1
-
-DESCRIPTION="A daemon that spawns one command per connection, and dampens connection bursts"
-HOMEPAGE="https://github.com/zmedico/socket-burst-damener"
-SRC_URI="https://github.com/zmedico/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i "s:^\(__version__ =\).*:\\1 \"${PV}\":" src/${PN//-/_}.py || die
-	distutils-r1_src_prepare
-}
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.1.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.1.ebuild
index 047476560a10..4c83798814c5 100644
--- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.1.ebuild
+++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 2503b7ad0d2a..d0eb075c1f5a 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -5,7 +5,6 @@ AUX vde.conf-r1 341 BLAKE2B b61648c4559e7fdc240ce7c82da6a0c0d53c4a94637ab0a4fd0d
 AUX vde.init-r1 1022 BLAKE2B 3859d94c2e0871998eda1ccdddf88ab01a00a67c86ec9c28710efe8347d302a97fe727fe3d58c61c1c3abda5a5fb401ca12672fe06cbaaa75b1beea1fa6d9281 SHA512 599b3560721b6e31cbcc21e764df772bde2a8bbf131b47ebb575bf31855a53237dd1c265d33f31c91e3115d6f8cb9f94493d2dd6792c8bedb011299d1ed6d8e9
 DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971
 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
-EBUILD vde-2.3.2-r4.ebuild 1664 BLAKE2B f8da664dc0bffde29dcd6086a6140fa7d890ac3fe505ee2a1cb7e7508d7f635451e867d60bf5a4c1cbdd7082556e15a198ffaaf434028b1c6a8b2a699590a352 SHA512 516232acd5db7ef34b7a1064870a0ad2797525bda33379abbc11a18a29b99e5f86a0fcf7b22d081a99602f15a0d6e94d3688f61c9578ee50a6796e93decf2a36
 EBUILD vde-2.3.2-r6.ebuild 1492 BLAKE2B f5f82e24bdbffd3eac3066c2a26657a3f29041e634f9b0132c7d2ee9323536be5e75912716b137f1bdb3dd30bd9a86a32e86089188aacb30e41eea746887c22b SHA512 6b5abf52deb147499c294e58c2f363df0313eaa9a7cb1af97369a5ea557c706a8ed3199bcb3405770918c97765417485f140d3e28292b7f8e6b62c8bef502400
 EBUILD vde-2.3.2_p20191011.ebuild 2190 BLAKE2B e0484281c05d992c02fb27c908a05eddd0b4a62a6cacb7331add7ea5c53702cd3e0006e1c5db17db5df7a54051b5198ad12953f3b1922f44d4acd8387073b34d SHA512 5068cbddcd630a5c87bc021cde9e4fe2a102d997c4bdb7e131ce1d6e8602cf13511e887d45520ace6e1fe74e6e80b327426fb1edc9a04384b5019f5983cbecee
 EBUILD vde-9999.ebuild 2190 BLAKE2B e0484281c05d992c02fb27c908a05eddd0b4a62a6cacb7331add7ea5c53702cd3e0006e1c5db17db5df7a54051b5198ad12953f3b1922f44d4acd8387073b34d SHA512 5068cbddcd630a5c87bc021cde9e4fe2a102d997c4bdb7e131ce1d6e8602cf13511e887d45520ace6e1fe74e6e80b327426fb1edc9a04384b5019f5983cbecee
diff --git a/net-misc/vde/vde-2.3.2-r4.ebuild b/net-misc/vde/vde-2.3.2-r4.ebuild
deleted file mode 100644
index 868a1ad7cdb8..000000000000
--- a/net-misc/vde/vde-2.3.2-r4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 flag-o-matic
-
-MY_P="${PN}2-${PV}"
-
-DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
-SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
-HOMEPAGE="http://vde.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE="pcap python selinux ssl libressl static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPS="pcap? ( net-libs/libpcap )
-	python? ( ${PYTHON_DEPS} )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${COMMON_DEPS}"
-RDEPEND="${COMMON_DEPS}
-	acct-group/qemu
-	selinux? ( sec-policy/selinux-vde )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-format-security.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	has_version ">=dev-libs/openssl-1.1.0" && eapply "${FILESDIR}/${P}-openssl-1.1.patch"
-}
-
-src_configure() {
-	filter-flags -O0 -Os
-	econf \
-		$(use_enable pcap) \
-		$(use_enable python) \
-		$(use_enable ssl cryptcab) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-
-	newinitd "${FILESDIR}"/vde.init-r1 vde
-	newconfd "${FILESDIR}"/vde.conf-r1 vde
-}
-
-pkg_postinst() {
-	einfo "To start vde automatically add it to the default runlevel:"
-	einfo "# rc-update add vde default"
-	einfo "You need to setup tap0 in /etc/conf.d/net"
-	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
-}
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 7db5db2e41bd..92e07e04438a 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -6,6 +6,6 @@ DIST whois-5.5.6.tar.gz 103581 BLAKE2B 7e4aebeb440b95a278a0f0d0e51dbec2003599ee9
 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
 EBUILD whois-5.4.3.ebuild 1573 BLAKE2B fc50ea531b65cef7b4987129c8c5669a417455d50b277a5da11f1c1d418a278e549c2c1a7d958d1c52d4bf6cc33a538f64d53898dca779dc90a6940b44a6cd07 SHA512 e6547e93190db050a60658e057da8a204ab7f441d5a5f9d45145547c60bf21804e63b36b0ec29932873fade1cc048f10c6f0dcb2084574c8bce9c04dbd488a8f
 EBUILD whois-5.5.5.ebuild 1799 BLAKE2B 88352b97b5f99ec654251f4e44fccc301c922ff3bff5ead97a793187728630d8c5d17a25fb008201407c6c2b35cc545772ed60ee73c7cb0676ca195bc8d9e57a SHA512 b5668faf787c2bf8f6786dab4a075e10a186c72e219f43cac4839bed67a88d192137091516495725fc30242e1a240d13f5dc93712e7c40c21846cd9b790dddda
-EBUILD whois-5.5.6-r1.ebuild 1933 BLAKE2B f484171828eaafa8c7d380c800ffaeae33a4bba5c832f7dedbbdaa80bb60ed93cc68c34fa00afaaf1a94c9aabca64251bdfb474d0150d22a04dbb01a46dcbf7a SHA512 5fb403c5c6a379f6014d15c6aa8e6b3dbe0acbabfde65a8d9311f8dbe0c10d6c16908cb20034ed859015b68ecd8b1b31a2fa933a78acba7bf25ef0d5a3f48165
+EBUILD whois-5.5.6-r1.ebuild 1929 BLAKE2B 652aaf93a1b4dec8f173281ac8ff5c914ea0ede736b06d21313f3a477e9c561285a22c6564a1c969507660cc0f717c5c9dfd481e7d916d0019a4d68b98937d69 SHA512 fbbb0713ef14357e26d7b0daeb5173dda84e68379e357ad1902835496664486937aa4d9a0c8bee4fa410a1721d619f071afe4558f4e041d0795895fa0266125b
 EBUILD whois-9999.ebuild 1913 BLAKE2B 1b7be0cc8b1d074cbe507e9dee7c0d1deba0e1b4389980a2c29026d37b51abd21dd1b52213f381eeccca69787580e8a4b72fc572ab2fbdc51ed91fcd185ad217 SHA512 1f365041a0b643011257e9edeb0f036f045fdfbd1018c2eb8ecea6e7839839e55817fad892c213c7d7364776dd8dbe33152fa16587bd7b94300ca8cdb3ce0828
 MISC metadata.xml 438 BLAKE2B 3c2de7b15d6973ef59d174c857597c7f320176305e7f37df85694b87874f9590f37b75402b9ce273c20855a67c54e47f64cc5c0f0cd77a5baeb348bab5c44356 SHA512 cbe1e74802cc8810ebe72d9daf7a3863bec49f70c0ac17c09c5616cb3dd5074ecf1e53172b522f30197f7e994ae7596f830dbf4c791c86083727d8b452db309e
diff --git a/net-misc/whois/whois-5.5.6-r1.ebuild b/net-misc/whois/whois-5.5.6-r1.ebuild
index d562bf425991..6e5eedb90f13 100644
--- a/net-misc/whois/whois-5.5.6-r1.ebuild
+++ b/net-misc/whois/whois-5.5.6-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index 2be0f36ed207..e0cc3b913841 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,3 +1,4 @@
+AUX wol-0.7.1-musl.patch 347 BLAKE2B 4ebedc009fb77556004f8bdda8679ca2f0eaca22145aa395a69ce6e78319a6c3fb430bc4ea30c4887dd4e870ad1ff36d7369ec3dc50a419bc5e8ebcdd29ebd7e SHA512 b7568aa53f20a0402aeb9ed579fab2846245df134c000cc4483ce63f01ec64943708595fff9f78c73e6c6156ddd06781314dee46a06c216c9abcd0f1ec696208
 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
-EBUILD wol-0.7.1-r2.ebuild 537 BLAKE2B 2779a8f0998d6484990426b3d134994d048bbe3bd6b95974f447bc1de40c5b8de697c90e0b3b0c64422dbce34b8188dd2069eb5f6064378e19f631bc0d68634d SHA512 a604ab3610cd7796a6b93a680d977af465c57a749a45372a06ea6a5e7bf68bc0ad2a37fdec57c742b13dd2bcd762e6894bad263a0375342a88cd0a2dc35b287f
+EBUILD wol-0.7.1-r2.ebuild 580 BLAKE2B d1f96ecb22d0ae3e8ed3baca024dcfd1ddd529c5e0e15abbffa11de33c45e9b2c7bed2540e91e9ee39f3a89bccb70434a64dc114f3b90eaada9e9bb492351499 SHA512 859fb5df28af1a8c11e23f3eff2f07d9e6c74ac78e15f3709cdfc9db8ca146e8c07351b55e02214104706c7bf83356dfa9d941b821dc851b49b6ae878ab7c78c
 MISC metadata.xml 616 BLAKE2B 5beea9884b74086c02e1cf37e08157dee574c98c56f06371e96132a31747be644761601429ff79211eec98004dd468b5e51e7a71c480b0d6e3e43d3e5941dfa3 SHA512 ba5865dcd92e68b01a21d126aadb530d936639bb391b959c683e83daefcc671201b772a713fc0a6397eb892558c8e9691700ee97955b3992fd64ecf1cdc9c240
diff --git a/net-misc/wol/files/wol-0.7.1-musl.patch b/net-misc/wol/files/wol-0.7.1-musl.patch
new file mode 100644
index 000000000000..c7c0dc6028ca
--- /dev/null
+++ b/net-misc/wol/files/wol-0.7.1-musl.patch
@@ -0,0 +1,17 @@
+--- a/lib/getline.h
++++ b/lib/getline.h
+@@ -27,6 +27,7 @@
+ #  endif
+ # endif
+ 
++# if defined (__GLIBC__)
+ # if __GLIBC__ < 2
+ int
+ getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
+@@ -34,5 +35,6 @@
+ int
+ getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
+ # endif
++# endif
+ 
+ #endif /* not GETLINE_H_ */
diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r2.ebuild
index 8ee1f1db4070..67f55caf695e 100644
--- a/net-misc/wol/wol-0.7.1-r2.ebuild
+++ b/net-misc/wol/wol-0.7.1-r2.ebuild
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="nls"
 
+PATCHES=( "${FILESDIR}/${P}-musl.patch" )
+
 src_configure() {
 	local myeconfargs=(
 		--disable-rpath
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index 051bd0519258..cb7741a68284 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,5 +1,5 @@
 DIST you-get-0.4.1355.tar.gz 143921 BLAKE2B da303fbcedd0818d785f846da4022364c3782d74b50f01b8aa2c0da38f4d61108da22a991e3ae02660021df6ee3378fb9e03826210563aee37e7f85e72b52fa1 SHA512 20f092d49e554f994b57dec4f12a8a0f4aaf418f8e0ce68611e1424f5ee512cad104c5498fe7d133ae8fa1c65440fdbebb8d523d9792336ea5c62ac3a58aa9ba
 DIST you-get-0.4.1432.tar.gz 149854 BLAKE2B 227fc950dfdfdbcf899a06db37e0b4e9060e7f82bfbae8a8081a6930827d32f59cc0ec32c0c2166f46d55b958930cafdb4bd1e81d46b7326ca759c58e4e68cd3 SHA512 aef856c86f574470ffbe0ebcb056b63f08663c514a68fc3953a2c10497df44d5f76fa19c593c1c02559effd13f32c82bd52738d033b6cd0bd7b1e8f8c418b680
 EBUILD you-get-0.4.1355-r1.ebuild 489 BLAKE2B 553a8ad218524c336b2ba4d0b1c814b2325a8d9d6dcb8a05e3842cd08938056b54555a80167ff3b331c153772d91878757d6a31d49346455a3e69a73a135bf72 SHA512 5be3e46d8fe95a94ff6d5a0517ac2a0eb0703e03c8d1dc06a19b887e77c53a613fa99ebd1b1195dc4ec2e8077495107b2b474704eae4923bc078e74ee9e59aab
-EBUILD you-get-0.4.1432.ebuild 528 BLAKE2B a938f81662e2d2093ecc29d38cb59e9265c258e4f35228e2aaa66c1886258e721cec407157eefaffdd4b4d247e10e7a20818db601eb9aa17b3c438c4ac889214 SHA512 470e3037e1c204915d4ef8c2f1b541180c390cd56118fe04db7f75feb76ee62773ea5403690a9a455fff2a6a0be63741de632957a5b1c3cb57c5e7065f1b463b
+EBUILD you-get-0.4.1432.ebuild 527 BLAKE2B a1a8af54793e1aa6758c1d6120137fbc37c5561b523d0a61c9ae954ee5fb1a9e167c7db8d20978c37b50f173fd7891f825b456f804c3f554de06621d0e848b47 SHA512 a0546b8ca67a6767b8e920c7e99cfdb9a2e1f19a2f5ebb2729559428e6e97e16c803303e4bbcfee6c2a0c8c4cc682ddc25a9c2fb16e206e8685aa9640de791df
 MISC metadata.xml 330 BLAKE2B 9d17cf8bd3386e62f13765cd48f3351ef8a3abd726772d0d2d1365c8f8fa531efe401c33a46232092aae2a0f846cee99d5bfba400f5f1b2d10466220d20477c5 SHA512 923e442a3f28cd825b34e717db363907d19638656c7045e705f1cd4460868e7b602de696096157097e2723d9b537d09130d2d8506ec206b3c874d205150a1dd6
diff --git a/net-misc/you-get/you-get-0.4.1432.ebuild b/net-misc/you-get/you-get-0.4.1432.ebuild
index 95797d08f17c..5d6729dda22e 100644
--- a/net-misc/you-get/you-get-0.4.1432.ebuild
+++ b/net-misc/you-get/you-get-0.4.1432.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
commit	b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree	9026dffec53f92cba48ca9a500a4f778e6304380 /net-misc
parent	3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)