gentoo resync : 22.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
commit: 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree: b9791a06ab3284e27b568412c59316c66240c682 /net-misc
parent: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
136 files changed, 1624 insertions, 2667 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 644aecfc0370..d3d6c9fd034b 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index a542939fbdde..24a52a7cef6f 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -17,21 +17,17 @@ AUX initd-13.38.3-r2 9933 BLAKE2B fffa5c97efc3691570500960cb01e86e0003950b93c670
 AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b573839db7860fd10828f444aef0f08d189a4e129a5545538424c1698e7d9d980cdbb44da2e68ff73dd0c75 SHA512 81747f6e6b4142b341797a8b2e9b212a48870d8db661669759020cc4c3ab0b66996a37dbd35afaa842dc00cd43aa834d3146021420b3f29b0d2f8b6e11d3fca7
 AUX initd-16.22.0-18.8.0 9974 BLAKE2B 29c3d51fb9935267061f33d5a5763dc07fdade2301f9f6c0b2b40cf866dd3673714e52e59b442c688e5c02f883718ed86ca227f6ba2fbe23e3919d23558905ed SHA512 9182c1385f404c3a4b7d3b72d3f03d4e34d3bed38378639a18f624f6a5cb95c451e7712588ee163ce8852b5eae1df01ff258bdb77cfecbe8130752f267079d96
 DIST asterisk-13.38.3.tar.gz 33711458 BLAKE2B a1f37c210e7e95962665310b542d9a3b682ecc5e90188e8272a0cd6e22ebfa963ed5af46f0f85c2074bc0bbe34d72473343ff3437d80b58e5383eb80385d0b89 SHA512 dd67f73704f1c68639313852ba1508165c7b525f0f4156c776258e27ee19a0ee87293ae7805178b0f37188fca91b861c52b5206cbba754a6181492d0efb7e895
-DIST asterisk-16.19.1.tar.gz 27870922 BLAKE2B e7b2ceac60f9db19802acc6c69b233556834815e1a9a3d17b2fd331d2577beb356f31a531a6d8fde70f78e9362bd8b6dbc796f906557c82bcd4847a612c788a3 SHA512 7b74fedce91ac597f3cc7a03b401ae7506bc6479faf008f3ea9c0f4783d85c5ce06d71bf73333d4bc1609a2cb96511d931d79f3bc8613906f370f9b4015b30b9
 DIST asterisk-16.20.0.tar.gz 27888074 BLAKE2B 74f7812db787e5dcb041850fc7e80229e05ef0849cf373be29f9a3ac2eb0f2244fc6f2bd2a3f411c4d37d968184dfbc140e55ad62de53e6beb0b2340179b831c SHA512 0e270c2d00eda1aea3135eba427a77ac2abe66a31c868cf700d5cc26bde65fded6f2191d5e4af361b2e055ae04f2943611ca1fa19815a4a690076a83fb899148
-DIST asterisk-16.21.1.tar.gz 27912610 BLAKE2B 75b93fbde52d72906bb613b1d42b7fe592fac9a6af76aabb11dab1bb15b2ad8134f8cfe0a9a58f5f72928e046b0b6111d8e899909d6baca3fd820b583c6acd35 SHA512 399875d3e70e2ebae8b27edc9d97b485d7acfe7a99c1f6e2a6212ccac9cd77fd4e720ccb1cf4d16a441fb8f894d8b9a64785c48bc606a0cfd105d2b7ab16d766
 DIST asterisk-16.22.0.tar.gz 27925083 BLAKE2B ce700f8924fb2c7c8fc521879c0768595eb7462bb3aa78dd8b64c8a268b357e522ece17c6c4a02a4e17c16bad5141d5c2c15b602d335567be5a3df49f67300ca SHA512 7032da647f4063320fb2ea9c3cd7b0079fbb907e5c8f9d5cdc4197c82d07c99c75bfdcace5c74a593573cd0d9a1b9eb73b2030dc0b13604abb481a311a742173
-DIST asterisk-18.5.1.tar.gz 27953748 BLAKE2B 543f2bfbe1527f3a168dc73d3d9f20e80e95be9de9532a97ff6a5c70a548d525c39ce5251b80dbcd1c0e31c066fc48520e6c373b1404bf24a00b0a48ad134bcd SHA512 95f30c14602587827c7d7bc4652639163f4fe6338fade35d533525aa8825d7a5082c9d6fa4671a5f4f89bd90a0d657ce7e51fd4216558bd367abcb10b25aeb23
+DIST asterisk-16.23.0.tar.gz 27960909 BLAKE2B 60aa12e41c199da7c052555f5716fd7325de66d0821c8f285635c8ad01435a182c670b12c9d3959ce8206b1bad255e61eeea199bf23b9dd49915da84487e2ce2 SHA512 d9f6cc083afb858ce48b090bea6a8479679ff840eb35dbc6af7d88ded17539c6e906547a7d936de31b3a50d692df1ccce2fe40b81bba1dc6a82a78c94e1198c4
 DIST asterisk-18.6.0.tar.gz 27970531 BLAKE2B a2eaecc962b236e6e455b8d305c05f33fab8e4d6c63eae1506b8354710d6e3e0e3c6da59600555d880520bb58a13950f830057ac03bc82628ab27b2627de52c9 SHA512 17ad7e4dc86f75d4e70f779b6fe6958ee544233b20a36847a6624a7f07b135ddb415f5dca245843ea359e9a6a7c75bfc40ce36fca1df5a7a12549ae522fa2590
-DIST asterisk-18.7.1.tar.gz 27995503 BLAKE2B edc13b33243507114fbf2a514fb67d462ca2f8095e4eba95dccd194b4495c3be256ddff280b7400182fed7ffc4d0a462c687f5a23e2162933e0603464e851d54 SHA512 5e08ed7e95d00538fd24ed46644818d690fe8c5b8f8d6b9a7d01120c7de28138372f8e166950730b65bd0ffc3e1028af89377bde598bee549ca86d369f9427df
 DIST asterisk-18.8.0.tar.gz 28007752 BLAKE2B d5feb2a03003869ee304cd38bc3abcd77a13614c4f1f0a871d517c972f661c17de3da7f452345aaa11e23526a612c1805325ac5a3e902fea1070f63c993ef3fa SHA512 aa06077c6e33e35c35bbaf7dcee13782197f2d9f61e159741ade20050a7bd0dd9a7f6a69d539ee3789af950e8c03518d6186abc99d93ace38dd7e9a1e5dcd337
+DIST asterisk-18.9.0.tar.gz 28045278 BLAKE2B 776be9ee6481dbaf38ff617dc5cc2525b226d57fd93a7ec180c20795af3a7905c5239b1e452628cca463f9d8e077ead794afde6425d39043eb4c3dda3ceba7a6 SHA512 514f806ac93c2975101133e897c20e4483ad97141b125de5b6fcb96b8acd3248bd0d4fc638381fe9e9be7b504a35ddae24d8437c33ed10c88a37565577af52b6
 EBUILD asterisk-13.38.3-r2.ebuild 10884 BLAKE2B a5d6ad2195ad4375d43cc95ef76fdfd5e1ebb075c1907cb320ad98de9221f32e2ef6754cef38fa0f9633995ce58b506a4293e84ef085d87803f6eeb93f7ecdef SHA512 2abb7f02954fb6039c4cb4b71db6ed09ac6008273c084db47162db880a13a504cc4f1d293c97770b7f363852c159db9e4f62f54a91c23cb40f7f4244399b056c
-EBUILD asterisk-16.19.1-r1.ebuild 11250 BLAKE2B c187f9a9ace7b0b27cf7f435a821be029a958a3b223c9e57dc37dc2aafdfd10cac7c401726bd3afdc25dc97692b061ec96429d390321a812d7f1c9a9510bbf90 SHA512 3397e1de8591eb3ce5c83f8d123369c0bffe96e7b33c318508ae1b1b5cbdbc552bc5887c1a6f24aa161750f81d682e0e832d5ad09b78f570c850d35278bd879e
 EBUILD asterisk-16.20.0-r1.ebuild 11250 BLAKE2B c187f9a9ace7b0b27cf7f435a821be029a958a3b223c9e57dc37dc2aafdfd10cac7c401726bd3afdc25dc97692b061ec96429d390321a812d7f1c9a9510bbf90 SHA512 3397e1de8591eb3ce5c83f8d123369c0bffe96e7b33c318508ae1b1b5cbdbc552bc5887c1a6f24aa161750f81d682e0e832d5ad09b78f570c850d35278bd879e
-EBUILD asterisk-16.21.1.ebuild 11252 BLAKE2B 0ec58a25537e2be301ab08745848dc82c195c429dd9b942ad02893fd3845345d3281087d56335ac9aaf4b0e72176c86b06e7bc51f0de86eb15dce98141a19714 SHA512 56fcb729fe283d66d0ee8442b8261b568654a7a841daf9fb7308091718f1176672c876f5f4bf9560d720cd7b03b7acf993dbdba72dbb2062285dc7ce60e342c4
-EBUILD asterisk-16.22.0.ebuild 11300 BLAKE2B a29cd3eac10268e130d109abf65330057b3bab2a145eaa0f90e43c099374cc6f4e8f3e91af996bc358d020d04aeb75ee28eeb5c580a9e3e29b5e8c1062e0f6ba SHA512 07e6914a1a086e2f12e3cc315657781752d59308ecab43d50947a6fe010953da51fa12dc3a932c131a34b804577ccd61f0c881b4baf40a9fd99af5164283506a
-EBUILD asterisk-18.5.1-r1.ebuild 11225 BLAKE2B 09e5c7e0d8df81ca8ad6778429a22ac3665f34d7fa1639eebd017126020fd7b68d6c0af28b9e848e88a860719d48fe6eb7d43c15f38c1d0dd1764794376609d7 SHA512 50fd30b5acf04f27e3b58b9e1a2cbe9421dfc51132467ba613b1bb18d9ab897bcd12c9265242692d75b3102c7c8293909d0b31542b04e4703bf2802b06a223b8
+EBUILD asterisk-16.22.0.ebuild 11298 BLAKE2B 897154c0fb088236ceafe0b431a71ba9cef7ba47cc0accf90e54308ae50478e56419ed7126d1805c30605e9eded6790d98d6d03fc06e8a4b6f942ef7d5e873a5 SHA512 515a0750df9e35361516ca076632a39b33749aeb2d88e629229f6a44980a8f58e5d46fd861f8491e5f4b0a1561480afa14bdb3e2ed0527350e27532add0620af
+EBUILD asterisk-16.23.0.ebuild 11300 BLAKE2B a29cd3eac10268e130d109abf65330057b3bab2a145eaa0f90e43c099374cc6f4e8f3e91af996bc358d020d04aeb75ee28eeb5c580a9e3e29b5e8c1062e0f6ba SHA512 07e6914a1a086e2f12e3cc315657781752d59308ecab43d50947a6fe010953da51fa12dc3a932c131a34b804577ccd61f0c881b4baf40a9fd99af5164283506a
 EBUILD asterisk-18.6.0-r1.ebuild 11223 BLAKE2B 99eca23e3eaa2caf971038282d32de5a944f5b62f229b23891a19cdada87a905ae88a9b2440625e7380779cc5a6224407c5e1a28ba1650f051c3151a8c00729b SHA512 a78276a1977eedcaf244f70cf4fc3499d0ba8b3fe07fc0ae1c1e3530ad9de2d24ea752a02829bae81e69fef139263b48767bc029f7db0eec818e334b4287b9e4
-EBUILD asterisk-18.7.1.ebuild 11225 BLAKE2B 09e5c7e0d8df81ca8ad6778429a22ac3665f34d7fa1639eebd017126020fd7b68d6c0af28b9e848e88a860719d48fe6eb7d43c15f38c1d0dd1764794376609d7 SHA512 50fd30b5acf04f27e3b58b9e1a2cbe9421dfc51132467ba613b1bb18d9ab897bcd12c9265242692d75b3102c7c8293909d0b31542b04e4703bf2802b06a223b8
-EBUILD asterisk-18.8.0.ebuild 11273 BLAKE2B 7846bc1f453f77ca7bcee275508008a8d9b93f542998bdccbff97ad67b961b62fc122a0613afc3d0f0799170750bd681f78634652b122d1211138a069c431a23 SHA512 1e5d88bbb7555cb75518631f8190fb133d6c638a55338f7b06faad3f786de127502b5e8952a1c2951059b45e9821c8bad651900faba0769c0b08e2534782ab4e
+EBUILD asterisk-18.8.0.ebuild 11271 BLAKE2B 96fd6cf1dfaf6162e905d8cc38646722e8a9944cf1d475f4d6a3a8e7156b62112dcd28356915a551180759660c45075b43488266f5f10709ed8287d73c32a497 SHA512 64cf9d20655eea8b7a3c508f49f1aaf845a923b5a4fe6578777c5e9d76d578d70b170c6215defcfe47b4ceeac9ed002b2e772d5e73ab89b40ae05c2b27211ab3
+EBUILD asterisk-18.9.0.ebuild 11273 BLAKE2B 7846bc1f453f77ca7bcee275508008a8d9b93f542998bdccbff97ad67b961b62fc122a0613afc3d0f0799170750bd681f78634652b122d1211138a069c431a23 SHA512 1e5d88bbb7555cb75518631f8190fb133d6c638a55338f7b06faad3f786de127502b5e8952a1c2951059b45e9821c8bad651900faba0769c0b08e2534782ab4e
 MISC metadata.xml 1483 BLAKE2B 00aa83418aa9cf46f9ac04f2281157abd02f6e0d77b18e10ec0e516a116d92c87b6bb70a4c595dd5e2553f522f8ebd4ef6b102f30cd02fe8ce261f3fa049ddd0 SHA512 65f32411b7a6ed223a9e12d9f43fc975de7fa00c42e93b6302dbcf50a44c4805d1a116ddea0749d17e28dfc0fe6897ecccd0873a76e6dbf4f9580e2ff6df2149
