gentoo resync : 17.07.2021

52 files changed, 873 insertions, 1278 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a8cebe3539f9..a938578b99dc 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9cbac42c0bb5..15309054f5df 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -18,10 +18,14 @@ AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38f
 AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b573839db7860fd10828f444aef0f08d189a4e129a5545538424c1698e7d9d980cdbb44da2e68ff73dd0c75 SHA512 81747f6e6b4142b341797a8b2e9b212a48870d8db661669759020cc4c3ab0b66996a37dbd35afaa842dc00cd43aa834d3146021420b3f29b0d2f8b6e11d3fca7
 DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2 SHA512 bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051
 DIST asterisk-16.18.0.tar.gz 27843069 BLAKE2B 643c371b4747111e233c0758efb529e7f54f1deeff10e65fb05f3a1a58c4ba5c139bdb583d2a2552e29aacac5d0f3980fd9aeb19fda2513843fbe0c849dec217 SHA512 025a30a1eed1d2cd14eb1345e1e0edfcc23b4c517e0d33da7d06d97b3ffa3c9ce9c2fe9449109eefade6d62b6205b598fecb69245adb04f03bd53f8482fbd7ad
+DIST asterisk-16.19.0.tar.gz 27872364 BLAKE2B 3510f300c2cd0d67232e5d36752f60a2e67dde988de1ca41b5709dc29aa462f268b49b6c48cf669a7b5fdc0aec038dbfb1d56f7ebe6e9a7285d2cee34b3fc789 SHA512 e50b7c42591ff7fedba3e591a4e696ace62731d81b4d054757a91d8997ee454e949c56a4cf19e37c160407b23ec8c654c1b8af18712d09078e6149b5b22c5040
 DIST asterisk-18.4.0.tar.gz 27926601 BLAKE2B 1a4089ee274732462a8e480d449e4043f7393a6df0b78dd3ea341d3996b9e433066e6d7c53b3ab334db5946a4b847ac02abb4afc5747b6f541cad81a6d58d468 SHA512 024d0a5c75d55fe614ba6219aece62778e9522a0f8365d57192aa5aa22be94d45a3bed69ac14659738e97dd98967533c13096a855366083e6df2b7800e684602
+DIST asterisk-18.5.0.tar.gz 27956264 BLAKE2B 1b2cc477dd37be81b7c1611f1334db8e5095a2d76b1cfa0148072f7c3e9247e3d43da8b0bf502e18c2f553a893b1cc0a1aa9f2ca0942b012d0261c6171536370 SHA512 f31ac2ccd4b9af3ee4ad1c1368519e889d2e3e5b6b22e6f1b6dc020ffbdc8caccf0c03ba620f4a8b6346403abffde23d93fa8c06a6d7d993074edfaa0cf256df
 EBUILD asterisk-13.38.2-r1.ebuild 9682 BLAKE2B 59116ae296d6506307e01059a3925f6a3c5e5faab53ea264817a006b2abea0ba7579377b3c55a254d402a05676e11957715c1c64c160d1aa13a8b4a1d34f3998 SHA512 1c1662f449aa828ac2b9215fffb37e499f818ef94ce4927fa16eb2d5181a60d3489db025641118e94943844ceee646138e95526988a90e87dff7eb5882730410
 EBUILD asterisk-13.38.2-r4.ebuild 10809 BLAKE2B 8e47dca23cbd7496fb96f02b7a5378d30c91843bd0e6742f6bd86e6e358b351a9f8b2b2c20cbca93b341a8b6d53d5c62fa6fd3b8545439ad237337c7d20fcb86 SHA512 2d37bf064823b4e5f9607ef52cd0494829442ef9d765d7fca586555a521030b1ba59dd4f9ae680bfdb33cb386a3308f66243375cc75ad3a4537a3273acba68c9
 EBUILD asterisk-13.38.2-r5.ebuild 10809 BLAKE2B 2a6b5c1c0cfacf96196b1f3d076554277377e1745ebb7cb7d0d801dbbd364e52a23464a78e4fc324895de7efaef495a38ca1db25f257b74f95e4c53fd591363b SHA512 24e91b215398d4d4c7e032b0b7de4aecd87e3764dda842a092a6d31f68dd3bb55df84c32c0bbb95f13aaccb42f700640a336a4fa8df02cc58dae80ef51f92ab3
 EBUILD asterisk-16.18.0-r2.ebuild 9871 BLAKE2B 51969cf5594b9d613d9059d5a4af13f12d9d98f346403a9a388ff330c3eaaa865ffb27adc642e16e6dcf8299c6080f62f0b9e8e47c30a8eacfe0ace39d4ce5f7 SHA512 002af728e030d3cf06eef8f021f7584e522bf3b5eff9f64b50f848b39d6f9eaf74e6e55ee42578c981bfa14841511de8744389906ef4bd23e2cc09e78100b83e
+EBUILD asterisk-16.19.0-r1.ebuild 11217 BLAKE2B 6053903a9a4f68d75f46ce622cc72ebaa752e7518ee0bffc49dadb19d53c4dc83b11888321277ad625f1455e9d1a53e0a435b2bb39f1ec28e0612f7af26efb4a SHA512 6328832a8f58950859ff47a4e374dd4803ea54442531ea6dc5153e0a8e02726cb6e7751025d0ebaafd7ba1160e1ab498eff76d2054e76aa6d2024c74b3244f65
 EBUILD asterisk-18.4.0-r2.ebuild 11234 BLAKE2B 26543c5d82e172047b5fdc3129defa36f2508b791f8a2cd132fb7f78494d12cb406c52ad2cb544589bc959754e35ca7e1edf3117a36857c95a3edda816c1841d SHA512 f2e84a8c058440b529fbaaebbbd13f7a8d85d4bf8af573f4318532ca53e650b153d8610180ffe9bfdf32594387f83b56219332849a404f2626cea8ccfe88ee2e
+EBUILD asterisk-18.5.0-r1.ebuild 11190 BLAKE2B 85fcf0ea3ba693936835c47971d85b962def77113c77fd5d3c878e8f15ae7f8a5cf23d899d6779034f27ae78e7710a3ca27fa5302975d272f67ab11e086b2553 SHA512 2039c5d624abc31fd43840e7fbd57c483f0c8a543d79dce32c690800f88f49f1ee52dd63ee9ea2791afd876b934d87202316852d35833c93e28ba8c4c2b6fff6
 MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-16.19.0-r1.ebuild b/net-misc/asterisk/asterisk-16.19.0-r1.ebuild
new file mode 100644
index 000000000000..9548b400631a
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.19.0-r1.ebuild
@@ -0,0 +1,363 @@
+# 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() {
+	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.5.0-r1.ebuild b/net-misc/asterisk/asterisk-18.5.0-r1.ebuild
new file mode 100644
index 000000000000..1334c613ae61
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.5.0-r1.ebuild
@@ -0,0 +1,362 @@
+# 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() {
+	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/bopm/Manifest b/net-misc/bopm/Manifest
index cb629865ee99..8809df025ada 100644
--- a/net-misc/bopm/Manifest
+++ b/net-misc/bopm/Manifest
@@ -6,5 +6,5 @@ AUX bopm.conf.d-r1 221 BLAKE2B ca4f3eb206dfc18d5714d1e5530bc1d562d1e6262ce26cc93
 AUX bopm.init.d 450 BLAKE2B 22516346f9461d43c364115f04256090a8eef2e83dceb6432ce5e3dafe264fb043c0a15c0531042e0c0fcaf068f74ff15d5b93f85b07a5793c9e0dbaf191ab7e SHA512 14f310b94d66d904b83b475210b5b78730a0d7776b725a46c01f3da1a62599fffd964231133e9f4514d49c770bb406e94ce748cf7d67d2b6a3b174c71b8d0e6e
 AUX bopm.init.d-r2 435 BLAKE2B 824a52870c1724d1e6ce0b3bf319e5c7718d2591e87fb9b1115fe3a07b8ef5f4234d2d935b31701934ba7ab23b6340c068d6843227760fbbea00df4df8a260d9 SHA512 ba5dab8f556108a7e273788a8483443c250f8b8c24d17f522b795b8383d2f257babd9543921f038461f16c34e6103e526c63c8c5d2e00be80f5f8ab0fd8040d3
 DIST bopm-3.1.3.tar.gz 819273 BLAKE2B a0630ca3835467ae15622aa2ec5ee6174b57f43e7d22b1cd03884dcbc2e6d4967118e5c22f238b00a9495f76ec92537d0c4fb517ba7cf3e2c355cee366777804 SHA512 974c243e4fb7e184d3aa570dda2d919cea33df71215746d156b37b7fa3d6f45cd5448c847a7321d4ca22356fffa372f5486e6c3cd958698e173d79731f8ef8af
-EBUILD bopm-3.1.3-r4.ebuild 1401 BLAKE2B 635d6656a807d702aece550b9332f6a87beac0e0bf564a10b759695c036bfaa35fe9fb6281833c506e93717c0167e302a534ba0764d09ba0f151828647d8b096 SHA512 409e437e4d03693b4ed96f2367c8f0ad5e71e1b14125d5cfd6809066694cc7d83206aedc4292af456b2d4819c339bbe222587df44e2ea2401c22175e3e042a6d
+EBUILD bopm-3.1.3-r6.ebuild 1650 BLAKE2B 5b9e970140edbd3abd7d7a24ab8b37e7e31ea7bd3dd50be82bc411bff616fee6199aac9cb983a793fe88580ee75d1d7d4bf50be618a0ad1e5c9d3788f8684f8d SHA512 cb4cb072c6586fcea5be1b2c10b86d9c61bf11e03d7393031ebfc8e50b8763f2c533d2765201e96df8ee0a482519a1629efe1cfca951fb4967ec12d5133a1cc7
 MISC metadata.xml 320 BLAKE2B 0df7bccca17096486031e49410ea661aa6e82e5b9da83c14e193805a2635438487c8d95107b8594a6917983f7976f89fc7a89af6f3cb6cf403e4318d40b09812 SHA512 7df57a22ef6611ea0872ba4b2fd29f6f48d88c18719f032a1f664a4e97945b89d707cec3bd95a1bb9714a4916cc70863a0f1d35e43f977dd829bcdd7ffa329b6
diff --git a/net-misc/bopm/bopm-3.1.3-r4.ebuild b/net-misc/bopm/bopm-3.1.3-r6.ebuild
index d90d4d376cd0..ae8dd5a2d897 100644
--- a/net-misc/bopm/bopm-3.1.3-r4.ebuild
+++ b/net-misc/bopm/bopm-3.1.3-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools user
+inherit autotools
 
 DESCRIPTION="Blitzed Open Proxy Monitor"
 HOMEPAGE="https://github.com/blitzed-org/bopm"
@@ -13,16 +13,14 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 
+RDEPEND="acct-user/opm"
+
 PATCHES=(
 	"${FILESDIR}"/${P}-remove-njabl.patch
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-quarantine-bad-pid-file.patch
 )
 
