gentoo resync : 11.05.2021

41 files changed, 1229 insertions, 1027 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8efa869ead84..987a984b4cbf 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index c2794e1802af..5cf70699ceae 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -3,6 +3,7 @@ AUX asterisk-13.18.1-r2-autoconf-2.70.patch 535 BLAKE2B 06f880515f27166a75738bde
 AUX asterisk-13.38.1-r1-autoconf-lua-version.patch 2320 BLAKE2B 5f9a4b4063286f964da0756698134ce9127a3ae854e19ccec098fb554f4835cbb1698da6ac76293dcb1af3dfd8ea741e9450d58b61c7da440ff3077c848dae68 SHA512 dae3daad5a6755a8a932b40c5d209c348a72266c139a2e05420ea4b8f292062832cf791bc8d41de4bf8c1e0516e8699efdb80724a5afb2d017ab707073d7fca8
 AUX asterisk-13.38.1-r1-func_lock-fix-races.patch 9580 BLAKE2B 174aa69b0738c87f02692c2eec978171216b2117218a54b9785a836d0b72b779ed1aa48a3c3b624deb9e16e3485d60a8390b60019c90524f6248665d1ae0ff44 SHA512 bff6f20a677eef837a6727859c1c90309e6f012621743b7e8b6b92ad17cf44c9b94aa75a0b64550ae39a6260210a944725d9e9603fbe0ca7bcbd4fd61d991748
 AUX asterisk-13.38.2-r1-menuselect-exitcodes.patch 1736 BLAKE2B 32f18fe623c6a9ba4db24001bc6669a2bc0838f2b757a2bcacde6eeb6b63f31881af877ce25cf7f38f6b7c010d92b5a1065d22b3f7526bcdc22799a09b22a975 SHA512 c4888e24051f0913c7dd13dbadbc38e7638bdedfee36b6f6cee047f6113d39cd09d79d9ecbfbb38f72ae6c9092e1423a0eff885118cfa44d4995f11d95c4a1d3
+AUX asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch 7091 BLAKE2B bd00ce7a49b946cd6f2f170edf777a3b7f61bc02882096536dd4e05f2d9c279d1ff5c4501f65eb1c64edbca8b9f283ac7cf542722478dca2c2fcc1e9d9decf83 SHA512 a5a160f5a93e64f6780e56c4af248aa33739bdacc80cfb0f224060c7bbe57633d84368ddac291306f6ec41989cfe619771f55d1c415fc80db3f0597b6058e553
 AUX asterisk-16.15.1-r2-autoconf-2.70.patch 499 BLAKE2B d52c6514d3cd120402298322dac081d88821035a13a5210bddf8574dfe69ec1e6eca1f3335dbd2976e870a8dfc634d1883b3e0db707557581da38b074f7359e6 SHA512 a55725377a874ee15a722076fc63323d73a976592aad524e56bdff5f4164eaa7e533723f5add93b738f39532392541bd2615fc39b3a4fd55a49f57f584d82846
 AUX asterisk-16.16.2-no-var-run-install.patch 728 BLAKE2B 25fc61c4aa68d9e3243d1161e68e0b61b14b5505eadd00fdf46e1c3977e7fb536afd42dc6c9a07f400a686c19afd04fd8f00fc1cb916978783a9e54ecfe81dd4 SHA512 ab1e7ac700711125162396c4ebe590eb000f4ad6c4cbe8845794f5d06353a4a52167fcc83ee97860f38540089cad6d45f2e8589c1f30098e85479a2b4c722f75
 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
@@ -17,13 +18,17 @@ AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b5738
 DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2 SHA512 bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051
 DIST asterisk-16.16.2.tar.gz 27808852 BLAKE2B dc05fe7c797f9b848c918121ffe7e7648bca75fccb70412fcd39f37beb3fd33e7d64cd198919cb6ae2867cd685651497ae15a30fb280988a9c7184e80de235ae SHA512 9e47ea2906a2c0d1a2f527d106ef6200a8d0cce76a31a6cfb3ca720a2ef7b5f723ae5c6266c74b0bdfd5718346e8d01a30fc346981463fa4ee7a4b7c99a67928
 DIST asterisk-16.17.0.tar.gz 27836573 BLAKE2B f01b499cdd9659403df2d422dc4140f3ade66384fc4bf72b220c4179ada5723e2ce07f0c76c473d9fb5bd14a83357c55145c7d5c840ef29c754b05d337f8709e SHA512 ea142028974beffc6e8e87a780eb3928c4542eb7886246eb689fc4f61191e4bf05477aabd24c98f14e69504e5afec29cea33aeab4fefcc8fbd48c72592b630c2
+DIST asterisk-16.18.0.tar.gz 27843069 BLAKE2B 643c371b4747111e233c0758efb529e7f54f1deeff10e65fb05f3a1a58c4ba5c139bdb583d2a2552e29aacac5d0f3980fd9aeb19fda2513843fbe0c849dec217 SHA512 025a30a1eed1d2cd14eb1345e1e0edfcc23b4c517e0d33da7d06d97b3ffa3c9ce9c2fe9449109eefade6d62b6205b598fecb69245adb04f03bd53f8482fbd7ad
 DIST asterisk-18.2.2.tar.gz 27888521 BLAKE2B 5837b6434568a8e9f7a8963098994ccb487cfe9b85d59b30e5866e4eb67d222c4ac2c77036f7d461de72acc6ffd07fcd2d56bcaa618f4aecdbdba60d609eeb93 SHA512 e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546
 DIST asterisk-18.3.0.tar.gz 27917957 BLAKE2B df4589291a1b8c815acc63650c1a1c6febef4147b849114fad13c84754f23c8a960b1ebc865c4e4fa33e63a841c11f2d0a5474980a406df94a654622b4a4b6f0 SHA512 7625d6c2c1069acde8dcb94f54dc3016cbb63c70eab7e0a86768be79ffe2286691367cd32df372d695e63f58919246e5c2dca98bec9389d7a4b09dced5bf8ecb
-EBUILD asterisk-13.38.2-r1.ebuild 10732 BLAKE2B 1f78589be4062805a77e827c0ef0934becc566336c2a8818c774f1cbf54c5137396d2dc3078d6f96f25d2b03aa6ad9aad559b69f6d1147c119cab76305d268c9 SHA512 c71fb95fef071d1b4704b77b896e1ffb4ceeae15c688003e9fabe8488b6cc5d7eeb35fba3d9a483b596992e2db4fabdfdd268a0fc565e36ab08602504975ae84
+DIST asterisk-18.4.0.tar.gz 27926601 BLAKE2B 1a4089ee274732462a8e480d449e4043f7393a6df0b78dd3ea341d3996b9e433066e6d7c53b3ab334db5946a4b847ac02abb4afc5747b6f541cad81a6d58d468 SHA512 024d0a5c75d55fe614ba6219aece62778e9522a0f8365d57192aa5aa22be94d45a3bed69ac14659738e97dd98967533c13096a855366083e6df2b7800e684602
+EBUILD asterisk-13.38.2-r2.ebuild 10793 BLAKE2B 80fafcb1cb0e73db4d3d8fa386d7db287ee952d583d7a014f85e979622d908edc2aa853719feeddab915577a012a75931c242b0f7b4dbceaa8e4ef5be6cfecab SHA512 88d94fc242a934089788a1cde7d7ed30880a9b0bec03c3c5c5fb5c04cdf4f3abe866b7b8c06588739143f83ad41395e99446a4610d6e5e8914269def23e9382c
 EBUILD asterisk-13.38.2.ebuild 9664 BLAKE2B 7b5018e14e5fd93fe92b96a2ba20c39e061dee93a7c3491601ac1a051498fefa6914b5c259576537e1d9c96be1ef45e85d7b742bdc62d40390d824f08cb617cb SHA512 5c82cef460eebf4fb1cf1bbc1824b050855dfb2e8d8a8b0e42cfbff85a761e97843a1ff4bfc38dcb235475db7f2ea36536e031978dd861a9de4d84cddba829f3
 EBUILD asterisk-16.16.2-r1.ebuild 11297 BLAKE2B 70d3e6454e089576316d562b0fe92e9b146c673d129479b90c5c108def4be9cc6ee2f1491210ae753934132ba3472a1833fc1c7cadfc0edfc603c86e0ba49593 SHA512 cade051bcc31019a1a8a831f23deb7a9dfdf54585c158ff798bcb3132b5683f7534a3c1aedacab9062596b22d9c70a510426abb8338bebaaa1691616cf37125e
 EBUILD asterisk-16.16.2.ebuild 9855 BLAKE2B d83137ba59e6497549c60202332615cc8ca7fc7aa80fb69691fe7269fc43e47f6713264ed8328dcdad58886cf7e9b1e84ca3c65a9ef7e8e9ae8e4a4dfbf957dd SHA512 6ac7bdaa50bfaf06b7d45daa4b3349765b1ee89d838681afcc9a3b2a92bbc489273ce6d09635fcd2ac951b234fdcb1371365bbf7fee1eb4de8a80a814d6e43f9
 EBUILD asterisk-16.17.0.ebuild 9859 BLAKE2B cdf9fcbba362fbe821e9bb93bb5ddaf159b650187b1a3d94986554d3afaa9a01c1d14b6ae883defe98c8e6ec72f470203656129f1be2375aff84c69f4f3c7f48 SHA512 fef880641ac72ee4988371d4130c2fdae283f9c9da958d6a66377b56f6f81e46d228145864d3f5b1da77c2314b0b26ced599be8f604340e547dbde43d208a3c1
+EBUILD asterisk-16.18.0.ebuild 9800 BLAKE2B dd4a96b4104359bfea9bb46eec7f8b4453e40e043035b5e8ffc6bd9b1e66bde0583ba701d03450604fb94e76b101951bec0c214871fc3bc35323deb5f8b6ffa3 SHA512 18bcd403796ce850783592df92a927d8c5a31023601d830a4951de2ec6995571a9a54b9ab554781683248a4944e128fc979b1a51da99b0c386b0d491de1378c7
 EBUILD asterisk-18.2.2.ebuild 11270 BLAKE2B bb3522c9a90506fdcf22dd243edee97550d4af8d70d5d6393b2005e6ce71adbc3fd1c23b53b618651888aab14557a1d5c6fe774ac89fcb6a20e264ad52d1b3df SHA512 fbbfa6d86aa3fb6734a68844a7724f234b239c74b4c43232af9cb08077af0824a0475ce11ae365ef399f1419299324e63a50ec6106a47b9403aa7f259fd7397c
 EBUILD asterisk-18.3.0.ebuild 11218 BLAKE2B efeba024aeedee227df0c4f94b4f611b8bdd49a45dc350d23c7fd5042f329a60a79b77210b0f990cf66dcbaf7a4244b0f01ebad632a25ef9186ddb554f691b60 SHA512 05343e131eb0e84b0a73e7a7cc0a16ff386bc1a4fd0914ab49e8fa84a5b6e69449aba2dbcc56087ac0bf18d6037f41eb006ecd321b0c750c1ba06c610afda895
+EBUILD asterisk-18.4.0.ebuild 11159 BLAKE2B 0f13f7d155054688e97bfa5dc892f5d6f80b8d9bf0f952356d76be3f907716803ee6fb8978a9c03ae0791dc1d0932fe6ddb66119e6c05c6251177ef6c9b278e1 SHA512 7bbd41f0b4a2767ec4b36ebed02498b3b2fa35145b376a20b44c0750d71edb21c0ebe0d30f7300112a3e2c626820799e948ed17c55200a96bd55d030656a700d
 MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-13.38.2-r1.ebuild b/net-misc/asterisk/asterisk-13.38.2-r2.ebuild
index f5cfeb45ac9c..44754c3a017f 100644
--- a/net-misc/asterisk/asterisk-13.38.2-r1.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.2-r2.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-13.38.1-r1-func_lock-fix-races.patch"
 	"${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch"
 	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
+	"${FILESDIR}/${PN}-13.38.2-r2-func_odbc_minargs-ARGC.patch"
 )
 
 DEPEND="acct-user/asterisk