diff --git a/net-misc/asterisk/asterisk-16.19.1-r1.ebuild b/net-misc/asterisk/asterisk-16.19.1-r1.ebuild
deleted file mode 100644
index a1a9536e12ed..000000000000
--- a/net-misc/asterisk/asterisk-16.19.1-r1.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11:=
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
-	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	tmpfiles_process asterisk.conf
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-16.22.0.ebuild b/net-misc/asterisk/asterisk-16.22.0.ebuild
index 735b5ef050f6..cbb7d1d625e5 100644
--- a/net-misc/asterisk/asterisk-16.22.0.ebuild
+++ b/net-misc/asterisk/asterisk-16.22.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.asterisk.org/"
 SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE=(
 	+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-16.21.1.ebuild b/net-misc/asterisk/asterisk-16.23.0.ebuild
index 236daff8745d..735b5ef050f6 100644
--- a/net-misc/asterisk/asterisk-16.21.1.ebuild
+++ b/net-misc/asterisk/asterisk-16.23.0.ebuild
@@ -109,6 +109,7 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 _make_args=(
 	"NOISY_BUILD=yes"
 	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTVARRUNDIR=/run/asterisk"
 	"ASTCACHEDIR=/var/cache/asterisk"
 	"OPTIMIZE="
 	"DEBUG="
@@ -301,11 +302,11 @@ src_install() {
 	diropts -m 0750 -o asterisk -g asterisk
 	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
 
-	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newinitd "${FILESDIR}"/initd-16.22.0-18.8.0 asterisk
 	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
 
 	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
 	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
 
 	# Reset diropts else dodoc uses it for doc installations.
diff --git a/net-misc/asterisk/asterisk-18.7.1.ebuild b/net-misc/asterisk/asterisk-18.7.1.ebuild
deleted file mode 100644
index 456bc7d82990..000000000000
--- a/net-misc/asterisk/asterisk-18.7.1.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE=(
-	voicemail_storage_odbc
-	voicemail_storage_imap
-)
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	lua? ( ${LUA_REQUIRED_USE} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11:=
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libcrypt:=
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	blocks? ( sys-libs/blocksruntime )
-	cluster? ( sys-cluster/corosync )
-	codec2? ( media-libs/codec2:= )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9:= )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="dev-libs/libxml2:2
-	virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-_make_args=(
-	"NOISY_BUILD=yes"
-	"ASTDBDIR=\$(ASTDATADIR)/astdb"
-	"ASTCACHEDIR=/var/cache/asterisk"
-	"OPTIMIZE="
-	"DEBUG="
-	"DESTDIR=${D}"
-	"CONFIG_SRC=configs/samples"
-	"CONFIG_EXTEN=.sample"
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-
-	[[ "${MERGE_TYPE}" == binary ]] && return
-
-	if tc-is-clang; then
-		use blocks || die "CC=clang requires USE=blocks"
-	else
-		use blocks && die "USE=blocks can only be used with CC=clang"
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-	local copt cstate
-
-	econf \
-		LUA_VERSION="${ELUA#lua}" \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with codec2) \
-		$(use_with lua lua) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake "${_make_args[@]}" menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select codec2       codec_codec2
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select deprecated   app_macro
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	_menuselect --enable app_voicemail menuselect.makeopts
-	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
-		if use "${vmst#+}"; then
-			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
-			cstate=--enable
-			[[ "${copt}" == -* ]] && cstate=--disable
-			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
-			_menuselect ${cstate} "${copt#[-+]}"
-			eend $?
-		done
-	fi
-}
-
-src_compile() {
-	emake "${_make_args[@]}"
-}
-
-src_install() {
-	local d
-
-	dodir "/usr/$(get_libdir)/pkgconfig"
-
-	diropts -m 0750 -o root -g asterisk
-	dodir /etc/asterisk
-
-	emake "${_make_args[@]}" install install-headers install-configs
-
-	fowners asterisk: /var/lib/asterisk/astdb
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording,outgoing}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
-	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	use doc && dodoc doc/*.{txt,pdf}
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	while read d <&3; do
-		keepdir "${d#${ED}}"
-	done 3< <(find "${ED}"/var -type d -empty || die "Find failed.")
-}
-
-pkg_postinst() {
-	tmpfiles_process asterisk.conf
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
-	fi
-
-	if use deprecated; then
-		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
-		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
-	fi
-
-	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
-		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
-		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
-	fi
-
-	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
-		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
-		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
-		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
-		ewarn "steps to migrate:"
-		ewarn "1.  /etc/init.d/asterisk stop"
-		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
-		ewarn "3.  /etc/init.d/asterisk start"
-		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-18.8.0.ebuild b/net-misc/asterisk/asterisk-18.8.0.ebuild
index 11d956599705..b9f7f4096822 100644
--- a/net-misc/asterisk/asterisk-18.8.0.ebuild
+++ b/net-misc/asterisk/asterisk-18.8.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.asterisk.org/"
 SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
diff --git a/net-misc/asterisk/asterisk-18.5.1-r1.ebuild b/net-misc/asterisk/asterisk-18.9.0.ebuild
index 456bc7d82990..11d956599705 100644
--- a/net-misc/asterisk/asterisk-18.5.1-r1.ebuild
+++ b/net-misc/asterisk/asterisk-18.9.0.ebuild
@@ -107,6 +107,7 @@ QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 _make_args=(
 	"NOISY_BUILD=yes"
 	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTVARRUNDIR=/run/asterisk"
 	"ASTCACHEDIR=/var/cache/asterisk"
 	"OPTIMIZE="
 	"DEBUG="
@@ -300,11 +301,11 @@ src_install() {
 	diropts -m 0750 -o asterisk -g asterisk
 	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
 
-	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newinitd "${FILESDIR}"/initd-16.22.0-18.8.0 asterisk
 	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
 
 	systemd_dounit "${FILESDIR}"/asterisk.service
-	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles-16.22.0-18.8.0.conf asterisk.conf
 	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
 
 	# Reset diropts else dodoc uses it for doc installations.
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index 49b952db5508..bc368b972106 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,5 +1,5 @@
 AUX bfgminer-5.5.0-cpus-undefined.patch 514 BLAKE2B 1edc334c1e47dbaa04408d4a4b9eea67a70daf29ddb6120c291d092da9bae01992696e2246a651e8c0d9f1d789c405376c60edbcd6d7f1c3640e29e175507dc5 SHA512 357658486f64738f0f3aa9061e3f9c4471fa14da3ca21603ef4986eaf76f2935b4c0dfeaf006b7a7036ef82b2b547b62a9c00c7de68c245ff5ac1cb889382ae2
 AUX bfgminer-5.5.0-fno-common.patch 2746 BLAKE2B 6954f9016289a6e0f4f5fb68e3c08013f3ad422f6d1710709df3103bb03551d40926d0e4469cf91fcdbe5c6064b9d66bf47309c014a662ef5778a2b5bb301bec SHA512 f59ff668c8deb63e6276129be6e88ad2a347994f3de2a6389e353f61ef677fb73be6f45b090d40cc3546f8456ae291a60bce8645e85f5e39d1d7eed531c5db82
 DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb
-EBUILD bfgminer-5.5.0-r2.ebuild 5212 BLAKE2B 47d631b4eb6776af267f66c6e08b520bc94d4f965ecbebc005368ce7be1f908283fc366ffb82259d09c6a902f56ec4eb72442de3ec2f72d7b4350dd513b219b9 SHA512 41f7a3f11f63e8ce250173e5e585258e1053220dc26e9d2ae9f4ce35b11b503c00a4ddee7498211cdcb63abf2b431629cc6ba75695cf7f73e3d898e1a9f69189
+EBUILD bfgminer-5.5.0-r2.ebuild 5161 BLAKE2B ac9bd0b0bdf7043c5ce1e981b9366fdb6fc03a3520fa7219a4ae3e677eb74b26b7c7f52e2e08352bb5b9c1b9ffd43127de745f1ef4b644720b70ec46c8280fd7 SHA512 8d665fdc21bb33ce0803b75e981294b43db6bfd0810a8068ccb72069675797e086baa3d06b88077af371a9780e4aa6ffa113ab87d577c22951221be2e90f9c81
 MISC metadata.xml 3963 BLAKE2B 604c98e56fe7e6363dd66c092feb78d097ef0c7dfa862c558e7cfca0168ef69de42c786ab2ba9cbfce12e64bf58ac69bc95afed57375bb12a902e9ce8d242c85 SHA512 f32cccabbf109e538f9735f3e37a0d4b44df398e3889af2cb20d336dc6784a8d224d868c7b46d5c4feb4b6beab0ede225e88d187ac0da6ad26892557fc33238f
diff --git a/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild b/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild
index af67aaf1fede..2837322a181b 100644
--- a/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild
@@ -97,12 +97,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	opencl? (
-		|| (
-			virtual/opencl
-			dev-util/nvidia-cuda-sdk[opencl]
-		)
-	)
+	opencl? ( virtual/opencl )
 "
 DEPEND="${DEPEND}
 	virtual/pkgconfig
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 24633761d531..2a64a3615b5b 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -2,5 +2,5 @@ AUX libbridge-substitute-AR-variable-from-configure.patch 942 BLAKE2B e1835eefb9
 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02
 DIST bridge-utils-1.7.1.tar.xz 29632 BLAKE2B 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515 SHA512 6a3824853bdaa1733c552973e6a5082280facdddc52c3feeb2c8c9375ba9469a5930b559092c9de1a73b464f388f019e147b45ac1e2d10ce8968057779fcd12c
 EBUILD bridge-utils-1.6.ebuild 1436 BLAKE2B 42f9eab53b9e394593c7b9f78f988a5558cbb0aca979e9adbfd96bed3824e2ab1aee9b974df1870a94a639778a90f19b1bd5af3a42dc9f646181bd55dfcb5367 SHA512 002a1d7fbf2f2b756f2c15d73b6d9e7acca1c6d3295a78a19e578de82967d50ace95167a98a060254195719369c5a9e7669b2d262be120f9a1a906619740843a
-EBUILD bridge-utils-1.7.1.ebuild 1386 BLAKE2B eb67b11143f43b5350899bca91959550cd6396e1946805096b25f8ffa7fa7a8abe493e4a956dab9449e061962e59676732a1e9cf1197b093fc3ecdede6e5635e SHA512 a6ce25865a6d2525de69e559a81e83496c78b8dcb0258190dc8469b0bb53cc7141e3724975fd490859976576eae8e8f9a4bb3b8b8fcff1dd9d1896d44098e160
+EBUILD bridge-utils-1.7.1.ebuild 1379 BLAKE2B 62267a7aadaaa12fe07c2679c8beb99e6917d6c39ac3697ec696300f897c140fd2cae478cf50e1cd8668f1a3fb96dd5fbcc8c6ba69930e90ba70a679382186c1 SHA512 1283f3f38a9fe0e0065e4101b45d326df424651d708b9c0891fea6a52755cbe313717e37cae25bfd37f385b70c685a4260ea04419d913d1a5fc27279c3dbb5b9
 MISC metadata.xml 492 BLAKE2B a62977b2f90df86ceacd84e556618f3adf5338eef114a17ca9a17e4bff142190fa68df777719b91bc4ec3108d3fd13c21205addaf30e4fc4012ff83fb882590f SHA512 216e32dc64a175f83b942cbc24894e055a77f7b9c251d68395cb4635bda446ea197f8feee7957747e68bdb46c8c84e8625b626c82944e161debba3009f9befa8
diff --git a/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild b/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild
index e8aa9dc50b6a..b3ea6ff1a706 100644
--- a/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.7.1.ebuild
@@ -11,7 +11,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/chrony/Manifest b/net-misc/chrony/Manifest
index cea1285f31ad..108732543a0b 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -2,10 +2,14 @@ AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c32
 AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4
 AUX chrony-4.1-seccomp-glibc-2-3-4.patch 932 BLAKE2B 89f6f1ee4ece8ce021dd35f20c44749f613049f3aee1007fcbad1f123767e73ebd5567d4aeffd04938d75788b6b42c332903b93cf5c76fdfc404c3c918f52bd8 SHA512 7315f6e08a418b574fc5c9c1100b2fd39320f38d7c20117e5d8e902f71a99ad8f3e743e1cf18a0223710c6321fbac5baae05b1201f156275af404bc81c32796a
 AUX chrony-4.1-systemd-gentoo.patch 309 BLAKE2B 4824abf9130c6861f2966c4cdec93313429df499c14cd75897ffebdcc1bb9dd4058aa4889f17e4549ed5d0c581208c316bc3bd28cbed96030303f401a4dd7bff SHA512 ae5d80bcf16554a22b624c2def7ccabc72cc3dba5dc0fc8096eeb7367b388d02ad2d3ce6119980fc12d573ea0803eeb58cb5b409b0c475f70e75c8d112553245
+AUX chrony-4.2-systemd-gentoo.patch 538 BLAKE2B 70d3bb2a190aa2401ff566dd88d1cace1d3573261819d082863fe310bb16507fcc1497fd31ec24033cb9dbe8356aef416d91b36df6067fd37f4273e59bc4e330 SHA512 62e54e1c16380812b3cf11a84091e134401341a4a64dda806af1a52dfa4158912adc4c2524388956f67a44e095e893ed714a2eee15650080c38ce44d2bc279ec
 AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea7106356083cf1a20bdb8fd4b85bd8cce8cf20ce6839e8788fedc1f94e912ec512193988f83283ceef86d6cfc7 SHA512 ab0bbd07c17e391d068c5a37d5f8d9c8fc2c42add2700869217a95784666bd3f23bebd70942cf11b42c124e0947f68c101153998e89bc61ccb71b30a0187cf0c
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-4.1.tar.gz 564648 BLAKE2B f9c4b44c521ee592c109b8a3d500b9cb3ea4fbf0d7dce9d8754498ad41ce2ac87c913cf72a38557ce5f28208672163b21b067307f723fd91cc91d71f69e739ef SHA512 5e283d6a56e6852606c681a7c29c5786b102d584178cbd7033ebbc95a8e95533605631363b850a3087cca438a5878db7a317f120aab2fd856487d02fccfbcb1f
 DIST chrony-4.1.tar.gz.asc 833 BLAKE2B 6d800ae436523f61cd713cdd12cf0246db53e732554433d5ef6cf1a437296ee9d0da3b2e9e72d1ccb0e3a6b1ee1227e5d1626bf031b0491670ee0712e17c57ff SHA512 82faf9171d782c18224d2d44b340994b0ddab141e88cc803dea83d0ffbb6468bc51e8b11c8dd9bd327220cae04f7d789b58ab23141a2bdf038ce628f9adeb57a
-EBUILD chrony-4.1-r2.ebuild 6685 BLAKE2B 8be8794997c68853e7068e52b0c68b7a97ccc763c259beaff580669e843c892d04dda8368847b4f07bafbeff44d491e2d3c43a007a4e7388e7ed1ad9de6dbb3f SHA512 dd492f7e747862f460d982ef7e5d0ea4d9895669cfbe2e1090e7224145da356043349b395727ce0107ec060d1a12a712bab262f7473dfd520e51280f1d2623c5
-EBUILD chrony-9999.ebuild 6639 BLAKE2B 0cba522a8f0ef1addaf4c05ac05881ba17fd24b727b9117f31b835680cace7afaac872c1ac84a56d000f68cbf6aeb092c7bb7236b1f3a3a0debeafb10afe10d4 SHA512 5bd344725e7d9704a6f046e9ccbff9fe1ad6d3ebe4af1380b687f493d9e8ca36cd879537c89580d914fac5c55e3663796e7fe8f4361039aae16b5ab969827240
+DIST chrony-4.2.tar.gz 578411 BLAKE2B 6eac4f144f5811d0f83a9827e2b5113dead1ff96952f6e6d32dcea9858e04512f635d70237fe6faced095991204b0f62bcb0e9d1a4b34e8778f205058afdfb45 SHA512 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d
+DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f595ea38f990d5e15194f91532d3f3221c6c38581467d62e95d23853a4fc438d32b99606def5f06db0031969 SHA512 d8ae4b540ce3529a5a72e10c14765a33ca6fc41529b6fdc9928fb171f25bd6fb87f930b7783638892f42f4cbcfaab4cb1064c930bae1d5204a71babad72b6e10
+EBUILD chrony-4.1-r2.ebuild 6684 BLAKE2B b366d69c4a2068b512bd7cbb14b7387ccd02947a7cb94f21bfc552ecc904829abc6dee333c4bbc11b9a3cdc97aa6c95d7a1c662fea22cc7df9b1c83f566873d9 SHA512 621e244dbaa0bff3bb74d5d7f92c9db85104f4c7ec02e774cd96fb1a7012141699c711e06b8b5a92be8ac70876ee933280bcabbea7a6f35593eec5d41b203028
+EBUILD chrony-4.2.ebuild 6645 BLAKE2B 36e2fa322fd75673afe913a472ba65d6aa6610700a149545107e381106950fcddcf0e30e077f95d169b12d550faad8c8526e8c2f782b75126ce7aaea4cac87ee SHA512 5817e255eb667f7bf788bf7b42d99851583cca22178c4a5301b071fdb30e0c53dbc9f4c6951f36aea2b9de6bb6352265920450455103234be8fe711c8e428fb9
+EBUILD chrony-9999.ebuild 6645 BLAKE2B 36e2fa322fd75673afe913a472ba65d6aa6610700a149545107e381106950fcddcf0e30e077f95d169b12d550faad8c8526e8c2f782b75126ce7aaea4cac87ee SHA512 5817e255eb667f7bf788bf7b42d99851583cca22178c4a5301b071fdb30e0c53dbc9f4c6951f36aea2b9de6bb6352265920450455103234be8fe711c8e428fb9
 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0
diff --git a/net-misc/chrony/chrony-4.1-r2.ebuild b/net-misc/chrony/chrony-4.1-r2.ebuild
index 1f5c3e41f685..eefd2899e047 100644
--- a/net-misc/chrony/chrony-4.1-r2.ebuild
+++ b/net-misc/chrony/chrony-4.1-r2.ebuild
@@ -70,7 +70,7 @@ if [[ ${PV} == "9999" ]] ; then
 	REQUIRED_USE+=" html"
 	BDEPEND+=" virtual/w3m"
 else
-	BDEPEND+=" verify-sig? ( >=app-crypt/openpgp-keys-mlichvar-20210513 )"
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
 fi
 
 PATCHES=(
diff --git a/net-misc/chrony/chrony-4.2.ebuild b/net-misc/chrony/chrony-4.2.ebuild
new file mode 100644
index 000000000000..57c2893c3532
--- /dev/null
+++ b/net-misc/chrony/chrony-4.2.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
+	inherit git-r3
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc
+	inherit verify-sig
+
+	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
+
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	fi
+fi
+
+S="${WORKDIR}/${P/_/-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux"
+# nettle > nss > libtomcrypt in configure
+REQUIRED_USE="
+	sechash? ( || ( nettle nss libtomcrypt ) )
+	nettle? ( !nss )
+	nss? ( !nettle )
+	libtomcrypt? ( !nettle !nss )
+	!sechash? ( !nss )
+	!sechash? ( !nts? ( !nettle ) )
+"
+
+DEPEND="
+	caps? (
+		acct-group/ntp
+		acct-user/ntp
+		sys-libs/libcap
+	)
+	libedit? ( dev-libs/libedit )
+	!libedit? ( sys-libs/readline:= )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss:= )
+	nts? ( net-libs/gnutls:= )
+	pps? ( net-misc/pps-tools )
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-chronyd )
+"
+BDEPEND="
+	html? ( dev-ruby/asciidoctor )
+	nts? ( virtual/pkgconfig )
+	sechash? (
+		nettle? ( virtual/pkgconfig )
+		nss? ( virtual/pkgconfig )
+	)
+"
+
+if [[ ${PV} == "9999" ]] ; then
+	# Needed for doc generation in 9999
+	REQUIRED_USE+=" html"
+	BDEPEND+=" virtual/w3m"
+else
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
+	"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+		doc/* examples/* || die
+
+	cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
+}
+
+src_configure() {
+	if ! use caps ; then
+		sed -i \
+			-e 's/ -u ntp//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	if ! use seccomp ; then
+		sed -i \
+			-e 's/ -F 2//' \
+			"${T}"/chronyd.conf examples/chronyd.service || die
+	fi
+
+	tc-export CC PKG_CONFIG
+
+	# Update from time to time with output from "date +%s"
+	# on a system that is time-synced.
+	export SOURCE_DATE_EPOCH=1607976314
+
+	# Not an autotools generated script
+	local myconf=(
+		$(use_enable seccomp scfilter)
+
+		$(usex caps '' '--disable-linuxcaps')
+		$(usex cmdmon '' '--disable-cmdmon')
+		$(usex debug '--enable-debug' '')
+		$(usex ipv6 '' '--disable-ipv6')
+		$(usex libedit '' '--without-editline')
+		$(usex libtomcrypt '' '--without-tomcrypt')
+		$(usex nettle '' '--without-nettle')
+		$(usex nss '' '--without-nss')
+		$(usex ntp '' '--disable-ntp')
+		$(usex nts '' '--disable-nts')
+		$(usex nts '' '--without-gnutls')
+		$(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')
+
+		--chronysockdir="${EPREFIX}/run/chrony"
+		--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"
+
+		${EXTRA_ECONF}
+	)
+
+	# 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')
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
+	newconfd "${T}"/chronyd.conf chronyd
+
+	insinto /etc/${PN}
+	newins examples/chrony.conf.example1 chrony.conf
+
+	docinto examples
+	dodoc examples/*.example*
+
+	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
+
+	if use html ; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	keepdir /var/{lib,log}/chrony
+
+	if use caps ; then
+		# Prepare a directory for the chrony.drift file (a la ntpsec)
+		# Ensures the environment is sane on new installs
+		# bug #711058
+		fowners ntp:ntp /var/{lib,log}/chrony
+		fperms 770 /var/lib/chrony
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
+
+	systemd_dounit examples/chronyd.service
+	systemd_dounit examples/chrony-wait.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
+}
+
+pkg_preinst() {
+	HAD_CAPS=0
+	HAD_SECCOMP=0
+	HAD_PRE_NEW_SECCOMP_LEVEL=0
+
+	# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
+	# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
+	if has_version 'net-misc/chrony[caps]' ; then
+		HAD_CAPS=1
+	fi
+
+	if has_version 'net-misc/chrony[seccomp]' ; then
+		HAD_SECCOMP=1
+	fi
+
+	if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
+		# This version introduced a new filter level: -F 2
+		# It's a limited set of seccomp filters designed to be 'bare minimum'
+		HAD_PRE_NEW_SECCOMP_LEVEL=1
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process chronyd.conf
+
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
+			# bug #719876
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
+			ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
+			ewarn "This is necessary for chrony to drop privileges"
+		elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
+			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
+		fi
+	fi
+
+	# See bug #783915 for general discussion on enabling seccomp filtering
+	# by default.
+	local show_seccomp_enable_msg=0
+
+	# Was seccomp disabled before and now enabled?
+	if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
+		show_seccomp_enable_msg=1
+	fi
+
+	# Are we coming from an old version without the new 'minimal' filter?
+	# (-F 2)
+	if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
+		show_seccomp_enable_msg=1
+	fi
+
+	if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
+		elog "To enable seccomp in a stricter mode, please modify:"
+		elog "- /etc/conf.d/chronyd for OpenRC"
+		elog "- systemctl edit chronyd for systemd"
+		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
+		elog "By default, we now use -F 2 which is a baseline/minimal filter."
+	fi
+}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 6051d64c9884..57c2893c3532 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	fi
 fi
 
@@ -70,12 +70,12 @@ if [[ ${PV} == "9999" ]] ; then
 	REQUIRED_USE+=" html"
 	BDEPEND+=" virtual/w3m"
 else
-	BDEPEND+=" verify-sig? ( >=app-crypt/openpgp-keys-mlichvar-20210513 )"
+	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
 fi
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-4.1-systemd-gentoo.patch
+	"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
 )
 
 src_prepare() {
diff --git a/net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch b/net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch
new file mode 100644
index 000000000000..1852cdeb92e9
--- /dev/null
+++ b/net-misc/chrony/files/chrony-4.2-systemd-gentoo.patch
@@ -0,0 +1,13 @@
+diff --git a/examples/chronyd.service b/examples/chronyd.service
+index 4fb930e..8df627a 100644
+--- a/examples/chronyd.service
++++ b/examples/chronyd.service
+@@ -9,7 +9,7 @@ ConditionCapability=CAP_SYS_TIME
+ Type=forking
+ PIDFile=/run/chrony/chronyd.pid
+ EnvironmentFile=-/etc/sysconfig/chronyd
+-ExecStart=/usr/sbin/chronyd $OPTIONS
++ExecStart=/usr/sbin/chronyd $OPTIONS -u ntp -F 2
+ 
+ CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE
+ CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_KILL CAP_LEASE CAP_LINUX_IMMUTABLE
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index 9075bed686ac..d75869096b9a 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,3 +1,5 @@
 DIST cmst-2020.11.01.tar.gz 2818638 BLAKE2B 69cf85abb0beebfcf3a2d6d3af8281de43d795a104a8d9f5bfbb37b6dd1c9541910fad4ce536643ae0cbe8ef1e0bdc31016d9f99056de4279123bb5d8a428d1c SHA512 cb8082ac7e1d377709a7d3fda49ed7a99ef7a9c5eb00ca24423685a5146f519bc810c37140755f4f399957781af09de75e47de8b209517c74ac55f8e5758986c
+DIST cmst-2021.12.02.tar.gz 3009904 BLAKE2B 47f4f6516668e4c71821754c096a5442614836b5c5fc5290dbf04df407010ae243cd482d7757edf6dd2e091bf166ab3cdfbb84c715a46edb30c3ee8ae1f42e26 SHA512 15875232d6f842bcecebc99f5e59fef1268bb04b319538919d6b5d6b442c3462177719170f16b5b3fa86a5a7c7f669864250c8499e0a444f26f121b80cab5dcf
 EBUILD cmst-2020.11.01.ebuild 842 BLAKE2B 025957f9befade5083cea90cddfe9c8c751b1291afd3db59e76017ed731727083a3bac9295809d87594483797b8d55afd67496b4cd9c3c3ce5b72ece2f5b8b09 SHA512 520b528cffafbe7fa1133f10a57621777adf906df142e6bf7ade46ea932dd7c1ece14807f47148a5262a613f2e73a3f9f53ff455916f059749011b71c24937a6
+EBUILD cmst-2021.12.02.ebuild 936 BLAKE2B a142d2fedae00934cc122988f1cdf352dda1931f386a6b77f8da0714470b64371b86cd33644c9c830dd0a4bbc08d4f2b22864dcf11ca719328c239e39511dbb9 SHA512 50685b55cb804b5493a7a13af528a1b0ae2b99a23279d0b32eddf686103089734e1023a2ac843776c06dae3ccf0c34594759fc858f61f126454aa74f28f9766c
 MISC metadata.xml 390 BLAKE2B 19055fbf6cc2b268ff117e4cd4e39c894452cd7a3f9c71a113831a142ee4458aae99f86497fc85ee5e29ee73a50d2363ce816e46e2cf3cf47e6be51658d882d2 SHA512 fcc4db887275f29a69ddb8d731f3bc1516734b75bb5ce494d2ddfc13f951a7c1ce9f715383c62725919755b61488943f91c1286d126fb91a24176c24e0e3dcaf
diff --git a/net-misc/cmst/cmst-2021.12.02.ebuild b/net-misc/cmst/cmst-2021.12.02.ebuild
new file mode 100644
index 000000000000..88003e7ee218
--- /dev/null
+++ b/net-misc/cmst/cmst-2021.12.02.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Qt GUI for Connman with system tray icon"
+HOMEPAGE="https://github.com/andrew-bibb/cmst"
+SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	net-misc/connman
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	eqmake5 DISTRO=gentoo
+}
+
+src_compile() {
+	lrelease cmst.pro
+	default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	rm -r "${D}"/usr/share/licenses || die
+	gunzip "${D}"/usr/share/man/man1/cmst.1.gz
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 2bbcc1c25727..420b5398f49a 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,5 +3,5 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d
 DIST curl-7.80.0.tar.xz 2474492 BLAKE2B 0452ecb6943bc56b20ad8f1223135c9cae68cf31089b0e17e84d81af98dc5a47f5edfc271c5b4c23f232db6cea7ff5a9bffa9c7c319255d9afdb06fa5b8f761f SHA512 e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab
 EBUILD curl-7.79.1.ebuild 7976 BLAKE2B c357b42732f1cd78231236fba09d431ab43feaa62601287f06d5a6254c1978d009a75d7df341837c1d192e1f3610fd6adcf4a50a07a9a58a5e96c301d3bad797 SHA512 3e97838ef17a7cc0bd45f258f1fddf22a1ba8b263860637c580d8aee3a8fccb91e75fbdd3fd9957e300a55ab26e548f9bcc95694341c17d8c4fe1e2de3793cb3
-EBUILD curl-7.80.0.ebuild 7967 BLAKE2B 1cb4782621e80352d52694bc8fce8acae5ff9155aca27c75725aa10b91e56b8d6090eb0fd8a126a87cdbe0dff34b13132ffbadd1f175947b4fefb2c403acbf27 SHA512 d5837104cc05e701fe7d7979a5907502ad874d78949426ea778344d5a70df27c20ee464f465cb317264b1fc3ce3c0758276b17c72b7e7f2e7582db845ecbda58
+EBUILD curl-7.80.0.ebuild 7525 BLAKE2B be1ff7440c5c3468bc50c9fe8b3935a6452725afdbc07b73dd167147fb3c346d3e5be89f8544241b0acbf42212b4ea7a6d803cde5ef04bf762416f7081f6e46d SHA512 070d9611fb4ecc21811040f9d742156dd5e343fd6f5dbf6a281b5081e87bc69d09727bede3060390194c0576b320e6e82266f23ab722143d91145582fdee1ed4
 MISC metadata.xml 2050 BLAKE2B a795f1af5b0945a936d279317ac89de2c32ca0e0512ccbd5d19acd29d82415d6c8e4ea4480150de8910b0a1c5e7ce4260b3c26f5f720a4ec828c4d78f6d40adf SHA512 add740cc284bd6912dcd4beb1d706cbfde85ff9859032b9706dddb69dbd5df613043f8e2b1fe634700b97a92cd6a953908486ec9b7b1564a16ecbec2c48b5dfd
diff --git a/net-misc/curl/curl-7.80.0.ebuild b/net-misc/curl/curl-7.80.0.ebuild
index 261d977f06d5..eb15e98757d7 100644
--- a/net-misc/curl/curl-7.80.0.ebuild
+++ b/net-misc/curl/curl-7.80.0.ebuild
@@ -12,15 +12,14 @@ 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
 IUSE+=" nghttp3 quiche"
 IUSE+=" elibc_Winnt"
 
 # c-ares must be disabled for threads
 # only one default ssl provider can be enabled
 REQUIRED_USE="
-	winssl? ( elibc_Winnt )
 	threads? ( !adns )
 	ssl? (
 		^^ (
@@ -28,7 +27,6 @@ REQUIRED_USE="
 			curl_ssl_mbedtls
 			curl_ssl_nss
 			curl_ssl_openssl
-			curl_ssl_winssl
 		)
 	)"
 
@@ -76,9 +74,6 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 #		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
 #	)
 
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/perl
 	virtual/pkgconfig
@@ -114,7 +109,7 @@ multilib_src_configure() {
 	# 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-gnutls --without-mbedtls --without-nss --without-ssl )
 	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
 	#myconf+=( --without-default-ssl-backend )
 	if use ssl ; then
@@ -134,10 +129,6 @@ multilib_src_configure() {
 			einfo "SSL provided by openssl"
 			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
 		fi
-		if use winssl || use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		fi
 
 		if use curl_ssl_gnutls; then
 			einfo "Default SSL provided by gnutls"
@@ -151,9 +142,6 @@ multilib_src_configure() {
 		elif use curl_ssl_openssl; then
 			einfo "Default SSL provided by openssl"
 			myconf+=( --with-default-ssl-backend=openssl )
-		elif use curl_ssl_winssl; then
-			einfo "Default SSL provided by Windows"
-			myconf+=( --with-default-ssl-backend=winssl )
 		else
 			eerror "We can't be here because of REQUIRED_USE."
 		fi
@@ -218,7 +206,6 @@ multilib_src_configure() {
 		--without-amissl
 		--without-bearssl
 		$(use_with brotli)
-		--without-cyassl
 		--without-fish-functions-dir
 		$(use_with http2 nghttp2)
 		--without-hyper
@@ -233,7 +220,6 @@ multilib_src_configure() {
 		--without-rustls
 		--without-schannel
 		--without-secure-transport
-		--without-spnego
 		--without-winidn
 		--without-wolfssl
 		--with-zlib
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index cca4e00070c7..0b500a5c7a1c 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -5,7 +5,7 @@ AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
 DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f
 DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45
-EBUILD dhcpcd-9.4.0-r1.ebuild 4801 BLAKE2B a8f34f5fb98801eeba23b6c6da40415fdd870a378faa40f8eb40b7a0d67c049a3be6a8f9e50c1b91589a2828fc6de528370615506c3a05f8c1919a1445f88cc1 SHA512 3dcc64f1f441d10bbc21ea4c42515b0e2caee20a01c7bd47c0b4282001d87a4b6649300ce54bd4b32f0129436b494324263754580e0fa183d10c13c56c54e0e8
-EBUILD dhcpcd-9.4.1.ebuild 4670 BLAKE2B 589609544f68b6db7c6790a46caea33cc4b418f95a66e78cad1073f76450336cf0ce4cb1e7ea87e2319dca103ba3c4272863acd6320f509e9beedd8ebe65a047 SHA512 9065db3caa1bc3b955b50f1997348205b5dc266d08594ff772cc5d6ba140ce1ca7cc5b50c9b0117e9130a4bbe7b30d6a162e748e884b008aa6d92e269b56a713
-EBUILD dhcpcd-9999.ebuild 4670 BLAKE2B 589609544f68b6db7c6790a46caea33cc4b418f95a66e78cad1073f76450336cf0ce4cb1e7ea87e2319dca103ba3c4272863acd6320f509e9beedd8ebe65a047 SHA512 9065db3caa1bc3b955b50f1997348205b5dc266d08594ff772cc5d6ba140ce1ca7cc5b50c9b0117e9130a4bbe7b30d6a162e748e884b008aa6d92e269b56a713
+EBUILD dhcpcd-9.4.0-r1.ebuild 4803 BLAKE2B 1c93be89788270ed167a8d2e5f9fc6761f563aafad9053187c118f3b5b6b47833411577f3071726380c82a1d8d5c53b50a3f544d244e72ddbfe82cbaa37fba43 SHA512 fddf7f0abe8a11e8763835c970e5da8d7cc61076b201829ed0ea4464e2df3bd3eee884e3b8c6fc570197202e06ac175510509921e7d621d6b1b04cac6b50d865
+EBUILD dhcpcd-9.4.1.ebuild 4672 BLAKE2B 5f9a04694321efff65e9e362f2003751866fa5da42fe06b173f9adb24d39b9d04f3c818b13f4a89e90f6cf09d8fdad85cdd52e2035cb198b9a1c50bdc222268d SHA512 25d79939886e696848791b9a317fd5b63a42ef6d64d2810fa63efe887f6d534f3d058ba6c92503d35cc8b9a3da49c7e32db345b91f0479b5377a17f79a7f042b
+EBUILD dhcpcd-9999.ebuild 4672 BLAKE2B 5f9a04694321efff65e9e362f2003751866fa5da42fe06b173f9adb24d39b9d04f3c818b13f4a89e90f6cf09d8fdad85cdd52e2035cb198b9a1c50bdc222268d SHA512 25d79939886e696848791b9a317fd5b63a42ef6d64d2810fa63efe887f6d534f3d058ba6c92503d35cc8b9a3da49c7e32db345b91f0479b5377a17f79a7f042b
 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
index abe76a4939a1..996f45958644 100644
--- a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
@@ -18,7 +18,8 @@ else
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd https://roy.marples.name/projects/dhcpcd"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/
+https://roy.marples.name/projects/dhcpcd/"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
index 5726f78a3a5f..7cebecfb3116 100644
--- a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
@@ -18,7 +18,8 @@ else
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd https://roy.marples.name/projects/dhcpcd"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/
+https://roy.marples.name/projects/dhcpcd/"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index 5726f78a3a5f..7cebecfb3116 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -18,7 +18,8 @@ else
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd https://roy.marples.name/projects/dhcpcd"
+HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/
+https://roy.marples.name/projects/dhcpcd/"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index 4986ef9e5159..3afb72a0f909 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,5 +1,7 @@
 DIST dleyna-server-0.7.0-r1-patchset.tar.xz 1680 BLAKE2B fd6494dc04bb0fc20e677c69b360df30c89b35b6a990a2ce78e87101291307c485a5cb133152eabbd117691eff4d738fa2e33303128c4305a0c1e5137c67781d SHA512 7f37ba456f84bd9e45b732d40467e08ba5ce775c0f1d30011157e10a6f3010b904fc52a4d699a211dd66b66c54ff6e98b109aa5ba9c04112f81de1529d55c425
 DIST dleyna-server-0.7.0.tar.gz 105020 BLAKE2B 01e4459631fef66e88aabcadfd85a4b01a5b95d33b5c1734decd1b0667876d7e5834bf23f754361772faebd7daf63d5f37cff9cb9bd11ff47c62aeb7afdb4969 SHA512 16bcab369a4d4624f75ed5d40bb5a06cafa1907b3ceceeb0de95f9f00750c257b69202f29f9c2d1ebcd61c541ee930d7a2747dab979e15a74e9a6e109eae6800
+DIST dleyna-server-0.7.2.tar.gz 105415 BLAKE2B 3a38b97f45c04be1e48f87a1653d5ca4776eaa4763d8ce8639f77f5f0512c2331ccbbfe09a5493152c35655989652de071ba9658735af8ab137d77b0b28ec054 SHA512 c6a4dc66c2ae745a3c5d7eb70d7fc97adecc73b80ad5fb4ada710c0aa6f8bd5d3a1abb14acfe0a77d3e148e2159868acf1250599c43379c3d1c1337581de1536
 EBUILD dleyna-server-0.7.0-r1.ebuild 796 BLAKE2B 72c19c93a88bce019f920be5b04d4618ce68ae90e116273402145aa9f15b9e84a0591fca3c7fe2461df5ad04ff800bdb9a14eb418f9b9243fbed718fdc82525d SHA512 39dace6c4ce4574d39d5477cb23152f4760078ae865784a74710587608250a9908f06de3e06f3607a9aafe9ed416af9a54537a354aa085443a4fa630e19af1f1
 EBUILD dleyna-server-0.7.0.ebuild 674 BLAKE2B 61ff666be0dd8d68a5ccb443f08e7597c2cf196c8de5db2c018bf88b574a982a677f51cbb4e09e18e022c562911194d27b39aa2ca7cf7fe04e582edce63c1a55 SHA512 64b58c5e4285d80b3e55a16b60a15e1ca531cc96ab84ea599839c2f206dc9d3a85441ffbc3ba0ed640a3ab17171a45722fc1ea99778c3e2fa686ffd9646c75f9
+EBUILD dleyna-server-0.7.2.ebuild 686 BLAKE2B 94bf089986e60d99d3d36c71579c2a5d80434b6933f2056dd9774fc64944dc854f673cadddd9c36ac03b97a453cabe22f9d28d288224e4a076188e23978b293f SHA512 9f2c0ab9461137a750bb28223f2458cf75afff7af21d2b131aa38c373f14c1265e97d96323aec08fefbc3bcddc763318668a6f89f9f9ffa38c99b949be5cc8b0
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild b/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild
new file mode 100644
index 000000000000..2e55eaf9f961
--- /dev/null
+++ b/net-misc/dleyna-server/dleyna-server-0.7.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Service that allows to discover and manipulate DLNA Digital Media servers (DMS)"
+HOMEPAGE="https://github.com/phako/dleyna-server"
+SRC_URI="https://github.com/phako/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=net-libs/gssdp-1.2:0=
+	>=net-libs/gupnp-1.2:0=
+	>=net-libs/gupnp-av-0.12.9:=
+	>=media-libs/gupnp-dlna-0.9.4:2.0=
+	>=net-libs/libsoup-2.42.0:2.4
+	>=net-libs/dleyna-core-0.6.0:1.0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 248a2646489e..c5cf51c919f3 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,8 +1,6 @@
 AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
 AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c2d65fa49c502b3b4de0fd32914ce7c4708bb6f6188296f75d387e0384c142381bb77cfb706c7e1c SHA512 8e6f0e58863402f0169b8a7625d049bf85db60bebe40a42dfb450a1bddfcd6f8f436002de6c1ff599c8f848e4ba85a70e4058cb55a9a49fafb1e69a8e7eb9f57
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
-DIST frr-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
 DIST frr-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
-EBUILD frr-8.0.1.ebuild 3538 BLAKE2B f4c2a6bc1901bc776f0266ece3a0daf04ab716b63a55c32e634f387e2482d18b3c1446785294fab12be08c1d97eb07f56dbcaad22bc20d354befa7c08489fee1 SHA512 4ebdd4c6bbf0770f7c478a1c85a47e8d78237d709240bdeaa7f4bace13ef0b59bc5bf715c899977ba8c712c63a1cf14685fd7e5056cddd2af254fe0e8de8a9d7
-EBUILD frr-8.1-r1.ebuild 3445 BLAKE2B fe86b9e6e3ff80ed9efdb6633c45fdf2103764e9087323f9f755237c3fc2da67827592d74a5a4d3da385043e250dfac09313dfdcc5966583fa11e10bbd7d2c53 SHA512 6fbde4096367c00896662d6226708e397ffd2625a8c215b2ebc5f56b3862fe67ceb9eba44329280fe73a36fd85e3081241d58b9bcc6bf679a392568c7782dac6
+EBUILD frr-8.1-r1.ebuild 3443 BLAKE2B 71e918606fa31871fba67eaf2c8a84e4185e2b8035684787f86fcad6386e073cfdc787da00a5a287fa1c245a43c27fa984a8218c2ce2a494efd6892eb0980384 SHA512 a90eddb16c5660f3133b2d4341edb575a12b5dce671adf93d259ed84d6d07438fcf5e1b529d7128ddfe12356c1e96236ecd40abe31fcf0148076ac934e687418
 MISC metadata.xml 767 BLAKE2B ce7920e238d443a1ede5f38b323c86dc2f4e24d5efeb6603a59e8ec9a0d083cdc8e6162d7d3e9463b29bf786b26e00aac19c549ddf943b16175897fb94265516 SHA512 29dd8aa5ad6706a53e00c14feea8e7a75d10ec453dec715a495a75a0390661c268d5a5fc10acdb26d050a0d804162930de79bf0e41a499b803a4762442b8a108
diff --git a/net-misc/frr/frr-8.0.1.ebuild b/net-misc/frr/frr-8.0.1.ebuild
deleted file mode 100644
index 75fd3b38166f..000000000000
--- a/net-misc/frr/frr-8.0.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools pam python-single-r1 systemd
-
-DESCRIPTION="The FRRouting Protocol Suite"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
-# FRR tarballs have weird format.
-S="${WORKDIR}/frr-${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp systemd test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-user/frr
-	dev-libs/json-c:0=
-	>=net-libs/libyang-2.0.0
-	sys-libs/libcap
-	sys-libs/readline:0=
-	virtual/libcrypt:=
-	grpc? ( net-libs/grpc:= )
-	nhrp? ( net-dns/c-ares:0= )
-	pam? ( sys-libs/pam )
-	rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
-	snmp? ( net-analyzer/net-snmp:= )
-"
-BDEPEND="
-	~dev-util/clippy-${PV}
-	sys-devel/flex
-	virtual/yacc
-	doc? ( dev-python/sphinx )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
-	!net-misc/quagga
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang tools
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--with-pkg-extra-version="-gentoo"
-		--enable-configfile-mask=0640
-		--enable-logfile-mask=0640
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/lib/frr
-		--sbindir="${EPREFIX}"/usr/lib/frr
-		--libexecdir="${EPREFIX}"/usr/lib/frr
-		--sysconfdir="${EPREFIX}"/etc/frr
-		--localstatedir="${EPREFIX}"/run/frr
-		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
-		--with-clippy="${BROOT}"/usr/bin/clippy
-		--enable-exampledir="${EPREFIX}"/usr/share/doc/${PF}/samples
-		--enable-user=frr
-		--enable-group=frr
-		--enable-vty-group=frr
-		--enable-multipath=64
-		$(use_enable doc)
-		$(use_enable fpm)
-		$(use_enable grpc)
-		$(use_enable ipv6 ospf6d)
-		$(use_enable ipv6 ripngd)
-		$(use_enable ipv6 rtadv)
-		$(use_enable kernel_linux realms)
-		$(use_enable nhrp nhrpd)
-		$(usex ospfapi '--enable-ospfclient' '' '' '')
-		$(use_enable rpki)
-		$(use_enable snmp)
-		$(use_enable systemd)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	# Install user documentation if asked
-	use doc && dodoc -r doc/user/_build/html
-
-	# Create configuration directory with correct permissions
-	keepdir /etc/frr
-	fowners frr:frr /etc/frr
-	fperms 775 /etc/frr
-
-	# Create logs directory with the correct permissions
-	keepdir /var/log/frr
-	fowners frr:frr /var/log/frr
-	fperms 775 /var/log/frr
-
-	# Install the default configuration files
-	insinto /etc/frr
-	doins tools/etc/frr/vtysh.conf
-	doins tools/etc/frr/frr.conf
-	doins tools/etc/frr/daemons
-
-	# Fix permissions/owners.
-	fowners frr:frr /etc/frr/vtysh.conf
-	fowners frr:frr /etc/frr/frr.conf
-	fowners frr:frr /etc/frr/daemons
-	fperms 640 /etc/frr/vtysh.conf
-	fperms 640 /etc/frr/frr.conf
-	fperms 640 /etc/frr/daemons
-
-	# Install logrotate configuration
-	insinto /etc/logrotate.d
-	newins redhat/frr.logrotate frr
-
-	# Install PAM configuration file
-	use pam && newpamd "${FILESDIR}"/frr.pam frr
-
-	# Install init scripts
-	systemd_dounit tools/frr.service
-	newinitd "${FILESDIR}"/frr-openrc-v1 frr
-
-	# Conflict files, installed by net-libs/libsmi, bug #758383
-	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
-}
diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
index 1fcbac9b2687..2e4b5ede225c 100644
--- a/net-misc/frr/frr-8.1-r1.ebuild
+++ b/net-misc/frr/frr-8.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 kernel_linux nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 3229c70c9927..b96b92e08915 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,17 +1,25 @@
 DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f99111931646e8d194d493cf6992ac76a065a02816e5eaf0c974f752aeabb9cde7e7f8ec70d70529402b0b58072c44994e39e53 SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1
 DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f
 DIST geoipupdate-4.3.0.tar.gz 28170 BLAKE2B 4a7cf9820a37b063665cd0494003fedd4b8a9835dc0746477f28287ccee619efe07c7af608ccb04293b817151fbe409f24c828a0c5f2bd4d60f8570b4df8d4f7 SHA512 2cc40ef436b67e114e854230c439778a139adb05c766e8fdaf70269c23bee4cecee35d5b1a0b12ce9b70185e28231eb97486120fbd2900b8f61c2e6ce6601ad3
+DIST geoipupdate-4.8.0.tar.gz 33561 BLAKE2B 0553e52992243e9f4b2f098228810b2fc802ec312f6d41486088cef46170d23e23f936077b624e9587cf5a266629fe2bf6f9c8f025f63c00309f63151d270a1c SHA512 55a5ba2b0b92abfc1e7837206222702aaf98d2bd00494915426e02ead0004f5546f4e2abe99a914bebd41690b1253d7a2b19098c110882c5862a3bbf2092234a
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip 11234 BLAKE2B d806e8bf8671c1e1adf0dc95ea61efdba9a53ffd1e4b2cdd469030964c7137a51cc77ed65b2788ff4a692ab6ca46572f30e20b6b8c7887eb304c07d8f835fadc SHA512 bacd8f76999947d61c25839c38fa102b4cd7c2998573727309032db6ea47019147f51d2c03d38744e739b2e26afe0ad49c330e936649ad848d332ab1d04c3bca
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.zip 14710 BLAKE2B 0e469d2bd8959bb3b743637a7c88f9695342d66827fd4c372b67605082016619799e71b2a174c83bcbc3f72a0d816f123eec9d885146d6dd4f266482888ba7ed SHA512 9b42452b5fed988d4c786beb6fa65b0c277d5da64c0b74eb533647b792a2a8d9c68203409266e3a2402637f0decb28b131210cfaee1d3af792e557a1baa02a1f
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
 DIST github.com%2Fmaxmind%2Fgeoipupdate%2F@v%2Fv4.0.2+incompatible.zip 32231 BLAKE2B ebccf1282f99c7b889969d9a11be3aa98d662adb463ede02bc4ff2e2db757be5a9187f6ff0568ed08fde2438d2f66974972f25128ff252a4bafafef786448091 SHA512 46dc6e891a4bcd57ffae0777ac4c3b9bcebbb8d8a661704d9fada707221ad9fe9b37fe0a053824e4ee362a0fc4cd625e0379c4522f5526dd1353beffb62149e4
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.zip 18663 BLAKE2B ccec7bae555b0c549b5da7d2ca1a16d261721473c638aafee7bd80a1be86b3a377654e32bbcad0c040186767b2f3f92017c0df47f7b86a0c926aabfdbf708450 SHA512 13d7c1acdffefb28bdd1c9efdaa579cf94d02a187e1952fe5da1cccb4934c34329792776fa46e801b43fee8df15c3f9dcd0a7a3fe85b78942dcbafca6e106b7b
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
@@ -28,14 +36,24 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod 188 BLAKE2B e47d78f037db3
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip 92066 BLAKE2B bc321a8dde64189df65fef0a931a54a1c8dce62de17b011149c1f78a3db2c6bc50e0694c4dac2bb77291dda45fdaaca68901f5a6a584cf8b78117231c2a417ae SHA512 f40c1d8fc0c0edd78abec113f71601ccbc6a320e7eceb9ded2e6a047a05c9ad54bfdd7aea3f476fb10983b92e5d0fdf3cc716b93ad5a93793f40dc3d830c8d28
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201026173827-119d4633e4d1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201026173827-119d4633e4d1.zip 1496749 BLAKE2B 6f665574261f31847b1fafb76bf05483808610124bdf9bb22b976b93ef0d722a8cfd4892f48320ee0e7404b0876f65c37d945ce4466547d692d6fc00f4802c63 SHA512 604c6790250b7d05360cbd341cde88fc5c2a499bae119d51de5b073df0704089abd3b1536c5ef7008db7a5ef6dd8512824e77553ee8216134a2daa6cacb357c2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200902074654-038fdea0a05b.zip 41507 BLAKE2B 1717646144575b87f757c60d60954498f6bbd58d166cfbf650fd16c7a96435f9a4ca93f775c47ac54348bf7416356b5a205f4683139aa59b3093c80a5236a93b SHA512 170b91617f7c7f85f2879c22bef923f2816702fe5774592711d1de1483d5f7359456f94a5a89b9f165d2c18d7ff00ce7b8b5c6d639b8647bdd0a8fa37f9f895a
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
 EBUILD geoipupdate-2.3.1.ebuild 557 BLAKE2B d10ba07cf135898b205407d4a4a1212a09315dd0ab046b227295c13c15ad0df296f4f1310543e9b082b5899ee2e3eef484ff9a1965b4ad9a2841bd097f2255ba SHA512 75a4de845ad1923a0ad678de9db19213696beba4995b37ff7cab8c887396dff9b5005bd247e72c3ee2d140617718e1fbc3795a1fb70acb9028bd063fbcb48959
 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
 EBUILD geoipupdate-4.3.0.ebuild 2780 BLAKE2B 8cdd7ec3ee334c87e4944198db1e39d57469a0cf9cfce07bbad7b03aa9b790b40c85f057d93bbd9c92ba20423d52cb0d9386295ef5575e4590a6d257fae06472 SHA512 a80f829eac8e7e22205ce9625ce1948866ffb4c290f728e53d2a0f73000b65914c3b915c0c46d9fbe9951373d2b9141dc4acaf43135d4a9d8c1c7ce8c053dd7a
+EBUILD geoipupdate-4.8.0.ebuild 2499 BLAKE2B 3002ac10f9da56e45da2dc4998d7da7374a1a06db0ad4fadca5c44e693ca88970fa6b0cd507fa6d7d2becedce5a4d3a38bf451b471a72085fd6c6a698ed1b26a SHA512 55e50669d3964ca7d6f62d920ab221fd69b431ddd5dab65cf00c8d9f82c2eb0ba9c64d0894da800a1cb18c2e580b27f4803b240bd651e258ad4c0ab63a854ca8
 MISC metadata.xml 365 BLAKE2B fe03fdda21f1ab1dcbf3fe2263aabd4a567e0527a33f551a2c9e5883fc9738607705710f10125fd50127d71e86b6a935d955c12dfa588713b40adeb84001a4c0 SHA512 bbf7afa666726fb1b3b9ddc8a899a8fc404c141bdd1c2adc3a458c9a5b4b7b60697fcf3e43df8a5a4ce3cb96db46d92d0af2887bba7aa52d759171dd240c4415
diff --git a/net-misc/geoipupdate/geoipupdate-4.8.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.8.0.ebuild
new file mode 100644
index 000000000000..bbc41d9ed2f3
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-4.8.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGO_PN="github.com/maxmind/${PN}"
+EGO_SUM=(
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/gofrs/flock v0.8.1"
+	"github.com/gofrs/flock v0.8.1/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1"
+	"golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b"
+	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+)
+
+inherit go-module
+
+go-module_set_globals
+
+DESCRIPTION="Performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
+
+# Do not let these leak from outside into the package
+export GOBIN= GOPATH= GOCODE=
+
+src_compile() {
+	# requires pandoc but the information is still in the distributed md files
+	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
+	#sed -i -e 's/go build/go build -x/' Makefile || die
+
+	# the horror, the horror ... but it's all automagic
+	export CONFFILE=/etc/GeoIP.conf
+	export DATADIR=/usr/share/GeoIP
+	export VERSION=${PV}
+	default
+}
+
+src_install() {
+	dobin build/geoipupdate
+
+	keepdir /usr/share/GeoIP
+
+	insinto /etc
+	doins build/GeoIP.conf
+
+	einstalldocs
+}
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index 0590dba8183a..27b14aba3157 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-remote-desktop-40.1.tar.xz 63980 BLAKE2B 6f5ebe7f00e2038f88740a994ee90f55b7f3ce6e4ea8898b7326d2f36dea2d89c721cffd253f92cde388b1273ad8d086242bfadaa86e4b87361844b3a3bca5b7 SHA512 39116afa16256820a69e020b71de5458fc5da8154bc8255d2157ff56fc679c39f4608f790d74eb4a0cb10cc61bd27d4172cfc547582100cab5b897644a700ee3
 DIST gnome-remote-desktop-40.2.tar.xz 65400 BLAKE2B 47be88529c365e5ab72b225aae1ad0fdca4748c39476ea1251db8f317e7fc25e90acf0b908f64f0a2111e0c59d8a213ede6945fe75151cdca6ab2cf8a77351cc SHA512 f39feb5b4b89d1c504a07c5dcf5962a4340cfc45c70d806a2b6739512ca80671dd8b7928a6dad83165dbba50b17c7961e329ecae0dd59f3f57f4fcf0f7969466
-EBUILD gnome-remote-desktop-40.1.ebuild 1226 BLAKE2B d6f64f25193c9f9b95f281d1ab31b09f7ee414472ab89a0c7bb8e3bd06e8f3b01009250747339a31c865e70e6e908fb4648ecb464bfb20e1135a5a50807e8050 SHA512 561a66e5a50b815657d68b5c22e0a33bcd58398fa77a687c166f0b93b8d58a2c5c9cea97cf6969fd08aa661f55b07f46b533b51166894ee3aa2db8bdbc1e838e
-EBUILD gnome-remote-desktop-40.2.ebuild 1227 BLAKE2B 009b113dc0ea796ee3b5007eb42436e1f58cff823805a793c3e3f461f573ed251746272e06cf497442528f87016dc854cffd52e89da4abfcc0a983b43b3323db SHA512 2c9f6267b7c55bf2d519cc4a5f497dc0a4efd72dfabc7372a29ea672bc3e809765a5d9e9eb386542349087364d0a6f69a56f64fea6c71003178e26797b7618c2
+EBUILD gnome-remote-desktop-40.1-r1.ebuild 1222 BLAKE2B 75029e6a760aa7bad27a215ed028451113f11602e9197c602f1d063157f99f25d86edc381af68d0719be490c5d3ea47adfa1874a74bc014cfa3584cc43e46061 SHA512 677e47930dc4280b1b77db3e60a9511f6121ba68282d68511d579f57cc94f1d631c64504f986fd7d3a334d7c6216df57da3d5d7f33efa62ef7b61cb4368d3c63
+EBUILD gnome-remote-desktop-40.2-r1.ebuild 1223 BLAKE2B fd00425e6695a63a9c2e3f926eaf31c0ea79f5be4254698f35fbc2efdefd7301915df404a6cac8f8d6105a7d880e23478c0f9bec73e9b22d9763276dc474d08e SHA512 129b288f27d27fa7cd50fc6b1e85a3d605b649343a84eb4abc3e0dd552227295127d7e950c85ea5cf2854e93b6200b84e30c10f8932c681a50822829446f8f7f
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.1.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.1-r1.ebuild
index 700f245f2103..2fead429fc5a 100644
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.1.ebuild
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.1-r1.ebuild
@@ -18,7 +18,7 @@ RESTRICT="test" # Tests run xvfb-run directly
 DEPEND="
 	x11-libs/cairo
 	>=dev-libs/glib-2.68:2
-	>=media-video/pipewire-0.3.0:0/0.3
+	>=media-video/pipewire-0.3.0:=
 	app-crypt/libsecret
 	x11-libs/libnotify
 	rdp? (
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2-r1.ebuild
index 8df01c6524eb..073774aa90af 100644
--- a/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2.ebuild
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-40.2-r1.ebuild
@@ -18,7 +18,7 @@ RESTRICT="test" # Tests run xvfb-run directly
 DEPEND="
 	x11-libs/cairo
 	>=dev-libs/glib-2.68:2
-	>=media-video/pipewire-0.3.0:0/0.3
+	>=media-video/pipewire-0.3.0:=
 	app-crypt/libsecret
 	x11-libs/libnotify
 	rdp? (
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 4c9c1a6c25d4..9572453330a4 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,5 +1,5 @@
 DIST gns3-server-2.2.25.tar.gz 10229566 BLAKE2B 73827940698335dcf9ef6d4b6c4c88b162852ec493f8ea05eebbdca20df3c84e4f5ee2ac218ed72755350df2f0e27cfc6cbd34b541e9e5bc0eada2fcb8e266ac SHA512 c7fa163eedc064fd266100658d7d2084ab0c542280d6689938a06943534df320f905c0e46175580bd3792218369936c55f9e135a12577f8a4b7eb86ac8fe9739
 DIST gns3-server-2.2.26.tar.gz 10230386 BLAKE2B 9b9de96cc22aeb1da92a48c9c04a0bf0271f3e47909bf09de76f357d727a4dfc2aa8181c47713192a9c88e55497ca3d8577f34635bf1f2f353387008c1bd13b7 SHA512 80a3e2939374b7a8f7e961f565b16d8a7575414793a3772235b41eadc184d02543ddae18122e90a2602ca51ce24513e1add17b1e7732f44c108daf3d6bc9dc7a
-EBUILD gns3-server-2.2.25.ebuild 2079 BLAKE2B 5d0cd48a38265e55410e9b3934fd248745c9aaace27163c46cbd97a0412b0893b52ebc96322abe19e8241d888c13a29aadd22faf1ea9e50f9d61412282cd0ae7 SHA512 4d21ffce7f0e447ceb490fc00d97f7bcdfea30ccc562b347afd767b3652977e12dc77a58a585c997773b698928735a4284c42a7610bd5aa122df84b11320f0a6
-EBUILD gns3-server-2.2.26.ebuild 2079 BLAKE2B 5d0cd48a38265e55410e9b3934fd248745c9aaace27163c46cbd97a0412b0893b52ebc96322abe19e8241d888c13a29aadd22faf1ea9e50f9d61412282cd0ae7 SHA512 4d21ffce7f0e447ceb490fc00d97f7bcdfea30ccc562b347afd767b3652977e12dc77a58a585c997773b698928735a4284c42a7610bd5aa122df84b11320f0a6
+EBUILD gns3-server-2.2.25.ebuild 2080 BLAKE2B 86f77a875b0b902ef7d9f263ab95d9297ede38d4176c7abef98ab7f60b417bbc6c7484916ddea4577684325a8f51cc9d1e28595b6ebc7ed4b15f47cef63c7cdc SHA512 296a0c340bd262b17be77b660bb63042be6a0c689e9db0cbdec2263a071eff796e02a412dbc544a8337c704e1ac96eea85faf8a66814d6d3d29456b1b742a9b2
+EBUILD gns3-server-2.2.26.ebuild 2080 BLAKE2B 86f77a875b0b902ef7d9f263ab95d9297ede38d4176c7abef98ab7f60b417bbc6c7484916ddea4577684325a8f51cc9d1e28595b6ebc7ed4b15f47cef63c7cdc SHA512 296a0c340bd262b17be77b660bb63042be6a0c689e9db0cbdec2263a071eff796e02a412dbc544a8337c704e1ac96eea85faf8a66814d6d3d29456b1b742a9b2
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/gns3-server-2.2.25.ebuild b/net-misc/gns3-server/gns3-server-2.2.25.ebuild
index 9d91356deda2..2b820f4601e9 100644
--- a/net-misc/gns3-server/gns3-server-2.2.25.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.25.ebuild
@@ -63,7 +63,7 @@ pkg_postinst() {
 	elog ""
 	optfeature "QEMU Support" "app-emulation/qemu"
 	optfeature "Virtualbox Support" "app-emulation/virtualbox"
-	optfeature "Docker Support" "app-emulation/docker"
+	optfeature "Docker Support" "app-containers/docker"
 	optfeature "Wireshark Support" "net-analyzer/wireshark"
 	elog ""
 	elog "The following packages are currently unsupported:"
diff --git a/net-misc/gns3-server/gns3-server-2.2.26.ebuild b/net-misc/gns3-server/gns3-server-2.2.26.ebuild
index 9d91356deda2..2b820f4601e9 100644
--- a/net-misc/gns3-server/gns3-server-2.2.26.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.26.ebuild
@@ -63,7 +63,7 @@ pkg_postinst() {
 	elog ""
 	optfeature "QEMU Support" "app-emulation/qemu"
 	optfeature "Virtualbox Support" "app-emulation/virtualbox"
-	optfeature "Docker Support" "app-emulation/docker"
+	optfeature "Docker Support" "app-containers/docker"
 	optfeature "Wireshark Support" "net-analyzer/wireshark"
 	elog ""
 	elog "The following packages are currently unsupported:"
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
index 4ea7c4bb7982..f5641d73ab3e 100644
--- a/net-misc/gupnp-tools/Manifest
+++ b/net-misc/gupnp-tools/Manifest
@@ -1,3 +1,5 @@
 DIST gupnp-tools-0.10.1.tar.xz 178164 BLAKE2B 86554b223aec9064e1bb9277e8ff609258868247b82aada52d98259c8a0e6f748f61a41ab8bbea41f8f73b386252ff2922406572782e627c8a70a8cd7ce22842 SHA512 bb95ac0b18e23e89074adec0a5e4e87aa43f98d7b3d9e173f4045bc64e542d5a311dde54a069b3485ebd0f4cdf36c813b5c84f5b9734c5361c4221617bd59a25
+DIST gupnp-tools-0.10.2.tar.xz 181020 BLAKE2B ae6666d0876cfa57df56720b178d4b9bb492d9dbc82582ecaa09d178e20f55b3d045085b20965af2a9efd30fb9de0155f29b824ef004dd67309ed2be0a1fe487 SHA512 acb48b6081851345a01bd4604f4c83beca0fcff627e9d282efd807f5c98739ca4967a428456487e27196d1be6d65dd9482a12267da146e4efe0f61fa5a43c7a2
 EBUILD gupnp-tools-0.10.1.ebuild 695 BLAKE2B a8265d2cd0601f95e250919be5c4d7844ed45a0c3a9a866828a2f31cf10a7542f6f6cc31d7c8314e0d3a72f68c54ef60200186d7dd508ffb2ad3d0c343abee94 SHA512 bafc80fbfe751fc7cc8d452822f68bc031444bff2ff57375fc13b7d970d3a482d8685cd61ca69ce285740cd2f6b3d6c2101784d3612f906ce9ba1bd8361226af
+EBUILD gupnp-tools-0.10.2.ebuild 697 BLAKE2B 6ec0b991a5ea7faf88ea754b711c9ec1a386e72001650c867128ae67917e4f0396688a8b8423e34ba78d5f2c7934886f9a0a3cf6c0274448b5a4c01b405a5fc7 SHA512 214be96c825561240c8f3f8cec3826ab76b0ffcecf3b2be7838834cbd38bfc3d012b20f5a46c34889039c505ebad955a1f61e0ff665934fdf64fdcaa9a74ec53
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.2.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.10.2.ebuild
new file mode 100644
index 000000000000..5558662142ff
--- /dev/null
+++ b/net-misc/gupnp-tools/gupnp-tools-0.10.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="Collection of developer-oriented UPnP tools"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	>=net-libs/gssdp-1.2.0:=
+	>=net-libs/gupnp-1.2.0:=
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/gupnp-av-0.5.5:0=
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/glib-2.24:2
+	>=dev-libs/libxml2-2.4:2
+	x11-libs/gtksourceview:4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dav-tools=true
+	)
+	meson_src_configure
+}
diff --git a/net-misc/kafkacat/Manifest b/net-misc/kafkacat/Manifest
index 20b260ec6d70..de928ae93a91 100644
--- a/net-misc/kafkacat/Manifest
+++ b/net-misc/kafkacat/Manifest
@@ -1,3 +1,3 @@
 DIST kafkacat-1.5.0.tar.gz 124682 BLAKE2B 392689ded1cd07268bba572273b2b18dbac0d0f4c2daf87c0a4c5fbbff2568df7ec5ca7b64aed34caa851b5e9b8629e246f9d19087496a882b8b55b2e2138f78 SHA512 57f75b26ef32df244043fa9fc17dc2d6fd93daeea4bc389aa78356ea6e45dea780ff9c3462ed27d2a7798560a21eef04f098bf7766c7305bcee4573f557651ad
-EBUILD kafkacat-1.5.0.ebuild 669 BLAKE2B af42aa0a0718a66bcbca7a58e4aa41067f3c529c57a18015e602ddaf41f53e01809408cb7797ad1b352ffc43949cd389de21d415437a254a0421563929ff30c3 SHA512 e605348a3662f5e3f3cf54f87d8455769923835f2427659715c031628ad87199f2f67a8b69258fd2b56f7c7a3171e9b41f1737ce665899793951ea54a854dce6
+EBUILD kafkacat-1.5.0.ebuild 665 BLAKE2B fd8e16958d8e64f3f2a7e13e722ee19a782dc9b1b95d36be19441e9af92adf4883c361a3fdcf1d9f5ec0832ce26871382c0189691c1afb01f8378e421ed5c56a SHA512 898bd07d1083cbe684baf7ac5042033140cb8d36087a9344c8ee69e8bdad9d57fbb8cf18fbacadeef6eba90b7553641a4285303f6d9deceb4b59bf3750818e9d
 MISC metadata.xml 468 BLAKE2B a9a00808af0af8c2a3183f35ccef3edd15c2772d99c3c01e2a0da115dafe46c89449d1dbe7119e08c294c7d53372ac4a6dc31d5cc956c66b73350143472af09b SHA512 d1cdf304cc2cca1744e2092b50db577b981d8684ebfa4a4d099bd84bada67e00558c439d9a735bc43247db598fa34e0419dd3fcaae94ae68246baf003bbffca8
diff --git a/net-misc/kafkacat/kafkacat-1.5.0.ebuild b/net-misc/kafkacat/kafkacat-1.5.0.ebuild
index 0e3125abcb97..a3ce11e765e8 100644
--- a/net-misc/kafkacat/kafkacat-1.5.0.ebuild
+++ b/net-misc/kafkacat/kafkacat-1.5.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Generic command line non-JVM Apache Kafka producer and consumer"
-HOMEPAGE="https://github.com/edenhill/kafkacat"
+HOMEPAGE="https://github.com/edenhill/kcat"
 SRC_URI="https://github.com/edenhill/kafkacat/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 0a2bf4c3c59b..9ab232b3c649 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -6,6 +6,6 @@ DIST minissdpd-1.5.20200928.tar.gz.sig 543 BLAKE2B 5fdedfe4b042924667c329aa964e0
 DIST minissdpd-1.5.20211105.tar.gz 38870 BLAKE2B a2c7c2b377f426eaffd77a15dd48945bd923344ed606c5060c209b57d7cb1ed92eaf93d8ffda6154b16d293ef78a20bec45aaae287c3f17b6affe3ab0bbc32f8 SHA512 ef393a051352c4abcc11d9f3bf1c822585750c1f8284875345f5cdb947b601c0bcd896d519a826f580612abbd7eacaedbd42e3fa60d654c906a35936faa92886
 DIST minissdpd-1.5.20211105.tar.gz.sig 543 BLAKE2B 09ac05a8e3836b10cdda4fbe00c09c0adccc0fcd119ac2711943c351eedc07b4a915c05a7026f853d26f41d687d5e8b1f69b229033291af302c4e56bc0f93333 SHA512 cfa41832f229609fc41f60a8b35d7dfbb9285933a17baecde2e2e0d855d841941d9e532d8c33a8f025f076cb052a3526d5daee2cdc5e0065f253258f4ee005f1
 EBUILD minissdpd-1.5.20190824.ebuild 677 BLAKE2B eecbab57e067679e992529c0aa64d246be5a1ee7a2dc56ccc6dc4f2e2ad512b869d6adca9dbf0f228297aeb557a27dbc8aaa177b1f74310a6fab1914793cb37d SHA512 d98bf9956693c41a56fbd5401f648359678d40c3ab6b936732004747567ce65686d3baec04b6a6e704450b7cff121a1e0789218550bff79bdd51594ff8b81cb8
-EBUILD minissdpd-1.5.20200928.ebuild 970 BLAKE2B 19e025bb874e1ef5554a2f18a5794cf0f9f5194d6a3d7d111e4321d0f7d347c4acbaad0cee3fe5c8e410ab8ad8464cbc206038ae339796feb4ee768b42ce07b4 SHA512 9f70df6c063235fb790dcd39cfc33eff8226d2a531afe733921713a16e0f6861b9612bd21106b6bb87c528cc6ef57637b95c5d53cb289af39c3493583cf96f46
-EBUILD minissdpd-1.5.20211105.ebuild 969 BLAKE2B 1647d974e2f660cd35015ef470985864a1caacc1fd608a48354a78a548447dce0c4f034937b20a4c270b3a571a9b06cc452ead63d67e496ed91cef42fa485bda SHA512 098d56a212515d5870a377d427b2c7541a485131c336f0996429b987a155795d2a0eb09f376a8320f0875fcdde83d5f07bcd3acd6a91a6ac8931e26e7bd1205b
+EBUILD minissdpd-1.5.20200928.ebuild 969 BLAKE2B 31d9df5038ddbb27130f73c590bf1f650e09638234bcb2daf2a290f661e19a4e06bf0e17bc29642712045c27fd9568b0258e124985c6b3c16aaebdb583f9e55a SHA512 122af0c6d875e66a3cf92e9d3a36efbcb5da873e7adc75ab2df27a534ab40261af1fb9629b0df80e4d8d1b72a04bd27a23b3d907ffeaf6a22709c57cca1a264d
+EBUILD minissdpd-1.5.20211105.ebuild 968 BLAKE2B cc003ba33ca58b0d739168754a9b526f011b3e42a089a6926fd9b411d3d71f8bbd8cd42b3cccece2776223886fe9ec5a1ffe71763377447aec4990d03cd189d8 SHA512 4a29d07a081e0db65d3d016854787ad78abf81eac5acedc796373231ee1cb67bb605408620d3ecb39d7b9581960d86c1bd4aaeec2b460d7248559138b5b134af
 MISC metadata.xml 361 BLAKE2B f4494f703999092a10082b23b3326f798df53decf2c9724f906ce70a7da884103edc2932b64954966d3d9f636bf8d3796375e10e688ec53b40b0201411fb49f5 SHA512 6f0a117ab68ff21e355354536c109985e7a42ade339c6ffa36231529731b14a0308eb8ef4b4df9a95cdef4e02ba410fd521c164fdabbaaf4c74117a4cf8b6f3b
diff --git a/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild b/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
index f6632eade218..b1e836721742 100644
--- a/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
+++ b/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
@@ -17,7 +17,7 @@ DEPEND="net-libs/libnfnetlink"
 RDEPEND="${DEPEND}
 	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
 BDEPEND="
-	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
diff --git a/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild b/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild
index b07a95967646..cefaa8e598e9 100644
--- a/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild
+++ b/net-misc/minissdpd/minissdpd-1.5.20211105.ebuild
@@ -17,7 +17,7 @@ DEPEND="net-libs/libnfnetlink"
 RDEPEND="${DEPEND}
 	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
 BDEPEND="
-	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index a6ebc41a8706..ace47d1efdc7 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -5,6 +5,6 @@ DIST miniupnpd-2.2.2.tar.gz 250649 BLAKE2B d561916ced9b5c58371382fe0bec68cd0771d
 DIST miniupnpd-2.2.2.tar.gz.sig 543 BLAKE2B 461a9149c66b0e314a767405024fc7bfb641a20ae36b908dc467c9211660d5cb0753fb3c99fa9d6df35d693a2f6790efb6a325f0005804572eaa78a02b23a482 SHA512 8ffc9901cd992cbd9d0fa4c5e510fe43f748ab4a7c4732cc8f2f685f19b71a3f087a63a39e1dbf081175ac65de34b5c05dc3ef636a805e550a0406119a5904ef
 DIST miniupnpd-2.2.3.tar.gz 254752 BLAKE2B ebdb8d4ce7dc649ef0243d2d698b9f51cb2006055eb3abb70d9ccc839cb57c7113595ef1b9b5886f55bc458d8260edf95ae6e1964a5d5423f9b0b46e07e02775 SHA512 56b1e93e9576fa412202e1940fcd8b7af57584714c15017bbcec1aa4fa7bba7a6fa5d1136048100d7cce3222f31b38837de1eae344b533164314c858cdf08ef9
 DIST miniupnpd-2.2.3.tar.gz.sig 543 BLAKE2B 3ba2e69cfd7e0a27a746f45e5eb10e573e00c4fc20a7d62b94a2e0b7e4e9ad8779d53df72e31547b78dc6e34676204a4848652e81d1e479a68973e150f51f468 SHA512 9f766f3e94de1fbd458c7bda30cc87892198af7544aa9dc0fa4c6b6a1c9434e4bab6f8583eeccf3ae613da240ad599d750425c507e8138d483710459f31a0b21
-EBUILD miniupnpd-2.2.2.ebuild 2096 BLAKE2B 8d0fd68a34e76b77f74160775f8057c68b3c1a4e17b99461626b89fd703f20b9369164fba285c980e14f30028406cf215b0d707ecfe43dc703d1253974d7ae1f SHA512 3bc8158580d5040bfaf6953a6f2019547d8f6f6c7f64f6fb444d5108619c66cb98763d5f72c70fcd05514d185da19632f5435c2b5d7189b8b9f86dafc64d7fea
-EBUILD miniupnpd-2.2.3.ebuild 2323 BLAKE2B 8294335fe7030cabfeee6d68bd8ac205965476510e814a9c6d0c7a5d2da6aff42335955a5231761602d09a2595886a9d965b5482d5a4b4b385c01de42f26f757 SHA512 bd5c32e398acf92765f4812040f2b37bf3d412c68723334208ada532e7359eb54458af63c3f81694d5023af8cacec129ac1898412cd710733697bcd9f1501758
+EBUILD miniupnpd-2.2.2.ebuild 2095 BLAKE2B a417629c1de6328f29b115a09248818c3f419b8cb5c1853e9050e4b123b9ecc166b0fc3cd0ad2571d3432ccd5140b33a9123afc4931aa4986f271a921141f848 SHA512 7f8b371cb74bc6eb27aa1f72cd7542dd74f5b115600bb834dd20c40dfd66f673a8ea2f14a17f3109893c5a820b8f43f6db08b169247cc9d2b5407a214a428585
+EBUILD miniupnpd-2.2.3.ebuild 2322 BLAKE2B e8203bc9d1ef9604a9738003bcca5714b73dd7b610eea9ceeacc6b0c092b4cfd31abee12224b940496a2b545b17170be989725aaac22f8be615601b9d95d47a7 SHA512 7dec24e45f945543033dd32bf119fb52fa2ec9aa24e448d24de3124a07fd2c2b7e5b3ed7d7b0cb03b510645023aa730380d6a95567c120844aa275099e91966e
 MISC metadata.xml 903 BLAKE2B 08e36f0ed04a8314bcd5edab87303883dc2dfe454b4ab427bf8f1716922f20465c61971dae2eb95381783589b202b4480f98c0d1f01fb2e7cc8e2a72ee9a294c SHA512 3b253a010b5f5e683c6cd4b60d9e8ef3a1bf6c85856ea18bbb2d97a610af7ca1bfbf0d62096044d3c851067b5203359d1768a58eafe6d06ad48a36013839d811
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild
index b2d4b1534d14..ecd348986772 100644
--- a/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.2.2.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-apps/lsb-release
-	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild
index 1042f0c2cb80..5c5f0f516cc3 100644
--- a/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.2.3.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-apps/lsb-release
-	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+	verify-sig? ( sec-keys/openpgp-keys-miniupnp )"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index fd9bee5b0cc0..d473f527fef4 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -3,7 +3,9 @@ AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e9149
 DIST ModemManager-1.16.6.tar.xz 2339528 BLAKE2B b76a8b6959d988a27d411384440b9bd1b7ac1a9d780b77319e735c4b42c55c51f51304ae936aa9b385634640bcb1a55696d4bd25ffdaf88eb73839bfefe5e091 SHA512 78a928007732baaa0eaed9d587913774d4fb79049d652474f39176190496012dc4c93fd0bd774ed6f86f845f3b9f345bcccf4c7b2438b83cf5846b2bcdcb39d5
 DIST ModemManager-1.16.8.tar.xz 2344748 BLAKE2B 70ed052a7cd5561518577948419b0363816805d8a1af7de2874fa3dae795e38611d34733f5ed5dcfb12270421430249ee0a49bf54e4dcb87abe4ab595bd0b4c2 SHA512 be32ef03210035a93bad5ac0e339863c247cd000276e1bfa1acf584df652a78eda74990226a00a20e957481ce92801ed365b153de8f927a983cec41d3bbe3082
 DIST ModemManager-1.18.0.tar.xz 2493576 BLAKE2B 36034a589fb38447c83a232b6d24ca2fceed15ebc89a41af969bdcebeb482d4baf2657d063b1011c0df252b4ba7f703284cbf111b90d565d66157006331d6e69 SHA512 6e99e5529a74e6fdf814b4fcb9c9f5cd6a0398cd75303feee62c3564f9d62f54bb5a435a9847ed085fe2031af5a8d821d43f9cabed7d3be019ae0f5c8b0e11d2
+DIST ModemManager-1.18.4.tar.xz 2510768 BLAKE2B 726c1a7970fdd13b7a1952abceff1905ed167a5da290d7d48427f221434ad02032cc0590d5701b10d48b93d10c35daadae4b20a026da335a9cf3020f55c4c6c6 SHA512 156193f0e9709e401f3acd66f8bc3028e04de70fca760b42fd9626e616292851cdeadd18685e05f0f83066a21d5c43741e96838e4940767a93b03db9bee7c9db
 EBUILD modemmanager-1.16.6.ebuild 3567 BLAKE2B 65802d8c7595ae478afea4d0232ca4da9b3a34f6a98bd4dc7443b76899c576b0c31c6c14d0c70378241fda1a5bbc7e5816c5cff12eabce6e4b8ef7a2b5d99bba SHA512 75c7aa58d2cb1097cab704b5a301b3a2a752f9ad043d853e7292d0f8963fc4f1cc0b8775b9df7a880136f5beb980679ed58349b041551787afd627f14b8bee34
 EBUILD modemmanager-1.16.8.ebuild 3574 BLAKE2B a5b0d70185d35e3008abbf4616ff7f8f344527b792a826388e5ed0ea3c85bc6adc23be3fbf3f3fd86dce64f8a1e60d38092da5d619ebb1600eb326ce8935d5e4 SHA512 06d2668d1b3a5215b80cc8a5839c4078662526f1c1fa8fb4a73a932c6e3ffe4c517c9b4ab426927201f6215b17c114d49e931f989d69b4ec3f863efda69f2b1c
 EBUILD modemmanager-1.18.0.ebuild 3619 BLAKE2B d4209522fe447e7fe37d3fe191a8fc4d67d8455941b085bb988d5ad52da904663b8b80310a43cd032e68b2b6233b94dfad8a75c14ba13bd94d72e9d4410c1517 SHA512 df28ce31928da7728faa522f50500455d26d9309c7e1c9770d241107920318e135256554ed46d388f0116af142531d59116669c5704c3e9299508a6b1f87de6a
+EBUILD modemmanager-1.18.4.ebuild 3609 BLAKE2B 146cc78886306350ed9f9cb04e3594a2d5cc9c012140fe1f88a90742c531e1bdef6c3fa878fa03a8bb391cdd42f224088969abab772a30a74d16a3c27bdfca7a SHA512 7a98d62dbbcdd4e14f74247a00b3337b43ee32d304d159d8ad181135f4ba8e3decdabc0088b85b7d7ba91912f20afa4a5737bbda2e872e31457dc29805da883a
 MISC metadata.xml 432 BLAKE2B f9a84e1bbcd6bb14effe1d41ef9eddfdf5b10ccaee4cfe041ac2f68e405dfdffe4930d5e701f9808d62832253e3255498425df53b6c652fb313365f260765433 SHA512 57f8df2fc04eea86d59a03e151dbd1df719faf3fad8c2ff6b8a74567ea01c0c30a1a92d4bd29db29116b4cdb8b688821f4fe62b81a89239c68ca884b160cefee
diff --git a/net-misc/modemmanager/modemmanager-1.18.4.ebuild b/net-misc/modemmanager/modemmanager-1.18.4.ebuild
new file mode 100644
index 000000000000..b84f97094ad6
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.18.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 readme.gentoo-r1 systemd udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
+REQUIRED_USE="
+	?? ( elogind systemd )
+	vala? ( introspection )
+"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	udev? ( >=dev-libs/libgudev-232:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.26.0 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection?] )
+	qmi? ( >=net-libs/libqmi-1.30.2:= )
+	elogind? ( sys-auth/elogind )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+RDEPEND="${DEPEND}
+	policykit? ( acct-group/plugdev )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="
+		If your USB modem shows up only as a storage device when you plug it in,
+		then you should install sys-apps/usb_modeswitch, which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--disable-static
+		--with-dist-version=${PVR}
+		--with-udev-base-dir="$(get_udevdir)"
+		$(use_with udev)
+		$(use_enable introspection)
+		$(use_with mbim)
+		$(use_with policykit polkit)
+		$(use_with systemd systemd-journal)
+		$(use_with qmi)
+		--without-qrtr # libqrtr-glib not packaged
+		$(use_enable vala)
+	)
+	if use systemd || use elogind; then
+		myconf+=(--with-systemd-suspend-resume)
+	else
+		myconf+=(--without-systemd-suspend-resume)
+	fi
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/modemmanager.initd" modemmanager
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	if ! use udev; then
+		ewarn "You have built ModemManager without udev support. You may have to teach it"
+		ewarn "about your modem port manually."
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/netopeer2/Manifest b/net-misc/netopeer2/Manifest
index fcb6c60c7118..040b0128b885 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,5 +1,3 @@
-DIST netopeer2-2.0.30.tar.gz 382529 BLAKE2B e17bc4eceb07b91347aac4e5167d7a92bfd7bfde77a79f27b6531f4ad0c77fc42e9281ed156b017969171dbb9f25e2570e9b2db1a85af9da896d5f39bd902555 SHA512 f0ec1b1e469b5a39ec4ae9533bc0cea6391068502defba3e3f25b154a573d37c030283b4483e27a11e8e372f580110af7df7279c6e1be3a2fec249a6b79c3d95
 DIST netopeer2-2.0.35.tar.gz 381321 BLAKE2B c776561b59bf05d093496e242fdb37766bf6292175186f92b85b86162d5fd6bba7118c41cef0ccfc835b09f34da1978f4e3aefb9961893b3d15b57117c3dbdb6 SHA512 f6b956c4b9d0f799f622eba62c2b20beb5f7db4899c6284bbb53303ff15f8787644687eeb99f1c68b455784166f2e858959ee16a345c0aabc444952bde70427d
-EBUILD netopeer2-2.0.30.ebuild 977 BLAKE2B 6315256db0e18386ed77668700ef2660439ad4d6112ef022799f98b6a5530645421e6156fc47a0db6d78bfe69623494ad058cfbddcff1c91473749550c3db045 SHA512 c821d498f878d4c590831c192d7a1ed14d9523128b5a7da488a918bf0539f6291056efd68ad05a1d1c42c27640387afe8fa7a32c7a4fbf389d002803b62e3d46
-EBUILD netopeer2-2.0.35.ebuild 980 BLAKE2B ac544c4217587fd87d8702b528a629841ccc02fe19ccb64720f2175a6c17172e5cef9e042866a825ddfb085c62a2ded85ae959fe80c7b4b1474c66d3930537dc SHA512 84c0edd43fa9fb09d7323ef750845012f9509294eb35a2dd8c08ab56e37cfec7e4064879d348b37f4dea6ecc8e03415f2043f28aa716e59436d1f583d8591021
+EBUILD netopeer2-2.0.35.ebuild 978 BLAKE2B d219cc8f2ae80831cb16e00047db60eebf156b0b8ec96dcf1f2c52d3400f482a2b535c5811c6f21257ba3a36268cd88d393187825ffce046603f641a1a391b1c SHA512 bb60a9b22620bdf5618f7635d56fdfe5bc481d761e1a679dd855e452b6d914583c319d20c0dae539df9c718981959547da8a370c08930ab70c61e1abeee9b4cf
 MISC metadata.xml 329 BLAKE2B 65eb219ac645e711725eef7985454f1d818421b3c152fbc28d1ec9efe1154233b16749cd4f2aeb87c41fe305979c62605409da6f2df68d589ec2d6e4bd657c5a SHA512 a3fc10fa1cc2754842547ecfd1b80ed16e32e7b406a1fb4fb1f8959423e85cdd9e5145b48649d19c95abac1702440abb6ac4a1b7f7715e15ff2264e8796da4dd
diff --git a/net-misc/netopeer2/netopeer2-2.0.30.ebuild b/net-misc/netopeer2/netopeer2-2.0.30.ebuild
deleted file mode 100644
index e47eeecc25b5..000000000000
--- a/net-misc/netopeer2/netopeer2-2.0.30.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Server for implementing NETCONF configuration management"
-HOMEPAGE="https://github.com/CESNET/netopeer2"
-SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-libs/openssl:=
-	net-misc/curl:=
-	>=net-misc/sysrepo-2.0.47:=
-	>=net-libs/libnetconf2-2.0.19:=
-	net-libs/libssh:=
-	>=net-libs/libyang-2.0.97:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGENERATE_HOSTKEY=OFF
-		-DINSTALL_MODULES=OFF
-		-DMERGE_LISTEN_CONFIG=OFF
-		-DENABLE_TESTS=OFF
-		-DENABLE_VALGRIND_TESTS=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /etc/netopeer2
-	doins -r scripts/.
-}
-
-pkg_postinst() {
-	elog "In order to do initial server setup please"
-	elog "run setup scripts located in /etc/netopeer2"
-}
diff --git a/net-misc/netopeer2/netopeer2-2.0.35.ebuild b/net-misc/netopeer2/netopeer2-2.0.35.ebuild
index 04f0cbece36f..f4ad0b6b6641 100644
--- a/net-misc/netopeer2/netopeer2-2.0.35.ebuild
+++ b/net-misc/netopeer2/netopeer2-2.0.35.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/CESNET/netopeer2/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/openssl:=
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 515a9794b89b..f8830c7e2471 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -7,8 +7,8 @@ DIST NetworkManager-1.32.12.tar.xz 5373452 BLAKE2B 29ca1f1c2aea60e4ddc7e3d546460
 DIST NetworkManager-1.32.4.tar.xz 5250412 BLAKE2B 6c0931d50a8666f88865d4ca5281e1570dd230156e30bb27822c9ea3d93b3b3b24f336e154787794e7edd7c00296f9f7c5761136cac0c0eacf142a0371cbfe81 SHA512 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684
 DIST NetworkManager-1.32.8.tar.xz 5255076 BLAKE2B 5f1bc55e3b9e6864c05421c8506ac202162deaf5081450e5d50f52699abc2d9bfb6e89b6f48c9874cccdc11fe754a5063a63e830702e211cf178ce7df0d628fb SHA512 328733f3dce9e52e680e464b60112995439f94dfeaea3b6c2082b323e85418483db6c6dc9e43f52176ff7c1291b226db77fe5acab9935dad7735c4397f5e9b83
 EBUILD networkmanager-1.32.10-r1.ebuild 11696 BLAKE2B 8cf1b21ce091f0d60b303b176ab801dfb292c3ff5da76e0988e7440c718d2a02786bd8b82828f8b9f70c21b4bfd4acecb87f9c32b56a6ba251f60512a855087f SHA512 4ba056421e940bf557f037a4357a31af2d3d577d1ba013350009ec1849146c6d0cb412180a60bc2ac7c9f712e0fd6c093f7e2cda45ce08823e0acc2bab0e0177
-EBUILD networkmanager-1.32.12-r1.ebuild 12243 BLAKE2B 13773159c5df4f8c1bd2b91fd261b42ce1bef6aa3e54ce7568727b6fdc83e612925908540ebf10765f379a2b708b892ea1e843db49f02eb83fbed0ae091b158f SHA512 8ab56159d2b8d9b4914abfc0784a4d2139ff7850593c260fa1c841a2446c94ebab453f111b7edbb692b1d9609ea67a4b707c1c091018af8d60a75e665e5497d2
-EBUILD networkmanager-1.32.12.ebuild 11973 BLAKE2B cb84cd0969914f4373c8162a8d51580fd3555b4ab8028de641ee6f8749a4ad5cc39ad1af3385663654ac67e1f26de7bc1c837f9e94b7549a777014bd8b75bded SHA512 60de1b88e8b0e464e0bbbdb858640af6e73dd77d8a698f649b4e5151e39f54617f2827cd617375a7fff34e5d0ac0612df3688d75a8cbf9b6c0cb18939d46b2f8
+EBUILD networkmanager-1.32.12-r1.ebuild 12176 BLAKE2B 5b158ded9412830690fdc1a7b2546ea0e3dfcc01f7e663c0d0f7c89c9db7728b190cfe32abd6cbf3e2aa27d65329ce2e7c564592389996bdc9b11592cb0ea069 SHA512 2df198811228f9e191db18489722449fc0de3007017eec480d618d8ad371e85f1528811f2395b6f84574cb52c19b510d2f830f77ff16dcc1f8e174c9c6775c07
+EBUILD networkmanager-1.32.12.ebuild 11967 BLAKE2B b94f628f497e85d43f000598a74a88fea23f21dbda412abb24dffe2bb736aef7a3d0d587fecd1f706049ad2411610ed4790c8391fbd5caf391857e38e9ec56e8 SHA512 31de3c5f36e5033175ed9c1fa6d3687542237f04d17303528c73671627e85d801a65d3d2fdb0494cba6c2f041941a360ff799c8984558eb33860b544a4a80ac8
 EBUILD networkmanager-1.32.4-r1.ebuild 11371 BLAKE2B 5ad40b864ffd1ded48fd148267362ffaca2b1139332a1fd7e632909ef617b9549b4cf913be4dd43bdd8c862b6eb77a284aa75863c10bba4e0859bd3ee9dc8808 SHA512 e44332cfac5c3e9cd2931e5f5a40c3b219c0f55684c0bced16432ba40ebacf2dffe368a741f521014cbac4a16eb04d88c985fdbfd6c1f4c9da8f31ddfe919a9e
 EBUILD networkmanager-1.32.8-r1.ebuild 11384 BLAKE2B 8ba69b4605e75af3d6ae5cdded420ab18aba256b9ea4dee03885d068f0715e405c8fa6698a7c8bce9f6578293d37ca357829f801cebcef55cc3982c197b22648 SHA512 01ef6f7183dcf8d0876a725f729d8d064b492c295ec12345465fe74823d26a14dfd03a4f0331283dcd8d98c8606bc46ca2c8d1ab10385b5516ac1f02a8904667
 MISC metadata.xml 2377 BLAKE2B e665210ad074426373296d0164654cd793c0fad1eb71ba68ede73ecbcbb17c1636722a7676bc5ccde93d0a8b7c75c170a3cc0bfe1f06305984dc630e8c0e0b2b SHA512 e43a86d9af9ff0dbc2d701b59f29ffca279f9a3adaf3fd3473f170827c15e77a454e6f5df554028c300e13dd536fdee0528acab62eb706f7061a3600b2e9dad3
diff --git a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
index 7cd23f0708ce..005ce3efffb2 100644
--- a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
@@ -30,8 +30,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-# Unkeyworded given somewhat experimental changes for bug #816210
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/net-misc/networkmanager/networkmanager-1.32.12.ebuild b/net-misc/networkmanager/networkmanager-1.32.12.ebuild
index e158bf041108..b364bb3e0fb7 100644
--- a/net-misc/networkmanager/networkmanager-1.32.12.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.32.12.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 29d0369ce0c5..309e7248d3af 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -2,13 +2,7 @@ AUX nextcloud-client-3.2.3-inkscape.patch 3190 BLAKE2B 432a1d418e61c982ff6f4d7a4
 AUX nextcloud-client-3.2.3-webengine.patch 15574 BLAKE2B 8cd752db888f87f075f3b69cf34e3e84fde99f3f2dec4891092d47c020b60efc49968bfee7ef8136b6e0454cc331b778fcbc2a94903b11c1cc3e587d153e3aa9 SHA512 b3ea743ab50ef8eda12a0bef8513d1563d3682c54e6af586ccf60cf7b4377e93913c4d6eb0ba1b65075203608bfa81f934dfc408b89c5bf3b84352524bc08091
 AUX nextcloud-client-3.3.4-inkscape_to_rsvg.patch 2170 BLAKE2B 1593e98d25f5a9cbb30829a9619ad6916e6fd2e3be64a538dc0452ff3785deea86cdccfa5c7bae40dc4dcfc83e127d9dfb16e14d3954449ebf15939cf3f34d76 SHA512 9d97656af41df5dcd1c647f49833cdc71bfa5c7d0941d722ee01d6040702754c6d07d7320637a18bd8baddcf724e84c4dec6128d329646bb5773f5f2fd22830a
 DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99
-DIST nextcloud-client-3.2.3.tar.gz 15381488 BLAKE2B 14ee239321d7c530dada9d4727fa7cc9801637827fc8dd065ea9b68c54f3559cdb56b0d0e0e37fc7aa5c668be51e3839bc33b20ea9ab73e4a1df4ba260b0ab9e SHA512 bbb247ce4945503a5b1af55ee200edaef000bb21220a9408657e057c98bd3f7bd646dedbedc57048e9f593f3a1d408ac37b4b01c390ecf85dca82868792e922d
-DIST nextcloud-client-3.3.4.tar.gz 14032214 BLAKE2B 2d5a4cb8ed2aff6166e13c5e7ea5450d9b9ba1f385eb3cb99588584d1ccaf114ecdd4ed2fa0bdfcba6e5582df8e4bcdee371ef0de8c023fde131f23828d30fbf SHA512 c4fe2d032161fea556610396c5b51d6745f41de76d17e21fdd93ed0163f2079d1abba997a3184842403041cc25a303c5844fbd2213717b27d11ff9612f364151
-DIST nextcloud-client-3.3.5.tar.gz 14060100 BLAKE2B c5e712dbd8055590963f7be3286a33492c512b440ca7636cf69ea246212b4882c5bb1e66290e35b3cf6efc96a91eea6542495036160923251a475931de57ceee SHA512 42502f12366b99e457b0f22ed28b587105eaef0d16404062e04544629f4074747925f168ecce4c035d75bf28ac2bae03464e5c127a826571b82648ec8f0834b2
 DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0
 EBUILD nextcloud-client-3.1.3.ebuild 1973 BLAKE2B f175a9555be40de2623e5392e99d587a6e5ae2e058964924165c01495be57d42f209c15db261571cc8120587e9be0c04aa5b83293f2d0e7f714fe521a8b6bac9 SHA512 65ec99fb719ec4ebdf0466aa59ac5e9a4ffecaac9a8b94cb2f59a2efadab5ce9e44ec54e574fc818cbb71554828c14b7b1a575ddd97fc881345854045b8931e3
-EBUILD nextcloud-client-3.2.3-r1.ebuild 2175 BLAKE2B 9f3c68d6afd38a786b1808860b77b2f05c53361b7dbfae0a52bb0f46114c56f2f6c510b3d339179549af132b34478ae84e361313e47362ca53677dc0025b62ff SHA512 93364128839e839fb76752cb753301652dec39a6ff936dac43e90ca636180703889b1e48c79a0f9e814a9c094534e96d474583d2aee3222eabd3b3b4410a8797
-EBUILD nextcloud-client-3.3.4.ebuild 2166 BLAKE2B 81877061305f13dd5fb75bb56c39aaedc49b63624b35a536fd1ce711468c2608da0c1d4e64d26af729ccac65b44f8f2bd087bdd1b61403f938986940242c1c93 SHA512 9cc5ee0c40d68b797aa83cedd7c2347bf446d187eb3435d91ece998e22684b7dd25467d83656e3cc8e1d7a6f0c3661c30b5cde105b53bdba7574e4dc8decd937
-EBUILD nextcloud-client-3.3.5.ebuild 2173 BLAKE2B 281b3c90c66e0251e8dfbab1f5806ccdb9744e7109f9d1f10939acc4c60b038ec8702ee8ddf092925f3e4c60491c6ba845ded9e42cc16beb51448f76f971868e SHA512 9eadc5f0cfa15fc264e348955b378d7bbb39352ae3b40602dc2f177d09a96448dbe84ca236516f44866a6bf470b43077ea422e052c3204f69436cc784edee99f
-EBUILD nextcloud-client-3.3.6.ebuild 2173 BLAKE2B 281b3c90c66e0251e8dfbab1f5806ccdb9744e7109f9d1f10939acc4c60b038ec8702ee8ddf092925f3e4c60491c6ba845ded9e42cc16beb51448f76f971868e SHA512 9eadc5f0cfa15fc264e348955b378d7bbb39352ae3b40602dc2f177d09a96448dbe84ca236516f44866a6bf470b43077ea422e052c3204f69436cc784edee99f
+EBUILD nextcloud-client-3.3.6.ebuild 2195 BLAKE2B 3eb1920755ce582360cd690e610fdcdfab06cb6ccd7562770851ccf74d47712dc180b69a2ea8f88d639d8b59e970b2bf850432eca4c6518e9560b6e009712ad0 SHA512 a9b4087ea8c6a16393c75d07cecd3c4cb21ff8bded49dfc73231d9701100c039c753fdb7af787d975a30dc4cc2009efe4d859445b24f84aa6bcd22ebe3f16c97
 MISC metadata.xml 605 BLAKE2B c24c20e11e5ddf2ce188c7c80aecacc9af7145aa325b150e9d9b753b11525683938409aa911d65d4e62a2f6177df369005aaba7c10768beba4bb66955126b547 SHA512 5fc64dfed80ed91c89402e22910dc72e8d3649be1bcd27b0a48ecd6a86f129b06d9d37fa7d4f7d54c083b3b04935a28ae982871e7c1cf28a88cbd9dbf9aebc17
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild
deleted file mode 100644
index f5a364e114c6..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-inkscape.patch
-	"${FILESDIR}"/${P}-webengine.patch
-	)
-
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild
deleted file mode 100644
index 79fbb809fed5..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.3.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	gnome-base/librsvg
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-inkscape_to_rsvg.patch )
-
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.5.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.3.5.ebuild
deleted file mode 100644
index 35dda8ac61e3..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.3.5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	gnome-base/librsvg
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.3.4-inkscape_to_rsvg.patch )
-
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild
index 35dda8ac61e3..c6e9450b1f36 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild
@@ -59,6 +59,9 @@ PATCHES=( "${FILESDIR}"/${PN}-3.3.4-inkscape_to_rsvg.patch )
 S="${WORKDIR}/desktop-${PV/_/-}"
 
 src_prepare() {
+	# We do not package libcloudproviders
+	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
+
 	# Keep tests in ${T}
 	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
 
@@ -67,10 +70,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DBUILD_UPDATER=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libcloudproviders=ON
 		$(cmake_use_find_package doc Sphinx)
 		$(cmake_use_find_package doc PdfLatex)
 		$(cmake_use_find_package webengine Qt5WebEngine)
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 58a39da980af..622b415dc281 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -6,6 +6,6 @@ AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0d
 AUX ntpsec-1.2.1-seccomp-rollup.patch 2987 BLAKE2B 82bd355cdd169133f232f6514f363e87b6876472d49d69d034dd33aefe7179dc3db5e661909774471635dd947761f5e8ab47ecc0dcf8d6c2e62ffdad06044a3f SHA512 34c1941dfd7d7968fa954fb36411aad5e711767f1c0b6aca52cd8f8c839163110af2d4774a7a41b1f3d0daa49af5823b74e9c8a2a9ec12b9a344c72ce505d279
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277
-EBUILD ntpsec-1.2.1-r1.ebuild 4385 BLAKE2B 2491e0e0264e62b0c0df4e0a8ff16db025595cc923e7f5d7377d6b34ba49e54282250c749d2b6ef902656f397e656d9154f8917629ec120a0002fbb712025773 SHA512 b88a7764966d07394af3dc473e5fbc5645dc90a28a3005768900714d7e08e356596cbc23ca49a65974fb929ab8d8acb73f70f5e8d03b9cc3942c5c75880003b1
-EBUILD ntpsec-9999.ebuild 4063 BLAKE2B 46d4c35ff1b73d2af63182f38ea3d3c4b3ab28b53b31764f9e8615922239857df7cbe7397d32202402b91507547e0d6d9834184f13c249bd95e32e39ed4c1cd2 SHA512 55278b3d172de7de1eff6a9269049bbb40270ce16cd6063c550ae0c9a642300899ba22d3953b24e4abe7fb7391cd453a035892915d15d44d0cf7e7f89cc1606b
-MISC metadata.xml 1968 BLAKE2B 7322d8ae32025477e68bee19ef813b5bd8011f750cd9dde23437a7519491db477e85178f3be69356c2cccd2a3519b60fa264988c9cd3fb8d6f8700a1392199d6 SHA512 c4d698ea3cf83e8b624281a3f841742f318f5d52768361debad2aaa7413e8447fd4f62d6b11fc3b25981da6b7f73efbd87d904c9688cdc1e7b54fbb3d88b2154
+EBUILD ntpsec-1.2.1-r1.ebuild 4377 BLAKE2B dd1b2f43d6b675115c4fc05696d911ee961c7de76b1b41cb78713de5f002eb7178eeaa3af5a89ce3752e399939d2071c12db2d065b750f7558f0c89f9dd8852b SHA512 0bacae74caf389efe8918f62dc2c344d405c6cf04d1bf02b36e708bef8a2e572453fcd72443780a3771af05e8412328c697cec8e55706e79ed801c5e1e76cc85
+EBUILD ntpsec-9999.ebuild 4329 BLAKE2B f6706f89cbd8191608ca4092ee2de304db5ac676cd6fcf3fc0d2c107acb5a66da0d546d8b060ff80db60a00a9029b0746e104b71546b0109ffddef259144d778 SHA512 26a81887ef0537376df3f458772cf000fb7f40171e7d481a1f72393f0226ee7c3c810715bcae144dab63b06e942767d6e073112e7626e2a12db5ecc80c8fc6e5
+MISC metadata.xml 1902 BLAKE2B d807dc3dae199835bfa1624e76b43e39a1392f07d736ab5936c48bd4cfd69fdc1bae71a02c3cd9f405aa0992e7ebe27f5ffb639eafed027deba96eaa99ace391 SHA512 a29e4dfebcda69c393487ccfccdefd2b9e4e5c63591d2ed7c008b54b7c04afea071938fd2e0ce6c67f26ccecf427053b1a2b8e946dfcc3e092f64d00bc28aadf
diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml
index 9d4b63729b27..69f78f92c02d 100644
--- a/net-misc/ntpsec/metadata.xml
+++ b/net-misc/ntpsec/metadata.xml
@@ -28,7 +28,6 @@ NTPsec project - a secure, hardened, and improved implementation of Network Time
 		<flag name="rclock_zyfer">Zyfer driver</flag>
 		<flag name="rclock_arbiter">Arbiter 1088A/B GPS driver</flag>
 		<flag name="rclock_nmea">NMEA GPS driver</flag>
-		<flag name="rclock_neoclock">NeoClock4X DCF77/TDF driver</flag>
 		<flag name="rclock_modem">NIST/USNO/PTB Modem Time Services</flag>
 		<flag name="rclock_local">Support for undisciplined local clock (not recommended)</flag>
 		<flag name="smear">Specify the interval over which a leap second is applied (experimental)</flag>
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild
index 8835c7ccfcfb..379a375aacd1 100644
--- a/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r1.ebuild
@@ -23,8 +23,8 @@ HOMEPAGE="https://www.ntpsec.org/"
 
 NTPSEC_REFCLOCK=(
 	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
+	shm pps hpgps zyfer arbiter nmea modem local
+	)
 
 IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 4d520e72c5a9..2065ee52d6a6 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -3,10 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE='threads(+)'
+DISTUTILS_USE_SETUPTOOLS=no
 
-inherit flag-o-matic python-r1 waf-utils systemd
+inherit distutils-r1 flag-o-matic waf-utils systemd
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -14,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
@@ -22,8 +23,8 @@ HOMEPAGE="https://www.ntpsec.org/"
 
 NTPSEC_REFCLOCK=(
 	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
+	shm pps hpgps zyfer arbiter nmea modem local
+	)
 
 IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
@@ -48,7 +49,7 @@ RDEPEND="${CDEPEND}
 	acct-user/ntp
 "
 DEPEND="${CDEPEND}
-	app-text/asciidoc
+	>=app-text/asciidoc-8.6.8
 	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
 	sys-devel/bison
@@ -56,15 +57,23 @@ DEPEND="${CDEPEND}
 	rclock_pps? ( net-misc/pps-tools )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
+)
+
 WAF_BINARY="${S}/waf"
 
 src_prepare() {
 	default
+
 	# Remove autostripping of binaries
 	sed -i -e '/Strip binaries/d' wscript || die
 	if ! use libbsd ; then
 		eapply "${FILESDIR}/${PN}-no-bsd.patch"
 	fi
+	# remove extra default pool servers
+	sed -i '/use-pool/s/^/#/' "${S}"/etc/ntp.d/default.conf || die
+
 	python_copy_sources
 }
 
@@ -85,9 +94,10 @@ src_configure() {
 	local myconf=(
 		--nopyc
 		--nopyo
+		--enable-pylib ext
 		--refclock="${CLOCKSTRING}"
-		--build-epoch="$(date +%s)"
-		$(use doc	&& echo "--enable-doc")
+		#--build-epoch="$(date +%s)"
+		$(use doc	|| echo "--disable-doc")
 		$(use early	&& echo "--enable-early-droproot")
 		$(use gdb	&& echo "--enable-debug-gdb")
 		$(use samba	&& echo "--enable-mssntp")
@@ -114,6 +124,7 @@ src_compile() {
 src_install() {
 	python_install() {
 		waf-utils_src_install
+		python_fix_shebang "${ED}"
 	}
 	python_foreach_impl run_in_build_dir python_install
 	python_foreach_impl python_optimize
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 89bc1b321840..92690bf7a712 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -1,9 +1,9 @@
 AUX oidc-agent-4.0.2_makefile-liblist-automagic.patch 448 BLAKE2B df7716192364c71619af14cdd88323a2b6ac7b382d76326aacafa0814dc141416fdda87fc3a11eae8c333e0ac4fcad4386d2e902e13a300a12bd5cbe25df11d7 SHA512 b1145a26fe837a06291067c62bb939b76993e10194a0fc155cfc892677e4f432e0744410dee23eaf14f3a04a9a0c5d8629abaa7c40e3e1abe28ccb2868a41ceb
 AUX oidc-agent-4.1.0_install-perms.patch 1911 BLAKE2B a74915c1ea19c4d8fcfc09b30c60259e361776c458d0f52885ba4399f0599a8094caced14f59cd024331a4d09efe9298061b914faf4e74a700975e2afb7890df SHA512 9390b4ee8a5baccd8de0f5b22c18ea6d2c0a3c83e70b3e3f44af87cf563ec332ce40c6f5cb4f0f7065cb6b17317442daa22de125139823b4b99428c0624fa08d
 AUX oidc-agent-4.1.0_makefile-toolchain-vars.patch 1439 BLAKE2B 9e3477c1eb3303cfbf66f99f8a3fb71966c78c2af2922219efe6684c2fc572fafd8c5d9e93c70cc05aabeed3a53d97a592f3e22d9a0aa6931ce436946fc194c7 SHA512 e96d88784bc55095308fc40da8c969da1068ec6c2ca62ed34fa455785c28f1e4373c49a8023f2ca77fa64cacdb27481972eae014e66315b30c9de2a76651749f
-AUX oidc-agent-4.2.2_makefile-toolchain-vars.patch 1194 BLAKE2B dd0e28e3dbbd2aced6742afbfa1c7bfaa79111a0be4cfaf822184761173a6c6d209c1f6f9fdd4bb3fcf41a94df09b24dbee1bf0e949443ab0e7938d3002cf0ec SHA512 b7555d04afa850aa1579def5825f7e22a024358d8ce5850632f379d2e94a13a2de1c2eb79619c3d6e80b57292d95037103ead3e54c8825b6a349734c5e4e37c2
+AUX oidc-agent-4.2.4_makefile-toolchain-vars.patch 1216 BLAKE2B 52a0b1141772b4c0be288909657a8215db635f9a95cadf542d36c421a6fd7a71a38996f691d94838f4f37d28fd49ac7921e4371c13a7d702d07ba75f67a7693f SHA512 1664e44399a7152b632376d6d44ae8ccf360145f705709af24011ca0e637e976393a49898b0666eebba9ccddc7525d38c464e16768c34e8972709739c567eb16
 DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1
-DIST oidc-agent-4.2.2.tar.gz 823169 BLAKE2B 5ce071c1ac6e65ab7de869e9963884e60142dc1c93e8eb3eb00c144527754199867238eb45ca2cba814dedf7e55b2aedf66f45e613697ebc3262598fca0312e5 SHA512 852eb5c6c071aafa58366e5e867f95908cac2fa0c3b6924e021cc81825b0bba0549e74742eff0ef5a9bbb16173e21c94ba7b618150a42b585968b4cd4663409e
+DIST oidc-agent-4.2.4.tar.gz 823459 BLAKE2B 71c2fd983031641c5ed39ba3f1771bf283ab56eae6bba426da5308a7c9fcf2ce48103220375b9881e255eeddf05d50d58e2dee047b0b4436451c8d39b0cd55e6 SHA512 6f4f79823869197a0b74cd757b72e1d060ed9f1d9be477f815989b723a86285b200bd72b95f07a4698e754b9ad7aae48cee72603e1a6eaab71590cc63c2bae3d
 EBUILD oidc-agent-4.1.1-r1.ebuild 2052 BLAKE2B 1b40576b3e8869a7a6904192ab397786a3dfb3be1c14910fb8efacc0f7931dea599378602f4f776947d81c38cb188c792c74db741685d292eb4533dafd7907aa SHA512 e498dd833ef994e96f4f9fe41d42edb5334f3dae38d85a3929c5d2b6ef7d28bca15253be4029922a45849e51771b92f411f81f3fb2850e3f86bbed50be694d13
-EBUILD oidc-agent-4.2.2.ebuild 2073 BLAKE2B c6d1c5992bdb7aa47af2b5c7795f83a9976d5e335e7cad3a93d765bafa034660d23021f3f4c0071aba2dbbde22ebdb6a0ab07a5342bdfcbb6515ec887266062e SHA512 7b21b359b66da7d9badcc551b7a12bf507825d46f85a4e3a11343f510456192a3ccc4a69c48b0fcd9f0fe1eb75b98f0a43058ce5448608ced006f761ebb8d2a9
+EBUILD oidc-agent-4.2.4.ebuild 2073 BLAKE2B a0fe26c99af5804e0f677b8f59e72ba6500aea62ec747b9cc37e2e28b4345a143af9e98b3db6c71b1e49bdb33c3a976be5138b0235ef5e895cc07edcc85722af SHA512 b8421a3a592487eec4ece9b51e11f94bd0e93a59f78e7ade0cbb75f0ce239d929d4d11a8e75835f0fa27ea2bb8b2a591f5120cce53b036ee0ec43076597b3781
 MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch b/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch
index 2df3afce8e68..7d4bc3b30744 100644
--- a/net-misc/oidc-agent/files/oidc-agent-4.2.2_makefile-toolchain-vars.patch
+++ b/net-misc/oidc-agent/files/oidc-agent-4.2.4_makefile-toolchain-vars.patch
@@ -21,8 +21,8 @@
  ifdef MAC_OS
  LFLAGS   = $(LSODIUM) $(LARGP)
  else
--LFLAGS   = $(LSODIUM) $(LSECCOMP) -fno-common
-+LFLAGS   := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common
+-LFLAGS   = $(LSODIUM) $(LSECCOMP) -fno-common -Wl,-z,now
++LFLAGS   := $(LDFLAGS) $(LSODIUM) $(LSECCOMP) -fno-common -Wl,-z,now
  ifndef NODPKG
  LFLAGS +=$(shell dpkg-buildflags --get LDFLAGS)
  endif
diff --git a/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild
index 53f713528866..ff691320302b 100644
--- a/net-misc/oidc-agent/oidc-agent-4.2.2.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.2.4.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch
 	"${FILESDIR}"/${PN}-4.1.0_install-perms.patch
-	"${FILESDIR}"/${PN}-4.2.2_makefile-toolchain-vars.patch
+	"${FILESDIR}"/${PN}-4.2.4_makefile-toolchain-vars.patch
 )
 
 src_prepare() {
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index d8d855f64b5a..171449dceba7 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -5,5 +5,5 @@ AUX oidentd-3.0.0-ipv6-masquerade.patch 2302 BLAKE2B c291c43037d7b30e15b0c459961
 DIST oidentd-2.5.0.tar.xz 195536 BLAKE2B ea6327fc415811b7050503daa393639f5740e9c1681794cfadf447e4968024aed7e0367ba804209d236c295777f856297b62c1d7e307c268c3d9fad9b240b7f5 SHA512 31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320
 DIST oidentd-3.0.0.tar.xz 187088 BLAKE2B ca824119cbb54aee52658c9a167ace88b2ed7f118565d7be043e19534a323772d18a043d803cd553c7408a525e3c717ffb990fb8794b4af4e8ac6c1efe4571c0 SHA512 92e733272979c08bba012f33aa6e0eadc15e18e03c24258b0333f74c201df87cc619012e2d8da69aac10c15684691464f59551c9b9d83e690b3902e47f649c68
 EBUILD oidentd-2.5.0.ebuild 1254 BLAKE2B 928c432bef758266ecd842a3aaea3a4fe55468598a4867d1502eec42a73e540b62591f277f96f4874f38c1e9069f3ccdc6a32a8390c0fc619aa8d9a643511bb6 SHA512 0ea39fead9d40f11229831e53551430788baf885b25efa476b7695057a182279b187b142b50113530a3b2177f577ec5a1f0b60dd88346e23fa807b90055b36f8
-EBUILD oidentd-3.0.0-r1.ebuild 1283 BLAKE2B 2927c0036a8150c70ead57c1dfcf939d74c21f0041096947625dc171b11520ba69bae84ee37a97f0a0be2039a122e3ddd8a9624a91d1b45356d98da1a28ed5bd SHA512 40be13b814098f848aa9c4bbfd005655e75ff8e2316d56fe817541474e14ee1dec32858c1ae111788db75c9dc962e3bdb74e22880c554fa8e2fb496a3f1b809b
+EBUILD oidentd-3.0.0-r1.ebuild 1278 BLAKE2B 898693a5fb9f881dab4f4e5a8c4cf658058707d74796cb61b5bef8fffa11e0f7acba577386a3ed9c7008d9c170b975b59a9bd67289c061e73f6a029895e25b13 SHA512 960e4631d8c8f67ba582254b17055db710d6c2cb5d36f9df101692624a6ded343120d268681ed35c0ce9f5abfadab4ac65e2ce8e4139391ba3a1d37cbbfd3cac
 MISC metadata.xml 570 BLAKE2B 13988eee6eb154328c20cc58e0a7fceed6a6cf38811cb33456d154b646ccd2f638c7d9ffcae17552eb2c907a03ef4ca48a01dcaa9ca082bcd86f01f8b8efb811 SHA512 7474d2c67d8aeb05d48a71517b622706906de74d13d42c6e486fee4103470d72da0523d39084e2d304ada98e228c49d14d0befda63fc50102909eb1dcfda611e
diff --git a/net-misc/oidentd/oidentd-3.0.0-r1.ebuild b/net-misc/oidentd/oidentd-3.0.0-r1.ebuild
index 3c1eea07ecf3..de8a92711131 100644
--- a/net-misc/oidentd/oidentd-3.0.0-r1.ebuild
+++ b/net-misc/oidentd/oidentd-3.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="debug ipv6 masquerade selinux"
 
 DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )"
diff --git a/net-misc/openrdap/Manifest b/net-misc/openrdap/Manifest
new file mode 100644
index 000000000000..8cfaf886c045
--- /dev/null
+++ b/net-misc/openrdap/Manifest
@@ -0,0 +1,28 @@
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip 66303 BLAKE2B 4b02e631a3537d577b78b1372f8496113c582bfaafc48f5ce6981ed72da6a611d6c692a85c6e7cc8aeb47c89d0fec9f491d59607ead55d5e4be256525d3173bb SHA512 d29dc8a3c82c34af07b0c393349eda79b30c988d439771e02106bf2f386ef5fc3feaebf00da3953a40bff2c5ed93880ecbf45e1607303c11a417bfffb96e2e65
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip 5447 BLAKE2B 9b79de84354305adc2019db61eaa5f84daaf0ba088b1582776b4973d85fda9055264b14218a00ddaa3c23696f5c57574eecbd48c2c7dc4df84348bf5c507d559 SHA512 eb9b80bd07a9586681ccb20b48644c404ad326e65251571531776ffb51eed20dfc79cb34dba332dea2fb4aa1a766da2cbad597b59db3c7f770b56febe1956ed4
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.mod 43 BLAKE2B 3d0d2a05e01b444fd374e5fb17a44bc8e5edfd9b6f3cfb4f11c5560b5cb7ff6fd6b17a71dc4f66b1b5bae36772c4f1b78f38c4d57e56781e7a8f49e20a119181 SHA512 7b584512981122677bbdb1c18358f1ecf72f7e97f61d80c9787f0887ea456e96c3f67155fc287a8cc7ce39584cf48696dd9c3a14c98e3c3f5b3a744cc6a4cd9f
+DIST github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv1.0.4.zip 24559 BLAKE2B 341d9363a33f516e7f5e919d83836affa0133c7d6153b2c5aa85c748fcc4e77dc93d6c3d2e215d91beb020cd6e4fdc3cb602593ad403fbf3eec88dcd71122bbc SHA512 8f262a5f859f2cb644c9e278e492b7c0004a38d45ad41a9cb5a321a4d450fc81007ff1ddbdc34923d3da4fd1d271c11aa7192f77adeb6421d9f82a11cd942eae
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.zip 1825995 BLAKE2B 043e1f926e0ae47ededfa2ced40e95fe6c564122b2e2a64ed631f3bd4dc52c8ccf5b5bd4641d17ed996875dc1e64ca8edcb6f02dca34be178e611cee74e4ce7d SHA512 a596a5c0e3ae5fcf366d84dddc7b884fb72d6dd89dbadc79f9ac2cea397f2795ba3ea5408cfcb75f248ddb18c9774ac7f55d0e355f1be1468812565c5403fa5c
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
+DIST openrdap-0.9.0_p20191017.tar.gz 78085 BLAKE2B c3366aff7f12bdc8df4646c426e803834b382d02c0295eda0c97fef1ecc6ed54b6435e49bd1f67fe9884e4b8de466bb52db1494a4a531957c5c7c607eca4e5bc SHA512 494ceab714a4dc7c37c1a11a16a4d475627be59f9c56058a99ca203dece8a4963b06b0fca4091c1d3e194208427095335f9bb12043b02f27efb9b884ed43f7ef
+EBUILD openrdap-0.9.0_p20191017.ebuild 1925 BLAKE2B bdf8c6c223f5213672505f8423c4c1aecae4daf06f75c53286b0d04f3d995adbcddce0a7555ca03a79cd96c16ec17cb88b79589949de5447686338bef8786dda SHA512 78a8f7bdcad253670dfe2519e22afc3a632676dfb86244c92ad35dda28b31bf85c0a1c79b2efaa3c2236c23092444527a4004cf31069db3cc4163077d694f6ca
+MISC metadata.xml 502 BLAKE2B 8190935c5504521111ad0a3cd92de04eb407c0b5306ed48787b6950f2507eafb2715fa9bd62d5352f74af95a78f2fcd9d8521ed02c1f4da815e66671f48c4711 SHA512 cf4dd914fb175eee0ce8fcb545d2b933c4a028790ab7df98b37b8b681e7354239a0542ce5187a185deaef6a4b621cafab410ba3e72843e8cf01c05c564a7faae
diff --git a/net-misc/openrdap/metadata.xml b/net-misc/openrdap/metadata.xml
new file mode 100644
index 000000000000..363217878440
--- /dev/null
+++ b/net-misc/openrdap/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		OpenRDAP is a command line client for the Registration Data Access Protocol.
+		RDAP is a replacement for WHOIS, which provides domain name and
+		IP address registration information in JSON format over HTTP(S).
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/openrdap/openrdap-0.9.0_p20191017.ebuild b/net-misc/openrdap/openrdap-0.9.0_p20191017.ebuild
new file mode 100644
index 000000000000..0deb042fb15f
--- /dev/null
+++ b/net-misc/openrdap/openrdap-0.9.0_p20191017.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+EGIT_COMMIT="af93e7ef17b78dee3e346814731377d5ef7b89f3"
+EGO_SUM=(
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/jarcoal/httpmock v1.0.4"
+	"github.com/jarcoal/httpmock v1.0.4/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="RDAP command line client"
+HOMEPAGE="
+	https://www.openrdap.org/
+	https://github.com/openrdap/rdap
+"
+SRC_URI="
+	https://github.com/openrdap/rdap/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
+S="${WORKDIR}/${PN/open/}-${EGIT_COMMIT}"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	go build ./cmd/rdap || die
+}
+
+src_install() {
+	dobin rdap
+	einstalldocs
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 3f427335c8f6..e64565fab4f3 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -26,9 +26,6 @@ AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391a
 AUX sshd.service 259 BLAKE2B e65ea7227658295584c3fdee3bf46f098c1c5a53a0b433e88ae8d43f0823fade25846a5f3abbacf939a13af8195a888d0ffb937e8da943478e76eea7c0e13c82 SHA512 9656ae4c045ba47ad28f983e50d1119d51c1d0a7471fe8e792d6f734a71c8d4d900431b591f2f40bb8af3a382e6215933ae32eff56de6da0f2f166d6fb855987
 AUX sshd.socket 136 BLAKE2B 22e218c831fc384a3151ef97c391253738fa9002e20cf4628c6fe3d52d4b0ac3b957da58f816950669d0a6f8f2786251c6dfc31bbb863f837a3f52631341dc2e SHA512 4d31d373b7bdae917dc0cf05418c71d4743e98e354aefcf055f88f55c9c644a5a0e0e605dbb8372c1b98d17c0ea1c8c0fee27d38ab8dbe23c7e420a6a78c6d42
 AUX sshd_at.service 177 BLAKE2B 0e78184f58cb4c68fb834953fac3ce01f9e39e9eb1a84c03f720205f5b611365c9a48fba445962c06c7e18bdb310cdb9ffe4fc49e95f69608922d224b00c890b SHA512 423120ea2e1ac0b92575ce4eb05347483f902238dc104848e74088f49483c37d30c27364e7fe8599b3e85562159c69284ecf25a4c5394b4cfa18c5c77c6beacd
-DIST openssh-8.5p1+x509-13.0.1.diff.gz 997005 BLAKE2B b6cdc9ba12dc642c7073463fb8b153a32019e8bc4c1778c2371d89cdc8d9b43e86523d0c03ebeeafa7004a16ad46dfbc18b338bf95f46101d8865709d45aa6b0 SHA512 b0247885d3a0718eb4df123c552f9e95ad9ffd55f96189aca35006c23d76ec76b28420cac4d7b2167c07f2e0a0652edfa20c2ce60aea3f7607a1e747f836ff91
-DIST openssh-8.5p1-sctp-1.2.patch.xz 7692 BLAKE2B 298bf5e2004fd864bdbb6d6f354d1fbcb7052a9caaf8e39863b840a7af8e31f87790f6aa10ae84df177d450bb34a43c4a3aa87d7472e2505d727757c016ce92b SHA512 84990f95e22c90dbc4d04d47ea88b761ff1d0101018661ff2376ac2a726b5fca43f1b5f5d926ccbe1c8d0143ac36b104616bd1a6b5dcdba4addf48a5dd196e2b
-DIST openssh-8.5p1.tar.gz 1779733 BLAKE2B f4e4bd39e2dd275d4811e06ca994f2239ad27c804b003c74cc26f9dffae28f1b4006fc618580f0dc9c45f0b7361c24728c23688b45f41cb8a15cf6206c3f15c3 SHA512 af9c34d89170a30fc92a63973e32c766ed4a6d254bb210e317c000d46913e78d0c60c7befe62d993d659be000b828b9d4d3832fc40df1c3d33850aaa6293846f
 DIST openssh-8.6p1+x509-13.1.diff.gz 1011666 BLAKE2B 0ac0cf2ff962b8ef677c49de0bb586f375f14d8964e077c10f6a88ec15734807940ab6c0277e44ebdfde0e50c2c80103cff614a6cde4d66e9986152032eeaa90 SHA512 ae4986dd079678c7b0cfd805136ff7ac940d1049fdddeb5a7c4ea2141bfcca70463b951485fb2b113bc930f519b1b41562900ced0269f5673dbdad867f464251
 DIST openssh-8.6p1-sctp-1.2.patch.xz 7696 BLAKE2B 37f9e943a1881af05d9cf2234433711dc45ca30c60af4c0ea38a1d361df02abb491fa114f3698285f582b40b838414c1a048c4f09aa4f7ae9499adb09201d2ac SHA512 ba8c4d38a3d90854e79dc18918fffde246d7609a3f1c3a35e06c0fbe33d3688ed29b0ec33556ae37d1654e1dc2133d892613ad8d1ecbdce9aaa5b9eb10dcbb7a
 DIST openssh-8.6p1.tar.gz 1786328 BLAKE2B 261a0f1a6235275894d487cce37537755c86835e3a34871462fe29bfe72b49cd9a6b6a547aea4bd554f0957e110c84458cc75a5f2560717fb04804d62228562a SHA512 9854eda0b773c64c9f1f74844ce466b2b42ee8845f58ad062b73141d617af944fa4ebafdf72069f400106d2c2bd0a69c92fe805ec1fc26d4f0faadf06c3fbbe6
@@ -41,10 +38,9 @@ DIST openssh-8.8p1.tar.gz 1815060 BLAKE2B 3a054ce19781aceca5ab1a0839d7435d88aff4
 DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
-EBUILD openssh-8.5_p1-r2.ebuild 17581 BLAKE2B a971d17ec56d3a6217174c14cec3b273ce0a2d1835cf1ea7e7ef32f8769bd69b7fddc77ec59158744fe8d1463464d33813e4c361cfeafc3935afd4260df136f3 SHA512 07bee99c1b3c40d3b82a640960494b2f92ae1f47f7af3acb04507f5a5e3db35aaaea5d530d59723256b9952cedb8836a0157dd9f7101b2f94aafdcc7c1765944
 EBUILD openssh-8.6_p1-r2.ebuild 17655 BLAKE2B 51c2e441eebfab62ebb34eb83ab11ca024ff50a8a3444db82014e554c7d89de10757a45b0f81f4d704977cc7c75a55bae46dbd32bb88132950b72c8cb583073e SHA512 5014bbcde62554e03814906c13521a2db2dcb8df1107d1b2825a9296c85fa76a68c70f07317e57145b46f28b0d5a772aaa03b9e3f6b42db2b3fc0f3be416e527
 EBUILD openssh-8.7_p1-r2.ebuild 17549 BLAKE2B 00b3970d5724d32f81935906c8d63be1bae00a2dc5e753c039cba60ed0f1fba13c6de4a34202c34581ddb4ffe04e9a63f1268880ba2528b8f184db50276a3dd8 SHA512 ef26ff570235d2f0557ac98471f8d9eb9645d925e45d426f89981d8ace599257e5e479d920280a7bdb35ef74918fb629f6a3e5bbb6a26a265cbc667687875bdb
-EBUILD openssh-8.7_p1-r3.ebuild 17211 BLAKE2B 29d557f303cc855abf64f968e7461244172f4bd3373e8ddc7f0209f72e56c36f11113a2aba4872d2903b4d6fc9475bc8cd660890f5e514ae75df361c5d9916e5 SHA512 772f3adbfd6ddfaba741f5fba03120a16325643d3d63e3d19afb38c067b87b364919d0df70590a768a1299b900712938c41d94d8277af585a18a1a7056839890
+EBUILD openssh-8.7_p1-r3.ebuild 17203 BLAKE2B fb53113ee453fd7a6373761fe0f8f5981fd97acd0f9388710a891f481d681cd3ad491071153e80cb3e7988e189b3f5f6b81de777094e4bd7e6da1a4009179206 SHA512 8cfe82b6d523bd5584eadc5b2469cf3f509051068596160b7a39ee3d887aa5ecc6b7c805e321aa29fe84340872572fb46771ab1bf6c917c69d56518286b6cce7
 EBUILD openssh-8.8_p1-r2.ebuild 17437 BLAKE2B 774044490edbe4b1c7b3b187fbad7f94a347ad28d750153b4a7b73a5b6897ffc8f95dfd01603351b99cbfab9a432224adc53ef5e65b5ba3610de30c88976c215 SHA512 bb7d9707cde3070ed5826a473909022eaaebca2a0d8f2b4b18aafc325a0b22ce0e38fc5f387260e243506413a177ab78dd31288c354c5606a4076d385e03f481
 EBUILD openssh-8.8_p1-r3.ebuild 17220 BLAKE2B 3451f58d25412f8ed8e7d8211196beee2c8904eb00c74cc1a99df03cc285ef4dcb2bc73a0afe9c729cde8e446a5f6096bdeb7f2864bb8dc271507fdbc5b5faa5 SHA512 7865293de246ca81061a73899f0d2ee8d4348928febb6850da36d270c6d4336b98c290c75a4eca69cc30d0cc4f2b5e4679d7f50aeee347a680e0a7f35e7fea90
 MISC metadata.xml 2102 BLAKE2B 4b1464bbe657cd70e0787f1030354bf5cd87d43f4e19fbaf3686ffdf4c001449511d93d2549a29b4f11faa7901476d85ea7e2555b31f94a97bf73b7912230439 SHA512 ee3fd9db64eced5ef136dec87e5fe965381d2b83247af6e65c9f205adc8758b7bf90a3e45c0fe15dfe82e9aa0f6f25411b58183b8a56ef0ad51026cacbcd89a1
diff --git a/net-misc/openssh/openssh-8.5_p1-r2.ebuild b/net-misc/openssh/openssh-8.5_p1-r2.ebuild
deleted file mode 100644
index 96e4f161abd5..000000000000
--- a/net-misc/openssh/openssh-8.5_p1-r2.ebuild
+++ /dev/null
@@ -1,510 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user-info flag-o-matic autotools pam systemd toolchain-funcs
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-# PV to USE for HPN patches
-HPN_PV="${PV^^}"
-
-HPN_VER="15.2"
-HPN_PATCHES=(
-	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
-	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
-	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
-)
-
-SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="13.0.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
-	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
-	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
-"
-S="${WORKDIR}/${PARCH}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( !sctp !security-key ssl !xmss )
-	xmss? ( ssl )
-	test? ( ssl )
-"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
-		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	ssl? (
-			|| (
-				(
-					>=dev-libs/openssl-1.0.1:0[bindist(-)=]
-					<dev-libs/openssl-1.1.0:0[bindist(-)=]
-				)
-				>=dev-libs/openssl-1.1.0g:0[bindist(-)=]
-			)
-			dev-libs/openssl:0=[static-libs(+)]
-	)
-	virtual/libcrypt:=[static-libs(+)]
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	userland_GNU? ( !prefix? ( sys-apps/shadow ) )
-	X? ( x11-apps/xauth )
-"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf
-"
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
-	local fail="
-		$(use hpn && maybe_fail hpn HPN_VER)
-		$(use sctp && maybe_fail sctp SCTP_PATCH)
-		$(use X509 && maybe_fail X509 X509_PATCH)
-	"
-	fail=$(echo ${fail})
-	if [[ -n ${fail} ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested:	 ${fail}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "Missing requested third party patch."
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
-	eapply "${FILESDIR}"/${PN}-8.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
-	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
-	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
-
-	# workaround for https://bugs.gentoo.org/734984
-	use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch
-
-	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
-
-	local PATCHSET_VERSION_MACROS=()
-
-	if use X509 ; then
-		pushd "${WORKDIR}" &>/dev/null || die
-		eapply "${FILESDIR}/${P}-X509-glue-${X509_VER}.patch"
-		popd &>/dev/null || die
-
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-
-		# We need to patch package version or any X.509 sshd will reject our ssh client
-		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
-		# error
-		einfo "Patching package version for X.509 patch set ..."
-		sed -i \
-			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
-			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
-		einfo "Patching version.h to expose X.509 patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
-	fi
-
-	if use sctp ; then
-		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-
-		einfo "Patching version.h to expose SCTP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
-
-		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
-		sed -i \
-			-e "/\t\tcfgparse \\\/d" \
-			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
-	fi
-
-	if use hpn ; then
-		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
-		mkdir "${hpn_patchdir}" || die
-		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
-		pushd "${hpn_patchdir}" &>/dev/null || die
-		eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch
-		use X509 && eapply "${FILESDIR}/${PN}-8.5_p1-hpn-${HPN_VER}-X509-${X509_VER}-glue.patch"
-		use sctp && eapply "${FILESDIR}/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch"
-		popd &>/dev/null || die
-
-		eapply "${hpn_patchdir}"
-
-		use X509 || eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch"
-
-		einfo "Patching Makefile.in for HPN patch set ..."
-		sed -i \
-			-e "/^LIBS=/ s/\$/ -lpthread/" \
-			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
-		einfo "Patching version.h to expose HPN patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
-			"${S}"/version.h || die "Failed to sed-in HPN patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
-		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-			einfo "Disabling known non-working MT AES cipher per default ..."
-
-			cat > "${T}"/disable_mtaes.conf <<- EOF
-
-			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
-			# and therefore disabled per default.
-			DisableMTAES yes
-			EOF
-			sed -i \
-				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
-				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
-			sed -i \
-				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
-				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
-		fi
-	fi
-
-	if use X509 || use sctp || use hpn ; then
-		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
-		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
-		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
-		sed -i \
-			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
-			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
-	fi
-
-	sed -i \
-		-e "/#UseLogin no/d" \
-		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
-
-	eapply_user #473004
-
-	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
-	sed -e '/\t\tpercent \\/ d' \
-		-i regress/Makefile || die
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable PATH reset, trust what portage gives us #254615
-		-e 's:^PATH=/:#PATH=/:'
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-
-	# The -ftrapv flag ICEs on hppa #505182
-	use hppa && sed_args+=(
-		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
-		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
-	)
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-	use xmss && append-cflags -DWITH_XMSS
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
-		# doesn't check for this, so force the replacement to be put in
-		# place
-		append-cppflags -DBROKEN_GLOB
-	fi
-
-	# use replacement, RPF_ECHO_ON doesn't exist here
-	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the sctp patch conditionally, so can't pass --without-sctp
-		# unconditionally else we get unknown flag warnings.
-		$(use sctp && use_with sctp)
-		$(use_with ldns ldns "${EPREFIX}"/usr)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(usex X509 '' "$(use_with security-key security-key-builtin)")
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-		$(use_with !elibc_Cygwin hardening) #659210
-	)
-
-	if use elibc_musl; then
-		# stackprotect is broken on musl x86 and ppc
-		if use x86 || use ppc; then
-			myconf+=( --without-stackprotect )
-		fi
-
-		# musl defines bogus values for UTMP_FILE and WTMP_FILE
-		# https://bugs.gentoo.org/753230
-		myconf+=( --disable-utmp --disable-wtmp )
-	fi
-
-	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
-	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local t skipped=() failed=() passed=()
-	local tests=( interop-tests compat-tests )
-
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		elog "user, so we will run a subset only."
-		skipped+=( tests )
-	else
-		tests+=( tests )
-	fi
-
-	# It will also attempt to write to the homedir .ssh.
-	local sshhome=${T}/homedir
-	mkdir -p "${sshhome}"/.ssh
-	for t in "${tests[@]}" ; do
-		# Some tests read from stdin ...
-		HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \
-			SUDO="" SSH_SK_PROVIDER="" \
-			TEST_SSH_UNSAFE_PERMISSIONS=1 \
-			emake -k -j1 ${t} </dev/null \
-				&& passed+=( "${t}" ) \
-				|| failed+=( "${t}" )
-	done
-
-	einfo "Passed tests: ${passed[*]}"
-	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
-	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
-	local locale_vars=(
-		# These are language variables that POSIX defines.
-		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
-		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
-		# These are the GNU extensions.
-		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
-		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-	)
-
-	# First the server config.
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables. #367017
-	AcceptEnv ${locale_vars[*]}
-
-	# Allow client to pass COLORTERM to match TERM. #658540
-	AcceptEnv COLORTERM
-	EOF
-
-	# Then the client config.
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-	# Send locale environment variables. #367017
-	SendEnv ${locale_vars[*]}
-
-	# Send COLORTERM to match TERM. #658540
-	SendEnv COLORTERM
-	EOF
-
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd-r1.initd sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	if use pam; then
-		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	fi
-
-	tweak_ssh_configs
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use hpn && dodoc HPN-README
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	# https://bugs.gentoo.org/733802
-	if ! use scp; then
-		rm -f "${ED}"/usr/{bin/scp,share/man/man1/scp.1} \
-			|| die "failed to remove scp"
-	fi
-
-	rmdir "${ED}"/var/empty || die
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-pkg_preinst() {
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
-		show_ssl_warning=1
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-	for old_ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${old_ver}" -lt "5.8_p1"; then
-			elog "Starting with openssh-5.8p1, the server will default to a newer key"
-			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-		fi
-		if ver_test "${old_ver}" -lt "7.0_p1"; then
-			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-			elog "Make sure to update any configs that you might have.  Note that xinetd might"
-			elog "be an alternative for you as it supports USE=tcpd."
-		fi
-		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
-			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-			elog "adding to your sshd_config or ~/.ssh/config files:"
-			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-			elog "You should however generate new keys using rsa or ed25519."
-
-			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-			elog "out of the box.  If you need this, please update your sshd_config explicitly."
-		fi
-		if ver_test "${old_ver}" -lt "7.6_p1"; then
-			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-		fi
-		if ver_test "${old_ver}" -lt "7.7_p1"; then
-			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
-			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
-			elog "if you need to authenticate against LDAP."
-			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
-		fi
-		if ver_test "${old_ver}" -lt "8.2_p1"; then
-			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
-			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
-			ewarn "connection is generally safe."
-		fi
-	done
-
-	if [[ -n ${show_ssl_warning} ]]; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-		elog ""
-		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
-		elog "and therefore disabled at runtime per default."
-		elog "Make sure your sshd_config is up to date and contains"
-		elog ""
-		elog "  DisableMTAES yes"
-		elog ""
-		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
-		elog ""
-	fi
-}
diff --git a/net-misc/openssh/openssh-8.7_p1-r3.ebuild b/net-misc/openssh/openssh-8.7_p1-r3.ebuild
index 9a1a572b0363..488f832c164c 100644
--- a/net-misc/openssh/openssh-8.7_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-8.7_p1-r3.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
 
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index db988590c81c..20706db5d403 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,5 +1,7 @@
 DIST ownCloud-2.9.0.5150.tar.xz 5775740 BLAKE2B c43044dd383d66dd212bcd3efd818fad289ac51b082eaa7b47db03778cdfc87725efbdffc567e416bf5444d7e58f795606f093a782ca783cefc2d4994df3fb2a SHA512 c183b2d4340dc8880d2bf31aedaffb96da518fdb60f1e8c857ee2f8d02c36cb69552475fdbf536f7ecebd9af2a7732f52a9e02f20450452c78d346910be3cf57
 DIST ownCloud-2.9.1.5500.tar.xz 5787048 BLAKE2B 6f7df0c1ca13e6074bbd75caaee838ddb822f9284a4f5cc95e1b2c1432adf2969e2413607bebc1542d4bc7790bd6e61edfba758d2205a23fbede6873b7e22316 SHA512 5c78cd0318b7cd35f32721cf364d6e807d32eb1f3651e7f22ff3f3c7737967193ad089062965b3dcee24c23c14cc0d7acdfc95094f4f90f8aaf718f45f22e18a
+DIST ownCloud-2.9.2.6206.tar.xz 5759996 BLAKE2B c328ea261a4fddecf93837dbcac01aab0971542d8dfb3f5b0a32a8432ca0e0904c3f4fc81c5c7811da8b3af64b58e929c055e7cec0649f00049e037372948eec SHA512 d075a11ee92aa9771c631a766feddfa1a70907d7d341b58043e1ba96ac52786a6a750b15c2f9b7a0992fe02a45586cc3445755dc9df4cd267e72f070d2222f0f
 EBUILD owncloud-client-2.9.0.5150.ebuild 1541 BLAKE2B 5703093f44e5c8cbdfb96c94b798578f438d2d6fad50997feea985a86860dfbe2dd70b84d59fb2cc125e78bcc544ecd5fa147a0378f7cee7dabf47fc7ce067fb SHA512 ed7fd1391484791c428d97a7a21a6544198836c9f036ae1fe5acf45819a0184b9c075a418ed74bf1dcef61492017207aa5a4a56098fdfac4f0a57b2fe493290c
 EBUILD owncloud-client-2.9.1.5500.ebuild 1541 BLAKE2B 5703093f44e5c8cbdfb96c94b798578f438d2d6fad50997feea985a86860dfbe2dd70b84d59fb2cc125e78bcc544ecd5fa147a0378f7cee7dabf47fc7ce067fb SHA512 ed7fd1391484791c428d97a7a21a6544198836c9f036ae1fe5acf45819a0184b9c075a418ed74bf1dcef61492017207aa5a4a56098fdfac4f0a57b2fe493290c
+EBUILD owncloud-client-2.9.2.6206.ebuild 1500 BLAKE2B a696ee5d555770f7b0fa2e2d84a41765ee3d30c845a0fbc4ac21a94e22168b48de93873b1cf96db01e4f1ddd84b30e1230cc4df9fff66479c4fe12fb76ac5cdf SHA512 1801423f8e5bba0c5985dfb439e2a7e774704bc83dbfd41f3314ee625ab444be0f7e9ca0665c4beae6824012696e7410b9ebee51d11004a60bd8a2657b0eea1d
 MISC metadata.xml 432 BLAKE2B 1009c05cb07872e37fa6f8113a0586840454e09e07a8c7c40c9c4f879577e3ba1d36a7832f0789ae77fe8b882f9ccc8d2346de40c13ea77cc1404e78e8b15e6d SHA512 9f1c221258a82d7b1e6311b51cdbd5a72ff9cf4c80fdc075b3219581cd008a6a83f4066868f014ed33640bbfad68a4f4504cd9efb65119dcd176d34dc07e6ee9
diff --git a/net-misc/owncloud-client/owncloud-client-2.9.2.6206.ebuild b/net-misc/owncloud-client/owncloud-client-2.9.2.6206.ebuild
new file mode 100644
index 000000000000..1f71bd2d5125
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.9.2.6206.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+MY_PN="ownCloud"
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="dolphin gnome-keyring nautilus test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
deleted file mode 100644
index 8f61e7a9661b..000000000000
--- a/net-misc/quagga/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX quagga-0.99.22.4-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
-AUX quagga-services.init.3 1072 BLAKE2B b4c3c8d6399c6c60cedfffad65f3cde56a46c9b97a62b04709660c9ff9023dd4254e7d5c78c9672bcd83c678c57c921605afbaaf9961df94d5e00abd7bb00211 SHA512 03ce5cf77612ece73d3df85c6afa747dab479949299458b5c6f59dcf778b60314fd0a9c7987be289cc0b8363dcc6e337ab5309e0a86f716208ddfc5f12b8a4b3
-AUX quagga.pam 975 BLAKE2B 71fba18cca8f1a12399556f8247a04e9a1750ef178092c6066c3f93383baff25ddfa9aae495ab20a5d068586bcc6032dde31c590aebdc639e8ad7681e0b56417 SHA512 92dc6c68146d46046c6f5ff410629a2a7170e81e9657b7a2aebe1d94c8fa267acdcac9d8d8596fb54dbbacc0566502e82d900ea33f8824c07fba497b7e0f1efe
-AUX systemd/bgpd.service 347 BLAKE2B 96902e15c0d8cc6f800f31abe085b8447f7607fe1322f181fb251da18bc3ebdf371fe38f285e2d973f63881e18efa647812b0fc89b4a798903f1d3fabbf5e3c5 SHA512 dfefd7b758fd41ccaeb024c0ba4f08400086e05f44c1985cb387d0dfb0c0e19844879b49f84c350282e0d5d56dd1c65c8ac33f65e06543a20aacdfbba593606b
-AUX systemd/isisd.service 352 BLAKE2B 8f2ebb0441e994dd70e637fcf6bec6c06a270a1eb428019efab2b937292eaa3eb0fbe521817bee2c91e8583492ab6d692adbe8240ba534a8089933ee2ca9189c SHA512 28c054986c9171f960663056d3058c46c81270a0cb14c356d31deb1e77ef44e710535ec402773fc44191b449eae3367411ee6344386069fda9ac150c6c715713
-AUX systemd/nhrpd.service 344 BLAKE2B 6fabe5c537b5c2d8dc683f84575cae1d3620e5e48bb394be9f9b35d545a48ac1afaaf1085f39f3c96614557b7f5d60a60a4d3b4a70c00107d1a265508b524940 SHA512 d289853f3dfca5f6de2a24935fbcd13018938e8d6614dd4eeb127b5085e6a772b0af2e8f15786c309d515b998fc7f49edd159d47e4fb7686029167775bca2635
-AUX systemd/ospf6d.service 364 BLAKE2B f3567f74e5eb5a1884038c8b186d2b1ec68bfae5383970cfc36cb949e734c23ec24b9543aa93603b61312b63b5f7704de0b391405e45a2358fb8b3250b286457 SHA512 379f72ec275329a715c0e4b044cbdeae8f51e06b3ed8eb1bf643163ab824a9539c6a1b0d6521cea6585eca58fbf8bd3fa153ef62936c14c06fad48395e7103ac
-AUX systemd/ospfd.service 352 BLAKE2B f752e08d2d1f76114dd19f5d2f159ef5fdb202dd5af4b3337dfd1780f811f6bc39d3e9c853a4af11441e9c484caa3b07ee6845a49e36166df81d8be50e946d8d SHA512 48fff984c5ac6e446fcf77307645258df881e194869aeff4d145233bb1306e422e7964f9043d244cd3bfcf9fe4cb2ebf117f562c564c847138ef32e070c50a85
-AUX systemd/pimd.service 359 BLAKE2B 0574421bb2db4248ee4506d64ef7116272180266db27763b0e18f315ad74a428f0a7b69db2e783fdecb186f79c1d9fa0b17792b349fc6c0af4880451418baf3a SHA512 fc0d6dbf746c3fd95cf82be44415c456559596c03460c9975f957591b0d647cdf6968fe16091673114306f3dcdfce9fc401a053d8bf8f00b67b3957512b26640
-AUX systemd/quagga.conf 33 BLAKE2B 58926119e2e5fe2050c33e598c9a6ef30f792d2c31b98f5a157e42da4bc176db897ecceee2999cbdcab32eb0d0f1434d84f51970fe96c45a557f892df5843f96 SHA512 78effd7fe5ddd0187dc6e110ac2550001e24e803423ece7332e7dae0f83fde2d897aafe18665c64a15e2c1747b347d8eb9c99c8b95f16348deffca454a79ad8a
-AUX systemd/ripd.service 347 BLAKE2B eaca725f889ad7689ba246ecbc20aa78314cc60a5a7d648ed3196afc2272fa0b968b0de088b7e34087d08d25ea053c0756e9cf9d35b358818c8639a4e0ec5d44 SHA512 4251609529c0fe7b8cee1191eae3d13ae1813d5d9544d2844df7e135f341f84cfd2192e6331bb2642da3637f7dd2ec29ffa93df918ecc1e071cfb45802ceabee
-AUX systemd/ripngd.service 364 BLAKE2B e79e086c0bbe3ceb12fadc711a1c88a34034780807d6abc63cad390854140835ab477b7203b8c492baae297f7fbe3085791944d1b2db2a737930c1bf36a81465 SHA512 ccfd048152896ee7ebdc434554a080b8ba36444d4de1cd11b5d2408cddfeb2ea1312962460b9a761d1a2db31dd5e72cadddf1807f9783ac1c2a51fd52c85ad54
-AUX systemd/zebra.service 354 BLAKE2B e22f8e321c5116179937e9c681482e779436092a10548ea4e564a0005f102a8d6dbba17fe5ef2a3952752f1ca6b1539841ccfee25b4a7b03b9e9faca1618004b SHA512 d02a801a421c143cefb63abc3448b162505fb9063130523f939f1e6ad33c4b39f113d00e6d0c4ea7f53616fffa1aa2333bf33660b5ccb4d7fd9d4f048c5a979a
-DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b056958ae2fa28bd2e9e8d9902e569a8f9a2925ba45396bb92e345bfcaf8ca1ef9136a433c615a5bd12a279e7c062939549a SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8
-DIST quagga-1.2.4.tar.gz 2925847 BLAKE2B e0e8d8b8e2243bc5cecc2e66d26040780f839414a16fb8a719d25a6fe1c29dc8545a92700a3758100715e1efb3d874584903885af51ef9f5d88c4a02d02dbc74 SHA512 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd
-EBUILD quagga-1.2.4-r2.ebuild 3749 BLAKE2B c74664cb99e99f230728675a454452b629b93942c9f249e03977d43ae9e9456618351641750ab58bd104c633aaed3003b99eb5edea4df971239e7ff56bb1f0fb SHA512 19591d2a01f07b798ea900ac63ef7c9b52ee3194b542baa4d1437011efb78c4895571cae372c3a15bdff8bdcf0446e383de767ac1f9c97f9cbe04d59cb6330e8
-MISC metadata.xml 2376 BLAKE2B 645ca93c56f216ddfca8d0642c2191e38aeaa911fdc42f20b23786899f728da4ae6d148fb5c71d7ca29579c37be74cf8e8c83da6f3372a69bb29b1df93188b04 SHA512 ed9a49432cd75f68007f5bc29077861dc95432977972c801e6fb84976a0611d2d253dd8edd71e64325eff43ae77b66898104dbff230c7015f971a12fcb19b6e4
diff --git a/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch b/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch
deleted file mode 100644
index f6b726b591f7..000000000000
--- a/net-misc/quagga/files/quagga-0.99.22.4-ipctl-forwarding.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix for missing definitions on some Hardened configurations
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=437292
-
-diff -Naur quagga-0.99.16.orig/zebra/ipforward_sysctl.c quagga-0.99.16/zebra/ipforward_sysctl.c
---- quagga-0.99.16.orig/zebra/ipforward_sysctl.c	2010-03-11 12:11:32.000000000 -0500
-+++ quagga-0.99.16/zebra/ipforward_sysctl.c	2010-03-11 12:11:39.000000000 -0500
-@@ -31,6 +31,15 @@
- 
- #define MIB_SIZ 4
- 
-+/* Fix for recent (2.6.14) kernel headers */
-+#ifndef IPCTL_FORWARDING
-+    #define IPCTL_FORWARDING       NET_IPV4_FORWARD
-+#endif
-+
-+#ifndef IP6CTL_FORWARDING
-+    #define IP6CTL_FORWARDING      NET_IPV6_FORWARDING
-+#endif
-+
- extern struct zebra_privs_t zserv_privs;
- 
- /* IPv4 forwarding control MIB. */
diff --git a/net-misc/quagga/files/quagga-services.init.3 b/net-misc/quagga/files/quagga-services.init.3
deleted file mode 100644
index e613b26abb03..000000000000
--- a/net-misc/quagga/files/quagga-services.init.3
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${CFGFILE:=/etc/quagga/${SVCNAME}.conf}
-
-pidfile=/run/quagga/${SVCNAME}.pid
-
-command=/usr/sbin/${SVCNAME}
-command_args="-d -f ${CFGFILE} ${EXTRA_OPTS} --pid_file ${pidfile}"
-
-get_service_config() {
-	[ -e "$CFGFILE" ] || return
-
-	awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE"
-}
-
-depend() {
-	config "$CFGFILE"
-
-    [ ${SVCNAME} = "zebra" ] && need net || need zebra
-
-	[ "$(get_service_config log)" = "syslog" ] && \
-		use logger
-}
-
-start_pre() {
-    if [ ! -e "${CFGFILE}" ] ; then
-        eerror "Before starting ${SVCNAME} you have to configure it, by creating"
-        eerror "a ${CFGFILE} file."
-        eerror ""
-        eerror "A sample file has been installed in `echo /usr/share/doc/quagga-*/samples/${SVCNAME}.conf.sample*`"
-        return 1
-    fi
-
-	checkpath -d -m 0750 -o quagga:quagga /run/quagga
-
-	if [ ${SVCNAME} = "zebra" ]; then
-		ebegin "Cleaning up stale zebra routes..."
-		ip route flush proto zebra
-		eend $?
-	fi
-}
diff --git a/net-misc/quagga/files/quagga.pam b/net-misc/quagga/files/quagga.pam
deleted file mode 100644
index 9a91ad852fbd..000000000000
--- a/net-misc/quagga/files/quagga.pam
+++ /dev/null
@@ -1,26 +0,0 @@
-#%PAM-1.0
-#
-
-##### if running quagga as root:
-# Only allow root (and possibly wheel) to use this because enable access
-# is unrestricted.
-auth       sufficient   pam_rootok.so
-
-# Uncomment the following line to implicitly trust users in the "wheel" group.
-#auth       sufficient   pam_wheel.so trust use_uid
-# Uncomment the following line to require a user to be in the "wheel" group.
-#auth       required     pam_wheel.so use_uid
-###########################################################
-
-# If using quagga privileges and with a seperate group for vty access, then
-# access can be controlled via the vty access group, and pam can simply
-# check for valid user/password, eg:
-#
-# only allow local users.
-#auth       required     pam_securetty.so
-#auth       include      system-auth
-#auth       required     pam_nologin.so
-#account    include      system-auth
-#password   include      system-auth
-#session    include      system-auth
-#session    optional     pam_console.so
diff --git a/net-misc/quagga/files/systemd/bgpd.service b/net-misc/quagga/files/systemd/bgpd.service
deleted file mode 100644
index f5db0b2510ec..000000000000
--- a/net-misc/quagga/files/systemd/bgpd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=BGP routing daemon
-Documentation=man:bgpd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/bgpd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/bgpd.pid
-ExecStart=/usr/sbin/bgpd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/isisd.service b/net-misc/quagga/files/systemd/isisd.service
deleted file mode 100644
index 10eb0a8fe1d8..000000000000
--- a/net-misc/quagga/files/systemd/isisd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=IS-IS routing daemon
-Documentation=man:isis(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/isisd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/isisd.pid
-ExecStart=/usr/sbin/isisd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/nhrpd.service b/net-misc/quagga/files/systemd/nhrpd.service
deleted file mode 100644
index 1a93bae61b14..000000000000
--- a/net-misc/quagga/files/systemd/nhrpd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=NHRP daemon
-Documentation=man:nhrpd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/nhrpd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/nhrpd.pid
-ExecStart=/usr/sbin/nhrpd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/ospf6d.service b/net-misc/quagga/files/systemd/ospf6d.service
deleted file mode 100644
index b6372d10d898..000000000000
--- a/net-misc/quagga/files/systemd/ospf6d.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=OSPF routing daemon for IPv6
-Documentation=man:ospfd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ospf6d.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/ospf6d.pid
-ExecStart=/usr/sbin/ospf6d -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/ospfd.service b/net-misc/quagga/files/systemd/ospfd.service
deleted file mode 100644
index 310d219c0014..000000000000
--- a/net-misc/quagga/files/systemd/ospfd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=OSPF routing daemon
-Documentation=man:ospfd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ospfd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/ospfd.pid
-ExecStart=/usr/sbin/ospfd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/pimd.service b/net-misc/quagga/files/systemd/pimd.service
deleted file mode 100644
index d39f59696c51..000000000000
--- a/net-misc/quagga/files/systemd/pimd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=PIM-SSM routing daemon
-Documentation=man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/pimd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/pimd.pid
-ExecStart=/usr/sbin/pimd -d
-ExecReload=/bin/kill -HUP $MAINPID
-SuccessExitStatus=1
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/quagga.conf b/net-misc/quagga/files/systemd/quagga.conf
deleted file mode 100644
index 296083753e0a..000000000000
--- a/net-misc/quagga/files/systemd/quagga.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/quagga 0750 quagga quagga
diff --git a/net-misc/quagga/files/systemd/ripd.service b/net-misc/quagga/files/systemd/ripd.service
deleted file mode 100644
index b2a74df47fb9..000000000000
--- a/net-misc/quagga/files/systemd/ripd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=RIP routing daemon
-Documentation=man:ripd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ripd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/ripd.pid
-ExecStart=/usr/sbin/ripd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/ripngd.service b/net-misc/quagga/files/systemd/ripngd.service
deleted file mode 100644
index 75c60d8395b5..000000000000
--- a/net-misc/quagga/files/systemd/ripngd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=RIP routing daemon for IPv6
-Documentation=man:ripngd(8) man:zebra(8)
-BindsTo=zebra.service
-After=network.target zebra.service
-ConditionPathExists=/etc/quagga/ripngd.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/ripngd.pid
-ExecStart=/usr/sbin/ripngd -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/quagga/files/systemd/zebra.service b/net-misc/quagga/files/systemd/zebra.service
deleted file mode 100644
index d2374411b459..000000000000
--- a/net-misc/quagga/files/systemd/zebra.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=GNU Zebra routing manager
-Documentation=man:zebra(8)
-After=network.target
-ConditionPathExists=/etc/quagga/zebra.conf
-
-[Service]
-Type=forking
-PIDFile=/run/quagga/zebra.pid
-ExecStartPre=/bin/ip route flush proto zebra
-ExecStart=/usr/sbin/zebra -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
deleted file mode 100644
index b4781a230f1f..000000000000
--- a/net-misc/quagga/metadata.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-	<longdescription>
-		Quagga is a modern fork of Zebra. Quagga is a routing software package that provides TCP/IP
-		based routing services with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2,
-		OSPFv3, BGP-4, and BGP-4+. Quagga also supports special BGP Route Reflector and Route Server
-		behavior.  In addition to traditional IPv4 routing protocols, Quagga also supports IPv6 routing
-		protocols. With SNMP daemon which supports SMUX protocol, Quagga provides routing protocol
-		MIBs. Furthermore Quagga supports OSPFAPI, a API interface to the OSPF LSDB. It supports
-		inspection as well as injection of normal and opaque OSPF LSAs. Applications like SRRD - The
-		Service Rounting Redundancy Daemon - can make use of OSPFAPI to inject opaque data into the OSPF
-		routing domain. SRRD, for example, implements a cluster server by using the OSPFAPI to flood
-		service state information into the routing domain
-	</longdescription>
-	<use>
-		<flag name="bgpclassless">
-			Apply unofficial patch to enable classless prefixes for BGP. Patch and information to be found
-			at http://hasso.linux.ee/doku.php/english:network:quagga
-		</flag>
-		<flag name="fpm">
-			Enable Forwarding Plane Manager support
-		</flag>
-		<flag name="multipath">
-			Enable multipath routes support for any number of routes
-		</flag>
-		<flag name="nhrpd">
-			Build Next Hop Resolution Protocol daemon
-		</flag>
-		<flag name="ospfapi">
-			Enable OSPFAPI support for client applications accessing the OSPF link state database
-		</flag>
-		<flag name="pam">
-			Add support for PAM (via <pkg>sys-libs/pam</pkg>) to the Quagga Virtual Terminal Interface
-			Shell (vtysh); if the readline USE flag is disabled, this flag is ignored
-		</flag>
-		<flag name="protobuf">
-			Enable support for <pkg>dev-libs/protobuf</pkg>
-		</flag>
-		<flag name="readline">
-			Enable support for <pkg>sys-libs/readline</pkg> to provide the Quagga Virtual Terminal
-			Interface Shell (vtysh)
-		</flag>
-		<flag name="tcp-zebra">
-			Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain
-			sockets are chosen otherwise
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-misc/quagga/quagga-1.2.4-r2.ebuild b/net-misc/quagga/quagga-1.2.4-r2.ebuild
deleted file mode 100644
index a2be0d887b3d..000000000000
--- a/net-misc/quagga/quagga-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
-
-inherit autotools flag-o-matic pam readme.gentoo-r1 systemd tmpfiles
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
-HOMEPAGE="https://www.quagga.net/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
-	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~s390 sparc x86"
-
-IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	acct-group/quagga
-	acct-user/quagga
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap )
-	nhrpd? ( net-dns/c-ares:0= )
-	protobuf? ( dev-libs/protobuf-c:0= )
-	readline? (
-		sys-libs/readline:0=
-		pam? ( sys-libs/pam )
-	)
-	snmp? ( net-analyzer/net-snmp:= )
-	!elibc_glibc? ( dev-libs/libpcre )"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/gawk
-	sys-devel/libtool:2
-	test? ( dev-util/dejagnu )"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
-)
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
-You have to create config files in /etc/quagga before
-starting one of the daemons.
-
-You can pass additional options to the daemon by setting the EXTRA_OPTS
-variable in their respective file in /etc/conf.d"
-
-src_prepare() {
-	# Classless prefixes for BGP
-	# http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
-
-	eapply "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# -fcommon is added as a workaround for bug #707422
-	append-flags -fno-strict-aliasing -fcommon
-
-	# do not build PDF docs
-	export ac_cv_prog_PDFLATEX=no
-	export ac_cv_prog_LATEXMK=no
-
-	econf \
-		--enable-exampledir=/usr/share/doc/${PF}/samples \
-		--enable-irdp \
-		--enable-isisd \
-		--enable-isis-topology \
-		--enable-pimd \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quagga \
-		--with-cflags="${CFLAGS}" \
-		--with-pkg-extra-version="-gentoo" \
-		--sysconfdir=/etc/quagga \
-		--localstatedir=/run/quagga \
-		--disable-static \
-		$(use_enable caps capabilities) \
-		$(usex snmp '--enable-snmp' '' '' '') \
-		$(use_enable !elibc_glibc pcreposix) \
-		$(use_enable fpm) \
-		$(use_enable tcp-zebra) \
-		$(use_enable doc) \
-		$(usex multipath $(use_enable multipath) '' '=0' '') \
-		$(usex ospfapi '--enable-ospfclient' '' '' '') \
-		$(use_enable readline vtysh) \
-		$(use_with pam libpam) \
-		$(use_enable nhrpd) \
-		$(use_enable protobuf) \
-		$(use_enable ipv6 ripngd) \
-		$(use_enable ipv6 ospf6d) \
-		$(use_enable ipv6 rtadv)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	readme.gentoo_create_doc
-
-	keepdir /etc/quagga
-	fowners root:quagga /etc/quagga
-	fperms 0770 /etc/quagga
-
-	# Install systemd-related stuff, bug #553136
-	dotmpfiles "${FILESDIR}/systemd/quagga.conf"
-	systemd_dounit "${FILESDIR}/systemd/zebra.service"
-
-	# install zebra as a file, symlink the rest
-	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
-
-	for service in bgpd isisd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd) $(use nhrpd && echo nhrpd); do
-		dosym zebra /etc/init.d/${service}
-		systemd_dounit "${FILESDIR}/systemd/${service}.service"
-	done
-
-	use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga
-
-	insinto /etc/logrotate.d
-	newins redhat/quagga.logrotate quagga
-}
-
-pkg_postinst() {
-	# Path for PIDs before first reboot should be created here, bug #558194
-	tmpfiles_process quagga.conf
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index 1ab0f3285673..df308ac1bfef 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -1,7 +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.2.tar.gz 19839 BLAKE2B d51ff68303a05abd8049abebafd76a01d8dedff6a294057640989989f851f1b381d75f2ad7ab94a850de76c485340770e06cf086225d641a2fee6d43112b473f SHA512 6e3759e73c05532b54f004592989572f78a0cfef7a2af1ae33708c9d239b63203702466664d39701afbc0012ff53fbf0bc3917ad8bb3df3322c4b613fd2e8aba
 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.2.ebuild 917 BLAKE2B 865820dd26fb43906f1f6f90dd2f746f18aca5817a5ec5ded14f93013513b47c9b715ed1bc24d4da3097a136588106efad5bd286186861b9b20bd322ffd379e9 SHA512 864a33b2bd39263cc8c4b217275dd6d484605c5103dd2c15633cb74c479db63bae83b91fe98e51e0a76a21065c0219b0ebf02f37f772220bc7987d872d65e249
 EBUILD rdate-1.10.ebuild 743 BLAKE2B a3241a2734fbde24280b2a78cbd91b11151d7536504ef01229dca386198c524f417b7c4714e1788a77ffe77515fcbf2b9c92cdb3d0523d1f899fc20a866a29ae SHA512 582511eb5b1c66b6575a4cf7f2e8a9663013a612f25943213d392e418e1f3b8b0786cb8ce45446b84250c3336c0838e72b6a220b2ba78ed7a687c89b4655b480
-EBUILD rdate-1.4-r4.ebuild 830 BLAKE2B 1a8a3f303d06b50a53cd86bf2f8973b269824b91db1f01dff92f9bd9be59c2e3fe7adb229edce00f36be62ed2fc1594b259a07fb7d82ca9198f777086df504de SHA512 b7924e5b106f30b6df99c0ced3dd37e6e3834ce7407bd46ef62de66c2ddf5e1c955690bbb3af0de9059e0c37398f09b78225189d8c4495fa107e79b474027d50
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/rdate/rdate-1.10.2.ebuild b/net-misc/rdate/rdate-1.10.2.ebuild
new file mode 100644
index 000000000000..85c5f91b3cf8
--- /dev/null
+++ b/net-misc/rdate/rdate-1.10.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="openrdate"
+
+inherit autotools toolchain-funcs
+
+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"
+S="${WORKDIR}/${MY_P}-${PV}"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="dev-libs/libbsd"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	default
+
+	# Don't use hardcoded 'ar' command
+	sed -s '/^AC_PROG_CC/a m4_ifdef([AM_PROG_AR], [AM_PROG_AR], [AC_SUBST([AR], [$(tc-getAR])])' -i configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate
+	newconfd "${FILESDIR}"/rdate-confd rdate
+}
diff --git a/net-misc/rdate/rdate-1.4-r4.ebuild b/net-misc/rdate/rdate-1.4-r4.ebuild
deleted file mode 100644
index 8e279dfd9bfd..000000000000
--- a/net-misc/rdate/rdate-1.4-r4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="use TCP or UDP to retrieve the current time of another machine"
-HOMEPAGE="http://www.apps.ietf.org/rfc/rfc868.html"
-SRC_URI="ftp://people.redhat.com/sopwith/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="ipv6"
-
-DEPEND=""
-
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS=/d' \
-		-e '/^rdate: /,+1d' \
-		-e '/\tinstall/s:\([^ ]\+\)$:$(DESTDIR)&:' \
-		Makefile || die "Sed failed!"
-}
-
-src_compile() {
-	use ipv6 && append-cppflags "-DINET6"
-	tc-export CC
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	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 a4c3d52a4c4a..545dbda49aba 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,5 +1,5 @@
-DIST Remmina-v1.4.20.tar.gz 2489535 BLAKE2B 8d557dfc8629572d3fc930aea85e62fdc6294521c4997e1d211b8aac385f1bab3a13f082cff7f40e3add839d3922b4884736a9a50eb3e043df4c6314d3e456c5 SHA512 27a4bfbcb77f1cebe527bdcdd78f1dedb703c888c9452bdac7162e18e7eee0bf2e49143f3a3f98d451d4c1cf7cd6b9f89ae9fb67755930501e4f08e08d311892
 DIST Remmina-v1.4.21.tar.gz 2982350 BLAKE2B d076db92290ead724e6b5c13beba2ef94d16e8209c5095e5db754a8b25ee236ed7a87b5ce29ac0b9424d3c55e5443467b1cc628fb80a0f63c59d915d9fc7839e SHA512 3fb7a29bf9e001203bdc5c176a0cf11a5c98638d605a02e2edbb16669b9e85526706c11e15bd2c308919ee6ef14217356bbafa0328ce337053bba20da6f2905a
-EBUILD remmina-1.4.20-r1.ebuild 2285 BLAKE2B eb136311307b897702cb30f7db66008752e7c8c3ad319ef6f4bf441e4778cb4e80d2001ce8e2bc95376f82f88b55848dd1ec7975d4d228f13eb80617ad764354 SHA512 1da2e08d976d20e949d38d584f7e34697b3f2c2f2e1de0c9c557b07693a2fce2dff3b8db5f2f5eab7ef79c95a71b161a7393e6073f17fa02e6b21c690348a0d1
+DIST Remmina-v1.4.22.tar.gz 3277782 BLAKE2B d9502406e9a534de18358d9d6a7790a5bb25a5be79ee9bfa390cc2c7de01e0852337834fbe1213b5f683bb948f124d44e4006a6650dd3794ee8a1f707307ed53 SHA512 8b5b8c92d5d732aec1530fdd5c1c7f74b9bfe9a9e8e990f21e92780d57b3642508c6a8c36c741bad8caa765a9709afbd577b26fe196cf71d883f924237212551
 EBUILD remmina-1.4.21.ebuild 2348 BLAKE2B d691f779d7e7caf10ff19daf2a5523bc60dc4aa3d1db5dd07beace9a4b02d94046694702c71b82fe2683143f949c4d3e29f137ef1abe6e27df4a01f691b0de99 SHA512 f7fa151fcbd9973be071a8aa5566bb9234768ac8dc493614cf242c5a75d628cd140e88cc89428f4c9ab2b1d75defa9cc915e6e57c2af5baf11032540145c88e9
+EBUILD remmina-1.4.22.ebuild 2350 BLAKE2B 8b8bc5827409208c0be511b0afec5264d940b9f2808ec8ca3c5b0aadf13eb26377a809a8b1a6b0dac156a8d511123cf114f9369befc0a06ea6d7888fdb96ef4c SHA512 83acf682b8291b7c0e3e16df06f117bfe68974a4db3c919e0c6d70d41b5edf8d126a8d1a54a7dd72eedae34756290756da6690ab2c52fdb309877687f1d0354f
 MISC metadata.xml 1174 BLAKE2B 03a647f7a881a228a2123e269567394dcf5d8e908d223dcc30b87f11e7447ffbadcda0e4a29d9126b6d15c35ddb07a7a4b9b49631156d8efc2de3f460d202bf8 SHA512 fd1632f13bffe28ca6b2349dcd32641393c0fa9fe1dd6b629b2e6d8b88a3f7f1adce8f4dfe0adce7243e5fe485da9eeaf6042ea4f532e086c97cf5d21f34a91b
diff --git a/net-misc/remmina/remmina-1.4.20-r1.ebuild b/net-misc/remmina/remmina-1.4.22.ebuild
index 0d23b7a13176..5c9f28ce599d 100644
--- a/net-misc/remmina/remmina-1.4.20-r1.ebuild
+++ b/net-misc/remmina/remmina-1.4.22.ebuild
@@ -13,8 +13,8 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit zeroconf"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf"
 
 DEPEND="
 	dev-libs/glib:2
@@ -29,17 +29,18 @@ DEPEND="
 	x11-libs/libX11
 	x11-libs/libxkbfile
 	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
 	gnome-keyring? ( app-crypt/libsecret )
 	gvnc? ( net-libs/gtk-vnc )
 	kwallet? ( kde-frameworks/kwallet )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
+		cups? ( net-print/cups:= ) )
 	spice? ( net-misc/spice-gtk[gtk3] )
 	ssh? ( net-libs/libssh:0=[sftp]
 		x11-libs/vte:2.91 )
 	vnc? ( net-libs/libvncserver[jpeg] )
 	webkit? ( net-libs/webkit-gtk:4 )