-pkg_setup() {
-	enewuser bopm
-}
-
 src_prepare() {
 	sed -i \
 		-e "s!/some/path/bopm.pid!/run/${PN}/${PN}.pid!" \
@@ -55,8 +53,19 @@ src_install() {
 
 	dodir /var/log/bopm
 	fperms 700 /var/log/bopm
-	fowners bopm:root /var/log/bopm
+	fowners opm:root /var/log/bopm
 
 	fperms 600 /etc/bopm.conf
-	fowners bopm:root /etc/bopm.conf
+	fowners opm:root /etc/bopm.conf
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
+		if has_version "<${CATEGORY}/${PN}-3.1.3-r6" ; then
+			ewarn "You need to update permissions on:"
+			ewarn "- /var/log/bopm"
+			ewarn "- /etc/bopm.conf"
+			ewarn "to be owned by opm:root"
+		fi
+	fi
 }
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest
index d764cf8f4ad4..68124fbd6a90 100644
--- a/net-misc/connman-notify/Manifest
+++ b/net-misc/connman-notify/Manifest
@@ -1,3 +1,4 @@
 DIST connman-notify-0_pre20191003.tar.bz2 9102 BLAKE2B 7c31de51b21f7cae475b543cf74bba1d969c779f00d1dab7ebce2da6758e1dec6c3c06ae1f0ab133292fc03c1dc61cd1c18c4719311f7a7b65f1771afb097b64 SHA512 6ca8dce104fc5c94af8ef4fab94e44f6a921017d58bbe12660f6bb6a6a0ab6b0808bb7584b75d2acaa486d4cbe718f436fcf7924d6baac97b59a2b77a13215f4
-EBUILD connman-notify-0_pre20191003-r2.ebuild 947 BLAKE2B e35b01aaff21a376caeafe9eb750cccc6594ed80ca06bbac27aa1a447fbb487f722a798b5cfb2dd7f34d568a2bd1d236297f28c0c96d4639b085c57979e850bf SHA512 e49827a6f26fe43145de0acbc0c8985c5b685a8c47c4e21bfd33302c5c6e6d43fb24ecf0ce0c56b765c9f197146af156c9b06340ff779a4e7a356ab55c34f98d
+EBUILD connman-notify-0_pre20191003-r2.ebuild 948 BLAKE2B 0f5626e262c13a4a09e42aaf0b23b9034f5589ea41c6b34881f21a637ee5237ba68b43397649eae60fbe3a2e969ff2e81f176f855bb5f84128f89e8ecb0ce674 SHA512 27463c9750c2c1d39b0580bdc299c4a38d34766411c7f8fe399ac84d4a8e23eb5f2fffea827b07346cae117510fc6bf10d9ca7d2444856684ff11a52f40c074c
+EBUILD connman-notify-0_pre20191003-r3.ebuild 969 BLAKE2B 8c500f60718391885b7d805304390ac4814a06e02b1d720ab41af955fd47f9aeeb4b4d01f04a7d901bce897d844c2423120d875685863a5ff7fed2c44ecb1585 SHA512 c1db99b1759a772a9fec828878c79f6db72cb8eb2d58487e0e5b5d9cf03d46ae352218fc8bb987b2352601ebc71f1dc6c08f189b67747690632765c54dd38897
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
index 7111e0e57bbf..69220f55962a 100644
--- a/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit desktop python-single-r1 vcs-snapshot
 
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
new file mode 100644
index 000000000000..e9555e6bfa2b
--- /dev/null
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit desktop python-single-r1
+
+MY_COMMIT="4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52"
+
+DESCRIPTION="Desktop notification integration for connman"
+HOMEPAGE="https://gitlab.com/wavexx/connman-notify/"
+SRC_URI="https://gitlab.com/wavexx/connman-notify/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
+
+EGIT_REPO_URI="https://gitlab.com/wavexx/connman-notify.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	net-misc/connman
+	virtual/notification-daemon"
+
+S=${WORKDIR}/${PN}-${MY_COMMIT}-${MY_COMMIT}
+
+src_install() {
+	python_fix_shebang ${PN}
+	dobin ${PN}
+	dodoc README.rst
+
+	make_desktop_entry ${PN} ${PN} ${PN} Network
+}
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 7b6842008b4d..a2aa5f75f02c 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-gui-2.2.19.tar.gz 5162823 BLAKE2B 58ed776ac542ff06e288c8af80af256e69d5c7bee637fd3ba539d0601035ea72f8673fb6fa31bef4671d1934d0e5bf06a28aa1281e2e6fb71408e8e09fcfdc05 SHA512 a1ca103f57edc639f60bb447f04b86f439e29500a8446c046cd2fbe5f9267e87394e1f2cd21e8f894c1e520ff0493f16235debba26d3855e1d1a423e2b7bb9af
 DIST gns3-gui-2.2.21.tar.gz 5162935 BLAKE2B ebe60ecd2c2228a783ae8c0aa65213534a81495c7d0afbd5fee7023dcf87e2d25c6575f8b966299f2953e16749ef92d17b07a1cbcac211effb28baca6851aaa8 SHA512 64ec5b49e6dc2ae6af2618b5ad0f06d306c43989802db1f0e30e5fe1ca92bdbb53d011820ed622690f3d97987be94daf3bf9a9b6e6fd4fd04fa6e8bffa846423
-EBUILD gns3-gui-2.2.19.ebuild 1099 BLAKE2B bb40c8d8b4fa70391019d3cdb7c09081db92ea33303185a6d4d5a9811ff48bb0fedf9239ae82da2f60f73907cc6e4bc35cd5bfd7cf230c6b8d632cb8df66323f SHA512 aef0c60f7051d94577c2affc687c924095970e810bdab540ed0fbd690722ab20bd61bc4f844d0b2ab795c91a45f4fede9e86ba87f0696af979c3ece6b9a806aa
+DIST gns3-gui-2.2.22.tar.gz 5043351 BLAKE2B 98bae9bcec74511f33134c0430937788d0ade66648081eda1a394aa032914410d3765a9cbe6c0167911aad9df6392810fdcbaf43d3d27862fbd881d847324d37 SHA512 12a7e014b6f86d643641fc3511387cfe7b9bccf3a8ed9b49e21aaa73f3fd2412a413e83264e306e837b76a5f707caddf08151f95c55a4c2bb197a73cd0429de4
 EBUILD gns3-gui-2.2.21.ebuild 1099 BLAKE2B 4a3c36f87a3fa83d4414161b661c7dfff3c11d7439b408b60644c928826c0d6e9a24c6262d75d287e06d51e6677c3f12bd7a5a79d8ab14fd816165d3c692faa2 SHA512 892e9d0c5292d90b3ff34b300c67134a503e31ca9b5978015df670efa81bd663a080a090029c5532e27d60d6a63902456238d4e92e0709a5af314b2214ad5878
+EBUILD gns3-gui-2.2.22.ebuild 1024 BLAKE2B c3585ad5af11292a85bef8cb9fee2dc74af2943828c493c9aa6f9f8718d60481c44ed0f38baf3daa1337e418a96bb35b919e728e0d233bdcdaf11ad714c7081e SHA512 3080d89cc01c1bde3500e74f2bb5e47b7f3df22c361c00205dc277d489cd6069bdaa34657d036912dddc22c3ec39d9070ec040f44c60f04710d808f7ec148d80
 MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.19.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.22.ebuild
index f682826007ae..4e0c4f33f2ce 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.19.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.22.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
-
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
-inherit distutils-r1 desktop xdg
+inherit distutils-r1 virtualx xdg
 
 DESCRIPTION="Graphical Network Simulator"
 HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui"
@@ -27,6 +26,8 @@ RDEPEND="
 	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
 
+distutils_enable_tests pytest
+
 src_prepare() {
 	default
 
@@ -34,9 +35,6 @@ src_prepare() {
 	sed -i -e 's/[<>=].*//' requirements.txt || die
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "resources/images/gns3.ico"
-	make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
+src_test() {
+	virtx distutils-r1_src_test
 }
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index fd9eb7d840c6..c4e19fdb56ed 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-server-2.2.19.tar.gz 9050750 BLAKE2B 213ab73e53ce1b87ae56739d4b1097c57f9d5b6b8c40aff8f95d4e32c21ef2f5a4689307920a9d2176adfa15c27e0e6cbb9e634934431111c82b0d91b5afb61f SHA512 f42ece97f9da398f3ab62fb80e2b13a5a1e51d1964a65014932b585673964265e361c5f5fdfbc453858fc868bae8cdbb897f93738abbd12c1f3b037595306039
 DIST gns3-server-2.2.21.tar.gz 9054117 BLAKE2B dbbbba4dfe8d084184d38750c67152b99ee286dae88d92c15f153077396cdb008214da89d9161516daef0fbde8de3ba30f6628b9d138799d9ed8c1bc21c17f29 SHA512 adb7b08c88525f8b292688cd31973a00723b8d7989399d861e629bf754408901c2b00c67d425aacd7c234d9bab5d46542024196a4b44066eb1dbf39cf3d521bb
-EBUILD gns3-server-2.2.19.ebuild 1920 BLAKE2B 97df3dc66e92ef74325c411945666fdd2be613ff9f43bc3cad09e7fb891c8a914612c398968b8158848775eeb7fbea32c4dc9499b15ad1a1386acc44404ba561 SHA512 a3ea580135874ec73009f732b72fda4b9b3b785937c9347b13434ed613cfa223607e2d0813c11d895f46195d84170b2569ec085399a6328aa1a307fa75a28c2a
+DIST gns3-server-2.2.22.tar.gz 9011028 BLAKE2B 910711cac6f649d8dd3f7a4d2a9aa77839c9dda9f4280e7079b86857c542907feaa1205b7060ce7cc8956a2fbd220d5393cda319f64ff17eeb5ce476922afccc SHA512 444f483e69a56ab82c053c042b8791711e2fc6b7c800d30c08f2221405418a5c78d780f0f959c80d56ce864230ae17b04639c74a6559c7f5abce65f9c808a282
 EBUILD gns3-server-2.2.21.ebuild 2113 BLAKE2B 843ae1b77b7bae4847d7b2fcd176d550b34fcc26fa4b530ed0d82aaf4667a39480f24903cf5549f3162e136f6dca0d6b8782a6557320868846410b162d9feaf3 SHA512 e10ab97da6dc98892bb04802dfd0d9b56aabf39c9624bcb929c9634c5456f8942fbd793259fd5efe6f6b938cfc3481680f148af28f9aab5d3f641e4fbc0d6c0d
+EBUILD gns3-server-2.2.22.ebuild 2233 BLAKE2B 58febe525be2f40d6294398ae76b7b7f87261b0a97f246512a07db590aa545b7b3dda22f0fb8ffa317c202867dbcb99748bc3e771f660278a67d2f2bf260b2c6 SHA512 ffbde90e9fd1a526f74a5031af44d8550d75e0a051f5aa7f68facf72b01cbbacfef183e898c32472a2187dd9557616a20704a954080e261214fc9c700034936f
 MISC metadata.xml 597 BLAKE2B 1a58fc067ee6fc27e5641b4f4bf1c9324cf68a5c224d379bb60ee0ec83feb8aadab7381d33211a2ade2e66d60814346cebe522faedcdc0c3afd4787719a58fe8 SHA512 68d895f6e9eaa8b642250cbe774098e316a3dd162c0b20b9a2e27f87bad9f8a7ee06b6954c71d71258b7c774b2f3e06abb88cfa0f3de5a9a7852a5f96a4e3583
diff --git a/net-misc/gns3-server/gns3-server-2.2.19.ebuild b/net-misc/gns3-server/gns3-server-2.2.22.ebuild
index c02bcf1c7998..b670345461be 100644
--- a/net-misc/gns3-server/gns3-server-2.2.19.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.22.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
-inherit distutils-r1 systemd optfeature
+inherit distutils-r1 optfeature systemd
 
 DESCRIPTION="GNS3 server to asynchronously manage emulators"
 HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
@@ -29,7 +29,15 @@ RDEPEND="
 	>=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
 	>=net-misc/ubridge-0.9.14
+	sys-apps/busybox
 "
+BDEPEND="
+	test? (
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
 
 src_prepare() {
 	default
@@ -40,8 +48,9 @@ src_prepare() {
 	# Remove Pre-built busybox binary
 	rm gns3server/compute/docker/resources/bin/busybox || die
 
-	# Package installs 'tests' package which is forbidden
-	rm -r tests || die
+	# prevent installing tests directory, see:
+	# https://github.com/GNS3/gns3-server/pull/1930
+	sed -i 's/"tests"/"tests*"/' setup.py || die
 }
 
 python_install() {
@@ -54,11 +63,13 @@ python_install() {
 }
 
 pkg_postinst() {
+	elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	elog ""
 	optfeature "QEMU Support" "app-emulation/qemu"
 	optfeature "Virtualbox Support" "app-emulation/virtualbox"
 	optfeature "Docker Support" "app-emulation/docker"
 	optfeature "Wireshark Support" "net-analyzer/wireshark"
-	elog
+	elog ""
 	elog "The following packages are currently unsupported:"
 	elog "iouyap and vpcs"
 }
diff --git a/net-misc/gofish/Manifest b/net-misc/gofish/Manifest
index 61f19c0531e8..5d9af1318170 100644
--- a/net-misc/gofish/Manifest
+++ b/net-misc/gofish/Manifest
@@ -1,8 +1,5 @@
 AUX gofish-1.2-r1.confd 21 BLAKE2B 3a7fb9d9e622954e7bf2cabc4c3dcfa3b948303810e091f4f8d1a8fc73ba1d7bbe778714b4fb5cb3138c7913b5e74dc45cd964794b602d94149480d70fd8cfed SHA512 869e3a142459145c162cbcb9ae147169bff1158db0027c79c1374bf2f5160827e249ee7a59f3b0721d6392b585ce5a6ca65bdc0950092d8663d3dc9ffb65a2d7
 AUX gofish-1.2-r1.rc 276 BLAKE2B 0a0441c2357a0089aced9143de03c628d0b7b2e8fb1544ac7a3a7b7f0364745866977519654d9ebdc9037307424c981f6bb1627605f581a17cc58bd402d2c835 SHA512 0d8ccd935ce7a4d25be0f67d6095fdbcbd5e11b49aabdbd64cfba5f297cdcbc3db70b3759da4158cca00bf50faa6874c6cc3b2cc51dfebfa3c0b1c65c252db3f
-AUX gofish.confd 429 BLAKE2B 508d6970cf449da1b1b9cf3940d3df024f66ace3ec1f64415eccfab8d3a8c27be54c3b00fbbbc058fc17d583dd863323aad0a88291ffaee2015a6352202a004d SHA512 3a3fc8a701149195d6a18aa38cf22030415fcaf1e72bb9603175345d639a055e7b13130d4a2ef3308eaf946ed4d0c8d21378f8793e344d2baf6dc4c9ad0b7db6
-AUX gofish.rc 607 BLAKE2B 85733d62a2b59a0feb900169cac3ce58f49a40664c7a536b23e4efde8db0888957773ace3cd0f317b821be4532cfd8b9ff7f6641f66cfcac15af6e62bee959fb SHA512 dbae20d8b5bd17e05612bf85acea2a6d0433a7c59670e6d7c2807274da8d8a81a82cdb15eac7dda572be062ef2aa87b62dabc0dfc208013eaeb682f7bc49f9e1
 DIST gofish-1.2.tar.gz 212596 BLAKE2B ca202a55463fbc0b09ed902556d038101b4963ef24920ccd527c2b0c99a2905431c3bdffb2777605010b62db48dd80362ecc68e6ddcfecc7f5f4245bece4d749 SHA512 f7999a5e2b4f80d6402f26d9434f844b26b47b43a6b00055e72ba399426672ed299ca759252d8eb732b23a4c2c369a92c11c0d496f16f4bf3a999398cf6c5bee
-EBUILD gofish-1.2-r1.ebuild 638 BLAKE2B 6eea9492afa5815f033e3a15331980c733c4725faeb907261c22caaef6936ac3269e4d970c6e3e45a37140b2ff65855c8a9cb5af0cfe26f03e09e8ecd9851f71 SHA512 3022adbcf217df44bad004f97a97ea3c965e61babdf47d3fc4715f4d9f9ae7da3325458a234f0bab6a19f5eb77112e6660e3854945eff386164f2c5419473424
-EBUILD gofish-1.2.ebuild 652 BLAKE2B c75e3dd069dc503b10b0eac2a817607a272587062562a0b0cf5cfe3abd2fc2f770bfb1968c341d5da1f54322959f4e02c4087f76a7ccb80fda78eab6d81efdc3 SHA512 0e85d33f0c2fb1aafb733d8f4aaac19329865f0c66e4224c686caea4aa27e790e3a1e7420f1912315323ed8664354d93da2b2bc044347a7ab6a73bb42dc72d37
+EBUILD gofish-1.2-r1.ebuild 637 BLAKE2B b5afbe1797212677f509b6cdbb0cd948f3d3cff76f5becbe44968931182b9e7c995dee9261789dc3f1617d7bd756ef70effc34dc0307036527caaa955523b4c8 SHA512 55b4ce851b73d818a2b0c0d571901f66688dbd316d73f4f9d81bc513a56a196aafb73c521972d4349f071f4e7be4aa9bc17380bec07d4c488516ddd9b12ef8f7
 MISC metadata.xml 466 BLAKE2B 5cfa732e72370b818e728f16af957fcd57c4a10d03dca70bd83014074d659e2a695752a4f3bb536b30eca784b812004638fae7d7fb25cb1381b18c7881220aaf SHA512 957563aed285486e3453274fcb2a50f3492aee99f537f6028f8cedc95a88d033e7c0639dca64e34048fd6889c3148483a886e8f0e10063e85445febdea41ddc0
diff --git a/net-misc/gofish/files/gofish.confd b/net-misc/gofish/files/gofish.confd
deleted file mode 100644
index af244521a7e7..000000000000
--- a/net-misc/gofish/files/gofish.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Config file for gofish Gentoo start-script.
-# Should be stored as: /etc/conf.d/gofish
-#
-
-# Application name
-GOFISH_APP=gofish
-
-# Path to gofish executable
-GOFISH_EXEC=/usr/sbin/gofish
-
-# The gofish config file
-GOFISH_CONF_FILE=/etc/gofish.conf
-
-# The start options
-GOFISH_START_OPTS="-d"
-
-# The stop options
-GOFISH_STOP_OPTS=""
-
-# The reload options
-GOFISH_RELOAD_OPTS=""
-
-# The pid file
-GOFISH_PIDFILE=/var/run/gofish.pid
-
-
diff --git a/net-misc/gofish/files/gofish.rc b/net-misc/gofish/files/gofish.rc
deleted file mode 100644
index 5667b78a7c1b..000000000000
--- a/net-misc/gofish/files/gofish.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-#
-# Startup script for the Gofish Gopher Server (for Gentoo Linux)
-#
-# config: /etc/conf.d/gofish
-##
-# use: rc-update add gofish default
-#
-
-opts="start stop"
-
-depend() {
-       need net
-}
-
-
-start() {
-       ebegin "Starting ${GOFISH_APP} "
-       start-stop-daemon --start --verbose --pidfile ${GOFISH_PIDFILE}  \
-           --exec  ${GOFISH_EXEC} -- ${GOFISH_START_OPTS}
-       eend $?
-}
-
-
-stop() {
-       ebegin "Stopping ${GOFISH_APP} "
-       start-stop-daemon --stop --quiet --pidfile  ${GOFISH_PIDFILE}  \
-           --exec ${GOFISH_EXEC} -- ${GOFISH_STOP_OPTS}
-       eend $?
-}
-
-
-
diff --git a/net-misc/gofish/gofish-1.2-r1.ebuild b/net-misc/gofish/gofish-1.2-r1.ebuild
index fa82bccbe174..ab81b6ae1b8b 100644
--- a/net-misc/gofish/gofish-1.2-r1.ebuild
+++ b/net-misc/gofish/gofish-1.2-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
 	acct-group/gopher
diff --git a/net-misc/gofish/gofish-1.2.ebuild b/net-misc/gofish/gofish-1.2.ebuild
deleted file mode 100644
index 6ab8823d84a2..000000000000
--- a/net-misc/gofish/gofish-1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Gofish gopher server"
-HOMEPAGE="http://gofish.sourceforge.net"
-SRC_URI="mirror://sourceforge/gofish/${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-
-pkg_setup() {
-	enewgroup gopher
-	enewuser gopher -1 -1 -1 gopher
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		--disable-mmap-cache
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc Configure_GoFish
-	newinitd "${FILESDIR}"/gofish.rc gofish
-	newconfd "${FILESDIR}"/gofish.confd gofish
-}
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 573214c62b28..492dcbd9b33f 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,3 +1,3 @@
 DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a
-EBUILD gsasl-1.10.0.ebuild 1779 BLAKE2B 416e387229cc0a178d948053793d7f6c010f32cae055900323a5152d1863e706bde9659dabf9ca96559e1c88711366dd7d840cf1b40fa45b74990cd39c21b2e3 SHA512 dba3b09d9e235753231b83ca2689018336c17d063b98ed485a490296df56d29f436a8f4f8f20bb97adcacef745f876522ee722ad69d38b51fea4980543bc6327
+EBUILD gsasl-1.10.0.ebuild 1786 BLAKE2B 1e1dc3cf3ea470466f85523c7d886d1081f0d81a6efe45092a8651e6ac21b6a00f464d2e5477e7a57af704e6471f82ec40e258a8cc1bdc7aa64e0115a7192e2a SHA512 affca58c28af42840e3649f69d901b1cddf7320cb89ea587a4b252a1b5b7ff5281374245dcd053f8caa8bcea38380af5678ade58856e1457a878be1ad915099b
 MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0
diff --git a/net-misc/gsasl/gsasl-1.10.0.ebuild b/net-misc/gsasl/gsasl-1.10.0.ebuild
index a9891b41bfc4..93ca9ea43387 100644
--- a/net-misc/gsasl/gsasl-1.10.0.ebuild
+++ b/net-misc/gsasl/gsasl-1.10.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
 
 DEPEND="
diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index 8f61d2eb07fb..82f32c5e4b9c 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -1,5 +1,4 @@
-AUX ices.initd 328 BLAKE2B c2084fe4a4885cddc5b5c449144029575889801dff93cbb41933341a07eefc39731b66d749ebec24cdf077163211e490ad8e92c66efe6c4e489b5d78a3f91a4c SHA512 55ad0dbde053d3d2b666e597b4720511c67adbd445b0c98fa1d096c400b77e1ed181b62859cdc97a071097b9abc194fea315052b35316537dac2f2d1cbf1b282
 AUX ices.initd-r1 307 BLAKE2B 3dc8638cb74d79ab772c3618812fac27ab856f74e39c8e5b6a8dc211ffb842d474ff4177ab7e450f542011cbdf66d7bd1e956570cd77ae4768ee3f8375e0bfb1 SHA512 de3aa2919cb715c6036d1b993275560819528e8c6d616362e414e9bc6cf77a67393f68c1643ebfac1b43e8d3bf2ce3bde004894921d8bfdf66eb667fbaa7bae9
 DIST ices-2.0.2.tar.bz2 293818 BLAKE2B d037c6ce6e5d009a12fd9d8efba321b87562a0d492a5191a93b3ff991c1252af1aaa21c41b8171d6eaa9f518712d893b187765cab5a7a9de3560231ec4315b67 SHA512 ff257b478a7237886ba59bf7d1a494ebd4c7c12fd74e8e10c00ea65710249ead1b5b1ae8d9540fab05f2e4486949c6e350f3da59a1d1bf261397ca257806b2c7
-EBUILD ices-2.0.2.ebuild 861 BLAKE2B d29f4dd5774c568ea6d180621f971bc01c09788bddfa67b3e12b70926ba71546afaedb24c0995497996ceb114a85d8d9fba788d70486278e607f09393248b352 SHA512 30755da6e5409c9f61f79f27938e6fe4f044a13fa667e7901f7bb2824faa596a4b507e033a65405192884b76e6e891f89c957209d37b12ba64c489a6016e20ba
+EBUILD ices-2.0.2-r1.ebuild 835 BLAKE2B b3b27868fee36daa93078f030352758504ff9b60085fef4a1cbe73524c5ff2f7d83192832684f2f1f4bfe63f160daaeb884053796ca3a20804f0ed98a676705e SHA512 f95065d4985d16f908af3f15a316ef91705382e7de190464e0a63c851997f7fbfeb9896847cd7c85d8b8ddb661a1ad2122e0eebbd7d60635c796a57f86802855
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/net-misc/ices/files/ices.initd b/net-misc/ices/files/ices.initd
deleted file mode 100644
index ada3b4943e28..000000000000
--- a/net-misc/ices/files/ices.initd
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting IceS 2"
-	start-stop-daemon --background --start --pidfile /var/run/ices.pid --make-pidfile --exec /usr/bin/ices /etc/ices2/ices.xml
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping IceS 2"
-	start-stop-daemon --stop --pidfile /var/run/ices.pid --name ices
-	eend $?
-}
diff --git a/net-misc/ices/ices-2.0.2.ebuild b/net-misc/ices/ices-2.0.2-r1.ebuild
index 34319a5138bc..001620dd1b72 100644
--- a/net-misc/ices/ices-2.0.2.ebuild
+++ b/net-misc/ices/ices-2.0.2-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit user
+EAPI=7
 
 DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding"
 HOMEPAGE="https://icecast.org/ices/"
@@ -12,18 +10,16 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ppc64 sparc x86"
-IUSE=""
 
-RDEPEND="dev-libs/libxml2
+RDEPEND="
+	acct-group/ices
+	acct-user/ices
+	dev-libs/libxml2
 	>=media-libs/libshout-2
-	>=media-libs/libvorbis-1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewgroup ices
-	enewuser ices -1 -1 -1 ices
-}
+	>=media-libs/libvorbis-1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf --sysconfdir=/etc/ices2
@@ -33,7 +29,8 @@ src_install() {
 	default
 	insinto /etc/ices2
 	doins conf/*.xml
-	dohtml doc/*.{html,css}
+	docinto html
+	dodoc doc/*.{html,css}
 	newinitd "${FILESDIR}"/ices.initd-r1 ices
 	keepdir /var/log/ices
 	fperms 660 /var/log/ices
diff --git a/net-misc/ip-sentinel/Manifest b/net-misc/ip-sentinel/Manifest
index f7f477daf5c7..1f0cf863a9ff 100644
--- a/net-misc/ip-sentinel/Manifest
+++ b/net-misc/ip-sentinel/Manifest
@@ -3,5 +3,5 @@ AUX ip-sentinel.cfg 278 BLAKE2B bf582820bb9a22a0cb3e5b82ae934697c77d9f777e31ae1b
 AUX ip-sentinel.conf.d 357 BLAKE2B a8f08e6c63e4b1413f9021985086a573c4691c70f3d2f7447e0f23a4bfc80253b32971fff473e7ca1c71ee1f7bed192d2e8cd1ca01385153d156dc4bb1a25e7d SHA512 c35614e812cc0b3caea671cf2703493030f6de96f8b5afc80455c93f3e6181ddaf7eb6c22d8b63244f219b506db4bddfdf9792bf89ec17d7c56d274d003d4506
 AUX ip-sentinel.init 1047 BLAKE2B 3073e1145b94e93b08400a06ed7a0f0ba4a7d11bd996f4daaf3e27ca857dd2b5c74d30e644ebdc3a5fa1911ef378d3a9306a011d293f5d46d25f989c5f3ac44d SHA512 89729f42d31a81902e957e67089c0e3ead7f8e8f9554ef787bd6c05f210f231d56812a5dcf56d5be58c360dd31fa38873dfa17d1ae0423a80d1e93055853ed75
 DIST ip-sentinel-0.12.tar.bz2 165803 BLAKE2B 5b77dc771c432ddb556cc30cc9fce4226fed47958930cad4364af63146f8feeb5177542bccecbd276161acaa2232315022a59b8b83ba7763523886b4cb82b364 SHA512 dfa025fd96260073903ffe33dbaa5a146658dee2b8cb9bc04da0894a8de83207971a7f1e731128e42a0421052cdc352ed43a0298916f521d5f230533266e5077
-EBUILD ip-sentinel-0.12-r1.ebuild 2179 BLAKE2B aed07a13e13ad7502d8f7b8675ae23858a49d21466a459f5c3e8d131b803c432883cbdfe93b4d760a357e12d72343819db9ce9361b9651e8e420a13e50ac5796 SHA512 328522239664f4f0f726bd46184e4df20e5d131f3f0de777407c6d6b10253cff3f1c3f5556cfd2efbd5ac2d374418c6389d949e176274c5eaed827bd8f6e7492
+EBUILD ip-sentinel-0.12-r2.ebuild 2144 BLAKE2B a30287f1ab38cee2d4f353644cae1d9b160bcf5eafb7c7e0df2c27b1f7f4c50ffcafde662ee48bc735a1cdddc4edede172c4f8233761af8b828f4b4aec9044d6 SHA512 7b4fbb37bcb9f541a389def64766a5b76e87f7ae22a93dde1fcbc0249827c2ea84a8b1285f051a37d3970af79acb985c7d1e7b06e66557c163c87278d89db450
 MISC metadata.xml 1303 BLAKE2B 7e42bf502035f8efb315fa524c938ff417f26dd88042ee673ffc9ed7aaa7efa52ef7a7ea08b7576bf32b8e213b6107c85b633967c261ead2349e78674793a36e SHA512 9ca404d2b97faf88cf40cf991584dfb1888e78b41817cc6dacfb2ac2bf13afdbb9c8496f61236e85ce2932c12d889975758108df0229760a16fa4478e5c0ffed
diff --git a/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild b/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild
index 2cd5fcce6a09..44c2ea9d4979 100644
--- a/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild
+++ b/net-misc/ip-sentinel/ip-sentinel-0.12-r2.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit user
 
 DESCRIPTION="Prevent unauthorized usage of IP addresses"
 HOMEPAGE="https://www.nongnu.org/ip-sentinel/"
-LICENSE="GPL-2"
 SRC_URI="https://savannah.nongnu.org/download/ip-sentinel/${P}.tar.bz2"
+
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-PATCHES=(
-	"${FILESDIR}"/${P}-fixed-dietlibc-compat-stuff.patch
-)
+PATCHES=( "${FILESDIR}"/${P}-fixed-dietlibc-compat-stuff.patch )
 
-pkg_setup() {
-	enewgroup ipsentinel
-	enewuser ipsentinel -1 -1 -1 ipsentinel
-}
+RDEPEND="
+	acct-group/ipsentinel
+	acct-user/ipsentinel
+"
 
 src_prepare() {
 	default
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 123d55131d84..54c9c025a60c 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -2,7 +2,7 @@ AUX mikutter 137 BLAKE2B f76eb22d6492f8737ce7de92068f551ece304a7d983a922555db1d6
 DIST mikutter-4.0.6.tar.gz 2322108 BLAKE2B 46d0cda2bc173ee971e516f017f66e26e9f7a4abd7330111ef66cd40bd0c6dd407b3d6988fa5955ca33a2c375cb77b4c234c8439dc27b6baf43dfcc9a34f4052 SHA512 16dca21bf7f989d2af71a8acc26816dbd7ebff7866b65d4c376b87cf2ba7757d8978a25483cb548448e3341c51d7767b638775e2696f64484b4f5ec8cdce050e
 DIST mikutter-4.1.5.tar.gz 2331485 BLAKE2B 25113ed59cad43094b77bacdf2e42079d9fb5a641a0b2e7ac9529e66183b6f7f953182350cf1d7f8703c10dda0a973edddd54b6c092fc3bf4c3ffe1cc243c2bf SHA512 a8d4be8fb4bf73a9b383ee0d18a6a6c91b6a4ad4ff5837c483da6274b70e4390600d729e303e00a3d4068791e80e0c83619760a3b885cbc4e3717eefb48b3c7c
 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
-EBUILD mikutter-4.0.6.ebuild 2842 BLAKE2B 3e58510c4bfbbb648fe4d635f706305052fc3e45856749f7741b36b4720ce928193822969f8489d1af2babc838a2d21d1845a3d07935027d327ff0bcdc9304b4 SHA512 6951f54995cad1162278b876b9cb7665c5154093d56dd9731184a999a8bca69aa836ccd2273ebaa4a4b80c30dcdc9936fa0c9a28d2fbd6e42ad01fdeafc060fb
-EBUILD mikutter-4.1.5.ebuild 2913 BLAKE2B 62aab5d7da3e7a3c823594d5f530e4bae3e4df538e13ddfc36433e3617c19885e8e2cb7dcc68f7cbfff6f0f2234b32d2b19557b073fb1772030231de69e8dee7 SHA512 5b7859c8371e92ad97d0312984cd2029c517a6f1c8e44769f4e2993072b2e710ff6f052966a023929b8408ae83e49268e63c715461fb2fd3a1a0184b1b4b8abe
-EBUILD mikutter-9999.ebuild 2842 BLAKE2B 3e58510c4bfbbb648fe4d635f706305052fc3e45856749f7741b36b4720ce928193822969f8489d1af2babc838a2d21d1845a3d07935027d327ff0bcdc9304b4 SHA512 6951f54995cad1162278b876b9cb7665c5154093d56dd9731184a999a8bca69aa836ccd2273ebaa4a4b80c30dcdc9936fa0c9a28d2fbd6e42ad01fdeafc060fb
+EBUILD mikutter-4.0.6-r1.ebuild 2842 BLAKE2B 368b17c9ada5dd40769217aa855a0d0a15effe69e57079dce86a0367a9b260ab0af3b554a755e052767978056bbf796de8fd222cfc487b99ba962b693596ae79 SHA512 ce83f8171810471109b22af7b28361af1bb787e4827431028e1b8f13dc0b3b2a079e8f28269c408c0726388515108f584cf45fc371c08eb6a5eb174ad1f161c0
+EBUILD mikutter-4.1.5-r1.ebuild 2913 BLAKE2B 83da434712c11500321e94f2ca68b8fe9ff64007762475ebc254d3d5c34028a38ace04cb0a87d25f7d8480cb3152605f0041afc7b0a7d384f4c6673a40a62aef SHA512 8721c6633be245ad1fcb2a0a1b06462fb0acf5081b693a75c5838614352042ef54d6dfc68bc8b0d2c509dd571ae2964a2572cedc3a2051c472bfcfa78b4ae089
+EBUILD mikutter-9999.ebuild 2842 BLAKE2B 368b17c9ada5dd40769217aa855a0d0a15effe69e57079dce86a0367a9b260ab0af3b554a755e052767978056bbf796de8fd222cfc487b99ba962b693596ae79 SHA512 ce83f8171810471109b22af7b28361af1bb787e4827431028e1b8f13dc0b3b2a079e8f28269c408c0726388515108f584cf45fc371c08eb6a5eb174ad1f161c0
 MISC metadata.xml 214 BLAKE2B 8c736c7fcedf2d2c712e43cb3a7850254057fca17f9ec3647598d76e726cd4eea542ce40b339abb3f96a56b17a3f355d9508a5980dd7c7e243bbc19b68a6a5b7 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3
diff --git a/net-misc/mikutter/mikutter-4.0.6.ebuild b/net-misc/mikutter/mikutter-4.0.6-r1.ebuild
index 64060b71b8ef..0a87e3d4a471 100644
--- a/net-misc/mikutter/mikutter-4.0.6.ebuild
+++ b/net-misc/mikutter/mikutter-4.0.6-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	libnotify? ( x11-libs/libnotify )
 	media-sound/alsa-utils"
 
-ruby_add_rdepend "=dev-ruby/addressable-2.7*
+ruby_add_rdepend "=dev-ruby/addressable-2.8*
 	=dev-ruby/delayer-1.1*:1
 	=dev-ruby/delayer-deferred-2.1*
 	!<dev-ruby/delayer-deferred-2.1.3
diff --git a/net-misc/mikutter/mikutter-4.1.5.ebuild b/net-misc/mikutter/mikutter-4.1.5-r1.ebuild
index 37c694971242..25c639c91cdf 100644
--- a/net-misc/mikutter/mikutter-4.1.5.ebuild
+++ b/net-misc/mikutter/mikutter-4.1.5-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	libnotify? ( x11-libs/libnotify )
 	media-sound/alsa-utils"
 
-ruby_add_rdepend "=dev-ruby/addressable-2.7*
+ruby_add_rdepend "=dev-ruby/addressable-2.8*
 	>=dev-ruby/delayer-1.1.2
 	!>=dev-ruby/delayer-2.0
 	>=dev-ruby/delayer-deferred-2.2.0
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index 64060b71b8ef..0a87e3d4a471 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	libnotify? ( x11-libs/libnotify )
 	media-sound/alsa-utils"
 
-ruby_add_rdepend "=dev-ruby/addressable-2.7*
+ruby_add_rdepend "=dev-ruby/addressable-2.8*
 	=dev-ruby/delayer-1.1*:1
 	=dev-ruby/delayer-deferred-2.1*
 	!<dev-ruby/delayer-deferred-2.1.3
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 874a3ec7e0a7..bb6e2fda8dd0 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,7 +1,5 @@
-DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5f0e962c472b109afc1a54854d30123c4732f9b9e8ba28d9324508894faaa78f3b484c99c0063d1ea2f499b7 SHA512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b
 DIST putty-0.75.tar.gz 2731167 BLAKE2B 529b2c65853b8f915afd0563c1a055244d919794a71cff43573910fa2d4a81efca060c12320a0d07ddf3b03064b7e27d00ae396d6a2c1e46dc1a06403cae5c17 SHA512 3dbc15485008a98daf60236061253e66b94a6e5da123fc84c5f0ac006c84e17c70fe748987677775e3b54a12297eb826cccf70a4fc039b633bc2d512938b3028
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.74.ebuild 1700 BLAKE2B 52a4eebdf6da39c2ec1ed1a9e0ca292a971c7c999715d9fcf963a81da7a5909504de04253be6ff5cbf6f867dbca775976efebd6d406a5eaf052c0032b226ac30 SHA512 74cfeb3aaee1a92541c76787181ede728f1622ddbae203282d021770df6ac12bb3ba968314919c3bfff8e1e028ce7c9ff9f366cceb06a48df4e2b8ae0413ef76
 EBUILD putty-0.75.ebuild 1700 BLAKE2B 52a4eebdf6da39c2ec1ed1a9e0ca292a971c7c999715d9fcf963a81da7a5909504de04253be6ff5cbf6f867dbca775976efebd6d406a5eaf052c0032b226ac30 SHA512 74cfeb3aaee1a92541c76787181ede728f1622ddbae203282d021770df6ac12bb3ba968314919c3bfff8e1e028ce7c9ff9f366cceb06a48df4e2b8ae0413ef76
 EBUILD putty-9999.ebuild 1746 BLAKE2B 112f9ce331c974edf1a5e7e9dd778bed19e5072be100302fe601a92cc9456be965dc0f2cf015a4630385b8c766b12bc497ef4504ee2bbcafea9e8dfe7e812f4d SHA512 87cae42323cbc63e4a739b7eed25925ed91467a5b06fbc68721f6f7afaa7af3e23e94428d1a497a7509fb44673d101b7b6b58e7f5140fa1bd008f1f95212ffab
 MISC metadata.xml 1010 BLAKE2B a21ec4ee14bf1b61343ad8f504ee9ccfcf090ad6212c5ffe570b44e3443baeacb1fc3dc3080ce8611f730edf54e8a459d4669fc1bb7ca0c52b35567facab075d SHA512 1649e0d50d4f8318c2869a7e6ebb697f05c16f5e4e9bbe1b35ba38c1513c4bb14f2d4283fd3fd91fe30ab9bcf318f619d7c39ee1bcc3c476b95555e2939b2c8b
diff --git a/net-misc/putty/putty-0.74.ebuild b/net-misc/putty/putty-0.74.ebuild
deleted file mode 100644
index 62ac436ba4c6..000000000000
--- a/net-misc/putty/putty-0.74.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 sparc x86"
-SRC_URI="
-	https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2
-	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
-"
-IUSE="doc +gtk gtk2 ipv6 gssapi"
-RDEPEND="
-	!net-misc/pssh
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		x11-libs/libX11
-		x11-libs/pango
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3[X] )
-	)
-	gssapi? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-"
-REQUIRED_USE="
-	gtk2? ( gtk )
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${S}"/unix || die
-	econf \
-		$(use_with gssapi) \
-		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
-}
-
-src_compile() {
-	emake -C "${S}"/doc
-	emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_test() {
-	emake -C unix cgtest
-	unix/cgtest || die
-}
-
-src_install() {
-	dodoc doc/puttydoc.txt
-
-	if use doc; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	cd "${S}"/unix || die
-	default
-
-	if use gtk ; then
-		for i in 16 22 24 32 48 64 128 256; do
-			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
-		done
-
-		# install desktop file provided by Gustav Schaffter in #49577
-		make_desktop_entry ${PN} PuTTY ${PN} Network
-	fi
-}
-
-pkg_postinst() {
-	use gtk && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && xdg_icon_cache_update
-}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 1086e40023b9..d9ab1c94675c 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,13 +1,5 @@
-DIST Remmina-v1.4.13.tar.gz 2519879 BLAKE2B ff2410ffbdea4509866b41e47eaa8caafb7f45091047eff9a830590b7a04c25cbbdec5788ccf9f35afdee613722e74e7595b73b4c3c8eea2fa3ffb4e09411d99 SHA512 cf82dc90f021635bcde906a73a2ad59087fe7cbe1bdd69a828ffc1e04ea0cc1bfa23386b70c36df85ae41dfa17f2d4379bedff29c03d9838c6ac18347e06b6dc
-DIST Remmina-v1.4.16.tar.gz 2615347 BLAKE2B 5cff71d94bf66dd0116be739646c33a601a83deb8fef1cfcddf9c197eb34458ea97f6e45e96e7e0bab7fbfb6d95c6150e5c72c6d5aae5f23bfedc8f080e00ade SHA512 a9b42ba95ab9c5f985c5c359d0fb138d73ca5f0f9199cb9e84e522d1e11c50f9fe2b8c943d64242e367f4185fd9eb0c764321ba9d4ab9a09c5c5c1dc37c0ba78
-DIST Remmina-v1.4.17.tar.gz 2618015 BLAKE2B 2b4fbc6cd80dba7d73d8ce7cb5627b6fb67c0cc0c76f124da629f2ebee2c5d0542c3e6b626cdc19630f49f1227fada7e5344ff2f49eeabbc8709c50f5d1f58eb SHA512 e833a4c602ce68354b6d65ea0d7e32c19a242bb72d5fcfd558106b6f53d9397b278472070bc53579185ebbc8fb2ea88718e05f05fdb743df5b46051eb3423d78
 DIST Remmina-v1.4.18.tar.gz 2578470 BLAKE2B 341352b6661a640cf99c5ca6a79f3f1a77cbd0a6027e4bd4a6360f2ed17e1a5abb58ca8a8638988842efb7218072e5cb4a3e56e0f35b7c06f9094c0e00d72689 SHA512 98f14caf39afd8531ce1af2e5f9addc1c68fa12eb66845f0436eec623e8bdbdd75ec14c59544e6e6414b2e4c522ac2b8213fd30561a902768d805ceb1d768f69
-DIST Remmina-v1.4.19.tar.gz 2452278 BLAKE2B 7f5ef0f0a13a73eb4893c4a49f6f97eb0141e3c385306503e63f81efdb5d85453ba9d5f030e6e73502c8ad314d701422e4e03d2ce9e69c5fb8003f01a08a5a42 SHA512 c07cee297aee28e772e39bc600144f946f6f315b6e48077c2f756125e51b1e82bc0cee39b9e81ba4568608b14bfd9c7dfc633240eb64245bdeeb537bc812dc6a
 DIST Remmina-v1.4.20.tar.gz 2489535 BLAKE2B 8d557dfc8629572d3fc930aea85e62fdc6294521c4997e1d211b8aac385f1bab3a13f082cff7f40e3add839d3922b4884736a9a50eb3e043df4c6314d3e456c5 SHA512 27a4bfbcb77f1cebe527bdcdd78f1dedb703c888c9452bdac7162e18e7eee0bf2e49143f3a3f98d451d4c1cf7cd6b9f89ae9fb67755930501e4f08e08d311892
-EBUILD remmina-1.4.13.ebuild 2491 BLAKE2B 70f498068e3529e7e8a3d46d937f4a76faee8b5eae69d12f07a5c8785f5c2c496f4331d5770cb6e4cf6b408fae859c14a40573892484a1a75dcc97b83163d108 SHA512 d142b8d3bbf6b4520a77564d6be9e01cc02e9df66e82ac38ef70f2e1cfce9378418f107d4859416606bf5aadc108792bc1039b4f63161ea97cb2d7ca0546d470
-EBUILD remmina-1.4.16.ebuild 2526 BLAKE2B ca1d007130661aafd360d7e11275b4227580a6f252a605b5be69f857e6f4815d58386592d23675817b143602450015c26e8cec88530d694ad34dd5e8dd347faa SHA512 52b8ac1fc61154b8359b1a037717a0f485439efcfe3f3261879d17701d46a48ea3641c130b84f77feb8afc093710d1cceee13cc173cc26dd88a6a7bcfadca7bb
-EBUILD remmina-1.4.17.ebuild 2526 BLAKE2B ca1d007130661aafd360d7e11275b4227580a6f252a605b5be69f857e6f4815d58386592d23675817b143602450015c26e8cec88530d694ad34dd5e8dd347faa SHA512 52b8ac1fc61154b8359b1a037717a0f485439efcfe3f3261879d17701d46a48ea3641c130b84f77feb8afc093710d1cceee13cc173cc26dd88a6a7bcfadca7bb
 EBUILD remmina-1.4.18.ebuild 2524 BLAKE2B be9d8782355c80121ae005c7d1cebec007604ad6046cd66f8fb5e6f8ae3bce69d9564e50e24ee0ba14fe03a418b099729cd70cd7914ec3d56bd47dc74d27e6d5 SHA512 2e67e4196ab4966a96e6af90827347dd28824a89593e57ee39c82b67f85783bdd2d900046de7a0e5a21c49bd3e08ecfa1c2f061036832721fa2d4665bd41ff9c
-EBUILD remmina-1.4.19.ebuild 2452 BLAKE2B 49759438820a9042ecc3f7d4e707dafd110f836c88bf97f450c85f3a05e738e95e2f4055e51c695ad59bc36a3cf39113f7f3840807ae64de9192eabe5c063f44 SHA512 e73efd10390baab1341d68eff931eeb633d36128f626028f703eb63a0545d6e379b696b82814e0a9c4d401697abb88c6ef9ed4bc5ed5a5b44be0e8ded6e53205
-EBUILD remmina-1.4.20.ebuild 2434 BLAKE2B f6e1d5209505d3958459c4e66f4bd8fab3436ffbe5a37eac7e5727ab91094f6cbdaac69bfac88c487cb9ddf8cd5397386ddeb74ab6edbad36eca762ff298a72a SHA512 9a13e927c740f733653621eb981012f83c43c6b0e64f7b0c9cdb3aad9659af955987a340c72ca3655cf3813e556f6644739df19fef0380c0571e865d8e5fe7c3
+EBUILD remmina-1.4.20.ebuild 2283 BLAKE2B 59ab932746408a1a0b15fdffa70760b25b68dc80a06b950d59b46a8d916ccaabcb4453d4bb7de2cb79be7fdb4ea2989f3989cbd80d73e11298bc8b5279e472ed SHA512 61acc96a8a3f6222350eff12fcf565f37815273992df0c7de76a56a659665d860d10672a5c3509d7c8aadde8ac5ab4901ebd29f8e4ceccf47fd50d8542b412ed
 MISC metadata.xml 1179 BLAKE2B cd5ed669c77987fc48b69e50632cbdcff804a9eea251b1f2591e47ee22f9e7d0e7922fc23b7b8f8846e15d8d201b9bf177fcba75d3bca75118f912f63ee58f88 SHA512 88b7748273b1cb9e625352a30820fdeb56e78207e5d06049c20406b371859713fcf5a7053578c9df41369ba12d35b3031e1e95919a34529f5f95246727a33c9c
diff --git a/net-misc/remmina/remmina-1.4.13.ebuild b/net-misc/remmina/remmina-1.4.13.ebuild
deleted file mode 100644
index a300a82d205c..000000000000
--- a/net-misc/remmina/remmina-1.4.13.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-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="appindicator crypt cups examples gnome-keyring kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/wayland
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	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 )
-	kwallet? ( kde-frameworks/kwallet )
-	dev-libs/openssl:0=
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex appindicator)
-		-DWITH_GCRYPT=$(usex crypt)
-		-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_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.16.ebuild b/net-misc/remmina/remmina-1.4.16.ebuild
deleted file mode 100644
index e7bceef93c0f..000000000000
--- a/net-misc/remmina/remmina-1.4.16.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-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="appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	dev-libs/wayland
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	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 )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex appindicator)
-		-DWITH_GCRYPT=$(usex crypt)
-		-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_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.17.ebuild b/net-misc/remmina/remmina-1.4.17.ebuild
deleted file mode 100644
index e7bceef93c0f..000000000000
--- a/net-misc/remmina/remmina-1.4.17.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-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="appindicator crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	dev-libs/wayland
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	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 )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex appindicator)
-		-DWITH_GCRYPT=$(usex crypt)
-		-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_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.19.ebuild b/net-misc/remmina/remmina-1.4.19.ebuild
deleted file mode 100644
index 33fd67a9140e..000000000000
--- a/net-misc/remmina/remmina-1.4.19.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-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 telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libappindicator:3
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	dev-libs/wayland
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	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 )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_GCRYPT=$(usex crypt)
-		-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_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-		# when this feature is stable, add python eclass usage to optionally enable
-		-DWITH_PYTHON=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.20.ebuild b/net-misc/remmina/remmina-1.4.20.ebuild
index f0ee1b9f9517..bce90bb5c37f 100644
--- a/net-misc/remmina/remmina-1.4.20.ebuild
+++ b/net-misc/remmina/remmina-1.4.20.ebuild
@@ -7,14 +7,14 @@ inherit cmake optfeature xdg
 
 MY_P="${PN^}-v${PV}"
 
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
 HOMEPAGE="https://remmina.org/"
 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 telepathy vnc webkit zeroconf"
+IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit zeroconf"
 
 DEPEND="
 	dev-libs/glib:2
@@ -38,7 +38,6 @@ DEPEND="
 	spice? ( net-misc/spice-gtk[gtk3] )
 	ssh? ( net-libs/libssh:0=[sftp]
 		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
 	vnc? ( net-libs/libvncserver[jpeg] )
 	webkit? ( net-libs/webkit-gtk:4 )
 	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
@@ -77,7 +76,6 @@ src_configure() {
 		-DWITH_SPICE=$(usex spice)
 		-DWITH_LIBSSH=$(usex ssh)
 		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
 		-DWITH_LIBVNCSERVER=$(usex vnc)
 		-DWITH_WWW=$(usex webkit)
 		-DWITH_AVAHI=$(usex zeroconf)
@@ -94,5 +92,4 @@ pkg_postinst() {
 	xdg_pkg_postinst
 
 	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
 }
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index 74be4ad5a950..90dda1b6fb53 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -2,6 +2,5 @@ AUX scponly-4.8-gcc4.4.0.patch 555 BLAKE2B 0eff2d5cd94f60540dd1bbb6b6f9f1486abbb
 AUX scponly-4.8-rsync.patch 7838 BLAKE2B 1d6191aee86b0e3e75e527dbb1f8dbf631940a34da3f29f36b0e55577555dc9ad02e2e787a8cd53aeab5a28d93da7dd528a486f1133fd7a04b91971774b4b2a1 SHA512 37885c9b46422ac034182f9c9f230b4e806ce8c894ebb6c621f0e2b3d5f46c91db902c2dae6aefe5471907025d400320e4eff37cc7c5cc4c6f7d8c88a38e53f8
 AUX scponly-4.8-sftp-server-path.patch 2692 BLAKE2B ead282d46cb25a6d8606fa65e538142c15dd0be82956c2c8a48c7d46cc9ec59605a4f1c10fc5235acb584945b00ee4c187391d198571d841b45225c328765b49 SHA512 86171549d894426d12eb2f8d65959d1be2e137327c135be31c762820a55256f5c4ac90a01f989c8bffd2b46b275de408912306209b5aba9a94b81dbc06ff5a24
 DIST scponly-4.8.tgz 101687 BLAKE2B aa7250464fa3b51a439d35418c64d49f8595eaac6ffe710137c7c53b96bcf66a5ead38e9520b2cead7a829b57520f988f873eb713d5f52045cba4ef02c8e9b61 SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b
-EBUILD scponly-4.8-r6.ebuild 6863 BLAKE2B 4799a68568747249a5e10d5cf652d85a6740d3f0d322e806662836315565b2113573bc5d376e1369940c6f488948448b564690861f058e42be9e7c2ba941b459 SHA512 59b49748f350181c4d25b5f847ced5d0749e85b7f716f667ce5b83a64681b28c2991365e3ef9d9e8ebd21fab024dac2370a17ec6d914ffdcbcc3bdd11adacb43
 EBUILD scponly-4.8-r7.ebuild 6929 BLAKE2B 6acb6a90fa08450656a9edef983620e89fd0e3f30afdeb3c730d06394be0179d63f1e31f894a84c9d4c21883371518a3ba83669b0065cbfb5c3afbae5327a39f SHA512 13052ec55d53c1d8d919c4e5fb3b781be250d07ea17a9a9f226c694c3c5d3b33019643220db85e723a1bc276c9614a8efe7837b7b2de39a2d03598b1d26c9227
 MISC metadata.xml 1760 BLAKE2B 0e8926cd16ce210ce1545243103305d7c2943fbb0dd41b09d819225aa67995c7c0a3e5d7cc892422480e237d8f9b89b4b95f137abf9a8ed3287c953517e296be SHA512 0a25c9484e1f10839f62d09f2eabd6cee41c70045a6d6e0e321bf6f19b414923369bc4d4aead8828835f81094459ed7230c2ddcec496677a94c276be255381e9
diff --git a/net-misc/scponly/scponly-4.8-r6.ebuild b/net-misc/scponly/scponly-4.8-r6.ebuild
deleted file mode 100644
index 8e34824af99f..000000000000
--- a/net-misc/scponly/scponly-4.8-r6.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 toolchain-funcs user
-
-DESCRIPTION="A tiny pseudoshell which only permits scp and sftp"
-HOMEPAGE="https://github.com/scponly/scponly"
-SRC_URI="mirror://sourceforge/scponly/${P}.tgz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="+sftp scp winscp gftp rsync unison subversion wildcards quota passwd logging"
-REQUIRED_USE="
-	|| ( sftp scp winscp rsync unison subversion )
-"
-
-RDEPEND="
-	sys-apps/sed
-	net-misc/openssh
-	quota? ( sys-fs/quota )
-	rsync? ( net-misc/rsync )
-	subversion? ( dev-vcs/subversion )
-	unison? ( net-misc/unison:= )
-"
-DEPEND="${RDEPEND}"
-
-myuser="scponly"
-myhome="/home/${myuser}"
-mysubdir="/pub"
-
-PATCHES=(
-	"${FILESDIR}/${P}-rsync.patch"
-	"${FILESDIR}/${P}-gcc4.4.0.patch"
-)
-
-DOC_CONTENTS="
-	You might want to run\n
-	emerge --config =${CATEGORY}/${PF}\n
-	\nto setup the chroot. Otherwise you will have to setup chroot manually
-	Please read the docs in /usr/share/doc/${PF} for more informations, also
-	the SECURITY file.
-"
-
-src_configure() {
-	CFLAGS="${CFLAGS} ${LDFLAGS}" econf \
-		--with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \
-		--disable-restrictive-names \
-		--enable-chrooted-binary \
-		--enable-chroot-checkdir \
-		$(use_enable winscp winscp-compat) \
-		$(use_enable gftp gftp-compat) \
-		$(use_enable scp scp-compat) \
-		$(use_enable sftp sftp) \
-		$(use_enable quota quota-compat) \
-		$(use_enable passwd passwd-compat) \
-		$(use_enable rsync rsync-compat) \
-		$(use_enable unison unison-compat) \
-		$(use_enable subversion svn-compat) \
-		$(use_enable subversion svnserv-compat) \
-		$(use_enable logging sftp-logging-compat) \
-		$(use_enable wildcards wildcards)
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHOR BUILDING-JAILS.TXT CHANGELOG CONTRIB README SECURITY TODO
-
-	( docinto chroot; dodoc setup_chroot.sh config.h )
-	# don't compress setup-script, so it is usable if necessary
-	docompress -x /usr/share/doc/${PF}/chroot
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	# two slashes ('//') are used by scponlyc to determine the chroot point.
-	enewgroup "${myuser}"
-	enewuser "${myuser}" -1 /usr/sbin/scponlyc "${myhome}//" "${myuser}"
-
-	readme.gentoo_print_elog
-}
-
-pkg_config() {
-	# pkg_postinst is based on ${S}/setup_chroot.sh.
-
-	einfo "Collecting binaries and libraries..."
-
-	# Binaries launched in sftp compat mode
-	if has_version "=${CATEGORY}/${PF}[sftp]" ; then
-		BINARIES="/usr/$(get_libdir)/misc/sftp-server"
-	fi
-
-	# Binaries launched by vanilla- and WinSCP modes
-	if has_version "=${CATEGORY}/${PF}[scp]" || \
-		has_version "=${CATEGORY}/${PF}[winscp]" ; then
-		BINARIES="${BINARIES} /usr/bin/scp /bin/ls /bin/rm /bin/ln /bin/mv"
-		BINARIES="${BINARIES} /bin/chmod /bin/chown /bin/chgrp /bin/mkdir /bin/rmdir"
-	fi
-
-	# Binaries launched in WinSCP compatibility mode
-	if has_version "=${CATEGORY}/${PF}[winscp]" ; then
-		BINARIES="${BINARIES} /bin/pwd /bin/groups /usr/bin/id /bin/echo"
-	fi
-
-	# Rsync compatability mode
-	if has_version "=${CATEGORY}/${PF}[rsync]" ; then
-		BINARIES="${BINARIES} /usr/bin/rsync"
-	fi
-
-	# Unison compatability mode
-	if has_version "=${CATEGORY}/${PF}[unison]" ; then
-		BINARIES="${BINARIES} /usr/bin/unison"
-	fi
-
-	# subversion cli/svnserv compatibility
-	if has_version "=${CATEGORY}/${PF}[subversion]" ; then
-		BINARIES="${BINARIES} /usr/bin/svn /usr/bin/svnserve"
-	fi
-
-	# passwd compatibility
-	if has_version "=${CATEGORY}/${PF}[passwd]" ; then
-		BINARIES="${BINARIES} /usr/bin/passwd"
-	fi
-
-	# quota compatibility
-	if has_version "=${CATEGORY}/${PF}[quota]" ; then
-		BINARIES="${BINARIES} /usr/bin/quota"
-	fi
-
-	# build lib dependencies
-	LIB_LIST=$(ldd ${BINARIES} | sed -n 's:.* => \(/[^ ]\+\).*:\1:p' | sort -u)
-
-	# search and add ld*.so
-	for LIB in /$(get_libdir)/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 \
-		/usr/libexec/ld.so /$(get_libdir)/ld-linux*.so.2 /usr/libexec/ld-elf.so.1; do
-		[ -f "${LIB}" ] && LIB_LIST="${LIB_LIST} ${LIB}"
-	done
-
-	# search and add libnss_*.so
-	for LIB in /$(get_libdir)/libnss_{compat,files}*.so.*; do
-		[ -f "${LIB}" ] && LIB_LIST="${LIB_LIST} ${LIB}"
-	done
-
-	# create base dirs
-	if [ ! -d "${myhome}" ]; then
-		einfo "Creating ${myhome}"
-		install -o0 -g0 -m0755 -d "${myhome}"
-	else
-		einfo "Setting owner for ${myhome}"
-		chown 0:0 "${myhome}"
-	fi
-
-	if [ ! -d "${myhome}/etc" ]; then
-		einfo "Creating ${myhome}/etc"
-		install -o0 -g0 -m0755 -d "${myhome}/etc"
-	fi
-
-	if [ ! -d "${myhome}/$(get_libdir)" ]; then
-		einfo "Creating ${myhome}/$(get_libdir)"
-		install -o0 -g0 -m0755 -d "${myhome}/$(get_libdir)"
-	fi
-
-	if [ ! -e "${myhome}/lib" ]; then
-		einfo "Creating ${myhome}/lib"
-		ln -snf $(get_libdir) "${myhome}/lib"
-	fi
-
-	if [ ! -d "${myhome}/usr/$(get_libdir)" ]; then
-		einfo "Creating ${myhome}/usr/$(get_libdir)"
-		install -o0 -g0 -m0755 -d "${myhome}/usr/$(get_libdir)"
-	fi
-
-	if [ ! -e "${myhome}/usr/lib" ]; then
-		einfo "Creating ${myhome}/usr/lib"
-		ln -snf $(get_libdir) "${myhome}/usr/lib"
-	fi
-
-	if [ ! -d "${myhome}${mysubdir}" ]; then
-		einfo "Creating ${myhome}${mysubdir} directory for uploading files"
-		install -o${myuser} -g${myuser} -m0755 -d "${myhome}${mysubdir}"
-	fi
-
-	# create /dev/null (Bug 135505)
-	if [ ! -e "${myhome}/dev/null" ]; then
-		install -o0 -g0 -m0755 -d "${myhome}/dev"
-		mknod -m0777 "${myhome}/dev/null" c 1 3
-	fi
-
-	# install binaries
-	for BIN in ${BINARIES}; do
-		einfo "Install ${BIN}"
-		install -o0 -g0 -m0755 -d "${myhome}$(dirname ${BIN})"
-		if [ "${BIN}" = "/usr/bin/passwd" ]; then  # needs suid
-			install -p -o0 -g0 -m04711 "${BIN}" "${myhome}/${BIN}"
-		else
-			install -p -o0 -g0 -m0755 "${BIN}" "${myhome}/${BIN}"
-		fi
-	done
-
-	# install libs
-	for LIB in ${LIB_LIST}; do
-		einfo "Install ${LIB}"
-		install -o0 -g0 -m0755 -d "${myhome}$(dirname ${LIB})"
-		install -p -o0 -g0 -m0755 "${LIB}" "${myhome}/${LIB}"
-	done
-
-	# create ld.so.conf
-	einfo "Creating /etc/ld.so.conf"
-	for LIB in ${LIB_LIST}; do
-		dirname ${LIB}
-	done | sort -u | while read DIR; do
-		if ! grep 2>/dev/null -q "^${DIR}$" "${myhome}/etc/ld.so.conf"; then
-			echo "${DIR}" >> "${myhome}/etc/ld.so.conf"
-		fi
-	done
-	ldconfig -r "${myhome}"
-
-	# update shells
-	einfo "Updating /etc/shells"
-	grep 2>/dev/null -q "^/usr/bin/scponly$" /etc/shells \
-		|| echo "/usr/bin/scponly" >> /etc/shells
-
-	grep 2>/dev/null -q "^/usr/sbin/scponlyc$" /etc/shells \
-		|| echo "/usr/sbin/scponlyc" >> /etc/shells
-
-	# create /etc/passwd
-	if [ ! -e "${myhome}/etc/passwd" ]; then
-		(
-			echo "root:x:0:0:root:/:/bin/sh"
-			sed -n "s|^\(${myuser}:[^:]*:[^:]*:[^:]*:[^:]*:\).*|\1${mysubdir}:/bin/sh|p" /etc/passwd
-		) > "${myhome}/etc/passwd"
-	fi
-
-	# create /etc/group
-	if [ ! -e "${myhome}/etc/group" ]; then
-		(
-			echo "root:x:0:"
-			sed -n "s|^\(${myuser}:[^:]*:[^:]*:\).*|\1|p" /etc/group
-		) > "${myhome}/etc/group"
-	fi
-}
diff --git a/net-misc/sipcalc/Manifest b/net-misc/sipcalc/Manifest
index 74b029d038f6..457a905b2026 100644
--- a/net-misc/sipcalc/Manifest
+++ b/net-misc/sipcalc/Manifest
@@ -1,4 +1,3 @@
 DIST sipcalc-1.1.6.tar.gz 117628 BLAKE2B 6da2a64f63ac9a4a53a588f8d82cfca230ba0f97893d89310ea0d83a8d6cc6b6a4c53fa1dc7ed9ac20b6bd8cc39e479c3b5d35658c58069e561b55d841e3a3ee SHA512 9d2047a6fb6ef177d455f44abea19bab7d0131b16eb2444b2b074e94e776854fa74084ab625d2be9b64d136979ede71722c2e24dca12ff54e4a5bb02f947570e
-EBUILD sipcalc-1.1.6-r1.ebuild 430 BLAKE2B 25591bf6debb2e1789f220aee280e3acd5b7c29bf588a230b1da657a3403cd2eb989095da8d2d8b4ce4ebba306eefa41c3a02f68d569838e018c7557c1ce2997 SHA512 071827ab68fffb2b7077db0446112928e5fd786104cff39b848a0cfc8952d54a023687288d05b8bee6b8ee13a7664e78c0093ed03baf37d78c7a02e904a73602
-EBUILD sipcalc-1.1.6.ebuild 395 BLAKE2B a0723c01782024f886664e1601e0795f3d44daef110d86872a99db28c1a57d76ccb9c828e0838d3c4dd8d587980a61744bb57a3199c78c5e1470af93f3706df1 SHA512 b8ffde5a7516d98a361497dc58464f8130333ef7605ba915e40e45fd86f7d95b5c2a257a453491d3b3066233e0289abd7950b3fc8774d5f0e646ba3c12ff31ca
+EBUILD sipcalc-1.1.6-r1.ebuild 420 BLAKE2B 24a5bb79cc46b61d26a9215f7d25ac14d03c3e5106e4363fc08091da1b3df8a09e31100309626c1828d9c759aec980c67c441da8c3b17b6a9604641dbba4dc04 SHA512 f65801a76ad8d3f4b934ef6217fdeb54a577f45e86f60faa0387a10aa53e23ecaf5ed7b5d36f628a6e233116c50a855879fc0d1d344a577a0b4fa3b10f20b48b
 MISC metadata.xml 402 BLAKE2B 53ffb74b2ed29b592030bb97f860016e844e0ad32d78131e5fad2b040f633ef90834bf7f7cc1a06cb951009eec5a0a5d59bbf159681235951c9bc085c2001deb SHA512 4af5280a5c2dfe1b04ab551cc65c9ff0e7b0ac8281eeafbfc1b14fa95c4a59b74a18133b31c08b584f51c55276542df9c6742c54734125fca8ed278cf1b41ce5
diff --git a/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild b/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild
index 17eccb499d61..421b296d3495 100644
--- a/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild
+++ b/net-misc/sipcalc/sipcalc-1.1.6-r1.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-DESCRIPTION="Sipcalc is an advanced console-based IP subnet calculator"
+DESCRIPTION="Advanced console-based IPv4/IPv6 subnet calculator"
 HOMEPAGE="http://www.routemeister.net/projects/sipcalc/
 	https://github.com/sii/sipcalc"
 SRC_URI="http://www.routemeister.net/projects/${PN}/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/net-misc/sipcalc/sipcalc-1.1.6.ebuild b/net-misc/sipcalc/sipcalc-1.1.6.ebuild
deleted file mode 100644
index 4d992820870b..000000000000
--- a/net-misc/sipcalc/sipcalc-1.1.6.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sipcalc is an advanced console-based IP subnet calculator"
-HOMEPAGE="http://www.routemeister.net/projects/sipcalc/"
-SRC_URI="http://www.routemeister.net/projects/${PN}/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/net-misc/spread/Manifest b/net-misc/spread/Manifest
index 1f88ba0e06fb..806222224cc4 100644
--- a/net-misc/spread/Manifest
+++ b/net-misc/spread/Manifest
@@ -1,6 +1,6 @@
 AUX spread.init.d 519 BLAKE2B cc0795f77e5b94ebecdd178beb487555a039b8679a8cdd0edbcc54c1b0faa6bd52f481fc11e58ee98f0a6b8c6432d8fe79c1a2791093a6a8430ec49a3706fe58 SHA512 20852b8fe9b14a1b3cde97683042060382f7a66c28e2072ede63bca9752cd0c4307e5aad689b3274018cf83b0918d0418a99b162af67a332ecc0d90d0deb475a
 DIST spread-src-4.4.1.tar.gz 760038 BLAKE2B 250e6347695f5f6e8047bf527c92baa3cfb6c44ce88ea08ff6ab066b937fab29531743133e73e155a5cc07109b1942efe46fd1d3b74202264a2e8ef0f518a0ad SHA512 19f3fe897e4a4bd68dffc7d28d7b99826bbcbb5c2f44eb18127ed486063594bfd788c03c8c338b9b329302659325fa84a9cbfee3f202a9970afb1a560bb6f496
 DIST spread-src-5.0.1.tar.gz 803058 BLAKE2B b115675cb8ad89bfda7921d7ede0d168bfa833297a13cf5bba866505813fc255d3585b4a02e51409acda73597803ac691b0b6d329b189405004fce5505af7f1c SHA512 f57dbabb6e4d343434fe1c48bb8868cf601e22c599a520521a23c6dfa215b1d835fb2a7dc3b7cf124352060d12566c5f64114544428cc5a95e7899208379b115
-EBUILD spread-4.4.1.ebuild 701 BLAKE2B ed2d42efea2341e3f86d3ccb6f4200f3d957a3fa385308fce5b6ff73d980427e3163298f39ec42a9e9e19885107aa72d64a12f119fda16aa1247d1dd7527f86a SHA512 597b098fd422b7d99d9a9a044d3aefaa989de71579bb629fe3819f34a700582c37d97a876b5b660723df94fe93effd1c5e6f4c513130d11b8f9e6cee6c1858b8
-EBUILD spread-5.0.1.ebuild 703 BLAKE2B a06866661e1bba22c60437c70f2d78939cf868ebf75cb4f7552ac30b062ab449e4ccd4f59d4ab3c803d2ff0fbc2217564807d44d4200924ce10e0a1298cadd28 SHA512 bb618e00444c2d02c096d3c98eb97216307fa626059ed3c5750a775e9aa14bd918f7562d865092234f562b9cdbcb4b4a71bf3a28a64950b94149a7d04964984f
+EBUILD spread-4.4.1-r1.ebuild 644 BLAKE2B 2c97f4c1319fbbc8830ab46db001d50ad9b2ef1e0ec7dfc870288f953013a10086f34a769e841ea857d482f03032766c2113793fa74cf3540c5d5fc4e8d90134 SHA512 f41fa156f4a190578e62052466d3938425dd50bb6b0cb59eb466ff3cae2e359aca046ffb67bc1c8f51a9dfe4e358160dec396061192378c35c5c0adc16201a2f
+EBUILD spread-5.0.1-r1.ebuild 646 BLAKE2B ad58e577c8eca88537e74422ef22dfcf8c522f047a9d637a0a6cadafbcfc127d2c15661669b12433a148ab53805edf2f86e7b841db1e34e8b5659557748062e8 SHA512 b23eb9333ef93c8da58fa039cbcc676a8b709ea734e8278db5b346d0d5d5f08b0b3e8e0ccbe51130e746f5fb0d31f4e61dd153fcc2acb40da39f357698733e1c
 MISC metadata.xml 245 BLAKE2B 922e349900957e202d9925c3b56ddbc4e93034b041d2d500a4f85b60a78f34089bae6ab910423c336af01717f3a3c6003ebbcb6f51d0d7e1a07574e70e7cfe86 SHA512 4706a02393a13e76abffdbffc63ca8bcc70dd9d7145241e0469ab0511df26bf7d6be8d31fdabff7916d23ab1dc886e3d9886551d8ad80074488a31d02952ad16
diff --git a/net-misc/spread/spread-4.4.1.ebuild b/net-misc/spread/spread-4.4.1-r1.ebuild
index f7a6437d93e7..70da45c67ba2 100644
--- a/net-misc/spread/spread-4.4.1.ebuild
+++ b/net-misc/spread/spread-4.4.1-r1.ebuild
@@ -1,29 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit user
+EAPI=7
 
 MY_PN="spread-src"
 
 DESCRIPTION="Distributed network messaging system"
 HOMEPAGE="http://www.spread.org"
 SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Spread-1.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	enewuser spread
-	enewgroup spread
-}
+RDEPEND="
+	acct-group/spread
+	acct-user/spread
+"
 
 src_prepare() {
 	default
diff --git a/net-misc/spread/spread-5.0.1.ebuild b/net-misc/spread/spread-5.0.1-r1.ebuild
index b7526d4dcd16..85b0f141896f 100644
--- a/net-misc/spread/spread-5.0.1.ebuild
+++ b/net-misc/spread/spread-5.0.1-r1.ebuild
@@ -1,29 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit user
+EAPI=7
 
 MY_PN="spread-src"
 
 DESCRIPTION="Distributed network messaging system"
 HOMEPAGE="http://www.spread.org"
 SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Spread-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	enewuser spread
-	enewgroup spread
-}
+RDEPEND="
+	acct-group/spread
+	acct-user/spread
+"
 
 src_prepare() {
 	default
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index fa998e9f2d15..94d52e65317a 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -2,9 +2,6 @@ AUX x2gocleansessions.service 198 BLAKE2B 2660b62182aecd274786220abe4616f3862934
 AUX x2goserver-4.1.0.0-Xresources.patch 1139 BLAKE2B f48f329836a86958866836949a44ccd6c37dc56b3da85366d8ab9a5ec003bc50a10f262211c9de3f2512aa497746d4ad43d1043fe6a36caf3905981f3d551e3c SHA512 42dba64bb8a0c278ca81f4e41236c17ea01c8294914f0051d4781c701b4356ccc05ee6835b0688b79205e0cd7a4c9ebbe418aac685a982db00fa293d48a61300
 AUX x2goserver-4.1.0.0-skip_man2html.patch 2936 BLAKE2B 6b18439c5dc994c5a8ec073e2767047dcd94ebb61b0418ba5d55d55d2860530ab818b87192bdc85124be6a9d52d5c19872063555b7bdcd721429ccfa8593cabb SHA512 7b56c725c42f0813ecb88ed7f34feb0cecd1eaedd157c19068f3e6607bd8510fbba177079744f9e93fc83a4bcc65e7df40f8b1bb6acf4124fda847bc4fb86986
 AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f91dd100562bb3029202a0bb0174fcb71dd776b075a708558eeaf8b1d9914c671bd8e59799772be44 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c
-DIST x2goserver-4.1.0.2.tar.gz 138053 BLAKE2B 5281f05d8531ace6e9228faf5c73590b17e4f743ab6a01779bcf0252c2c34d4525919ae71deef190bf835713be2f43d25fa41fd5c82e99280f0dc77927af7006 SHA512 32f9f38889b79a836bba12bf8df61d0a1530959b1e0da52935a330472a3933288edc611a4843ae145261e954a61e5b61a00a7cb0563b276bcad0587e00c09672
 DIST x2goserver-4.1.0.3.tar.gz 141581 BLAKE2B 79401a146e8a18451d6521f4b9556b2f22746bd752f39dc45764bacca085f2bb66a92327aaeb292979ce43ffbde24541e492cec814f1f8a535614cbdc2dc3ebd SHA512 9d7257dd454bfedca9e3ef1b07bc38b540cb833fae4535f2225a1f0bfea93c0f04c638d411b57c50e7170106a5ae1d7f41c19f043832129a7a9460dcfd34c56a
-EBUILD x2goserver-4.1.0.2.ebuild 2593 BLAKE2B 4a996297ca35b0306bd1057565099a511f78fc47095b780718327785349d241fdbae42ba02da49f1643251a1bbe20d7a8f9c8ce5a6c39ce2d0a1748790872969 SHA512 11e50cf4858d7363b27b6000f92111fc70be01d986b2452d600dfe2f71c435764ceee9de3d4050ce65924ec1c03f6d97d576bd8058ec5cb9d216318156267bca
-EBUILD x2goserver-4.1.0.3-r1.ebuild 2526 BLAKE2B bcf8660139ec8f5a3f0b890201d2b8a0547a683fd7538700759f120f686d73a79a9a78bf7d69e10c97769a207693eca1ff74af014225277e869ecf2ac17574bc SHA512 b4f5094d66f77d2424f2f7913ed65b582f15ab6752941dbdf0938d2233bcfcff97acd6b20496dc9173a6e710cc9ac3528195f19a2f7932c495f4760bfe693c54
-EBUILD x2goserver-4.1.0.3.ebuild 2690 BLAKE2B 50641b4a750a3026657805e966292d4ec4122450e4702cd4ba661e6b33a2a265423e1a5830f03db6fc3d87c5e44023ff972b0b9406952ced3c6e8e61215b33cb SHA512 b271f0d8bede6fa5d39697f20ff0970964aef86fd8a2a16b7580536d0555be2a0a8bdace517380c4f3dbbdacef297451d640ad064f898724b705d725eeea76ce
+EBUILD x2goserver-4.1.0.3-r1.ebuild 2524 BLAKE2B 5e788c529470b0e79259e6f6250f4bfaf6a552054276d06267c0a5baeefd42e9d903ae96c224aac7afae531dadf85299a0d1e483f39bc7b69ccecede5d16bd0f SHA512 7cfe8711457cbf38e6061b95e10395399b53112ca271a30636036249dacb74c1b0b5eb4bc73d5830c27722738419438f5e854a9ad853b635a50251c8b963fc6f
 MISC metadata.xml 346 BLAKE2B 0b995b0163615cb9c993c9ebdfd75d144052fcb65fed6d5f2e3cdaceaedaf8d4c7b6dfdf32e98a1f0c1cfae022617f216f73845177f5e9f904a77f043b78e851 SHA512 860975e20db2fefc93338ee5c21a2491f56c4f96924788098c94c9dcd0faebec15fdc7f06c04c571bae291a47ac6be4980799057d56ef33afefec3d878260c2e
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
deleted file mode 100644
index ca896382fcee..000000000000
--- a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd toolchain-funcs user xdg
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="dev-lang/perl:=
-	dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	dev-perl/File-Which
-	dev-perl/Switch
-	dev-perl/Try-Tiny
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc[nls]
-	>=net-misc/nx-3.5.99.14
-	net-misc/openssh
-	>=sys-apps/iproute2-4.3.0
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( net-fs/sshfs )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
-	"${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
-)
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	default
-	# Multilib clean
-	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		PREFIX=/usr
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		NXLIBDIR="/usr/$(get_libdir)/nx" \
-		PREFIX=/usr \
-		install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym ../../usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if use sqlite ; then
-		if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then
-			elog "To use sqlite and update your existing database, run:"
-			elog " # x2godbadmin --updatedb"
-		else
-			elog "To use sqlite and create the initial database, run:"
-			elog " # x2godbadmin --createdb"
-		fi
-
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL database, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
index 7e6f6226496a..c702e328a829 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
deleted file mode 100644
index 84cebf81ce7e..000000000000
--- a/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd toolchain-funcs user xdg
-
-DESCRIPTION="The X2Go server"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fuse postgres +sqlite"
-
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
-RDEPEND="dev-lang/perl:=
-	dev-perl/Capture-Tiny
-	dev-perl/Config-Simple
-	dev-perl/File-BaseDir
-	dev-perl/File-ReadBackwards
-	dev-perl/File-Which
-	dev-perl/Switch
-	dev-perl/Try-Tiny
-	media-fonts/font-cursor-misc
-	media-fonts/font-misc-misc[nls]
-	>=net-misc/nx-3.5.99.14
-	net-misc/openssh
-	>=sys-apps/iproute2-4.3.0
-	x11-apps/xauth
-	x11-apps/xhost
-	x11-apps/xwininfo
-	fuse? ( net-fs/sshfs )
-	postgres? ( dev-perl/DBD-Pg )
-	sqlite? ( dev-perl/DBD-SQLite )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
-	"${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
-)
-
-pkg_setup() {
-	# Force the group creation, #479650
-	enewgroup x2gouser
-	enewgroup x2goprint
-	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
-	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
-}
-
-src_prepare() {
-	default
-	# Multilib clean
-	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
-
-	# Do not compress man pages by default
-	sed '/^[[:space:]]*gzip.*man/d' -i */Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		PREFIX=/usr
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="/usr/$(get_libdir)/x2go" \
-		NXLIBDIR="/usr/$(get_libdir)/nx" \
-		PREFIX=/usr \
-		install
-
-	fowners root:x2goprint /usr/bin/x2goprint
-	fperms 2755 /usr/bin/x2goprint
-	fperms 0750 /etc/sudoers.d
-	fperms 0440 /etc/sudoers.d/x2goserver
-	dosym ../../usr/share/applications /etc/x2go/applications
-
-	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
-	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if use sqlite ; then
-		if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then
-			elog "To use sqlite and update your existing database, run:"
-			elog " # x2godbadmin --updatedb"
-		else
-			elog "To use sqlite and create the initial database, run:"
-			elog " # x2godbadmin --createdb"
-		fi
-
-	fi
-	if use postgres ; then
-		elog "To use a PostgreSQL database, more information is availabe here:"
-		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
-	fi
-
-	elog "For password authentication, you need to enable PasswordAuthentication"
-	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
-	elog "An init script was installed for x2gocleansessions"
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 2aa1f89e68eb..2df236dcb9c6 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2021.05.16.tar.gz 3336051 BLAKE2B b73206355187a9f61c51749ce01db40757937f79f988a3b81513a5cbe2c854d1b7f2268d7e02c4a0eb3d46c0852990950dfd400acc09f7616aeccb2e8cba6cf9 SHA512 a78ebfc16cc52458e2a036deb48693110f20c046ca3a509be9adbca76d23429953fcf3cd3aab8390a19af747291950bb9261e5339e5cbb0903b98848216c7aca
 DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3
-EBUILD youtube-dl-2021.05.16.ebuild 2185 BLAKE2B ae2b6ad60b6ec44cceeb957c121976720ef9eea4e446e604e598e3e69eb3ed981c838f1bebd16d30c559ec1c1366eca418f6594a34ea64cfc6b407298d62f51e SHA512 2c7917b52f4b75ac4429ff546bf099057ca7d4d4c3ddc9ad9a05b6d07a5ddec6bd3df7530362d6973002776656847905c0e8dd01f60bac56b2495697474272e5
-EBUILD youtube-dl-2021.06.06.ebuild 2157 BLAKE2B 63acd2a5c3cc48f9cd3dd9edaeb9c6c6dd29f2d58222fd6cd9f870c25e6e284bcfd7ce78efc422f82a60f7e8fd605d797f8b79774b6229345d20a8618d8d0044 SHA512 154191b8d145b9669ce427bfcb918b5bd69f2c8417b236b2485687d0f3a71927404203ac5ef11519a3289491d98b909a26d21d7cba64dbcde9870178a18071eb
+EBUILD youtube-dl-2021.06.06.ebuild 2152 BLAKE2B af86d64eaf6fd32e80916fa1b42c4e99742ecab1aef7208a5a8d8c13f81992f7e032fe8ae6c4bb4931061eaa62965b7cb023aae869141730b62659606cdfd6d2 SHA512 35d7f7c29caed0f0cc741d62b665b4d19df036c33143fd31b5e582fb0ada17994c97db8803a0c6f4294af49dff1dbeecb779c1f896ace5a4777e22f37d2606f5
 EBUILD youtube-dl-9999.ebuild 2150 BLAKE2B 845e5d04d4ce84654c07ac59a7d3ee585fd8c514fc26ef6bf6d768c9812e8f72a8be6c41b76c74d995b8e0cef84e5d5e9dc3a4f20d6789c7160bc287cf0a011f SHA512 bc42946c393450632744e8c2e06a2defaa4066322756caccf8010a6d3c9db12d9296f9f366b7e8375283d166655089f06beb4cb3be313c1a7ec2bc74f4d576f0
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
deleted file mode 100644
index f6c4602df69f..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..10})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	if ! has_version media-video/ffmpeg; then
-		elog "${PN} works fine on its own on most sites. However, if you want"
-		elog "to convert video/audio, you'll need media-video/ffmpeg."
-		elog "On some sites - most notably YouTube - videos can be retrieved in"
-		elog "a higher quality format without sound. ${PN} will detect whether"
-		elog "ffmpeg is present and automatically pick the best option."
-	fi
-	if ! has_version media-video/rtmpdump; then
-		elog
-		elog "Videos or video formats streamed via RTMP protocol can only be"
-		elog "downloaded when media-video/rtmpdump is installed."
-	fi
-	if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
-		elog
-		elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
-		elog "or media-video/mpv to be installed."
-	fi
-	if ! has_version media-video/atomicparsley; then
-		elog
-		elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
-		elog "from the metadata into the resulting MP4/M4A files."
-	fi
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
index 5d46a59d125b..f22b67f5220c 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="