diff --git a/net-misc/asterisk/asterisk-16.18.0.ebuild b/net-misc/asterisk/asterisk-16.18.0.ebuild
new file mode 100644
index 000000000000..fd51937b8461
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.18.0.ebuild
@@ -0,0 +1,318 @@
+# 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 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 unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/asterisk-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/ncurses:0=
+	sys-libs/zlib
+	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=
+	)
+	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]\+"
+
+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
+
+	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 NOISY_BUILD=yes 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 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_THREADS BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+	emake DESTDIR="${D}" NOISY_BUILD=yes install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	emake NOISY_BUILD=yes DESTDIR="${D}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
+	chown root:root "${ED}/etc/asterisk/"* || die "chown root:root of config files failed."
+	chmod 644 "${ED}/etc/asterisk/"* || die "chmod 644 of config files failed."
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.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 < <(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	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.freenode.net"
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-18.4.0.ebuild b/net-misc/asterisk/asterisk-18.4.0.ebuild
new file mode 100644
index 000000000000..7af5c494233a
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.4.0.ebuild
@@ -0,0 +1,361 @@
+# 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
+	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}
+	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 < <(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	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.freenode.net"
+	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/files/asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch b/net-misc/asterisk/files/asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch
new file mode 100644
index 000000000000..db3817b5242b
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-13.38.2-r2-func_odbc_minargs-ARGC.patch
@@ -0,0 +1,180 @@
+From d847f7e8f8736e5f51fd11df2992fac87131c1d8 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Wed, 17 Feb 2021 22:51:17 +0200
+Subject: [PATCH] func_odbc:  Introduce minargs config and expose ARGC in
+ addition to ARGn.
+
+minargs enables enforcing of minimum count of arguments to pass to
+func_odbc, so if you're unconditionally using ARG1 through ARG4 then
+this should be set to 4.  func_odbc will generate an error in this case,
+so for example
+
+[FOO]
+minargs = 4
+
+and ODBC_FOO(a,b,c) in dialplan will now error out instead of using a
+potentially leaked ARG4 from Gosub().
+
+ARGC is needed if you're using optional argument, to verify whether or
+not an argument has been passed, else it's possible to use a leaked ARGn
+from Gosub (app_stack).  So now you can safely do
+${IF($[${ARGC}>3]?${ARGV}:default value)} kind of thing.
+
+Change-Id: I6ca0b137d90b03f6aa9c496991f6cbf1518f6c24
+Signed-off-by: Jaco Kroon <jaco@uls.co.za>
+---
+ configs/samples/func_odbc.conf.sample         | 11 +++++++
+ .../func_odbc_ARGC_minargs.txt                | 20 ++++++++++++
+ funcs/func_odbc.c                             | 31 +++++++++++++++++--
+ 3 files changed, 60 insertions(+), 2 deletions(-)
+ create mode 100644 doc/CHANGES-staging/func_odbc_ARGC_minargs.txt
+
+diff --git a/configs/samples/func_odbc.conf.sample b/configs/samples/func_odbc.conf.sample
+index c467f7ec06..b825974ea7 100644
+--- a/configs/samples/func_odbc.conf.sample
++++ b/configs/samples/func_odbc.conf.sample
+@@ -23,6 +23,10 @@
+ ; For substitution, you have ${ARG1}, ${ARG2} ... ${ARGn}
+ ; for the arguments to each SQL statement.
+ ;
++; Additionally you can use ${ARGC} to determine the number of arguments that
++; was actually passed (or risk using leaked ARGn variables from the channel).
++; Also reference the minargs configuration option.
++;
+ ; In addition, for write statements, you have ${VAL1}, ${VAL2} ... ${VALn}
+ ; parsed, just like arguments, for the values.  In addition, if you want the
+ ; whole value, never mind the parsing, you can get that with ${VALUE}.
+@@ -87,6 +91,13 @@
+ ;              These additional rows can be returned by using the name of the
+ ;              function which was called to retrieve the first row as an
+ ;              argument to ODBC_FETCH().
++; minargs      The minimum number of ARGUMENTS that has to be passed to the
++;              function.  If fewer arguments than this is passed, then the call
++;              will fail.  It is important to note that unlike Gosub() and friends,
++;              func_odbc will not mask out ARGn variables that it's not actively
++;              using, as such, without this, it's entirely possible to use say
++;              ARG2 from the Gosub() inside func_odbc when the intent was to
++;              use an argument passed to func_odbc, but it simply was never passed.
+ 
+ 
+ ; ODBC_SQL - Allow an SQL statement to be built entirely in the dialplan
+diff --git a/doc/CHANGES-staging/func_odbc_ARGC_minargs.txt b/doc/CHANGES-staging/func_odbc_ARGC_minargs.txt
+new file mode 100644
+index 0000000000..0984b5022d
+--- /dev/null
++++ b/doc/CHANGES-staging/func_odbc_ARGC_minargs.txt
+@@ -0,0 +1,20 @@
++Subject: func_odbc
++
++Introduce an ARGC variable for func_odbc functions, along with a minargs
++per-function configuration option.
++
++minargs enables enforcing of minimum count of arguments to pass to
++func_odbc, so if you're unconditionally using ARG1 through ARG4 then
++this should be set to 4.  func_odbc will generate an error in this case,
++so for example
++
++[FOO]
++minargs = 4
++
++and ODBC_FOO(a,b,c) in dialplan will now error out instead of using a
++potentially leaked ARG4 from Gosub().
++
++ARGC is needed if you're using optional argument, to verify whether or
++not an argument has been passed, else it's possible to use a leaked ARGn
++from Gosub (app_stack).  So now you can safely do
++${IF($[${ARGC}>3]?${ARGV}:default value)} kind of thing.
+diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
+index 5cc0faaa98..9d6d0fc304 100644
+--- a/funcs/func_odbc.c
++++ b/funcs/func_odbc.c
+@@ -120,6 +120,7 @@ struct acf_odbc_query {
+ 	char *sql_insert;
+ 	unsigned int flags;
+ 	int rowlimit;
++	int minargs;
+ 	struct ast_custom_function *acf;
+ };
+ 
+@@ -545,6 +546,14 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co
+ 		return -1;
+ 	}
+ 
++	AST_STANDARD_APP_ARGS(args, s);
++	if (args.argc < query->minargs) {
++		ast_log(LOG_ERROR, "%d arguments supplied to '%s' requiring minimum %d\n",
++				args.argc, cmd, query->minargs);
++		AST_RWLIST_UNLOCK(&queries);
++		return -1;
++	}
++
+ 	if (!chan) {
+ 		if (!(chan = ast_dummy_channel_alloc())) {
+ 			AST_RWLIST_UNLOCK(&queries);
+@@ -578,7 +587,8 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co
+ 		return -1;
+ 	}
+ 
+-	AST_STANDARD_APP_ARGS(args, s);
++	snprintf(varname, sizeof(varname), "%u", args.argc);
++	pbx_builtin_pushvar_helper(chan, "ARGC", varname);
+ 	for (i = 0; i < args.argc; i++) {
+ 		snprintf(varname, sizeof(varname), "ARG%d", i + 1);
+ 		pbx_builtin_pushvar_helper(chan, varname, args.field[i]);
+@@ -603,6 +613,8 @@ static int acf_odbc_write(struct ast_channel *chan, const char *cmd, char *s, co
+ 		chan = ast_channel_unref(chan);
+ 	} else {
+ 		/* Restore prior values */
++		pbx_builtin_setvar_helper(chan, "ARGC", NULL);
++
+ 		for (i = 0; i < args.argc; i++) {
+ 			snprintf(varname, sizeof(varname), "ARG%d", i + 1);
+ 			pbx_builtin_setvar_helper(chan, varname, NULL);
+@@ -756,6 +768,14 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha
+ 		return -1;
+ 	}
+ 
++	AST_STANDARD_APP_ARGS(args, s);
++	if (args.argc < query->minargs) {
++		ast_log(LOG_ERROR, "%d arguments supplied to '%s' requiring minimum %d\n",
++				args.argc, cmd, query->minargs);
++		AST_RWLIST_UNLOCK(&queries);
++		return -1;
++	}
++
+ 	if (!chan) {
+ 		if (!(chan = ast_dummy_channel_alloc())) {
+ 			AST_RWLIST_UNLOCK(&queries);
+@@ -768,7 +788,8 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha
+ 		ast_autoservice_start(chan);
+ 	}
+ 
+-	AST_STANDARD_APP_ARGS(args, s);
++	snprintf(varname, sizeof(varname), "%u", args.argc);
++	pbx_builtin_pushvar_helper(chan, "ARGC", varname);
+ 	for (x = 0; x < args.argc; x++) {
+ 		snprintf(varname, sizeof(varname), "ARG%d", x + 1);
+ 		pbx_builtin_pushvar_helper(chan, varname, args.field[x]);
+@@ -780,6 +801,8 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha
+ 		chan = ast_channel_unref(chan);
+ 	} else {
+ 		/* Restore prior values */
++		pbx_builtin_setvar_helper(chan, "ARGC", NULL);
++
+ 		for (x = 0; x < args.argc; x++) {
+ 			snprintf(varname, sizeof(varname), "ARG%d", x + 1);
+ 			pbx_builtin_setvar_helper(chan, varname, NULL);
+@@ -1290,6 +1313,10 @@ static int init_acf_query(struct ast_config *cfg, char *catg, struct acf_odbc_qu
+ 			sscanf(tmp, "%30d", &((*query)->rowlimit));
+ 	}
+ 
++	if ((tmp = ast_variable_retrieve(cfg, catg, "minargs"))) {
++		sscanf(tmp, "%30d", &((*query)->minargs));
++	}
++
+ 	(*query)->acf = ast_calloc(1, sizeof(struct ast_custom_function));
+ 	if (!(*query)->acf) {
+ 		free_acf_query(*query);
+-- 
+2.26.3
+
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index 66aec0e822b2..2fd64bc21444 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,6 +1,7 @@
+AUX croc-disable-network-tests-r1.patch 763 BLAKE2B daf8248adb801bd16f1a567d1ce16746877617a83a2f63ab640312abf3b1089105e8b71b4fcb21ccdf8cd59987ac4e5826463680634c44d417d8bf5c2b514b35 SHA512 659936bafed02bc2274ee7a9a482c711850a08ed1e871584d978930e5b38b019b42b3308a3550e388e04cbdcd92964cb5326fc5825b7b377c11e6ba99660f772
 AUX croc-disable-network-tests.patch 813 BLAKE2B 305ccd0cbfde01e44bc89cc9bd5545134b02df4f91e217f4eca71cbc4b4c0f2fc908912f16b47fd4867c4472cfb861bc17263cf378106d7542a7ec78287a69f3 SHA512 f31578ac1530e20715a4be305a18245f201ea16514bb265c0b676d72190e3ac90d89d1e846e5bfb8199fc0e532ed56b890b7e2b1389834564686c7bb36fc2e46
-DIST croc-9.1.0.tar.gz 2744612 BLAKE2B db189efe91cba9265de9114a8df97482789659bebfe4c374197b003262af3b91a8622099cccbc255bd6441d05148a10af4f0bf5f06f59ac7986a830489ba8bea SHA512 a5a048448b9890907499240c0aa0707db53da45cbb51e2e7e1f5b78537118ff83ce2e91ae1ef6e1a57c8a9d0e682265621e23613cd0dad5ae9158d57df67a0be
 DIST croc-9.1.1.tar.gz 2820437 BLAKE2B 55cd043fee62c27e28261826e11c96fec355463850ae459d1709439f74153a8e6f87a65607232a51cc9d0fa0682e7e65f73eb885aee8ce06a46969040784e24a SHA512 88c4399cf64fc7f539ce40599785517dfcc97dd05caeb7d9976e39bf011dfecf8d04b2501bd8b94442ceba56c7515d15cd69b3ee4969cc61cac59e048e8e3bba
+DIST croc-9.1.2.tar.gz 2784568 BLAKE2B e0bc32f5d8e72fafd04d6c10797906f4f5d627dc0bf5a2bfdcd0d1fd55d3ede50332f0e628f147b3c0c99f3da38750ffe318642b3bbfee206b2b954a446fdeb9 SHA512 ca6e45db48eb1fe652fbaa48c0cdd580ea25e5094c462ff9d3dcb545b1f868bb78f91b7c079c7299d2efebb72d41a805b0971f6b2f011a1f642cdc3ea5503885
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765
@@ -16,8 +17,6 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c
 DIST github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod 42 BLAKE2B 82ce41a468f86b7e890b3f78540b186af17a4dba7dc95f9e19ae08a0008af3ab1a4f6dc4038233dad1cc62b9c8e0950c6ea062f03f4502cbccb256a84c4cea45 SHA512 330121b143198b7a6564df33fd8cb6b2526d641c08301f7e26c06a4274e8e038b16b0bc833ec3363770f0c177882fe0e8021d721a2fc32e8050e75a2051febf9
 DIST github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip 32312 BLAKE2B 37cf6c05b306d6d88aaf6455a0068dcd5744657e057529ec6e62b1117b87c09c40d159e1d1205f6751111c4eea3194cbfe199de5d7a74d3a0ada349ceb4b8e51 SHA512 ca740e3296a7699459cfc4ce454277c7b5dc2bacd12ad5959f6d2a77d9d268f6671d4c30b1c84072d53045935838005d2dcc5beeab1acfee6e952c67e0bbc859
 DIST github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod 34 BLAKE2B 86aaf734f424439c38d57c59bb08da879781d897196a6f1c6486fe74677d055bc301fdfd72825e079b50bb04ef2a12db0c0e65a0a59f0be65db12f03c731bed9 SHA512 8664f01b08e210d9f70e72a1c8add0547055979561ebc689e9b7f601f4ee8359d00649a5f8a0bc0c9715009ef8066a1924f5311377b7346685b3bef676481dcc
-DIST github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.mod 142 BLAKE2B 61dc9cff180fdd116136f37018e74635e19370e37f237c8cf7b52cc026d91ca0e97c1da39232828405f26b786fc39a81b70a2ffa09a9279bdff711a0f219072f SHA512 33c28ef3ee2d71f8f2a4c02a443bf9f40c6b7bab1e56a686e5f7e0e497eae7f2878d3e725be8cf15ad1be26716ab0d783404529f082a36056173f718f4bdd68a
-DIST github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.zip 9682 BLAKE2B 8257caa4722ca71e9155888b9b483aabd2f5ebd4d561ebf263c40c260c9feea01f57844e0952ff890806b2d434dcf3731d859b7d7e5cf08aa8c086bd9522f9b7 SHA512 a297bdc807d24ed88953c86aa0ac320851977324dbff9e00d4e5b813a0a8467b9cf12f6536759a4d87c7695579d2a3efd050991d488dfef4c85c996f9e6005ee
 DIST github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.mod 109 BLAKE2B d1745ea6be8862914fbec8575738c7b68bbb210bafc3e385126b8bbb7a553ed60c8a96b2cdc3af3f30b8b492d9741281f8d296c219bc821c0e212912ba9039a0 SHA512 83c81af5529aa71b8465e8b18f402f067b030dbab794fda6d04a872ab6e170598f3ff360d81bf54d150bfea1e63cbc12b09c4ad83826f34db25dc64f2caaacea
 DIST github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.2.zip 9680 BLAKE2B a1a9179beef0f7564ede0986f43fe6ac05c93e7766c99d76471cf1bfe65efbac25ee794564e65dfd7862289143b9cb26a19048cec7488153c78a2380e12c6d99 SHA512 d457b81d745e94be4ded5739ea2d15e34118033610f01228b821af8084837bcf493e661df6b875264ae02ebf54a80d84d59868cde3d755bb7e2b0e834396580c
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
@@ -47,10 +46,14 @@ DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod 72 BLAKE2B 5f5815449eb
 DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip 21717 BLAKE2B 611144d8f187db3a63bf6c8dce9b2b4752551c412a5228c4d52c7f24cc65336b95e6d2ffb8f20baf50d0ebf90ae77998c6ec6c5618c0fbebf5b312a7b26be892 SHA512 bac0d4ffb2e4bb0dcdcebdd5d651984dc9b1be639a7de249b1ba47bd66d7d4f0aad3ae7b9ba9ea6ba032204e543feb3b83b77e86e7a5de295f2fd06a0f8876b9
 DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.1.mod 200 BLAKE2B ac3886b13c5b45725a8b53e9f8c03b577cc1ade1d81947bc441e28d107b0cb402621def301c3507ffbae3ad822af7f04307794e6b215209ab12ccc30b0d35b39 SHA512 01d5e9bb9869ab766d61ab82cd383eeabef10b7f93a708271824958ce4f2cd6fa1140b21065809b0141c795c025c22f04501cf8874804a1fa3445ad722e42a13
 DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.1.zip 11583 BLAKE2B f1e557e34acd31eda481a39b053211bd581dd64019afe305c236886970cdff4489825e5823e28f83fbe7c0bbaa4229bc14714fb28d00d3023acfa8f9247bc804 SHA512 3fa8341a5e534baa4b4cde61df068e67db65fdbadc3bfb48bed3fabea3d6acadfa04dea950286d8a1778a18afa2b09564948f53b8da65e8b58481d2baeebbb60
+DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.mod 200 BLAKE2B ac3886b13c5b45725a8b53e9f8c03b577cc1ade1d81947bc441e28d107b0cb402621def301c3507ffbae3ad822af7f04307794e6b215209ab12ccc30b0d35b39 SHA512 01d5e9bb9869ab766d61ab82cd383eeabef10b7f93a708271824958ce4f2cd6fa1140b21065809b0141c795c025c22f04501cf8874804a1fa3445ad722e42a13
+DIST github.com%2Fschollz%2Fpake%2Fv3%2F@v%2Fv3.0.2.zip 11584 BLAKE2B 436025438469ea00bca4fd958a604a29d688bf0c9c205e651d814458a35728d065c7c1af9f5bf3d39b61bf629581656578b9453fb788cbd9c71af83c7f9416be SHA512 c16986d2d0ecda2c9b119abfb4565eab79c829d8eaf0c2be00079f21b4f4988fb13bcd3e61add4a5781511aecbd1411d6a9da3aea12401db89ad41a67c409522
 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.mod 216 BLAKE2B cab544fefb07749635d4f00451aececdb02ee3f24a08762f5ce2af7ca356693b2dbadd1190fae5aa0b67564d34faa5afef9882ceffec4389c2ab26b6e5da70c2 SHA512 4ebaa50c73558c972222a6c44f768442542ceef31a1b4372df732b6c634443cdda8dc6ab8e468a53380a4323e05464b995364109ae9f17e215ca2eb55f0b5665
 DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.3.zip 9036 BLAKE2B ee36c5c39df2e10c28c6caae3b40c876ab88fd314dfe65809f92914429156cf87eafb0f9709df8a6b9ca45427a69dc62d03591c4d3da00376c4065617f44799c SHA512 a1686577f23bdc2121197742103a4c35685e3aaf4251ee26e2352f830a1244eaaeceb859cba23410a1a12d6d59e9f62b03cd8aeaf287d10c59db6c784d51ac68
 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.mod 595 BLAKE2B c96dbd7220e3f018eff0feacd44ae0330edab515a8f5d8b8be1e2e65f429e6b9927a38425f0629ceac2a812773dbf9feeae5c37302e120b4d4bd6ed698d09e16 SHA512 29ec96afa5026e9b5238db5fe506979ae88689e25bec6e76a6acb7d9ef79e6126a642c0ccc11594ac5746654dcfa0104470b99a60068efea44eb01c247265f55
 DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.6.zip 606458 BLAKE2B e22a5c544a46b42aff8cdcd1fee43531d63ecd13a25b2b876004ac754c117ade1599ba14b180732361f045a13c31056db84451e98d68cacde7e285e3c86ffc99 SHA512 4548ec4cc5645c7ffbf0eba82a31512711b57368c408aebf884a314a6dfd49035f3e6391fbe526194357ce11c0ac717fd7f1d45a308832dad47e6862b1bcc8f7
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.0.mod 595 BLAKE2B c96dbd7220e3f018eff0feacd44ae0330edab515a8f5d8b8be1e2e65f429e6b9927a38425f0629ceac2a812773dbf9feeae5c37302e120b4d4bd6ed698d09e16 SHA512 29ec96afa5026e9b5238db5fe506979ae88689e25bec6e76a6acb7d9ef79e6126a642c0ccc11594ac5746654dcfa0104470b99a60068efea44eb01c247265f55
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.8.0.zip 606683 BLAKE2B 52a01c6532d69a877a53cdac3faee136edc3b4c913aa97c03de2ae2bf149f6d2edbeef3e1623fe9453a56c5143b9f669c5bf131708aadb3c562214b3d1a64cbc SHA512 eee7b75e41ce80c290b1cb1bd9199687a5b0c02d98eafcc74a42be21c0565834cec0809f6d03ffe232793566c5e2fc5b99d2f5573fa58fde89b185eef8692841
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
@@ -67,11 +70,15 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.zip 1865333 BLAKE2B 58893c3623e8ae23e9dbb28cfbb4faa45b949b640489e5e8e677b52292afd272da6075d5a9f532fe6089412ea0324b87db31c7bbb5831c35fc817a11892a2aba SHA512 ee1b82519e67b583b967d7426c0a4bab55253039259dcb1ac9bd053a16623a9fe9e9a491e5c540499e69bd20b1f05c2ff4a31e3dd5f8da175ead4b784bb8dc90
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210506145944-38f3c27a63bf.mod 247 BLAKE2B 66c7bddf0c6300cb14884379a13eacf7ce4cbd1e86cdd94fbef5f67bbb27e263ecd4cc2c936b7f95751b7afadee561629014be9d997159c742be2e5ce7bf099d SHA512 36d6474a79deda7b8749681b46e682e0440d07b3e8930279c66a45c0d42a6f2c6dd75b7bc7c3cc1ef50cdeff988442630af904ff0f58bb2def5f49040ade16cc
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210506145944-38f3c27a63bf.zip 1874428 BLAKE2B bc63491e97e9a528a252723dd16ac8e79d7dda0a022be2f0b94ae68017f14759127bbc398b721efbca6f270ccf4ea7146cd267be68898369a81bb2368cc367e6 SHA512 203fa97ecc318bc5a6de3a79380d52863b7280eeb7e1509f092d04bc6c1d6f89e32b5c836622adbee2031f2482d4d63e0e2e2523fe1c610ce6eb08f338fcb523
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.mod 179 BLAKE2B 1d41797e9cd238f294cd4d01f3115a496d72952d4aa92116e99de7fef6d5881b8e532e4c419c36dbd58a04e4cfd27c814936e5b51ca99f47c9bee8578eb9d71e SHA512 ea5604f4e47cf196e4ab474016327b04c27aab3ef394d19f15a0a34d763f659c1764dea0554de8afbc9ec28168681f1ea1e03a6ef64fc1355f0e0d7c4ef709a1
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.zip 1565776 BLAKE2B eb0064f562896b0e6ae48369150c663f66ed93ced8d05f355e8c6ad7d53b9e6b7f4b1ff5d4c0dfb6a7e5b23e6344a90e9e02304ece8d669578d56bfa9517d27f SHA512 dae90ddd392edd9d13a21e183c1cd1e8ab37c595172612f499dd264a599cd9ea191e5a84a7ae4f26baca2615c6bd18671a63b9844dd4b84a5af13585582b3fc9
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210505214959-0714010a04ed.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210505214959-0714010a04ed.zip 1563787 BLAKE2B dacd05c5aa5769245e305f6a1909d8db3c9aa2fba479965b620ac2e093788f586e57102df3bcccfde8d4a8c13cac4a714c075506ffc5ff9146b339562d7b72a9 SHA512 5d517a263e8a7ec74a84c6306596a26f434bdffa85f3334c77665977a3f8f9359eb21720f1c9ba47f8a253ecc83efd725cacc5301df43948d17dfd1315120dd9
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -81,11 +88,16 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210223095934-7937bea0104d.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210415045647-66c3f260301c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210415045647-66c3f260301c.zip 1668770 BLAKE2B e071f99a42996d0a84bf57f5f7c3d081d85dc97f64fc952c796323c76745b55bf9d7edbea2ffd7fe8598c8e69eba540c6fbe6df56fc1c21bc6db3fde2b0df17d SHA512 fd719c0cadd011e001a94453e97d496b5daea4afcc95a7747dd090bbb4cc38ceb5262f7183800adda7791aaf75206831cbe60553faf4f950706dcf8336136967
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210507161434-a76c4d0a0096.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210507161434-a76c4d0a0096.zip 1634364 BLAKE2B d1f30deb0d15aebbf986cc79f797f53db03521e109a8642ca1fc950cf1c94942e2309a7136c42470cad9fedb586afceff4087acad885bebaa6b9f4e7524ebe8f SHA512 e5c0b615cb8161d2efadf58e3c411dff7f62e14a836379d6024924c0dbcfe54ff4d3bc20cad86fb20d0c8a4b391e2061a3d75ac3033ee17d6d804eaad32c40e4
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.zip 22672 BLAKE2B e36e6cfa566c936219702eb086d6fe20936dfd57b58f7643331b116b63dfbfd40e679794d453b9a4c5952d5523a52dc6538ea05466e6a291f9d1240d3a2381c6 SHA512 9dca218e749d2a405b7d7bdc29ce1a3219e5f965103a7cccd5468c861262539c0c13212b28059d27937a9b39ce0e16dff386f92a31b62cb23f3dbb52bf992660
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210503060354-a79de5458b56.mod 95 BLAKE2B e684a60aa4f81d9b1bc646e05933b19fbce141011fd2e6c68922bc35ae5605c7ac6bf360d23495386b2d6aa6dc1752fff42f9ee110395e7d693df4aecd600e65 SHA512 e9ea2b640f798292d676ee885d9390a0d39e97209bd1f361eb110acbaebcfc36dfa49140770fdd5d768daa4d7cf1554cfdfaa19864ee078825c84401a5a09658
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210503060354-a79de5458b56.zip 21403 BLAKE2B cbe932fa03ef0429e062a16019f125577b0a281902b93b0b84c30b56e1a8d120211b0e5f435eafee842cbc2430f877bff71e3ded19db5316ad4ddf5e92dd1f2b SHA512 71948fb5bb4e2802e3dbc1bbea9cef38a11f07719c357cbf519c62d85cd49a544e36c64f6a1193a329d29f19006dd753de986644338a9b01ac21c5d5fbd0269d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
@@ -99,6 +111,6 @@ DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip 6816 BLAKE2B 44b63e4a425a5b5250
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-EBUILD croc-9.1.0.ebuild 5785 BLAKE2B b781c40d169c8c0d1471c69f328b377d4f7ead9be8ea40e13d9d989efc12a2cc4f8ef0410020003fc858f4dad4da5f4e5b227ebc172356dbe5bae13f50609d05 SHA512 afa0e4a59a7084b058a3849f6c299977fe75d7615a94597628113f2453648ae2139877f9edc337642ba50d60c4123aa5cb677457bd121d1d324503d10e930755
 EBUILD croc-9.1.1.ebuild 5860 BLAKE2B 001c6ae2fff287364a7a7c7f254e1b24100594330eb154af269f20918e5658323ea6485f6482e265c60140f2392532aee5b24c46be9abc84a994c5cb699cd085 SHA512 936aa93b8f69ee4bb0a4b283e2a9ebc22406ce8095d0e1193730a7f9033215f54575190a844bb8f92d57e7036639e004e0c604f6ec0e6369a51ebd010489110c
+EBUILD croc-9.1.2.ebuild 5863 BLAKE2B 1205cabc8607db50439e45eb29cee43e29ce16158cdd36a0bef2c0c8fc7fbccb9fe22cb2932921a6aa3e883936ab717987c9cf0fdaa0673bf369ef2b61e41ede SHA512 069e821d0e3253e70bb8e3306178ff2c6d357d5425b27ac13108e828e51aa1da8fa33152ff2c9f5f3976e9390b66e8e5a265571b84a18111bb1890b2a66e85d1
 MISC metadata.xml 326 BLAKE2B 1d21a0f6089d6399bf2f2262b64d941a9d8ca689929ab306121968e86ad29465d7dd6802ea8010c2bdf898f57ce5a640d74f93340058e5d155878214668ea683 SHA512 ce6f19fc8a729207e3f95787e8d4100b3877c22db06afa83667d58cd1d208b127c49bb7116280668ef0a4f864b0f92cace9aa1766efd82ed1cffd1b1fab86c91
diff --git a/net-misc/croc/croc-9.1.0.ebuild b/net-misc/croc/croc-9.1.2.ebuild
index 346132b16e5d..fcb14f2ddb82 100644
--- a/net-misc/croc/croc-9.1.0.ebuild
+++ b/net-misc/croc/croc-9.1.2.ebuild
@@ -24,8 +24,8 @@ EGO_SUM=(
 	"github.com/denisbrodbeck/machineid v1.0.1"
 	"github.com/denisbrodbeck/machineid v1.0.1/go.mod"
 	"github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod"
-	"github.com/kalafut/imohash v1.0.0"
-	"github.com/kalafut/imohash v1.0.0/go.mod"
+	"github.com/kalafut/imohash v1.0.2"
+	"github.com/kalafut/imohash v1.0.2/go.mod"
 	"github.com/kr/pretty v0.1.0"
 	"github.com/kr/pretty v0.1.0/go.mod"
 	"github.com/kr/pty v1.1.1/go.mod"
@@ -51,12 +51,12 @@ EGO_SUM=(
 	"github.com/schollz/logger v1.2.0/go.mod"
 	"github.com/schollz/mnemonicode v1.0.1"
 	"github.com/schollz/mnemonicode v1.0.1/go.mod"
-	"github.com/schollz/pake/v3 v3.0.1"
-	"github.com/schollz/pake/v3 v3.0.1/go.mod"
+	"github.com/schollz/pake/v3 v3.0.2"
+	"github.com/schollz/pake/v3 v3.0.2/go.mod"
 	"github.com/schollz/peerdiscovery v1.6.3"
 	"github.com/schollz/peerdiscovery v1.6.3/go.mod"
-	"github.com/schollz/progressbar/v3 v3.7.6"
-	"github.com/schollz/progressbar/v3 v3.7.6/go.mod"
+	"github.com/schollz/progressbar/v3 v3.8.0"
+	"github.com/schollz/progressbar/v3 v3.8.0/go.mod"
 	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
 	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
 	"github.com/spaolacci/murmur3 v1.1.0"
@@ -67,29 +67,31 @@ EGO_SUM=(
 	"github.com/stretchr/testify v1.6.1/go.mod"
 	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094"
 	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
+	"github.com/twmb/murmur3 v1.1.5"
+	"github.com/twmb/murmur3 v1.1.5/go.mod"
 	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
 	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
-	"golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc"
-	"golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc/go.mod"
+	"golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf"
+	"golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod"
 	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
 	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
 	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-	"golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d"
-	"golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d/go.mod"
+	"golang.org/x/net v0.0.0-20210505214959-0714010a04ed"
+	"golang.org/x/net v0.0.0-20210505214959-0714010a04ed/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
 	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
 	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
 	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
 	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
 	"golang.org/x/sys v0.0.0-20210223095934-7937bea0104d/go.mod"
-	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
-	"golang.org/x/sys v0.0.0-20210415045647-66c3f260301c"
-	"golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210507161434-a76c4d0a0096"
+	"golang.org/x/sys v0.0.0-20210507161434-a76c4d0a0096/go.mod"
 	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
 	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
 	"golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod"
-	"golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72"
-	"golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72/go.mod"
+	"golang.org/x/term v0.0.0-20210503060354-a79de5458b56"
+	"golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod"
 	"golang.org/x/text v0.3.0/go.mod"
 	"golang.org/x/text v0.3.3/go.mod"
 	"golang.org/x/text v0.3.6"
@@ -119,7 +121,7 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-disable-network-tests.patch"
+	"${FILESDIR}/${PN}-disable-network-tests-r1.patch"
 )
 
 DOCS=( README.md )
diff --git a/net-misc/croc/files/croc-disable-network-tests-r1.patch b/net-misc/croc/files/croc-disable-network-tests-r1.patch
new file mode 100644
index 000000000000..04540e14b9d4
--- /dev/null
+++ b/net-misc/croc/files/croc-disable-network-tests-r1.patch
@@ -0,0 +1,32 @@
+Disable tests that fail with network-sandbox
+
+--- a/src/utils/utils_test.go
++++ b/src/utils/utils_test.go
+@@ -7,7 +7,6 @@ import (
+ 	"log"
+ 	"math/rand"
+ 	"os"
+-	"strings"
+ 	"testing"
+ 
+ 	"github.com/schollz/croc/v9/src/models"
+@@ -189,19 +188,6 @@ func TestHashFile(t *testing.T) {
+ 	assert.Equal(t, "e66c561610ad51e2", fmt.Sprintf("%x", hashed))
+ }
+ 
+-func TestPublicIP(t *testing.T) {
+-	ip, err := PublicIP()
+-	fmt.Println(ip)
+-	assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
+-	assert.Nil(t, err)
+-}
+-
+-func TestLocalIP(t *testing.T) {
+-	ip := LocalIP()
+-	fmt.Println(ip)
+-	assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
+-}
+-
+ func TestGetRandomName(t *testing.T) {
+ 	name := GetRandomName()
+ 	fmt.Println(name)
diff --git a/net-misc/httpstat/Manifest b/net-misc/httpstat/Manifest
index 9e934b878988..c3d59bced524 100644
--- a/net-misc/httpstat/Manifest
+++ b/net-misc/httpstat/Manifest
@@ -1,4 +1,4 @@
 AUX httpstat-1.2.1-gentoo-tests.patch 840 BLAKE2B 478fc8c29c816be383def1d2f2194fe7d0fb888487c45afeba9b3a7808bbc01cbf1c836ee14b5f57115e19a1f63537736d137e19b3e1eac9b8af65f3519d5142 SHA512 6e904552c42e8d5cc9f6b298902601cb7ce1304ba2c85f0910f508ac09e5257562e7ed94fb0462512f02caff2a83fa2bb6ec35045a720e25c4f91e976cd1c99b
 DIST httpstat-1.3.1.tar.gz 97691 BLAKE2B f7a5388c3891c1caac654c6c9be425864e2a037eba2e12229ec72c847864f7be23b64d5450ebb42f976335f5b6ca878f1ee555ee3b2178c1a10c5969f883604d SHA512 bca91afe14d50af37c741ca4baa7d3843b010bb6dc012c72bd28c43f59099c20628cadc4dd80652dffeb1d26fb07f5cf156a3f6bf9eba1f6e121d4b250020b46
-EBUILD httpstat-1.3.1.ebuild 710 BLAKE2B fc1b9a37ae600cdfda97fb5f01b8062c8ecde270fb538b28ed1b22134104adfc8c07ecd7344b942116b6c26d0f8c76aa9c93f2eca0f38571d350864cfa9afe54 SHA512 ccb9fbe3a2d85f7d2492bc1b44e9dda75b3b990dd9333dc0bb4fe328df9c6bc4b01679981dae3831c88daa8c05a5a61ee05ea9d0a20f35371de4a104dfed49c3
+EBUILD httpstat-1.3.1.ebuild 708 BLAKE2B 2da69e8bbe607a8dfbb55a639bd3514ed2f1a8597d076a68b6ff96d4a409b576d179bef7933423a708c878bcc9e87b7f5f4bb8032444b35b34ce53ef3469b733 SHA512 151af5244a13c4439dc05ef0b2c714adcfd8fb2502049854fd1e84f11b0fc0333b8ba36f4876b814d4c366cfab7c7b308d2f6546601922bdf0339d05e91335bd
 MISC metadata.xml 438 BLAKE2B 06e46ab9f98e01534d2a49fc7a7715daa4bc621453a6f5799d6f969a2b8925802feba503d3a52d68186035fe9cb59659589bbd9c4c413486609e9cb78d6dd126 SHA512 29dfe149f8c10fd8e9a570f8ba19e601d147acf1b3b969dc99664bbf7dd18a5969a6877b14f04618938f43fecac820317c23cdfa786c9f63cc9f6aba2f01878d
diff --git a/net-misc/httpstat/httpstat-1.3.1.ebuild b/net-misc/httpstat/httpstat-1.3.1.ebuild
index 36a680823404..d4395f533cac 100644
--- a/net-misc/httpstat/httpstat-1.3.1.ebuild
+++ b/net-misc/httpstat/httpstat-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/reorx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="net-misc/curl:*"
diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index da2007e96685..8f61d2eb07fb 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -1,5 +1,5 @@
 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 867 BLAKE2B 6512bb7f349c3796d9cb06d9efc2627e06b7db6005f9ff283fbbccdc531775c5b7914480528be7c590f6121a83b1099ede2adbdc6c2d28d7f683ea9d3de2905c SHA512 ebd1b49c4b648638e41468a88370eedbe92e5fdc1dbff7ccfbb9e7645007d05b7f5b9e2d58864ac75e7a05bcbf254869db86add19bd439c40ef58dcfcc5ea7f3
+EBUILD ices-2.0.2.ebuild 861 BLAKE2B d29f4dd5774c568ea6d180621f971bc01c09788bddfa67b3e12b70926ba71546afaedb24c0995497996ceb114a85d8d9fba788d70486278e607f09393248b352 SHA512 30755da6e5409c9f61f79f27938e6fe4f044a13fa667e7901f7bb2824faa596a4b507e033a65405192884b76e6e891f89c957209d37b12ba64c489a6016e20ba
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/net-misc/ices/ices-2.0.2.ebuild b/net-misc/ices/ices-2.0.2.ebuild
index 02c0a2edefa3..34319a5138bc 100644
--- a/net-misc/ices/ices-2.0.2.ebuild
+++ b/net-misc/ices/ices-2.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit user
 
 DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding"
-HOMEPAGE="http://www.icecast.org/ices.php"
+HOMEPAGE="https://icecast.org/ices/"
 SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index e8ad0b9cf6a5..ee07f632c9cd 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,18 +1,5 @@
-AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aaf280a858e1ade2d34938f29026bc62c6b0b43919c26a909f2997d7caaaa5e9c82f139c8bc2aefc752aceeff6fe5f15f0c7b53618c SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34
-AUX iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch 1134 BLAKE2B cb6a700f3b0681e6abf5bfcfed3b5b4736aeba481e1b5334193cc32dab8e21134ed729d1b6b098495e46f59416f9d2c29f186b87143adcb2824f08058c7792ce SHA512 4e8bd9d4ae752dcdcb169eec1c42bc16d3f89cd1579140db74c3883da54145faea875513aca4bf8241208253b8950590fd615fe2ea7e448d431d509ff2e8dc03
-AUX iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch 2852 BLAKE2B a9375c41ba6dde249ec2a0a287eef68228198c7132dd145550c55a6f42b29d2e53160ef9a99455e0f60e2bb738f1a2dbeff016f2ce6903ead58c75bdcafeb618 SHA512 e9f322620ce2e10830c7127fdb64e68ea7bad59620e8b1ffd10ec9ee9f49f74500f0efe25de62feb0e1dd3cbd37af744263b53deeae8d78d44a6b9d335686afc
-AUX iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch 7935 BLAKE2B 550fc998feb6accae244baf8334d522ffcd6c464756f465c17298bef5338c8e746345026b72c95ff86aa14ef85223ca8cad4e00040f66b4e7aab3526296fc411 SHA512 1da0f189d47cb0b31cea5d1ea8081fbb2be0e55fb5b206cb366dce467bf0e557a2b77b2c8007993bdc91006a5f290269ae70e5d7e50f7fa5bdde93b0079d4e07
-AUX iputils-20200821-fclose.patch 1764 BLAKE2B d74fa527970ede1c52f5a361debe06f46d81821356008429165d7ccd4952e61610b567d9c7008b8ba0d6cf909af8bcc5026dc4b724e441486ff15307f32659f7 SHA512 b17db5137e4ebd1a32d2e051152f6f726b2c6350356ba57262f68a57765f8129a4af27c78620b46ed927217e543937b8f4ba0969ae64aeaa6e67d07c361341fe
-AUX iputils-20200821-getrandom-fallback.patch 1056 BLAKE2B 27cf7f9711f877bc55238cccc8714b17bf6e731d0e070e87ed915cf7d18f18019c768d2cea58048795772003408bbcc65c0a12f2fa3ca099b16d84e2ac558b7e SHA512 b1366b67dbee58744ac03dfda3d3daee4f86fada8cb5e44a9ed84ae669cfd2735aee6b21b80d7835e07ec5c42524f359601f6b09b0ac38dd93a18c319db98fe7
-AUX iputils-20200821-install-sbindir.patch 894 BLAKE2B 5947e4d94b802b23ba6160f47bf51208ebf5e056961fe8dee37c67a21dad3e485ebfaca0937089b65514f3c9ac14d0c161c200cdaa17f820e381679eef278214 SHA512 0cf552b0b2770aa061d8edf7a0b1a24ef58c8d1ded4d266224e56644281c9f19c724ee722eb7f35eac9c4a4e493089558a4d961686308a7ded3f776d2fca9553
-DIST iputils-20190709.tar.gz 404101 BLAKE2B 38e66366cc13a77b7da1a85afe7245891c6c7069c218bc8d5d0dd3664d07a5c4004aa6fc56c192b90bfacf2e5e103997cd671a236aa0a9932a5818eca1e10744 SHA512 5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5
-DIST iputils-20200821.tar.gz 504852 BLAKE2B 3ce31554937e28ca3edd204b4b4ba2d11a5eab4ed0d9257cc1f0df38e3ac4d9093f786f308c96c35e1b4909be5de51a0bfb25d890269d9bd7bdd3ea5f612c299 SHA512 4a57c3637cdd9aab2600682774e27370716cbdf1c7ac8ae61bf86c21c08701a5b697792df4aa95309b196eaa74f3cb6b2836a40f04da0e602156e982ac99d8c9
 DIST iputils-20210202.tar.gz 513055 BLAKE2B 37f3c10ff3918d40fe2eae1e4b19ed711b97c30cd2d682e42f484a11a28ab7c93975a51fbb7a8b1c1d725fc9051ae773bc2e81b9d80a2dd0e6ff55867d54875d SHA512 af600fe74e1b78c0da66c378f55eb468d62206aaae1864693f7ec79833c9c0de95843573d1792627695f08ecfcdb4e79c354065daf178d393fcc6ef9a8a5d526
-DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
-DIST iputils-manpages-20200821.tar.xz 19200 BLAKE2B 7d139ccac181eb3d74e3dcd2ba28cb906a0002aa4922de3e37771e2063234fa12428fa44bab3b50e43c40576a66d585a7460cf550afbeacd665fc41a3333d11a SHA512 0dd385565c9a15dfce668d637e055004a347056ee56260a4e726e7aa5ba5a6374aea8e9fc848dfe36b7609e5d92cb8c21f3e88f2d63e7cfe299489e41a17dc33
 DIST iputils-manpages-20210202.tar.xz 19204 BLAKE2B b9d43962890ae5fe9e4c21fb23c8911c22cbfb35a28521a2f0611d7813e4c21979f6b309569cdb57dd9b3a30653278982194ca08a815cfb41566a379930d124b SHA512 d5cced9a5e4acffbe35d20a796d038336d06f512c3ee47bc6e37782b4645d5c35b16e18aaae298547b60fe644e5608efe7847f2de6175bfcd39128d230ee4cd1
-EBUILD iputils-20190709-r1.ebuild 4900 BLAKE2B 29526dcceb55264321dda568e9852b6577aafe8c63c2a032dbef5d1770d0386ea3e282640f8d705701635aed681b50280dcae1d34e2ca7e6a0a83c27cd60b407 SHA512 6845469476c465dcf90505bde7c2e7a3d7be1fd2f02a2b5132e7e078fd6c14c842b938db246124a54ae8d8a82271b8f76978259e63889640a5840a787c500566
-EBUILD iputils-20200821-r2.ebuild 4403 BLAKE2B 1097736275825e4d919f656a5200d1e0e90865bb6569b15de343e67824b1696656681f83b3ab9a391ba1c98d7e3c7bdd16b35b30ddf401524f54a30963e60297 SHA512 a4fb9591459e620722662cb37fd143033285784f34b7584c2460d35ee1df4d5866ef7f25ead65eeed405c30511f4f7cdb50f1a8ba9af0ace3606dffddfc16ba1
-EBUILD iputils-20210202.ebuild 4195 BLAKE2B b9adbcf552e07ac65cb786882cb48babcfb37a31903a1a65ac2c4fb8aae8e75fd5c50960a7d465173388c1d1ec6785dd0178aee904329973cf1725b83990a7cb SHA512 8b1042db8c47a2f1c2f7125e70f0bbd62a046e683ba93ac15e747c456f45d965505dbc44c63d69fb37368a57f7117bbeeaa792ebc370af73930d1f25c846c262
+EBUILD iputils-20210202.ebuild 4187 BLAKE2B dc16aa0c366ba0d73e8b9aa52b6d5811af3c863bf237c17fb1883ce9aa73419f46a0580d6cabce5037cf732c3d27ca354e1694b5b0811466361f0271eb5e1485 SHA512 27713da5471b70f1460df74344137018827ab7e6b6c00749020e6b0497f2744b2a58564c064a56f4b46ff97d011286e69b2299daa7b8f7cc984cb3f917e8137b
 EBUILD iputils-99999999.ebuild 4195 BLAKE2B b9adbcf552e07ac65cb786882cb48babcfb37a31903a1a65ac2c4fb8aae8e75fd5c50960a7d465173388c1d1ec6785dd0178aee904329973cf1725b83990a7cb SHA512 8b1042db8c47a2f1c2f7125e70f0bbd62a046e683ba93ac15e747c456f45d965505dbc44c63d69fb37368a57f7117bbeeaa792ebc370af73930d1f25c846c262
-MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
+MISC metadata.xml 1509 BLAKE2B 800c6f657d331ad2f73fbd3e6a199732549f89ba31188e8caf5612008b89f60c6a7fb925f2740fcca07d3772f12ea9c5590de834e77201730b848a877061a97a SHA512 5b358f53068f6a49f00141c47f75fde84fe609fd6652e3e717b97b9d36abbfb80ea52c1ef8c2e3a850ab3724f1d4a87093b2bfc1ee5497d082ce1937dc3aa83d
diff --git a/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch b/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch
deleted file mode 100644
index 50e108b09e85..000000000000
--- a/net-misc/iputils/files/iputils-20150815-nonroot-floodping.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iputils-s20150815/ping.h
-+++ iputils-s20150815/ping.h
-@@ -61,7 +61,7 @@
- 
- #define	MAXWAIT		10		/* max seconds to wait for response */
- #define MININTERVAL	10		/* Minimal interpacket gap */
--#define MINUSERINTERVAL	200		/* Minimal allowed interval for non-root */
-+#define MINUSERINTERVAL	0		/* Minimal allowed interval for non-root */
- 
- #define SCHINT(a)	(((a) <= MININTERVAL) ? MININTERVAL : (a))
- 
diff --git a/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch b/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch
deleted file mode 100644
index 715ed45041b5..000000000000
--- a/net-misc/iputils/files/iputils-20190709-arping-revert-partially-fix-sent-vs-received-package.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 18f14be80466ddc8fb17a400be82764a779c8dcd Mon Sep 17 00:00:00 2001
-From: Sami Kerola <kerolasa@iki.fi>
-Date: Wed, 31 Jul 2019 21:28:12 +0100
-Subject: [PATCH] arping: revert partially - fix sent vs received packages
- return value
-
-Commit 84ca65ca980315c73f929fed8b6f16bbd698c3a0 caused regression.  The
-arping -D needs return value evaluation that was the earlier default, in
-other cases the new return value should be correct.
-
-Addresses: https://github.com/iputils/iputils/issues/209
-See-also: https://github.com/void-linux/void-packages/issues/13304
-Signed-off-by: Sami Kerola <kerolasa@iki.fi>
----
- arping.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/arping.c b/arping.c
-index 77c9c56..2c87c15 100644
---- a/arping.c
-+++ b/arping.c
-@@ -792,7 +792,11 @@ static int event_loop(struct run_state *ctl)
- 	close(tfd);
- 	freeifaddrs(ctl->ifa0);
- 	rc |= finish(ctl);
--	rc |= (ctl->sent != ctl->received);
-+	if (ctl->dad && ctl->quit_on_reply)
-+		/* Duplicate address detection mode return value */
-+		rc |= !(ctl->brd_sent != ctl->received);
-+	else
-+		rc |= (ctl->sent != ctl->received);
- 	return rc;
- }
- 
diff --git a/net-misc/iputils/files/iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch b/net-misc/iputils/files/iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch
deleted file mode 100644
index 9814707d7239..000000000000
--- a/net-misc/iputils/files/iputils-20190709-ping-fix-main-loop-over-multiple-addrinfo-results.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Benjamin Poirier <benjamin.poirier@gmail.com>
-Date: Thu, 26 Dec 2019 10:44:03 +0900
-Subject: ping: fix main loop over multiple addrinfo results
-
-Despite what the log of commit f68eec0eafad ("ping: perform dual-stack ping
-by default") says, main() was not designed to loop over multiple addresses
-returned by getaddrinfo().  This is apparent because until commit
-db11bc96a68c ("ping: make command to return from main()"), ping{4,6}_run()
-never returned (they always exited).  After commit db11bc96a68c, we
-encounter unexpected situations if getaddrinfo returns multiple results and
-ping{4,6}_run() return != 0.
-
-For example (notice echo reply is not received):
-
-    root@vsid:/src/iputils# ./builddir/ping/ping -w1 google.com
-    PING google.com(nrt12s22-in-x0e.1e100.net (2404:6800:4004:80c::200e)) 56 data bytes
-
-    --- google.com ping statistics ---
-    1 packets transmitted, 0 received, 100% packet loss, time 0ms
-
-    PING  (216.58.197.142) 56(84) bytes of data.
-
-    ---  ping statistics ---
-    1 packets transmitted, 0 received, 100% packet loss, time -1002ms
-
-    root@vsid:/src/iputils#
-
-Establish the following convention:
-
-* return value >= 0 -> exit with this code (same behavior as before commit
-  db11bc96a68c)
-
-* return value < 0 -> go on to next addrinfo result
-
-The second case will be used in the following patch.
-
-Fixes: db11bc96a68c ("ping: make command to return from main()")
-Signed-off-by: Benjamin Poirier <bpoirier@cumulusnetworks.com>
-Origin: https://github.com/iputils/iputils/commit/c249e48bb865e731896b7d8ceaf4bca7d28768b6
-Bug-Debian: https://bugs.debian.org/947921
-See-also: https://github.com/iputils/iputils/pull/244
----
- ping.c         | 6 +++++-
- ping6_common.c | 1 +
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/ping.c b/ping.c
-index 34653be..ae687b4 100644
---- a/ping.c
-+++ b/ping.c
-@@ -495,8 +495,11 @@ main(int argc, char **argv)
- 			error(2, 0, _("unknown protocol family: %d"), ai->ai_family);
- 		}
- 
--		if (ret_val == 0)
-+		if (ret_val >= 0)
- 			break;
-+		/* ret_val < 0 means to go on to next addrinfo result, there
-+		 * better be one. */
-+		assert(ai->ai_next);
- 	}
- 
- 	freeaddrinfo(result);
-@@ -504,6 +507,7 @@ main(int argc, char **argv)
- 	return ret_val;
- }
- 
-+/* return >= 0: exit with this code, < 0: go on to next addrinfo result */
- int ping4_run(int argc, char **argv, struct addrinfo *ai, socket_st *sock)
- {
- 	static const struct addrinfo hints = {
-diff --git a/ping6_common.c b/ping6_common.c
-index 6cc5404..731dc6d 100644
---- a/ping6_common.c
-+++ b/ping6_common.c
-@@ -551,6 +551,7 @@ int niquery_option_handler(const char *opt_arg)
- 	return ret;
- }
- 
-+/* return >= 0: exit with this code, < 0: go on to next addrinfo result */
- int ping6_run(int argc, char **argv, struct addrinfo *ai, struct socket_st *sock)
- {
- 	static const struct addrinfo hints = {
--- 
-2.25.0.rc2
-
diff --git a/net-misc/iputils/files/iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch b/net-misc/iputils/files/iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch
deleted file mode 100644
index a308fb7c9f63..000000000000
--- a/net-misc/iputils/files/iputils-20190709-ping-try-next-addrinfo-on-connect-failure.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From: Benjamin Poirier <benjamin.poirier@gmail.com>
-Date: Wed, 25 Dec 2019 13:33:12 +0900
-Subject: ping: try next addrinfo on connect failure
-
-On hosts that have routing rules matching on the outgoing interface [1],
-getaddrinfo() may return results sorted in a suboptimal order because it is
-not aware of the network interface passed to ping via the "-I" option.  In
-particular, address reachability detection may fail and getaddrinfo() will
-return ipv6 results first, even though the only routes available are ipv4.
-
-Improve user experience by trying next addrinfo entry if we encounter a
-failure at connect() time because of missing or unreachable routes.
-
-[1] For example, on switches running Cumulus Linux, the default VRF is used
-for front ports and a "mgmt" VRF is used for the management interface, which
-also handles all DNS traffic.  (VRFs apply different routing rules based on
-the iif/oif, ie.  influenced by SO_BINDTODEVICE.) In the default vrf, it's
-possible to ping an ipv4 address via the mgmt vrf by specifying "-I mgmt".
-However, that will fail if the target host is specified by name, has a AAAA
-record and there is no ipv6 route to it.
-
-Since libc commit 5ddb5bf5fb, getaddrinfo() does a udp connect to result
-addresses to check if there is a route to them.  This is to implement
-RFC3484 §6 Rule 1 ("Avoid unusable destinations") which is part of the
-algorithm to order results.  getaddrinfo() is unaware of ping's "-I" option
-and tries to connect its socket via the default vrf, which has no ipv6 route
-to the target host (and, in fact, no ipv4 route either).  Following this
-failure, getaddrinfo() returns results ordered according to
-/etc/gai.conf (Rule 6) - by default, ipv6 first.
-
-ping tries only the first entry returned by getaddrinfo() and fails to
-connect to it because there is no ipv6 route to the host, even in the mgmt
-vrf.  However, if getaddrinfo() had ordered the ipv4 result first or ping
-had tried the next addrinfo entry (the ipv4 one), ping could connect a udp
-socket to it and later successfully exchange icmp messages with it.
-
-Example:
-
-    cumulus@act-5812-10:~$ ip vrf list
-    Name              Table
-    -----------------------
-    mgmt              1001
-    cumulus@act-5812-10:~$ ip vrf identify
-    cumulus@act-5812-10:~$ # --> default vrf
-    cumulus@act-5812-10:~$
-    cumulus@act-5812-10:~$ ip rule
-    99:     from all to 10.230.0.53 ipproto udp dport 53 lookup mgmt
-    99:     from all to 10.20.249.1 ipproto udp dport 53 lookup mgmt
-    1000:   from all lookup [l3mdev-table]
-    32765:  from all lookup local
-    32766:  from all lookup main
-    32767:  from all lookup default
-
-    cumulus@act-5812-10:~$ ip route
-
-    cumulus@act-5812-10:~$ ip -6 route
-    ::1 dev lo proto kernel metric 256 pref medium
-
-    cumulus@act-5812-10:~$ ip route show vrf mgmt
-    default via 10.230.130.1 dev eth0
-    unreachable default metric 4278198272
-    10.230.130.0/24 dev eth0 proto kernel scope link src 10.230.130.211
-    127.0.0.0/8 dev mgmt proto kernel scope link src 127.0.0.1
-
-    cumulus@act-5812-10:~$ ip -6 route show vrf mgmt
-    ::1 dev mgmt proto kernel metric 256 pref medium
-    anycast fe80:: dev eth0 proto kernel metric 0 pref medium
-    fe80::/64 dev eth0 proto kernel metric 256 pref medium
-    ff00::/8 dev eth0 metric 256 pref medium
-    unreachable default dev lo metric 4278198272 pref medium
-
-    cumulus@act-5812-10:~$ host google.com
-    google.com has address 172.217.0.46
-    google.com has IPv6 address 2607:f8b0:4005:802::200e
-    google.com mail is handled by 30 alt2.aspmx.l.google.com.
-    google.com mail is handled by 40 alt3.aspmx.l.google.com.
-    google.com mail is handled by 20 alt1.aspmx.l.google.com.
-    google.com mail is handled by 10 aspmx.l.google.com.
-    google.com mail is handled by 50 alt4.aspmx.l.google.com.
-
-Success with numeric address
-
-    cumulus@act-5812-10:~$ ping -n -c1 -I mgmt 172.217.0.46
-    ping: Warning: source address might be selected on device other than mgmt.
-    PING 172.217.0.46 (172.217.0.46) from 10.230.130.211 mgmt: 56(84) bytes of data.
-    64 bytes from 172.217.0.46: icmp_seq=1 ttl=51 time=4.68 ms
-
-    --- 172.217.0.46 ping statistics ---
-    1 packets transmitted, 1 received, 0% packet loss, time 0ms
-    rtt min/avg/max/mdev = 4.675/4.675/4.675/0.000 ms
-
-Failure with host by name
-
-    cumulus@act-5812-10:~$ ping -n -c1 -I mgmt google.com
-    connect: No route to host
-
-Success when running in the mgmt vrf because getaddrinfo()'s address
-reachability test is effective and ipv4 result(s) are ordered first.
-
-    cumulus@act-5812-10:~$ ip vrf exec mgmt ping -n -c1 google.com
-    PING google.com (172.217.0.46) 56(84) bytes of data.
-    64 bytes from 172.217.0.46: icmp_seq=1 ttl=51 time=4.65 ms
-
-    --- google.com ping statistics ---
-    1 packets transmitted, 1 received, 0% packet loss, time 0ms
-    rtt min/avg/max/mdev = 4.650/4.650/4.650/0.000 ms
-
-For demonstration purposes, the following configuration allows one to
-reproduce a similar problem.  Starting from a host with a vanilla
-configuration, default ipv4 route using eth0, no ipv6 global routes:
-
-    root@vsid:~# ip route
-    default via 192.168.15.1 dev eth0
-    192.168.15.0/24 dev eth0 proto kernel scope link src 192.168.15.100
-
-    root@vsid:~# ip -6 route
-    ::1 dev lo proto kernel metric 256 pref medium
-    fe80::/64 dev eth0 proto kernel metric 256 pref medium
-
-    root@vsid:~# ip rou flush table main
-
-    root@vsid:~# ip rou add table 1 192.168.15.0/24 dev eth0
-
-    root@vsid:~# ip rou add table 1 default via 192.168.15.1
-
-    root@vsid:~# ip rule
-    0:    from all lookup local
-    32766:  from all lookup main
-    32767:  from all lookup default
-    root@vsid:~# ip rule add pref 1 to 192.168.15.1 ipproto udp dport 53 lookup 1
-    root@vsid:~# ip rule add pref 2 oif eth0 lookup 1
-    root@vsid:~# ping -c1 -I eth0 google.com
-
-    ping: connect: Network is unreachable
-
-With the current patch
-
-    root@vsid:~# /src/iputils/builddir/ping/ping -c1 -I eth0 google.com
-    PING  (172.217.174.110) from 192.168.15.100 eth0: 56(84) bytes of data.
-    64 bytes from nrt12s28-in-f14.1e100.net (172.217.174.110): icmp_seq=1 ttl=53 time=11.3 ms
-
-    ---  ping statistics ---
-    1 packets transmitted, 1 received, 0% packet loss, time 0ms
-    rtt min/avg/max/mdev = 11.313/11.313/11.313/0.000 ms
-
-Signed-off-by: Benjamin Poirier <bpoirier@cumulusnetworks.com>
-Origin: https://github.com/iputils/iputils/commit/2705c8248281fbb8efaa5326ab1d0ed0a670bd3d
-Bug-Debian: https://bugs.debian.org/947921
-See-also: https://github.com/iputils/iputils/pull/244
----
- ping.c         | 3 +++
- ping6_common.c | 7 ++++++-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/ping.c b/ping.c
-index 34653be..013c4e6 100644
---- a/ping.c
-+++ b/ping.c
-@@ -628,6 +628,9 @@ int ping4_run(int argc, char **argv, struct addrinfo *ai, socket_st *sock)
- 					error(2, errno, _("cannot set broadcasting"));
- 				if (connect(probe_fd, (struct sockaddr *)&dst, sizeof(dst)) == -1)
- 					error(2, errno, "connect");
-+			} else if ((errno == EHOSTUNREACH || errno == ENETUNREACH) && ai->ai_next) {
-+				close(probe_fd);
-+				return -1;
- 			} else
- 				error(2, errno, "connect");
- 		}
-diff --git a/ping6_common.c b/ping6_common.c
-index 6cc5404..bc1030b 100644
---- a/ping6_common.c
-+++ b/ping6_common.c
-@@ -651,8 +651,13 @@ int ping6_run(int argc, char **argv, struct addrinfo *ai, struct socket_st *sock
- 			firsthop.sin6_family = AF_INET6;
- 
- 		firsthop.sin6_port = htons(1025);
--		if (connect(probe_fd, (struct sockaddr *)&firsthop, sizeof(firsthop)) == -1)
-+		if (connect(probe_fd, (struct sockaddr *)&firsthop, sizeof(firsthop)) == -1) {
-+			if ((errno == EHOSTUNREACH || errno == ENETUNREACH) && ai->ai_next) {
-+				close(probe_fd);
-+				return -1;
-+			}
- 			error(2, errno, "connect");
-+		}
- 		alen = sizeof source6;
- 		if (getsockname(probe_fd, (struct sockaddr *)&source6, &alen) == -1)
- 			error(2, errno, "getsockname");
--- 
-2.25.0.rc2
-
diff --git a/net-misc/iputils/files/iputils-20200821-fclose.patch b/net-misc/iputils/files/iputils-20200821-fclose.patch
deleted file mode 100644
index cc370f0a5561..000000000000
--- a/net-misc/iputils/files/iputils-20200821-fclose.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e1c3d09b412ad0d022178344b8cbf748dc60f17f Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 24 Jan 2021 23:29:27 -0500
-Subject: [PATCH] tftpd: recvfile: avoid closing the file twice
-
-The close_stream function calls fclose, so don't call it again.
-
-This resolves an abort in glibc:
-
-    Message: Process 1038079 (tftpd) of user 65534 dumped core.
-
-    Stack trace of thread 1038079:
-    #0  0x00007f5f650ed204 raise (libc.so.6 + 0x39204)
-    #1  0x00007f5f650d6547 abort (libc.so.6 + 0x22547)
-    #2  0x00007f5f6512f25f n/a (libc.so.6 + 0x7b25f)
-    #3  0x00007f5f651372fa n/a (libc.so.6 + 0x832fa)
-    #4  0x00007f5f65138dc2 n/a (libc.so.6 + 0x84dc2)
-    #5  0x00007f5f65124b2f fclose (libc.so.6 + 0x70b2f)
-    #6  0x000055571a50de73 recvfile (tftpd + 0x2e73)
-    #7  0x000055571a50e064 tftp (tftpd + 0x3064)
-    #8  0x000055571a50e387 tftpd_inetd (tftpd + 0x3387)
-    #9  0x000055571a50e50f main (tftpd + 0x350f)
-    #10 0x00007f5f650d7e6d __libc_start_main (libc.so.6 + 0x23e6d)
-    #11 0x000055571a50d3ca _start (tftpd + 0x23ca)
-
-Fixes: 5d6be65 ("tftpd: remove global variables by using a run state struct")
-
-Reviewed-by: Petr Vorel <pvorel@suse.cz>
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- tftpd/tftpd.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c
-index 42998f9b..a09d32ba 100644
---- a/tftpd/tftpd.c
-+++ b/tftpd/tftpd.c
-@@ -387,7 +387,6 @@ void recvfile(struct run_state *ctl, struct formats *pf)
- 	write_behind(ctl->file, pf->f_convert);
- 	if (close_stream(ctl->file))
- 		syslog(LOG_ERR, "tftpd: write error: %s\n",  strerror(errno));
--	fclose(ctl->file);		/* close data file */
- 
- 	ap->th_opcode = htons((uint16_t)ACK);	/* send the "final" ack */
- 	ap->th_block = htons(block);
diff --git a/net-misc/iputils/files/iputils-20200821-getrandom-fallback.patch b/net-misc/iputils/files/iputils-20200821-getrandom-fallback.patch
deleted file mode 100644
index 5b69e5c88fb7..000000000000
--- a/net-misc/iputils/files/iputils-20200821-getrandom-fallback.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 469b41ac89b9f6772ea31df8379669d205be95f8 Mon Sep 17 00:00:00 2001
-From: Nuno Silva <nuno.m.ribeiro.silva@tecnico.ulisboa.pt>
-Date: Mon, 24 Aug 2020 19:34:53 +0100
-Subject: [PATCH] common: fix infinite loop when getrandom fails
-
-Fixes: https://github.com/iputils/iputils/issues/291
----
- iputils_common.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/iputils_common.c b/iputils_common.c
-index 58eacd0..c41f201 100644
---- a/iputils_common.c
-+++ b/iputils_common.c
-@@ -98,18 +98,24 @@ static unsigned int iputil_srand_fallback(void)
- void iputils_srand(void)
- {
- 	unsigned int i;
-+
- #if HAVE_GETRANDOM
- 	ssize_t ret;
- 
--	while ((ret = getrandom(&i, sizeof(i), GRND_NONBLOCK)) != sizeof(i)) {
--		switch(errno) {
-+	do {
-+		errno = 0;
-+		ret = getrandom(&i, sizeof(i), GRND_NONBLOCK);
-+		switch (errno) {
-+		case 0:
-+			break;
- 		case EINTR:
- 			continue;
- 		default:
- 			i = iputil_srand_fallback();
--			break;
-+			goto done;
- 		}
--	}
-+	} while (ret != sizeof(i));
-+ done:
- #else
- 	i = iputil_srand_fallback();
- #endif
diff --git a/net-misc/iputils/files/iputils-20200821-install-sbindir.patch b/net-misc/iputils/files/iputils-20200821-install-sbindir.patch
deleted file mode 100644
index cb1575841ccd..000000000000
--- a/net-misc/iputils/files/iputils-20200821-install-sbindir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8d1420f3019cd1caccf2ffa15a5873f0c61ab529 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 24 Jan 2021 22:39:03 -0500
-Subject: [PATCH] tftpd: install into sbindir
-
-The xinet.d config expects the daemon to live in sbindir.
-
-Closes: https://github.com/iputils/iputils/pull/310
-
-Reviewed-by: Petr Vorel <pvorel@suse.cz>
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- tftpd/meson.build | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tftpd/meson.build b/tftpd/meson.build
-index 6e508a24..b4cf6812 100644
---- a/tftpd/meson.build
-+++ b/tftpd/meson.build
-@@ -3,7 +3,8 @@ inc = include_directories('..')
- executable('tftpd', ['tftpd.c', 'tftpsubs.c', git_version_h],
- 	include_directories : inc,
- 	link_with : [libcommon],
--	install: true)
-+	install: true,
-+	install_dir: sbindir)
- 
- subs = configuration_data()
- subs.set('sbindir', sbindir)
diff --git a/net-misc/iputils/iputils-20190709-r1.ebuild b/net-misc/iputils/iputils-20190709-r1.ebuild
deleted file mode 100644
index 8c5d1387e1a0..000000000000
--- a/net-misc/iputils/iputils-20190709-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces dependencies.
-# To regenerate man/html pages emerge iputils-99999999[doc] with
-# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
-
-EAPI="7"
-
-PLOCALES="ja"
-
-inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
-
-BDEPEND="virtual/pkgconfig"
-
-LIB_DEPEND="
-	caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn2:=[static-libs(+)] )
-	ipv6? (
-		ssl? (
-			gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-			!gcrypt? (
-				nettle? ( dev-libs/nettle[static-libs(+)] )
-				!nettle? ( dev-libs/openssl:0=[static-libs(+)] )
-			)
-		)
-	)
-	nls? ( sys-devel/gettext[static-libs(+)] )
-"
-
-RDEPEND="
-	traceroute6? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-	static? ( ${LIB_DEPEND} )
-"
-
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-ns-stylesheets
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt:0
-	"
-fi
-
-[ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-arping-revert-partially-fix-sent-vs-received-package.patch
-	"${FILESDIR}"/${P}-ping-try-next-addrinfo-on-connect-failure.patch
-	"${FILESDIR}"/${P}-ping-fix-main-loop-over-multiple-addrinfo-results.patch
-)
-
-src_prepare() {
-	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
-
-	default
-
-	l10n_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local emesonargs=(
-		-DUSE_CAP="$(usex caps true false)"
-		-DUSE_IDN="$(usex idn true false)"
-		-DBUILD_ARPING="$(usex arping true false)"
-		-DBUILD_CLOCKDIFF="$(usex clockdiff true false)"
-		-DBUILD_PING="true"
-		-DBUILD_RARPD="$(usex rarpd true false)"
-		-DBUILD_RDISC="$(usex rdisc true false)"
-		-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
-		-DBUILD_TFTPD="$(usex tftpd true false)"
-		-DBUILD_TRACEPATH="$(usex tracepath true false)"
-		-DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)"
-		-DBUILD_NINFOD="false"
-		-DNINFOD_MESSAGES="false"
-		-DNO_SETCAP_OR_SUID="true"
-		-Dsystemdunitdir="$(systemd_get_systemunitdir)"
-		-DUSE_GETTEXT="$(usex nls true false)"
-	)
-
-	if use ipv6 && use ssl ; then
-		emesonargs+=(
-			-DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))"
-		)
-	else
-		emesonargs+=(
-			-DUSE_CRYPTO="none"
-		)
-	fi
-
-	if [[ "${PV}" == 99999999 ]] ; then
-		emesonargs+=(
-			-DBUILD_HTML_MANS="$(usex doc true false)"
-			-DBUILD_MANS="true"
-		)
-	else
-		emesonargs+=(
-			-DBUILD_HTML_MANS="false"
-			-DBUILD_MANS="false"
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_compile() {
-	tc-export CC
-	meson_src_compile
-}
-
-src_install() {
-	meson_src_install
-
-	dodir /bin
-	local my_bin
-	for my_bin in $(usex arping arping '') ping ; do
-		mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
-	done
-	dosym ping /bin/ping4
-
-	if use tracepath ; then
-		dosym tracepath /usr/bin/tracepath4
-	fi
-
-	if use ipv6 ; then
-		dosym ping /bin/ping6
-
-		if use tracepath ; then
-			dosym tracepath /usr/bin/tracepath6
-			dosym tracepath.8 /usr/share/man/man8/tracepath6.8
-		fi
-	fi
-
-	if [[ "${PV}" != 99999999 ]] ; then
-		local -a man_pages
-		local -a html_man_pages
-
-		while IFS= read -r -u 3 -d $'\0' my_bin
-		do
-			my_bin=$(basename "${my_bin}")
-			[[ -z "${my_bin}" ]] && continue
-
-			if [[ -f "${S}/doc/${my_bin}.8" ]] ; then
-				man_pages+=( ${my_bin}.8 )
-			fi
-
-			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
-				html_man_pages+=( ${my_bin}.html )
-			fi
-		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
-
-		pushd doc &>/dev/null || die
-		doman "${man_pages[@]}"
-		if use doc ; then
-			docinto html
-			dodoc "${html_man_pages[@]}"
-		fi
-		popd &>/dev/null || die
-	else
-		if use doc ; then
-			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/iputils/iputils-20200821-r2.ebuild b/net-misc/iputils/iputils-20200821-r2.ebuild
deleted file mode 100644
index 55b1e38f169b..000000000000
--- a/net-misc/iputils/iputils-20200821-r2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces dependencies.
-# To regenerate man/html pages emerge iputils-99999999[doc] with
-# EGIT_COMMIT set to release tag, all USE flags enabled and
-# tar ${S}/doc folder.
-
-EAPI="7"
-
-PLOCALES="de fr ja pt_BR tr uk zh_CN"
-
-inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6"
-
-BDEPEND="virtual/pkgconfig"
-
-LIB_DEPEND="
-	caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn2:=[static-libs(+)] )
-	nls? ( sys-devel/gettext[static-libs(+)] )
-"
-
-RDEPEND="
-	traceroute6? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-	static? ( ${LIB_DEPEND} )
-"
-
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-ns-stylesheets
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt:0
-	"
-fi
-
-[ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
-
-PATCHES=(
-	"${FILESDIR}/iputils-20200821-getrandom-fallback.patch"
-	"${FILESDIR}/iputils-20200821-fclose.patch"
-	"${FILESDIR}/iputils-20200821-install-sbindir.patch"
-)
-
-src_prepare() {
-	default
-
-	l10n_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local emesonargs=(
-		-DUSE_CAP="$(usex caps true false)"
-		-DUSE_IDN="$(usex idn true false)"
-		-DBUILD_ARPING="$(usex arping true false)"
-		-DBUILD_CLOCKDIFF="$(usex clockdiff true false)"
-		-DBUILD_PING="true"
-		-DBUILD_RARPD="$(usex rarpd true false)"
-		-DBUILD_RDISC="$(usex rdisc true false)"
-		-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
-		-DBUILD_TFTPD="$(usex tftpd true false)"
-		-DBUILD_TRACEPATH="$(usex tracepath true false)"
-		-DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)"
-		-DBUILD_NINFOD="false"
-		-DNINFOD_MESSAGES="false"
-		-DNO_SETCAP_OR_SUID="true"
-		-Dsystemdunitdir="$(systemd_get_systemunitdir)"
-		-DUSE_GETTEXT="$(usex nls true false)"
-	)
-
-	if [[ "${PV}" == 99999999 ]] ; then
-		emesonargs+=(
-			-DBUILD_HTML_MANS="$(usex doc true false)"
-			-DBUILD_MANS="true"
-		)
-	else
-		emesonargs+=(
-			-DBUILD_HTML_MANS="false"
-			-DBUILD_MANS="false"
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_compile() {
-	tc-export CC
-	meson_src_compile
-}
-
-src_install() {
-	meson_src_install
-
-	dodir /bin
-	local my_bin
-	for my_bin in $(usex arping arping '') ping ; do
-		mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
-	done
-	dosym ping /bin/ping4
-
-	if use tracepath ; then
-		dosym tracepath /usr/bin/tracepath4
-	fi
-
-	if use ipv6 ; then
-		dosym ping /bin/ping6
-
-		if use tracepath ; then
-			dosym tracepath /usr/bin/tracepath6
-			dosym tracepath.8 /usr/share/man/man8/tracepath6.8
-		fi
-	fi
-
-	if [[ "${PV}" != 99999999 ]] ; then
-		local -a man_pages
-		local -a html_man_pages
-
-		while IFS= read -r -u 3 -d $'\0' my_bin
-		do
-			my_bin=$(basename "${my_bin}")
-			[[ -z "${my_bin}" ]] && continue
-
-			if [[ -f "${S}/doc/${my_bin}.8" ]] ; then
-				man_pages+=( ${my_bin}.8 )
-			fi
-
-			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
-				html_man_pages+=( ${my_bin}.html )
-			fi
-		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
-
-		pushd doc &>/dev/null || die
-		doman "${man_pages[@]}"
-		if use doc ; then
-			docinto html
-			dodoc "${html_man_pages[@]}"
-		fi
-		popd &>/dev/null || die
-	else
-		if use doc ; then
-			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/iputils/iputils-20210202.ebuild b/net-misc/iputils/iputils-20210202.ebuild
index 82b60db38922..c60375ef537e 100644
--- a/net-misc/iputils/iputils-20210202.ebuild
+++ b/net-misc/iputils/iputils-20210202.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
index 6d135dfdb422..11c6f638649b 100644
--- a/net-misc/iputils/metadata.xml
+++ b/net-misc/iputils/metadata.xml
@@ -15,7 +15,6 @@
     <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag>
     <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag>
     <flag name="traceroute6">Build and install deprecated traceroute6 tool. It's recommended to use <pkg>net-analyzer/traceroute</pkg> instead.</flag>
-    <flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This is generally a very bad idea.</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 09bf226db1ed..d996bdeabef4 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -6,5 +6,5 @@ DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2
 EBUILD ipv6calc-1.0.0.ebuild 1487 BLAKE2B 2bea35e2df217cee666c20940c365e91976eb70cf752653148138649e1c80c35514d13b2eb3571a401c3413fb9b29c24fa3e297c0d6837bd57bb4618b340b1e3 SHA512 93bb58646c27e30c067f003bd8b79c8d9562e63c2db39c80e207913760c1bcc46ec3e14cb343466d0a5a2f8a4d9cf037abdabcac520cd06a950f364c705f189f
 EBUILD ipv6calc-2.1.0.ebuild 1525 BLAKE2B 2fb920cc7f827d4b6d272f8a50418a6382ea82ac64ed7ed79c2cd2faa76240b0656ba02b1184207c9de2161b13b176ea283db9713bb6ebd5ad9d3a1ddbc0c00a SHA512 2e3653a9c4a8b48d2f61a8ff3d46f2218cf9a407ed48c2add7d8a04f686984c046491ec6f0f2235daa20c935bb50e754ff63f85778efe21a7dd8e174f408a86c
 EBUILD ipv6calc-2.1.1.ebuild 1528 BLAKE2B fd6b294ac662f84c8f4812e1049ca3c546ddb66fd126a49154b076833745aa217660f89ce4049207a8177c306e1ec2e724dd7120175ff49fcce86bc012861ba1 SHA512 297f6571f673e48b0edab519cfdea211f62bd07a8ba0570acb6a68592f468661b9e9bb12ae66710c36893eaf76d36a46fc66cb540cf9680036dc6a33471cfc07
-EBUILD ipv6calc-2.2.0.ebuild 1575 BLAKE2B 1bea82fa8be3c154ecea8324de86ec094a9a694a4c310cf75d31bfdc40ff3f082117845f6313ffa1c25958f4e31423c11a23209b0b70fd12343cae6ba7014a6f SHA512 343345be48aff2368136549fcc4670429d03aaf0488f8877be70b0a7054c69444bd70ed1add74eedb3fb32380e067f2f79c0a170c30b3fa501d9518c29579a52
+EBUILD ipv6calc-2.2.0.ebuild 1574 BLAKE2B f1a636fe26ceb3618358222498bd68e517c0ed1a4c77d002e8f44d1984641b68cbbc4976b994659b4d6320de7afc244ad3e6a817550b341c3e12a73ab6abcf52 SHA512 a094719eee65deee5e3067fa2c348dfcaa2f7544191f292c94db7b75baaed2932422683bbd8a3b0d73f9bd27f444c226496d396f2b55e735da75e59cf74defd3
 MISC metadata.xml 334 BLAKE2B 78e76af76293fbb24c7ad6bd4f884a67d449c26d4fd7b4ff220a324f5d421c51d56d53800b2116a02777e59c3d6f4a353823c3df31073c9676443c9816fadfe3 SHA512 ef70d2c2da48d173396b2dbb2e13104ca57e7c9ab81150c07c3c166604168984d37934815eb34a4e26c2cadbdbdcaea8983141c6eea6a36b26dfb4e89157ae6e
diff --git a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
index 8e201fbd4650..498fe326ea83 100644
--- a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="geoip test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 61a10f8de35c..1b096570e919 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,4 +1,6 @@
 AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec20ba60b3e40733fcc2b223286466c9f4eb60fbe49cd9ce239f95e7e1cccb5b5b1df2e88893 SHA512 98f08cd0bef699bdd8da026efbf211c5bf8dfa5bb24bd4438581dd4acf6cbabdb42e19de5a5d8ae9db74bafea86fb316ff75f3278c255cab7277f95681578044
 DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad
+DIST omniORB-4.2.4.tar.bz2 2713397 BLAKE2B 5759b2563dca421b9a994bb13c30ce6dd98324a2357c4908130a42ce5baec357b881c22b4dff27809607ebde27e7cd65305a91aa5cbdb6d68a19df1f36524e72 SHA512 0b142b127175f16f844823e5adf5593b290528646e13a4c30f6cbd92d159d3998a81b952717039c3f0e386f79404ddd18a3de35fc45fa88383d1d9e51064d988
 EBUILD omniORB-4.2.2.ebuild 2356 BLAKE2B 399814240e5c0b85626ffb6800812207be3d7a3929d2defb4fc7a0f857d9d3f0187eb6986602696f636d30dcc527a85f7d51a985cef437196eb238ddfc750919 SHA512 f1019973a9c3feab9b118df4f9dd76cc028e995e5ec488f7b2d9822cf030ab1a9cb8c5ecd2779a3595cf2e4b3d5772653f95e18bdd11406c0a474a3e8460aaae
+EBUILD omniORB-4.2.4.ebuild 2360 BLAKE2B 125f9d6421b3a5f2b985a39d8005027c6f056296f380008215a69e725e883f45bae8dd69ed56a764263b75c994973a9b8404653231569651b5ffb121c8ef6a2c SHA512 fefb14322b1a452eab1bde9fdb3f6a5a1f637f57064381e1ef7268f4620e1b4fde60ea5d08bd13d09355e8a29b3dd2166d4262942212e3bfe81758bac03147c6
 MISC metadata.xml 247 BLAKE2B c2c840442760456aa29eeda2b225baa3eca5af75444074a09d500b1063f59ce978b5053c0d79fb7cd3717a477ef8e8e343dcf731a5a99e27058b0528c5066a4f SHA512 d76af24fd2513c0ed4a1f3066c9e9b9eb6407d1c013f22b3bcc9646fb771560c45c42c3851075ce9aa32bfe6ef68534cf1ccd3fefc9657fdb0b2794424ab8d1f
diff --git a/net-misc/omniORB/omniORB-4.2.4.ebuild b/net-misc/omniORB/omniORB-4.2.4.ebuild
new file mode 100644
index 000000000000..3c0e6d3f124b
--- /dev/null
+++ b/net-misc/omniORB/omniORB-4.2.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit python-single-r1
+
+MY_P="${P/_p/-}"
+DESCRIPTION="A robust, high-performance CORBA 2 ORB"
+HOMEPAGE="http://omniorb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ipv6 ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# The OPTC(XX)FLAGS variables aren't present in these files, but we
+	# will set them when we call emake.
+	sed \
+		-e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
+		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
+		-i mk/beforeauto.mk.in mk/platforms/i586_linux_2.0*.mk || \
+		die "failed to switch CFLAGS variables in the makefile includes"
+
+	# The out-of-source build is suggested by upstream.
+	mkdir build || die "failed to create build directory"
+}
+
+src_configure() {
+	cd build || die "failed to change into the build directory"
+
+	ECONF_SOURCE=".." econf \
+				--disable-static \
+				--with-omniORB-config=/etc/omniorb/omniORB.cfg \
+				--with-omniNames-logdir=/var/log/omniORB \
+				--libdir="/usr/$(get_libdir)" \
+				$(use_enable ipv6) \
+				$(use_with ssl openssl "/usr")
+}
+
+src_compile() {
+	cd build || die "failed to change into the build directory"
+	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	cd build || die "failed to change into the build directory"
+	default
+
+	rm "${ED}/usr/bin/omniidlrun.py" || \
+		die "failed to remove redundant omniidlrun.py"
+
+	cd "${S}" || die "failed to change into the ${S} directory"
+
+	dodoc CREDITS doc/*.html ReleaseNotes.txt update.log
+	dodoc -r doc/omniORB
+
+	if use doc; then
+		dodoc doc/*.pdf
+	fi
+
+	cat <<- EOF > "${T}/90omniORB"
+		PATH="/usr/share/omniORB/bin/scripts"
+		OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
+	EOF
+	doenvd "${T}/90omniORB"
+	doinitd "${FILESDIR}"/omniNames
+
+	cp "sample.cfg" "${T}/omniORB.cfg" || die
+	cat <<- EOF >> "${T}/omniORB.cfg"
+		# resolve the omniNames running on localhost
+		InitRef = NameService=corbaname::localhost
+	EOF
+	insinto /etc/omniorb
+	doins "${T}"/omniORB.cfg
+
+	keepdir /var/log/omniORB
+
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/omniidl
+}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index b0afe115d35b..14eb214306a2 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,7 @@
 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 1705 BLAKE2B facfdddc435961582f8f437113f49efac9f65d027a6263aa38f2d31768c3737602756069ec201309c8275c50a0575b01d95124f701e7818f29ebdadd5a285b80 SHA512 096f01563f6af4253eeba726724f17caa681bc658f767254da6326310fa040a0784e952a6d65e0e2da47332b52df3c28379de1dde6603f04c02bba9b689c0b07
 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.75.ebuild b/net-misc/putty/putty-0.75.ebuild
new file mode 100644
index 000000000000..de62fdf29a9f
--- /dev/null
+++ b/net-misc/putty/putty-0.75.ebuild
@@ -0,0 +1,95 @@
+# 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 1ff9c946e76d..1f52fe9c9c51 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,5 +1,5 @@
-DIST Remmina-v1.4.12.tar.gz 2338965 BLAKE2B 86ec07a2c5ff0957cc3d855a4cc86c9675aa474110d7d40d202817f01c4d5815c008a5f0f78802e9b3ef14b3590d58ccbb124e2b6c6f0b14ea8c8592a4d8bd50 SHA512 7ae8031ff64c113b0ed792c6ba56c42918ccce5a30fe0255f730ef7a5a712dc500495e591598fd6cc553c09c6d5a2457e33f4dc1019403e89b25cc02e491515d
 DIST Remmina-v1.4.13.tar.gz 2519879 BLAKE2B ff2410ffbdea4509866b41e47eaa8caafb7f45091047eff9a830590b7a04c25cbbdec5788ccf9f35afdee613722e74e7595b73b4c3c8eea2fa3ffb4e09411d99 SHA512 cf82dc90f021635bcde906a73a2ad59087fe7cbe1bdd69a828ffc1e04ea0cc1bfa23386b70c36df85ae41dfa17f2d4379bedff29c03d9838c6ac18347e06b6dc
-EBUILD remmina-1.4.12.ebuild 2454 BLAKE2B 1107f512ad9c7c860c5f0877ab97681f5ed28dad4c64730ea06f1864607f7c3d7240eb6655bdf943fa2bd169ca47a736ae8fd36fea65d08944f102797ed30ea1 SHA512 be98439fa5ca5899eafb9be3fa6f47f0b40365b118bc81a520687a21e30bd727e1ec07344100d6d9cddf385b0824505bdfdf761da4089228dadf15569273090f
+DIST Remmina-v1.4.16.tar.gz 2615347 BLAKE2B 5cff71d94bf66dd0116be739646c33a601a83deb8fef1cfcddf9c197eb34458ea97f6e45e96e7e0bab7fbfb6d95c6150e5c72c6d5aae5f23bfedc8f080e00ade SHA512 a9b42ba95ab9c5f985c5c359d0fb138d73ca5f0f9199cb9e84e522d1e11c50f9fe2b8c943d64242e367f4185fd9eb0c764321ba9d4ab9a09c5c5c1dc37c0ba78
 EBUILD remmina-1.4.13.ebuild 2491 BLAKE2B 70f498068e3529e7e8a3d46d937f4a76faee8b5eae69d12f07a5c8785f5c2c496f4331d5770cb6e4cf6b408fae859c14a40573892484a1a75dcc97b83163d108 SHA512 d142b8d3bbf6b4520a77564d6be9e01cc02e9df66e82ac38ef70f2e1cfce9378418f107d4859416606bf5aadc108792bc1039b4f63161ea97cb2d7ca0546d470
-MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
+EBUILD remmina-1.4.16.ebuild 2526 BLAKE2B ca1d007130661aafd360d7e11275b4227580a6f252a605b5be69f857e6f4815d58386592d23675817b143602450015c26e8cec88530d694ad34dd5e8dd347faa SHA512 52b8ac1fc61154b8359b1a037717a0f485439efcfe3f3261879d17701d46a48ea3641c130b84f77feb8afc093710d1cceee13cc173cc26dd88a6a7bcfadca7bb
+MISC metadata.xml 1179 BLAKE2B cd5ed669c77987fc48b69e50632cbdcff804a9eea251b1f2591e47ee22f9e7d0e7922fc23b7b8f8846e15d8d201b9bf177fcba75d3bca75118f912f63ee58f88 SHA512 88b7748273b1cb9e625352a30820fdeb56e78207e5d06049c20406b371859713fcf5a7053578c9df41369ba12d35b3031e1e95919a34529f5f95246727a33c9c
diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml
index 253b4e8ff61d..6c790d0c7d65 100644
--- a/net-misc/remmina/metadata.xml
+++ b/net-misc/remmina/metadata.xml
@@ -14,6 +14,7 @@
 		Currently RDP, VNC, SPICE, NX, XDMCP and SSH are supported.
 	</longdescription>
 	<use>
+		<flag name="gvnc">Enable GVNC plugin using gtk-vnc, suitable for KVM and Vino servers</flag>
 		<flag name="kwallet">Enable KDE Wallet plugin</flag>
 		<flag name="spice">Support connecting to SPICE-enabled virtual machines</flag>
 		<flag name="ssh">Enable support for SSH/SFTP protocol</flag>
diff --git a/net-misc/remmina/remmina-1.4.12.ebuild b/net-misc/remmina/remmina-1.4.16.ebuild
index a680d0156b38..e7bceef93c0f 100644
--- a/net-misc/remmina/remmina-1.4.12.ebuild
+++ b/net-misc/remmina/remmina-1.4.16.ebuild
@@ -13,13 +13,16 @@ 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"
+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
@@ -31,8 +34,8 @@ DEPEND="
 		<net-misc/freerdp-3[X]
 		cups? ( net-print/cups:= ) )
 	gnome-keyring? ( app-crypt/libsecret )
+	gvnc? ( net-libs/gtk-vnc )
 	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 )
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index a83d05555130..7fe0d34eb776 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -1,3 +1,5 @@
+AUX s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch 1927 BLAKE2B 76d18015437f5b9b2ec0ed2a573189a711ec055366dfe44d8a6557d0b240b9aad4f1f9a145b845a692acb93f3ab0c27b5cf70fa3626b90c6822ff026144e8801 SHA512 57302dc8238980ef28a273c2d91f5a099aad25855c246bf0dff2e64fede9efb8a6ad9ccd1a23df5e753e620080ac7ee4c02ce0f0c3c867210e5b49d53697e796
 DIST s3cmd-2.1.0.tar.gz 127120 BLAKE2B 4282f616eb7ca97fa0d529a2c5acc1359f88888d182b62e1fa7d3f7401a93852a4e0724363a4c6f0a6520d6aef290d64e1775cb252fc0fbaa4b94762402c381e SHA512 98156218c4379e233185662d29fa4299b4a4e45a0fe143a145f30ff7d03362a4558b5fff5e5da0da850f5cce2c760fcd031bcf5ff7a6bd2c6352259e791d65e6
+EBUILD s3cmd-2.1.0-r1.ebuild 622 BLAKE2B 56f38ff9027933c54bdc421977e9c7b719d5583613da66250658e490ab1d18bda9f9c32f99a4764e221ba2ddd07c6bd7f35bafe059362963d50aeb4105fcdc3f SHA512 8901d811fb89a3ed9e7b7ba08e5c746d1b0fd7095eadfe65393acccfcaa9924da4d042033956b406b475f80b66be5f2437211faf43e76b03ae8836e320c9e29d
 EBUILD s3cmd-2.1.0.ebuild 548 BLAKE2B e3ed8df8e2c54fa963b625bd9394a89dc326403470eaac824e64d6bd2b912dee1a7bc3bdc46a0a488304a86e2f472abe0ac8e6a1163df128cffc80b16e4d37e5 SHA512 da0b560f6ed2acf6d7cd00c6f8c8bbb825f32e49f25e6f05503928e0bbbec7c6803b39cae35ff17e5a75bc9a6896015a0e5d713eb1ee6c3ebb08ef730d57580b
 MISC metadata.xml 714 BLAKE2B 2a7000a762de00a18e30b131609496815f2f47405684af84eeb5de35d6a29762eb7be897912ef0d75e1c43d14e01ab4f552cd77cc661553556277f0ca802b12f SHA512 7107fcd23b90ed1b5cf3d454112ab5d673569da5f14cd41f9f430b643ad0837fe6d713f9584a09547c8d33dbe8e5e3352c360b25dca99dfbb8f2eaa84b4007e5
diff --git a/net-misc/s3cmd/files/s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch b/net-misc/s3cmd/files/s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch
new file mode 100644
index 000000000000..92d90c6df9b4
--- /dev/null
+++ b/net-misc/s3cmd/files/s3cmd-2.1.0-fix-compatibility-with-Python-3.9.patch
@@ -0,0 +1,57 @@
+From 4806955e05011c3d981e91c12a95d84ab3aa65d4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <obudai@redhat.com>
+Date: Fri, 2 Oct 2020 14:24:09 +0200
+Subject: [PATCH] fix compatibility with Python 3.9
+
+getchildren() method was removed from the ElementTree and Element classes in
+Python 3.9. See the release notes:
+
+https://docs.python.org/3.9/whatsnew/3.9.html#removed
+---
+ S3/Exceptions.py | 2 +-
+ S3/Utils.py      | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/S3/Exceptions.py b/S3/Exceptions.py
+index d12c5c5..2710d82 100644
+--- a/S3/Exceptions.py
++++ b/S3/Exceptions.py
+@@ -126,7 +126,7 @@ class S3Error (S3Exception):
+         if not error_node.tag == "Error":
+             error_node = tree.find(".//Error")
+         if error_node is not None:
+-            for child in error_node.getchildren():
++            for child in error_node:
+                 if child.text != "":
+                     debug("ErrorXML: " + child.tag + ": " + repr(child.text))
+                     info[child.tag] = child.text
+diff --git a/S3/Utils.py b/S3/Utils.py
+index b9f4fd5..1f66f6c 100644
+--- a/S3/Utils.py
++++ b/S3/Utils.py
+@@ -64,9 +64,9 @@ def parseNodes(nodes):
+     retval = []
+     for node in nodes:
+         retval_item = {}
+-        for child in node.getchildren():
++        for child in node:
+             name = decode_from_s3(child.tag)
+-            if child.getchildren():
++            if len(child):
+                 retval_item[name] = parseNodes([child])
+             else:
+                 found_text = node.findtext(".//%s" % child.tag)
+@@ -122,8 +122,8 @@ __all__.append("getListFromXml")
+ 
+ def getDictFromTree(tree):
+     ret_dict = {}
+-    for child in tree.getchildren():
+-        if child.getchildren():
++    for child in tree:
++        if len(child):
+             ## Complex-type child. Recurse
+             content = getDictFromTree(child)
+         else:
+-- 
+2.26.3
+
diff --git a/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild b/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..8fd4a4deed4d
--- /dev/null
+++ b/net-misc/s3cmd/s3cmd-2.1.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Command line client for Amazon S3"
+HOMEPAGE="https://s3tools.org/s3cmd"
+SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-magic[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${P/_/-}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-compatibility-with-Python-3.9.patch" )
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 5acee2de6d77..c80dfb25cfb2 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,11 +1,7 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305
-DIST whois-5.5.6.tar.gz 103581 BLAKE2B 7e4aebeb440b95a278a0f0d0e51dbec2003599ee9f6e6355f29a5b043ba5cbad19310058964120142d417e6a5df86bd68d03d7ac4358be488538584c2a56740f SHA512 97a139a8e24b9a92c5597bc31e1b8d5d5bcab1ec4cc53f80cbdb7f2e5b7e54f36b3a8a8d90fd7b86452aad36adc0ba2015aaf936643b290c8a777f5f6cb27ef3
-DIST whois-5.5.8.tar.gz 102750 BLAKE2B 87225c4472d4ac26b44f25773b5c2ec3696b8e00cf8ad48f551fcb0b1aa96b5d2b59cf09067a43f78af44caaf20bbd072c4a19f12bffee9d5566524bb21df763 SHA512 80f748f34aae9bd6053bc5c9357b7ffa8d713972486b2bf091b04378082dfe13e368de6873fc1de647527e74b07ff5a4198ff1bbd10152097341534668b5cdb7
 DIST whois-5.5.9.tar.gz 102516 BLAKE2B f5f15568558e9f82ed19dbd35fd43f3067953d4766477f71bfb5d638cbf328fe95012633daa90ad14a6bdf836161967684562f6e028bc204f2a9ed539600c92d SHA512 ab70181220a6d41dd9add04bd81836c89a626de1b45f617e9ab044a666f0ab99a4dee910cff4b0a6a3e47b5e0a7320c2c20f3ff95c2dfc852123d4f672629e16
-EBUILD whois-5.5.6-r1.ebuild 1929 BLAKE2B a24c8553e97f60f5e1ca03534c07c863269354409da13a2eb45a9d4e26a5a6d24c7de7f20d47534e1a7bfa9aaf3fbb05a0d9dab5330e500c8b7ebe7461cd6509 SHA512 c97c5a688863392a7c20b41a05c0d23f1a9dfc77f7f2f998fbfffbb8cc709accaa0687ddaa87754dd93f77bcfa4a2c15ebc3288280fe733d76e01e446764bb9b
-EBUILD whois-5.5.8.ebuild 1913 BLAKE2B fba85f7bcc9bd4132a95dd3cbe7070bfd6fef092626ef54f704b3978a2198c0a1b5e60451bf3bfcc080a1001ea319b8733c40f4e8aa430158a8cd455e9efd00d SHA512 4028276f4513a5a03fddb0eae2af822d1727a90baa11dc4728d97e7902220863fb9b99f566ff5e65d0a2a5ae2f4d80fa39e3a10cc9960033c73c062411837d15
-EBUILD whois-5.5.9.ebuild 1913 BLAKE2B fba85f7bcc9bd4132a95dd3cbe7070bfd6fef092626ef54f704b3978a2198c0a1b5e60451bf3bfcc080a1001ea319b8733c40f4e8aa430158a8cd455e9efd00d SHA512 4028276f4513a5a03fddb0eae2af822d1727a90baa11dc4728d97e7902220863fb9b99f566ff5e65d0a2a5ae2f4d80fa39e3a10cc9960033c73c062411837d15
+EBUILD whois-5.5.9.ebuild 1906 BLAKE2B 134054616f8e108d3668d4dcba8cd2ccdb78834c7a83f9342942e4b43487f537500a4e16524276787f80a43b56d9d4120e73bda25b3a9d36beab7985c06afbe0 SHA512 b36292da9d56227da3b300f0b85d47fe321fe130a63005dac2787d4a05db935f8621491bb21e39894ef2fdd7e6bfa32a53d08b9930ecf022dd17ee371cdfd2be
 EBUILD whois-9999.ebuild 1913 BLAKE2B 1b7be0cc8b1d074cbe507e9dee7c0d1deba0e1b4389980a2c29026d37b51abd21dd1b52213f381eeccca69787580e8a4b72fc572ab2fbdc51ed91fcd185ad217 SHA512 1f365041a0b643011257e9edeb0f036f045fdfbd1018c2eb8ecea6e7839839e55817fad892c213c7d7364776dd8dbe33152fa16587bd7b94300ca8cdb3ce0828
 MISC metadata.xml 438 BLAKE2B 3c2de7b15d6973ef59d174c857597c7f320176305e7f37df85694b87874f9590f37b75402b9ce273c20855a67c54e47f64cc5c0f0cd77a5baeb348bab5c44356 SHA512 cbe1e74802cc8810ebe72d9daf7a3863bec49f70c0ac17c09c5616cb3dd5074ecf1e53172b522f30197f7e994ae7596f830dbf4c791c86083727d8b452db309e
diff --git a/net-misc/whois/whois-5.5.6-r1.ebuild b/net-misc/whois/whois-5.5.6-r1.ebuild
deleted file mode 100644
index 2b98a55ddf5e..000000000000
--- a/net-misc/whois/whois-5.5.6-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/-/_}"
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://github.com/rfc1036/whois"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
-else
-	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="iconv idn nls xcrypt"
-RESTRICT="test" #59327
-
-RDEPEND="
-	iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )
-	xcrypt? ( >=sys-libs/libxcrypt-4.1 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-#S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
-	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
-	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
-)
-
-src_prepare() {
-	default
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
-
-		# don't generate po files when nls is disabled (bug #419889)
-		sed -i -e '/^all:/s/ pos//' \
-			-e '/^install:/s/ install-pos//' Makefile || die
-	fi
-}
-
-src_configure() { :; } # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	use xcrypt && export HAVE_XCRYPT=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
-}
diff --git a/net-misc/whois/whois-5.5.8.ebuild b/net-misc/whois/whois-5.5.8.ebuild
deleted file mode 100644
index 4420819a3d8a..000000000000
--- a/net-misc/whois/whois-5.5.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/-/_}"
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://github.com/rfc1036/whois"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
-else
-	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="iconv idn nls xcrypt"
-RESTRICT="test" #59327
-
-RDEPEND="
-	iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )
-	xcrypt? ( >=sys-libs/libxcrypt-4.1 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
-	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
-	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
-)
-
-src_prepare() {
-	default
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
-
-		# don't generate po files when nls is disabled (bug #419889)
-		sed -i -e '/^all:/s/ pos//' \
-			-e '/^install:/s/ install-pos//' Makefile || die
-	fi
-}
-
-src_configure() { :; } # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	use xcrypt && export HAVE_XCRYPT=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
-}
diff --git a/net-misc/whois/whois-5.5.9.ebuild b/net-misc/whois/whois-5.5.9.ebuild
index 4420819a3d8a..e2d9d7e38ae3 100644
--- a/net-misc/whois/whois-5.5.9.ebuild
+++ b/net-misc/whois/whois-5.5.9.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2"
 SLOT="0"