+	x2go? ( net-misc/pyhoca-cli )
 	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
 "
 BDEPEND="
@@ -64,24 +65,25 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_CUPS=$(usex cups)
 		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
 		-DWITH_FREERDP=$(usex rdp)
 		-DWITH_FREERDP3=OFF
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_SPICE=$(usex spice)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
 		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
 		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
 		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_TRANSLATIONS=$(usex nls)
 		-DWITH_UPDATE_DESKTOP_DB=OFF
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_X2GO=$(usex x2go)
 		# when this feature is stable, add python eclass usage to optionally enable
 		-DWITH_PYTHON=OFF
 	)
diff --git a/net-misc/sobby/Manifest b/net-misc/sobby/Manifest
deleted file mode 100644
index 7b5aca818502..000000000000
--- a/net-misc/sobby/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX sobby-conf-0.4.7 193 BLAKE2B 82cb4d2d2310b81d6e6c69358d493282ce459a9adea11d328ee0512f16324df15b725ce0ffadeda1f2daa4d1d7c5fe49d83aa610eea481b3e58a05ce26bb40b5 SHA512 fa18053f316a666d5eb3e5576e5a73ff6609e985a6c65e11c547a1597074f1ce60d625d859402ad44103af596e74a1aeaa87c19c4c7bcab77d21f1ce244e566c
-AUX sobby-init-0.4.7 560 BLAKE2B f21863f4df71918beb29497207d2ace23acfcd4a21e3f945e34d56f79e4c0d3a6c21d57ac1f690e8377db0fe0a1f03abc55e56f1c56cd4b12dea5f7d6cb3cd65 SHA512 2c6254db40b628148591cc1a89b41962db23afcb9dd24d54d702f6bdf97c9976ef7ddc88ed93b7e6572b313f07d4410596e57c0b3b7f1ab866f930a9b0174c4c
-AUX sobby.xml 451 BLAKE2B 75ac409597a9e369f63aaa91f45bf18a33d11077445c3c2a53ed8d8bddb0d0f6cf38da91d1002403c8a5d26729958d4956967229524aca6d29bfd55025297516 SHA512 5ef02607a1e60a801036ad57b59d79fa1adff128da857491e0a149dd0b3a14c7244f263e7c916a1f9b08fba49597a02a11b8ff3924b278031d570679fa9eb8e3
-DIST sobby-0.4.8.tar.gz 134766 BLAKE2B 2406f4e71615cd00de7a5dc1b00734d26b96f577d7bfd3bfd56746c63b26fdc089a1560fbbea78b5863ce1755b81c0e0787cab0d6c3c476b1ab2b35bb6df084a SHA512 b946fc5c15257f74213fd6418933f8f4970ca58213a4c5bb33e1110f85964ce137eb5a9fdd0a601d8838310315241b9c29065493f4c9b33a8dbe09e77cc25492
-EBUILD sobby-0.4.8-r2.ebuild 1155 BLAKE2B f7d3486c8fa54ebdea41fbc62586cda1a06a2a305cff23462922db0190cb080a3e003cc72e6437d6beee73479c4ee840a7cd9f8176d1213e9758f585049bcc68 SHA512 07375097470055f2cdc6be16e395f621cdbd5b2d5bd1b54fc4487dfbc3cf9f8c3d157da6cdbf7c83e72a44d246e73c68e47b570d752030528a67aa1e89614ab2
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/net-misc/sobby/files/sobby-conf-0.4.7 b/net-misc/sobby/files/sobby-conf-0.4.7
deleted file mode 100644
index 0dced5a6df41..000000000000
--- a/net-misc/sobby/files/sobby-conf-0.4.7
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2         
-
-SOBBY_OPTS="-c /etc/sobby/sobby.xml"
-SOBBY_USER="sobby"
-SOBBY_GROUP="sobby"
diff --git a/net-misc/sobby/files/sobby-init-0.4.7 b/net-misc/sobby/files/sobby-init-0.4.7
deleted file mode 100644
index 2fc00631147f..000000000000
--- a/net-misc/sobby/files/sobby-init-0.4.7
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2         
-
-depend() {
-	use avahi
-}
-
-start() {
-	ebegin "Starting obby dedicated server"
-	start-stop-daemon -b --quiet --start  --make-pidfile \
-		--pidfile /var/run/sobby.pid -u ${SOBBY_USER} -g ${SOBBY_GROUP} \
-		--exec /usr/bin/sobby -- ${SOBBY_OPTS}
-	eend $? "Failed to start sobby"
-}
-
-stop() {
-	ebegin "Stopping obby dedicated server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/sobby.pid
-	eend $? "Failed to stop sobby"
-}
diff --git a/net-misc/sobby/files/sobby.xml b/net-misc/sobby/files/sobby.xml
deleted file mode 100644
index b61a89f211e5..000000000000
--- a/net-misc/sobby/files/sobby.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sobby_config>
-  <settings>
-    <autosave_directory>/var/lib/sobby</autosave_directory>
-    <autosave_file>autosave.obby</autosave_file>
-    <autosave_interval>0</autosave_interval>
-    <command_directory></command_directory>
-    <name>Standalone obby server</name>
-    <password>secret</password>
-    <port>6522</port>
-    <post_save_hook></post_save_hook>
-    <session></session>
-  </settings>
-</sobby_config>
diff --git a/net-misc/sobby/metadata.xml b/net-misc/sobby/metadata.xml
deleted file mode 100644
index bef24d2c2337..000000000000
--- a/net-misc/sobby/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-misc/sobby/sobby-0.4.8-r2.ebuild b/net-misc/sobby/sobby-0.4.8-r2.ebuild
deleted file mode 100644
index ce4e8e8f322b..000000000000
--- a/net-misc/sobby/sobby-0.4.8-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="Standalone Obby server"
-HOMEPAGE="http://gobby.0x539.de/"
-SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="zeroconf"
-
-DEPEND="
-	>=dev-cpp/glibmm-2.6:2
-	>=dev-libs/libsigc++-2.0:2
-	>=dev-libs/gmp-4.1.4:0
-	>=dev-cpp/libxmlpp-2.6:2.6
-	>=net-libs/net6-1.3.12
-	>=net-libs/obby-0.4.6[zeroconf=]
-"
-RDEPEND="${DEPEND}
-	acct-group/sobby
-	acct-user/sobby
-"
-BDEPEND="
-	acct-group/sobby
-	acct-user/sobby
-	virtual/pkgconfig
-"
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf $(use_enable zeroconf)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}/${PN}-conf-0.4.7" sobby
-	newinitd "${FILESDIR}/${PN}-init-0.4.7" sobby
-
-	insinto /etc/sobby
-	doins "${FILESDIR}/sobby.xml"
-
-	fperms -R 0700 /etc/sobby
-	fowners -R sobby:sobby /etc/sobby
-}
-
-pkg_postinst() {
-	elog "To start sobby, you can use the init script:"
-	elog "    /etc/init.d/sobby start"
-	elog ""
-	elog "Please check the configuration in /etc/sobby/sobby.xml"
-	elog "before you start sobby"
-}
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index f46ee9c0c57a..85aabeb6ef54 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -7,6 +7,6 @@ DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B 0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
 EBUILD socat-1.7.3.4.ebuild 1532 BLAKE2B 798d515cf02e7ae01ff39357151bb57d6a2d29594e6fdcfabefec77432f6ca94b73cf697850a83558c675bf83cde86bea452358fe574e1b64bb6d53b786c916c SHA512 92c581282a689a04bc8f7a9300d9565ebfa1a45b1ad18e114e7cc539055ab04bc962e92292aa1873d816d0ed470bb05c3d57c888d2b1cd923e0bf49357b9e4dc
 EBUILD socat-1.7.4.1.ebuild 1479 BLAKE2B fe50e1861da8d2e17344ae1df1e6433ea7ad694a7ee8a19953a6d35afacfda16bb34813391f35483224c71a93d214eb5bf928f8ab480df384d988e4c105c897a SHA512 9a7aade38d9239f319f1f2fe313ad4ed9ca9040bfedd14d1329294cada49b76aa924b66a4c792e31ed0e58f4431818bdcc42a6ef616d0c72ccdc08f49477af3f
