gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /net-misc
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
123 files changed, 2145 insertions, 2367 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 55a18243aeb5..df364daeb983 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 2fd2be012d54..9835918f8160 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,17 +1,22 @@
 AUX 1.6.2/asterisk.logrotate4 848 BLAKE2B b169368ad6893e2fc2680b788569cf8b74657531b9484664aae2869f6dfef3ff71cf64a3fa91e90c4fdbb275a8038751fff4087129e67f63b11b81a436e459b7 SHA512 8d661424838fd9500512290785a56af4364717df87d3423ab8dc3039affd1a26fa7aae6afe2ca4fe1ce668a0172b07a96f4cc9a73eced95f25d5848f3a3f2624
+AUX asterisk-13.18.1-r2-autoconf-2.70.patch 535 BLAKE2B 06f880515f27166a75738bde6e81be1cac961a2ec2eec049cddbbb39b58d350f37a4feb49e86157d6dd5e80abaf251cf6b122ec094e0109c1f20f3e9b0f65c29 SHA512 77d1bb1be97fe5b8df78a8b21173c0d12a91f9a543404d73e4f4af2080a0b4edb87b3ccd36b1935f4fbd2a0bb44e971d303eba774e648c48c2a453c8e42838a7
 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-16.15.1-r2-autoconf-2.70.patch 499 BLAKE2B d52c6514d3cd120402298322dac081d88821035a13a5210bddf8574dfe69ec1e6eca1f3335dbd2976e870a8dfc634d1883b3e0db707557581da38b074f7359e6 SHA512 a55725377a874ee15a722076fc63323d73a976592aad524e56bdff5f4164eaa7e533723f5add93b738f39532392541bd2615fc39b3a4fd55a49f57f584d82846
 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
 AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
 AUX asterisk.tmpfiles.conf 88 BLAKE2B 3c32a8dd17b94d607407a7b201448be69c72f1cbe2c414a72e2e2a49436160edcd79b370df6cd830d37d713ee0083e11b92b8053a7822645db960af9fe97ba2f SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23
+AUX asterisk.tmpfiles2.conf 43 BLAKE2B b459348ce0bf46a915b0a64a4961d753bb9610486dc8499e7ff4eb2fab8d1afda59d880057bd4862f12a497d4cba5b025d73f5f510987d349dd46d269a4d1869 SHA512 65e35490966095a7be6f4acb9e338fe94021976860319fd1c13b8d1b19376854f45348e182ce3a6c02d459c6dfeae62236148b7c992ddfaeb0ed55d0d8682e1b
 AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5
 AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da
 DIST asterisk-13.38.1.tar.gz 33705256 BLAKE2B c783ee40880455cee5a60b111f69d95fdc42bd42a598834236e9999d0f2f401548229560e937fa8d842c5d24715d3891e7860f098d35d5630522e7a659123242 SHA512 270b7c8374104b3c2e9999503fa5cab5b465e37ddfa6759c1019fb99b6bb5877fe4505501ac3306a708ce911aeda36d04796f51156312c04fec013dbaa56a57f
 DIST asterisk-16.15.1.tar.gz 27796648 BLAKE2B 4daa0b121a789d0384d81c3b56951bfd7c919cae3de1d7eaa0ba50f01f428c1d56555838f9ce2b3fe24309b131310c59622ed114cd4f76ac7b06896ceb3da6fc SHA512 5ce6e1301825b142859087ba237b2c1b3e0687cac3fac28f35b043727cac26583697534b2726a65510e50ef27cf373b0c4cef60042f789aa6b875448a5f08914
 DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1
 EBUILD asterisk-13.38.1-r1.ebuild 9456 BLAKE2B dcb95d4a66e3a79ec8493ca92103cba49f87d4a355208cb92602d8d16d81d37fb9d5d6225ad067dfff3eba475f00c7322024d986c12db77967e676a9fa32ede7 SHA512 9c8f127f40b7d87e9721e67d04c7be55101c1bcffcecddf98072cb3eb45e250af74421cbc65565fc70fd71158b9850ec4e2b22485a09842d186bcb6d2432141d
+EBUILD asterisk-13.38.1-r2.ebuild 9787 BLAKE2B 656c7a18b9bbbe933f49644c26ebc466d69e6f0033e189e1618bc7a0622a655873f0f551683936532ba802fbfa350956d3ee78a73529e66483c874205d5ef83d SHA512 643f4d40847b8ff76a39110fda1909727710ce53a924cbc8aeacca324c14e04cb26edf7603fff116ca9a757f8bdb0cd92c2726bfdd372c716dffb987bfb1272c
 EBUILD asterisk-13.38.1.ebuild 9184 BLAKE2B da7b6e6754a5825d1960346d779820aace4450232a728890ef9555e637fb27d5e20312fdef9b0288b09544d3b669636aadf1dfb64f46040435ce64a1029c1538 SHA512 1f9b49e36fccdc32f80f9018e1c5e3c89dd10dc1ca89647fb0c148e0b66286f9bd01484f54290cfc9aa14da4b35ed36c41d2e691e84af9138311322ff60e7c3f
 EBUILD asterisk-16.15.1-r1.ebuild 9633 BLAKE2B 5a6dd460244d81b83f943c982008f79071685a547140d9bf1abed4f0b845ee9a416cb510f9d8c5e9b80fa7d1b351a6cfa2cd087672aafc5d552dd78c542268ce SHA512 74187eff38dff704c9f3de4b7a3f82f054b0c90c2aad6882acd8f227840663f7bc97c8845fcdd1301ddee22328e437004554c6c03bafdfa8a911267ec4009e4c
+EBUILD asterisk-16.15.1-r2.ebuild 10100 BLAKE2B 1ad9ba65ce8d89ddc53220f30803a4dc0248991b710c0b9d933343abcd63495b711914ecc6f6151cae6830bb39d01cf6dcea3e9fa8dce39c80b0994473422de1 SHA512 d07ada08b13ba033f0e28748084f512a39201ae9271f28fa84da41e9732e978da89d69a8f6f8796a7d0ca20eb3754b0a9dc2ff37b97a695a6a155c88de9a5155
 EBUILD asterisk-16.15.1.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1
-MISC metadata.xml 1212 BLAKE2B c9ad06a8991f05ba0355febe14ad4dfef9bd2d5b03327b90958c3164f5baaa1d9ff8458075dbc4270e7f4e09e806a4dd54b4d64ce4defd9883159ed56a616d27 SHA512 082b14c964a23b9616d73358b50af8644c05a5ebd86337719146b996cfdc1594d2871bc67d7b353c34687eee64706b9511efcad0ef4003e8a76d509d89b3cdd1
+MISC metadata.xml 1377 BLAKE2B 4b7f76e4834ff58ed593b7e1141b4781b6dfbfb1fb32ee7a1e4f6a982f1267f2e690409f4d6d7f7ea45d4dc8f93bda274a72d1e39d9034f39ed6386a25382413 SHA512 192b14fc1c15b7a7117ee1653adada3fdc480082d2533662c7e7c8ccd13dce08d4eb0c02413c269f544b93870a1deb60092dee8ea92abfd6ce0a39630a9807d8
diff --git a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
new file mode 100644
index 000000000000..638c1695a1f3
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2020 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
+
+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
+	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
+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 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/asterisk-historic-no-var-run-install.patch"
+	"${FILESDIR}/asterisk-13.38.1-r1-autoconf-lua-version.patch"
+	"${FILESDIR}/asterisk-13.38.1-r1-func_lock-fix-races.patch"
+	"${FILESDIR}/asterisk-13.18.1-r2-autoconf-2.70.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	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 )
+	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 )
+	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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	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="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 \
+		$(use_with caps cap) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(usex "$1" enable 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 NOISE_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 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
+	systemd_newtmpfilesd "${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 &&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-16.15.1-r2.ebuild b/net-misc/asterisk/asterisk-16.15.1-r2.ebuild
new file mode 100644
index 000000000000..8316274ea097
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.15.1-r2.ebuild
@@ -0,0 +1,322 @@
+# 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
+
+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
+	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
+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 libressl 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-historic-no-var-run-install.patch"
+	"${FILESDIR}/asterisk-13.38.1-r1-autoconf-lua-version.patch"
+	"${FILESDIR}/asterisk-13.38.1-r1-func_lock-fix-races.patch"
+	"${FILESDIR}/asterisk-16.15.1-r2-autoconf-2.70.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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl: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="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
+	systemd_newtmpfilesd "${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 &&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/files/asterisk-13.18.1-r2-autoconf-2.70.patch b/net-misc/asterisk/files/asterisk-13.18.1-r2-autoconf-2.70.patch
new file mode 100644
index 000000000000..68a5604757b2
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-13.18.1-r2-autoconf-2.70.patch
@@ -0,0 +1,10 @@
+--- asterisk-13.38.1/configure.ac.o	2021-01-08 18:33:41.360112920 +0200
++++ asterisk-13.38.1/configure.ac	2021-01-08 18:38:26.649995123 +0200
+@@ -605,7 +605,6 @@
+ 
+ AC_FUNC_ALLOCA
+ AC_HEADER_DIRENT
+-AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/event.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/types.h syslog.h termios.h unistd.h utime.h arpa/nameser.h sys/io.h])
+ 
diff --git a/net-misc/asterisk/files/asterisk-16.15.1-r2-autoconf-2.70.patch b/net-misc/asterisk/files/asterisk-16.15.1-r2-autoconf-2.70.patch
new file mode 100644
index 000000000000..99c597540192
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-16.15.1-r2-autoconf-2.70.patch
@@ -0,0 +1,14 @@
+--- asterisk-16.15.1/configure.ac.o	2021-01-08 18:41:50.979913016 +0200
++++ asterisk-16.15.1/configure.ac	2021-01-08 18:42:23.739899786 +0200
+@@ -612,11 +612,6 @@
+   AC_MSG_ERROR([*** Could not find dirent header that defines 'DIR'.])
+ fi
+ 
+-AC_HEADER_STDC
+-if test "$ac_cv_header_stdc" != "yes"; then
+-  AC_MSG_ERROR([*** ANSI C header files not found.])
+-fi
+-
+ AC_HEADER_SYS_WAIT
+ if test "$ac_cv_header_sys_wait_h" != "yes"; then
+   AC_MSG_ERROR([*** POSIX.1 compatible sys/wait.h is required.])
diff --git a/net-misc/asterisk/files/asterisk.tmpfiles2.conf b/net-misc/asterisk/files/asterisk.tmpfiles2.conf
new file mode 100644
index 000000000000..ce85c7f5461a
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.tmpfiles2.conf
@@ -0,0 +1 @@
+d /var/run/asterisk 0750 asterisk asterisk
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index d3ea21bdff55..9951bd05d61a 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/metadata.xml
@@ -10,7 +10,9 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="blocks">Utlize -fblocks (only supported by, and required when using, clang/LLVM)</flag>
 		<flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag>
+		<flag name="codec2">Enable Codec2 support in asterisk</flag>
 		<flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
 		<flag name="gtalk">Enable support for Google Talk services</flag>
 		<flag name="http">Enable embedded web server</flag>
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index b7f582bdd4f1..77038fba587f 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,5 +1,6 @@
+AUX bfgminer-5.5.0-fno-common.patch 2746 BLAKE2B 6954f9016289a6e0f4f5fb68e3c08013f3ad422f6d1710709df3103bb03551d40926d0e4469cf91fcdbe5c6064b9d66bf47309c014a662ef5778a2b5bb301bec SHA512 f59ff668c8deb63e6276129be6e88ad2a347994f3de2a6389e353f61ef677fb73be6f45b090d40cc3546f8456ae291a60bce8645e85f5e39d1d7eed531c5db82
 DIST bfgminer-5.4.2.tar.xz 1039200 BLAKE2B f63a7fa2c85d352a366794a39619599db6ccc3f98508ccd90387b315374227d74edfcfd2329db8b57c96539b194b0d2ee746cbea032c241dab1cf93e717b137d SHA512 b5ae8ae44df166d5576f89683ce9ee0832ca1f506b2522da7e3cd432abc5e218e9080e2a79f4da29e40db0d3179e63c9a8907d5d6b60d5d4895d6cac2b15d8ca
 DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb
 EBUILD bfgminer-5.4.2.ebuild 5051 BLAKE2B 9d00b36077d11bb18eb719e7b8d2addb77bf3bdb737ed8d0317f96e89106ccbe8363a166a18b487f6df5903c35b0eadd4b21116b037d5c61a38f8beebb894949 SHA512 a68f64e7151bca5a3213b917e9bbb755dff0004ae9c5a6a2f6c4dcda7194bae5a504f41492f1a5f8d3f860b9bd585783718351d92329815e504a69a888cf4461
-EBUILD bfgminer-5.5.0.ebuild 5113 BLAKE2B b1b2eb32c4e1dbbcd404189f76da4e89159837304184ca5ba977bac976f970aab872c3ceb4d31fa5447c8eb0f9410f1158eceab1f49252ac260124b891352183 SHA512 c7741ccc9997b1420d27478e76cb9d5e5543fa73f572455e4a175667a7af67f12d0c9336f0b8c51f40bff5070effe4e5ee234bb0a1d9ad993c3fc5d2d01921fa
+EBUILD bfgminer-5.5.0.ebuild 5170 BLAKE2B 6ecd2bd4c5ed8fb7037244d990f57402ba3fc1aceb9104ddddeefc4da3c371948bb8ba5f2d97df3ac1c761864f0b9b1247303cbb88a4a478ac65e38e3962d26f SHA512 c679f140eeb9adc18a5d23f04ae031f5dccd03152e8a750fe9e771889ca768826fd3a29c51c8444e0399fe5e97f49416112ca802d91950a26622594425f00eb1
 MISC metadata.xml 4029 BLAKE2B b9ed1a1c14386e3c4c3d11d40ae60988e2d7170c2363418b1dd9f33e0e32516bcf45ea08c96310d598173b43cd0fa23d7c1f6033656c3914ded0e685f39b6de6 SHA512 17f36d0d7f9055d1860acf7fe83f036184303cfa095d872f40877fd2f78cfb3433bdb01eba6c39058117dcbdbe5c7645e6b5eb0d24922288d34256c80624fa21
diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
index 1f145b5ad199..e58b26ba420d 100644
--- a/net-misc/bfgminer/bfgminer-5.5.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.5.0.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=6
@@ -120,6 +120,10 @@ DEPEND="${DEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.5.0-fno-common.patch"
+)
+
 src_configure() {
 	local CFLAGS="${CFLAGS}"
 	local with_curses
diff --git a/net-misc/bfgminer/files/bfgminer-5.5.0-fno-common.patch b/net-misc/bfgminer/files/bfgminer-5.5.0-fno-common.patch
new file mode 100644
index 000000000000..bd804e173909
--- /dev/null
+++ b/net-misc/bfgminer/files/bfgminer-5.5.0-fno-common.patch
@@ -0,0 +1,83 @@
+https://bugs.gentoo.org/727008
+--- a/adl.h
++++ b/adl.h
+@@ -4,10 +4,10 @@
+ 
+ #include <stdbool.h>
+ 
+-bool adl_active;
+-bool opt_reorder;
+-const int opt_targettemp;
+-const int opt_overheattemp;
++extern bool adl_active;
++extern bool opt_reorder;
++extern const int opt_targettemp;
++extern const int opt_overheattemp;
+ void init_adl(int nDevs);
+ float gpu_temp(int gpu);
+ int gpu_engineclock(int gpu);
+--- a/driver-cpu.c
++++ b/driver-cpu.c
+@@ -43,6 +43,8 @@
+ 
+ BFG_REGISTER_DRIVER(cpu_drv)
+ 
++struct cgpu_info *cpus;
++
+ #if defined(__linux) && defined(CPU_ZERO)  /* Linux specific policy and affinity management */
+ #include <sched.h>
+ static inline void drop_policy(void)
+--- a/driver-opencl.c
++++ b/driver-opencl.c
+@@ -795,7 +795,6 @@ char *print_ndevs_and_exit(int *ndevs)
+ 
+ 
+ struct cgpu_info gpus[MAX_GPUDEVICES]; /* Maximum number apparently possible */
+-struct cgpu_info *cpus;
+ 
+ 
+ /* In dynamic mode, only the first thread of each device will be in use.
+--- a/miner.c
++++ b/miner.c
+@@ -3762,10 +3762,6 @@ static int statusy;
+ static int devsummaryYOffset;
+ static int total_lines;
+ #endif
+-#ifdef USE_OPENCL
+-struct cgpu_info gpus[MAX_GPUDEVICES]; /* Maximum number apparently possible */
+-#endif
+-struct cgpu_info *cpus;
+ 
+ bool _bfg_console_cancel_disabled;
+ int _bfg_console_prev_cancelstate;
+--- a/sha256_sse2_amd64.c
++++ b/sha256_sse2_amd64.c
+@@ -48,7 +48,6 @@ static uint32_t g_sha256_k[]__attribute__((aligned(0x100))) = {
+ const uint32_t sha256_init_sse2[8]__asm__("sha256_init_sse2")__attribute__((aligned(0x100))) =
+ {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19};
+ 
+-__m128i g_4sha256_k[64];
+ __m128i sha256_consts_m128i[64]__asm__("sha256_consts_m128i")__attribute__((aligned(0x1000)));
+ 
+ bool scanhash_sse2_64(struct thr_info * const thr, struct work * const work,
+--- a/sha256_sse2_i386.c
++++ b/sha256_sse2_i386.c
+@@ -48,7 +48,6 @@ static uint32_t g_sha256_k[]__attribute__((aligned(0x100))) = {
+ const uint32_t sha256_32init[8]__attribute__((aligned(0x100))) =
+ {0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19};
+ 
+-__m128i g_4sha256_k[64];
+ __m128i sha256_consts_m128i[64]__asm__("sha256_consts_m128i")__attribute__((aligned(0x1000)));
+ 
+ bool scanhash_sse2_32(struct thr_info * const thr, struct work * const work,
+--- a/util.h
++++ b/util.h
+@@ -217,7 +217,7 @@ void cgsleep_us(int64_t us);
+ #define cgtimer_time(ts_start) timer_set_now(ts_start)
+ #define cgsleep_prepare_r(ts_start) cgtimer_time(ts_start)
+ void cgsleep_ms_r(cgtimer_t *ts_start, int ms);
+-void (*cgsleep_us_r)(cgtimer_t *ts_start, int64_t us);
++extern void (*cgsleep_us_r)(cgtimer_t *ts_start, int64_t us);
+ 
+ static inline
+ int cgtimer_to_ms(cgtimer_t *cgt)
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index d6f71e651cb5..108679cd0932 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -2,5 +2,5 @@ AUX chrome-remote-desktop-44.0.2403.44-always-sudo.patch 820 BLAKE2B f1e2c9d3a7b
 AUX chrome-remote-desktop.conf.d 283 BLAKE2B a0146298fa2e18e16911587de10aa3dd229cfb26a2d1865637cc4c69c317f4cb303b98daa7f91b6e69cc34c6fbbab3d19332396d4f5c11eeef4958401e26ff14 SHA512 5391c4a2d5787047f773abbf1c5a9dd3842160d768122edc32f0a0275e198882a41a3ca88526d52347f89d1fb4e1a51b6dc785c4dd4a0c0b5935e1e6eff30f49
 AUX chrome-remote-desktop.rc 1183 BLAKE2B d1d56ac91a2ced2c6f13019f9d5c7f1d554c2fbd3f57842d6d0b791f2e90233e4d6e8a49155b634a5e20c0bad212a5bc5f63924b1a83d45db01b1fd69445fa07 SHA512 831391b6fcaeeda476a3064d6fff1fdcebb8037aba124814a81ad4a1336a68973f319a003d1ed0938eea68f5ddad179fe29fb12efa05fd204f7fa9c5fb8dd735
 DIST chrome-remote-desktop_88.0.4324.33_amd64.deb 33645072 BLAKE2B 5fc565c3a27307e46ff307ad2e68a9a390b5fb86be9d3d8bb5f82f3d22013f70af18002c888d5df82956b6f33b3397cf2cb8b9a7e4c07db480ead81abbb5743c SHA512 0cf6ebe8ce916874be79255faf870b20df892ce4825902996685416cedd8d8ef52215e7f278301fd6ff11e2cbc3b2e82078d7b0ee23ab35669760b1102d5827e
-EBUILD chrome-remote-desktop-88.0.4324.33.ebuild 4716 BLAKE2B 32dd5fc913b4240e91d6bb62817e4d7fe1028ba93b1e51a0022e99e7e2bef4893b1e18c38bdd1da462bd1bd37ee84618a974cff71ec3947318177a5902aaa3f3 SHA512 6c8053cfb1137594e206b16a24bb1e765b2554c4159998cda82c499310cd3adae4466cec09d5d21d6f76664f00e56b0684b1a6fd4383d1941325aea017b77f51
-MISC metadata.xml 324 BLAKE2B 06aa537ecdc6bbcacbbfd245dfb6400f988a9479963032ba1f8734445342cb22cb943e8cbb77f1c1fb8a6f175506b19606ca43aafda5c503c6b38f36ece15a90 SHA512 0b117b42b32bda19d274c55a1673115eabdea39cd77fb5498d72040fa3eb1666c5e990b64918bf20fee113c42e8cba5888544621d284aa9db95fe895d805c121
+EBUILD chrome-remote-desktop-88.0.4324.33.ebuild 4752 BLAKE2B c9cf603c748e8a6bf1a6a9a58c95db17f89485d4e8ac1a2e0937e0c04c18e5ef22de03ae2e9c4091bb648459fbca785578215282410d0af315159bc872046e6c SHA512 d172655f950e089f9baf169e55cad9ad2f0162a1c7d8d5917694f22bb96c234fe260f6c73ed4ebc9690a92308d8b8c2391f5187ac24925c4c5786f20ad4dd2a9
+MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild
index ace3c7112e56..32d84d049579 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild
@@ -18,7 +18,7 @@ EAPI="7"
 PYTHON_COMPAT=( python3_{7,8,9} )
 PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW"
 
-inherit unpacker python-single-r1 l10n
+inherit unpacker python-single-r1 l10n optfeature
 
 DESCRIPTION="access remote computers via Chrome!"
 PLUGIN_URL="https://chrome.google.com/remotedesktop"
@@ -30,7 +30,7 @@ SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
 LICENSE="google-chrome"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="xrandr"
+IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="bindist mirror"
 
@@ -69,7 +69,6 @@ RDEPEND+="
 # - The Xorg invocation uses absolute paths with -logfile & -config which are rejected.
 # - The config takes over the active display in addition to starting up a virtual one.
 RDEPEND+="
-	xrandr? ( x11-apps/xrandr )
 	x11-base/xorg-server[xvfb]"
 DEPEND="$(unpacker_src_uri_depends)"
 
@@ -119,6 +118,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	optfeature "Dynamic resolution changes" "x11-apps/xrandr"
+
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		elog "Two ways to launch the server:"
 		elog "(1) access an existing desktop"
diff --git a/net-misc/chrome-remote-desktop/metadata.xml b/net-misc/chrome-remote-desktop/metadata.xml
index 09ff7ff62a4c..496b9d3fd3e6 100644
--- a/net-misc/chrome-remote-desktop/metadata.xml
+++ b/net-misc/chrome-remote-desktop/metadata.xml
@@ -4,7 +4,4 @@
 <maintainer type="person">
 	<email>vapier@gentoo.org</email>
 </maintainer>
-<use>
-	<flag name="xrandr">Enable support for the XRandR extension for dynamic desktop resizing</flag>
-</use>
 </pkgmetadata>
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 8d2289b1ee40..41c9445dea3c 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,5 +1,8 @@
+AUX cni-dhcp.initd 376 BLAKE2B 5fe40f28773ffbb12416b40e3813578d28787e9ee26ec4a62b2d3e834920f43fedd0bc985bb412c9576c438367429c835b6099f78f017932b6cdff9341e3f356 SHA512 3475f7c6966b9afac6be52c705286b235a59847748aad5c602162589d4ee1193acffc5965c9130c311e318d06f62a3930d5eb1a70b118a63270f4241f8c4fce8
 DIST cni-plugins-0.8.6.tar.gz 1993056 BLAKE2B 89276e0f7fdbc782b30ff675abcb0f92f210771bb772269210416e17d6da443fe732774d9af8ae66f69847c8b48ee4dc6485f51e2156814cfd7e3ca8b455428f SHA512 8815de8b375c737c3a1951b0a7ef5786209fdcf723aa1bc7c2dab7e1bbdee4933a7237f41bdee4208828b457bc79ec69ff68db060c52bab13863f42b042480c8
 DIST cni-plugins-0.8.7.tar.gz 1965945 BLAKE2B 592b1f126547363877c657e03d69fcb25874e6d472d731861a1a03e3933901bd618a5097f3d91f6ca7fbedce29a0ff0076a65be1a528a2584a7dcb5940a4b010 SHA512 1b11b080b1f54a8a792b1048573d7d882603b76929f0c9343eeb2e010f97700c0deea4489faeb493a1aeac12557b6847b26784c378d0430c47de6bdaca6aa70f
+DIST cni-plugins-0.9.0.tar.gz 2705022 BLAKE2B 82f723501901da40e4ea2f111bd1ed3023a1d11e1715902830f3cd0cf0d46d9f9c57389b3a763448fcd52c40aba97a731986ca1862e2ecd912e8a274abf626c9 SHA512 8d545d17e6bf4180755708e47607c855b99f6ea4183a33930b7d05974d2151c90873f1e2064b806059a26caba6942502d9954fce697bf000995d539c2208811c
 EBUILD cni-plugins-0.8.6.ebuild 887 BLAKE2B 22a40a3a3e6269454c8393f45af4c03fb75d100f1976a89b58e56ee3add1e22d4b60aa4858bc49bdf663369df1f5ffe77e49b727df65efa8aec31e81cf46e917 SHA512 64f51abba277243b73f48e14abfeca29c6c68a1c74acd2023c58c27608ce7b7257102380926bfd982661325b668eb9ae3532cf2e1b64b80fc3a1c70603f19e8a
 EBUILD cni-plugins-0.8.7.ebuild 888 BLAKE2B 79bf0e6b70ca215ab02e203393dc0d1da9fbe67f5e1b2553fdda95a65083a5e974560e513d29c633a95b6823700052ed516efdb206b7ef87fd850dde26696a36 SHA512 2e183a9fd0587c39803d63eeaf25a04441776ddd993ce2b94167e0bf024c41b333ab4336670dc3ede154b4ac0983c6e8e59fa186378c19661d64cea4f4adad96
+EBUILD cni-plugins-0.9.0.ebuild 936 BLAKE2B d59052c6ac0291afc86987e72fad3b6dafb0abae2d452147d50884a9956830e35b7acc5b771bef4b6f9968b1d7b7918480b60417118232b4c7fdf34c5c1de2db SHA512 71e599ad2edccd2d18f86ac9d8c63b2cb28c39db2539714211d8a5fafb7781b8adb3811058b536bdd819fe97cc30763ce8c6065906aff1193fdcf3575c03a5af
 MISC metadata.xml 350 BLAKE2B 9cd61d5f345c1e1967db0576296baf94bf06a59709485d150052af880eaef6a453ec0dd1cbf5003657ceb00bfba60c05e8225b9fa27828a7b6c377149ca23d0e SHA512 99cd00c8a61afa34a7a974eb9663314fa8abe0c61a384b222cb27f57aefd8116c450143f0e7c65f52d4cff1ee9852ed72f8efd13d548d2e0bc41475bf4dc2e2b
diff --git a/net-misc/cni-plugins/cni-plugins-0.9.0.ebuild b/net-misc/cni-plugins/cni-plugins-0.9.0.ebuild
new file mode 100644
index 000000000000..3ef070097fe8
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.9.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info
+
+DESCRIPTION="Standard networking plugins for container networking"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
+S="${WORKDIR}/plugins-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+	newinitd "${FILESDIR}"/cni-dhcp.initd cni-dhcp
+}
diff --git a/net-misc/cni-plugins/files/cni-dhcp.initd b/net-misc/cni-plugins/files/cni-dhcp.initd
new file mode 100644
index 000000000000..26b838c516bd
--- /dev/null
+++ b/net-misc/cni-plugins/files/cni-dhcp.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+
+name="CNI-DHCP"
+description="virtual dhcp server for containers"
+command="/opt/cni/bin/dhcp"
+command_args="daemon"
+command_background=true
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	need net
+}
+
+stop_post() {
+	if [ -e /run/cni/dhcp.sock ]; then
+		ebegin "Cleaning socket for ${name}"
+		rm -f /run/cni/dhcp.sock
+		eend $? "Failed to cleanup socket"
+	fi
+}
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 4d07f273fe2e..a2a533a44f84 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -17,6 +17,8 @@ DIST dahdi-fw-vpmoct032-1.12.0.tar.gz 443985 BLAKE2B f7f1b5240dafeea42c25c19e3bd
 DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457792a0432adc57dabf73e67868dd7a72995f2e9240a528a357427ae8602b10907c813cc50da4c35b8c060bdc7ece399f096ce6519b SHA512 3534f0bab0e142ae94b9b5c401a5c314bab43bc1ca9283600ca82b1746afa514eff6a965ccc6b48774d577beaddb12d165f66221b3b6457df68ccbcede812047
 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
 DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304
+DIST gentoo-dahdi-patchset-3.1.0-r3.tar.bz2 107738 BLAKE2B 9c6a846f744753ae133c24425224675fdbeab5c1b1bc70dd621c615af2f13eec6eb4981ec160c813be62d9d69cd8af6b2cd517005399e24f78fa30da5e20c464 SHA512 75d6562783adc5584966cba38d92a7d1aba3f448cac486be454f9810bb8380009a71a56261a0820a5eb5e13a2c0b49768c1d6adc2310f0be2133140e9e9ae3de
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
 EBUILD dahdi-3.1.0-r2.ebuild 4797 BLAKE2B 0678c138c04c0d18e7b1220150615cc19bedc684ba8e22129439e938c80eed8af614314849e2d86811e18bacd78eb0baf4403784f658e5be4b473e66af0528ef SHA512 5846b09fe4cb0103c97f7eab2ae4e4a2ae4ad4872bb36979dac84378095611cfee432b1ff326d8fabb3d9d4d877fbbaa81a1fed93118c8acc7787d3159753101
+EBUILD dahdi-3.1.0-r3.ebuild 4807 BLAKE2B 9634d7bff8eeac90a2463d1461679712e0c529ba55ff33b5c352074424899d5323359814b874380cfd34109ab0765c3025b8c7117f6bb684d5d55de2766ac748 SHA512 8ee0db6a8c26604ae5638d86d0ed5c9aead14545268444f556367b1d01287de78b8c57a8ca1bf711e4f5613dd665c10c30f0ee5e70a2316a5e0ab4bc69c892fe
 MISC metadata.xml 539 BLAKE2B a0ce99924eb45e3ab924bdf354a54b185775fdf86e412dd53b2f2ad00772376e7e191c9166b9417dc81d0e05dccdaa1e6eb1e72b937a8a125b948f023129624e SHA512 41033deb3d149daf967524383856a8e45eebfc6b6c721ae5a9bb6fcc18c5f1371e49f5f52f403ff9f192911c3345a52ae11b03b4d0fa1d3cf753ec5efd570c5c
diff --git a/net-misc/dahdi/dahdi-3.1.0-r3.ebuild b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
new file mode 100644
index 000000000000..6a86455478f1
--- /dev/null
+++ b/net-misc/dahdi/dahdi-3.1.0-r3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-mod linux-info toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=3.1.0-r3
+S="${WORKDIR}/${MY_P}"
+
+JNET_DRIVERS="cwain qozap ztgsm"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="https://www.asterisk.org"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
+	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="flash oslec"
+
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES PCI ~CRC_CCITT"
+
+pkg_pretend() {
+	use oslec && CONFIG_CHECK+=" ECHO"
+	check_extra_config
+}
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		[[ "${file}" = dahdi-fw* ]] || continue
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
+			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
+		die "Error moving firmware files into the right folders."
+
+	for drv in ${JNET_DRIVERS}; do
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.c from jnet to DAHDI."
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.h from jnet to DAHDI."
+	done
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
+			die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
+			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	if use oslec; then
+		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
+			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
+	fi
+	default
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" install
+
+	# Remove the blank "version" files (these files are all empty, and root owned).
+	find "${ED}/lib/firmware" -name ".*" -delete || die "Error removing empty firmware version files"
+
+	# If the kernel sources have a System.map, and there a suitable depmod
+	# available (seemingly when we're not cross-compiling), then the kernel
+	# sources depmod kicks in.  Remove the files caused by that.
+	find "${ED}/lib/modules" -name "modules.*" -delete || die "Error deleting bogus modules.* files"
+}
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 59320740dd59..816d773b7d08 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -26,6 +26,6 @@ AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9
 DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
 DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
 EBUILD dhcp-4.4.1.ebuild 7903 BLAKE2B 6ecca7fb6bec01270e230aeaa3b141c9cc092af4dd498a312e0f9785c3080b1069b2f9a0fbc8fa64442e4e416d42c45343eebac96ba7b2a22d8a7a0428e06787 SHA512 baf8324bfd80e5206ff27239825eb575b9bde687907bcf88341453d491135598580753400089ba6c5e92c639a8043032bc3ba6e7a16f78cc1f49e385b5203e3a
-EBUILD dhcp-4.4.2-r3.ebuild 8090 BLAKE2B fa8f94c0ade697ffd8a5aff8b6a00164c5d5f417906240962a7ddb1b6f332a508589f08595a7dd015aa2b610573f92ead038068205e3667c6437c4e922fd9bb5 SHA512 ffb98aa63471e9c180778558e338cd5575b50cbaca20e572e6133feabb6ee526be41683245374b0c827fbf187ef52acd0b29769516a5b09fca04d143d2170183
+EBUILD dhcp-4.4.2-r3.ebuild 8154 BLAKE2B 4088188226b1261b8356d84db315aefb7b19f6c2dee88234cf2f6e3d71f9b1a2ba2f35505417f0e73efb32e9faec2657214d27a925d89bba0e14f34da6ec8080 SHA512 acf8f516eea2e729121f0ec810827d27520a3f39b3aedf7a6b8abe26c1fd67db7770a416f7b7a7c765814fd9a8a2d092d7ad30262be96b134ca014595be47cdb
 EBUILD dhcp-4.4.2.ebuild 7930 BLAKE2B e4a9d780010707cf9f16816f29ccd1a9c0ebbf961bd89e6c05a1516a5a97c6900a3a04e6435ed4bd00bc8874dd126d6e87d95e1147933f72b1ae8deac2acc6dc SHA512 40b769fce9749bace22ebdabeabfaf44251b03a07bb8dd186c8af5238d1cbdd89a40e59205fac287f576b2fe5d2152371e7f1244c5d22daa2cf158d0814bc9df
 MISC metadata.xml 476 BLAKE2B e77eff7eca45c59f3f7ead1b4065db2696400ed0814fddcd6b8cd377d156795e7d7a6864da8c869b870d1705bbdd6f403a3a0358e149b5a4b4ad098589ba90a9 SHA512 8e9599bcb9c15749514d5fada7ebb4e4bf0752541ff8b54a3c6b557d5debc6356ce593b8f9640abf534aae123d3e65d978cfdf091635246c8afe2a170a61de26
diff --git a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index c0bbefce10fc..b123e346e37a 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r3.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
@@ -166,6 +166,7 @@ src_configure() {
 		--enable-paranoia
 		--enable-early-chroot
 		--sysconfdir=${e}
+		--with-randomdev=/dev/random
 		$(use_enable ipv6 dhcpv6)
 		$(use_with ldap)
 		$(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
@@ -178,6 +179,7 @@ src_configure() {
 	local el
 	eval econf \
 		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el//\\} ; fi ; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+		--with-randomdev=/dev/random \
 		--disable-symtable \
 		--without-make-clean
 }
diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
index bd7af8d6ce24..8a2715cacd71 100644
--- a/net-misc/dhcpcd-ui/Manifest
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -2,5 +2,5 @@ AUX dhcpcd-ui-0.7.7-tinfo.patch 912 BLAKE2B 98d9797abc46573c3d83ca6d9d3c97746f9c
 DIST dhcpcd-ui-0.7.7.tar.xz 195648 BLAKE2B f382e331326e66d81674579ba018e6f9a6662df9d10fa0cca92808290e5d7621e7861afaa3d9a2c4d05fcc24b619922f8740faeaf4a531701f5d14505636fdf7 SHA512 46f66c16986c248740b2dc8ce0edb663fbd35809d2d21f701588c3736cdafb32b04c57ffbc6f8974841499ab46f6a1084d0a761b290e9d02ea3a9fae36a0ff3d
 DIST dhcpcd-ui-0.7.8.tar.xz 135028 BLAKE2B f3e79bb00708e2ce2ebb93d917506bb0fb015071b415768c47979d7f2b5e35d6f22bf71a58c43989dedc6561f0a8be738824f06627d2fa0995e335d7ef1925cd SHA512 5f0d2c32c32fc141feca0ab43a531d9b4f45e071a8a1e3ee1923d6394a3e5d6322e6f7e607b91154af4cfee93d649164c7ed3b805731dfc242c3ac367ec156c4
 EBUILD dhcpcd-ui-0.7.7-r1.ebuild 1350 BLAKE2B 2242025e46d67967cde0c7619f3bcddc47301d3e59f1c3ff129b4d650af2a94fa4828832e32a512bcd0e44df5f7284a361ce283b463d5aadf66eaf4c0fe0b03b SHA512 c6e730f0d2d7b847b62aebf2171ea849d3fdaf068ef7894bd8b8acf09ec7f5fa4cc77ff89307739f5de34ead6d069bd574dbea761aa81091675119a5a7cd4f5a
-EBUILD dhcpcd-ui-0.7.8.ebuild 1300 BLAKE2B 6e3cbd0dcda7b2db0beac0c1fc260d4437db8a83449d174240e74774dc1f2337b36249e72273ac62bbfd82a3b06c4adebc3232c1671d6800edfa90d723eac04d SHA512 be36cadb07e21147273deb6c19728ab1072f369bffe75e0a91123792c22e900839d4c0dc699654e374631794e06225aa6a282a8df6dcf7b6ae94df3f20572bdf
+EBUILD dhcpcd-ui-0.7.8.ebuild 1347 BLAKE2B 0db376ecc1252412680cc9a61bc1c58fb69aa64eb8a87a53638874c1ce5b0fba93cb8bc08e977790ba7ff159251416679630b119a4de8cde9f93c61b0ab92eeb SHA512 bbc00a4cfa65ad2d1087ffdd6f81d01928e0efe8d034fecffd7da6db84815a0f8989b86c44e95b75f44050948f2de84c02fb1a55496d4d8526d35a62528ff2c2
 MISC metadata.xml 278 BLAKE2B f04208caf75cd1e148b392ed9177f706cab4a373ff62412f46496d7e18430c6cf510e29876b1ef581fc67f561b3e114bcf05ee94920b1e3a10e6554d6cbb2887 SHA512 c7530022ff0aeb201cceabe36c9386e65eeb8ac3fe1fba0c429545408d22203bd972943c7ba8e8058f1d4166d306dfe9a2f3508f07438853b8997ce6bcf43e05
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
index 6878e53ae1ac..755b2b779ad2 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit systemd xdg
+inherit qmake-utils systemd xdg
 
 DESCRIPTION="Desktop notification and configuration for dhcpcd"
 HOMEPAGE="https://roy.marples.name/projects/dhcpcd-ui/"
@@ -53,6 +53,7 @@ src_configure() {
 		$(use_with ncurses curses)
 		$(use_with qt5 qt)
 	)
+	QMAKE="$(qt5_get_bindir)/qmake" \
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 09e51e209f12..95959871f993 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -2,9 +2,11 @@ AUX dhcpcd.initd 315 BLAKE2B c972ddd75c879d4e6a109cc4fd7b377ea27aef0b79ea5524cc4
 AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
 AUX dhcpcd.service 308 BLAKE2B b9533183aedeb8243512923de5eab61b8655bbd907d89cd06d1fac13c4b1a7741b59e9eebd37abfcfd2092781ba29e43edd4fa09d4eefc5b54c62ea74aa3885e SHA512 ff512117941a285e0b6f90689a78d6149d134d457ab08be78cd741f2c3707eb0c21ddf5961d8d5972844a13e995bb1757a29b9d0e6b26c6761250c8f9da29557
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
+DIST dhcpcd-8.1.9-patches-01.tar.xz 3208 BLAKE2B 38f59096c7fbe7beb3df11e492d3ef1d116645eefe0722870dd0ca7b5a9b562c2f8302343f33d22359e37623d66874eb5f9981c9f4e521a80629678edff6d0d8 SHA512 13f10f84d44f5cfbf262d4aeb4134121c99629062a8075247b2b35ad5d1927914139bdc8f897644e501239763b409d5eedb9bc30f86456a4af622ab20fe6ffcb
 DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96 SHA512 40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a
 DIST dhcpcd-9.3.4.tar.xz 255212 BLAKE2B cd64dca55bd8adfcfa8ffb5f75a949c6f8aef9f1bf7925060590f7f5f0325e08de3c766c8ff780736eb2bed40ba3ae7b59c3cf3e03f2ad1bd7ff4c92aafb6370 SHA512 00125cbed9a20ba016cbb383c02ce61a58482dcf6c46144e573ee3759dbaf19b5f470eaf19038197d0ff4249c852773c537294bab30b5bf3f5bae4d754741517
 DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f
+EBUILD dhcpcd-8.1.9-r1.ebuild 4508 BLAKE2B f9e5b4a9a96877250ba0ffa8acea899271b6d0e68aebde6e346e82fd21606fd4e9731a963a65bd4dab92c4eb9e49573e047b92dd1f6dfa82f354149356b1edb9 SHA512 27e97d6e582f7f696645c43079791873df7815019b7107c4e99ec98b12f4ce18212c5a0db3ced54bab56de324d96d1ec6ae8917757f49a0016f8e845a007b32b
 EBUILD dhcpcd-8.1.9.ebuild 4386 BLAKE2B 09d3f7a3bad9c03b427e18fe33d7aa54f1597b8a7389664d18c9cf01a21a5112a7a08177be703d9aee508f26c825f046b97f34b4e79e2bfef8b140e846bdc01c SHA512 1407f6718ecc06ccdd1728c4fbccb32e191bd731101529bf634ef53977f9f4a23eaefe568bd67592e2431df43c8f326b572c2d5cbacb15fe78ba369b6ff14597
 EBUILD dhcpcd-9.3.4.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 EBUILD dhcpcd-9.4.0.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild
new file mode 100644
index 000000000000..c45dfd2e5609
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/${P}-patches-01.tar.xz"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	eapply "${WORKDIR}"/patches
+}
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpd-pools/Manifest b/net-misc/dhcpd-pools/Manifest
deleted file mode 100644
index f74c43c92e84..000000000000
--- a/net-misc/dhcpd-pools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dhcpd-pools-2.21.tar.xz 544940 BLAKE2B 22c6fd4f461480f95b0671309389dd90a5d1ae6cc64e1a61a6c450f1a861855b682a8c276ebc4517cf627ca7cb435cf6f4917d25c86c3bc40396b92ad8ae156d SHA512 33c89dd7eb23b3df6e454cd75051f3d842cc265e8596f5657a9e72ae485befbe78655eb682cab10c14973286b85f2b174c2f23b88c5142b63589ca9ec0a9d975
-EBUILD dhcpd-pools-2.21.ebuild 466 BLAKE2B d9070f585907274444d3266eb8cf87e993883757bafbf5afe0216bb355d3c0ce968dd0f08eb4f276c6b703677259ba21f858e2ecf04f300eb28a1bbb4f7be6f5 SHA512 5af5975d4ee19f1127834f3757efbd6938776694f56f20622c4d7689c65f88c1a7b05cc7248ccca0b70558e688312cbe6a3e3465961a8cbb312948cb30d68269
-MISC metadata.xml 248 BLAKE2B 08f96609f1f2f9710137b80ba66301f51be6775ad5a8d0325485cbf61d5fe5cdcf7d8fa7a3883e95747f859f453fdbac7d96c87f6a5898c3c6c7917a434dee52 SHA512 fa1880b28830d7288b9905ffba62f3aed001698fcf05b86e8eb66683008f60d3451b1e8d749faf6acab2acfa0ea3641ec232171e903fdd20dfc04f2f6903f4cc
diff --git a/net-misc/dhcpd-pools/dhcpd-pools-2.21.ebuild b/net-misc/dhcpd-pools/dhcpd-pools-2.21.ebuild
deleted file mode 100644
index 0a5975331137..000000000000
--- a/net-misc/dhcpd-pools/dhcpd-pools-2.21.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="ISC dhcpd lease analysis and reporting"
-HOMEPAGE="http://dhcpd-pools.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND="dev-libs/uthash
-	doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-src_configure() {
-	econf $(use_enable doc doxygen) --with-dhcpd-conf=/etc/dhcp/dhcpd.conf
-}
diff --git a/net-misc/dhcpd-pools/metadata.xml b/net-misc/dhcpd-pools/metadata.xml
deleted file mode 100644
index dbb5930ad32a..000000000000
--- a/net-misc/dhcpd-pools/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">dhcpd-pools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index df9bf8d00368..44ebda6ab459 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -3,6 +3,6 @@ AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee753
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
 DIST dropbear-2020.80.tar.bz2 2287654 BLAKE2B 3cec03034e3ca2befd1b895ecffbf0e0ea00af3e642ac00b4ccaf330d1eeb99840ef328374e9d53d033e801c82ee3a55dba884a2aa6741c1274a2c8cfc4490e0 SHA512 7fccc1003b73540fa1da9763771519f8ae52608f7a1c5f66736db1885a87c346bd9711bcf017c48ba712a83ff04f01c12bea7180ed596fe58038fe656d2fd3d3
 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794 SHA512 2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
-EBUILD dropbear-2020.80-r1.ebuild 2704 BLAKE2B ef2564b6773a91794c4c016fd6f33f75211eb5ade5187cfab0447ee8ff6d421f88983f6b673398ae34d8efdfd8fc24965c91ddb11d351ccae792c8570eccc6fe SHA512 d87869b76746178109a76281b5b52a80ad3662cf7558bc6ef91c7f1de928a8c19db0fff6ed5e01c1c6ecb612fe99b220eef22f9e5d33ebf69d8739b0eccaf691
-EBUILD dropbear-2020.81.ebuild 2746 BLAKE2B 647d12891973e585c6f077e96869659016c462f7c37f4c0a1bf4077805b8668e440bd61c85b70b5cc4c60cc036f5ad50e37605a5b1da6fe7a4a065c107b59356 SHA512 d501d3738f0b3c8a682a19a5f2eb0e430536e94f5b6d13132f0106793f777b44f7010952925beb112aabff8e367fa6496cecce893d86c8304e22b49bf83df2ed
+EBUILD dropbear-2020.80-r2.ebuild 2727 BLAKE2B e85ffcaeb12d7f15a6ca744a643f6a6aa83400ea40fc2c7faf46d9feb3b5df26efb188792b52a5f6ba5a3cf36c0432c970a726be029e0dd82912270cfcaf1f72 SHA512 0042683e8de737d8b8d9fe96c1ed619785ed2dccb19cf8d646d15839a11bd4c8a9ae5417fb98d21aa9031292edd5ac7ea97492deae119a9c9483f42980f645bd
+EBUILD dropbear-2020.81-r2.ebuild 2968 BLAKE2B b545ebc5560efc07ec82bddbfa7da82e8cbe0ac32a81fd27624e63a3865137fea29319472e20cbbb16f64026340d5d353a730911eef4a0da1443f315c4240648 SHA512 81ef82195ae8888a95ff65aed3cfe530a537508443852e34fcf8ce9cd22af014d3ca052e5c67c14bc6ac2b3743b971b4055497f7b5b559db2dc8273be38924ed
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2020.80-r1.ebuild b/net-misc/dropbear/dropbear-2020.80-r2.ebuild
index 88a15ff55baa..8ae9dcf02790 100644
--- a/net-misc/dropbear/dropbear-2020.80-r1.ebuild
+++ b/net-misc/dropbear/dropbear-2020.80-r2.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
@@ -106,5 +106,7 @@ src_install() {
 		mv "${ED}"/usr/bin/{,db}scp || die
 	fi
 
-	pamd_mimic system-remote-login dropbear auth account password session
+	if use pam; then
+		pamd_mimic system-remote-login dropbear auth account password session
+	fi
 }
diff --git a/net-misc/dropbear/dropbear-2020.81.ebuild b/net-misc/dropbear/dropbear-2020.81-r2.ebuild
index 1224921683b2..2ff85973af9a 100644
--- a/net-misc/dropbear/dropbear-2020.81.ebuild
+++ b/net-misc/dropbear/dropbear-2020.81-r2.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
@@ -17,12 +17,15 @@ IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
 
 LIB_DEPEND="
 	zlib? ( sys-libs/zlib[static-libs(+)] )
-	>=dev-libs/libtommath-1.2.0[static-libs(+)]
 "
 RDEPEND="
 	acct-group/sshd
 	acct-user/sshd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	!static? (
+		>=dev-libs/libtomcrypt-1.18.2-r2
+		>=dev-libs/libtommath-1.2.0
+		${LIB_DEPEND//\[static-libs(+)]}
+	)
 	pam? ( sys-libs/pam )
 "
 DEPEND="
@@ -47,6 +50,12 @@ set_options() {
 	)
 }
 
+pkg_setup() {
+	if use static ; then
+		ewarn "Using bundled copies of libtommath and libtomcrypt"
+	fi
+}
+
 src_prepare() {
 	default
 	sed \
@@ -59,13 +68,14 @@ src_prepare() {
 }
 
 src_configure() {
-	# XXX: Need to add libtomcrypt to the tree and re-enable this.
-	#	--disable-bundled-libtom
-	# We disable the hardening flags as our compiler already enables them
-	# by default as is appropriate for the target.
+	# Notes:
+	# 1) We use bundled libtom* when static build is enabled because
+	#    libtomcrypt lacks it and we don't particularly want to add it.
+	# 2) We disable the hardening flags as our compiler already enables them
+	#    by default as is appropriate for the target.
 	local myeconfargs=(
 		--disable-harden
-		--enable-bundled-libtom
+		$(use_enable static bundled-libtom)
 		$(use_enable zlib)
 		$(use_enable pam)
 		$(use_enable !bsdpty openpty)
@@ -73,6 +83,7 @@ src_configure() {
 		$(use_enable static)
 		$(use_enable syslog)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -107,5 +118,7 @@ src_install() {
 		mv "${ED}"/usr/bin/{,db}scp || die
 	fi
 
-	pamd_mimic system-remote-login dropbear auth account password session
+	if use pam; then
+		pamd_mimic system-remote-login dropbear auth account password session
+	fi
 }
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index e780ba793b2b..b4a0c4661d39 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,6 +2,9 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-112.4.321.tar.gz 99004752 BLAKE2B adec5e29703d36ceadcaed1447b03d5edfd2249f06ab295c55c87684bf4b4c9c59a49a59b71158c17908753cb4dac51e17629cc2fb07c4b44d32d094cecae8e5 SHA512 222cb754713233b05fcf918995ca21d5b5663757304d1303534007872ea83e432641fa13b758b21dcd24568b63fd88b3fed1e45d15b0422226040e655796d369
+DIST dropbox-lnx.x86-113.4.507.tar.gz 100113763 BLAKE2B 6340195b5d6d47b077e4a7b335c4c1d3298d6504503fb39bc71e407d7e8e09cd80afaed9df84dd4e7ea875a8adf28279d9d348f54905958034152fd201b4e4cf SHA512 4e74df30a7debd5c8e2aca4a2494178392d6646bc7dd1966a3aa730b43f0759251a046a7e9266ce68f683786ef9998e71718be1769c574019d688b6420f7ee17
 DIST dropbox-lnx.x86_64-112.4.321.tar.gz 103084021 BLAKE2B 96c15e627434557663712bd6f679efd11b8a6e353757becf1a09830e6f16fb5652159af9601ae1ca84ec397aee277161bcaf1988589b782c43ec433b7ed69a66 SHA512 e22c5595ba5dc90e3fcc958be92ac5fb403f76d8567a03bcfb14e5ea058147f23564de6a2d020a37da4f5a0c34dc85ccbc528bf1f1c683b370899e22f6e652ab
+DIST dropbox-lnx.x86_64-113.4.507.tar.gz 103671827 BLAKE2B 32bab397f2a964c63a733bdd5834cae5a872346fd56f539ce55df91755e8d4c9195e77723ca9d345fea5769163d15cd19406d28c9d4ff76b61d45ec77d729b78 SHA512 473282044032bab21e0d24c6987343b1cfdad98a4f608336d6c6af50e613e201ed71d56e5d231252e2eb3df236cdbba7c74ef1b6378fa88b1bce5995113d660d
 EBUILD dropbox-112.4.321.ebuild 2617 BLAKE2B 4c3c0dff5562ba9d40f10b6b5754a5f4ee8011bc7331a0ad9e2d89997a22e00752c8a062a24a4c49404fd6b2743f814b31e792c25ecbeecd0340a4edf33ddebb SHA512 3a89190dd79b8eb50e33262c3a76fd63476c09c42cdb7026abb72e4fd1eb109c92f0f6c09903af4874cb72c271998ceb21723a6f893fb954eade67c1be860765
+EBUILD dropbox-113.4.507.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-113.4.507.ebuild b/net-misc/dropbox/dropbox-113.4.507.ebuild
new file mode 100644
index 000000000000..a77b20f7a3b2
--- /dev/null
+++ b/net-misc/dropbox/dropbox-113.4.507.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index a8795b71f4c2..e26dd8fc8db7 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,15 +1,5 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
-DIST electrum-4.0.4.gh.tar.gz 4415688 BLAKE2B 1811b3a5534c343b6bc1efccfab822e2550e0b19563837ee69d93006c081acb116b96a2bfe812420cfd7694190d66eb5e5bb01e5d0271262b714a06979ff053e SHA512 1b4fc9f0ac9624ac271ba65989524f902a465ae50465fd7e9f90366a59e17e6938ab0f58cf9ec8e40c10ee99074e1f800cae080d37da60359091be698957ecda
-DIST electrum-4.0.5.gh.tar.gz 4429965 BLAKE2B 1aad8c0407f1dbe085f7cef580785335823fc773296c040a7ce118b0e3edd4a1972ad0712b98754cc548df841fda6df0c854797557c2a2f57a37bd4f3cc2cdb8 SHA512 a0f2eeb57020dc16b568a4d4fce37522f212036455b4e79abf1d44bc20065e896a861bf1a5547fbcae87c2659720d7937c9c0c817e787209c119a06c05549e76
-DIST electrum-4.0.6.gh.tar.gz 4430258 BLAKE2B 883e74d5224c24012d38b3730ef2138abd397500c0271b98938802d55d4ca50075e2e171779868ef4c789fc1feba5bfdecb295e032c2bec92da2d0d34e21987e SHA512 ae8caa827456a75a0e84e35477edf4b0ba28862438571ad54807062e54c673023b3767dd5bbe63f8bead8dc5a8b19a1e3fb1dbeee0c2141d59b8454eafb03965
-DIST electrum-4.0.7.gh.tar.gz 4431614 BLAKE2B bd0d0c4b52492ab439f5e5b6879edeafc0a9c45c3aa7b5fad340a702203a09da858fe7165c89e8c2e788d6e3f26002007012ea8f377f432d189018f9ac7c7e2e SHA512 2a036d19140b56947d374d1d64b6c51e12aba2eca7ad992d38305c884572ef7cf06c7bfa3bc89fa20e22e249cfda6de76dc006f86490e1af1d580c23406cb6f1
-DIST electrum-4.0.8.gh.tar.gz 4437153 BLAKE2B ae16db36f572c37e6640c5a6264d56f83dcf6f377da8493ec2ccbbe49007d41e5f14635e267e80da69a0025a1bdf478fae7479c9d7a677dc959e5146763c3cc1 SHA512 acc653162f706ee2bdb116d1a3e7f0bc5996c9d74bf634c395665fffac9ab4c15015aef8a10aff15621d9f712ee216eecf45a52bc718a56e6d8f65c71a7e92e0
 DIST electrum-4.0.9.gh.tar.gz 4435268 BLAKE2B e1dfe319f7b4beffd039164c97d247f5d267d9d99313480bf06f9b748d095b33859cd8ea5dd5a135b38a1a206858e08ce500af8982ef7a6e3b3f7ff0233b9637 SHA512 a9a04163c8d76006ca18e1c50f38cabd7c3d7d75b16c8504627b9eb49bf9dca91800e18a585e7afd0b98fafeeeb821b967bea29928a46d10f65f0abc3fb90887
-EBUILD electrum-4.0.4.ebuild 2400 BLAKE2B c579900e61c708b2f721fde772889488f0b43579517c34b21d24c1d665b1d7097a4cf367a52ea561bcd3856c2b7565dbd3c9044a3454ca04a3c1d5e198e94d38 SHA512 c45735ed759d721775892f5126a11038a7df85e616259c5627e6bade3654d85f1396bada52a240d1a02509ddfaa2b3711f0c4ad1c62b7c4e25b980dfb04f51d3
-EBUILD electrum-4.0.5.ebuild 2402 BLAKE2B 0049acbc9a0a618dfc2d9be7e7cd637bbf020e19f161e2235b17514f19e43f2f9ed7e29f65c93f946f4a4b14c5523ee417149b25b1fd09871d537b13caedd31b SHA512 c42acd9643cd26b9fcc32a880e7e8db211ced5b3bba22e7708bc7a0c019b6cdf88eaa4b9759b137365b39bad2e003403da46b92e6b839c1b020c7eb978ab38e2
-EBUILD electrum-4.0.6.ebuild 2402 BLAKE2B 0049acbc9a0a618dfc2d9be7e7cd637bbf020e19f161e2235b17514f19e43f2f9ed7e29f65c93f946f4a4b14c5523ee417149b25b1fd09871d537b13caedd31b SHA512 c42acd9643cd26b9fcc32a880e7e8db211ced5b3bba22e7708bc7a0c019b6cdf88eaa4b9759b137365b39bad2e003403da46b92e6b839c1b020c7eb978ab38e2
-EBUILD electrum-4.0.7.ebuild 2261 BLAKE2B d2d0417aff0306bbbca34802b8c710c605ff2b58890f52cc42c7a013cea66be51a72c3d1befd07976c3205a0a2ddcd099e7d6f5e35b55076341a3c84b3202295 SHA512 07151e3274e1cac0e6f64a1a064d245f9f6d54839390322e0532099eaa86a3d929eb37e8df60e9b9038cc1d18239ca5f53bba408877f305d50394fa39185fbf9
-EBUILD electrum-4.0.8.ebuild 2261 BLAKE2B d2d0417aff0306bbbca34802b8c710c605ff2b58890f52cc42c7a013cea66be51a72c3d1befd07976c3205a0a2ddcd099e7d6f5e35b55076341a3c84b3202295 SHA512 07151e3274e1cac0e6f64a1a064d245f9f6d54839390322e0532099eaa86a3d929eb37e8df60e9b9038cc1d18239ca5f53bba408877f305d50394fa39185fbf9
-EBUILD electrum-4.0.9.ebuild 2261 BLAKE2B d2d0417aff0306bbbca34802b8c710c605ff2b58890f52cc42c7a013cea66be51a72c3d1befd07976c3205a0a2ddcd099e7d6f5e35b55076341a3c84b3202295 SHA512 07151e3274e1cac0e6f64a1a064d245f9f6d54839390322e0532099eaa86a3d929eb37e8df60e9b9038cc1d18239ca5f53bba408877f305d50394fa39185fbf9
+EBUILD electrum-4.0.9.ebuild 2259 BLAKE2B e35312a6120d7ceda9dffeb82aec6906fcd9a90bf6bbab6532e8f175f6071fe041082abe2eb561bb327087d5d76dafa206422be6b829869b61a339841b971461 SHA512 b338779cb71efb56ad25160315d181a33598a954f129359da9c4c776c220cdf72b2e8ab8a3757efe31f46da30ffe6630ac01c530e219caf5b3a6bac8f180b45d
 MISC metadata.xml 653 BLAKE2B f58eed53ddc5608c39d763bef2b9543ce30c65a97afe157b84522b1367d19594855c5f8e39424af90c88934938601d98c5877f7d1d081aa5cc5be45cf19044a2 SHA512 a2d76c85cf2e409a1b0aa6449e43e82f1d88a4d7fa72c6282c7f7e55819d13b04dc733e3b297635aca1cb65136822b447feedf76358b948738489f8e0de97ea6
diff --git a/net-misc/electrum/electrum-4.0.4.ebuild b/net-misc/electrum/electrum-4.0.4.ebuild
deleted file mode 100644
index 0c777f8eb2a7..000000000000
--- a/net-misc/electrum/electrum-4.0.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	<dev-python/dnspython-2[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.14[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-	|| (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.0.5.ebuild b/net-misc/electrum/electrum-4.0.5.ebuild
deleted file mode 100644
index 0ed6a75d3617..000000000000
--- a/net-misc/electrum/electrum-4.0.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	<dev-python/dnspython-2[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.14[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-	|| (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.0.6.ebuild b/net-misc/electrum/electrum-4.0.6.ebuild
deleted file mode 100644
index 0ed6a75d3617..000000000000
--- a/net-misc/electrum/electrum-4.0.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	<dev-python/dnspython-2[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.14[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-	|| (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.0.7.ebuild b/net-misc/electrum/electrum-4.0.7.ebuild
deleted file mode 100644
index de86b6ef7b46..000000000000
--- a/net-misc/electrum/electrum-4.0.7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	<dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.0.8.ebuild b/net-misc/electrum/electrum-4.0.8.ebuild
deleted file mode 100644
index de86b6ef7b46..000000000000
--- a/net-misc/electrum/electrum-4.0.8.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..8} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	<dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.0.9.ebuild b/net-misc/electrum/electrum-4.0.9.ebuild
index de86b6ef7b46..d7fd3b935ca9 100644
--- a/net-misc/electrum/electrum-4.0.9.ebuild
+++ b/net-misc/electrum/electrum-4.0.9.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"
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index af44cf898aeb..76132d5eb4b2 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,8 +1,10 @@
 DIST gallery-dl-1.15.2.tar.gz 323739 BLAKE2B 99a06331bd7dc6ec951749129ad0ac797d9ce2d9f98e75a29198fd47d0481c43b96922ea08149abfe990e8994a19b3170853618de9b51465264d100dba777f32 SHA512 7f31c0485d9de6eaf76e7b0772e66049f9aa8fd7d77d3ef6fd2803d7ec7dddbf3419051c9d8b3984eb86a8fbbf9a168cf8ec69a55082a38e2ca23cfc3574b1f4
 DIST gallery-dl-1.15.3.tar.gz 325926 BLAKE2B 9ae31ba89a60460cd041fe9f353d4a7d1dab14fe63a8967f1a94f8d0ea42ef30032e5f734cbb370f5ac681f9274ba756a156acc7bd11ca4b5aad387fdc6be76f SHA512 618dc26ba74274c961cce1ef058fce3e12741366329ce50d09421245987a88a796be3f1a31926e8b2c33cc87cddcde3585f74f4f1a80347153c2a7a9cab7e3c0
 DIST gallery-dl-1.16.0.tar.gz 327915 BLAKE2B 8d7805219f900ab66afc400a56b279a18ebb78c47a531b380af2d1578c338f84575f1fb5a006a5e1bb0684349d595550dc89177493890001e38077edd34e00b5 SHA512 84cd8ab4b3e4a63f912e36454e6f35adb9f9c395002d04391c4093d4efe62ff249999eda3755f0ce77b4d4b7ce11ccfb2acb972cd5144ea84b00d61e370f5de7
+DIST gallery-dl-1.16.3.tar.gz 333058 BLAKE2B df45afa7c745a6176e8490bdcef95b7e1eb63b8c8ea61abf5422928fc72b5bedb101336c2470fb8edde0d12ce48d8d5f0eb4ab44acf6dc032eed2412e55ca30f SHA512 abb3223c13d67297bfd8cd94ac0efa66d7f6315ff589bb8b5ab96a3487015b91e8ab27e9ee43f4ee1dbbc7b69676c73cf4d4833bcd868295332aca417008c0e1
 EBUILD gallery-dl-1.15.2-r1.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
 EBUILD gallery-dl-1.15.3.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
 EBUILD gallery-dl-1.16.0.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
+EBUILD gallery-dl-1.16.3.ebuild 1110 BLAKE2B b9cf61f46bbb6f8eda87517208952861ca7d4d29f23bb8eda2ae696b4dadb6d1e8839b2302f68c31fa647013737a35650105a4bc0c09762d892d10a1f23bf7b0 SHA512 d79a05d6fd23705b55241e5a6370a0e5a74f5aabf781ab4a7dc9564b650ef461fb8c099ab062641e82696dc60e5dc61054c86e11b8323c12d1ef73c0954ba2e7
 EBUILD gallery-dl-9999.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
 MISC metadata.xml 767 BLAKE2B 513bfe624e86287f7ba2d8fbcfd2d6e1dd66a79c9a4325a03037ff11f95c4eeae320b47f7ea09b8e6fb6643a42263556a56e02eef7ca8405541b25cc8f710837 SHA512 d5aa8f0a5bbfc2231495aa2f3dd3f6b4fe0a491b3a1d527a304a41d8d1a7f35a60fabd7283a55ff14ed30be328f557d9e0c5dd884648030a8ad5010418f08d5d
diff --git a/net-misc/gallery-dl/gallery-dl-1.16.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.16.3.ebuild
new file mode 100644
index 000000000000..b1acc9d0aa4b
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.16.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{7..9})
+PYTHON_REQ_USE="sqlite,ssl,xml"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# tests require network access
+RESTRICT="test"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+src_compile() {
+	emake data/completion/gallery-dl
+	emake data/completion/_gallery-dl
+	emake man
+	distutils-r1_src_compile
+}
+
+pkg_postinst() {
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/youtube-dl
+}
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 65a968a34250..3202a10beb50 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,4 +1,5 @@
-AUX gns3-gui-rmraven.patch 7920 BLAKE2B d6264938eae55de6754c187f63bbb96707e8e0f68f1aa7153d8101aec5d81e46d3ad145a16f1694b358467c6a4586478c21112126b797e4b76e3ab549636dfdd SHA512 a47c9445caf185624aaec8834ed0884b588b07c34481e09b3f0be3ae5a9643f0a925eefb816d03617c072fe8d239307376715c6028345b6f498a98a41c3bcc51
 DIST gns3-gui-2.2.11.tar.gz 5240137 BLAKE2B 6601e8477c9d5dadfb04a19d4bb75efad39d23cde1fb4e9bc0698cf59c403f154ea1b46b216e2271da476b42d7d58ecee9ef8acabeae039c4026c1f5ee7325eb SHA512 7cb3b4b8bcae5b6adc6d3637fad9a8e4cf885709f9440f484224c04044960b082d1b7b81ad23b5c128c9e58e6ac23d07101128b96caaa095394c0feedc2a8dc3
+DIST gns3-gui-2.2.17.tar.gz 5161745 BLAKE2B 16501f3f2c9efa3f2bf0305f7af159f91d36000c4850fbcc8bf29afaf204de14d7f0531fc0c63d0e83b7c56a1a26961903852e06254057a4bcc8ff1c900613c8 SHA512 a3871a4d0470917b3bc7b0369ea30eb372cabc72bab1d036653ab94f09d75d5794cc58944905a2b72024c005c96172658a3f14ea081d2d81e7349df10c649045
 EBUILD gns3-gui-2.2.11.ebuild 1339 BLAKE2B 6f583146310feff20f56f007025d35de424a22336c569922082136641a89043cd1604248343bb6605301fe30b922228bdda7fb1c766660e734e2f3a10ddba071 SHA512 b586e650f3ffee47d1f81ab336f0c5cf3a426a2bb5a1e0e7d1a42fb405ab8c97c8d7ff55633fb96b037004f8947a348515254b4127006bb9f7e90c8a139be92d
+EBUILD gns3-gui-2.2.17.ebuild 1128 BLAKE2B 69dd59c79cbde82c113cbd0f9f96978040680a0bd17b4d3374c06e265692c4809e46157be448ce7f3761d49e13f8151de5018ca2a366f9e5bbf0804c014219f9 SHA512 c7f75554ded5a8af7abf70288239686f25f561a013f6c86bdd0ce327548a1655c0e4f8a545355fe52783c4653bb069494caeac63fb91e584836cdebb1c29b419
 MISC metadata.xml 567 BLAKE2B 91ca81f4e547aaf3098d74655d41ba9c340fd642268ac88cf28de6f4b782826d020a7b17cbad9a3dd17f27c573a632a006e23d114b0a049382075b4e71f125f4 SHA512 475a15519d9f8f3a2c8c6aed6ae780895b1f2ead2a659058f609ee1de19cac3e75b37f5f159bc8b6b0ce345ea64fee7d515ad1977fa1072aed73fe0b55c980ee
diff --git a/net-misc/gns3-gui/files/gns3-gui-rmraven.patch b/net-misc/gns3-gui/files/gns3-gui-rmraven.patch
deleted file mode 100644
index 9a8be4e62495..000000000000
--- a/net-misc/gns3-gui/files/gns3-gui-rmraven.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 2ea1946c0f83672f5289edcce207a8d2de03cc43 Mon Sep 17 00:00:00 2001
-From: grossmj <grossmj@gns3.net>
-Date: Tue, 19 May 2020 15:48:53 +0930
-Subject: [PATCH] Replace Raven by Sentry SDK. Fixes
- https://github.com/GNS3/gns3-server/issues/1758
-
----
- gns3/crash_report.py | 111 +++++++++++++++++++++++++------------------
- requirements.txt     |   2 +-
- 2 files changed, 66 insertions(+), 47 deletions(-)
-
-diff --git a/gns3/crash_report.py b/gns3/crash_report.py
-index a6a555fd5..dfbb9fc46 100644
---- a/gns3/crash_report.py
-+++ b/gns3/crash_report.py
-@@ -23,12 +23,11 @@
- import distro
- 
- try:
--    import raven
--    from raven.transport.http import HTTPTransport
--    RAVEN_AVAILABLE = True
-+    import sentry_sdk
-+    SENTRY_SDK_AVAILABLE = True
- except ImportError:
--    # raven is not installed with deb package in order to simplify packaging
--    RAVEN_AVAILABLE = False
-+    # Sentry SDK is not installed with deb package in order to simplify packaging
-+    SENTRY_SDK_AVAILABLE = False
- 
- from .utils.get_resource import get_resource
- from .version import __version__, __version_info__
-@@ -69,49 +68,50 @@ def __init__(self):
-         sentry_uncaught = logging.getLogger('sentry.errors.uncaught')
-         sentry_uncaught.disabled = True
- 
--    def captureException(self, exception, value, tb):
--        from .local_server import LocalServer
--        from .local_config import LocalConfig
--        from .controller import Controller
--        from .compute_manager import ComputeManager
--
--        local_server = LocalServer.instance().localServerSettings()
--        if local_server["report_errors"]:
--            if not RAVEN_AVAILABLE:
--                return
--
--            if os.path.exists(LocalConfig.instance().runAsRootPath()):
--                log.warning("User has run application as root. Crash reports are disabled.")
--                sys.exit(1)
--                return
-+        if SENTRY_SDK_AVAILABLE:
-+            cacert = None
-+            if hasattr(sys, "frozen"):
-+                cacert_resource = get_resource("cacert.pem")
-+                if cacert_resource is not None and os.path.isfile(cacert_resource):
-+                    cacert = cacert_resource
-+                else:
-+                    log.error("The SSL certificate bundle file '{}' could not be found".format(cacert_resource))
- 
--            if os.path.exists(".git"):
--                log.warning("A .git directory exist crash report is turn off for developers. Instant exit")
--                sys.exit(1)
--                return
-+            sentry_sdk.init(dsn=CrashReport.DSN,
-+                            release=__version__,
-+                            ca_certs=cacert)
- 
--            if hasattr(exception, "fingerprint"):
--                client = raven.Client(CrashReport.DSN, release=__version__, fingerprint=['{{ default }}', exception.fingerprint], transport=HTTPTransport)
--            else:
--                client = raven.Client(CrashReport.DSN, release=__version__, transport=HTTPTransport)
--            context = {
-+            tags = {
-                 "os:name": platform.system(),
-                 "os:release": platform.release(),
-                 "os:win_32": " ".join(platform.win32_ver()),
-                 "os:mac": "{} {}".format(platform.mac_ver()[0], platform.mac_ver()[2]),
-                 "os:linux": " ".join(distro.linux_distribution()),
-+
-+            }
-+
-+            self._add_qt_information(tags)
-+
-+            with sentry_sdk.configure_scope() as scope:
-+                for key, value in tags.items():
-+                    scope.set_tag(key, value)
-+
-+            extra_context = {
-                 "python:version": "{}.{}.{}".format(sys.version_info[0],
-                                                     sys.version_info[1],
-                                                     sys.version_info[2]),
-                 "python:bit": struct.calcsize("P") * 8,
-                 "python:encoding": sys.getdefaultencoding(),
--                "python:frozen": "{}".format(hasattr(sys, "frozen")),
-+                "python:frozen": "{}".format(hasattr(sys, "frozen"))
-             }
- 
-             # extra controller and compute information
--            extra_context = {"controller:version": Controller.instance().version(),
--                             "controller:host": Controller.instance().host(),
--                             "controller:connected": Controller.instance().connected()}
-+            from .controller import Controller
-+            from .compute_manager import ComputeManager
-+            extra_context["controller:version"] = Controller.instance().version()
-+            extra_context["controller:host"] = Controller.instance().host()
-+            extra_context["controller:connected"] = Controller.instance().connected()
-+
-             for index, compute in enumerate(ComputeManager.instance().computes()):
-                 extra_context["compute{}:id".format(index)] = compute.id()
-                 extra_context["compute{}:name".format(index)] = compute.name(),
-@@ -120,27 +120,46 @@ def captureException(self, exception, value, tb):
-                 extra_context["compute{}:platform".format(index)] = compute.capabilities().get("platform")
-                 extra_context["compute{}:version".format(index)] = compute.capabilities().get("version")
- 
--            context = self._add_qt_information(context)
--            client.tags_context(context)
--            client.extra_context(extra_context)
-+            with sentry_sdk.configure_scope() as scope:
-+                for key, value in extra_context.items():
-+                    scope.set_extra(key, value)
-+
-+    def captureException(self, exception, value, tb):
-+        from .local_server import LocalServer
-+        from .local_config import LocalConfig
-+
-+        local_server = LocalServer.instance().localServerSettings()
-+        if local_server["report_errors"]:
-+            if not SENTRY_SDK_AVAILABLE:
-+                return
-+
-+            if os.path.exists(LocalConfig.instance().runAsRootPath()):
-+                log.warning("User is running application as root. Crash reports disabled.")
-+                sys.exit(1)
-+                return
-+
-+            if os.path.exists(".git"):
-+                log.warning("A .git directory exists, crash reporting is turned off for developers.")
-+                sys.exit(1)
-+                return
-+
-             try:
--                report = client.captureException((exception, value, tb))
-+                sentry_sdk.capture_exception((exception, value, tb))
-+                log.info("Crash report sent with event ID: {}".format(sentry_sdk.last_event_id()))
-             except Exception as e:
-                 log.error("Can't send crash report to Sentry: {}".format(e))
--                return
--            log.debug("Crash report sent with event ID: {}".format(client.get_ident(report)))
- 
--    def _add_qt_information(self, context):
-+    def _add_qt_information(self, tags):
-+
-         try:
-             from .qt import QtCore
-             from .qt import sip
-         except ImportError:
--            return context
--        context["psutil:version"] = psutil.__version__
--        context["pyqt:version"] = QtCore.PYQT_VERSION_STR
--        context["qt:version"] = QtCore.QT_VERSION_STR
--        context["sip:version"] = sip.SIP_VERSION_STR
--        return context
-+            return tags
-+        tags["pyqt:version"] = QtCore.PYQT_VERSION_STR
-+        tags["qt:version"] = QtCore.QT_VERSION_STR
-+        tags["sip:version"] = sip.SIP_VERSION_STR
-+        return tags
- 
-     @classmethod
-     def instance(cls):
-diff --git a/requirements.txt b/requirements.txt
-index 99e803f1b..abd6cc7c9 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,5 +1,5 @@
- jsonschema==3.2.0; python_version >= '3.8'  # pyup: ignore
- jsonschema==2.6.0; python_version < '3.8'  # pyup: ignore
--raven>=5.23.0
-+sentry-sdk>=0.14.4
- psutil==5.6.6
- distro>=1.3.0
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.17.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.17.ebuild
new file mode 100644
index 000000000000..222f29a2923d
--- /dev/null
+++ b/net-misc/gns3-gui/gns3-gui-2.2.17.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 desktop xdg
+
+DESCRIPTION="Graphical Network Simulator"
+HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+#net-misc/gns3-server version should always match gns3-gui version
+RDEPEND="
+	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	default
+
+	# newer python packages are fine
+	sed -i -e 's/[<>=].*//' requirements.txt || die "fixing requirements failed"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doicon "resources/images/gns3.ico"
+	make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
+}
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 66749eb9764e..f1e78f21d914 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,4 +1,5 @@
-AUX gns3-server-rmraven.patch 7946 BLAKE2B 910366f4552ce3984cef20b88d5fb3a6233d02294d4921a068e5175e9b305dc6d60349c9362e6d09a959aa5eef615a1793363e8965e5711f33b15c981a3b192c SHA512 94af9d532ad6c90c23360240ab15f439cbdfbd95c870c76e0f71b5178d8a24058a18be088a98f9e3cc731f186cfb12c5fc501da32b0a514b7d66c98fdc0b58c3
 DIST gns3-server-2.2.11.tar.gz 7588877 BLAKE2B 429eb23e44ca0f3f68abba6fa437b80c12fb1e70c02e1c81ce2051a9d9b78f31f6618397dee07e307589c3f9f0ad55a26f22084ffa01b7c42b730bd505979c2e SHA512 6e11c6ae10942bac9f82dc3b5e0bee04c8afbbae8ca6b5d20e42495c15010ba17cddbac83c7c188a565ce8b24ed58ac7c80b4eb5a8f29f2612dce9d0dfa65a07
+DIST gns3-server-2.2.17.tar.gz 8980894 BLAKE2B 0f3698adeb7cf9daede05c0281a2c324bad0952a9e5774e11ebb9af342da020bac8b7acb05a938cd8df5a8934bed6bd2b56ee0187ea28b8356376e1f1396e944 SHA512 233db2e3bb3d6a071ce3ce24b8c86049f2707863f92ca67c4fdfb763bbdc98d3b78a1c2156d2d05548ee10f84394ab333f1c3404723091dc4e7edeb3df5a4a57
 EBUILD gns3-server-2.2.11.ebuild 1990 BLAKE2B 985f6510da23c8924af22a73faf0c7764b40c05b37964c21eef33ddf0a4546115ebefff79923ae49ff404e0e37480aec4e9017411f0f573884f4a2f2f756da62 SHA512 a0060db7bd91bc00d0313e2041e038d0999e16e542dd016f78e1b271107ca74d360f09b32d8488b45dfd24ac04c04b08cf86ea6088989ffbcdac1a16efbb9cc6
+EBUILD gns3-server-2.2.17.ebuild 2141 BLAKE2B bdf09970f3219a647417c16be639efc24db650957ecc8d1d33b0a782aa428f1499faa34e9e3147fd1ee0359937da6d0cd8714e849eb29246678e8dd4f306bc43 SHA512 9adc66b53022286421d46f591ef79eefb1b186376a5cee802c41b1a89e770e0ac7972c1b748e570da4dedb42473f6d89d032e698c080ff8f96e7fa3b29775507
 MISC metadata.xml 567 BLAKE2B 91ca81f4e547aaf3098d74655d41ba9c340fd642268ac88cf28de6f4b782826d020a7b17cbad9a3dd17f27c573a632a006e23d114b0a049382075b4e71f125f4 SHA512 475a15519d9f8f3a2c8c6aed6ae780895b1f2ead2a659058f609ee1de19cac3e75b37f5f159bc8b6b0ce345ea64fee7d515ad1977fa1072aed73fe0b55c980ee
diff --git a/net-misc/gns3-server/files/gns3-server-rmraven.patch b/net-misc/gns3-server/files/gns3-server-rmraven.patch
deleted file mode 100644
index 612a16aecaee..000000000000
--- a/net-misc/gns3-server/files/gns3-server-rmraven.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From c63aad8eca00bca2ec48fcb667bbdfd80a22a7ab Mon Sep 17 00:00:00 2001
-From: grossmj <grossmj@gns3.net>
-Date: Tue, 19 May 2020 15:48:53 +0930
-Subject: [PATCH] Replace Raven by Sentry SDK. Fixes
- https://github.com/GNS3/gns3-server/issues/1758
-
----
- gns3server/crash_report.py | 93 ++++++++++++++++++++------------------
- gns3server/web/route.py    |  2 +-
- requirements.txt           |  3 +-
- 3 files changed, 53 insertions(+), 45 deletions(-)
-
-diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py
-index 87e22a213..7f92d38e6 100644
---- a/gns3server/crash_report.py
-+++ b/gns3server/crash_report.py
-@@ -15,22 +15,21 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
-+try:
-+    import sentry_sdk
-+    from sentry_sdk.integrations.aiohttp import AioHttpIntegration
-+    SENTRY_SDK_AVAILABLE = True
-+except ImportError:
-+    # Sentry SDK is not installed with deb package in order to simplify packaging
-+    SENTRY_SDK_AVAILABLE = False
-+
- import os
- import sys
- import struct
--import aiohttp
- import platform
- import locale
- import distro
- 
--try:
--    import raven
--    from raven.transport.http import HTTPTransport
--    RAVEN_AVAILABLE = True
--except ImportError:
--    # raven is not installed with deb package in order to simplify packaging
--    RAVEN_AVAILABLE = False
--
- from .version import __version__, __version_info__
- from .config import Config
- from .utils.get_resource import get_resource
-@@ -59,48 +58,45 @@ class CrashReport:
-     """
- 
-     DSN = "https://dbfb677c73304b1286aef33dfbb749c6:93b9a937d4884426a1b15f37536fcd94@o19455.ingest.sentry.io/38482"
--    if hasattr(sys, "frozen"):
--        cacert = get_resource("cacert.pem")
--        if cacert is not None and os.path.isfile(cacert):
--            DSN += "?ca_certs={}".format(cacert)
--        else:
--            log.warning("The SSL certificate bundle file '{}' could not be found".format(cacert))
-     _instance = None
- 
-     def __init__(self):
--        self._client = None
- 
--        # We don't want sentry making noise if an error is catched when you don't have internet
-+        # We don't want sentry making noise if an error is caught when you don't have internet
-         sentry_errors = logging.getLogger('sentry.errors')
-         sentry_errors.disabled = True
- 
-         sentry_uncaught = logging.getLogger('sentry.errors.uncaught')
-         sentry_uncaught.disabled = True
- 
--    def capture_exception(self, request=None):
--        if not RAVEN_AVAILABLE:
--            return
--        if os.path.exists(".git"):
--            log.warning("A .git directory exist crash report is turn off for developers")
--            return
--        server_config = Config.instance().get_section_config("Server")
--        if server_config.getboolean("report_errors"):
--            if self._client is None:
--                self._client = raven.Client(CrashReport.DSN, release=__version__, raise_send_errors=True, transport=HTTPTransport)
--            if request is not None:
--                self._client.http_context({
--                    "method": request.method,
--                    "url": request.path,
--                    "data": request.json,
--                })
--
--            context = {
-+        if SENTRY_SDK_AVAILABLE:
-+            cacert = None
-+            if hasattr(sys, "frozen"):
-+                cacert_resource = get_resource("cacert.pem")
-+                if cacert_resource is not None and os.path.isfile(cacert_resource):
-+                    cacert = cacert_resource
-+                else:
-+                    log.error("The SSL certificate bundle file '{}' could not be found".format(cacert_resource))
-+
-+            sentry_sdk.init(dsn=CrashReport.DSN,
-+                            release=__version__,
-+                            ca_certs=cacert,
-+                            integrations=[AioHttpIntegration()])
-+
-+            tags = {
-                 "os:name": platform.system(),
-                 "os:release": platform.release(),
-                 "os:win_32": " ".join(platform.win32_ver()),
-                 "os:mac": "{} {}".format(platform.mac_ver()[0], platform.mac_ver()[2]),
-                 "os:linux": " ".join(distro.linux_distribution()),
--                "aiohttp:version": aiohttp.__version__,
-+
-+            }
-+
-+            with sentry_sdk.configure_scope() as scope:
-+                for key, value in tags.items():
-+                    scope.set_tag(key, value)
-+
-+            extra_context = {
-                 "python:version": "{}.{}.{}".format(sys.version_info[0],
-                                                     sys.version_info[1],
-                                                     sys.version_info[2]),
-@@ -113,8 +109,8 @@ def capture_exception(self, request=None):
-                 # add locale information
-                 try:
-                     language, encoding = locale.getlocale()
--                    context["locale:language"] = language
--                    context["locale:encoding"] = encoding
-+                    extra_context["locale:language"] = language
-+                    extra_context["locale:encoding"] = encoding
-                 except ValueError:
-                     pass
- 
-@@ -124,17 +120,28 @@ def capture_exception(self, request=None):
-                 if os.path.isfile(gns3vm_version):
-                     try:
-                         with open(gns3vm_version) as fd:
--                            context["gns3vm:version"] = fd.readline().strip()
-+                            extra_context["gns3vm:version"] = fd.readline().strip()
-                     except OSError:
-                         pass
- 
--            self._client.tags_context(context)
-+            with sentry_sdk.configure_scope() as scope:
-+                for key, value in extra_context.items():
-+                    scope.set_extra(key, value)
-+
-+    def capture_exception(self):
-+        if not SENTRY_SDK_AVAILABLE:
-+            return
-+        if os.path.exists(".git"):
-+            log.warning(".git directory detected, crash reporting is turned off for developers.")
-+            return
-+        server_config = Config.instance().get_section_config("Server")
-+        if server_config.getboolean("report_errors"):
-+
-             try:
--                report = self._client.captureException()
-+                sentry_sdk.capture_exception()
-+                log.info("Crash report sent with event ID: {}".format(sentry_sdk.last_event_id()))
-             except Exception as e:
-                 log.error("Can't send crash report to Sentry: {}".format(e))
--                return
--            log.info("Crash report sent with event ID: {}".format(self._client.get_ident(report)))
- 
-     @classmethod
-     def instance(cls):
-diff --git a/gns3server/web/route.py b/gns3server/web/route.py
-index d1275250d..c70dbbc3a 100644
---- a/gns3server/web/route.py
-+++ b/gns3server/web/route.py
-@@ -242,7 +242,7 @@ async def control_schema(request):
-                     log.error("Uncaught exception detected: {type}".format(type=type(e)), exc_info=1)
-                     response = Response(request=request, route=route)
-                     response.set_status(500)
--                    CrashReport.instance().capture_exception(request)
-+                    CrashReport.instance().capture_exception()
-                     exc_type, exc_value, exc_tb = sys.exc_info()
-                     lines = traceback.format_exception(exc_type, exc_value, exc_tb)
-                     if api_version is not None:
-diff --git a/requirements.txt b/requirements.txt
-index 57fbb7938..0af9e0d68 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -4,9 +4,10 @@ jsonschema==2.6.0; python_version < '3.8'  # pyup: ignore
- aiohttp==3.6.2
- aiohttp-cors==0.7.0
- aiofiles==0.4.0
-+aiocontextvars==0.2.2
- async_generator>=1.10
- Jinja2>=2.7.3
--raven>=5.23.0
-+sentry-sdk>=0.14.4
- psutil==5.6.6
- async-timeout==3.0.1
- distro>=1.3.0
diff --git a/net-misc/gns3-server/gns3-server-2.2.17.ebuild b/net-misc/gns3-server/gns3-server-2.2.17.ebuild
new file mode 100644
index 000000000000..b014c21ebf68
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.2.17.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 systemd optfeature
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=app-emulation/dynamips-0.2.18
+	>=dev-python/aiofiles-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+	>=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+	>=net-misc/ubridge-0.9.14
+"
+
+src_prepare() {
+	default
+
+	# newer python packages are fine
+	sed -i -e 's/[<>=].*//' requirements.txt || die "fixing requirements failed"
+
+	# Remove Pre-built busybox binary
+	rm gns3server/compute/docker/resources/bin/busybox || die
+
+	# Package installs 'tests' package which is forbidden
+	rm -r tests || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	systemd_dounit init/gns3.service.systemd
+
+	mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
+	ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die
+}
+
+pkg_postinst() {
+	elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
+	elog ""
+	elog "The following is a list of packages that can be added:"
+	optfeature "QEMU Support" "app-emulation/qemu"
+	optfeature "Virtualbox Support" "app-emulation/virtualbox"
+	optfeature "Docker Support" "app-emulation/docker"
+	optfeature "Wireshark Support" "net-analyzer/wireshark"
+	elog ""
+	elog "The following packages are currently unsupported:"
+	elog "iouyap and vpcs"
+}
diff --git a/net-misc/gwhois/Manifest b/net-misc/gwhois/Manifest
index 5b4293a92eaf..5a37582153cf 100644
--- a/net-misc/gwhois/Manifest
+++ b/net-misc/gwhois/Manifest
@@ -1,4 +1,4 @@
 AUX gwhois.xinetd 305 BLAKE2B 7ed747398edeb544cccd308ca04a192b62c2bad7206a8a2db85382f01cb72d5794a7c7818caf9a26a9a59841b1282a1a6dd8821b2153d8a3ac6631aa23074419 SHA512 33afac83df9f8d53b54144358cd50b1ea40e266fd5438d1f8a32954c4f05cdb608b5ebc688673f1866ac76e59dfb0b097884bb38077e50061639152899d68460
 DIST gwhois_20120626-1.2.tar.gz 41800 BLAKE2B 695005bd37abaf0dc39593dcc3dfd01102b896dc2bb74a8f3be774d5f7316861588ca3ca621eabdeb19739abfda9be0ab215c757181d3d08ce0416f315410d0d SHA512 c18e20a033e3d2de3b1a5c81d1fdae88cfd9dbc5261b4512b87376d0909ea538db46b3380aaa426ef43904ef292662185dd2f3cb59c56dba306c41a0e827bcb0
-EBUILD gwhois-20120626-r1.ebuild 1360 BLAKE2B 0adde949bbb6376f618164fda970dfb4d52d96d38d3ff182b35e38c04b18dc8ed783012e3452a026882865afe42dd3b2f2da405a7529e5dad56e8e3523f437b3 SHA512 fa7cff556bfb59cc903442186625bed386ad44ffeb695766861897ca8724756fb4bc473deab877ef036f05d3219d4c1f7b60a421e55ea2298e4bfc2bb5f2e743
+EBUILD gwhois-20120626-r1.ebuild 1356 BLAKE2B ba40647d5f2ba2c288fd35f4eeb32f01e37d5853a72e3a3fd2d3ffcb0668e949da45c9bad2420bc39cb1ba38baa46af11328b9ae3234e7cdf4acc202df5b2983 SHA512 ee2c6aca920fe76516f25bc09be95faccbb0cffd49ad4885d729bf11c637def0e2e111495a06ff373d4d9ff4980502ba413efe58967c9d514de0fead99451ded
 MISC metadata.xml 530 BLAKE2B 8bde49044c3d194febcd4dd6d43e60854f2282264a5a22d8e35a131c3f6fe5f72f91bb20a8d1179267af873246611fb4defa8ffc5b8e0f0288f6e514475f55c6 SHA512 8e59f39cd78c74a06d0c9d0efc4cf72e80df415b2433970707977cf049140630e976e12062ad2bab2822ac790ae6c160f87cb65c2c746e7ede14d288f6364306
diff --git a/net-misc/gwhois/gwhois-20120626-r1.ebuild b/net-misc/gwhois/gwhois-20120626-r1.ebuild
index 24146bc47fe1..e898b6141eb2 100644
--- a/net-misc/gwhois/gwhois-20120626-r1.ebuild
+++ b/net-misc/gwhois/gwhois-20120626-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit readme.gentoo-r1
 
 MY_P="${P/_p/.}"
@@ -11,23 +12,20 @@ DESCRIPTION="Generic whois"
 HOMEPAGE="https://julijane.de/gwhois/"
 # Debian is still maintaining it
 #SRC_URI="http://gwhois.de/gwhois/${MY_P/-/_}.tar.gz"
-
 DEBIAN_VER="1.2"
 SRC_URI="mirror://debian/pool/main/g/${PN}/${MY_P/-/_}-${DEBIAN_VER}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND="
-	www-client/lynx
 	net-misc/curl
 	dev-lang/perl:=
 	dev-perl/libwww-perl
 	dev-perl/Net-LibIDN
+	www-client/lynx
 "
-DEPEND=""
 
 DOC_CONTENTS="
 	See included gwhois.xinetd for an example on how to
@@ -37,7 +35,6 @@ DOC_CONTENTS="
 "
 
 src_install() {
-	dodir /etc/gwhois
 	insinto /etc/gwhois
 	doins pattern
 	dobin gwhois
@@ -47,13 +44,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ -f /etc/gwhois/pattern.ripe ]; then
+	if [[ -f "${EROOT}"/etc/gwhois/pattern.ripe ]]; then
 		ewarn ""
 		ewarn "Will move old /etc/gwhois/pattern.ripe to removethis-pattern.ripe"
 		ewarn "as it causes malfunction with this version."
 		ewarn "If you did not modify the file, just remove it."
 		ewarn ""
-		mv /etc/gwhois/pattern.ripe /etc/gwhois/removethis-pattern.ripe
+		mv "${EROOT}"/etc/gwhois/pattern.ripe "${EROOT}"/etc/gwhois/removethis-pattern.ripe
 	fi
+
 	readme.gentoo_print_elog
 }
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index d2046541207a..52407bdeb167 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -6,9 +6,10 @@ AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b06
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
 DIST linuxx64-20.10.0.6.tar.gz 119730020 BLAKE2B 62154534ee83f18ebd71c4f2d247863c028ad34dfea1fc1b182e3dd5ef3296f65a45860a1b613de286e9d1a5ac52f4ea00da92ba221619194608ccd453306112 SHA512 ec16064483c94c3b56caef622c2091e845613bd0926174fd40474f7f74d62a56f3d5dce2398e42b12a7c774b62dfe605ef7c9f7556d14814d902047a35154c68
-DIST linuxx64-20.9.0.15.tar.gz 117636697 BLAKE2B 4279fa23edd6be2c0cd73f4f1881815b377779d695b1fb110fd5a28aae6ef45649e9b9796ad6d637954bd4dd62e35aadbb352311297e10fa0923fb03ea42711b SHA512 6a5e2cc3f40ffd894548247df4ce2dd988293fa17e72ba101bd32250ac13ea077a80ab1129e7d85987333ad6afaf3c3e2fe75a642e66d21c87d07cf6c57adfb2
+DIST linuxx64-20.12.0.12.tar.gz 120763336 BLAKE2B 4db068617ce7f47351bf8d0b964f00719705090d7a805eccaca3823648852fa12b894aa2f55d5abc0c6936ee01204bc2967488368797d081f6fd97f1a1cb25b8 SHA512 9bc6fd49dea450269ac9f70c20fa5b6a3fb7812e83005063ce5a32032d02a2283d13fa25e64a426c1b7e7cce717a3c4dd0ce2903a51a12758f7f7c3efb558ae6
 DIST linuxx86-20.10.0.6.tar.gz 109881795 BLAKE2B 0deda5cd800a891a1c15f8e1b6f553b86ee1d90177ddb75460bc6f5a2afe40e9c56cc1427c25ed64ba66741ba0749efc736ea653ea633aefd086a3fb2e34d1d2 SHA512 027658ecc25775d3436a4a02f36a6fc7da766b909d2b21284e3d7f2c658397b4e3e496556eae84f241dca41b155ee2f7088780e5d89e295d641aadae3908cef8
-DIST linuxx86-20.9.0.15.tar.gz 108055955 BLAKE2B f94ff3e44152165d0122cc28c302df2bbc7401aaa7b61ee8e7479ffd44d6fcc25daac94211ba3dabed56d51b531d9a72a41e63dd2019880d956f2a4faa0269c1 SHA512 cddbef60ddf4baa1e9f45e80df78c2153907a4eb010649946ee10d0875c9066268a47d37ddd3f3cb026cf130a3f4e566d745f1b3781c13810b50476344cfafb4
-EBUILD icaclient-20.10.0.6.ebuild 4855 BLAKE2B e8c9f6e9041cff306a5dc9c5255dc536119f71b4bd8f6e9af15f796070fe3b2ee8bcef150489b7c4cc77f61a5fa606f07a6d9276c02e4a78e6619722c956c773 SHA512 b586a4a1706468cf6a8cc294b3f41913b04698809bafcebea9ebf6b9bc809684f29849e15eef4da7212c6354b46ea8952a2d8d5878fa487f152f9697e6dfe1df
-EBUILD icaclient-20.9.0.15-r1.ebuild 4853 BLAKE2B a0110efc3e3fc44cf83cc288b16923771f9722c62122e377fd420afb9366892ca221618790fdba390eca5538be64e0511d2f426c7437f0d52e902b9b58c6ace4 SHA512 0f71d26f20635ade089d35e56435342332d6dc8b3862bd68ae5a1cc8b71e51018aa28e22a2ca9c33aca9411136db8e751f475e730abc2ee21929240457928130
+DIST linuxx86-20.12.0.12.tar.gz 110107767 BLAKE2B 1958eb57622be69edb95ac2c0389f5dd98141bc92899d876b3c4911629c63a3d5b21bb2c7296975a41afbcc321b733fd05a6874ff4b03d79ff3c4aa6a1a44ec9 SHA512 e976ba3c00bbb16aa1039ac510fdb6118c1353e9ba4a67b4ac553896b6b51346d16ae8a569ddfbbc3ab89f89b1759789e2bb88e397611140e5caf11709917d98
+EBUILD icaclient-20.10.0.6.ebuild 4853 BLAKE2B 9bd96d270e9ccba3cd55b9397dd7a35033150cd318e174af9cf89878fed2940930ce7423a7ef12490b6d2cc07015376d3bcdc844f57487c1bedb144ab44e475c SHA512 a06fb2a3732e541bf052d94fbd3684e9fbbc6dfdb74a778c6f3ee90e837b5cd4c2a176156bab322a9b3a8527f5543feb245ea321fe136260bd9a06c42531c204
+EBUILD icaclient-20.12.0.12-r1.ebuild 5257 BLAKE2B c9290b8d671b3f1724f3c9469a6b1cac335c21bc1f7ef61f86f5e598fd7035915772199d9fb11e860f1e3be2a1202470bd8412b1a40d5fb79218c6829eacb226 SHA512 c354868982eabf494d18e184ff0045e9caba639d1bc561098549281d923c62386d7010c280ef411e61880658339c12aea52091c7db25da186ef0033e89556c82
+EBUILD icaclient-20.12.0.12-r2.ebuild 5336 BLAKE2B ba5372eab77e9f407818b50a2c068f53446de00422324de160be3a178d1c624558a0e25333966bcfe47c1d61e93bc6e38025bf3fa776e13506539b1c2ab898b6 SHA512 b8c86453827e697617955954d1a2756a074b641921cfd0cba2bd61edffdda96d1c665e7bb5499d1738abd0137e222bf85ec1018fe64fd20c39184f196b0a846b
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-misc/icaclient/icaclient-20.10.0.6.ebuild b/net-misc/icaclient/icaclient-20.10.0.6.ebuild
index 7c0393e74900..57eda077ca0f 100644
--- a/net-misc/icaclient/icaclient-20.10.0.6.ebuild
+++ b/net-misc/icaclient/icaclient-20.10.0.6.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="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-20.9.0.15-r1.ebuild b/net-misc/icaclient/icaclient-20.12.0.12-r1.ebuild
index c6398836aa03..a54700cb8626 100644
--- a/net-misc/icaclient/icaclient-20.9.0.15-r1.ebuild
+++ b/net-misc/icaclient/icaclient-20.12.0.12-r1.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="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
@@ -22,10 +22,10 @@ ICAROOT="/opt/Citrix/ICAClient"
 QA_PREBUILT="${ICAROOT#/}/*"
 
 RDEPEND="
+	app-crypt/libsecret
 	dev-libs/atk
 	dev-libs/glib:2
 	dev-libs/libxml2
-	dev-libs/openssl-compat:1.0.0
 	media-fonts/font-adobe-100dpi
 	media-fonts/font-misc-misc
 	media-fonts/font-cursor-misc
@@ -41,8 +41,6 @@ RDEPEND="
 	media-libs/speex
 	net-libs/libsoup:2.4
 	net-libs/webkit-gtk:4
-	net-misc/curl
-	net-misc/nx
 	sys-apps/util-linux
 	sys-libs/libcxx
 	sys-libs/libcxxabi
@@ -93,6 +91,11 @@ pkg_setup() {
 src_prepare() {
 	default
 	rm lib/UIDialogLibWebKit.so || die
+
+	# We need to avoid module.ini file getting added to the package's
+	# content because media-plugins/hdx-realtime-media-engine modifies
+	# this file on installation. See pkg_postinst()
+	mv nls/en/module.ini "${T}" || die
 }
 
 src_install() {
@@ -118,7 +121,8 @@ src_install() {
 	doins -r usb
 
 	insinto "${ICAROOT}"/config
-	doins config/* config/.* nls/en/*.ini
+	# nls/en/*.ini is being handled by pkg_postinst()
+	doins config/* config/.*
 	for tmpl in {appsrv,wfclient}.template ; do
 		newins nls/en/${tmpl} ${tmpl/template/ini}
 	done
@@ -231,6 +235,12 @@ src_install() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
+
+	local inidest="${BROOT}${ICAROOT}/config"
+	if [[ ! -e "${inidest}"/module.ini ]] ; then
+		mv "${T}"/module.ini "${inidest}/" \
+			|| ewarn 'Failed to install plugin.ini file'
+	fi
 }
 
 pkg_postrm() {
diff --git a/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild b/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild
new file mode 100644
index 000000000000..a92334c81619
--- /dev/null
+++ b/net-misc/icaclient/icaclient-20.12.0.12-r2.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# eutils inherit required for make_wrapper call
+inherit desktop eutils multilib xdg-utils
+
+DESCRIPTION="ICA Client for Citrix Presentation servers"
+HOMEPAGE="https://www.citrix.com/"
+SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
+	x86? ( linuxx86-${PV}.tar.gz )"
+
+LICENSE="icaclient"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
+RESTRICT="mirror strip userpriv fetch"
+
+ICAROOT="/opt/Citrix/ICAClient"
+
+QA_PREBUILT="${ICAROOT#/}/*"
+
+RDEPEND="
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	media-fonts/font-xfree86-type1
+	media-fonts/font-misc-ethiopic
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/speex
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	sys-apps/util-linux
+	sys-libs/libcxx
+	sys-libs/libcxxabi
+	sys-libs/zlib
+	virtual/krb5
+	virtual/jpeg:0
+	virtual/libudev
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+"
+DEPEND=""
+
+pkg_nofetch() {
+	elog "Download the client file ${A} from
+	https://www.citrix.com/downloads/workspace-app/"
+	elog "and place it into your DISTDIR directory."
+}
+
+pkg_setup() {
+	case ${ARCH} in
+		amd64)
+			ICAARCH=linuxx64
+		;;
+		x86)
+			ICAARCH=linuxx86
+		;;
+		*)
+			eerror "Given architecture is not supported by Citrix."
+		;;
+	esac
+
+	S="${WORKDIR}/${ICAARCH}/${ICAARCH}.cor"
+}
+
+src_prepare() {
+	default
+	rm lib/UIDialogLibWebKit.so || die
+
+	# We need to avoid module.ini file getting added to the package's
+	# content because media-plugins/hdx-realtime-media-engine modifies
+	# this file on installation. See pkg_postinst()
+	mv nls/en/module.ini "${T}" || die
+}
+
+src_install() {
+	local bin tmpl dest
+
+	dodir "${ICAROOT}"
+
+	exeinto "${ICAROOT}"
+	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
+
+	exeinto "${ICAROOT}"/lib
+	if use amd64 ; then
+		rm lib/ctxjpeg_fb_8.so || die
+	fi
+	doexe lib/*.so
+
+	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
+		insinto "${dest}"
+		doins nls/en.UTF-8/eula.txt
+	done
+
+	insinto "${ICAROOT}"
+	doins -r usb
+
+	insinto "${ICAROOT}"/config
+	# nls/en/*.ini is being handled by pkg_postinst()
+	doins config/* config/.*
+	for tmpl in {appsrv,wfclient}.template ; do
+		newins nls/en/${tmpl} ${tmpl/template/ini}
+	done
+	touch "${ED}/${ICAROOT}"/config/.server || die
+
+	insinto "${ICAROOT}"/gtk
+	doins gtk/*
+
+	insinto "${ICAROOT}"/gtk/glade
+	doins gtk/glade/*
+
+	insinto "${ICAROOT}"/site
+	doins -r site/*
+
+	dodir "${ICAROOT}"/help
+
+	insinto "${ICAROOT}"/config/usertemplate
+	doins config/usertemplate/*
+
+	local lang LANGCODES=( en )
+	use l10n_de && LANGCODES+=( de )
+	use l10n_es && LANGCODES+=( es )
+	use l10n_fr && LANGCODES+=( fr )
+	use l10n_ja && LANGCODES+=( ja )
+	use l10n_zh-CN && LANGCODES+=( zh_CN )
+
+	for lang in ${LANGCODES[@]} ; do
+		insinto "${ICAROOT}"/nls/${lang}
+		doins nls/${lang}/*
+
+		insinto "${ICAROOT}"/nls/$lang/UTF-8
+		doins nls/${lang}.UTF-8/*
+
+		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
+		doins nls/${lang}/LC_MESSAGES/*
+
+		insinto "${ICAROOT}"/nls/${lang}
+		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
+
+		for tmpl in {appsrv,wfclient}.template ; do
+			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
+				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
+				|| die
+		done
+	done
+
+	insinto "${ICAROOT}"/nls
+	dosym en /opt/Citrix/ICAClient/nls/C
+
+	insinto "${ICAROOT}"/icons
+	doins icons/*
+
+	insinto "${ICAROOT}"/keyboard
+	doins keyboard/*
+
+	rm -r "${S}"/keystore/cacerts || die
+	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
+
+	local util_files=(
+		configmgr
+		conncenter
+		ctx_app_bind
+		ctx_rehash
+		ctxlogd
+		ctxwebhelper
+		gst_play1.0
+		gst_read1.0
+		hdxcheck.sh
+		icalicense.sh
+		libgstflatstm1.0.so
+		lurdump
+		new_store
+		nslaunch
+		pnabrowse
+		setlog
+		storebrowse
+		sunraymac.sh
+		webcontainer
+		what
+		xcapture
+	)
+
+	exeinto "${ICAROOT}"/util
+	for bin in ${util_files[@]} ; do
+		doexe util/${bin}
+	done
+
+	# https://bugs.gentoo.org/655922
+	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
+	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
+	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
+
+	doenvd "${FILESDIR}"/10ICAClient
+
+	for bin in configmgr conncenter new_store ; do
+		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
+	done
+
+	for bin in selfservice wfica ; do
+		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
+	done
+
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
+		> "${ED}"/etc/revdep-rebuild/70icaclient
+
+	insinto "${ICAROOT}"/pkginf
+	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
+
+	# 651926
+	domenu "${FILESDIR}"/*.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	local inidest="${BROOT}${ICAROOT}/config"
+	if [[ ! -e "${inidest}"/module.ini ]] ; then
+		mv "${T}"/module.ini "${inidest}/" \
+			|| ewarn 'Failed to install plugin.ini file'
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
index 9ed07f2121a7..f5724952d133 100644
--- a/net-misc/igmpproxy/Manifest
+++ b/net-misc/igmpproxy/Manifest
@@ -2,5 +2,7 @@ AUX igmpproxy.confd 199 BLAKE2B 85902275ecd501bb26f37c91cf135cb34efd8dab8a6b5d85
 AUX igmpproxy.initd-r1 337 BLAKE2B 44af8071177be905593ea867b23be08a9b51928158f62c7d62bbae33b59edd23c3b873db29f38eac37c42a9385c223e050fb3ed1e8776472f9fb73533d73200e SHA512 1e4e5d73fe9a734ab7898c2defdef8f9b27c3811109ef8819875a65733c72e48feb683d0001ced759c3195ce30bf31c6af9be7cebf30dd1dcd9141ffbbfe3f53
 AUX igmpproxy.service 155 BLAKE2B 7cddd2b54bc632b16ec7ac28665dd752d5e8090741adff7da2d9085b30d7cdd8428d4525bf0ebeabd99663a246a86e45d0958792e04f52e3f798996a5dcabd74 SHA512 e50a6ba9c29e49ff243f3704033a3f4b1167281e6b8270de324a8f8f2646ff063fac0ef90d19196dbf4c8b39e2474e831f1ac2ac35f1a6b85e83e3f9f3d319be
 DIST igmpproxy-0.2.1_p20200508.tar.gz 43672 BLAKE2B 886e293a30ec8b0a6bdfee9a7858d6de67b42e71628a604b108909f7eac31cfb129648f6eb8c47cf6aeec4d0a078f5a7a0f4487737b4f9338f727445a4f94dac SHA512 f0929537cac30664ed94231b2b31098dccea53a3e0d5ddfc14ae5ab08fa116438a983d06c17f41d8fec69b94d0c8725eb23525c94813d78310f2f2e3c03bcbf7
+DIST igmpproxy-0.3.tar.gz 168403 BLAKE2B 4dd07936074fbd9b3c869851f5b592f1eec33109be78ee5a05b3658c26afb67c30379f7cc66dfa20af276aae0a1c21dbf5c9fd337c853d623b08126324b06561 SHA512 0b1deca544317e2f0b1ff550e5921e8d6f64565f7cd72b6210fc7d3d7c3a301875088687a31ca5a29d310b2931695bd7a77e41dc5685ab7175ea1d41fe9246af
 EBUILD igmpproxy-0.2.1_p20200508.ebuild 752 BLAKE2B f2239d6a5230d652b07ff5e7f0321ff7d9a073da365c61a542453d0d8295c1e677ff5bea68319dea2c58f4d94635aa8fbe9ed0572eee47782fdb5538a6afde67 SHA512 30de163b64bc4f5cf4d3a43df562c74eb991c1084c65db0f6d42de893a7f5251f30441f5b48e8b15377330950fa8d0c133f735d53e95291bb878f670f72469f0
+EBUILD igmpproxy-0.3.ebuild 652 BLAKE2B 44e9c3e2becbf6adf63266ed05c5260eeb2ef4e4b50e046278fa485ebefae750c87eae3f8af4a97bbb6572f73defc66de6441d14774e3349b57cb314768d7bcb SHA512 13290e2359b9aa45eda2e4bc7bf345bb89a0afb2ac23d3207e066ab66497412622911b355342d4e243f5a1b5e4e5b11938d45ff25b9c20863d48142c06ce9c58
 MISC metadata.xml 593 BLAKE2B 29de61191b267e0b01464e3cd66e5d1b68deb0feba50b2ae1facb2909a04dbe56e8fb1b9188028bb11ba8fade7f750927e9cc24e2f47bf071fb775a4366deec9 SHA512 326ef6823232e5e8a11e173024a759d969ab190fa3c406063c8f59cdd1a6c33cbe3e1e4c070605e298d7bd3ec4d92c446edcc17dcc3c76660f9391235c1a4721
diff --git a/net-misc/igmpproxy/igmpproxy-0.3.ebuild b/net-misc/igmpproxy/igmpproxy-0.3.ebuild
new file mode 100644
index 000000000000..b0dc2629ed3a
--- /dev/null
+++ b/net-misc/igmpproxy/igmpproxy-0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="A multicast routing daemon which uses IGMP forwarding"
+HOMEPAGE="https://github.com/pali/igmpproxy"
+SRC_URI="https://github.com/pali/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/igmpproxy.initd-r1 igmpproxy
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+
+	newconfd "${FILESDIR}"/igmpproxy.confd igmpproxy
+}
diff --git a/net-misc/kafkacat/Manifest b/net-misc/kafkacat/Manifest
index 771bc1d24d70..e28001ea87cb 100644
--- a/net-misc/kafkacat/Manifest
+++ b/net-misc/kafkacat/Manifest
@@ -1,5 +1,3 @@
-DIST kafkacat-1.3.1.tar.gz 52117 BLAKE2B feeecc7346f70b0193e3217e2aa4e1bc65fce8ddf03b24ec63d3513a586189e05774cbc1a45525bca4a82a828a82e7d3c1358559f2cbc7340466dd47a35d2b87 SHA512 98e51c7ad4a3bb1eda8587af5e4d9ce164d26a9511470799a8379e89d2462397eb51e80ccde6a5c9240b99b014f7ca2c6d494a576de3e0be65df744ebc56d758
 DIST kafkacat-1.5.0.tar.gz 124682 BLAKE2B 392689ded1cd07268bba572273b2b18dbac0d0f4c2daf87c0a4c5fbbff2568df7ec5ca7b64aed34caa851b5e9b8629e246f9d19087496a882b8b55b2e2138f78 SHA512 57f75b26ef32df244043fa9fc17dc2d6fd93daeea4bc389aa78356ea6e45dea780ff9c3462ed27d2a7798560a21eef04f098bf7766c7305bcee4573f557651ad
-EBUILD kafkacat-1.3.1.ebuild 597 BLAKE2B 5b6dd47fb03310902e2da45ee6f136d4486e2441659daadd628ad5e8251877879bfbdb9067fb8e40557f16a17028a261b709797bc728a7fa0d53b200eca88993 SHA512 21b21afcb4fcd66a463f91fbd770d18e5b7dfa3a0e023bf1f8c2eb795df8cdbe60d41767f1012b056cdd466663ab0ee575faa7ee447e862774d4dab996d9a5c0
-EBUILD kafkacat-1.5.0.ebuild 670 BLAKE2B 8ba2cf15c4b5df62c5b58e5dc27728c6aec386c3846e60f90fe5b860e29841b687ff1bf74d8e169ad2b151faed0956eb00eca2f3bbc6755c435f4ceb9ebc04b4 SHA512 b89b261c6a1fcadb248426fe69d1880c0c3562fcc57d9e4e1c5c1796b2cc0c66dad722fc661d10a1ba0f4b28e6fb77b9f4f3359315654430e3a7fe86b39a5e8e
+EBUILD kafkacat-1.5.0.ebuild 669 BLAKE2B af42aa0a0718a66bcbca7a58e4aa41067f3c529c57a18015e602ddaf41f53e01809408cb7797ad1b352ffc43949cd389de21d415437a254a0421563929ff30c3 SHA512 e605348a3662f5e3f3cf54f87d8455769923835f2427659715c031628ad87199f2f67a8b69258fd2b56f7c7a3171e9b41f1737ce665899793951ea54a854dce6
 MISC metadata.xml 467 BLAKE2B 6633c43878cbf26bef2b10e3eb16b9e1328e1fe1c99412d802ab8c30f7f88b6075b0a21f0e69fb0bc33642077f72cadf62bfce78beeb1d35b370f4297b8db437 SHA512 1aae094bbb20905e11f146984c42140fb8338ab632786be3491b1c70a254465e507459137ba241bd8d4f9313f3567a89985f72ed4f3a2bd407981cfac9322901
diff --git a/net-misc/kafkacat/kafkacat-1.3.1.ebuild b/net-misc/kafkacat/kafkacat-1.3.1.ebuild
deleted file mode 100644
index 607a27250bd7..000000000000
--- a/net-misc/kafkacat/kafkacat-1.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Generic command line non-JVM Apache Kafka producer and consumer"
-HOMEPAGE="https://github.com/edenhill/kafkacat"
-SRC_URI="https://github.com/edenhill/kafkacat/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+json"
-
-DEPEND=">=dev-libs/librdkafka-0.9.4
-	json? ( dev-libs/yajl )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf $(use_enable json) --cc=$(tc-getCC)
-}
-
-src_install() {
-	default
-	doman ${PN}.1
-}
diff --git a/net-misc/kafkacat/kafkacat-1.5.0.ebuild b/net-misc/kafkacat/kafkacat-1.5.0.ebuild
index d21b0f437ead..0e3125abcb97 100644
--- a/net-misc/kafkacat/kafkacat-1.5.0.ebuild
+++ b/net-misc/kafkacat/kafkacat-1.5.0.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/edenhill/kafkacat/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+avro +json"
 
 DEPEND=">=dev-libs/librdkafka-0.9.4
diff --git a/net-misc/liveice/Manifest b/net-misc/liveice/Manifest
index 12926702f742..61158e5b7fb0 100644
--- a/net-misc/liveice/Manifest
+++ b/net-misc/liveice/Manifest
@@ -1,3 +1,4 @@
+AUX liveice-2000530-build.patch 1014 BLAKE2B ad5654c354de6ab5f17f647ad9ff754f6a658c54b09af6e6d16a3d1ecc83b4eafefc24b10b1e68c3d75c988b0a4910720fb3e8e4cd5c0d9aa9195649dd05abe4 SHA512 d10b1fc45a530f1d4c8bf8de249b6f5bc25370e243b7316ab0314b8f991057c1c677babb760dda8eb6b712cee327f056a7ddeb8d2f7ad9939cd1e869d543a573
 DIST liveice-2000530.tar.gz 85171 BLAKE2B c804a4f64432cba3181e633b9edb4e67f39c18805290bfae290ae78bcb80d865a3106af8cfab40e214a043609d837bc887d0eb50adbaad3f1d2838dd44e4de58 SHA512 6b6b7ed7f4aa2b27e2b97db407554955e332002c059bbf3fbb5c5fe60c1d6aa5cd594d2698524a9b447fc3a81de96fb46945c2386467f1773ff0ba2b10da78e4
-EBUILD liveice-2000530-r2.ebuild 764 BLAKE2B 16a180483f6aa6eb7b84f55489554baaf062fd7b30faf52037e4c46f3f4c26b7e3c87661c82eb05dde4ad1ba4871a212573b72e667f629429198b417dc46f494 SHA512 ef914182851b028cd0bf9b98b45cb23028e83b957810b7f1f7d0784cc75e07a34f7a444c00e93eb399255493fd753a8fca89ab3c64e87f0477d9370783830188
+EBUILD liveice-2000530-r2.ebuild 639 BLAKE2B 5bc570e6b28550dcfbb40fae26ed5786874ddb3fa86738745132467569bb16280830152ccb8d27faa087ffc6411345095c999594524304655fc6e9656b7a34ff SHA512 e6e42f65a0f45fe200612770fc34c24dd46564e6a45ce921e64cd0cba46c14d6bf63a3e935c6ad19cf8049e2620dbdf957acceb83e2b5c5b311f2e6258556631
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/liveice/files/liveice-2000530-build.patch b/net-misc/liveice/files/liveice-2000530-build.patch
new file mode 100644
index 000000000000..14ab084c3d06
--- /dev/null
+++ b/net-misc/liveice/files/liveice-2000530-build.patch
@@ -0,0 +1,38 @@
+--- liveice/configure.in
++++ liveice/configure.in
+@@ -39,6 +39,7 @@
+ 
+ dnl Replace `main' with a function in -lresolv:
+ AC_CHECK_LIB(curses, refresh)
++AC_SEARCH_LIBS(nodelay, tinfo ncurses curses)
+ 
+ 
+ dnl Checks for header files.
+--- liveice/Makefile.in
++++ liveice/Makefile.in
+@@ -1,6 +1,6 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+-LDFLAGS = @LIBS@ 
++LIBS = @LIBS@ 
+ SHELL=/bin/sh
+ 
+ srcdir = @srcdir@
+@@ -18,7 +18,7 @@
+ 
+ DEFS = -I. @DEFS@
+ 
+-COMPILE_CFLAGS=$(CFLAGS) $(DEFS) 
++COMPILE_CFLAGS=$(CFLAGS) $(LDFLAGS) $(DEFS) 
+ 
+ .PHONY: clean distclean install installdirs
+ 
+@@ -33,7 +33,7 @@
+ 	rm -f Makefile configure config.log config.cache config.h config.status
+ 
+ liveice: setup.o streams.o encoders.o serverlib.o mpeg.o mixer.o display.o playlist.o wav.o audio_proc.o controls.o meta_data.o url.o liveice.h liveice.c 
+-	$(CC) $(COMPILE_CFLAGS) -o liveice $(OBJS) $(LDFLAGS) liveice.c
++	$(CC) $(COMPILE_CFLAGS) -o liveice $(OBJS) $(LIBS) liveice.c
+ 
+ setup.o: setup.c
+ 	$(CC) $(COMPILE_CFLAGS) -c -o setup.o setup.c
diff --git a/net-misc/liveice/liveice-2000530-r2.ebuild b/net-misc/liveice/liveice-2000530-r2.ebuild
index ab5dbb3d5095..9b714278e0a2 100644
--- a/net-misc/liveice/liveice-2000530-r2.ebuild
+++ b/net-misc/liveice/liveice-2000530-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Live Source Client For IceCast"
 HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html"
@@ -17,20 +17,18 @@ RDEPEND="media-sound/lame
 	media-sound/mpg123"
 DEPEND=""
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
 
 src_prepare() {
 	default
-	# cannot use LDFLAGS directly as the Makefile uses it for LIBS
-	sed -i Makefile.in \
-		-e 's|-o liveice|$(LLFLAGS) &|' \
-		|| die "sed Makefile.in"
+	eautoreconf
 	tc-export CC
 }
 
-src_compile() {
-	emake LLFLAGS="${LDFLAGS}"
-}
 src_install() {
 	dobin liveice
 	dodoc liveice.cfg README.liveice README.quickstart README_new_mixer.txt Changes.txt
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index cc36f5bfb20d..18fdc5789cd7 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -9,5 +9,5 @@ AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd
 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
 DIST memcached-1.6.9.tar.gz 556137 BLAKE2B 429d0d5de480d0a17a2c9942f595fab125d60ef1f3ff88754ab6e97eb9acdb71b26e40323babc7197e41d1605a82d2f094ce5638d2f4442467c8f652e20aaa44 SHA512 2169225aefe6bd7481d919ae3ef95ed85d2ed595f49daceeb13d2dc268097d4aee98cf604824fca103efcdffa7461bb26814209906a5dabf1a5d30af43f6a66c
 EBUILD memcached-1.5.22.ebuild 2934 BLAKE2B cb3e916ad63d33c7444716b6e527a5c39c22c5dfd745cbb473e8dc8cad02e9a73603edd59cdf6b5f46e99ff41147604ec657857f511d1751ce687f257d9cebd9 SHA512 0205da0a3219f7f9cbab4c921f73e0296adbe5d8fc13c33684439ba7134a13ef0b92ac091bf96d8abb728e7617c3e5d7aa6ae925a4b52ab1349d1d92448d6d86
-EBUILD memcached-1.6.9.ebuild 2864 BLAKE2B 33ab7091789346b61de45655d17fdbe4333a4f5016db20adb412c6ca50358a8af3b86ee5ec50a439c87ebe91ed2c2556813a7dde0de2b1476913285654bf251a SHA512 fe7a796d5d868ad6e40515deee9b83420e2f38ebefb289c2cae4fd1b1a7b3f5a0e6fde39dd1748e022ff371c25d42df0a3b0ebabf75b308c5243c3708d95d125
+EBUILD memcached-1.6.9.ebuild 2863 BLAKE2B 2adb9d76d4f455bed92c214363f4153ad4475d4f6e9521f1a96b3b45f2690615425398fa97caabe96913e50dcf2326102777a831eda333e8709ef5a485d0157d SHA512 7de4fbbe08633e6c377674036c3c0f7144d137efb22014f89a2781be535d146995bb815bcbdb29e08192d709887a8e8b9b72d4e8af561baa800e02afcff9e4cc
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.6.9.ebuild b/net-misc/memcached/memcached-1.6.9.ebuild
index c0865697796d..a78e6283331d 100644
--- a/net-misc/memcached/memcached-1.6.9.ebuild
+++ b/net-misc/memcached/memcached-1.6.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index 843e9da8fdc2..fd150f837503 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -1,4 +1,6 @@
 AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a9482fa0eca45d15b8aa5e544dc24f80152c29d0d47931e2a68c26b55cbcf7f4257cf55cd6592a SHA512 08e65f7bcf759889fe42349d6b7432e7b76c84069ff295ad7d72e0517cae2eabd2de11619e07cf7a573e5c2eeb3f0159becd355cae4358be093b93a9824424d3
 DIST mrouted-3.9.8.tar.bz2 112863 BLAKE2B 4a7defbb1b97be8e452881a689d99742df2878dc9c2613c79e1bdc33af398c2be1b2d21de94e90592877ee5b6aa6b2f0c64948193eda9005c828a6cc84e492c0 SHA512 50abf2271c76b604d1e356ca5c0b62a7f07487f364991502326bbee169c451b43b3dbf01b88340d6b406f16d86a6d6fd9e7bb03c6e76d6af463b46d8423a41f4
+DIST mrouted-4.2.tar.gz 292640 BLAKE2B 5d356c7c0132e2dc74e360c5a1761b6e39bcdfcb5306dcd7a8a35f5658139bdd74d92587b7fea248092bd4947b5119987bdf4066676c08c6baa849c1845f905b SHA512 88de66f24210bcf9d8e9ab0d38171c64c7dae2981fb2f81a54be2b08bbe26ff9b26ad5a7ec0fd4d67c2dad00a6df608aa7c1536c897bbc98f6bf223766924131
 EBUILD mrouted-3.9.8.ebuild 1081 BLAKE2B f6f973db6a7eb7e1a93998b58c2b8d9948a14682f9f6435fb25efe3f2dbcf44d3bfeb0e48332d3d9d66475f566dde4eaf27b4a5fe6395813a56cf2729a830798 SHA512 cdba5ee8434981a69ffe2b586b6f99febaf5f5ab948e995a458ac828f906e0af41ca5fc9e81268c2a5c312289c579152cf6799da673b73abd477692cd01b5865
-MISC metadata.xml 263 BLAKE2B cb359879b778e3cab54eb78f0d469b2acafd5dae71b337927dc91c871bc0b3477948813a77830721f9370c7c4e83f8aa0157eb29cb6a6548166028fe7564bbff SHA512 a671dd27602ae33831b300d8d25ee33335d220722d9004e5db3ef1d3f2bcf8646b4281f28a7a7baee9913e30a4f9699e5ae53233ddb8fcc11090162ab5945000
+EBUILD mrouted-4.2.ebuild 742 BLAKE2B 832a1d248850915eb6171dd5632f95f93df9beab0726f25f54f7022f7abc85a049cb86fbbfb678a13fa3381e00ab42017d8d20ce04c8d3ba77b77786c5924431 SHA512 2e8058c122d94078ac55c3c4995e201c331c3d5590c0dbca175bdb6534ec63407b2f1336190af6358337416a6752823842a35c830f3a78b8b596973142d28d8e
+MISC metadata.xml 350 BLAKE2B c177ffe2f3f3c6192b293561683d2bfea170030dbe31004c6d3a253440ba17a82dcdfc4426a0e5fedddbcd56bbd95a6bee3b24431efba133c1b1c0c0db821917 SHA512 19085d3b736466a73795c3f1ecf39b039453702c220a58ffcdbdd6425c94b9a6c4aa8339a7447a7430c158e06f9030c138417362b3de43b01dedd95401a16099
diff --git a/net-misc/mrouted/metadata.xml b/net-misc/mrouted/metadata.xml
index b3b5c800ae34..53b9c17fb0a3 100644
--- a/net-misc/mrouted/metadata.xml
+++ b/net-misc/mrouted/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name='rsrr'>Enable Routing Support for Resource Reservations, for RSVP</flag>
-</use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="rsrr">Enable Routing Support for Resource Reservations, for RSVP</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">troglobit/mrouted</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/mrouted/mrouted-4.2.ebuild b/net-misc/mrouted/mrouted-4.2.ebuild
new file mode 100644
index 000000000000..47de037fe009
--- /dev/null
+++ b/net-misc/mrouted/mrouted-4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs systemd
+
+DESCRIPTION="IP multicast routing daemon"
+HOMEPAGE="https://troglobit.com/projects/mrouted/"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.gz"
+LICENSE="Stanford GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="rsrr"
+
+BDEPEND="
+	|| ( dev-util/yacc sys-devel/bison )
+	virtual/pkgconfig
+"
+
+src_configure() {
+	tc-export CC CXX
+	econf $(usex rsrr --enable-rsrr '')
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins mrouted.conf
+
+	newinitd "${FILESDIR}"/mrouted.rc mrouted
+	systemd_dounit mrouted.service
+}
diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
index 8f9f2a21c146..bc9184e8354e 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -1,11 +1,4 @@
-AUX nemesis-1.4-fileio.patch 975 BLAKE2B 6f955ef14cff07d34ea5693a9dec680748d50c5d831663590a63e97aef9cc68668dd242610a996f19736bba409e6c36fdc2a3a3897cb18f656a2081c7f58d64e SHA512 3bfc30e047eaa493d47ef1dbc1e6940746b347f64c60c210a68db47774c169b2eaeedcaba84eff2fe16fca656d613819218b5f2afe52b97f0d0152cf00a65a3f
-AUX nemesis-1.4-fno-common.patch 4632 BLAKE2B 3a5352f58eaed5cd0120142c482551d15fe94a5660153c45c2ea79deedcf2fc535f4986a33a7a91fb21eb5f7275f762e8c800ac9e7f137932bf961e1b4b81d84 SHA512 e45442fea4d9f904a848e2529d401b296bf9c3d68e27ec464b6ce3160c49d73f96514d5211186158c8cbc0e9b5c2bc4d1a6cc1eb94d2301a4209d9c48f14cbbb
-AUX nemesis-1.4-libnet-1.0.patch 4627 BLAKE2B b2ab0e2c72bc24729912d60938dbd0f06ea7f93d78f0431baacab136b1a892ef8c5b0c1d6be96d03940b45aa8d058b05853db7f35832d7bbc53fc988fa019968 SHA512 aa94f7b9db756e636b671de2e0f56bcc145b73f808ef907d1f8965c78e8fd025a69e684d693a3095a751d6a3433c3f34c43c753624c0543c1c5b45bbb1c69eb9
-AUX nemesis-1.4-prototcp.patch 1287 BLAKE2B 0d50d3258f8a1c80cb9622c05ec8611e6f90491fc2d045c9a792630918f8bb73776555ce7714b6d5a2f0ee79b54d9d842db8f0ab3482b6d1fb18a92fe9fd257e SHA512 89f5bbd0506ff6ee15823631c254b9dc7049eccc31f9882485a6e07a9686f8d96f84ef7b56e366d1f3fccb302db9383b10ed3a17be3508a8ab4a001809e7876a
 AUX nemesis-1.7-fno-common.patch 2057 BLAKE2B c40c2b9549237432168f22d8d4f1903f4b6772b02466616df6b0951a7c6451ccd2adeb103a1931bfb82c7b1df78ff320de137ae0d522806e203ae9a7f7587377 SHA512 0d62b46676c3ebbe2e2bc8636a4d14de52ab9f94f8b67e86b7bcf3546a62b59503f4e1f23a18f25358bf0315983474f5ae602d87281802c30de00645ee56e700
-DIST nemesis-1.4.tar.gz 144187 BLAKE2B 9b16fa37283e4a659312bbd24e5ab850cf11cbee9c598f9e57bda517f462448a0a74721425144ec00afb2cde5ba86fcb020d2d7dbf4d6df688b67f7c282d9d38 SHA512 a8d4b434a9b0287e704ab923900c43051dc3aac4a7063e702aa93d7c89cfdeac287a6f40138bdca140e2c889e024f885288c4953940104ac12631cf7394501c8
 DIST nemesis-1.7.tar.gz 93423 BLAKE2B d46d19ae46852ea5a5f745b719779f3e4fbd77b918c8f53eaf743beb53d3ee345fa1663350d98095519481e819c5174fbe41b356da643b0aff9a2d5825494436 SHA512 6085cb91535c895325ca04e7583b29df9073731d8bee1d48ef46d09d25042d5220a73b2d02d77b4101de649877c0a2d0f4af5c06f125389fbd97c7350449134b
-EBUILD nemesis-1.4-r1.ebuild 626 BLAKE2B 0b7f3379705788d1873f67005011e0e6c8f54fa2ca7e96f22524ffc1ad67545e4e286991fd829db4a72bdfb0f9d22dad5ebdf93ff7537ffbc138e80490f9856a SHA512 d54b880507e5cfdc71fcc735d404758ffb9f466f1a633f410431ac2555b515238d35f76774ebf311f9378cddecd2c4feed9b1d00b596d36c1d7dde8756e652fc
-EBUILD nemesis-1.4-r2.ebuild 686 BLAKE2B 4379f65cdc3a45a0a9cf64f26e587e2591fbe9e50033ec5e525af5872e3485982d8c36ffaaabfc3031d3382b8c6c417e47ebb45582eaa8e66d3e2819e89e13e5 SHA512 ce6f875a66a18c5e4d0c7d2cb1774aceb6d10d7d17b6fc8d723715ae6a5c872ddd701b3709705148607ec14b1e08cbcd15e5ac4d1d781af0c38ee3420b01d2ce
 EBUILD nemesis-1.7-r1.ebuild 621 BLAKE2B e8f84d0a6a5dd4efffeeb7ceea943a3d878df025f35ccd3ad502d684ffb3ebc53973cdda9b5b0ae3ed20acacf65ed348450a8e9a9251ecb658b80c53c2968ba9 SHA512 b7662484bcf4972674959f532e5468ecef8e025c5e7ab19fef91e323a4c20532689113087e00a4dda28722751eacb1e482397a092591c501b4514684a5f091fd
 MISC metadata.xml 291 BLAKE2B 41178dcbae1f81d0bc5a8cfaacce0d5bdf65648775430d1b8828e3875e7322c7de7537983852485f3a091380a72b964e82f4cac91dc2281f1291662abfacd72a SHA512 7e39bc9868b0b6603f3a48d7905f47745656f96334e6fbaa66e314a6dbfb0c63e1ba33cbbc63fc61f8289fb756105dfd6cf9b990c113a8569a9997af29d2c2dc
diff --git a/net-misc/nemesis/files/nemesis-1.4-fileio.patch b/net-misc/nemesis/files/nemesis-1.4-fileio.patch
deleted file mode 100644
index d39cef3d6508..000000000000
--- a/net-misc/nemesis/files/nemesis-1.4-fileio.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/nemesis-fileio.c
-+++ b/src/nemesis-fileio.c
-@@ -63,7 +63,7 @@
-         fp = stdin;
-         fd = fileno(fp);
-     }
--    else if ((fd = open(file, O_RDONLY)) < 0)
-+    else if ((fp = fopen(file, "rb")) < 0)
-     {
- #if !defined(WIN32)
-         fprintf(stderr, "ERROR: Unable to open %s file: %s. %s\n",
-@@ -82,8 +82,12 @@
-         return -1;
-     }
- 
-+#ifdef DEBUG
-+    printf("DEBUG: trying to read max %u bytes from %s\n", maxsize, file);
-+#endif
-+
-     /* read() can return negative values on successful reads, test for -1 */
--    if ((bytesread = read(fd, (void *)memory, maxsize)) == -1)
-+    if ((bytesread = fread((void *)memory, 1, maxsize, fp)) == -1)
-     {
- #if !defined(WIN32)
-         fprintf(stderr, "ERROR: Unable to read %s file: %s. %s\n",
-@@ -106,6 +110,11 @@
-         if (strncmp(file, "-", 1))
-             close(fd);
-     }
-+
-+#ifdef DEBUG
-+    printf("DEBUG: bytes read from %s: %u.\n", file, bytesread);
-+#endif
-+
-     return bytesread;
- }
- 
diff --git a/net-misc/nemesis/files/nemesis-1.4-fno-common.patch b/net-misc/nemesis/files/nemesis-1.4-fno-common.patch
deleted file mode 100644
index 068fef61b6e4..000000000000
--- a/net-misc/nemesis/files/nemesis-1.4-fno-common.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- a/src/nemesis.c
-+++ b/src/nemesis.c
-@@ -12,6 +12,8 @@
- #include <string.h>
- #include "nemesis.h"
- 
-+int mode;   /* injection mode */
-+
- int main(int argc, char **argv)
- {
-     char **avtmp, *avval;
---- a/src/nemesis-dns.c
-+++ b/src/nemesis-dns.c
-@@ -37,6 +37,8 @@
- static void dns_validatedata(void);
- static void dns_verbose(void);
- 
-+int state;  /* default to UDP */
-+
- void nemesis_dns(int argc, char **argv)
- {
-     const char *module = "DNS Packet Injection";
---- a/src/nemesis-dns.h
-+++ b/src/nemesis-dns.h
-@@ -32,7 +32,7 @@
- #include <libnet-1.0.h>
- #include "nemesis.h"
- 
--int state;  /* default to UDP */
-+extern int state;  /* default to UDP */
- 
- int builddns(ETHERhdr *, IPhdr *, TCPhdr *, UDPhdr *, DNShdr *, FileData *,
-         FileData *, FileData *, char *);
---- a/src/nemesis.h
-+++ b/src/nemesis.h
-@@ -122,6 +122,8 @@
- extern int got_ipoptions;
- extern int got_tcpoptions;
- 
-+extern int mode;   /* injection mode */
-+
- typedef struct _FileData
- {
-     int32_t file_s;         /* file size */
---- a/src/nemesis-icmp.c
-+++ b/src/nemesis-icmp.c
-@@ -38,6 +38,8 @@
- static void icmp_validatedata(void);
- static void icmp_verbose(void);
- 
-+int got_origoptions;
-+
- void nemesis_icmp(int argc, char **argv)
- {
-     const char *module = "ICMP Packet Injection";
---- a/src/nemesis-icmp.h
-+++ b/src/nemesis-icmp.h
-@@ -42,8 +42,7 @@
- #include <libnet-1.0.h>
- #include "nemesis.h"
- 
--int mode;   /* ICMP injection mode */
--int got_origoptions;
-+extern int got_origoptions;
- 
- int buildicmp(ETHERhdr *, IPhdr *, ICMPhdr *, IPhdr *, FileData *, FileData *, 
-         FileData *, char *);
---- a/src/nemesis-ospf.c
-+++ b/src/nemesis-ospf.c
-@@ -15,6 +15,37 @@
-     #include <pcap.h>
- #endif
- 
-+u_short id,            /* IP id */
-+        frag,          /* frag shit */
-+        mtusize,       /* Max dgram length (DBD) */
-+        num,           /* LSA_RTR num */
-+        interval,      /* secs since last pkt sent */
-+        rtr_flags,     /* LSA_RTR flags */
-+        metric,        /* OSPF metric */
-+        ospf_age;      /* OSPF advertisement age */
-+
-+u_long source,         /* source address */
-+       dest,           /* destination address */
-+       neighbor,       /* neighbor router */
-+       as_fwd,         /* AS_EXT forward address */
-+       addrid,         /* advertising router id */
-+       addaid,         /* advertising area id */
-+       router,         /* advertising router */
-+       auth[2],        /* authentication type */
-+       mask;           /* subnet mask (icmp_mask) */
-+
-+u_char priority,       /* OSPF priority */
-+       exchange,       /* DBD exchange type */
-+       rtrtype,        /* LSA_RTR type */
-+       ooptions;       /* OSPF options */
-+
-+u_int dead_int,        /* dead router interval in secs */
-+      as_tag,          /* AS_EXT tag */
-+      seqnum,          /* seqnum for LSA */
-+      bcastnum,        /* num of LSAs to bcast (LSU) */
-+      rtrdata,         /* LSA_RTR router data */
-+      rtrid;           /* router id for LSA */
-+
- static ETHERhdr etherhdr;
- static IPhdr iphdr;
- static OSPFhdr ospfhdr;
---- a/src/nemesis-ospf.h
-+++ b/src/nemesis-ospf.h
-@@ -35,7 +35,7 @@
- #include <libnet-1.0.h>
- #include "nemesis.h"
- 
--u_short id,            /* IP id */
-+extern u_short id,            /* IP id */
-         frag,          /* frag shit */
-         mtusize,       /* Max dgram length (DBD) */
-         num,           /* LSA_RTR num */
-@@ -44,7 +44,7 @@
-         metric,        /* OSPF metric */
-         ospf_age;      /* OSPF advertisement age */
- 
--u_long source,         /* source address */
-+extern u_long source,         /* source address */
-        dest,           /* destination address */
-        neighbor,       /* neighbor router */
-        as_fwd,         /* AS_EXT forward address */
-@@ -54,20 +54,18 @@
-        auth[2],        /* authentication type */
-        mask;           /* subnet mask (icmp_mask) */
- 
--u_char priority,       /* OSPF priority */
-+extern u_char priority,       /* OSPF priority */
-        exchange,       /* DBD exchange type */
-        rtrtype,        /* LSA_RTR type */
-        ooptions;       /* OSPF options */
- 
--u_int dead_int,        /* dead router interval in secs */
-+extern u_int dead_int,        /* dead router interval in secs */
-       as_tag,          /* AS_EXT tag */
-       seqnum,          /* seqnum for LSA */
-       bcastnum,        /* num of LSAs to bcast (LSU) */
-       rtrdata,         /* LSA_RTR router data */
-       rtrid;           /* router id for LSA */
- 
--int mode;   /* OSPF injection mode */
--
- int buildospf(ETHERhdr *, IPhdr *, FileData *, FileData *, char *);
- 
- #endif /* __NEMESIS_OSPF_H__ */
diff --git a/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch b/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch
deleted file mode 100644
index a5a0a83d54a0..000000000000
--- a/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch
+++ /dev/null
@@ -1,158 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -128,22 +128,21 @@
- dnl     LIBS="${LIBS}  -L${with_libpcap_libraries}"
- dnl fi
- 
--CPPFLAGS="${CPPFLAGS} `libnet-config --defines`"
--CFLAGS="${CFLAGS} -funroll-loops -pipe"
-+CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --defines`"
- 
--if test `libnet-config --cflags | wc -c` = "1"; then
-+if test `libnet-1.0-config --cflags | wc -c` = "1"; then
-     CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/sw/include"
-     LIBNET_CONFIG_BROKEN_CFLAGS=yes
- else
--    CPPFLAGS="${CPPFLAGS} `libnet-config --cflags`"
-+    CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --cflags`"
- fi
- 
--if test `libnet-config --libs | wc -c` = "1"; then
--    AC_MSG_WARN(libnet-config --libs is broken on your system.  If you)
-+if test `libnet-1.0-config --libs | wc -c` = "1"; then
-+    AC_MSG_WARN(libnet-1.0-config --libs is broken on your system.  If you)
-     AC_MSG_WARN(are using a precompiled package please notify the maintainer.)
-     LIBS="${LIBS} -L/usr/local/lib -L/sw/lib"
- else
--    LIBS="${LIBS} `libnet-config --libs | sed s/\-lnet//`"
-+    LIBS="${LIBS} `libnet-1.0-config --libs`"
- fi
- 
- AC_DEFUN(HEADER_FAIL_MESSAGE,[
-@@ -185,7 +184,7 @@
- AC_CHECK_LIB(resolv, hstrerror)
- 
- LNET=""
--AC_CHECK_LIB(net, libnet_build_ip,, LNET="no")
-+AC_CHECK_LIB(net-1.0, libnet_build_ip,, LNET="no")
- 
- if test "$LNET" = "no"; then
-     echo
-@@ -193,7 +192,7 @@
-     echo "   http://www.packetfactory.net/projects/libnet/"
-     echo "   or use the --with-libnet-* options, if you have it installed"
-     echo "   in unusual place"
--    exit
-+    exit 1
- fi
- 
- dnl if test "$enable_pcapoutput" != "no" -a "$enable_pcapoutput" = "yes"; then
-@@ -216,7 +215,7 @@
- AC_CHECK_HEADERS(unistd.h errno.h strings.h netdb.h limits.h machine/endian.h sys/time.h sys/param.h arpa/inet.h netinet/in.h)
- 
- LNET=""
--AC_CHECK_HEADERS(libnet.h,, LNET="no")
-+AC_CHECK_HEADERS(libnet-1.0.h,, LNET="no")
- 
- if test "$LNET" = "no"; then
-    echo
-@@ -235,29 +234,29 @@
-         libnet_dir="/usr/include /usr/local/include /sw/include"
-     fi
- else
--    libnet_dir=`libnet-config --cflags | cut -dI -f2`
-+    libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
- fi
- 
- LIBNET_INC_DIR=""
- for i in $libnet_dir; do
--    if test -r $i/libnet.h; then
-+    if test -r $i/libnet-1.0.h; then
-         LIBNET_INC_DIR=$i
-     fi
- done
- 
- if test "$LIBNET_INC_DIR" != ""; then
--    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
-+    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
-         AC_MSG_RESULT(no)
-         echo
-         echo "   ERROR!  Nemesis will *only* work with libnet version 1.0.2a,"
-         echo "   go get it from"
-         echo "   http://www.packetfactory.net/projects/libnet/"
--        HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $LIBNET_INC_DIR)
-+        HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $LIBNET_INC_DIR)
-     fi
-     AC_MSG_RESULT(yes)
- else
-     AC_MSG_RESULT(no)
--    HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet.h)", $libnet_dir)
-+    HEADER_FAIL_MESSAGE("libnet 1.0.2a (libnet-1.0.h)", $libnet_dir)
- fi
- 
- dnl if test "$enable_pcapoutput" != "no" -a "$enable_pcapoutput" = "yes"; then
---- a/src/nemesis-arp.h
-+++ b/src/nemesis-arp.h
-@@ -30 +30 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis-dns.h
-+++ b/src/nemesis-dns.h
-@@ -30 +30 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis-ethernet.h
-+++ b/src/nemesis-ethernet.h
-@@ -29 +29 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis-functions.c
-+++ b/src/nemesis-functions.c
-@@ -37 +37 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis-icmp.h
-+++ b/src/nemesis-icmp.h
-@@ -31 +31 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis-igmp.h
-+++ b/src/nemesis-igmp.h
-@@ -30 +30 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis-ip.h
-+++ b/src/nemesis-ip.h
-@@ -26 +26 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis-ospf.h
-+++ b/src/nemesis-ospf.h
-@@ -33 +33 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis-rip.h
-+++ b/src/nemesis-rip.h
-@@ -33 +33 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis-tcp.h
-+++ b/src/nemesis-tcp.h
-@@ -30 +30 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis-udp.h
-+++ b/src/nemesis-udp.h
-@@ -30 +30 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis.h
-+++ b/src/nemesis.h
-@@ -15 +15 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
---- a/src/nemesis-printout.c
-+++ b/src/nemesis-printout.c
-@@ -34 +34 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-misc/nemesis/files/nemesis-1.4-prototcp.patch b/net-misc/nemesis/files/nemesis-1.4-prototcp.patch
deleted file mode 100644
index b4a4e7c71378..000000000000
--- a/net-misc/nemesis/files/nemesis-1.4-prototcp.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/nemesis-proto_tcp.c
-+++ b/src/nemesis-proto_tcp.c
-@@ -16,7 +16,7 @@
-         FileData *ipod, FileData *tcpod, char *device)
- {
-    int n;
--   u_int32_t tcp_packetlen = 0, tcp_meta_packetlen = 0;
-+   u_int32_t tcp_packetlen = 0, tcp_meta_packetlen = 0, tcp_headerlen = 0, ip_headerlen = 0;
-    static u_int8_t *pkt;
-    static int sockfd = -1;
-    struct libnet_link_int *l2 = NULL;
-@@ -58,13 +58,20 @@
- #endif
-     }
- 
-+    ip_headerlen = LIBNET_IP_H + ipod->file_s;
-+    tcp_headerlen = LIBNET_TCP_H + tcpod->file_s;
-+
-     tcp_packetlen = link_offset + LIBNET_IP_H + LIBNET_TCP_H + pd->file_s + 
-             ipod->file_s + tcpod->file_s;
- 
--    tcp_meta_packetlen = tcp_packetlen - (link_offset + LIBNET_IP_H);
-+    tcp_meta_packetlen = LIBNET_TCP_H + pd->file_s;
- 
- #ifdef DEBUG
-+    printf("DEBUG: link offsetlength %u.\n", link_offset);
-+    printf("DEBUG: IP header  length %u.\n", ip_headerlen);
-+    printf("DEBUG: TCP header length %u.\n", tcp_headerlen);
-     printf("DEBUG: TCP packet length %u.\n", tcp_packetlen);
-+    printf("DEBUG: TCP meta   length %u.\n", tcp_meta_packetlen);
-     printf("DEBUG: IP  options size  %u.\n", ipod->file_s);
-     printf("DEBUG: TCP options size  %u.\n", tcpod->file_s);
-     printf("DEBUG: TCP payload size  %u.\n", pd->file_s);
diff --git a/net-misc/nemesis/nemesis-1.4-r1.ebuild b/net-misc/nemesis/nemesis-1.4-r1.ebuild
deleted file mode 100644
index 5df00db4a5b5..000000000000
--- a/net-misc/nemesis/nemesis-1.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux"
-HOMEPAGE="http://nemesis.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 sparc x86"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-	=net-libs/libnet-1.0*
-"
-
-DOCS="CREDITS ChangeLog README"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fileio.patch
-	"${FILESDIR}"/${P}-libnet-1.0.patch
-	"${FILESDIR}"/${P}-prototcp.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-misc/nemesis/nemesis-1.4-r2.ebuild b/net-misc/nemesis/nemesis-1.4-r2.ebuild
deleted file mode 100644
index 0d74247451fd..000000000000
--- a/net-misc/nemesis/nemesis-1.4-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux"
-HOMEPAGE="http://nemesis.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~sparc ~x86"
-
-RDEPEND="
-	net-libs/libpcap
-"
-DEPEND="
-	${RDEPEND}
-	=net-libs/libnet-1.0*
-"
-
-DOCS="CREDITS ChangeLog README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4-fileio.patch
-	"${FILESDIR}"/${PN}-1.4-libnet-1.0.patch
-	"${FILESDIR}"/${PN}-1.4-prototcp.patch
-	"${FILESDIR}"/${PN}-1.4-fno-common.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index da4fd510101b..b202a31d5ab4 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -13,7 +13,7 @@ DIST NetworkManager-1.28.0.tar.xz 5129848 BLAKE2B 37dc9cda283dad29a70c85ed41a778
 EBUILD networkmanager-1.22.10-r12.ebuild 8550 BLAKE2B 2bc90b456b46a5240e05c52a6afe59b4320d905363a3bad0ae4d0f41e3d0584d2743a76c255be198cc0dffacfd29109deb59d67749b06423e3155c1f624c9150 SHA512 00e785287a1ff4cf9260b8cb5d342ead2c1e3568095d5a7074b72df8269940a46e257b95f36a335055ec3de17de8fae527b99434253dd06d1bc04e0108b0e1f0
 EBUILD networkmanager-1.26.0-r1.ebuild 11208 BLAKE2B f69905ebe2031f6e707c9c1907e03f0c80fdb2546bec7964a9b21b3a8a6008c023a630e9cfbca5cef00ff937056d816755d62884428fc972814ac67cee755a51 SHA512 40009fa98e7a6317d87a22e8ab559e70d229bdbd0bfc91e49cfcff36f5bc551d86d16f9fdd2e52e3e2821123dd47eb4e3efb0a79d873a91d34eefcbaf9c50e2d
 EBUILD networkmanager-1.26.2-r1.ebuild 11214 BLAKE2B b9bf75442380146f2b7eb73f8022cbd30eaecb47e9f48ab96300e26471ecfa1949f076749b23604cc8c5b34264858788cf638c74221bbc5bef2d04e0f219e19d SHA512 eb92e2db85fb28e961494c6425eab2f3a03d61c4efa94d5cdbf1393b7f4d90e55b6cc958f2ec7c0079250f8a51827d42a477ec459bffaa508e6817f4ab8c0d12
-EBUILD networkmanager-1.26.4.ebuild 11354 BLAKE2B e76905e2e9d0fb3e2215585242b704a3f01f7a287749a88c23b866a643ea5d6c090e5328d70691b778fcbd381e9303256588a59d6f21041b07479f600c00980e SHA512 c5830f50416a0eb83d4bb884f6fa0fe9777a489b4f2f3ec159bfd89e3521c6ea2fd44d6ed865ae623a68acdd51bc9ecf583d90e42d97cef8e4ef5fd119dcea74
+EBUILD networkmanager-1.26.4.ebuild 11353 BLAKE2B a8940cf649a0da4ba84dbc5daeba55f87360efb744f722d743d4550df223c20ae7a4defb1e9b168005d2fdac0a139d290840c2713a42d9e666d901a8beb8a880 SHA512 5b36c4a6f28098480ac33b506cb01ffb89e7d8aff575b0019ecc67e0bd3f9df80c3be8c0d0b2f460cfb82f77c84ae41f1635901987a7d48062b741bbed66b1ba
 EBUILD networkmanager-1.26.6.ebuild 11359 BLAKE2B f129d1aa0f60a115786e6833fd6cfa43f7b28174fd83cf74c09db9fb69222235e2a424ea8a0993bf4ca14dd24f5e942961f2780a1fdb6806a0ead0f616a6fae7 SHA512 2568a02a564e5be9135880e6e80d587eae81fccbf1469c78830f3580da69ab02d6090a0371697919d39082da6ef50c6a35aeb1318fa7c25a1159c321767a677c
 EBUILD networkmanager-1.28.0.ebuild 11194 BLAKE2B 8da159c9aab4f097f47e02ff3b5742afb9b3d667aa053d54fe9d342f8e6f8a7acceeaa26827bdb51991abc3c42b17f5fd6dbb2e3ee2098fcaa9939c8da0ddb6a SHA512 9448c3ee69ef0790733524e932d1f134f4dc11660cf5489442d45ed2e92cc45964dc52c94d9af47e696b08873547b376e511854d71d48cf9cb6a4755dd5ba2c7
 MISC metadata.xml 2182 BLAKE2B 699e4c087f213e132e3787d7c2f913b23bf79f4fb78037bd92510de0655863eb7ad2148a615b68b84ad14309624c25802bcbf65ee3052a6b84d20d2b8657bae6 SHA512 f8fbb50dbe481b3530e8ac6446c43e385095f04ad36c33a3ac73964675468b0d4cf47eab8698bc338d5fabc1f9f9ad2ad99edffac69aace897c88fa88f1dcfe3
diff --git a/net-misc/networkmanager/networkmanager-1.26.4.ebuild b/net-misc/networkmanager/networkmanager-1.26.4.ebuild
index c9a390df6143..62dce0d9a17f 100644
--- a/net-misc/networkmanager/networkmanager-1.26.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.26.4.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=6
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	?? ( elogind systemd )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 5c9d4837f294..091231432b2b 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,3 +1,3 @@
 DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004
-EBUILD nx-3.5.99.25.ebuild 3261 BLAKE2B e1af6432005e148a7a51435e2eb1d8ef1178935f6a302b3877978c1235741bf869569c7683f61a8ec45d40f040609ccf128448fbb39373f2a98e1e575bfff937 SHA512 5483a5084b78ed3ee751de714198d6ec2e1fd51ab754400adc9559be73d48035904aa3558a824d33e98e9289377543587a94daf48328ef0237f447844aca3c61
+EBUILD nx-3.5.99.25.ebuild 3399 BLAKE2B 8374b0636f45bbce371c9d2c08f0f87b25f85248a216ca3f7213b5a663952407237e8647e4099ba749efc5f114550ef05106ca18a5e502aad8ed7eb3c8233ef0 SHA512 f14f778992a7d4bc75656a99de471505703305f4d1ec66c11ec4694821d5d8f2746aa4a84ec1f9ffd522db230669a67df9dff43d6b16f90b0d2bf0baee55aade
 MISC metadata.xml 332 BLAKE2B 93930f64047301f8a393899de54a0d9294c7c17385b47fec5a2e402b2904bc88ae697e5b075e1defd723d8d251fd424e790e9b37b94bc48b10b395307e3830fd SHA512 005c90731093f7fc354297e981140415e33785492a1a835a5a5b8b68506d690679d6430ff0b05f6e3ce2ac763ea13cd68a599581a6037f16ac1974e6ad9d54a4
diff --git a/net-misc/nx/nx-3.5.99.25.ebuild b/net-misc/nx/nx-3.5.99.25.ebuild
index 2da4b0963c23..d3b7370a9078 100644
--- a/net-misc/nx/nx-3.5.99.25.ebuild
+++ b/net-misc/nx/nx-3.5.99.25.ebuild
@@ -113,8 +113,9 @@ src_compile() {
 	emake -C nx-X11 BuildDependsOnly
 	# Parallel make issue resurfaced, upstream working on autotools switch
 	emake -j1 -C nx-X11 World \
-		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
-		SHLIBDIR="/usr/$(get_libdir)"
+		USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \
+		SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		ETCDIR_NX="${EPREFIX}/etc/nxagent"
 
 	emake -C nxproxy
 }
@@ -122,10 +123,11 @@ src_compile() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		PREFIX="/usr" \
-		NXLIBDIR="/usr/$(get_libdir)/${PN}" \
-		SHLIBDIR="/usr/$(get_libdir)" \
-		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+		PREFIX="${EPREFIX}/usr" \
+		NXLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \
+		SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		USRLIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/X11" \
+		ETCDIR_NX="${EPREFIX}/etc/nxagent" \
 		install
 
 	# Already provided by mesa & related packages
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 0c5d3033f7c4..82d5cf265223 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -5,6 +5,6 @@ AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
 DIST openntpd-6.8p1.tar.gz 443997 BLAKE2B 5b86c79ff2f822aba652da92325ad18803233c8b1548203c82603b99d2c41dce012dfb2be67828cc892559f323b764cc1711202fd85bc1d5d755b5e677406b98 SHA512 200056bedb9c757aae1ce5d3f6655175ec058cb479429fe4704955f3a3fa15e8a9cb578ae4898ddb4cfc08c9742bbab6a7c92b5e569f06a148e40c448360b58f
 EBUILD openntpd-6.2_p3-r2.ebuild 1876 BLAKE2B 19b8f6bfaed7a095ff3401fc487877ca0badaa069b37482805e8b50053b701fa1c747894d9fb4c0b6984241f430e6aca442cbf77a2f91ca8b1ff5b7be66ec36b SHA512 8aa659e9a7ebfbd917a7facf394afb552a4eef2c7ab1f248109cfad92d4931a91bc7c38b440721751c013ea5e391b5400464d519cdd16e57eff8bb65b87eafe7
-EBUILD openntpd-6.8_p1-r1.ebuild 1721 BLAKE2B 169c523fc994065c5cb1612e6f76419ce9640cb1c835794a52dcbc8d1c5869b39948791125e86bb9fd92a3c8cb3496ab94c02ec8c3a8e1eadb84259f21c7b947 SHA512 8148f7327a91e7649e798fe7185cfb3690c4e1b64406723654b20b1962e8fba76e12a6b79f41b0680719cf0a7eb4cc6487f8dc98089406bf4b5b4bb4c9b4f8b9
+EBUILD openntpd-6.8_p1-r1.ebuild 1751 BLAKE2B 2189c1af512b47f3e8ed9c4701ae85cd566525c4028114cbb9484ca29da06f700880e05e3cf700a144ad3c55a62487a7f22e47b151eac9790888d63a9045a5cb SHA512 6f1e12df9f923d2b9687439ad1d5255be6639750223704d893bfc2b4d9cbb3de26a7ea3338d123d832eda6a27acf7c1beacd5218677d2f810da2fb393a6cce5f
 EBUILD openntpd-6.8_p1.ebuild 1749 BLAKE2B eabbbaa5d63fd9cd7f54da01bc71dea295172b57830d7a367eca13d10a22ad547ffe35e0517959a3ea866483cdf35fda8a1267b84dbb4648677d5e002784300d SHA512 d4405468d57a9f255ae3428bf292ad5689dba8621bd96cb2e8ab2824a7c736cc59cd1759173aa6dd5afe7a0a775d84932472a9ec0cde8b9262cd4d29ad622b67
 MISC metadata.xml 828 BLAKE2B 252026b498239d4105cf5a36f898f7587f046d6f533089d7b52116af656c85d340802f8d6e3b95ccb5263f7795e84248e1fbf2f644213c0fb54b7fdab33df79a SHA512 83fe295d82756146bc8b705e02564553079e0292601b2ef38ba46f05a2388bc77d13a0576de6b30937814a708570247c657f4605767fe93a7ca6c49e0c96cabe
diff --git a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
index 630ab20c6928..cdd7e30b03c5 100644
--- a/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
+++ b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="constraints libressl selinux"
 
 DEPEND="
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 25d91ebb59ff..ea485dca117a 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -55,5 +55,5 @@ DIST openssh-8_3_P1-hpn-PeakTput-14.22.diff 2012 BLAKE2B 701f46da022e7ecf35b57f4
 EBUILD openssh-8.1_p1-r4.ebuild 16449 BLAKE2B 405605bea6246ce0003dc1bba0077bea05d26e55f13ceda2dbe48d3f4a5cbd00a18e4ec85d2d4495200f31a93b9cb24705f85a01693ef7da9a9451f456b66492 SHA512 066909ba9b01e333a3e20ae965b7282179069f26971cca25c4b48bf03348c2c4589e431ceefa3a59b4658b91d7cb75652b32271ca8285d51542adc288253be96
 EBUILD openssh-8.2_p1-r7.ebuild 16875 BLAKE2B 7b5e94f6432b9471ff3bd79f0a0db35fd7f2c752a0921171b736229bffc31bed854d4bfcab75141670a95c310b943c302590f4ea7721f9aa7212033979fc1274 SHA512 7920af478491afadc9d3550c44e6bfc797767b9c0a775ec3ef5e4d116f5d80712261dee5f11ef179bff4ed8c7ce1a66cf6e21cc33f42c0dd41c917c8b7c48402
 EBUILD openssh-8.3_p1-r5.ebuild 17606 BLAKE2B c10216a426742ca807f6ca7be4adc8462c1c66571f80091eba53ed218de4c182e4e1a44df2afa2c6cbd0a4a250001c6890f5fe8b5855f85ae08901f5aff4bc9e SHA512 cb5a66c09184a57936e652e82f9eb3ae169d50d9213d173b30836013039b538e1c3af2a0c452676d8c15c064e054c8940e8e3d5da4123ce8f56fdf3a837e521a
-EBUILD openssh-8.4_p1-r2.ebuild 17681 BLAKE2B f66807ffa57f2f420a8e360f2eefaa4c4fdbf62c4ee4dbd147152693022e357c5c033b8dee21b9bf96bda087a1b4cfc40b025cccb5f59a2a8220d34ec89fe5b6 SHA512 175df97fde0e4c7d7902679a3fbc4c577bb081b38b9ae6b483d40252030f6d60293b18d7602dcce178a3a6638772761af5c659fa6dfb82c901d3b633d4fbec5d
+EBUILD openssh-8.4_p1-r2.ebuild 17679 BLAKE2B b6c9c35a26accdf248e57d66a4e5dc530cc40a7f1c92c6343c37ffba60188a8ab28fdf78b1f4afd306eb86cab12152d769800ec9cdfc2448ec88da396200a9a0 SHA512 0102006a643de2ce3e101fadb43c7d7f2b381ad1331c6d9ede0ae98ac422ead9e327b10b3c2e73498e0a8558f4045ac3be3d9642e89de0e6658869cb01f1955b
 MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/openssh-8.4_p1-r2.ebuild b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
index 6f909a78c109..894176403737 100644
--- a/net-misc/openssh/openssh-8.4_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
 
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 811e61c09467..383a58374b64 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -10,8 +10,6 @@ AUX ovsdb-server.service 480 BLAKE2B 5192dfe98551bbd81eead18a7eaba70ff0901bf2cab
 AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2599f5a405f6f7e30e1d550090b9debc2262da674b9d04d3be16aadf375ca2031e74056433c1ce20818 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa
 AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
-DIST openvswitch-2.13.0.tar.gz 7233892 BLAKE2B 66dfeb8a5dd61538360b319cfccbe49273298d6cb20df2105d1db7eb4d01f40d54ec8792a7f80d9ffc767f9b28ae09fee6aa76ac3d97be6fc43f3e7f3b2a63bd SHA512 3fcd15d07925273e0c45e6b1e70b2cd9998f753e8d1a11fd0de1d1511ad56dfddedbba436bb1c347b4afb84eb9cd6fc52c3d445b710a89d599d2ff47ed46f17c
-DIST openvswitch-2.14.0.tar.gz 7359886 BLAKE2B e7633578e9db395b534e2aca84f08919d06d14b68cdf78b04de25b887bcb4eb0e476c7d6c54ae23b72f797a3b083e09d23d8eb142da1e1463b2fbcde76069108 SHA512 5fe377f9b2857e238e3d40e4452e8b36c80283230f1d0f4b983324532beba725913da817e545c8d7630762f170bb5b0dfe810fd1b8b559994d5eae828beb8ec1
-EBUILD openvswitch-2.13.0-r1.ebuild 4405 BLAKE2B c526b9667212e53c6ca463403eb69f24750f42c29f91ce0dff2759d22c22b5dcb4a9a25410fbad3690c85dbad4e185297a419b3d0c5c56ee76ad063fc77b7552 SHA512 52c8c6963788f27bf444e342ad370568516a0717466d5e787a3064b07a987a1620dfa4e601ecf927d75b11cdcc6d53d0f2ba1229f49a1e1d796c6a29cb0df5a7
-EBUILD openvswitch-2.14.0.ebuild 4426 BLAKE2B 443c813af21d57007f506db532b93a4ea97312c887a5fdd80d7a3c814319416c514b581cde271d9785a22aee71d4156e5c8b2708ecfcae6044433d3a8e5219e8 SHA512 0471ef5cfa7e584a8db3123b29d8d865e46e3972b9c2ddfbda37257e0e7eb42d40e3b4b41fe39a7560b04b76f3a1970bc0ff80d05b7c946ce814a48d3e185baa
+DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b
+EBUILD openvswitch-2.14.1.ebuild 4424 BLAKE2B f76128e4cda15106b32b7813f7ccbaa0e45e913f127d93828d6c7e776e66c34db18e182b3e160dd87a78febb6bff08bf1f16f7594a5e03f8e792c4e78256cf08 SHA512 16de578721f6c31d678dbe6049eef962a940a46025fcd44bade664a912d43a07786728ecae2f9f35844075a1d9fe41f009dddd489f792428a7213df989c04140
 MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36
diff --git a/net-misc/openvswitch/openvswitch-2.13.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.13.0-r1.ebuild
deleted file mode 100644
index 41b9b1b021a5..000000000000
--- a/net-misc/openvswitch/openvswitch-2.13.0-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit autotools eutils linux-info linux-mod python-r1 systemd
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="https://www.openvswitch.org"
-SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	${PYTHON_DEPS}
-	~dev-python/ovs-2.13.0[${PYTHON_USEDEP}]
-	dev-python/twisted[conch,${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	debug? ( dev-lang/perl )"
-DEPEND="${RDEPEND}
-	sys-apps/util-linux[caps]
-	virtual/pkgconfig"
-
-PATCHES="
-	"${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
-"
-
-CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
-MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
-BUILD_TARGETS="all"
-
-pkg_setup() {
-	if use modules ; then
-		CONFIG_CHECK+=" ~!OPENVSWITCH"
-		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
-		# docs state 4.17.x code states 4.15.x
-		kernel_is le 5 5 999 || die "Linux >= 3.10.0 and <= 4.18 required for userspace modules"
-		linux-mod_pkg_setup
-	else
-		CONFIG_CHECK+=" ~OPENVSWITCH"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Never build kernelmodules, doing this manually
-	sed -i \
-		-e '/^SUBDIRS/d' \
-		datapath/Makefile.in || die "sed failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	set_arch_to_kernel
-	# monitor is statically enabled for bug 596206
-	# use monitor || export ovs_cv_python="no"
-	# pyside is staticly disabled
-	export ovs_cv_pyuic4="no"
-
-	# flake8 is primarily a style guide tool, running it as part of the tests
-	# in Gentoo does not make much sense, only breaks them: bug 607280
-	export ovs_cv_flake8="no"
-
-	local linux_config
-	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
-
-	econf ${linux_config} \
-		--with-rundir=/var/run/openvswitch \
-		--with-logdir=/var/log/openvswitch \
-		--with-pkidir=/etc/ssl/openvswitch \
-		--with-dbdir=/var/lib/openvswitch \
-		$(use_enable ssl) \
-		$(use_enable !debug ndebug)
-}
-
-src_compile() {
-	default
-
-	use modules && linux-mod_src_compile
-}
-
-src_install() {
-	default
-
-	local SCRIPT
-	if use monitor; then
-		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
-			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
-			python_foreach_impl python_doscript utilities/"${SCRIPT}"
-		done
-		rm -r "${ED%}"/usr/share/openvswitch/python || die
-	fi
-
-	keepdir /var/{lib,log}/openvswitch
-	keepdir /etc/ssl/openvswitch
-	fperms 0750 /etc/ssl/openvswitch
-
-	rm -rf "${ED%}"/var/run || die
-
-	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
-	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
-	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
-	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
-
-	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
-	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
-	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
-	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
-
-	insinto /etc/logrotate.d
-	newins rhel/etc_logrotate.d_openvswitch openvswitch
-
-	use modules && linux-mod_src_install
-}
-
-pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
-
-	# only needed on non-systemd, but helps anyway
-	elog "Use the following command to create an initial database for ovsdb-server:"
-	elog "   emerge --config =${CATEGORY}/${PF}"
-	elog "(will create a database in /var/lib/openvswitch/conf.db)"
-	elog "or to convert the database to the current schema after upgrading."
-}
-
-pkg_config() {
-	local db="${EROOT%}"/var/lib/openvswitch/conf.db
-	if [[ -e "${db}" ]] ; then
-		einfo "Database '${db}' already exists, doing schema migration..."
-		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
-		ovsdb-tool convert "${db}" \
-			"${EROOT%}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
-	else
-		einfo "Creating new database '${db}'..."
-		ovsdb-tool create "${db}" \
-			"${EROOT%}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
-	fi
-}
diff --git a/net-misc/openvswitch/openvswitch-2.14.0.ebuild b/net-misc/openvswitch/openvswitch-2.14.1.ebuild
index 3c2a20b5c72c..95c36b7bd173 100644
--- a/net-misc/openvswitch/openvswitch-2.14.0.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.14.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
@@ -12,7 +12,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug modules monitor +ssl"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/realtek-r8152/Manifest b/net-misc/realtek-r8152/Manifest
index 86ea980bc7e6..522326c1d606 100644
--- a/net-misc/realtek-r8152/Manifest
+++ b/net-misc/realtek-r8152/Manifest
@@ -1,3 +1,3 @@
 DIST realtek-r8152-2.14.0.tar.gz 88356 BLAKE2B c530080cab5e6f7433aa6452e3c5f1f19f14c2ac473751958d85efa5553d2b2889d80cc47c2ad4064ad5673008df97dce197254f445c5fc7ae3905c7833e1641 SHA512 2908e9963b6bec9d638514e6a54ab8bca0b56c4866245f476889e4c8462c36f2bece86abac2e5ece9aee1776f00f7d4a67fd5561d830a67e02e386d79aba07dd
-EBUILD realtek-r8152-2.14.0.ebuild 1587 BLAKE2B bcdbc62c548edce699f45a8a90a1613e4a3ded928e4acff581290012c20698d2e640942fe9a2bbf89b416d5f766617beabcc6b593061927f1420a262afb7f197 SHA512 3a2000c4906da96ceaa2bd00ba0de6e48fbea5f0983b66a79c67d470cf0e18464fe9df8b6d5ec189c06df5a66904365f8ed74aa6089bfff30b176e11f8ab753b
+EBUILD realtek-r8152-2.14.0.ebuild 1608 BLAKE2B d3e3d51c689e73b230936b46dd01ec582fffec9855b377e51e656ea385b171a088d35a004cf76fb2b99af5b10df6479707310db5205e9a91eb6eb95dede29780 SHA512 7fb49e147edd47989c3680bee50c51d76e17bb8c29bcd1d7abae1ef8b16f1ee38e2206b5e43a4d4508587fd2b9a12ae3b331b5c3bf831ec2db02987ca3539a7d
 MISC metadata.xml 252 BLAKE2B a7c6d432616d7b90dd77f1595a17154db8559729a787d0b94cbf6c44b3fc08005bd9ad6cd1eecc5fb8bf9f25789f7eac2efd074e6042125a207567f9af292716 SHA512 67a93db722bbbb0e7ed243cb68e60fbe315114013b2326bdaca5d2dd10ae6629bf207152c1cd95a98f6e638346fde3fdefbd35b3e47005a93eda61fd1aee0cae
diff --git a/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild b/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild
index 59f0e80e1b97..ac2d53b76ca1 100644
--- a/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild
+++ b/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild
@@ -37,7 +37,7 @@ pkg_setup() {
 	linux-mod_pkg_setup
 
 	BUILD_TARGETS="modules"
-	BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERNELDIR=${KERNEL_DIR}"
 }
 
 src_install() {
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index e1ebf6df04ae..c56787ff7461 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,8 +1,3 @@
-AUX remmina-1.4.5-with-examples.patch 1845 BLAKE2B 0da938e4f9c6ce8f0dc094449477d030c4b26c05b0758d9669d6f29311ee4c3273374addd92c2e191cb86c91dbce7ebb7681ebec46462986696c746e0dcd03ec SHA512 7a4c09378238a675e76eadeaa29215d32ea5f6afa618bdb60569b30ed9fba0dcbf7ae7cf3a1de47a05d25c5b61a3bd14313930dc02967477c20e212483af1e59
 DIST Remmina-v1.4.10.tar.gz 2072202 BLAKE2B 38b6a3cca9b5956a252d4d4433910d46d0d36a2232a2a107b1e556f118f3b1a6d3c02b0bea26a39a52d572c1380dbb5bdac1acd8d6ba07c97b9acc9a64a9142f SHA512 89fed0b0ed17ac1db57a1d9ad33b80f4d17f6cfb4ff7db9b6434d9d4dabf708971e4d93dd573dbf606d1899311e564f159a656223d66bc4a9d7a15a29b5b5963
-DIST Remmina-v1.4.8.tar.gz 1998851 BLAKE2B 80427d06c041d6315fa8fabe90aa8a52ebd2cd1a76ab0e74672f54328d5fa9d0d287e551a5027e5ef60471ce4d934cfe745742058f26e7b93a95e2a1f85dbfd9 SHA512 cf8ea93904a1643f480d7de72bc4154570bcf184150ffc4b3b06699c95f354bc2f4f595c3b00c6c87e9797dc60bcb9993913647b2073f1e85977026f290d81bf
-DIST Remmina-v1.4.9.tar.gz 2033555 BLAKE2B 901e0118f8231a6bf021a0389a1db9462f19527b21954f3deba24e92e3c04d0d323efa3aeb475f0ec915e8cdc4b55cf331ba2010598e8a58567cba0f353b5177 SHA512 21c5141619874a3d90fd1e2ee9ae87dd4ca4b7dc14c0e16f06bca01b38f84db6e7ab178b0f6e9db703bf5d1ddcb17db45553786bb047cf814b1ff67f4aa6139f
-EBUILD remmina-1.4.10.ebuild 2502 BLAKE2B 66c4daec9382a3a677d37da07e8fe95e97295176549cb0033a22ce478525055534db4d8975ddd63b53c8c15b3b45503800791c9a1e2fd215e3c2c86bfa2f4901 SHA512 46f68da358de3e4a8887f5cbfb4dd9ac8aa1feac3ef00f0895abe7452967c2b4829d80a36c67fce5c814dab17a54efb1d66602b713dd1e90a8b5f1ee1b538346
-EBUILD remmina-1.4.8-r1.ebuild 2493 BLAKE2B 444297b0607ae73a1a8868ddb5c5af4c58484adc944ad29d2c983b70c5ca482e20a7782d4681b59330183c074acc4d138517eb6e5bf702d5e2daa361ca96d2fa SHA512 95a1c2cf34f5039268cc58afbc36e6bc872f740a1ec2465ef95aa4c703b1592fd89ff86d7b1ef817ac184ac0b6202585f96bfab5e7a53c35b3018cc6f8a72b82
-EBUILD remmina-1.4.9.ebuild 2502 BLAKE2B 66c4daec9382a3a677d37da07e8fe95e97295176549cb0033a22ce478525055534db4d8975ddd63b53c8c15b3b45503800791c9a1e2fd215e3c2c86bfa2f4901 SHA512 46f68da358de3e4a8887f5cbfb4dd9ac8aa1feac3ef00f0895abe7452967c2b4829d80a36c67fce5c814dab17a54efb1d66602b713dd1e90a8b5f1ee1b538346
+EBUILD remmina-1.4.10.ebuild 2500 BLAKE2B 966b7a8753277b7b2494582eda605c337a13456afdb907195f730f5cddbbde7701edb6edfadd08383a8cb32134be815fa67bc62ab93628e980bcbef8658189fb SHA512 52b13e1bc91d55a991eb3967b5a676ee82debe3856153058d5ec222d1bc5c59ff04b772ae1439a2b9cbc890d3d9ebdb19ab3cbe7c0086a77d86c392bafa33fc5
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/files/remmina-1.4.5-with-examples.patch b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
deleted file mode 100644
index 930f326b27b4..000000000000
--- a/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5d569e04f33b2c9a8f735d928ad2c9cec9d1c4b5 Mon Sep 17 00:00:00 2001
-From: Antenore Gatta <antenore@simbiosi.org>
-Date: Sun, 14 Jun 2020 09:05:18 +0200
-Subject: [PATCH] Build failure with -DWITH_EXAMPLES=yes, closes #2228
-
-Signed-off-by: Antenore Gatta <antenore@simbiosi.org>
----
- plugins/tool_hello_world/plugin.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c
-index 3e277435d..9695fd586 100644
---- a/plugins/tool_hello_world/plugin.c
-+++ b/plugins/tool_hello_world/plugin.c
-@@ -42,17 +42,18 @@
- #include <gdk/gdkx.h>
- 
- static RemminaPluginService *remmina_plugin_service = NULL;
-+#define REMMINA_PLUGIN_DEBUG(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt, ##__VA_ARGS__)
- 
- static void remmina_plugin_tool_init(RemminaProtocolWidget *gp)
- {
- 	TRACE_CALL(__func__);
--	remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME);
-+	REMMINA_PLUGIN_DEBUG("[%s] Plugin init", PLUGIN_NAME);
- }
- 
- static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
- {
- 	TRACE_CALL(__func__);
--	remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME);
-+	REMMINA_PLUGIN_DEBUG("[%s] Plugin open connection", PLUGIN_NAME);
- 
- 	GtkDialog *dialog;
- 	dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR,
-@@ -65,7 +66,7 @@ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
- static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
- {
- 	TRACE_CALL(__func__);
--	remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME);
-+	REMMINA_PLUGIN_DEBUG("[%s] Plugin close connection", PLUGIN_NAME);
- 	remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect");
- 	return FALSE;
- }
--- 
-GitLab
-
diff --git a/net-misc/remmina/remmina-1.4.10.ebuild b/net-misc/remmina/remmina-1.4.10.ebuild
index 9a2ee2547ae8..9d4bfcf14a13 100644
--- a/net-misc/remmina/remmina-1.4.10.ebuild
+++ b/net-misc/remmina/remmina-1.4.10.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://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
 
 DEPEND="
diff --git a/net-misc/remmina/remmina-1.4.8-r1.ebuild b/net-misc/remmina/remmina-1.4.8-r1.ebuild
deleted file mode 100644
index 4222860b8986..000000000000
--- a/net-misc/remmina/remmina-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libsodium:=
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	gnome-keyring? ( app-crypt/libsecret )
-	kwallet? ( kde-frameworks/kwallet )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex appindicator)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.9.ebuild b/net-misc/remmina/remmina-1.4.9.ebuild
deleted file mode 100644
index 9a2ee2547ae8..000000000000
--- a/net-misc/remmina/remmina-1.4.9.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libsodium:=
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
-	gnome-keyring? ( app-crypt/libsecret )
-	kwallet? ( kde-frameworks/kwallet )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex appindicator)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/sipsak/Manifest b/net-misc/sipsak/Manifest
index d9de26ebba1c..30e5be1851a5 100644
--- a/net-misc/sipsak/Manifest
+++ b/net-misc/sipsak/Manifest
@@ -1,4 +1,3 @@
-AUX 0.9.6_p1-callback.patch 490 BLAKE2B 398728ea4fb79a0c8ab2e1920f08186df358bb7924674a38526432c487d453b4a679b731692cc06cff0e10b76b3558462901bf367993d0dbe90bb0d9dd8e739a SHA512 c10dec8410143ae5fee3b78fb65a83494e5b2539c41f2424455fdabce73a780e78ca159ce2e579db5e2344882e7472abd3f884f76863241218745451108fce4a
 DIST sipsak-0.9.8.tar.gz 202482 BLAKE2B 26ea0fc196d598f6ef111b0c511484db0ca23b4ea8e2febe957b578a5eb0e2351dcc1d5848bdcda4a01f6962d1cd97c80dcf58203fcb82e19eb7f475f8a7ee56 SHA512 1cd4c8e69f5c8cae83c524f73ef53eb139127ff3652eb1407542883c4c3593df9d61207e10198705e064b42da72c210fb6a88c087a83c3b13bbb6d9d8bfab20c
 EBUILD sipsak-0.9.8.ebuild 612 BLAKE2B 10b70d70266a0df520a64790064701353c504ab2b23c98196ee83c7de0a86501060aa4a1c00a07f23a097beb9eda776557955e29bccd77277e5ea67aece51766 SHA512 fa5c394c1ae92f649a4fcfd0cdd07e5ee615726be95a966a71bb7b05b1f77862565c40b7891a927af26d5e0e6de973735d3691453b5082a2e5d1f24626fac248
 MISC metadata.xml 303 BLAKE2B cc764a44b688e208776c7e99220318ff09e0cafc4b49a9b8e1d105766425f7c4fe59d85fdee39601ef066d59669eb8e6259cb755f997d400e1a8e13366a2bc55 SHA512 82474d39e280eff65aee9c5d4ccb9bb513d56bb2d55b10b8f49b161d505387ab351d3228d0253a40c01a9c4f5f2c5104bb7f2c41b227b0aa653350e6facf07d4
diff --git a/net-misc/sipsak/files/0.9.6_p1-callback.patch b/net-misc/sipsak/files/0.9.6_p1-callback.patch
deleted file mode 100644
index 37dc486d3174..000000000000
--- a/net-misc/sipsak/files/0.9.6_p1-callback.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr sipsak-0.9.6.ORIG/helper.c sipsak-0.9.6/helper.c
---- sipsak-0.9.6.ORIG/helper.c	2015-01-27 14:14:12.208729426 +0000
-+++ sipsak-0.9.6/helper.c	2015-01-27 14:14:55.406728851 +0000
-@@ -250,7 +250,7 @@
- 	return aptr;
- }
- 
--static void cares_callback(void *arg, int status, unsigned char *abuf, int alen) {
-+static void cares_callback(void *arg, int status, int timeouts, unsigned char *abuf, int alen) {
- 	int i;
- 	unsigned int ancount, nscount, arcount;
- 	const unsigned char *aptr;
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 5b00a04d405b..eaa362a60037 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,12 +1,15 @@
 AUX socat-1.7.3.0-filan-build.patch 1164 BLAKE2B ea158041a421fdfbbcfb14f050920f9f6ea9d99097d74c9c81c63c5816595f2ef8475b3add04d9efd8d19498382520a4f686d73c85b1df1879d5997b2f4da635 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf
 AUX socat-1.7.3.1-stddef_h.patch 1272 BLAKE2B 1693a96be8fc27c102ef48fd16a1c719ff240b7330800ee26876f2b9a0b21671d79da3244f87894ee2f65ca833f34e9636ed7ace4f19951fa4443abe26a2bb9c SHA512 294acc9f05526eb47bc2cc01603b1c5bc553c4a2ffaaf63b87b66eb653930c0f8139fb8c4d72ddec10482e35ae3a6ba144a6555c8ba64066c30cc4132f10f2bf
 AUX socat-1.7.3.4-fno-common.patch 497 BLAKE2B b1329f43afd86989d527a292ec188ebacfd269efe68bb649c6652cc7eb49d43363b0e0925c40cfa2e52a318a7eb84ae4822db98a5cbed69b394481f168def9ca SHA512 0dd7c92f8da42e99409b086ba48e757aa0fcdc404b771ce6d8f43296c72ab939bb98c202056312df5424332f9209b4f2b32b212b90c9d5819fb98ab0d890bc24
+AUX socat-1.7.4.0-32bit_build_fix.patch 1221 BLAKE2B f62b549c4ecce4df792c2ada29f251f0fdd142f593637abe962d42a9bb6af65bfac94e47846a612b97ee639c69addfdfc2de09a8bc4d2b062da2610b0e89f88d SHA512 734e74acfafbd3b1eadd71177198e9ee4f841f43c0da23f546026f56ae9649b99f04636361c46f5399e222a3e397ce02e635043b13c301e216426d98e4aa7131
 AUX socat-2.0.0_beta9-libressl.patch 9738 BLAKE2B c790d2e6486ace62f410680d93679177dacdda1dc03700711163bf66d73bd728ccc3c0e4ad45c7a8c65eaf47239c7558044e0683a80fdf75eab51e09df36ee63 SHA512 183972f5354872557a6ad131f1c8276b0250729aaa6659cd202dcf534d8b4bc41dd19cc6525bc888c325c670922ba382c684103ecdd8a385e5d27f52f321c7ed
 DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
 DIST socat-1.7.4.0.tar.bz2 509023 BLAKE2B 97ad5f5a52375aea4d2afbb4ac6143a86bfa057aed602d552b015f6c9fc6a3a0cc65b1717573b3c60bed482da908197366bd1d282ee1db6fd86a229484d2bb9f SHA512 c4d166c2259271a70f81d6c4972549549c3fc60a9e47cc03eff1dd4d71c298ac39c177ae3c053dc0c97c2770fe8d157fd0bc6f2c14aef91625f868894d5d7c61
+DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568 SHA512 7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
 EBUILD socat-1.7.3.4.ebuild 1586 BLAKE2B 7dfdd2075cee949d3252488fb60a5d3370bf540463857521a06b5e3fc32ae75195a4383e8dc18673322ef3db9ab2f25209ac638e67e7ad65bc113a3d4285b50b SHA512 716db6a19271e18a9f08386ef2906f55d7c483186e3622fca19075b2fbcbb57c3f22fc7adf62398528b576afff040aa6bef3dbf6d6ccd9f0fc919dc1f9faaa07
-EBUILD socat-1.7.4.0.ebuild 1534 BLAKE2B 1ab55137a27da5a25d6cb8d3ebf72f7b52aa0161a8ade16892fd68d0c6e40922996228050d51d72ce8e13f712574aa85249a550e9e6b3b65eb7e606e6d12a970 SHA512 3e3a47d3e41a8dfa9dda7c625d33d04f34c1a22695ff866db5dcf2234d9e8725a4ce80d241032a991df65d2086a204a660c8695ec1130f3cf245a32a58720fe8
+EBUILD socat-1.7.4.0.ebuild 1589 BLAKE2B 0be8375683d1948e56b7454ccd73c285d4871eb747b7c5efb21cd4f34717252ba55c0c1a2df485fa0a4374f098f826a4a7d2db6c551f282f9bc5994657edc547 SHA512 b5fc6b3535db3b43912832b976aace63fde55c7360da0f93fdad14c51d0084a9bd000c1c9a3bebecf48fcf77f99841ffe279dc51aa1971bceb341ca1ae2fe6c4
+EBUILD socat-1.7.4.1.ebuild 1534 BLAKE2B 1ab55137a27da5a25d6cb8d3ebf72f7b52aa0161a8ade16892fd68d0c6e40922996228050d51d72ce8e13f712574aa85249a550e9e6b3b65eb7e606e6d12a970 SHA512 3e3a47d3e41a8dfa9dda7c625d33d04f34c1a22695ff866db5dcf2234d9e8725a4ce80d241032a991df65d2086a204a660c8695ec1130f3cf245a32a58720fe8
 EBUILD socat-2.0.0_beta9.ebuild 1684 BLAKE2B 8b12d6c8f85d1f3d161238100f994c1f85862b1abc0d5759eca22d5e743821d1cccd2e1f505b19faf8ad4d65803fe26fd1a388b8a21802f000ec94d9f145a360 SHA512 5c3c58e869b297dfffded35ff69b6f34574901472196863bd8f29d52e4957129923c2f0738dc0a0b64c6cebbcb421be20ff008561ab53bfc91f543a0f96726d1
 EBUILD socat-9999.ebuild 1406 BLAKE2B c68fd7bf03d58f1bd16266304afab4cc73e2e129be5facb7416ed0a765fd198b02a76e5459b4dda831e2c4765c6cd9d4e0669dd024795161f38909c62d882116 SHA512 6ab7b9aa353e917b8aa46f2179bbcff95fa03e1e59ff4a8f68c512cbc8a582d5e288bd79a2a251c47837b60318640a1005392e0ebc72844a08327e41effdcc18
 MISC metadata.xml 467 BLAKE2B c95bf4d69aaf5077911ffc97657ec511286dd4f524fa4b9a1d537cba55d6fbc6ed2bdebf5379daa7c340a2f56538a2546971b39e7915baed943b177e7813b781 SHA512 2eb27fc5699059cecf00fa097c2e09440d5efd5a3b851631818d965bbda6767bfcc60a663d24569ab8b89a2e60bac9a5aead5fb3ca52d15e1d250140e7b70514
diff --git a/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch b/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch
new file mode 100644
index 000000000000..0b391ed8929a
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.4.0-32bit_build_fix.patch
@@ -0,0 +1,42 @@
+2021-01-08: Quick fix to a compilation failure especially on 32 bit systems
+
+--- socat-1.7.4.0/compat.h
++++ socat-1.7.4.0/compat.h
+@@ -134,6 +134,8 @@
+ #    define F_uint64_t "%u"
+ #  elif HAVE_BASIC_UINT64_T==6
+ #    define F_uint64_t "%lu"
++#  elif HAVE_BASIC_UINT64_T==8
++#    define F_uint64_t "%llu"
+ #  else
+ #    error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T
+ #  endif
+@@ -147,7 +149,7 @@
+ #  elif HAVE_BASIC_INT16_T==3
+ #    define F_int16_t "%d"
+ #  elif HAVE_BASIC_INT16_T==5
+-#    define F_int16_t "%l"
++#    define F_int16_t "%ld"
+ #  else
+ #    error "HAVE_BASIC_INT16_T is out of range:" HAVE_BASIC_INT16_T
+ #  endif
+@@ -161,7 +163,7 @@
+ #  elif HAVE_BASIC_INT32_T==3
+ #    define F_int32_t "%d"
+ #  elif HAVE_BASIC_INT32_T==5
+-#    define F_int32_t "%l"
++#    define F_int32_t "%ld"
+ #  else
+ #    error "HAVE_BASIC_INT32_T is out of range:" HAVE_BASIC_INT32_T
+ #  endif
+@@ -175,7 +177,9 @@
+ #  elif HAVE_BASIC_INT64_T==3
+ #    define F_int64_t "%d"
+ #  elif HAVE_BASIC_INT64_T==5
+-#    define F_int64_t "%l"
++#    define F_int64_t "%ld"
++#  elif HAVE_BASIC_INT64_T==7
++#    define F_int64_t "%lld"
+ #  else
+ #    error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T
+ #  endif
diff --git a/net-misc/socat/socat-1.7.4.0.ebuild b/net-misc/socat/socat-1.7.4.0.ebuild
index 1db0f86eaaf5..4b62fa74485a 100644
--- a/net-misc/socat/socat-1.7.4.0.ebuild
+++ b/net-misc/socat/socat-1.7.4.0.ebuild
@@ -35,6 +35,10 @@ RESTRICT="
 
 DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
 
+PATCHES=(
+	"${FILESDIR}/${P}-32bit_build_fix.patch"
+)
+
 pkg_setup() {
 	# bug #587740
 	if use readline && use ssl; then
diff --git a/net-misc/socat/socat-1.7.4.1.ebuild b/net-misc/socat/socat-1.7.4.1.ebuild
new file mode 100644
index 000000000000..1db0f86eaaf5
--- /dev/null
+++ b/net-misc/socat/socat-1.7.4.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="bindist libressl ssl readline ipv6 tcpd"
+
+DEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
+RESTRICT="
+	test
+	ssl? ( readline? ( bindist ) )
+"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
+
+pkg_setup() {
+	# bug #587740
+	if use readline && use ssl; then
+		elog "You are enabling both readline and openssl USE flags, the licenses"
+		elog "for these packages conflict. You may not be able to legally"
+		elog "redistribute the resulting binary."
+	fi
+}
+
+src_configure() {
+	filter-flags '-Wno-error*' #293324
+	tc-export AR
+
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc doc/*.html doc/*.css
+}
diff --git a/net-misc/spiped/Manifest b/net-misc/spiped/Manifest
index 041356328566..5c719ab3b8ee 100644
--- a/net-misc/spiped/Manifest
+++ b/net-misc/spiped/Manifest
@@ -2,5 +2,7 @@ AUX spiped-1.6.0-ldflags-support.patch 1571 BLAKE2B aa2cdddc0035cf1afefc2e204cb9
 AUX spiped.confd 639 BLAKE2B f9def241056bee9ca46de9735fdf9083d3a196476934fe4486b2cb6f19aeef31e5551b112da7b47e511d2732231741865c043a10946c686a7b9aad8d4e1cab01 SHA512 ce2b2f4025ce69ec639e452ed4f4760600e2acd41c29b7ab9c75a7e72bc66cf29c60d417a19f08bd7f7f1cfc7d8582ad6de62738251be3964bcf16ca872887ac
 AUX spiped.initd 649 BLAKE2B 2d516af5fc78d7ae13ca79ae8fe24756f484f6b7892d9acaa0a2fb7a62425d66bd2f7172bcc6b396380542bfe496434e70d6a0b93c0c29d3b5e064b41d4bf655 SHA512 6acdf82ca2ed469e3b69813e59628d3148b7c3600b5af74a82d6c715d812b74ed1effd43d7e644d872f1faea4a553e365f36cf054c4727fdc902446f0b89f52a
 DIST spiped-1.6.0.tgz 94431 BLAKE2B e994115d5080e4f41d57d3ef88223c7dca373320266a3fe4f0420fb7aef6ecf329fad5a409ec31f53caaeb22d86d0c3a48060758ceee28d011676a12124fc057 SHA512 9bca8e7da31b86f956a653279f9346d8270a7e28a07d30b4a7104b21fbfbd1a81410e6a7dc0827127331a8f10226d5b8d2ddaacb94c9f76ecc6d15d728ead27a
+DIST spiped-1.6.1.tgz 115055 BLAKE2B d9ee65c10b183cc8d5451adeb65a728052378811e71ee40d7e6f121c00b6003d4b21cc9402b424aac15d115cdbdc158207ef3e6c60b93fab2a4ba63257fd2f1d SHA512 ec69cb49a19e4e5705526ec74ee683ac3923412bc5ca3a45fc8268699367421cd37354ccc03c18c2d48f06cdb8a4c4bce3ef3b60934997c6770547e02e6f66ae
 EBUILD spiped-1.6.0-r1.ebuild 1070 BLAKE2B 61a0bc0f3b56a3e3f56d9287fe5f4022066d2e8459ac6c80f4fa18113a6b97d7fa10f6ef987a24b094cc9567d18e77f67ec1733d61935f27f35701456dbbf134 SHA512 52da723a5943b8e377d4c912c8ec1f40afe2cfed08207297e4885a49139bf2bd537ea9376424aac4d5fbf9c385b1114dc4ad8e4b1fea8c166d93fed8dcca616f
+EBUILD spiped-1.6.1.ebuild 1053 BLAKE2B 45f140d422fc11d719d3d72c6b55dd4270811aa4d0bb96ca5c0e5b268c26d4fcbda228f20bf215ee1b5c276d418a4fbfa6cb3ff0e3500c78c0aae6a357a0c6e6 SHA512 748884e7172790438179fd23c5f6aa41cc1eb7c986bdc8bb0343dc8e51c6c5231b7fb0c67d03f54177957a4b632e13461b8d3f4da809c9836bf92de0963f2e4c
 MISC metadata.xml 698 BLAKE2B a87abcb8c6729e90053ae83af7f33e29e5f6e9a4bd3ef53f71554caeb2d2c5c1e49a60cd98cee89ba4984bc31c35496e3fb3d3392b35fdc5c0a8b086490b7937 SHA512 26f7bb3fc9a8fd2f2ecc9a6b249b777bc9761f2058f3aa01a700d745e17a8e1f6aba16a8b013576b6bbb4cad951e7a4e01975c22c1cec9217307723ecaebbb63
diff --git a/net-misc/spiped/spiped-1.6.1.ebuild b/net-misc/spiped/spiped-1.6.1.ebuild
new file mode 100644
index 000000000000..c1cc245241ab
--- /dev/null
+++ b/net-misc/spiped/spiped-1.6.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="secure pipe daemon"
+HOMEPAGE="http://www.tarsnap.com/spiped.html"
+SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+MY_PN="${PN/d/}"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+
+# Blocker added due to #548126
+RDEPEND="
+	${DEPEND}
+	!net-mail/qlogtools"
+
+# Some tests fail.
+RESTRICT="test"
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin "${MY_PN}/${MY_PN}"
+	dosbin "${PN}/${PN}"
+
+	doman "${MY_PN}/${MY_PN}.1" "${PN}/${PN}.1"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	dodir "etc/${PN}"
+}
+
+pkg_postinst() {
+	elog
+	elog "You will need to configure spiped via its"
+	elog "configuration file located in /etc/conf.d/."
+	elog
+	elog "Please have a look at this file prior to starting up spiped!"
+	elog
+}
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index abd330d3265f..dbb8a3e39bfc 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -4,4 +4,4 @@ DIST sstp-client-1.0.10.tar.gz 3012713 BLAKE2B 6b924c9fef4df26a9aa93dd5670cae4db
 DIST sstp-client-1.0.12.tar.gz 468683 BLAKE2B 4bb97465ee29eb6dd816a69b45c53e58e9de2cd5d7b5c9e39ea4ebbb3c3de0c21b3d95317114ae8c93bc3be359300bd6a55fa0512540bf25405fb47f8fb4e736 SHA512 d29128e59977fa844b0f2b02580284bb4e909994e5616c4dfa150b7a9807d0f34219355abe8c315c60c5f2482e3255824ce7e05566dbea9a7f13a1739d46468f
 EBUILD sstp-client-1.0.10-r1.ebuild 1420 BLAKE2B cb9b8c161923f4ff3d193788b4e520a739f30bb37a01ede3d31ae2ece04c06f7b59bd9956bec6cb998854d544b3baca226c62d970eff750f42c8327fb9bdbf3f SHA512 009fe28e314d9450e2b6b4f44671396cd9edbd219c04281d960a4387f3669f530106a32f31311512f68fd8f6713be0695b542c84f1f46e28c9df86fe24901844
 EBUILD sstp-client-1.0.12.ebuild 1323 BLAKE2B 523d5bb199731c93af80ba3392a838c81884f059c8aac60e206159c94fe07f5dca9a52f25a8da64731a14368e36eed500b8425f290758eadd03fbf2702793bc6 SHA512 b9b48275716bb750d07b652ab8f02f3544965d2787ecc96fadcd2bd02b621d042bc5f129b62095b8bf9e703ae3c831d4f46465d8c06b2284dfae03cfe6860409
-MISC metadata.xml 330 BLAKE2B beffc0ba9de0664f0b9bd76ba88b417616d2ec9a493776b3ea477bf82972c6fafe29b08d8db40e711ef26c52b115d60f20dc01ebb57a01404888a818bb183311 SHA512 8d4b705f3bb0f8b6b4ec9f51e828c4739b092827cb32cae70782ce062eaf8363f8b6de36b17ec5e14e6715cf1a8373dae94828ff74c2975b96e2947c5fb657b4
+MISC metadata.xml 248 BLAKE2B 0170675aa541587a716c3683adf2383e443a45bcf2538380f3a4003ebb1e1af8c878dcb47792b835c8ff299f484a18bbc68cf7a0e058d8bb8d39d4767778c69c SHA512 5836901dac3fc4a340424cc221c2742fc9dde2c234c2cbc0d1cd9c45a8f9192c7658f49a5d5dae5221c2aa0cfed34ff0642ab0519e495991bf47fc4dd6d4a1f7
diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml
index c5411f6a2824..444265dcde3e 100644
--- a/net-misc/sstp-client/metadata.xml
+++ b/net-misc/sstp-client/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">sstp-client</remote-id>
 	</upstream>
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index 85750a0d44a7..c6527adbfe56 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,6 +1,6 @@
 AUX suite3270-3.5_p8-tinfo.patch 2733 BLAKE2B ea2d966d5138e33289d803223a4e49f4dc314ed206e5b5dd838e0ae7152a03417bb4b9044f544b8bf729421bb35f723bcb48ee2f58fcfaf27d460f51ed172d73 SHA512 5b748df7b50957746423954bea86b2ce43063b33a0e5ad3d22d93653c4e3dd11494111e46b4c83c45add41dc448c004ddc3b217be23712953682784c79f76564
-DIST suite3270-3.5ga12-src.tgz 3412286 BLAKE2B 5602f8bbe7b916a977c97848ff9a413a873f61e1c0c62b8c118dc43703adcd4a668e3cc301f9e37a139eebeeae44aca3cdedd0c10de15870ad8ead00d783e1ef SHA512 c7cb25b5c82b0d7ccac8c3ed17317a5a5ebce24fb32dcdfcaf7158157578617a7bccc265fdb67fce0557caa9c75d1afc2d8152a06b98af43ad9a9e29b5f2a267
 DIST suite3270-3.6ga8-src.tgz 3296047 BLAKE2B 98bcee4591c3eea12c7127aa2eeb39613f6f090c041ceab7a7b0f1bf0e946c3048ba2f93eaacf2bbaf04b44ba78a8895f6b7acdcf20baea19a408464f83f4d62 SHA512 88a00bec19ae7be92e5bc0edd6ae1e27bef7fbbf8c3f419efda3ba2b3a0cb5e72693916cd44d50166d5745ce0f9d8497641481cedbb0bb3149567b6f51b1a987
-EBUILD suite3270-3.5_p12.ebuild 2111 BLAKE2B 3720091974c742b7f15dac52389a61fcab79ba58a5069cb22f6298f6e780c0de1f04c969bdf5d75418e3e60ea89b4e06cafc687015cc10e91e3444370dff21db SHA512 0957867c66c3e13f181061b754256e386bd8693441c22d0135e9634c6b52c9744a894415a296d30186be2ae65824844eb034d7fcc3b8a6e5198221aa92ae87fe
+DIST suite3270-4.0ga13-src.tgz 3317494 BLAKE2B 898f279143006e1fc1f470bda3917afe85957de745676dc915f9c94292824ba0e10fc2ccf0a47e307c41e48741a3da7c066c45f63c917295e0522122226b79dd SHA512 bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b
 EBUILD suite3270-3.6_p8.ebuild 2126 BLAKE2B 6af9b8a731e933740f3ebf1f260251d7c91806f32bc70f3bf26a914227c7ef7bd9592fb898f1a8e2fbb7eeed0c703cfbd82a2bdbe0973512007f674fc2b8b908 SHA512 6d834fc4455625b414b2b19b509b71dc6a19501ff301fe15acb49c0e0fb632ef5d3ffac10e72e7ea593c00541c4bf0010a526d9c14c6e9ca077d76ef09672a33
+EBUILD suite3270-4.0_p13.ebuild 2052 BLAKE2B f59a294a5a3da6de4ffd156b05a762364d762cd565dcc53abb18ec72109e0f03cb9e2e3a1da820fbdc670ade0d8e4bb0adc562fd62eed523f8c4d55e30551424 SHA512 0c79ed9ef4827493dcf26e13090cbee69552da80ba6d78e56f035d41f65555fc3208d42cdea31c903d23e8ae1a05c5d47e1969c0cc3bb1174be6686b90d0e7e8
 MISC metadata.xml 463 BLAKE2B 5035d30c690419dbe52b4caf68981eb40c858f09787189439dda81dd57096276a029201b0ea3eb67840a14552d9c4dcf21eb00003ea530b79b85219cc607c19b SHA512 ef297d66d1c0b2c7ab6f8d0c489f355267124cd1f0cc09d18cf1b2cd33458be4c8e1716e84753ba6e49903a90fb676fb7ae908205672f927656ebd9c11879e45
diff --git a/net-misc/suite3270/suite3270-3.5_p12.ebuild b/net-misc/suite3270/suite3270-4.0_p13.ebuild
index 887b8223af5c..e19e219259f5 100644
--- a/net-misc/suite3270/suite3270-3.5_p12.ebuild
+++ b/net-misc/suite3270/suite3270-4.0_p13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 MY_PV=${PV/_p/ga}
 MY_P=${PN}-${MY_PV}
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${SUB_PV}
 FONT_PN="x3270"
 FONT_S="${S}/${FONT_PN}"
 
-inherit eutils font
+inherit font
 
 DESCRIPTION="Complete 3270 access package"
 HOMEPAGE="http://x3270.bgp.nu/"
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc s390 sparc x86"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
 IUSE="cjk doc ncurses ssl tcl X"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )
@@ -53,7 +53,7 @@ suite3270_makelist() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
+	default
 
 	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
 	# (they have the same contents).  Wrap that in a retry to avoid errors.
@@ -72,7 +72,6 @@ src_prepare() {
 }
 
 src_configure() {
-	echo "${INSTALL}"
 	econf \
 		--cache-file="${S}"/config.cache \
 		--enable-s3270 \
@@ -93,7 +92,7 @@ src_install() {
 		cd "${S}/${p}"
 		docinto ${p}
 		dodoc README*
-		use doc && dohtml html/*
+		use doc && dodoc -r html
 	done
 
 	use X && font_src_install
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 66dc88c9a693..754f74bfed8d 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -2,4 +2,4 @@ AUX teamviewerd15.init 282 BLAKE2B eaa5844606cab7942d8117a7f62687f1ba2b3ff5deecf
 DIST teamviewer_15.5.3_amd64.tar.xz 13028200 BLAKE2B 12eec74d2e737d8d091fa100f3a6ff56926257ddd7757f649d2acaacac55c29724690a9bc52bef9c9b966692f8d28d352dc5002b815b4b7e3fd535bb1b250105 SHA512 36a758759e1f0ebfc1e7cd559d5326f51704307373a96d4df1fae5d4e467cd638a9d2c7f4d40c7b2ad47ec4fc66e0f5b432596569b2226d92c18abe67ab01b50
 DIST teamviewer_15.5.3_i386.tar.xz 13562544 BLAKE2B 55d16574968943ae5dd52d523b63ceadd1f74ec7a4440dc476e6498bb3c05cda395524af4d4d4b3b1b94eae5ea22b70bc91ee63c27be90986589d7a8ec50393e SHA512 4022d179aedf8050ddb07f6ae44cac1a08f8f3e8a3b2593c2c3d97ba87f02d6b24db0247b173f64f38ed6128b148c025e0941e2695cf5fdbb443768e93dfd797
 EBUILD teamviewer-15.5.3.ebuild 4086 BLAKE2B c3093c33cc700ee4e58cc2e99a133b6fc7234254db8f890ef5a0593910f189a0e3286d8cf7bc4feb0a5335f24960568dd6520bd9959b97fc3fe57420e6743bf6 SHA512 c25d94347c9eee586f117b2a90bf858972d79b9a60e0e9317ad59b2f711e817703ca7f27af4e8e05543188c3dc60fd5c414986612e095581bf8bf7536c720126
-MISC metadata.xml 249 BLAKE2B 11f9a85069860d951af16d4536b4dcb5808a383e12932121c0344d7df116522d143eb5e5ccb10ab69c7d6a27ee4d421f4a34557eb02b8b9926d7ef34f3efef10 SHA512 876b15663b8f716c63393d90ad0c78d96088f53a2b2add76b0b749bf69e75be84ef58184f148c70ec2669b773f4dd2e37d045fe72429a6ddd2086b691a553047
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
index 025344585474..7a38bb900964 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
-
diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
index 73e5c27f890c..4a450c130208 100644
--- a/net-misc/ubridge/Manifest
+++ b/net-misc/ubridge/Manifest
@@ -1,4 +1,3 @@
-AUX ubridge-0.9.14-respect-flags.patch 395 BLAKE2B 746f481789bca31b87759eb879521288e27b4cf16d3e2d83ea593d76bf03f614ecad6a0f2c0b001d47c08ca57ab898b2c4c9d475d34bd0b54ce7da4bdf507746 SHA512 4a86af19f8462ff3d81d509e6d264240cb3769f3175e0b1c0142cee30d7b61354c86ffec57d31f0bfbca46c0dad078efa6d3c61d19e29ca9ab6dec43f401eccc
 AUX ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch 1008 BLAKE2B d518f3d2b5fc5fd9c6c15c39f755d05b04738dc8cd443b55019ba14d858a9796d2e73190a4956f1f13896d30e2cf49f203755c37d3ccfeb73b484da3421a37f1 SHA512 d9afe86a35ff50d9455bac90c0a0fbe830816c043c4580bff10e1a556ef3b0de92a697188b3efcf5f87ce8672015320b5795f393a6916e2d96619c465344c80b
 DIST ubridge-0.9.18.tar.gz 64340 BLAKE2B 7ac540ccf180adc8bf0bb0d440d6a0335626181ba680f7f94cea43d6b6b70745cd64f8ee8048aa1621b7407fea83cf03039147ffe38236e70970c014771ab09b SHA512 f2c9e9d0242f61363a3f4ce6f1acf4013245ff0854a7f64c96d6b8737bd3cc505a38aaf43a0928e2a5a88bcd39f786e00fab68748ad56770d18d713005750c60
 EBUILD ubridge-0.9.18.ebuild 1089 BLAKE2B 26e9f3dde16372a76c98da998844c51dc1adb387c8fad068ac412e1ae37285f438f6b6b1e336bf46857bcb5fcd3c8e97bf0d3dfe4aa7fdb93f461c80f9af1e2f SHA512 d86fba30cb6d18dbc74b2da231c2c89df2b72d5614c3b11554d0d2f47db336a4e8d3cbf5223949df55f123b0392d3388935646149a76ff6beaa286e2c3a82dc3
diff --git a/net-misc/ubridge/files/ubridge-0.9.14-respect-flags.patch b/net-misc/ubridge/files/ubridge-0.9.14-respect-flags.patch
deleted file mode 100644
index ab64aa7d6bed..000000000000
--- a/net-misc/ubridge/files/ubridge-0.9.14-respect-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile	2018-03-16 09:15:10.528245830 +0500
-+++ b/Makefile	2018-03-21 08:52:45.984204240 +0500
-@@ -40,7 +40,7 @@
- 
- CC      ?=   gcc
- 
--CFLAGS  =   -O3 -Wall
-+CFLAGS  +=   -Wall
- 
- BINDIR  =   /usr/local/bin
- 
-@@ -76,7 +76,7 @@
- ##############################
- 
- $(NAME)	: $(OBJ)
--	$(CC) -o $(NAME) $(OBJ) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(NAME) $(OBJ) $(LIBS)
- 
- .PHONY: clean
- 
diff --git a/net-misc/ucarp/Manifest b/net-misc/ucarp/Manifest
index 1e00f5f3dfd5..51756f293558 100644
--- a/net-misc/ucarp/Manifest
+++ b/net-misc/ucarp/Manifest
@@ -1,7 +1,6 @@
 AUX ucarp-1.5.2-fno-common.patch 255 BLAKE2B 8b642d7e715f300cc9adf4ebcad7deca4e5c2f522e7651fa219c9af0bc618a5481211c59ae1e9356682ad38794abeeafbc4b96c25bb3c8bf33f7beab71f6759b SHA512 46e78a4dd71413d28dc75fc4c374db85890103ecec34de016dd6c29f4418c3fe249028192e11e860479b8101ec6c2311e46d8bff21cce557e8254bb4cd0e8c82
 AUX ucarp.8 6311 BLAKE2B 1b01047eff2fbdf6deb8d3886fcb19d3512d2bb21518007d2bb578653d8a602ff8767f67a04119edd8c159c3430bf63a70d891610cd159853712bc3ef538762e SHA512 4aab5f072663501e90a504e47e30c7cf3a89c6996addb6a23c7d0b3688688141f90d6134c79d2746fef1934a63588723bafb375777b2a12a6715257681baf28f
 AUX ucarp.confd 880 BLAKE2B 134b87a7adfcd4c64a140f5c74d6d318a7205f68f436538a7f638382541876ec274c3e596cd086ed9e07e20586a899a67c6413e2e6a9c1653bcca57dcc949bbc SHA512 e72594f6292dcc4e17c13c07f12d5cd9ef791ea91ee2c22d5023d0aa574990b6ec6c6714dc45d678ba70ec8395790cd80272a8a57adbd8c735f296e580a298a1
-AUX ucarp.initd-r1 1902 BLAKE2B 05b7ba252938cd5f8c668c5593250376d0390f2eeade13c9d6801522b39027a4724b3e0e142128a5dbca6fef5e82adfeb914a8420c3c9a924000e287fdda298f SHA512 6e5a7a1ec245c6c89ce61b189768594a42b630b94d882f79357475a62f63b3198c036f1cdbc09a91b3d3509d6f6b0c621b56f107dbfca76fecf79fae3e0a66db
 AUX ucarp.initd-r2 1880 BLAKE2B 91bf40115850f5695d10c534385cb99f4531254b80940e3862cd0850d6ffb63b2306a3b41714a158d443595964e13bb67bb50eafbc92a58ab2627e7fb9014e48 SHA512 cf7dd9bdc148fb737a78701b5b9d2a705048cf4064f3be439e11b8dabd012f6628970461b2fa46e93813e246f200c2672c281e021b987765ba3ebb0fbf78d566
 AUX vip-down-default.sh 119 BLAKE2B 60a7cf7cb3eac992ddc167912ed4498c29a49fdfcf4f95bd5495ee252246e2adc89dc8d6f3c1a4f52cebc46fcc0f32a2b9db8b742f58a0da9badae084c4d4a88 SHA512 026988d259ab07568995e0609ee0b22245abcf26c65e7c3ddeea8efc801a78eb2796e7423c52731b8070db99e410db4de8217d0a3b7b8681d399fef25c64e56f
 AUX vip-down-default.sh-r1 118 BLAKE2B b9e814d9247ee11978f2a5cf5c285aa4ab0ec8a1ef4a5fce576d598e983fc2bbb055ce13d61aa69bd32d3d6c277c774dc40dcbaf2d28ac1289f5ad80b303073b SHA512 ddbee9c02601d32f6660b1f769b0cc87595c6417a8ade66f31d0815fa21d54291809f004ee4ce36d097789b6e5f5a0aaba77426bef54c2a824e6af334baf904b
diff --git a/net-misc/ucarp/files/ucarp.initd-r1 b/net-misc/ucarp/files/ucarp.initd-r1
deleted file mode 100644
index 14d84dc01ea4..000000000000
--- a/net-misc/ucarp/files/ucarp.initd-r1
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="UCARP is a portable implementation of the CARP protocol"
-description_logstatus="Logs the status of ${SVCNAME} to syslog"
-description_demote="Demotes ${SVCNAME} from master to backup"
-
-extra_started_commands="logstatus demote"
-
-command="/usr/sbin/ucarp"
-command_args="--interface=${UCARP_INTERFACE} \
-              --srcip=${UCARP_SOURCEADDRESS} \
-              --vhid=${UCARP_VHID} \
-              --passfile=${UCARP_PASSFILE} \
-              --addr=${UCARP_VIRTUALADDRESS} \
-              --upscript=${UCARP_UPSCRIPT} \
-              --downscript=${UCARP_DOWNSCRIPT} \
-              --xparam=${UCARP_VIRTUALPREFIX} \
-              ${UCARP_OPTS}"
-
-pidfile="/var/run/${SVCNAME}.pid"
-command_background="yes"
-
-required_files="${UCARP_PASSFILE} ${UCARP_UPSCRIPT} ${UCARP_DOWNSCRIPT}"
-
-depend() {
-        need net
-        use logger
-        provide ucarp
-}
-
-start_pre() {
-        local required_vars='UCARP_INTERFACE UCARP_SOURCEADDRESS UCARP_VHID
-                             UCARP_PASSFILE UCARP_VIRTUALADDRESS UCARP_UPSCRIPT
-                             UCARP_DOWNSCRIPT UCARP_VIRTUALPREFIX'
-
-        local config_var=''
-        for config_var in $required_vars; do
-                if test -z  "$(eval echo \$$config_var)"; then
-                        eerror "Missing or empty config variable '$config_var'"
-                        ewarn  "You have to edit /etc/conf.d/${SVCNAME} first"
-                        return 1
-                fi
-        done
-}
-
-logstatus() {
-        ebegin "Logging status of ${SVCNAME} to syslog"
-        start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
-        eend $?
-}
-
-demote() {
-        ebegin "Demote ${SVCNAME} from master to backup"
-        start-stop-daemon --signal SIGUSR2 --pidfile "${pidfile}"
-        eend $?
-}
diff --git a/net-misc/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest
index 5482cae1e5c9..d8cb201d1b08 100644
--- a/net-misc/wakeonlan/Manifest
+++ b/net-misc/wakeonlan/Manifest
@@ -1,5 +1,5 @@
 AUX wakeonlan-0.41-ethers-lookup-r1.patch 2287 BLAKE2B 95bacd277caff21b056f3a8c159808594dce0fc60c735757148a315c87d02d110695b343eaffa28b067668b2f874ad1f88516fe9cee4f98621ecbb15396b1b4f SHA512 52a0b30aa8a2beee0056112b49cfe6ef6021f682f7ba1ba38173d227f5e103f34fdded8c61b7b399cc548ca5e182b47d320af6dffe617673aa873f08c20e1bc4
 AUX wakeonlan-0.41-ethers-lookup.patch 2284 BLAKE2B fa45175d623a3e4cfb5b79ec4f499401b798a8fc3e4dd10a8d580f02083334db32ff5f925defb72b71d6ceceee3017d3bf9a4c2ef2559c9eb8e9d92e6e25a63e SHA512 39cdee0f2732f4d09822cbb82e4674e966b1648fbdd84b4a8adaf3b734ea2e8e4b5f0d535f7d70dbf3608c23ddc0761de9c5892a5c6c73613f322dc4e71db3d2
 DIST wakeonlan-0.41.tar.gz 6028 BLAKE2B d560c7dd830daf596ffd7d797d1908d1fc90d20c6861a0e341b20eb38137b809fe1a78819f9ca729fa06f88285cfb22d0719092bed1d49d9763a7e2bb8a986bf SHA512 192ed2ad157e3f5af01632b8f2b727e232448e5a9bff6aec25298fa9913ec38f1036b665b141b5299994c88b1941d9896b6eaa92cfdb44d65db3628f50e3824f
-EBUILD wakeonlan-0.41-r4.ebuild 613 BLAKE2B 1df96c919a21024edcd733591e752945dc4ef2fa95e1524fdffa5fba919d88090b29b47ab7c731ec45a39f4c4ce8a158821ee733a2109dc32e35c7ab3ed5c525 SHA512 ef9be9c6d91ea564809ca785a33ad2838ba363f13b12ceb9f660771f0e3bd408fd759d2724aa031fe417a45badbb0478ebf91382b12e240db3f2b0bf9e0993de
+EBUILD wakeonlan-0.41-r4.ebuild 620 BLAKE2B d143f032a58a7eee805b2172bd7234f24edb2a59ef73cc5dd0a2c2f79666a4e5553a92047bad51df89116dcd40de1d1dd143f309fbefe175c7516593f7af4e3c SHA512 5d61763a8596a4a94bf3ed2c849a2fac5b9ecb9f0ae7df37301f92c94fc478afe3132c02cf3b09c26b075c0d092f1c644f95f223fb2f9dabade8beb4768a0573
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild
index 34b627cabd74..ecdc7b997711 100644
--- a/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jpoliv/wakeonlan/archive/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 13d7e90a10e2..c178364860c1 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -3,7 +3,9 @@ AUX wget-1.21-avoid_bashisms.patch 870 BLAKE2B 12c695361b55fe9f1cccac1d99294af96
 AUX wget-1.21-avoid_eautoreconf.patch 214 BLAKE2B f03448fb7d494544d3fe579cc4460ab8d36bb033f0bdcb700fcf851c4e0e2e539bdc5d1bd08dd3fcecf3aa1957ff7ac68a858716fd96a9510f6cbdde64e0b92c SHA512 161f728b002335753ed085052092ae0563ce8120f44ec8bc06a47743ed6528996ec9e00a92de017eb5de863216c1521bd69663f97cc69f64e2579b08b6bb5f27
 AUX wget-1.21-gnulib-utime-errno.patch 753 BLAKE2B 01d236f8252e1ea2764e317f78740fa6479407ec2e25ff92b8be39e5bbadb33b73d263c326f12372a542cb044f52d60cab76caab1f496739c5b4d3a795c3ae1a SHA512 02b48efcad960e7b1b9b623bd8e99a55ce546e149536b9a43a15f494ee256d7c4616a5587734ee3b5c1c90759950cf48ecd54f1918f1a828fabf28e9158347c3
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
+DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712
 DIST wget-1.21.tar.gz 4866788 BLAKE2B e019df0ba0eefb0d6de0e73a73e7dc0ecd46048831ef3b4719ab47ce6895de7da3163902ff19881eb60eb4f67568a7de70092f62a8f8397a5ac9583fb689ad3a SHA512 13313a98f91ef34ad90103f076285549eb4887d77953e9f192d3b0667642b5ceb9e2e30091f766cbf1d6ed423499c497ed85d826f3f3e92f0711aa06d8303c5a
 EBUILD wget-1.20.3-r3.ebuild 3374 BLAKE2B b18227c786df61dbe839e4beaa0650ca1a04c34641997d8a8b967ff1a4cab06c662e1e702dc47b6fc90e2dde17e6c4d5c230b002e8613c3b2f82739af7fa2d98 SHA512 d62288f05bd78a46a97b018b9bdcbc2905f337b7a2f10809aa8c5cc421b570548ac611c2b1f67b1ced3361789de1c13783647fa3c6cfc7807afce037d7ee95ea
 EBUILD wget-1.21-r1.ebuild 3519 BLAKE2B 6d428d18831082a16876330751a51a0f9b0f8ddc8360b3c50f359a040f821fe91f50ebcdc3ef5c0a5ee5053e5be23e9db0451eee3d763abb55bd8a620231d6bb SHA512 dfe77397419662fd39e70cca783d53665ce68847180708274a02ac0b879b95d09da92a35bfd0d36ee8bf82af6cb4c343dd7fadb964b749e969a4a037496dfc5b
+EBUILD wget-1.21.1.ebuild 3327 BLAKE2B 00c9a7ddf3dd120b6cceba0545f42ab865f933f273f32f80edb969bc6503da630e180e411fca95bf7435f876f27fb2f13e2a8b29d2ecd17c7a9ccc1059f5ac93 SHA512 b2c5cff8141abe71ef8d1e78242855c440364b5f7a2a0514a90609201b142e8973342e255c2829455a897ae784f9b73a78702ddd03535499d43ddae9a1f18131
 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/wget-1.21.1.ebuild b/net-misc/wget/wget-1.21.1.ebuild
new file mode 100644
index 000000000000..ffe8a73aa719
--- /dev/null
+++ b/net-misc/wget/wget-1.21.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+RESTRICT="!test? ( test )"
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="
+	cookie_check? ( net-libs/libpsl )
+	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
+	metalink? ( media-libs/libmetalink )
+	pcre? ( dev-libs/libpcre2[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] \
+	|| [[ ${CHOST} == *-solaris* ]] \
+	|| [[ ${CHOST} == *-uclibc* ]] \
+	|| [[ ${CHOST} == *-cygwin* ]] \
+	; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	local myeconfargs=(
+		--disable-assert
+		--disable-pcre
+		--disable-rpath
+		--without-included-libunistring
+		--without-libunistring-prefix
+		$(use_enable debug)
+		$(use_enable idn iri)
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable ntlm)
+		$(use_enable pcre pcre2)
+		$(use_enable ssl digest)
+		$(use_enable ssl opie)
+		$(use_with cookie_check libpsl)
+		$(use_with idn libidn)
+		$(use_with metalink)
+		$(use_with ssl ssl $(usex gnutls gnutls openssl))
+		$(use_with uuid libuuid)
+		$(use_with zlib)
+	)
+	ac_cv_libunistring=no \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED}"/etc/wgetrc \
+		"${ED}"/usr/share/man/man1/wget.1 \
+		"${ED}"/usr/share/info/wget.info \
+		|| die
+}
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index c7fac9227431..ad351f53fec6 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,5 +1,5 @@
-DIST you-get-0.4.1355.tar.gz 143921 BLAKE2B da303fbcedd0818d785f846da4022364c3782d74b50f01b8aa2c0da38f4d61108da22a991e3ae02660021df6ee3378fb9e03826210563aee37e7f85e72b52fa1 SHA512 20f092d49e554f994b57dec4f12a8a0f4aaf418f8e0ce68611e1424f5ee512cad104c5498fe7d133ae8fa1c65440fdbebb8d523d9792336ea5c62ac3a58aa9ba
 DIST you-get-0.4.1432.tar.gz 149854 BLAKE2B 227fc950dfdfdbcf899a06db37e0b4e9060e7f82bfbae8a8081a6930827d32f59cc0ec32c0c2166f46d55b958930cafdb4bd1e81d46b7326ca759c58e4e68cd3 SHA512 aef856c86f574470ffbe0ebcb056b63f08663c514a68fc3953a2c10497df44d5f76fa19c593c1c02559effd13f32c82bd52738d033b6cd0bd7b1e8f8c418b680
-EBUILD you-get-0.4.1355-r1.ebuild 489 BLAKE2B 553a8ad218524c336b2ba4d0b1c814b2325a8d9d6dcb8a05e3842cd08938056b54555a80167ff3b331c153772d91878757d6a31d49346455a3e69a73a135bf72 SHA512 5be3e46d8fe95a94ff6d5a0517ac2a0eb0703e03c8d1dc06a19b887e77c53a613fa99ebd1b1195dc4ec2e8077495107b2b474704eae4923bc078e74ee9e59aab
+DIST you-get-0.4.1500.tar.gz 157365 BLAKE2B 4b55a6950c3134792807eedc6e7ba47cae68e909fd29b34d59c289761828814df07bebb8bfe12f7ff0a42e32d0e6cecd770c152ca79ad199ce19f464bdf66ed9 SHA512 133977bfc24b4bd1abd50fcc252d9d75fe166ebe1c02897d0b6720f479a6f9f6368c84d8e9beba2d0c1dedff7a632c67062ee61098f07e5f5ed27c827fbea73a
 EBUILD you-get-0.4.1432.ebuild 526 BLAKE2B 32794378404e0226c7a9115b16c80323ca322cf386d26a57352403af1ded2176b1ef3595e295d18237520ce8c74db6e64cf78697f05d08ed3e281410cb4a6dca SHA512 1c609705f6f41418b06abe92f57883ae90826d93a38527ce025fd3291d04f97f97e9fa8ae6fd01473731b4cdeea56180b0170c5d73f1d3e090ea39181eababd0
+EBUILD you-get-0.4.1500.ebuild 515 BLAKE2B 65e596e2970fd75d64d2549285695d6a4dfbd8d289dee4abf14127c9e0817650374cf520caf068a117a06ff77f6e489975f8140ae03b9789b4eb34370294507c SHA512 59698313e883b705cc36d934ed39d2079e05bdd2e6a476e2f1e5b110f1f483b1e64229eb443ed45f287a73a399679d0b0b08ff65411837eaf317ce33cae54e27
 MISC metadata.xml 330 BLAKE2B 9d17cf8bd3386e62f13765cd48f3351ef8a3abd726772d0d2d1365c8f8fa531efe401c33a46232092aae2a0f846cee99d5bfba400f5f1b2d10466220d20477c5 SHA512 923e442a3f28cd825b34e717db363907d19638656c7045e705f1cd4460868e7b602de696096157097e2723d9b537d09130d2d8506ec206b3c874d205150a1dd6
diff --git a/net-misc/you-get/you-get-0.4.1355-r1.ebuild b/net-misc/you-get/you-get-0.4.1500.ebuild
index 1e79ca147fa3..c0c07d814b2e 100644
--- a/net-misc/you-get/you-get-0.4.1355-r1.ebuild
+++ b/net-misc/you-get/you-get-0.4.1500.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python3_{6,7,8,9})
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit eutils distutils-r1
 
 DESCRIPTION="utility to download media contents from the web"
-HOMEPAGE="http://www.soimort.org/you-get"
-SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://you-get.org"
+SRC_URI="https://github.com/soimort/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 56140a222c32..e162b8d204ba 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,14 +1,4 @@
-DIST youtube-dl-2020.12.22.tar.gz 3238866 BLAKE2B 8f2f07c59b4d64ed9176bdbfcb858c4f90d7acfe97fad02bf98c517e46fca049421deb764a039466557cfda20d3921535e0e0ae0be4c9afe514a2242a18a45b5 SHA512 2acd7256d3479387db25cc85882da77996cb8fe09a6c6400a9580c1c10317ab72ee18b0e1c2429f533992c41e172f2bbd8c9570daed01578aa971b1ba9d3fbc2
-DIST youtube-dl-2020.12.26.tar.gz 3246941 BLAKE2B 7e2c3cea21e10458c1ee3718e9e039301590d8213367229818f36df488865eca7d1e76a27dfc1d4374d15314f271b12fc2c548f43927c724a936399fffa5ac19 SHA512 6a577aa435639af7c5e60183d7548d5f0a74cdea3cb87edaa81dc20ce5ca788ba99f731cbaacffdae74cc10d530e6b8d5b0cfccaf4cb9c2f4cc4f9c540b2d175
-DIST youtube-dl-2020.12.29.tar.gz 3246557 BLAKE2B 94ad5b81e9bfd17a1b05725920dab04f9d2e6e6655cf5df3bd42c443207253251b26f8c969a4baaabce7eb44e4cd2ec04d4ed20ad56569b540f2eba8796da3f9 SHA512 361bb9d60ca1b45887e56d346121412d4a23a7245d2960afdfca55e96d1134ef68126fd1aa5630e6067002de9e704cb70688d12d6e997413f221d28dced4fa81
-DIST youtube-dl-2020.12.31.tar.gz 3252801 BLAKE2B 23b6acffb1d312b628f4c9c485b81645f679df7c0d40649acca665bc524115e81d842d9e336145d65ca8d6e4217f46f4a6fee8dfa48c11fa0316af2a069a68ce SHA512 78c69648f40c99581a533bac0e1afa2339f5681a01278f9234ad8b6b3f0f1b29e21bb669d27d0a6f9bccae0e3be954b571261d1ab9a1e778f3f028c8795595b6
-DIST youtube-dl-2021.01.03.tar.gz 3258305 BLAKE2B faebd2ad58b434b6c34d8ede40f5b095acfa123db306881dce4b78f7d144bd76de7d45cc248ad09bcfe86b5930db6a8f69fbdaca5b62b4942ce6c6b004c791f1 SHA512 2698e91bb176e79c3c8d621e835f58523099b7d2b3aea33df01c6f692ce68b02df12884dc276111e53296db2f284f7ac24603302e35f4e10852a1ec9ec9abd18
-DIST youtube-dl-2021.01.08.tar.gz 3270591 BLAKE2B 7be0b80a80943360ed0b3385921bc4a42c9d5cbb92d5d11f159c0b374a0c86798b14f635e8d31c16aa690f736a14d6c11369b10e42722fd7b5b7a5fdca182196 SHA512 516c5ac6e0e4513e574771a9d39f643f077e18b408dc7b709b92ca99d2d72f15719b545d5f7598a3a1d5eaeae52efff283c42001ce8c846c019582490be8cac1
-EBUILD youtube-dl-2020.12.22.ebuild 2131 BLAKE2B 9b7c85878f0260e8df0b3cb11654f9f1d80cd3a2dc93c5fad50b35cc18f89369cfe5cefeaa7461e0e34d005195f01a85c3c6c13db375bd5c3518bba410cbc23d SHA512 2b55a07be0dd75e9b5ca14ad58d466304727ef50cc8b622c04ef42e0164073ced817d7f7bdf1cfd315794e5e13390fb3e47f4e88d5496f4ea8df24e30155945c
-EBUILD youtube-dl-2020.12.26.ebuild 2136 BLAKE2B ca2ebdc11f14acc9d57bf95b725ac45027942aa92c8b60c0f6d5cb5a7d90c511e4c11cb82845b067963ec6f635b3d8ad5564f639af9984964cf605d4b7bb2785 SHA512 fc56dae6b52494f0eb8c8cf00bf1331c64a857628d86881846e5a89544d6d0ea4d7b2ac5c9cadb6c9169b3ec5fd3479d34be6b487b8d00efe4b53b119f97256a
-EBUILD youtube-dl-2020.12.29.ebuild 2136 BLAKE2B ca2ebdc11f14acc9d57bf95b725ac45027942aa92c8b60c0f6d5cb5a7d90c511e4c11cb82845b067963ec6f635b3d8ad5564f639af9984964cf605d4b7bb2785 SHA512 fc56dae6b52494f0eb8c8cf00bf1331c64a857628d86881846e5a89544d6d0ea4d7b2ac5c9cadb6c9169b3ec5fd3479d34be6b487b8d00efe4b53b119f97256a
-EBUILD youtube-dl-2020.12.31.ebuild 2136 BLAKE2B ca2ebdc11f14acc9d57bf95b725ac45027942aa92c8b60c0f6d5cb5a7d90c511e4c11cb82845b067963ec6f635b3d8ad5564f639af9984964cf605d4b7bb2785 SHA512 fc56dae6b52494f0eb8c8cf00bf1331c64a857628d86881846e5a89544d6d0ea4d7b2ac5c9cadb6c9169b3ec5fd3479d34be6b487b8d00efe4b53b119f97256a
-EBUILD youtube-dl-2021.01.03.ebuild 2131 BLAKE2B 9b7c85878f0260e8df0b3cb11654f9f1d80cd3a2dc93c5fad50b35cc18f89369cfe5cefeaa7461e0e34d005195f01a85c3c6c13db375bd5c3518bba410cbc23d SHA512 2b55a07be0dd75e9b5ca14ad58d466304727ef50cc8b622c04ef42e0164073ced817d7f7bdf1cfd315794e5e13390fb3e47f4e88d5496f4ea8df24e30155945c
-EBUILD youtube-dl-2021.01.08.ebuild 2136 BLAKE2B ca2ebdc11f14acc9d57bf95b725ac45027942aa92c8b60c0f6d5cb5a7d90c511e4c11cb82845b067963ec6f635b3d8ad5564f639af9984964cf605d4b7bb2785 SHA512 fc56dae6b52494f0eb8c8cf00bf1331c64a857628d86881846e5a89544d6d0ea4d7b2ac5c9cadb6c9169b3ec5fd3479d34be6b487b8d00efe4b53b119f97256a
+DIST youtube-dl-2021.01.16.tar.gz 3275243 BLAKE2B 970bfff5db0aca7e386027e20f2b4d7e6b7209037820f3e0960f2e19b3b8e0aaf0f62bacb1794a15f359108533cbc396dddea99c84a8c88c13891329d2685326 SHA512 01b73f2e626df69249057ddc205d49dc7d6d16c66f4349fcdde5990615d1d13e0b5db15d65fb35e0c1328f7dc67d1473183228778614ccb7a3c9d27e80a0a38d
+EBUILD youtube-dl-2021.01.16.ebuild 2131 BLAKE2B 9b7c85878f0260e8df0b3cb11654f9f1d80cd3a2dc93c5fad50b35cc18f89369cfe5cefeaa7461e0e34d005195f01a85c3c6c13db375bd5c3518bba410cbc23d SHA512 2b55a07be0dd75e9b5ca14ad58d466304727ef50cc8b622c04ef42e0164073ced817d7f7bdf1cfd315794e5e13390fb3e47f4e88d5496f4ea8df24e30155945c
 EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B 7eb91fceeba248ff2a1b40ab97139da9a33211b2fe79c66ae6aa29a2b6fe1f2b4e400f4dcc655573d46b6fa9a7f3cb7baddc75a32739b89507db9d4f4f96eba3 SHA512 f9768251f05033b9df5a0ea82d9e62f6d8fcf651dbbcf72a300bba4caf22ca5b99af73b830eba2d5483ae9b227d99f02bfa015319303f7f7300e6106f1e0b342
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.26.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.26.ebuild
deleted file mode 100644
index 9d465c616942..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.12.26.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.29.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.29.ebuild
deleted file mode 100644
index 9d465c616942..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.12.29.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.31.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.31.ebuild
deleted file mode 100644
index 9d465c616942..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.12.31.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2021.01.03.ebuild b/net-misc/youtube-dl/youtube-dl-2021.01.03.ebuild
deleted file mode 100644
index 532cbacccf05..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.01.03.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2021.01.08.ebuild b/net-misc/youtube-dl/youtube-dl-2021.01.08.ebuild
deleted file mode 100644
index 9d465c616942..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2021.01.08.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..9})
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	sed -i -e '/flake8/d' Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake offlinetest
-}
-
-python_install_all() {
-	doman youtube-dl.1
-
-	newbashcomp youtube-dl.bash-completion youtube-dl
-
-	insinto /usr/share/zsh/site-functions
-	newins youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.22.ebuild b/net-misc/youtube-dl/youtube-dl-2021.01.16.ebuild
index 532cbacccf05..532cbacccf05 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.12.22.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.01.16.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /net-misc
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)