-EBUILD socat-1.7.4.2.ebuild 1509 BLAKE2B 6a5ba35fd1608958dbbd48c5674014dd6230eaa9c5ece671424a268f492368d0f01ed827fef72047bb6ace35bb140ba00e6789028d88c203525667ff2dd682cb SHA512 a30aeb5400337d161596a4cdb1f54625e8e7218e8a69999664325ae276758cfbca58e20e2ce852893b2bc02e6360fb97d39f33bd3de298da9b65509b4704442d
+EBUILD socat-1.7.4.2.ebuild 1502 BLAKE2B 35babb2d5719c566afebb8717ed3fdc92b5c611cb097d46851471d2f2b91eb9c15fe90efe2fb2433b6a88f0ebf41ab36afdaefee581ae91f88572b86f4e382b3 SHA512 db8b77987c12436f8db4a89a6b8cfb8fa1c0e818e7d1f2de14bfab0ef0291cff2ae96e624f9d1deadc14fca56d1a1789c8d032abf45a18095eefd4922a4aa6d8
 EBUILD socat-2.0.0_beta9.ebuild 1569 BLAKE2B 9dfa4c8b0b0abf35ac8f5cb1b8b719bae89f5814084606ecc3b1fc8197aa598b11b94912985578e939ce8c549da194fe2e17bb42214521297f0a41c5acc0d1cb SHA512 219edf709f24642d0113f0a9e4ea1566940895b1cc9b11163ab69f598a8863155fec5f06b66a8c09441e113d9fa210a1d7e26a194b5e4c6441d6e52cc2a1cb1a
 MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa
diff --git a/net-misc/socat/socat-1.7.4.2.ebuild b/net-misc/socat/socat-1.7.4.2.ebuild
index fbf589fadca9..7bb1513b232e 100644
--- a/net-misc/socat/socat-1.7.4.2.ebuild
+++ b/net-misc/socat/socat-1.7.4.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 7b736aa7c8ef..4165862b5fbb 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -7,6 +7,6 @@ DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249
 EBUILD spice-gtk-0.37-r3.ebuild 3674 BLAKE2B 84da9538eeff7eab47f2939ebfbd973e86d6f643590757fa8411998de0b328b090d0a681f32b896ff91f35805b9284009eec7e3d242039d8eab224e05667b92a SHA512 e8e1e7f9b6c148e0affe9d47ed661ce51790c73d30113f697598795b51fd89adc412e45c521e8f4ebe868254bad2c54c7b60eb5462ef8bc7c4ae99729a33f542
 EBUILD spice-gtk-0.38-r2.ebuild 2919 BLAKE2B d6117db4bcbbb8d77594c317ddb960ca75c78946e3a1d3bd1eb486c26f9bfbec35d1c25d71eaee0e6d09e0566061b5cd67834fc0e2343a1f7de1ea91ea796630 SHA512 089bcfe5ce85ec0d4644e04ac99d9c74173798516f2b9452193c285adaf469ad143053677eae86a4d0f05434d4af7fdab4b8e261b3a2c27436c8778d91fbd320
 EBUILD spice-gtk-0.38-r3.ebuild 3319 BLAKE2B 1b7912c86dad9cbed13e7e2d5f2608e271abb39045653a3a9e50bf1b38cfe9fa322629bdee75c2d93bec6041d3108d4850603f29779057e13a098593d25a9f28 SHA512 aa18468381279926d959966b0dd801635f9238e5922971d3e60088a85e0e389d13b9629df9b8cb704d6a6709ae7220f3c1a53a561992ac9ae183c5ad860d2c3d
-EBUILD spice-gtk-0.39-r2.ebuild 3235 BLAKE2B 812adb5b4ff8bcfb20f68461c576f326d8503a7619e8ff219484345782d57e9c81ffa986c08d47a17eda472ef82d1cbae9e1bad5afbb4aeecd3d2fda78437a5b SHA512 aa85e86eba8482afbc9beb212b6c3a732710cd2e2040fd698fd07ffb729df1bbc46c70c8738560db7f15999468f82ecf2f52b724d929f74c645eb64572e68e5a
+EBUILD spice-gtk-0.39-r2.ebuild 3233 BLAKE2B b0cd50b79dbf5a8edce15dc1cc1571480b3db1ee9daac6a5fa64b95a5d3a73f11d4f75deae0da8a24bec3bdf5f0be2a5c8503d57640daa485c23a530a2dd5f1a SHA512 85134bb29b726698a892e2f13e0eb0f5295a0eeb740bfe4a5127c88c279a2a1f901efdac09afcbf6334d6222bb9cff3f1cd02e483751c98665c7f0ca266de66e
 EBUILD spice-gtk-9999.ebuild 3185 BLAKE2B e8e5fe02e0a2c84281c85f25287f2e2703f49e57189c4911ac8db56e0989cb18b5c96f69e534619bb54fcc8a71d476b54011d8c8973c1aeb5622f0aa97ff619d SHA512 ede7935207d82cdc9a27242354f8affdabecdf317128a468ab05cd65accfd15669abdb06d8daeeceedc96bbeaa1191f0ad0f6da531e4d4c89bf71120bb34d707
 MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa
diff --git a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
index 97058d427523..f6db285d1dc8 100644
--- a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-g
 LICENSE="LGPL-2.1"
 SLOT="0"
 SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland webdav"
 
 # TODO:
diff --git a/net-misc/ssh-chain/Manifest b/net-misc/ssh-chain/Manifest
deleted file mode 100644
index 7ffe84a91ff3..000000000000
--- a/net-misc/ssh-chain/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ssh-chain-20131217.tar.gz 3956 BLAKE2B 64df261f9dac1d614d9095cd77b407cb6da44cd1cf97b043834670df63bb5abb7397074c073d7c0a2c10edf1cc19fcda8182a9e1ecac6b8a58a07f793e524d0c SHA512 7d9faa9bbce44a50ca56d65fd778d35f79c7ece982e2bb0e424471c866f9cc584390484dbed73447473016fe5de4564e22883d3dda4aa54e167853a3e0ce2975
-EBUILD ssh-chain-20131217.ebuild 823 BLAKE2B d80272ed78121e6aa1da0ce763aece3362d765a9a18a9a164743bce2f5617b4c06175e7806dd71b463a5120c9cd662f1b68cc8f92b1d063fa981b1766d0345b4 SHA512 32b8a34bb7177bba0ba5b842ee9e331d0842acba53daa0fed959a7913eb402e8f50647576120be7b95bd2f343e683ca1568fd3a32f070684ecd474eca6fa0192
-MISC metadata.xml 340 BLAKE2B 3b9b21a638b9249addaff2eeb6b593305250dbd049e7ee0891f74483eff741743387b20e5fcaca957995be441f89c193bc30166da6f1d3d15d74415dec8e29ef SHA512 78148ce37cf29f2ee8f958418453a5ef5a75425a6a1e34f64d86ef12fcd71476b7b5ab06cec8bf3da5f84f5ef8a6c066644c1acadc50ab113a86c2aa35d5b02d
diff --git a/net-misc/ssh-chain/metadata.xml b/net-misc/ssh-chain/metadata.xml
deleted file mode 100644
index 1a309aa03ee0..000000000000
--- a/net-misc/ssh-chain/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ryancdotorg/ssh-chain</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/ssh-chain/ssh-chain-20131217.ebuild b/net-misc/ssh-chain/ssh-chain-20131217.ebuild
deleted file mode 100644
index 45a56747325f..000000000000
--- a/net-misc/ssh-chain/ssh-chain-20131217.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vcs-snapshot
-
-COMMIT="c1bd9d82d750bf001d12a9cd41b9b24a3fd84f81"
-DESCRIPTION="ssh via a chain of intermediary hosts"
-HOMEPAGE="https://github.com/ryancdotorg/ssh-chain"
-SRC_URI="https://github.com/ryancdotorg/ssh-chain/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	virtual/ssh"
-
-src_install() {
-	dobin "${PN}"
-	dodoc README
-	if [[ -f "${EROOT}"/etc/ssh/ssh_config ]] && ! grep -q "^Host \*^\*" "${EROOT}"/etc/ssh/ssh_config; then
-		cp "${EROOT}"/etc/ssh/ssh_config "${T}/ssh_config"
-		cat >> "${T}/ssh_config" <<EOF
-
-#for ${PN}
-Host *^*
-	ProxyCommand ssh-chain %h %p
-
-EOF
-		insinto /etc/ssh
-		doins "${T}/ssh_config"
-	fi
-}
diff --git a/net-misc/sysrepo/Manifest b/net-misc/sysrepo/Manifest
index 5f5a7da6b0ba..f7ce4aa427c9 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,5 +1,4 @@
-DIST sysrepo-2.0.47.tar.gz 667259 BLAKE2B 9869fb936322f317156842daa71f1c07176914df4bcec73d2e8976dc28429555a1754eb5e2c5b0626f040bdf664d121dae711bc698974b727f27ecd544e6535b SHA512 ef9f7c2698180a820566f46d5155b0bf7b31c2c5b7675e17180bb7f28a9ebb10f4fefd7fe983d89b4e40a28f2b905f4a6541644ca3805975339ea7827a364d92
+AUX sysrepo-2.0.53-musl.patch 208 BLAKE2B 9cc49eeef2bd950c25259fdfbc308a8788bf2e8d97777db7a67abdda9cc66fa9a32c4221eefe82cd8b8b829d9848df6164ceffd3e63b251ce845ed0adc453456 SHA512 34d058d0a5dff6ea959ab0ee0882b6fc4c6c0ea257f790568bbd5f8cc12abb5405dbf7bb850d81d5b1836a34c231041157a0aba55ca5f67d570e85b2dce19b7c
 DIST sysrepo-2.0.53.tar.gz 669484 BLAKE2B f612080b316d6cf86ea70d88834f75b647dc16b29ad824829338d2144784bd7f425d3811055b9b956ef4e6820d467ecbe9a33a3d54a51a4024999b79e62b8255 SHA512 47949514df988a7a8a3b2a506f69baf6ea31bb32d5e80b85af968c827382cadf96e1ab237519308564a59ae67514d6ca3f5e300855259b9baf6ab49252a2eb12
-EBUILD sysrepo-2.0.47.ebuild 771 BLAKE2B 1e89bee7836779185e0eaa88846361c4ecaf681ce156b36f2c6b0bc8876cd5b774af186a066a0bb703a1fe52bafe3277cc064d28398ca7c1402dd03c07b101b8 SHA512 2df75af3a3434801908162348d62a9b62a365adcc14cc0f1cea1f3e1d2c11423a3d3232b3254baa67279253a36d2aa86cfa8a9ba934ee88808f4bfdbb466e793
-EBUILD sysrepo-2.0.53.ebuild 774 BLAKE2B 47179035d7a336c7862d6986d8ffed7b446495d0b313edf5ef43ee9b8127da11304fd21d019b1ff94d2ca8602936f9985b1ca2ba1989e31d7671417426c8518c SHA512 18453af092b26bbd0494f34f99eef81808508dba1bc1f85738e2b55b45e0f77fe02fc97de7d77e10a82a1c3e30df64c4594b79c3817e5f19228afc913f424ad8
+EBUILD sysrepo-2.0.53.ebuild 816 BLAKE2B 776d89625b42945d596f747a7b4c90791d26cf591103e859ee73f0c7801223a30db13b53006a4fd3a2a2b92aed0f6679e0c64a41534c1e399d574dd29c8adc1e SHA512 ce928151ad84cf4fb759f83ba7a36f8841ad86b43d4b7929173086561c406b4b3a38da7b243e79ae40c2f04f499c73b68ec9cc16dce13439a02937c4ff9bd1b9
 MISC metadata.xml 328 BLAKE2B e91ac8ab81f342a9cdbf7b924f37c12f2adade3b0dee1972a3b2f2035997d6e8f5de414a052f2e154f6cecba1ab310103db2fd60e16d085875200bf08fcea522 SHA512 acdb3728e90337d98aea6f5174aba7a81d84259226ec6dda4607524184137b75431e621ebe29b99d371f6b3ff54aed15732a1d89229bf8cb100b52b4e0ae1a99
diff --git a/net-misc/sysrepo/files/sysrepo-2.0.53-musl.patch b/net-misc/sysrepo/files/sysrepo-2.0.53-musl.patch
new file mode 100644
index 000000000000..24c5d86edc59
--- /dev/null
+++ b/net-misc/sysrepo/files/sysrepo-2.0.53-musl.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/828916
+--- a/src/sysrepo_types.h
++++ b/src/sysrepo_types.h
+@@ -19,6 +19,7 @@
+ 
+ #include <inttypes.h>
+ #include <stddef.h>
++#include <sys/stat.h>
+ 
+ struct lyd_node;
+ struct timespec;
diff --git a/net-misc/sysrepo/sysrepo-2.0.47.ebuild b/net-misc/sysrepo/sysrepo-2.0.47.ebuild
deleted file mode 100644
index 1cfc5beff760..000000000000
--- a/net-misc/sysrepo/sysrepo-2.0.47.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="YANG-based configuration and operational state data store"
-HOMEPAGE="https://www.sysrepo.org"
-SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=net-libs/libyang-2.0.97:="
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_VALGRIND_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	cmake_src_install
-
-	use doc && dodoc -r doc/.
-}
diff --git a/net-misc/sysrepo/sysrepo-2.0.53.ebuild b/net-misc/sysrepo/sysrepo-2.0.53.ebuild
index 622f5a98a45b..b0aaacfd87b1 100644
--- a/net-misc/sysrepo/sysrepo-2.0.53.ebuild
+++ b/net-misc/sysrepo/sysrepo-2.0.53.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -19,6 +19,10 @@ RDEPEND=">=net-libs/libyang-2.0.112:="
 DEPEND="${RDEPEND}"
 BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-musl.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_TESTS=$(usex test)
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 9ba84e9e1268..3347322cc1b1 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,5 @@
 AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21bca66a17811b1180ad89fcbc6e3ca8b70b8803c284456cc14393dddf5f2f395d9044d90e8ac8ee50d155be7779b08c14d7bbcb270b SHA512 5f9650a6f8589ab952506cbf6a67f603fc720a70dd76a505da69812c039fb9a0a4137c9667ce11e253a35bade056a18d2fa584ac23cda8111ff1fe17e90f025a
+AUX tigervnc-1.12.0-xorg-1.21.patch 1756 BLAKE2B c872216f03b595f61e91d876546c573ed572b20e9ead1e4ded7d830c739dc172a016784902d447dbe8aa78bb5a2e69c4ef6a4357f446af53f7bc569d56108dac SHA512 533ff06e9619cd63ee83dcb3e6a5a35f02f092b32b194f89e2c06f2f17aaf59a3c2adab27d3e87c4a0773f3f82cfec82492d6b031b3a9050d5f0ad4fcf0a0da0
 AUX tigervnc-1.9.0-030_manpages.patch 1978 BLAKE2B c9054f599b503d68d19dab1bd5c588ed19e96f3d547482c10acf84acc81fb59089497d1a282d6f8108132c8ed2fc412af9153c1305d6b04fdecf227c4ad42180 SHA512 dd58ab7987e2e619cc544cae77d7234575dbb812073f730ca0abda24e05c95fcc62449f96472a7962202725d2c9277432cf2289ff930d9841852c858977bf44e
 AUX tigervnc-1.9.0-055_xstartup.patch 1188 BLAKE2B 99f9371fffd6fdddef86b821152833ea7b24b9d121a51e85e04f1b25411a14f629513ed211b1c13f38f60dc48708db40891f1c36eea6b24e7b239f1e480540fe SHA512 b16cbd2360c6eba6210362d138ff5406f472bd4d81277def69460b846169f49cb3f98d29193c4fbc89d7ab06fb04052c2b94f7ceab6003f2b9b17c5b6c51151c
 AUX tigervnc.confd 346 BLAKE2B b21fe4537e186cd4de89f54b42006f0adbe4d6968c87dcb81981b02af27eec5ce06ad3aa76d9a747aeda481a5e422dfc8a122bc266660a240833863043cf81b0 SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4
@@ -6,8 +7,13 @@ AUX tigervnc.initd 1974 BLAKE2B bb909f75ecbb7f33db4a0e3a7a1ee59bf9c60d5cbef4d432
 AUX xserver120-drmfourcc-header.patch 1300 BLAKE2B d1be2072020a4eff663e56e1210b8ffadacd7c394f0bd5ac82a0d5b6a023c020a5125112807762b5260f07180f591009bd22eeb6d9a1324bae64caca7dd6aaba SHA512 aa980e28568df01f4589c258e293df1499c8d7d8d2e37a0bb52c240efb0fcb45f862f382633c389ba60283b6776e33e642acf3544bb89832bd2980bb80908e30
 AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311bf8b37e8e1873046919fbecf1023f0178793e939ba33e834b55c6e8277f88bd2b145716badc8b4a5c4 SHA512 bf69a4b65742c5f2351b7d0f0b7ad44f44050dd8f54972d9545ea873f27f8fe88314b016b07746b31ac75bde6648b249f523a1f3d9948a9cb26001d6096d4f3d
 DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
+DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
+DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
+DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 EBUILD tigervnc-1.11.0-r4.ebuild 4203 BLAKE2B 6e0640b1a200348f3301485410bfb0c85928efa2729d40a76de2be27e5c7d14115fc775528dd0482dd8fb2d7e16eea4d30c6f5f6b5e09c11e655bea8791f76f8 SHA512 7f91cbac0fecc548d7067c54530de96939d081f7297478cad7f006e72648f2dab2156151250dfa5324fcae50226b1a51300c259564830f84e8dd67325db71748
+EBUILD tigervnc-1.12.0-r1.ebuild 4351 BLAKE2B 94a56781ab0d53c915beb70e2838c1252850e6ddb6b26bd90fe9cf75da6c833d80151a50606a3e427133e371cbebc28c06a38f2a547aff3819a9bd3b26bbcf79 SHA512 26e47d615a53ac060893a62b8410bfe81c4d3321d65a810d956f7f0d06091f90eafef465825c879a166556e3f5495fa39554b556225e4cd644468412632bf203
 EBUILD tigervnc-1.9.0-r2.ebuild 4274 BLAKE2B 976aaba3766e4bbec266086c4e7d6b1e197a810bea4e2e0391d986162aeec60373a7358ec2d951f87aab83ecf6a0b4ba4fcc65a92ace997437e47b5fc015d75c SHA512 bc988f43bf23dde99a675f4510946731a5a896a32a043d08a755fd9a6dc94abc3c347abf496066edd2989bf150f5cd995cb2582354b63e885ed9e6d3fe98c5bf
+EBUILD tigervnc-9999.ebuild 4124 BLAKE2B b42f5598fb104540af2635ef7047bc165b6f03eeac365d40e592717edc0bed4ea8e085f675ea6049bc6660e0e23fdcf8b8a66a6cfb55fe6d34489f11bf36a64b SHA512 1201929cb06af2cdc4eef70b4ac4b6b483c566c795a370b365f81ff03af02979f4993fa17ab7e10d11f6e0a18fb13115aaf617fe8238b1ce5959658fb0e03361
 MISC metadata.xml 471 BLAKE2B 450ab613da6c09763bd4d8ccd873b0c808617e5f9c4a95ecbba0bde24601ffc877db8b81a4290cb7574589329d654ea05eecf77195ac481c209000b7ec314773 SHA512 f6811c2155dc2079293bd335d9c6182a2ebe1853ff666f2c28dfba1141cf4d92e845ee8a99da9799aa08fd8f752e9d1d0fd0de8effac1fda9b19c8e464ee2435
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
new file mode 100644
index 000000000000..c3e003d328a6
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
@@ -0,0 +1,55 @@
+https://github.com/TigerVNC/tigervnc/commit/736b50d04e1ba965696cd15d456dc2b7fc123150.patch
+https://github.com/TigerVNC/tigervnc/commit/f2577107f7f55382c524d8c738a777e5cdd80f60.patch
+
+From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
+Date: Wed, 24 Nov 2021 21:09:36 +0100
+Subject: [PATCH] xorg-version.h: Increase supported Xorg version to 1.21
+
+--- a/unix/xserver/hw/vnc/xorg-version.h
++++ b/unix/xserver/hw/vnc/xorg-version.h
+@@ -33,8 +33,8 @@
+ #error "X.Org older than 1.16 is not supported"
+ #endif
+ 
+-#if XORG_AT_LEAST(1, 21, 0)
+-#error "X.Org newer than 1.20 is not supported"
++#if XORG_AT_LEAST(1, 22, 0)
++#error "X.Org newer than 1.21 is not supported"
+ #endif
+ 
+ #endif
+
+From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
+Date: Wed, 24 Nov 2021 21:10:56 +0100
+Subject: [PATCH] xvnc: adapt for 1.21
+
+VENDOR_STRING is gone as is DEFAULT_LOG_VERBOSITY
+site.h has been removed and is not needed.
+--- a/unix/xserver/hw/vnc/xvnc.c
++++ b/unix/xserver/hw/vnc/xvnc.c
+@@ -69,7 +69,6 @@ extern char buildtime[];
+ #undef VENDOR_RELEASE
+ #undef VENDOR_STRING
+ #include "version-config.h"
+-#include "site.h"
+ 
+ #define XVNCVERSION "TigerVNC 1.12.80"
+ #define XVNCCOPYRIGHT ("Copyright (C) 1999-2021 TigerVNC Team and many others (see README.rst)\n" \
+@@ -111,14 +110,13 @@ static Bool Render = TRUE;
+ static Bool displaySpecified = FALSE;
+ static char displayNumStr[16];
+ 
+-static int vncVerbose = DEFAULT_LOG_VERBOSITY;
++static int vncVerbose = 0;
+ 
+ static void
+ vncPrintBanner(void)
+ {
+     ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);
+-    ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
+-           VENDOR_STRING);
++    ErrorF("Underlying X server release %d\n\n", VENDOR_RELEASE);
+ }
+ 
+ static void
+
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..a00c4d13860f
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	server? (
+		ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz
+		https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> ${P}-xserver-21.patch
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
+
+CDEPEND="
+	virtual/jpeg:0
+	sys-libs/zlib:=
+	>=x11-libs/fltk-1.3.1
+	sys-libs/pam
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	server? (
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		>=x11-libs/pixman-0.27.2
+		>=x11-apps/xauth-1.0.3
+		x11-apps/xsetroot
+		>=x11-misc/xkeyboard-config-2.4.1-r3
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+		drm? ( x11-libs/libdrm )
+		dev-libs/openssl:0=
+	)
+	xinerama? ( x11-libs/libXinerama )
+	"
+
+RDEPEND="${CDEPEND}
+	!net-misc/tightvnc
+	!net-misc/vnc
+	!net-misc/xf4vnc
+	java? ( virtual/jre:1.8 )"
+
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	java? ( virtual/jdk:1.8 )
+	x11-base/xorg-proto
+	media-libs/fontconfig
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	server? (
+		dev-libs/libbsd
+		x11-libs/libxkbfile
+		x11-libs/libxshmfence
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		>=x11-libs/xtrans-1.3.3
+		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+	)"
+
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+)
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+		eapply "${FILESDIR}"/${P}-xorg-1.21.patch
+		eapply "${DISTDIR}"/${P}-xserver-21.patch
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_VERSION}.patch
+		eautoreconf
+		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DBUILD_JAVA=$(usex java)
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		if ! use xorgmodule; then
+			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
+		else
+			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+		fi
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+	else
+		local f
+		for f in x0vncserver vncconfig; do
+			rm "${ED}"/usr/bin/${f} || die
+			rm "${ED}"/usr/share/man/man1/${f}.1 || die
+		done
+		rm -r "${ED}"/usr/{sbin,libexec} || die
+		rm -r "${ED}"/usr/share/man/man8 || die
+	fi
+}
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
new file mode 100644
index 000000000000..8b91a1a47c46
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit autotools cmake flag-o-matic git-r3 systemd xdg
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="dri3 +drm gnutls nls +opengl server xinerama +xorgmodule"
+
+CDEPEND="
+	virtual/jpeg:0
+	sys-libs/zlib:=
+	>=x11-libs/fltk-1.3.1
+	sys-libs/pam
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libxcvt
+	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	server? (
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		>=x11-libs/pixman-0.27.2
+		>=x11-apps/xauth-1.0.3
+		x11-apps/xsetroot
+		>=x11-misc/xkeyboard-config-2.4.1-r3
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+		drm? ( x11-libs/libdrm )
+		dev-libs/openssl:0=
+	)
+	xinerama? ( x11-libs/libXinerama )
+	"
+
+RDEPEND="${CDEPEND}
+	!net-misc/tightvnc
+	!net-misc/vnc
+	!net-misc/xf4vnc"
+
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	x11-base/xorg-proto
+	media-libs/fontconfig
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	server? (
+		dev-libs/libbsd
+		x11-libs/libxkbfile
+		x11-libs/libxshmfence
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		>=x11-libs/xtrans-1.3.3
+		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+	)"
+
+src_unpack() {
+	git-r3_src_unpack
+	unpack xorg-server-${XSERVER_VERSION}.tar.xz
+}
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_VERSION}.patch
+		eautoreconf
+		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+	fi
+	cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DBUILD_JAVA=no
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dmx \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--disable-xwayland \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		if ! use xorgmodule; then
+			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
+		else
+			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+		fi
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+	else
+		local f
+		for f in x0vncserver vncconfig; do
+			rm "${ED}"/usr/bin/${f} || die
+			rm "${ED}"/usr/share/man/man1/${f}.1 || die
+		done
+		rm -r "${ED}"/usr/{sbin,libexec} || die
+		rm -r "${ED}"/usr/share/man/man8 || die
+	fi
+}
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index d7b4466ea8f5..8adc32578e06 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,3 +1,5 @@
 DIST turbovnc-2.2.6.tar.gz 9022414 BLAKE2B 5baf1d5a9ea488ae1148feb107920d1e2cd2d29af58b6486ac8b7381f07def05d5fbf3a8b231221ef05a8365dd431f0640de0c4fc507475b0c801a53472870c4 SHA512 74fabb7006135853b662e8b6fcfc9b0cf55aa516477106de40587b4513a708c1458ab73f7a51f5f70c4abdc09f1ce13aafdcd56cd039655870a7614169d98af7
+DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788
 EBUILD turbovnc-2.2.6.ebuild 2196 BLAKE2B 281b187822a2f5631891f86caa7c137110cc8747aebae4ef16f925afc19531dc9e877e7503f236b33022ea24744dbb34a0a8f61c1839917d6c8fce9b7feff4f0 SHA512 398a0b53b23d3ea0e136f7cd0ee79c509c58b4502e2e687f045c67b740871aac6c27e418b720efd767986c89c9afe68dd4bcc98b70960172112c0cb0381e1fef
+EBUILD turbovnc-2.2.7.ebuild 2193 BLAKE2B 39274502936ed7ac2f3337eaa5e942497ed354750d640ee9f6b270ee3a402b2c65e9dd7a3d5ac1cd9b381ed5f4dc78e6757f3a13a33c09df3c215bd0556dbb6d SHA512 eb0d89a65bb65f3940bc11a3c0ccf66c2a56d2c3ef9386922e56ba46ab70c8217fc2531fab90f746ad4c519af19a02597e57a29adbfd0d764ebf36597c616ff3
 MISC metadata.xml 784 BLAKE2B 55a8bba421a15da5ed9401949b8e056b9c376030875bac0b28dece1a71f50c07010949bf82792129db82df98068061959a80c31093c8e91afb94cbdee0b2f020 SHA512 1e15fc8d88a46e7027eec5cdb8f8f7d6973f2ff1ea586ba6cf2d46a6d09050c6ba0ba94eaa9f59a8624a9885b8b25ec7a2977f1f4d71c02517bd8f681c05bec9
diff --git a/net-misc/turbovnc/turbovnc-2.2.7.ebuild b/net-misc/turbovnc/turbovnc-2.2.7.ebuild
new file mode 100644
index 000000000000..c7db05f8cba5
--- /dev/null
+++ b/net-misc/turbovnc/turbovnc-2.2.7.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop cmake java-pkg-opt-2
+
+DESCRIPTION="A fast replacement for TigerVNC"
+HOMEPAGE="https://www.turbovnc.org/"
+SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gnutls +ssl"
+
+DEPEND="
+	app-arch/bzip2
+	media-libs/freetype
+	>=media-libs/libjpeg-turbo-2.0.0[java?]
+	sys-libs/zlib
+	virtual/jdk:1.8
+	virtual/opengl
+	x11-libs/libfontenc
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfont2
+	x11-libs/libxkbfile
+	x11-libs/pixman
+	ssl? (
+		!gnutls? ( dev-libs/openssl:= )
+		gnutls? ( net-libs/gnutls:= )
+	)
+	!net-misc/tigervnc
+"
+RDEPEND="
+	${DEPEND}
+	x11-apps/xkbcomp
+"
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTVNC_SYSTEMX11=ON
+		-DTVNC_SYSTEMLIBS=ON
+		-DTVNC_BUILDJAVA=$(usex java)
+		-DTVNC_BUILDNATIVE=ON
+		-DXKB_BIN_DIRECTORY=/usr/bin
+		-DXKB_DFLT_RULES=base
+	)
+
+	if use ssl ; then
+		# We prefer OpenSSL, so default to that if SSL is enabled
+		if use gnutls ; then
+			mycmakeargs+=( -DTVNC_USETLS=GnuTLS )
+		else
+			# Link properly against OpenSSL to ensure
+			# we catch e.g. ABI change
+			# (i.e. don't dlopen it)
+			mycmakeargs+=(
+				-DTVNC_USETLS=OpenSSL
+				-DTVNC_DLOPENSSL=OFF
+			)
+		fi
+	else
+		mycmakeargs+=( -DTVNC_USETLS=OFF )
+	fi
+
+	if use java ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+
+		mycmakeargs+=(
+			-DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar"
+			-DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use java ; then
+		java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
+		make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
+	fi
+
+	# Don't install incompatible init script
+	rm -rf "${ED}"/etc/init.d/ || die
+	rm -rf "${ED}"/etc/sysconfig/ || die
+
+	find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -print0 | xargs -0 rm || die
+
+	einstalldocs
+}
diff --git a/net-misc/vrrpd/Manifest b/net-misc/vrrpd/Manifest
index 16c5eb7a7286..d1f47b60c8fe 100644
--- a/net-misc/vrrpd/Manifest
+++ b/net-misc/vrrpd/Manifest
@@ -1,4 +1,5 @@
 AUX vrrpd-1.9-rollup.patch 820 BLAKE2B 4862766d23aa2811023c5f7a37fd3ed08f74701a6b434ae1d6ae84dd1aa72f31d599db6779edd6216fa0e1b499c701f0f442dce7ae150173b74b370e8a03a880 SHA512 20dd64876125707cb0cca6c45363a4db05a9472a0bec7bded2665229ee9db44a8429703294cf39b53a703fa9c66b6644e89edf98d1e87c090d763da2a3b07b7a
 DIST vrrpd-1.9.tar.gz 542249 BLAKE2B a412559be70791515c6b82639a8e1d5fc33954963fbf00aa3c549434ac0748b9d0ea657b2d02b1a3537a30742c18fe6d6db832a11c23b6989151c5f04c771d05 SHA512 8c719cabbd6a799e4e439dbb698af9d6e24cf2635cfbd71a204b46bd2b65c1384e53f130b663d0fcfc903d89080ff25d9c97ae4cd9f6b2434d5462cf678a306b
+EBUILD vrrpd-1.9-r1.ebuild 904 BLAKE2B 55adba87adc1cc1204ca327847e2b492f35e03b10b1c5f56dcf740c78684788ec7dcfb335fde70510d2c17230c231d3d1185b4df831d4b9aef1c0705b21195d0 SHA512 f466c4a4318771247bbada8a8f70563f6c45af1c4b62602ea9757b959c1aa5c563fcc057a335ef83830b9ac93323b8398afa5848a208a0e78d7a9227367d98e5
 EBUILD vrrpd-1.9.ebuild 860 BLAKE2B 9d3b610b9dceec548d883812541bfd5fc18e55b9f4446d9265360adb3a19d162b34e2f3da18a228fd8969761580b73ec1dd2f6f5fc5892379c4d484a5a245e50 SHA512 67e6b2ce13c93f10bce83e6cecfc186e7a4078e6037f132ad96a73934e2b99377e4048cc6e8acff0ef4d30fa6f7f0553f5078f5ff5b68a9b9616cb42711bbe5d
 MISC metadata.xml 393 BLAKE2B 6d57b9c90d6314c40313182e349c083f87e1683bd00c0ad4002aac743c3a4dcb5f44f4f7dff6d62e280bc79ad70f20119beabde7670c2a1befdf5f7d0e2a6ee4 SHA512 67adeb2323ac9b77e43abcf795734e05be16089f77c978ad3e45ab9991d64f035dd43bf2e1417825af6931f446a0a2ba8e72a7bac4ebde7f52caf6215cd89853
diff --git a/net-misc/vrrpd/vrrpd-1.9-r1.ebuild b/net-misc/vrrpd/vrrpd-1.9-r1.ebuild
new file mode 100644
index 000000000000..5aefe0f4576f
--- /dev/null
+++ b/net-misc/vrrpd/vrrpd-1.9-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual Router Redundancy Protocol Daemon"
+HOMEPAGE="http://numsys.eu/vrrp_art.php"
+SRC_URI="https://github.com/fredbcode/Vrrpd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Vrrpd-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}"/vrrpd-1.9-rollup.patch )
+
+src_prepare() {
+	default
+
+	# Don't hardcore GCC
+	sed -e '/CC=/d' -i Makefile || die
+
+	emake mrproper
+}
+
+src_compile() {
+	local myemakeargs=(
+		DBG_OPT=""
+		MACHINEOPT="${CFLAGS}"
+		PROF_OPT="${LDFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	dosbin vrrpd atropos
+	doman vrrpd.8
+	dodoc FAQ Changes TODO scott_example doc/draft-ietf-vrrp-spec-v2-05.txt doc/rfc2338.txt.vrrp doc/draft-jou-duplicate-ip-address-02.txt doc/principe-Vrrp1.jpg doc/principe-Vrrp2.jpg README.md
+}
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index 38e60dfc3742..dd46d5075f1a 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -7,8 +7,8 @@ DIST xmrig-6.16.1.tar.gz 2417592 BLAKE2B a74e7b4393f2d3af7bbea114261f4878c3edf09
 DIST xmrig-6.16.2.tar.gz 2421650 BLAKE2B a850e7dce19dfec87644b1d8c3f445141fbf9bce2f2fe8176a7c5e528da67417728e9c327a05dbc32ca0b7b5d0536a9d5c19dbe5cdb0106763693574e58c62c0 SHA512 b845ed501e8d9829ceaf9ab31b493997cc489dcedb1eef91624d1cffa9a7e8e5baa4f85653eb40a3f27debe1710f5770df0e582ab6e857386b6d5ac3bb101e67
 EBUILD xmrig-6.15.2.ebuild 1331 BLAKE2B 8ee8edaf12c04ec64e64520e57e08c64f7f262a11589372023e7ae0b57ff3dd7a7d4d039c524781ace336c12eb44eafaca4ca3356797aeb2c56cb18eb738b17b SHA512 7c5439f973e51776a1c15e6764a5a32d3e7db9f21c1086120a8dfdd328dfb18c02327c38e99a6e822e702586272124f23e27cf95e829f4311d80e3198d8055a6
 EBUILD xmrig-6.15.3.ebuild 1333 BLAKE2B 218caecf6e9d293841b0a72bb306cdaab67abaf294a3e47fe749eefc6f0e6ec59af992beb22e1fa9809cfd9972af8361209a25eaaa855c9d01c5fd46a5208053 SHA512 01d5d0c9a57bd8c70beefabb81c033ee27599d4e9d5a492c53388910f8ea6b89a84aab666ff202d72b07b20faa65894afd5093a77903d75b9fd4a1662ed47ceb
-EBUILD xmrig-6.16.0.ebuild 1333 BLAKE2B 218caecf6e9d293841b0a72bb306cdaab67abaf294a3e47fe749eefc6f0e6ec59af992beb22e1fa9809cfd9972af8361209a25eaaa855c9d01c5fd46a5208053 SHA512 01d5d0c9a57bd8c70beefabb81c033ee27599d4e9d5a492c53388910f8ea6b89a84aab666ff202d72b07b20faa65894afd5093a77903d75b9fd4a1662ed47ceb
-EBUILD xmrig-6.16.1.ebuild 1333 BLAKE2B 218caecf6e9d293841b0a72bb306cdaab67abaf294a3e47fe749eefc6f0e6ec59af992beb22e1fa9809cfd9972af8361209a25eaaa855c9d01c5fd46a5208053 SHA512 01d5d0c9a57bd8c70beefabb81c033ee27599d4e9d5a492c53388910f8ea6b89a84aab666ff202d72b07b20faa65894afd5093a77903d75b9fd4a1662ed47ceb
-EBUILD xmrig-6.16.2.ebuild 1333 BLAKE2B 218caecf6e9d293841b0a72bb306cdaab67abaf294a3e47fe749eefc6f0e6ec59af992beb22e1fa9809cfd9972af8361209a25eaaa855c9d01c5fd46a5208053 SHA512 01d5d0c9a57bd8c70beefabb81c033ee27599d4e9d5a492c53388910f8ea6b89a84aab666ff202d72b07b20faa65894afd5093a77903d75b9fd4a1662ed47ceb
-EBUILD xmrig-9999.ebuild 1333 BLAKE2B 218caecf6e9d293841b0a72bb306cdaab67abaf294a3e47fe749eefc6f0e6ec59af992beb22e1fa9809cfd9972af8361209a25eaaa855c9d01c5fd46a5208053 SHA512 01d5d0c9a57bd8c70beefabb81c033ee27599d4e9d5a492c53388910f8ea6b89a84aab666ff202d72b07b20faa65894afd5093a77903d75b9fd4a1662ed47ceb
+EBUILD xmrig-6.16.0.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
+EBUILD xmrig-6.16.1.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
+EBUILD xmrig-6.16.2.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
+EBUILD xmrig-9999.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
 MISC metadata.xml 1033 BLAKE2B 9f8e1d1a6e6cc807536149bec4b2b2531a49f1915a3628e5ae9b55f5fd4c85a924403807bc34a8c1a065282c8e5c27cf2f87bae4a90d3b182f5a3a058407a601 SHA512 4e47c4fea9083f5bcfdd53d2a53f04fca9a5cb088b71d28d960d3fbf21a91e153fb99a738a986d7bff6ced690a86333801d3f27d2e6ca69b4445a2fba5a17b62
diff --git a/net-misc/xmrig/xmrig-6.16.0.ebuild b/net-misc/xmrig/xmrig-6.16.0.ebuild
index 2639977e5a05..516d44208bba 100644
--- a/net-misc/xmrig/xmrig-6.16.0.ebuild
+++ b/net-misc/xmrig/xmrig-6.16.0.ebuild
@@ -22,7 +22,7 @@ IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
 
 DEPEND="
 	dev-libs/libuv:=
-	hwloc? ( sys-apps/hwloc:= )
+	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
 	opencl? ( virtual/opencl )
 	ssl? ( dev-libs/openssl:= )
 "
diff --git a/net-misc/xmrig/xmrig-6.16.1.ebuild b/net-misc/xmrig/xmrig-6.16.1.ebuild
index 2639977e5a05..516d44208bba 100644
--- a/net-misc/xmrig/xmrig-6.16.1.ebuild
+++ b/net-misc/xmrig/xmrig-6.16.1.ebuild
@@ -22,7 +22,7 @@ IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
 
 DEPEND="
 	dev-libs/libuv:=
-	hwloc? ( sys-apps/hwloc:= )
+	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
 	opencl? ( virtual/opencl )
 	ssl? ( dev-libs/openssl:= )
 "
diff --git a/net-misc/xmrig/xmrig-6.16.2.ebuild b/net-misc/xmrig/xmrig-6.16.2.ebuild
index 2639977e5a05..516d44208bba 100644
--- a/net-misc/xmrig/xmrig-6.16.2.ebuild
+++ b/net-misc/xmrig/xmrig-6.16.2.ebuild
@@ -22,7 +22,7 @@ IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
 
 DEPEND="
 	dev-libs/libuv:=
-	hwloc? ( sys-apps/hwloc:= )
+	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
 	opencl? ( virtual/opencl )
 	ssl? ( dev-libs/openssl:= )
 "
diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild
index 2639977e5a05..516d44208bba 100644
--- a/net-misc/xmrig/xmrig-9999.ebuild
+++ b/net-misc/xmrig/xmrig-9999.ebuild
@@ -22,7 +22,7 @@ IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
 
 DEPEND="
 	dev-libs/libuv:=
-	hwloc? ( sys-apps/hwloc:= )
+	hwloc? ( >=sys-apps/hwloc-2.5.0:= )
 	opencl? ( virtual/opencl )
 	ssl? ( dev-libs/openssl:= )
 "
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index ef53308918fb..ae96ba4ac296 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,7 +1,3 @@
-DIST yt-dlp-2021.10.22.tar.gz 2010916 BLAKE2B fb8f789c74df06dcd672d00ac16eb7cbf466755c3fa607acdd21dd9a9ef2af158a5272f88656133078bd50585506b65cf3b3c03236726de954ccfa0b6c1195fc SHA512 2b590703f8d4f9454b50983019aca8046205234bd98cac4da73a6688eae177a19ef641e486aea92d86197ee7ad6c564c65f9b9496d623c00bdcc349817d5b1f8
-DIST yt-dlp-2021.11.10.1.tar.gz 2042241 BLAKE2B c4542edce26931a8753002a5cf0fda46549dd9b79709fc595c0c807837b07242d5d7a7fa19cc4f64cf7b7fc5803c4937185d68f4593250f9fa21155d5a24ee92 SHA512 54a371d70b7b82349a184b26201fca12fabbc9a107dc199347c412062776d63879d22955d76726df61bc40ec594a7179a997e4679c683673c8c0dd41f62b16f6
 DIST yt-dlp-2021.12.1.tar.gz 2064958 BLAKE2B d97bf6bc5d6a97aec05be73dcc00aac6b1aff011c307abcbf604a3bfab06dadfd28401eab8ad26d42b7ec3db778c66e9fa2de09d3e6c28304fd28791532509d9 SHA512 d04e9e5ae36e73923ac79bb98af6e402ba0b4403430cbcc0517e7f446d42b6c637846b11489c0159faf667ab798b937abb9597fb5fba76b6f7b6e2b379bae328
-EBUILD yt-dlp-2021.10.22.ebuild 999 BLAKE2B 36e72cb572e5640d596036634b3ecd7d02945eb63dfe9ed63af6a73283fb9161334a99bac7d879089ff2b02552726ad171b3f0758f0e8d5f15da3d386699bae8 SHA512 54552a9a36c3e335ade68c5c20f905069c17cd8c8c47f41ba8396cce2613a4b9c6e730f4d8a100b5e567c202dfe002903b28c4ced340e76f48e584bf095d1341
-EBUILD yt-dlp-2021.11.10.1-r1.ebuild 1773 BLAKE2B 7081587398e739d478451f9c0faf3e88fc73c7703e85568ffc6587454c78097f999fb62b52a8c7e6248cf930850ba94a0c97cd741697f6adcc926b18cbeda745 SHA512 bf5863ae2433774ccff6311ccbda227a52393178b65a37f765523829d9deccf8e8a3d0a676896b42a58702571d5fc23661b62b8673be4cfca3c7dd9e151b41cd
-EBUILD yt-dlp-2021.12.1.ebuild 1775 BLAKE2B d03e77ab2e76cb0849fb6c254666e5e5572dc3a90dec2826f51bb8d1ed31fb142a2d10fa7f67c20b66adefe0ae831ca52e79aa4bff0a4120981f6209a0c706e0 SHA512 0ef0ec553b54b55cbd5bfd68f9107f1bf58008ce745d3344d3cfcadcd131917d143b2315bee482eeb11adff73fe46010e232ce4248700cd264bd5c5bf4ce4e6e
+EBUILD yt-dlp-2021.12.1-r1.ebuild 2008 BLAKE2B 289ee6fd98fd60002e19aa82c706dc67f72a61c26b82fab1ec6cd9bf9d9461f8373473bfaf1c1be6931d0fcf98283c9868522c1b6fa805be3cb159e58985642c SHA512 cdd1d4390e74f2463a37db297b40ea0ba50c7676a364db00292242ea16a2488900d3f87a7db77724fd0d39cadc22c2b165766353d66f85af80d210ef61f817c9
 MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff
diff --git a/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild b/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild
deleted file mode 100644
index e4e5268e2804..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2021.10.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="youtube-dl fork with additional features and fixes"
-HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/websockets[${PYTHON_USEDEP}]
-	media-libs/mutagen[${PYTHON_USEDEP}]
-	media-video/ffmpeg"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -m 'not download'
-}
-
-python_install_all() {
-	dodoc README.md Changelog.md supportedsites.md
-	doman yt-dlp.1
-
-	dobashcomp completions/bash/yt-dlp
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/yt-dlp.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/_yt-dlp
-
-	rm -r "${ED}"/usr/share/doc/yt_dlp || die
-}
diff --git a/net-misc/yt-dlp/yt-dlp-2021.11.10.1-r1.ebuild b/net-misc/yt-dlp/yt-dlp-2021.12.1-r1.ebuild
index 88bf8090cd8a..f6633c012f81 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.11.10.1-r1.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2021.12.1-r1.ebuild
@@ -20,6 +20,15 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# adjust requires for pycryptodome and optional dependencies (bug #828466)
+	sed -ri setup.py \
+		-e "s/'(pycryptodome)x'/'\1'/" \
+		-e "s/'(mutagen|websockets)',?//g" || die
+}
+
 python_test() {
 	epytest -m 'not download' -p no:markdown
 }
diff --git a/net-misc/yt-dlp/yt-dlp-2021.12.1.ebuild b/net-misc/yt-dlp/yt-dlp-2021.12.1.ebuild
deleted file mode 100644
index 79ffad33d94f..000000000000
--- a/net-misc/yt-dlp/yt-dlp-2021.12.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1 optfeature
-
-DESCRIPTION="youtube-dl fork with additional features and fixes"
-HOMEPAGE="https://github.com/yt-dlp/yt-dlp"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	!net-misc/youtube-dl"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -m 'not download' -p no:markdown
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	local sitedir=$(python_get_sitedir)
-	dosym yt_dlp "${sitedir#${EPREFIX}}"/youtube_dl
-}
-
-python_install_all() {
-	dodoc README.md Changelog.md supportedsites.md
-	doman yt-dlp.1
-
-	dobashcomp completions/bash/yt-dlp
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/yt-dlp.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/_yt-dlp
-
-	rm -r "${ED}"/usr/share/doc/yt_dlp || die
-
-	newbin - youtube-dl <<-EOF
-		#!/usr/bin/env sh
-		exec yt-dlp --compat-options youtube-dl "\${@}"
-	EOF
-}
-
-pkg_postinst() {
-	optfeature "various features (merging tracks, streamed content)" media-video/ffmpeg
-	has_version media-video/atomicparsley || # allow fallback but don't advertise
-		optfeature "embedding metadata thumbnails in MP4/M4A files" media-libs/mutagen
-
-	if [[ ! ${REPLACING_VERSIONS} ]] ||
-		ver_test ${REPLACING_VERSIONS} -lt 2021.10.22-r2; then
-		elog 'A wrapper using "yt-dlp --compat-options youtube-dl" was installed'
-		elog 'as "youtube-dl". This is strictly for compatibility and it is'
-		elog 'recommended to use "yt-dlp" directly, it may be removed in the future.'
-	fi
-}
diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest
new file mode 100644
index 000000000000..37024bdf8e39
--- /dev/null
+++ b/net-misc/ytfzf/Manifest
@@ -0,0 +1,3 @@
+DIST ytfzf-1.2.0_p20211208.tar.gz 3230303 BLAKE2B eb1cc05945bc91226d9a3f893edfcfcc5d8544ac2607d6bec7bfc5dd4a8f4b0c01e7387a73d82d148e908e727a1f2809765c9e21e13ca9e7de947c68c1a28f10 SHA512 f87dea2afb706ec9ea23fab3fa02833ddeff7261807f8e2e77471829fe05d293644c6b1d75660cbaae798cfdaede5553d1eabcf6b608a08a7a9d2de825ab92a2
+EBUILD ytfzf-1.2.0_p20211208.ebuild 1083 BLAKE2B 9b3075fd59ebea17f97c33072cb8b4200a60698af92eaa30877eb17fc43447caf4827123d157061237b42d65048ad8015e71594f342b0ec18f056d59078b17d1 SHA512 7e5dbe88fd2651dd127c0fa943e72a6c6ed0cb49f1e80b0ab3e9cc5bfcdcea24fba7ad1b93a1899ed8462badee6d0c1bbe6b4d7be0764e5318db953a855483db
+MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/metadata.xml b/net-misc/ytfzf/metadata.xml
new file mode 100644
index 000000000000..b6a91b9d9370
--- /dev/null
+++ b/net-misc/ytfzf/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<use>
+		<flag name="minimal">Skip <pkg>app-shells/fzf</pkg> and <pkg>media-video/mpv</pkg> dependencies (requires custom settings)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">pystardust/ytfzf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/ytfzf/ytfzf-1.2.0_p20211208.ebuild b/net-misc/ytfzf/ytfzf-1.2.0_p20211208.ebuild
new file mode 100644
index 000000000000..0ba10e67d3ae
--- /dev/null
+++ b/net-misc/ytfzf/ytfzf-1.2.0_p20211208.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+MY_COMMIT="dc7b0056e9b84cf786e6e4adda7f91564d1d012f"
+
+DESCRIPTION="Posix script to find and watch youtube videos from the terminal"
+HOMEPAGE="https://github.com/pystardust/ytfzf/"
+SRC_URI="https://github.com/pystardust/ytfzf/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+# fzf/mpv "can" be optfeatures depending on configuration, but depend
+# on them so it works as expected out-of-the-box and allow to disable.
+RDEPEND="
+	app-misc/jq
+	net-misc/curl[ssl]
+	net-misc/yt-dlp
+	!minimal? (
+		app-shells/fzf
+		media-video/mpv[lua]
+	)"
+
+src_compile() { :; }
+
+src_install() {
+	dobin ytfzf
+
+	dodoc README.md docs/{USAGE.md,conf.sh}
+}
+
+pkg_postinst() {
+	optfeature "external menu support" x11-misc/dmenu x11-misc/rofi
+	optfeature "in-terminal thumbnails on X11" \
+		"media-gfx/ueberzug dev-python/pillow[jpeg]"
+	optfeature "desktop notifications" x11-libs/libnotify
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
commit	93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree	b9791a06ab3284e27b568412c59316c66240c682 /net-misc
parent	2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)