gentoo resync : 04.01.2022

49 files changed, 551 insertions, 908 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 709e122de52b..035567bc3aba 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index cd60e35ab3b2..fcb337959590 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -1,14 +1,6 @@
 AUX courier-authlib-r2 978 BLAKE2B e49effed437cc9fd76404054e014a87bf2a207c68c1a440293d73da748d423aca137031a2b043e832f5009f2384f3f7ae352c2d10dfccfeb6082fd42aa1513bb SHA512 8681f041431150027f41058ae8dd5fb2105a74caecb096aef42b1f0e255026c2f8509d9f688f2725ab1e12b792604cb481a95a6eeb177967c16ae5e3390f44d4
-DIST courier-authlib-0.69.0.tar.bz2 2197718 BLAKE2B 63c273a85983ce7bd57496eeefac51107e3132dc9eb372f199530dbf6c5a5ddde7f8ee285aa54a096002f9058dc7e1cd9eb1194e3d512ea19882f93b1147345a SHA512 c3806aa50d7ff13f75536064ec46028db3d5e1f4ef64692b5ece64810b4042ae0840bb346c73ae9d36f6113173f0e5e922356a178c10815640a26caa921e1614
-DIST courier-authlib-0.70.0.tar.bz2 2183323 BLAKE2B ebf58f8c4e7b58766edc684ced590ea7bfa692eff19a483f4ab7748a73e96e1c66858985ac89e281205838660a72e9a33e3b3c28fce3f94d981b61ca56b1e2b1 SHA512 61ce62860cc7ceb51f255a0659bf9b8f4172d0c1c8aee06d9821144330f9526f54e6bdb0158f2fd754d6ad92fd4cc84306b949d46c92e8aed47a397023b36b65
 DIST courier-authlib-0.71.0.tar.bz2 2207895 BLAKE2B 8eb92b2c07acfb662b34a2234759a80f3a1b5a96c9e537cd6215bd9a9a607ed8995461dd599e4fe2698e70510f11815ad13a0511446303ae5e26ff616f05d92f SHA512 7a9700c472fd9d6942bd15dfd8db474a738817608bcd8106b6211b24cdc0631fd69f99e7a5c9e9f6088c16b53a9304ec429c031b16621f8ef52581af8a4256ec
-DIST courier-authlib-0.71.1.tar.bz2 2208870 BLAKE2B 5058a5d3182c53020c3be0a693908bd90e6e2397f03124df3efd7c3bd39ebdc794166d49c6153880bbf93518afbf4388160680cd701236b075b6e59624fb6882 SHA512 a1b36f4f3b0f11fb34e5dab197b3a0471bc6a99528fe77836b3b2d12f9dac292be4c181aeba5afa3410685dd6882ed00ff6692e74cd0132ba591de1294d0f2d7
-DIST courier-authlib-0.71.2.tar.bz2 2208460 BLAKE2B 49aaea85032166ba4867e7834bb2f6c8d3eccb0ebe24b94bac3033a3da2154e3162d06892354b37eb0c38db092ce0096b050246db341b18a32065c19f322238a SHA512 b0bd2356013d48a998908d4825901e8e730ec276699005696948781e8af4014e25eded3116fa5a8a38b6236e9713f454170628b51aedab7b7d2ebec082643a47
 DIST courier-authlib-0.71.3.tar.bz2 2208794 BLAKE2B 4b0f56f066368383d471dd8f46941f7b652a87be939ba6319cf99115991c03dd117d6bc246cc802fa7066ce5c75aaa102c59ae397948dd31ddbbb024059566ef SHA512 02c55ff1a91aac581942f8a4a01edd2bb8e2e1a07faf551d40a97583ce2f6eab12e850e3170df255c1e7680a34e418784ec14bb033825d6bac21192ae37ce55d
-EBUILD courier-authlib-0.69.0-r4.ebuild 4464 BLAKE2B 017f911bd68b7c6784e71729b77afa4011926a6f577a4760d8ef193f788bd6c4dab2dd431ea4d72080610d6140871f44f5a8931c96f5e9c828063e4178ed5754 SHA512 cfd37a3416352ec2f1f9e8fb5684cfe9dd83ad73a5d0de9006c06b54ff61b2df674a3411d45ae5a38c89ff83bd00594080906a24426cb0451f2122a00cdc6e45
-EBUILD courier-authlib-0.70.0-r3.ebuild 4472 BLAKE2B 4098c1c73bb5487a4687cf23745722b553997c2d7e952679114b181e7cd251ed291779000ff4ec1c99dd0ba9efc2ef9bb771fee6b2b7d90ca8c742a0822ccaf9 SHA512 99fdf96d8b6f9fb6e755eac37f68498a6528eb6439be9dbb89e07913d6e1f6e79d15f142cfcb23a5df16831588981022bc401a95b15d29632872323024c64b67
 EBUILD courier-authlib-0.71.0-r3.ebuild 4464 BLAKE2B 017f911bd68b7c6784e71729b77afa4011926a6f577a4760d8ef193f788bd6c4dab2dd431ea4d72080610d6140871f44f5a8931c96f5e9c828063e4178ed5754 SHA512 cfd37a3416352ec2f1f9e8fb5684cfe9dd83ad73a5d0de9006c06b54ff61b2df674a3411d45ae5a38c89ff83bd00594080906a24426cb0451f2122a00cdc6e45
-EBUILD courier-authlib-0.71.1-r3.ebuild 4474 BLAKE2B 78a21747454a43acdb69c288ceeadcb6608f0354f3f1ad3087d49c5981665679831c3cd8708468e323c2af1b41e5da67e1352ba1deb787f6e60213fbd79dcd34 SHA512 c65339439affe89b5b0585bf332e1c84b520993e9e2e71904138022ffe9b192ebfdfe708dc435ee2ecd3069a5626534e428aa9fcdfa8a1b46a0c4b0a920d1184
-EBUILD courier-authlib-0.71.2-r3.ebuild 4481 BLAKE2B 553372031c47ebea9b10ca7ffd6fd9bab03c9479df3451765cbac075f7ba653e389e3ffe5d88f3d20f1ee4a3271cf707579eaaa83436fc02e6d73df025f633b2 SHA512 883f9455c340312975008e25a67791ece5166d0e0d5aeb6d719575bb181993fe006ccfc9b025e3f17f1d9f0dc9ba7a5141a673b670dd6adaa6e9bdc8fdd8a144
 EBUILD courier-authlib-0.71.3-r1.ebuild 4475 BLAKE2B 2ab5573d5a349e8606643c530dd8b2856041aeeeed092257244cfca3a2dd4115eb23b42806a435a67dbf6a91e3e8839c2f24ec5ea79c8ad31c415c8bb804ebdf SHA512 9b66fd2773e398a7cc2101a2189796bbe2a84e9bb75e87642d7ddd4687121576da50824c166e96fe3c060a29e8344c659f502cc01c2aa8c05ea6d8a1e9110c8a
 MISC metadata.xml 302 BLAKE2B f4a6bbc1e616a769172499ca1f863a8e43d608e25d2a99a6384fd0a0880e4e23f2c64c97404ad80ae12c3cd23eda5854ded0ed2c9000875c701aa22ff70b9e80 SHA512 3f25d55e6f6169b696d210cfbd7df486337885cd0905b62d307e6b3fd1595ac1471dccb59794ecfe0bbcd009339348ef7bb9debb4752533d1b28043cb5d1f918
diff --git a/net-libs/courier-authlib/courier-authlib-0.69.0-r4.ebuild b/net-libs/courier-authlib/courier-authlib-0.69.0-r4.ebuild
deleted file mode 100644
index 14023d2a01b0..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.69.0-r4.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-	>=net-libs/courier-unicode-2.1:=
-	virtual/libcrypt:=
-	gdbm? ( sys-libs/gdbm:= )
-	!gdbm? ( sys-libs/db:= )
-	dev-libs/openssl:0=
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
-	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
-	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
-	if use mysql ; then
-		DOCS+=( README.authmysql.myownquery )
-		HTML_DOCS+=( README.authmysql.html )
-	fi
-	if use postgres ; then
-		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
-	fi
-	if use ldap ; then
-		DOCS+=( README.ldap )
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.70.0-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.70.0-r3.ebuild
deleted file mode 100644
index c2e8c3099c6e..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.70.0-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-	>=net-libs/courier-unicode-2.1:=
-	virtual/libcrypt:=
-	gdbm? ( sys-libs/gdbm:= )
-	!gdbm? ( sys-libs/db:= )
-	dev-libs/openssl:0=
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
-	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
-	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
-	if use mysql ; then
-		DOCS+=( README.authmysql.myownquery )
-		HTML_DOCS+=( README.authmysql.html )
-	fi
-	if use postgres ; then
-		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
-	fi
-	if use ldap ; then
-		DOCS+=( README.ldap )
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.1-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.1-r3.ebuild
deleted file mode 100644
index a72659a6479f..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.71.1-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-	>=net-libs/courier-unicode-2.1.2:=
-	virtual/libcrypt:=
-	gdbm? ( sys-libs/gdbm:= )
-	!gdbm? ( sys-libs/db:= )
-	dev-libs/openssl:0=
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
-	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
-	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
-	if use mysql ; then
-		DOCS+=( README.authmysql.myownquery )
-		HTML_DOCS+=( README.authmysql.html )
-	fi
-	if use postgres ; then
-		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
-	fi
-	if use ldap ; then
-		DOCS+=( README.ldap )
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-}
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.2-r3.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.2-r3.ebuild
deleted file mode 100644
index 50ad7474ac45..000000000000
--- a/net-libs/courier-authlib/courier-authlib-0.71.2-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Courier authentication library"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-HOMEPAGE="https://www.courier-mta.org/authlib/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="berkdb debug gdbm ldap mysql pam postgres sqlite static-libs"
-
-RESTRICT="!berkdb? ( test )"
-
-DEPEND="net-mail/mailbase
-	>=net-libs/courier-unicode-2.2.3:=
-	virtual/libcrypt:=
-	gdbm? ( sys-libs/gdbm:= )
-	!gdbm? ( sys-libs/db:= )
-	dev-libs/openssl:0=
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! has_version 'dev-tcltk/expect' ; then
-		ewarn 'The dev-tcltk/expect package is not installed.'
-		ewarn 'Without it, you will not be able to change system login passwords.'
-		ewarn 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-		ewarn 'and others) will work just fine.'
-	fi
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	local myconf
-	if use berkdb ; then
-		if use gdbm ; then
-			ewarn "Both gdbm and berkdb selected. Using gdbm."
-		else
-			myconf="--with-db=db"
-		fi
-	fi
-	use gdbm && myconf="--with-db=gdbm"
-	use debug && myconf+=" debug=true"
-	use sqlite && myconf+=" --with-sqlite-libs"
-
-	econf \
-		--sysconfdir=/etc/courier \
-		--datadir=/usr/share/courier \
-		--localstatedir=/var/lib/courier \
-		--sharedstatedir=/var/lib/courier/com \
-		--with-authdaemonvar=/var/lib/courier/authdaemon \
-		--with-authshadow \
-		--without-redhat \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--cache-file="${S}/configuring.cache" \
-		$(use_with pam authpam) \
-		$(use_with ldap authldap) \
-		$(use_with mysql authmysql) \
-		$(use_with postgres authpgsql) \
-		$(use_with sqlite authsqlite) \
-		${myconf}
-}
-
-orderfirst() {
-	file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-	if [[ -e "${file}" ]] ; then
-		orig="$(grep ^${option}= ${file} | cut -d\" -f 2)"
-		new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-		sed -i -e "s/^${option}=.*$/${new}/" "${file}" || die
-	fi
-}
-
-finduserdb() {
-	for dir in \
-		/etc/courier/authlib /etc/courier /etc/courier-imap \
-		/usr/lib/courier/etc /usr/lib/courier-imap/etc \
-		/usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-		/usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-		/usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-		if [[ -e "${dir}/userdb" ]] ; then
-			einfo "Found userdb at: ${dir}/userdb"
-			cp -fR "${dir}/userdb" "${D}/etc/courier/authlib/" || die
-			chmod go-rwx "${D}/etc/courier/authlib/userdb" || die
-			continue
-		fi
-	done
-}
-
-src_install() {
-	diropts -o mail -g mail
-	dodir /etc/courier
-	keepdir /var/lib/courier/authdaemon
-	keepdir /etc/courier/authlib
-	emake DESTDIR="${D}" install
-	[[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
-	emake DESTDIR="${D}" install-configure
-	rm -f "${D}"/etc/courier/authlib/*.bak
-	chown mail:mail "${D}"/etc/courier/authlib/* || die
-	for y in "${D}"/etc/courier/authlib/*.dist ; do
-		[[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
-	done
-	use pam && orderfirst authdaemonrc authmodulelist authpam
-	use ldap && orderfirst authdaemonrc authmodulelist authldap
-	use sqlite && orderfirst authdaemonrc authmodulelist authsqlite
-	use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-	use mysql && orderfirst authdaemonrc authmodulelist authmysql
-
-	DOCS=( AUTHORS ChangeLog* INSTALL NEWS README )
-	HTML_DOCS=(	README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html )
-	if use mysql ; then
-		DOCS+=( README.authmysql.myownquery )
-		HTML_DOCS+=( README.authmysql.html )
-	fi
-	if use postgres ; then
-		HTML_DOCS+=( README.authpostgres.html README.authmysql.html )
-	fi
-	if use ldap ; then
-		DOCS+=( README.ldap )
-		dodir /etc/openldap/schema
-		cp -f authldap.schema "${D}/etc/openldap/schema/" || die
-	fi
-	if use sqlite ; then
-		HTML_DOCS+=( README.authsqlite.html README.authmysql.html )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}-r2" "${PN}"
-
-	use static-libs || find "${D}" -name "*.a" -delete
-}
-
-pkg_postinst() {
-	if [[ -e /etc/courier/authlib/userdb ]] ; then
-		einfo "Running makeuserdb ..."
-		chmod go-rwx /etc/courier/authlib/userdb || die
-		makeuserdb
-	fi
-}
diff --git a/net-libs/enet/Manifest b/net-libs/enet/Manifest
index 1e6f20160e66..c3e95c1226c5 100644
--- a/net-libs/enet/Manifest
+++ b/net-libs/enet/Manifest
@@ -1,7 +1,5 @@
 DIST enet-1.2.2.tar.gz 413454 BLAKE2B 3d13ae43a3ce361cf19d7b79c8ec92f76b7c1066659bf4e531a3144b03aac4e7b3738c102eff12bc0748a4a798e7be77473a6b386d29bb416998057f71ffe9d9 SHA512 2c28ab4b650dd4165ee5913c1bc80dc47e43f2363a5fdd7f3aa9be8fb3afbc8aff7a6bce731f7dac45eb930fc6338cd811c07e8dedca5554a7dd32293685062d
-DIST enet-1.3.13.tar.gz 669090 BLAKE2B 3041e9b2fe431dda2eae3464417d79b80664ff2c303222607991db28328e8eca2357fbf66248f40344bf93a26e0d1ffdad4698f9fe58939224b830700acee501 SHA512 82501c0248330a3a6bcac907907760e59b18cb662ebb42fe2c91e1557f1bc8ab452bf3fe7477dc01fa7a6e3b6124e1eb8eac46382d5bbebb2394879f9568b5df
 DIST enet-1.3.17.tar.gz 703278 BLAKE2B d31838a173f629a2216f59173c259cf7cb35985913c5f8f016641ceb189dc20308effa206f03391cafde842ad6e43ec1776d38ce02283bd5990ccf38eadf4d6b SHA512 efa0cb093a6ca295e5012a4fdebc5ffd6516a66a967e97b386b72781b18ce4a118c9bf94e87adbbdcd0ed441e22c62a05c24ff39fd6b475919e8efe9ab4715e4
 EBUILD enet-1.2.2-r1.ebuild 499 BLAKE2B 05ec1dc7aaecfb189a06dfdba15f4770491062f334830e6f9eb1ea5a3729f3ebd39951f6d5008902ba66f84640aca16c74473fc7705e00c6eeeb7b257bbc2a3b SHA512 1700ffc1e2129992d9f1bd4fac27a033a948e237349b38ac75cae19ccd479f1b8b2b1bcee114db196c8b8e24ba58a4fcb3e17cbcd194a32b63925302799cf3ec
-EBUILD enet-1.3.13.ebuild 543 BLAKE2B 77646d41979e890867c803d1e7056b17b63ffb76ec70d6ad5fe9eed99603634946a783e86dba66a957cf90609227e5c4d7d32fcafaf991df89e79eb864498002 SHA512 437dcd55c7d87514cde3c4a0a821cb7615349cdeacfab1be8759a0a9b318881d50f0c1dfbf4f097c9ec1426c63ea47b437d93b1f664ec7246aa4c1ca157017a7
 EBUILD enet-1.3.17.ebuild 583 BLAKE2B be689c20279390aff1b6cabd0305e4057b7a0c3519134aa11413da538a058deee610458e4a5a8c5a1197932fb902a56a4d62269f3a8246c46b73323fa9383cdf SHA512 9db4ba949b3eaa696bebbe1a4abfb6ea0ac4309f4466639264e8072989390c27047bd4d8aa98b7605248c1a4f571cb7e766d07956f4161f64f257f426af0c909
 MISC metadata.xml 412 BLAKE2B 531f035737f5646642c3d08352d94b25a3fb7e96d8c6a52e9c1f1b3c69af949dda25456c32cfb599ebfca68657cb8699afbb4f583b69d929dd4693f65f01ed51 SHA512 acb6f886f4759fbed4bdb5c785b3f38eb5e1d8d07def250f8678db4fb00c96cec8ef0f7397b10b0aac7dcd2f6a243c0a4930c2de52d7c5339532a4c2ffa6c4c5
diff --git a/net-libs/enet/enet-1.3.13.ebuild b/net-libs/enet/enet-1.3.13.ebuild
deleted file mode 100644
index 0e307002387a..000000000000
--- a/net-libs/enet/enet-1.3.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Relatively thin, simple and robust network communication layer on top of UDP"
-HOMEPAGE="http://enet.bespin.org/"
-SRC_URI="http://enet.bespin.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.3/7"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-IUSE="static-libs"
-
-RDEPEND="!${CATEGORY}/${PN}:0"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 7b3d66955418..4471a2f7f5d8 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -4,5 +4,5 @@ AUX gtk-vnc-1.2.0-meson-Fix-configuration-failure-with-Dwith-vala-disa.patch 105
 DIST gtk-vnc-1.2.0.tar.xz 218024 BLAKE2B 8e13886826eebc3261271b94e15c504f82b15681417e70cc6b54b824ceff4de20a470460c5176abb2df04f325389a08032f40b49cfc3429c290d6d7255fc56d2 SHA512 830c614afa6540397352da864ad32a5687ccce5dc1e2150220c9a7fc3c7b0fbcbb3770e06b5fed75602d830bc9a9d40855fa8b6d8b65f740fc7a53bbdfce6edb
 DIST gtk-vnc-1.3.0.tar.xz 220488 BLAKE2B ea5070cc396fe4ef52fe980b766658f1a4f82eb7dec52856ab79836363c8fdb48827d52c0df7edb2c943f5087fcfd87898aa43457f7cbf5a544a4c7063f84f3d SHA512 ff25c19a1cbd4588990f1f3a2448fd2e0b694b933ca1a7be9565188db78055efe13f90ad1243bf8237d6a29d38987d7b3e77344e50d09191207b09200b01f5df
 EBUILD gtk-vnc-1.2.0.ebuild 1726 BLAKE2B df068d3bea9685e002579f981cda026260b159948cf127f8152b10c0f102acb43d7a065b79a3d08cd1922bd661f4bb69a0c35450923f5896bbfc92d6ef9ac96b SHA512 20a13ba3044552513299c611bb35b732aca2cced2ce218e9b56947f9386c14acf990119844e09bb09172dd84b889c6665f3361ff5807f25f7dc0f9a4fa9780cb
-EBUILD gtk-vnc-1.3.0.ebuild 1491 BLAKE2B 2f5e095076d18fdf729308c3219f387879c5cd7c430dcd78427de4f6dd22a244daa5df2c5b05fd5d3f51e81c649bae44852e307bea526265e87c5288d2bb4742 SHA512 6e264102a629b95ea9f117b6ff3e7193223d3688550e066e817c1441fe03ecf4715a11e8e45f667be3f00c921410190a3379d9ab0fb80af2e418a92033e5d966
+EBUILD gtk-vnc-1.3.0.ebuild 1498 BLAKE2B 52b0044d5f482876c75ffa54ba9f8574410b4884ca4a1080774099d6e60c980720a63d847614e599e3ec9c5876fd5972aab712a3103b661ed40b413473d50489 SHA512 03a96ebfabf66ac4544250c425925880e92ad137218aa59d523d3e548f4e56522a2915cd724643e891721d55f0517913fc128956305cdae9e3c6550c80e0b49f
 MISC metadata.xml 398 BLAKE2B f3f6610cc4d7266437aaffb6278d79222d751634d79e275dc34547f95eaa826fc47a991b03cff5d7c9350314f876da54bb1322f6dd6e890e266a9e16b892b30c SHA512 953c1714f9dfaaf81e8dc27efa2758f5b0707dfe8594ef6fffa6da80aee0bfbd0c6d2c830d3459d4ba6bf36206ee55f4af5ee23f9f0845d1d1ee231cb8b8a352
diff --git a/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
index c29bc1decb07..99885c444904 100644
--- a/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-1.3.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+introspection pulseaudio sasl +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/net-libs/gupnp-igd/Manifest b/net-libs/gupnp-igd/Manifest
index 960af3f69aa9..b52f6a55bfb9 100644
--- a/net-libs/gupnp-igd/Manifest
+++ b/net-libs/gupnp-igd/Manifest
@@ -2,5 +2,5 @@ AUX 0.2.5-gupnp-1.2.patch 3485 BLAKE2B 83de24ae98ed70d6e92fec605b17772ea3d86d90f
 DIST gupnp-igd-0.2.5.tar.xz 287964 BLAKE2B 2267b991a0137006f122b3454bfb1bd9df0fd7fae2c47b50a394a2859f6e04375b55447830f6606c8a25260b9cafb75329cbdcd201c220a66fe881dce368abfe SHA512 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8
 DIST gupnp-igd-1.2.0.tar.xz 26100 BLAKE2B a72117b1c3ac3cd95d797b5d7a21b333a46d161bf22bc9649c1649fee6301f16824b0068ee094cfeb31ea283ca0aae8c2369c331fe956f59586ae00fd48c5825 SHA512 0129e743b09cc773b997e0f09d7ab84481d114d52ab273b1e9957960e6a47d686d600492b916970f3b2d3d30c36b68e1e4d049eb7be5d44101a56b90dd5f0af9
 EBUILD gupnp-igd-0.2.5-r10.ebuild 1437 BLAKE2B 878e30278be7c3c9048c099db41096d6699106e907136787f220e9c89e141d3c71e72982962798c51acdd436d1d48dd425c9d8de5da89b0223615b5cbda7c913 SHA512 f2cfb991cdb627ee24bebbe9fb6371319562823e90d4e29aaea53f10f146f0d67fa762f7e0f568afc8e766a19f7e9dd193fe47749d50c55e905e735a657dfe8c
-EBUILD gupnp-igd-1.2.0.ebuild 1142 BLAKE2B cc651dacf82fa18f935794f280c9399180ac7ccd7890637072db676ee100e688d26de46d7269559a78ba95e6b916ccaa1790e4c2c168599ee0cb181a7b817be0 SHA512 af7f95caf1f5b259efdb6725f7a7b90085fc844d8a721a06c03f3560828f381a42459643383e129207230c6bd790899724db1f5c3e45cfd1ac1098da26d09d62
+EBUILD gupnp-igd-1.2.0.ebuild 1141 BLAKE2B f3ce983d79138ba0a18c459409b68b0c35c0df3c98a2ffccd3645d515177c1a58cbf4d78b13406d176889fda651f3731698720c2f08bac750ef3ec3a6a9521b0 SHA512 1c117f5322386683c153c06e525b441deaed1b088bc011bce867ce27ef0207e2ad9a234a50053541924a2ea79d90a0bf018e1837c8bfcd8b93029fc6b0a15699
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
index 64f21fc9312b..7b036f45c5e2 100644
--- a/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-1.2.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org https://gitlab.gnome.org/GNOME/gupnp-igd"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1.2" # pkg-config file links in gupnp API, so some consumers of gupnp-igd need to be relinked for it
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/net-libs/libbloom/Manifest b/net-libs/libbloom/Manifest
index e5f8c8cecc1a..410fd2bae887 100644
--- a/net-libs/libbloom/Manifest
+++ b/net-libs/libbloom/Manifest
@@ -1,6 +1,6 @@
 AUX libbloom-1.5-AR.patch 492 BLAKE2B 1149e58d6c333b0ae442633e1c4824fc37cd07eb29d75c18cd0509f36114c8e458773fb4aee38b9b01193a92ace06aa193dee133da49c007d42399c8977d9e48 SHA512 da775a1e99a161c8f3433930b224aafaff681ffd96f89441bbce9b39a789d75de055eea95e799cac3769c9f9c5d14308968ee65a7daf5121d5ef024f3350c2ed
 DIST libbloom-1.5.tar.gz 1210081 BLAKE2B 8af463c487c2898c5a4cf3f7541490e2b069d4667ccda4b536f347535be5c7f5664c8ee17e0789ac5325feb8f325ae30a89e2de34323962e89378724cf130a84 SHA512 0dd69e3ee102e5808ba4350c71d212876db56235e263f8d5a66d6c3616d2e51cc18b5ca3a5a946d79c12751d9cc5667f7c633d77645c4b88a4d16ea344b51929
 DIST libbloom-1.6.tar.gz 1872005 BLAKE2B de3368724e9c05489efae74ce36e880e2db29f78792b84b13325a24a3c302154fdbb621d672e9ef7f612ef00df1ec8fe010c59461822f5d04b4c5b27996ef773 SHA512 3dd4343d68def05800dd6ffc5a05b05d0702a8c0c9f0a397f105d4389c88a7bffa419734aeb4fa4e1a2c418b12a8192fa27ddcbaeee72906450d64cbfd64db15
-EBUILD libbloom-1.5-r2.ebuild 595 BLAKE2B 5d19e1dcc14096cb5190d151cbd55dca99e2e444e23516e3d6cb331efb1959a2e104ea0d5519440b92276c65c14707d8aac05a7e99829d2d09ad9d64ca28fa7b SHA512 3858e3f238c753c2da1ba6e8d717f870613a34c811ad76f2fb4813e9ab9bad9c4d4639c6d07183aa9f14835f8f0daa7ec3377d2666f587a3583dd5158c73c2e9
-EBUILD libbloom-1.6.ebuild 602 BLAKE2B 910b16bc9cfa4739e1bb54e333af5856f50813a00ecd691c62da66e3c57a5fddeef9f4bf67d039bc4ae065b16827a72080a4a4fbd4b703faac057d39b45ab76c SHA512 121652c4fa718defd6a9f600fafc90436fe39ad099599762c1d2206519160b56c2c7fb93c0e70ae377ffdfdfae82b64c0f66613e409ee09fbf839681964a8e8b
+EBUILD libbloom-1.5-r2.ebuild 594 BLAKE2B ed1a294523463079b1199bd73c2d8bd7da125cce47fa52808ccf9d46ca4b7f5a39415f3fcd656c48f210439e205fbf3583e308af8fb4974735d437d22b3e998c SHA512 c9d7681619def50b64aa577210973ca8e9ce1e1511b9e68d6ecd4f40ad22caac5a7b0a1536bee0cdf7ac039050a33c80916aaf9c97acb3df2400340bcf2b8a3e
+EBUILD libbloom-1.6.ebuild 601 BLAKE2B 283f36b78a30ab73787c343a122205af7be6c3ba8cf524c305556a3697ad25882d6e7512ac0ffb880984ef19ccbb295a69cba0ea85593371f6e0a0681ee4c733 SHA512 8228296056c3805666f0864745475b6bb9f4e4dba8e0e8b6759a9355fc451d45a5db9d53c4dfcb7afb058061dbf8ff1c9cb974bb3b870f053a706b93cee1d327
 MISC metadata.xml 322 BLAKE2B ccf8ee2efd91b7e6ada82afcb00f67de420d5d2c1680e0fe1c3c4d5f2d1556494f5a9ed50c994d0e23d3fca239c2d8b24ae00bc25babe950d042c99a514820ab SHA512 5cfd32799c2bad0dd515be059453d54b23bb4c7e19718e9477549bd33baafff1a11debc9f25e9eba5979cc83d748b8cdddedad09d7d469fefa08a7dba8bdc1d4
diff --git a/net-libs/libbloom/libbloom-1.5-r2.ebuild b/net-libs/libbloom/libbloom-1.5-r2.ebuild
index 9be6bd8a03a9..17be8bdca711 100644
--- a/net-libs/libbloom/libbloom-1.5-r2.ebuild
+++ b/net-libs/libbloom/libbloom-1.5-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="A simple and small bloom filter implementation in plain C."
+DESCRIPTION="A simple and small bloom filter implementation in plain C"
 HOMEPAGE="https://github.com/jvirkki/libbloom"
 SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/net-libs/libbloom/libbloom-1.6.ebuild b/net-libs/libbloom/libbloom-1.6.ebuild
index 4ba1dfabf23f..a792f191fa46 100644
--- a/net-libs/libbloom/libbloom-1.6.ebuild
+++ b/net-libs/libbloom/libbloom-1.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="A simple and small bloom filter implementation in plain C."
+DESCRIPTION="A simple and small bloom filter implementation in plain C"
 HOMEPAGE="https://github.com/jvirkki/libbloom"
 SRC_URI="https://github.com/jvirkki/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest
index 9dde121f2dac..a5c33af2ab96 100644
--- a/net-libs/libgfbgraph/Manifest
+++ b/net-libs/libgfbgraph/Manifest
@@ -1,5 +1,5 @@
 DIST gfbgraph-0.2.4.tar.xz 39520 BLAKE2B 71ce5a091b5ab7d27b7b5353ff76cb67c90a358371f1afe41a561bab195c7e01353854fbd28c3970c3179ded24daf41f7150f70b5efcb1c81aac89de9fed2c88 SHA512 e6d63e56f4d67b59b0abbfb9dfe3aad8b142023413246015a84078c76f631eaa6e9fa7eb5771f64156ea01e160eb07b17783059e449036b372b4bcb26751ff68
 DIST gfbgraph-0.2.5.tar.xz 283632 BLAKE2B 7a229e098623613c3c758dd7d9d4802cf82a6b8c7f6c81ad8de2392597d13b6db9978ef1794321aa6915f9065dca030e58ef1569d64f956a7048846e996cea23 SHA512 c3a1168935272377c211d95e4efcb8ed56d129589bcaa6e0d7b5dff7ca916f0c63dc30eb1a903aea3de51cb109ae787e985bdd9485fb97cd1b5b6971bea01a1e
 EBUILD libgfbgraph-0.2.4.ebuild 1253 BLAKE2B 13b7673066d2759daba70e95ca4063825190bc82d739c5c5fc3a21b4fcb8d51825f69d81a97cf5daa35e0653cc5678fcb7352f0771e357f0bdcc88e1c32c30aa SHA512 b716d4248eab483e82c4bf05deae33345d5fd1dadd1fbc7f95c2d5c649135343d8261877c96b5fede2e8d7ea9c9ac720116e814f344f136953cababb2e381915
-EBUILD libgfbgraph-0.2.5.ebuild 1225 BLAKE2B 56efc32b703c618c1040e534ddc57de637884f17bf575760fd84a2c0004dd4d929c0d3dc40687759fab71022bb60381f722a8802b74bac96215ea93c1d2c62dd SHA512 90f2a2051499acc540af00752210ca4c1106fd6b9b0b80bf77e762ab65e4f36ad8dec25ba50af06477cebca2e8f1c973538bfa9085c32dd8cc9b5d6c39a828d9
+EBUILD libgfbgraph-0.2.5.ebuild 1232 BLAKE2B 88b2349d74a8e4e760e86328ba37bf4b5af341121583d4d81b866d8e737b998ea05d6367abae17354e770f677ad16a1d01401dddac7929e4fc042a441b36d0f7 SHA512 a9a6d3bcc68f15219474c599c535a8e1be54e596bd723574b668ea4a8f8714ec87cb8b6977c04f0c7f88b92d7a2ef78381b78e9366497fcc1d3e6a49c47d9bfd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild
index da63e53c252b..aab4f4e6bb45 100644
--- a/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild
+++ b/net-libs/libgfbgraph/libgfbgraph-0.2.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="+introspection"
 
 DEPEND="
diff --git a/net-libs/libiscsi/Manifest b/net-libs/libiscsi/Manifest
index 482ab6d52744..f961d92c2fd4 100644
--- a/net-libs/libiscsi/Manifest
+++ b/net-libs/libiscsi/Manifest
@@ -6,7 +6,7 @@ DIST libiscsi-1.18.0.tar.gz 271603 BLAKE2B 9e059d57ce231ba1699927c54ee7d7bda6927
 DIST libiscsi-1.19.0-remove-ld-iscsi.patch.bz2 6104 BLAKE2B 611202ca0ec046caf5cbd1adaeafb42a7d7d00fcea51e61df6c251576ea276cfe9a2168a9c3f1d4c7aa585d7ff9e90a95d8da03d86ceee2971a84c2bce8d7a5c SHA512 e826883b50e04c6dc3340b51d7b3d3f3fc2bb91cf4e5c13367341449d5a57618d5918946416994f6acbf3e13ab38bafe435fb9ad4542d5e3bb1dfb08f202adf4
 DIST libiscsi-1.19.0.tar.gz 284969 BLAKE2B 4e5dc37ba3393076dfc0ed8df0cf969771b16deeeffaf0b65741d1466103bf32b45c22566a6ccb43a5f8740a7681b78f8374ef041a96a59ac1b67ee7fc781cf3 SHA512 2c0e70b7ecf66204524e57edf557a014b5141a8819e5d663b6e50cb2e756fd634ae1db0b1ca6915444d80a9babd54a82619bdd98726d16d4eeaf7b3c89cf3d53
 EBUILD libiscsi-1.18.0.ebuild 908 BLAKE2B 4ca51f1f01cb18445990e05ad606eee71638d82adffc2d2d02b098241575f27e293388e06af4b770171a82021c5f3d6c2232bf507cd7696369523c10f8231f5f SHA512 0592599af1fe5116abcd26ed6835a080b9514def998ffcc1829922c5d32c41d0ca71adf7cb609304e62644426aa679906004621c1cd08e1d0b9e6ea064e604be
-EBUILD libiscsi-1.19.0-r1.ebuild 1175 BLAKE2B 08f99506cf67dfe3c7c026d98b7e9e48906771c3f474bec81a9eacba802cda4a7ebae138d81d34ac8f51c2fc1663a019472d8f45df27cdea40ea2663cbf066dc SHA512 80b29d136343f74816f6eb12d6cbc33b21f40b70be739e47bf66ea3d3c703ccfa69dc951d6ecf2ec0ea0290b47e86dd88a4edb3d884abbc58b8615ee36d87b33
+EBUILD libiscsi-1.19.0-r1.ebuild 1182 BLAKE2B cbe5147d6998e50f964de941a939c92b2d8443a78fc28ec7786a8b8a6a17f6d28b021110651101206534234e172770a9b7b4f5536a3920a33ebae3af03d7669b SHA512 01d636dab2be6e16d13b08945617dc29d391eac08524f9d0f535729c6adb8d85d321a3268b122c99096e9c5b3e61ee120e6907bc1c94a5f340d14381d6eaa21e
 EBUILD libiscsi-1.19.0.ebuild 1077 BLAKE2B 3c55ef59df3254c562ea0b6bf0d11e611aa2092e25b494e24a6bd522b006d2cd4621a87a94f13f14671861f5769533bb895ac15bdea895478e96f74cb079ccc0 SHA512 fad483abeaab71df65361c86cd51246daa687d455979e87b63bc83713d50bf26d6014e4144e2a03c9098ecf38c428f3d7448f12ffa240e439cdc9f9518f96186
 EBUILD libiscsi-9999.ebuild 780 BLAKE2B 97579ffe527177fd41fad0f9180e1ab5260cb1f258df2253f9e17a090c307225d44ca94e08a26bc69f8a5399fa2767a0257fd0067f36fb40deb3802dc8d8fa9f SHA512 883a138a8b4cbcde371d14c327ae103832cfd67a06bf90769519279b4873395ab48aaacf64273d59a636ea6d0f1d9cae6f56964760ba376c8df5869b470b4221
 MISC metadata.xml 352 BLAKE2B 675cfb96cc8e0a8f244a926ffc2e151f648722df008cfd9b50dba836996c264c116838ba51c90c85bc29c7797c0ba1d7971019ff99de86c6f1292beb17299055 SHA512 902862649e210c3de4e27552df8daee7278a0b27785d4669345922c3b4e9c26078157bfd8f2ec9a883c83f24dcd8502e8258c4532af747f42c24bffb690e7552
diff --git a/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
index b44971289d2f..62962ce3a2c4 100644
--- a/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
+++ b/net-libs/libiscsi/libiscsi-1.19.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-remove-ld-iscsi.patch.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="iscsi client library and utilities"
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index bc7b9d181b9f..e0b59475f943 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -3,8 +3,10 @@ DIST libmicrohttpd-0.9.68.tar.gz 1884342 BLAKE2B 3f74c48917fa19753a617242fa07b99
 DIST libmicrohttpd-0.9.72.tar.gz 1693553 BLAKE2B 24d9284d8cab65d4a5b6b7f3a5b860dfd8cf69b21e44ee05ae2f7561b766a72d2dbb7f57849a31c22454e211befa74e058f78814b79e7876b3d14c7252ab5800 SHA512 9695e2fb08785e4b60342226ef3a0af22da4d80f127e7db9ec80ce844f70d0d781b30af207d58d8eb691b85a5fe4691cb9ecf887ca86f5e059a05259ae041316
 DIST libmicrohttpd-0.9.73.tar.gz 1738675 BLAKE2B 63845b1b7fa0aa8ce29e9917521e10bd59fa0d27658e87ef3273d5014adf5cd9514a2d84465a573df03b44dcd50da7d157ef9c4952107ebba49efdfb398476c2 SHA512 473996b087ac6734ab577a1c7681c6c0b0136e04e34e13c3b50fd758358c1516017ad79097e0c57792786f6dd0208834374c09238113efed13bb4be11ef649d3
 DIST libmicrohttpd-0.9.74.tar.gz 1962057 BLAKE2B 6751696740e2893b6ad1ecf5f6e6716dc4b053f788ca1c9c76a25051437942cd975dc0ee428a65af58da04f4cca41c4ed79cdd335b3f90d1dd52651185ee42dc SHA512 86e8b88e064f17557455617975888993a285f4de6d4051cb837ef3e7328d3718001ef280473d306724dd85a01e1787fca099d4bd18e5d78b766e41a3a9f126ef
+DIST libmicrohttpd-0.9.75.tar.gz 1952076 BLAKE2B 419d7b7113edbcc54eec3e3b6da92d040e15b451bde4e1372b368fdd87277c85daddc295bc71d25bf02135921a8716876e9536c9dee286fa29b66bfb8167ebd2 SHA512 4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c
 EBUILD libmicrohttpd-0.9.68-r1.ebuild 1256 BLAKE2B 859ca10c35695d9ca39109aef4966d029dc6f0f5c307453db26070fc57ab6d7d6a4d9ba16fa09bf5a80aa299b9a1698a0481b940d4b2f4e01aa0e22165f9468c SHA512 504463d6caf3edc4a594356fd7092cbe800da452c8d21fffd29d159a58f048b1f82581d189bcd80373e782de282ee7154fd83945dcd207cffad1aaf4b308e6d7
 EBUILD libmicrohttpd-0.9.72.ebuild 1292 BLAKE2B a4afc0c39b260ca28eefa81f54661d2ecfc77711aa318a1d3d99603a5fdba2364ad1917623e97cc32d052205cd62fa2243a17cdac192f0f3b17d28e16e8c7108 SHA512 d48f9b68ed4f2b9fd9a8e2104e844c365e2dc7de5abd638f62b6ba5966d17bb2077dfa338a49ccd201ddcd491a8b27c8b7420b700ecf3ecb4637d6b8234e75de
 EBUILD libmicrohttpd-0.9.73.ebuild 1419 BLAKE2B 8933009f87e45ab7c778bc047b62ef0112956db9d6e2f99d56491af39bbf1924a8bc2a8ff3555f22335b0aa04de1ae43ada3c8b1f69a1cfe4f314e3c74bd5fb0 SHA512 db5a749c1d20501bf6afc7a5093fb0b62d5b72f3c769779c0ba6a79a3fcc24a2404b68f89873c09db78385fb8ab8230b627cce3fc82ba7a3df4622d388def1ad
 EBUILD libmicrohttpd-0.9.74.ebuild 1379 BLAKE2B f54904a66857481886254efc322a6968c73a494153dbef04a143eb45d62b1a15127e7c93dd93fff0c0e8344f6b0f72922cb6766220256ccab30b63afa7d3c82d SHA512 e6a89377911a7e98439c146b74f3231da1197d902a730044ff9814b086aec02c7d8f349b5723d03d453e3d24ec67b01a062c2bc570f1ba883759ac9777b049be
+EBUILD libmicrohttpd-0.9.75.ebuild 1379 BLAKE2B f54904a66857481886254efc322a6968c73a494153dbef04a143eb45d62b1a15127e7c93dd93fff0c0e8344f6b0f72922cb6766220256ccab30b63afa7d3c82d SHA512 e6a89377911a7e98439c146b74f3231da1197d902a730044ff9814b086aec02c7d8f349b5723d03d453e3d24ec67b01a062c2bc570f1ba883759ac9777b049be
 MISC metadata.xml 632 BLAKE2B 1944894dc81e31fc69c406a905d6f2670c62d55938b53da47d98ba4b64795226230671c0ca7188653807def9b182191c817a7cbf5cdcbb07ef2c42fb68e61ab3 SHA512 43ebbf10601c286197dda1f2361f80fc2c2a9525dfbfcfd5870810dc7428143fde1fd9966097a64c2ee1ae792deca17864efdb4cb5a57e57e94cc86dda9cb318
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
new file mode 100644
index 000000000000..0103838713fd
--- /dev/null
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit multilib-minimal
+
+MY_P="${P/_/}"
+
+DESCRIPTION="Small C library to run an HTTP server as part of another application"
+HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-2.1+"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+epoll ssl static-libs test +thread-names"
+RESTRICT="!test? ( test )"
+
+RDEPEND="ssl? ( >net-libs/gnutls-2.12.20:= )"
+# libcurl and the curl binary are used during tests on CHOST
+DEPEND="${RDEPEND}
+	test? ( net-misc/curl[ssl?] )"
+BDEPEND="ssl? ( virtual/pkgconfig )"
+
+DOCS=( AUTHORS NEWS COPYING README ChangeLog )
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		--disable-nls \
+		--enable-bauth \
+		--enable-dauth \
+		--disable-examples \
+		--enable-messages \
+		--enable-postprocessor \
+		--enable-httpupgrade \
+		--disable-experimental \
+		--disable-heavy-tests \
+		$(use_enable thread-names) \
+		$(use_enable epoll) \
+		$(use_enable test curl) \
+		$(use_enable ssl https) \
+		$(use_with ssl gnutls)
+}
+
+multilib_src_install_all() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/net-libs/libmrss/Manifest b/net-libs/libmrss/Manifest
index 8d98de3c25dd..1cf16261ca9a 100644
--- a/net-libs/libmrss/Manifest
+++ b/net-libs/libmrss/Manifest
@@ -1,3 +1,3 @@
 DIST libmrss-0.19.2.tar.gz 375238 BLAKE2B e01682d9223d3f2cea444b5e6b5e9b6e476782ef0ae1c4a85d5ea8e8e5383d5317f2d35eff93347e6b5fde0778060c212b8e489915f50b20f098f7e94805e148 SHA512 0997ced472b767174977b7623484c57bfd0b901a9650cb7f7738ad7393153752ebfc1f717e2eacfb5f7eb319140599128d73de7e095327ee089cd1f85ab42b24
-EBUILD libmrss-0.19.2-r1.ebuild 1175 BLAKE2B ae200825669be6f1c6c28750413fee98ccc2b785fd1629c016bde5dc11a4214b02dfd127538bf25daeaf8621131ed88e4725a6a34b973443d48818c82d3a4206 SHA512 8e3f9ce923069fb626da50b2d6c28762d93440011c928b4b892bef0b830324d54ea65f450c04a87b7cec4a8a73780fd55fc50f09023be9c9943bd6ba3a97d4b3
+EBUILD libmrss-0.19.2-r1.ebuild 1182 BLAKE2B 9795978e597580867d9372136ab06cf18ef77cc3fddf899a3f88723124f619bfbcc07104d70776a5e4295e3cf529863e071790f2b0deec5deda52cca55a597ab SHA512 c0747a1c5aa943a57a30b27abeeea7b3faeffb4c55204f790c7f580996a40e6bab0edfc1eec0ca8a3638ba172c4a29ba455536411deacd3e15af3ec895b2c06a
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
index c36887130680..094466ef4985 100644
--- a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
+++ b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
+KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/net-libs/libnxml/Manifest b/net-libs/libnxml/Manifest
index 2f44e83ef31a..e9c16f257d44 100644
--- a/net-libs/libnxml/Manifest
+++ b/net-libs/libnxml/Manifest
@@ -1,3 +1,3 @@
 DIST libnxml-0.18.3.tar.gz 361977 BLAKE2B babe5773f102889d52d0d63511984201e220205925b703221559cf73c8e380b78b3788ff48bdc2da382746bb95acf4c9a70c69d689c4fd7db3be4bd65f44000d SHA512 fc420a4b773eca68608ac1d509930a0528c3a41b53fc7cc340c09fd53f92a88afb4091e810d97d59e73a8beeaaeed52dd3c880273ef512a5305800b3ef46717a
-EBUILD libnxml-0.18.3-r1.ebuild 1109 BLAKE2B a0a741c24696d147b1d885a8e055e2654417a0be3df6c8ad4adf6b3ffb4a67bd67c3b37d4d6ff0933eeb8719a4b674a363e3939b2f449ac104863257125c27e3 SHA512 4d971f8e8a06fc4b5e48b2b15a7bea359eec459ccda47634ac4aee453e8fb11e176fad699e6ba5f3a5ad3532f480e8a25dee60fb4d8edfa078b09269f248d971
+EBUILD libnxml-0.18.3-r1.ebuild 1116 BLAKE2B ac5477bfc79ef62ef3b491439ee0c094f118de90002e81f6d3aa24d2d0349ad76fce1419935d13eda45f85f3cf92c933559f3e1551117aee4f2455125c834578 SHA512 d38c1bd4ead63c0b5afd96d3b90a9f3983a6e5902aa7138e13ee03717e606f79bf035f483f4c59df259f4bf382228d459f2970ec72ca9c74fc18573c9a12190b
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
index 0d411264df2f..9a1d82c9061e 100644
--- a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
+++ b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 ~sparc x86"
 IUSE="doc examples"
 
 RDEPEND="net-misc/curl"
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 8a68a021b8be..612535075e71 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,11 +1,8 @@
 AUX libpcap-1.10.0-usbmon.patch 620 BLAKE2B 463f446051bd6df5afd679ee95c13792ab4ce1962cd8cd1de7acfc1c40c887741ee0a8a5725566781833711e4c8286942ba6e0fb2ee262e2177df82f2175942d SHA512 77fc6eb400bbf265ed1290bead8c317bdcdbeaf5a73aacfd95c3a1e77dfe8d5a33dfe49043462051552e3550273219b10939fc2cf4eda7298317c7b4490428ea
 AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174191e13d28658e380baa2d48f828736a0ff176de4b5fdaa7c0bf42c36509dfffd0c6d49cec45669d03201fad8efaf90c75 SHA512 57f51c1f2fc093bacf43a96c7156e82946a3f11025b3afe3c24c2704fb4a9a7750e0526d41a17d52d649f55b44d642d5daa3a76f0ae18aaca582591f20acd1c1
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
-DIST libpcap-1.10.0-upstream.tar.gz 934559 BLAKE2B 54e809af242b18d600b88f29bbe31b01784b5160366242f313908b58dfb1e6ee2ceae8d359f730881e15c1b26ed90c553869dffb25a74eb3cea9f597dd490b1d SHA512 007710386ff3435ef97fc99293076eae3c39b424e986141184c712b0285f8589357a1b25085f7eba28730de04312042c724d193934a399797e95a56f5301da7f
-DIST libpcap-1.10.0-upstream.tar.gz.sig 442 BLAKE2B f19ca45bbeee39ef1b3f8a8e8d8d9f24ad43e503430a3fa969a8ce668cb7926e1d19adb7e7cf11fff9dafa09b04507052ccc98f7b2a81f053ff01ec6c7ec8f87 SHA512 8a13aef00120080793da800f038d13124d412dfcfae6c0a952bcab544b50c8b69f6a672438bbe5bcdbfeda2e0d541bccefefbfc69f94e1635c0e9eaf77f19902
 DIST libpcap-1.10.1-upstream.tar.gz 935221 BLAKE2B 0ec028e5d026a97b92ba6f23f88daf36b827eee08a752a0162fbabd1b5a2a70141ec403b6ff26dc3eb25ca5c6630c9c2f60f05b33161770da3d5e829c4eecdc6 SHA512 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171
 DIST libpcap-1.10.1-upstream.tar.gz.sig 442 BLAKE2B b76bf3c40a923b6c8fb9a356dff49a90e30dd0b0d785f138ac56bf1a41ad3a6fcfa3d5b3d28c12543857c5616b8938108b06313e35e4474d50991b72d9d371c8 SHA512 f9807efd11d99524b247981e5f4f02e1ffbeaa8468a9a22c66f9931a894071b9182164807b9fd11436883d36e8b0c6cc62302852005d958e34b5236e20caa33d
-EBUILD libpcap-1.10.0-r1.ebuild 2475 BLAKE2B 0f136a18dc356e53d1b17435d01ff9ea5b1195f1ef702c7055223442eb6238a2ee74a1717ad3ba8109c177b1bd76405c5d2f14a2579a867ea10baa623c3fb5fe SHA512 a3ff18fbc94ff96f79ee9cd1ad1e632b7c08fd340aba27396bf808511b141fcc97992624cb17dd5453772da5695a4027cbc2a10c9a1c4029d68ae6fee2fb17e6
 EBUILD libpcap-1.10.1-r1.ebuild 2480 BLAKE2B f02720edb102c10c14ea0267191c8d92c56ac2428acde0f36ec5dd74853eaeef342a1e80029559f080c99c1565fe8c9c6e6446ca5498970e367b9e4db3862a64 SHA512 10ecad877e7614f4a4193c58df6a7321b25686e8bce6054c453235ca19c3b07dc9e8e08d89f8a77477e79f0861d6e0468c973ca6ca9c30762f764b675510d756
 EBUILD libpcap-9999.ebuild 2366 BLAKE2B b5a13e590e29a2b965f43990f374aaf6add4986c1917d96b0bfde753e72dc4f821ba67503aed0a5fac0ed9aab4d297a0da253d831efb78896f3e4d24bc3551ca SHA512 e3b39860c6110547c945b29cb65be4d51dfb2598edd9e776fb02f9a588056e6f1ac5bc3c00bfcef5f471b8af5f9e6a8e5ca713ca4a0006e21316ab29bbd6dc89
 MISC metadata.xml 919 BLAKE2B 0d4146081122df26ec1c9ae4f7c66e9f93ef4c25458e0de3489de29bf69a6d428123ab84f4c2fbd0582525ea2197c5cbfc9e2b591459e43eb0e159cf6a684dcc SHA512 0bfdfd1ad64faebc2c122ac029ce5d7b30e84e630ceafd0503f9a659b1781f1c41bf6f0c431ab4f80187ec04506cd32ffc10485d9493cf93e63a466c5db69619
diff --git a/net-libs/libpcap/libpcap-1.10.0-r1.ebuild b/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
deleted file mode 100644
index 33b6906a9c48..000000000000
--- a/net-libs/libpcap/libpcap-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
-	inherit verify-sig
-
-	# Note: drop -upstream on bump, this is just because we switched to the official
-	# distfiles for verify-sig
-	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
-	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-	remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
-	rdma? ( sys-cluster/rdma-core )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	dbus? ( virtual/pkgconfig )
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
-	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
-)
-
-src_prepare() {
-	default
-
-	if ! [[ -f VERSION ]]; then
-		echo ${PV} > VERSION || die
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable dbus) \
-		$(use_enable rdma) \
-		$(use_enable remote) \
-		$(use_enable usb) \
-		$(use_enable yydebug) \
-		$(use_with netlink libnl) \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h portability.h
-	fi
-}
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index 32f8b7a25751..1696121b4bdb 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1,3 +1,3 @@
 DIST libslirp-4.6.1.tar.gz 135569 BLAKE2B 7a890912f2a8ce9d6820870e2d29b9c7a2253c403c2bcb127a38e02b2b81d1e262f34571c8a4c05fbf46874b9b2967cb5597cabe169ad54f12702fdd8b90bb3c SHA512 04a9dd88cd58c849a24b9cff405d951952760d99ea2bef0b070463dff088d79f44557a13c9427ba0043f58d4b9e06b68ff64a4f23a7b0d66df594e32e1521cae
-EBUILD libslirp-4.6.1.ebuild 818 BLAKE2B 66dc681fe6639558ed0b6d5f452819d521013109e5b581ec7f2f547c9357a7904d84d88d605b1245c54d6e909691a04df13939b42ef71e6117d0c29143487485 SHA512 034dfd20907fd88bf11c144eccb55e41f3245057155b559f1257b48aa5c2912f8e535aa1ccaaf63c499086a0f08c31e660adf2e64dde0aebfcf81f1ebeed5d0d
+EBUILD libslirp-4.6.1.ebuild 824 BLAKE2B 1fce5d68f372bfa50e835f52b7e3c0516967fce91b9c62c7ff1b1bf6e47f67265fedfd382e24669d816caa9f7b475da857573191446886111530d9098ed49a98 SHA512 b0d0a5d49da1d10c83d4783fbf03e3151405089bca9af904dd0568fdb0968189eb655a05c2737fbc80f577ab828985179f5a90827565f14434d8e9d755dce8da
 MISC metadata.xml 347 BLAKE2B 5437bd93b104cc9c49978c86236b2068a8f0bf0e4639f0a022c96b9a7a9db9d3ad338ed753b89381bb94b72c59a67aadcd7bc94f8dd0a9cc752b550384b165bc SHA512 7dace6c54156cf3d129452917ff3e73b86737ec71aade2e201008050978613179afaa3030ccc97a1619d431bc5c26a233a0036c1322e3108556feeada84cd380
diff --git a/net-libs/libslirp/libslirp-4.6.1.ebuild b/net-libs/libslirp/libslirp-4.6.1.ebuild
index 66229c715845..dbfe15353d26 100644
--- a/net-libs/libslirp/libslirp-4.6.1.ebuild
+++ b/net-libs/libslirp/libslirp-4.6.1.ebuild
@@ -5,10 +5,10 @@ EAPI=7
 
 inherit meson
 
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 ~riscv x86"
 MY_P="${PN}-v${PV}"
 SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A TCP-IP emulator used to provide virtual networking services."
+DESCRIPTION="A TCP-IP emulator used to provide virtual networking services"
 HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp"
 
 LICENSE="BSD"
diff --git a/net-libs/libzapojit/Manifest b/net-libs/libzapojit/Manifest
index 1e9489927ba6..98f625535ffd 100644
--- a/net-libs/libzapojit/Manifest
+++ b/net-libs/libzapojit/Manifest
@@ -1,3 +1,3 @@
 DIST libzapojit-0.0.3.tar.xz 272108 BLAKE2B 7bd606b01cb9b92c844a35d4229e52347c5193033c4fe483eb2fcf5bf76c9773cc26741d7eed8d52c1352767c65055088335ffb0779d390988292956b367584f SHA512 8dc1006db515a4b2971ebccdcf167930566a11bfe74f545e3a9647ff061be4ac2781faf1adbf6e6107b4ff2e08f16b9ad1f96f9b8e4f0eba87601fdc1c35eaa3
-EBUILD libzapojit-0.0.3.ebuild 827 BLAKE2B 63fb455821a323ec9a9364fbac10930bfb49271179f95bff41d2aaeff947912faca1b2264a3700f0f413462ec29e70e8e32ad77cc707736abc2f9f786aa88d6e SHA512 16b48dccbbc623d6f7e7ead7521555e3b23b68ed16a5d42f629fd9a452c05dadd0d8276b5546bdac6369c7797972accf37a2fb0d9fff7160347b33731461fa2d
+EBUILD libzapojit-0.0.3.ebuild 834 BLAKE2B 535a0a1bf613f5a3daa98f75bab0a3100e42620010f1ecc631bd4e530451a061424d850586d336d710ebbf18f054fa6b77642214a8f1a6ef89b92ede5c8cf0de SHA512 146f22bd66efb1ba69bb3ce3a9afb3d13886c7600064f70ed73ea655d4e34a6c74757ff5ccd51539c7b74464e2734414231774cb7e80e16cd404e117cf74c8c8
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libzapojit/libzapojit-0.0.3.ebuild b/net-libs/libzapojit/libzapojit-0.0.3.ebuild
index c5f25a502ef2..d10dc3b24c72 100644
--- a/net-libs/libzapojit/libzapojit-0.0.3.ebuild
+++ b/net-libs/libzapojit/libzapojit-0.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libzapojit"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 6ed7357bd98f..9f98989a149a 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,11 +1,9 @@
-DIST mbedtls-2.16.11.tar.gz 2692209 BLAKE2B 9d7bccfc0d1bc5a038b6dcb866722a27362c229a5f1b515396aabbb53e77cfe36525446fb2557c817772810f24335a51c9a5c45bcfa866d8a07ff4e96498dbde SHA512 b35de49ce596b549b5e85b6affdf2cf1360fb8b0d4e551636a91a4923b1cb212dce7880d575d40c73d5682afe8bb893312d803798ce8f807842a2aab8e2ba2ee
 DIST mbedtls-2.16.12.tar.gz 2702190 BLAKE2B 3cbe0bcfd0eca279d9b4b3816416b8e778f0aa38d368d810701e65140f0d1524afabe4fd1a1a65297f872a7dfafb7d2feeb7382fe8ea2b180f24551ceac53c26 SHA512 40c4487cc40afcf929bc7158d735a869ebada41c811f63a10d74e9b9644960e2a0aeb7c7c9841c0aef815425990847d47e7f42f9bafe0b2a959e769e3d74ebe9
 DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994
 DIST mbedtls-2.28.0.tar.gz 3712239 BLAKE2B 1141465bc5b73e7fd94bbd02c79290093fd075626be93aea839a54ebff81fb00917f0a4fe7911fee983a36147fa4922d258714a330b40b0da4764a3b2419df8b SHA512 2ddc161caeebe8bf1e8cf23c398f65ceff699eb6487a7bcaf6a665879aac5458e21e26b06370085cbdae6ce6b5394afece656aa6307bbb3f5b701bcb41f3dd64
 DIST mbedtls-3.1.0.tar.gz 3766628 BLAKE2B a52e8fb9a3b88c1cf7cb0c8f5598f90a1c9ca05dbc399432293c3acb77aaf0a1b92a9792bda986b47e925736b21c83de1c891b21d45fd2dc8cb5d7d1b09168e7 SHA512 c374fafad89f8793ed1a302634a403b855317d9759377d4bade13c61857d0317a2fc144ab3a9aaee52901ff7a3c4b4b0e7e81ebe5510ab4d228103def01ae628
-EBUILD mbedtls-2.16.11.ebuild 2591 BLAKE2B 13fcba2f6e4b3397df3629dd1f302de9730eacaa78f850a527ef4ddd4f6daebfbc01d8b8203b5453da0e820b5b584210197ef89de685e211105f27c04b7e09f6 SHA512 7de94d90b5f9dc757a3570e60cc2971c58f555d1e230ad0767b8c5bc525e6b0723757371756109038078d32114ceae2f7b69eda94c85388a972301e5b2096276
-EBUILD mbedtls-2.16.12.ebuild 2591 BLAKE2B 13fcba2f6e4b3397df3629dd1f302de9730eacaa78f850a527ef4ddd4f6daebfbc01d8b8203b5453da0e820b5b584210197ef89de685e211105f27c04b7e09f6 SHA512 7de94d90b5f9dc757a3570e60cc2971c58f555d1e230ad0767b8c5bc525e6b0723757371756109038078d32114ceae2f7b69eda94c85388a972301e5b2096276
-EBUILD mbedtls-2.27.0-r1.ebuild 2658 BLAKE2B 0f8abad89ee22296b4493419f537ed484065ade24d014061d90c304644286692d1f774149de8c62a7e3634caa4d9060a38d147a808f1a4d0c674d2f5085f513e SHA512 637c754102dc34304984c7c9909089b788fc967a8ea44821e9941de34650e166292c7776964bf2a74e174645389ef87976c111852d0f2346a31c1f5e6a825832
-EBUILD mbedtls-2.28.0-r1.ebuild 2658 BLAKE2B 6b6884824dc6769bb13f11e96010b8c0cfdeb6cc8d27c85ef279ee67fdcb46c1a8e4efe704c2e741c3929c5846ac7e6cf8fa0126b29741489c32d0c2183466fa SHA512 56b6db67615465aff8494634d76cb116518da3847370e5b077ceab2d67078421f49ec95d3fb78051eb8e58ecca9837bcc374defc0d4754e940f3afbb8c88a8bb
+EBUILD mbedtls-2.16.12.ebuild 2646 BLAKE2B d3ec300834294fa08d45e57f47f970f3c69b903ceea0b83a9a65ad19ae79570f94876583c39e1a88269f6a08c768524c1c4a1261bffc77ad46189f4d4152b81c SHA512 07c7991767aaee6d291ae6dc313eb49d9344aca3b9cd9aa76cd5110d3a71f394074cb6f83b6e785c2eedaf5f63d4a491280a4a9533a678a62627202c5293cabb
+EBUILD mbedtls-2.27.0-r1.ebuild 2713 BLAKE2B 04a6a635d0cea7ca5ee974c7e3203519b06a39709db2813962d251eb1f3ea2679ac127e5d6358b0ebd05fe70473a64b7670476298195e5070c96ebe77cb36d52 SHA512 3cbd1b1e297ede691c62a283442267141491c59d6b57d65ee2312dee399f6d55c954317586e0245e2ae8622d50890098f91e2cf3fce78256c72fed49a7a7282e
+EBUILD mbedtls-2.28.0-r1.ebuild 2713 BLAKE2B 688b43d616de8eaeaa432ad433ff0276c54dcfb86f1b27ac5e2a33a3a5d6b1ee8ba11aee3b5585ddf11bc07740e85e725dce7246b5a4fe5db89a9c7c2ba38729 SHA512 d00846dc9d6d391f12728d6c6b92a29fbc9a118c4c4ec2380260ea2970eddd185d148946709a20e9809c26c9c54ef19b66353c2a4f60c999a009518a51728c63
 EBUILD mbedtls-3.1.0.ebuild 2416 BLAKE2B 1f10d91faee5f4d8db8a3dd82da4308e156a280ffd1860764726189212cda26f5d4c8f71abf2de81002c16b5335f39ba5a08605c9eb023668cb25b7b6bb6add1 SHA512 95baf23bb04e80b76c4a394d30712a28dd7575b68aa84730b9293733492dc463b6b3533c620608551828d3c48c39a2b7eccf7832ac4e59afffb06b0b550285fa
-MISC metadata.xml 750 BLAKE2B 9adfb9c0b5ce5ac9b3a56878b7d0d4b0dc883c911b92b00ed772242293b7181b0a43760341ad01d897c2022f507b193145220a8a1c16f0fce8fc64e08486e8a1 SHA512 66092068631e2812b1c3bca713d43ef502ee29a22532a12b204d47f86b3dddc2182c4c41b15200e89ee24f25c976508b602492e9cce02c88dbbb9f35e7aa54a2
+MISC metadata.xml 847 BLAKE2B a79da594cc8f9491335ebef15bdbf2255e1d02780d3434779f51ccb8dcc319c350205dd6eee75143e50c79c987c50045db374442425a2cf582faf1e5c0ad8b92 SHA512 574394f0955d67f13524a5ea411249dd63e6b313f144e0f6b2e2b44bb0d6d311e93fd44a386174dc8f2f4960105e396b74f60e7c2fd1dea3ac3b493a862820a4
diff --git a/net-libs/mbedtls/mbedtls-2.16.11.ebuild b/net-libs/mbedtls/mbedtls-2.16.11.ebuild
deleted file mode 100644
index 8ddca1907c00..000000000000
--- a/net-libs/mbedtls/mbedtls-2.16.11.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		dev-libs/openssl:0=
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	# psa isn't ready yet, it might be in 3.x(?) but certainly not
-	# at the moment.
-	# bug #718390
-	local myctestargs=(
-		-E "(psa_crypto|psa_its-suite)"
-	)
-
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/mbedtls/mbedtls-2.16.12.ebuild b/net-libs/mbedtls/mbedtls-2.16.12.ebuild
index 8ddca1907c00..0ad3fec46cf1 100644
--- a/net-libs/mbedtls/mbedtls-2.16.12.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.12.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P}
 LICENSE="Apache-2.0"
 SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
+IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,6 +34,7 @@ enable_mbedtls_option() {
 }
 
 src_prepare() {
+	use cmac && enable_mbedtls_option MBEDTLS_CMAC_C
 	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
 	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
 	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
diff --git a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
index fc18e8b6b047..7436d6b627e9 100644
--- a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P}
 LICENSE="Apache-2.0"
 SLOT="0/7.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
+IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,6 +34,7 @@ enable_mbedtls_option() {
 }
 
 src_prepare() {
+	use cmac && enable_mbedtls_option MBEDTLS_CMAC_C
 	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
 	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
 	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
diff --git a/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild
index ef9cb32d329a..545749431ca9 100644
--- a/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.28.0-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P}
 LICENSE="Apache-2.0"
 SLOT="0/7.14.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
+IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -34,6 +34,7 @@ enable_mbedtls_option() {
 }
 
 src_prepare() {
+	use cmac && enable_mbedtls_option MBEDTLS_CMAC_C
 	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
 	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
 	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
diff --git a/net-libs/mbedtls/metadata.xml b/net-libs/mbedtls/metadata.xml
index abf57a31dfbf..a39a95180bc6 100644
--- a/net-libs/mbedtls/metadata.xml
+++ b/net-libs/mbedtls/metadata.xml
@@ -10,6 +10,9 @@
 		cryptographic library written in C and targeted at embedded systems.
 	</longdescription>
 	<use>
+		<flag name="cmac">Enable block cipher-based message authentication
+			code algorithm
+		</flag>
 		<flag name="havege">Enable the HAVEGE random generator.
 			Warning: the HAVEGE random generator is not suitable for
 			virtualized environments
diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest
index 7f6905b5e16a..1a41f9536c7b 100644
--- a/net-libs/nDPI/Manifest
+++ b/net-libs/nDPI/Manifest
@@ -1,6 +1,9 @@
 AUX nDPI-3.4-configure-fail-libcap.patch 911 BLAKE2B 6f376334d7c53a2a6c6a0e5babea2c6e2c1c744159b9113e5346e4fd312e42487655f728ca838d32e26a681287b795f0f9236fc70db9f626dbf1526e4c654bcf SHA512 638a1c0a791459f8cdcbdcc71ff16eee8ca43a1d1fd4346b61f30b127b5bd5047f7bf86c87c23784001588b029e35a633bd73423066839bffac754162a86f4bd
 AUX nDPI-3.4-fix-oob-in-kerberos-dissector.patch 882 BLAKE2B 189f3bbd5b209d7b7ea8d1febd06901dea20acc7153fc8ece674f7f67c2217e946ae519af77b9553e8938f7bd90e7c56e1c68849c78726f828d0fec9cbf80f86 SHA512 1aa8201959872163cc4864745149700982ef0188e4a341b0a33e9eb0b1afdf5d9dc244fad070b32ceb0fce7b9dc42622cd4e7a327a42ff24e10ce0211d3da984
 DIST nDPI-3.4.tar.gz 37976087 BLAKE2B 49e25586671a91278d90775c3dbc881ce4ca9ae4afd3108b1caff3b0d38251808bcd52ead253f451474195994fbf94658f70241acedb23c35a475df3b15c4a20 SHA512 ed5a22b6ddc14ad707a18a0bd96746c1df489969faaa42016fa9aad8d414fc4ee303b96cac15c3ba86f484a80a0aaa2dd1be5f92be672912e0e0d30da4bdad4c
+DIST nDPI-4.0-patches.tar.bz2 8744 BLAKE2B 48bfb2cf240823b64ab15a3f8a21acece878102ebb4cc807648b264ef091107a05d66fc672cccd1bc721ad3ea0edde786a1f133dfc84c91422604a9929e327ed SHA512 99a780c18c048ceec29c42828c420fe3f9624906eaef70f92af6abdbf7bc29133e048d7f8de85d8b73aa6667066e7ab5843fa293221d5ec8bbe87803dde83db6
+DIST nDPI-4.0.tar.gz 120053617 BLAKE2B ea0f333bd62622c1ab792137f9bbf2e35cb3790aae191c5caeaea36c7ce376bfa84633e99e321c16bcfbe5812d6674b825bdc4197297cee76064ed88f344a577 SHA512 2526041bc02a210e65bad31323a66167d79a37d14697cf4459054cc54715e53f9673b0000cefa6b452bbe3b3e6c25f0bafcf59d24323d210e2ce6782d9153f81
 EBUILD nDPI-3.4.ebuild 1542 BLAKE2B c33be0c27e0521e4b75b10a0fd49b8f208120fff45653c9f9da4f8320c7d31b25df5374e33fb8517551bdda081029eb14e5db2278fdaa1c6ab28ed45e13ce9de SHA512 e3825dab00f2e399df07f6753f2e53900d5caaf9f41da325f30ee4c2ed7669f08278b2b96e12c06fad6057eae4587c909de3222b50982f63afb26cec7e206e11
-EBUILD nDPI-9999.ebuild 1285 BLAKE2B 7f9f9faabe4713bf484bdbb0b91ff2f78831f74943627c67a550241cf7f120a65b12bd18c89fbbfb1bc052b613ef6c96d5bdafd2ecde3d5803c21b4b9edaa237 SHA512 796059fe7321238a0b5aafa7db7b439c4bd1b8f4b7c0a3d865a453a1ecbdf2a7d535fc88ff0b6eab1cda6a0758221fe9da71cc9e2cd14e889f14cf3eb41fa89b
+EBUILD nDPI-4.0.ebuild 1212 BLAKE2B 741348a3f3852cadfbc33fb41c3470a95968171ef9afa7ab9eb7edbe941eb4519f95fa574ec04b2fa635f40f2a5c7d128c2fe238cb3bdc53d1bc228cef567e1e SHA512 0dd616a001a4bd28eb5dd48823f59c974ea5d72dcfd3d4b0f2e6132d497477d2b57518295bff5c362b7ee8d03338605ac22cad8fe739871b415c9a239e422560
+EBUILD nDPI-9999.ebuild 1081 BLAKE2B 13d97c80b4ef0d209d96ddeb72a02d7fe89c4822cb33de424135e96ca13380ffc7f09c11b34dff83200550399736280133193a1861a9efcfd57dad9fc074d23f SHA512 71b5f86c2ee6eb43a9b8d5cb6ed3960238887b763a32c12f66b8adf8a8704abc08c46e1b966521e31db1706bad2e38f4c60273da2f100b25fa8cf1f90a85bd2e
 MISC metadata.xml 293 BLAKE2B 9a139bc75f89728980d35a12c076b25ba8d0f95a6ec0815646588d8f602f2cf6b19c5fbcf6d4eef08b9b7967197e34c7f337b55aa052ccd30ac1cb6d30ef3357 SHA512 32b7db90abc45b9550430d5696f292e16cc467243c289d721b92f1fbec771bbccad095a46de98997fbb16f916f85c801a1139ea90d10d48cb89c2285a7d10d63
diff --git a/net-libs/nDPI/nDPI-4.0.ebuild b/net-libs/nDPI/nDPI-4.0.ebuild
new file mode 100644
index 000000000000..8516413b47eb
--- /dev/null
+++ b/net-libs/nDPI/nDPI-4.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
+HOMEPAGE="https://www.ntop.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ntop/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.bz2"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+
+DEPEND="dev-libs/json-c:=
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-patches/
+)
+
+# Also sent a patch upstream https://github.com/ntop/nDPI/pull/1392 for
+# AR/CC etc but doesn't apply cleanly (at all) to 4.0.
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
+		src/lib/Makefile.in || die
+
+	eautoreconf
+}
+
+src_test() {
+	pushd tests || die
+
+	./do.sh || die "Failed tests"
+	./do-unit.sh || die "Failed unit tests"
+
+	popd || die
+}
+
+src_install() {
+	default
+
+	rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
+}
diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild
index bd4ac3459b84..ea288e57ec66 100644
--- a/net-libs/nDPI/nDPI-9999.ebuild
+++ b/net-libs/nDPI/nDPI-9999.ebuild
@@ -1,58 +1,54 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools git-r3
+inherit autotools
 
 DESCRIPTION="Open Source Deep Packet Inspection Software Toolkit"
 HOMEPAGE="https://www.ntop.org/"
-EGIT_REPO_URI="https://github.com/ntop/${PN}"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ntop/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="static-libs"
+	KEYWORDS="~amd64 ~x86"
+fi
 
-DEPEND="
-	dev-libs/json-c:=
-	net-libs/libpcap
-"
-RDEPEND="
-	${DEPEND}
-"
+LICENSE="LGPL-3+"
+SLOT="0/$(ver_cut 1)"
+
+DEPEND="dev-libs/json-c:=
+	dev-libs/libgcrypt:=
+	dev-libs/libgpg-error
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+# Also sent a patch upstream https://github.com/ntop/nDPI/pull/1392 for
+# AR/CC etc but doesn't apply cleanly (at all) to 4.0.
 
 src_prepare() {
-	eval $(grep '^NDPI_MAJOR=' autogen.sh)
-	eval $(grep '^NDPI_MINOR=' autogen.sh)
-	eval $(grep '^NDPI_PATCH=' autogen.sh)
-	NDPI_VERSION_SHORT="${NDPI_MAJOR}.${NDPI_MINOR}.${NDPI_PATCH}"
-
-	sed \
-		-e "s/@NDPI_MAJOR@/${NDPI_MAJOR}/g" \
-		-e "s/@NDPI_MINOR@/${NDPI_MINOR}/g" \
-		-e "s/@NDPI_PATCH@/${NDPI_PATCH}/g" \
-		-e "s/@NDPI_VERSION_SHORT@/${NDPI_VERSION_SHORT}/g" \
-		< "${S}/configure.seed" \
-		> "${S}/configure.ac" || die
+	default
 
 	sed -i \
 		-e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir     = \${prefix}/$(get_libdir)%" \
 		src/lib/Makefile.in || die
 
-	default
 	eautoreconf
+}
 
-	# Taken from autogen.sh (bug #704074):
-	sed -i \
-		-e "s/#define PACKAGE/#define NDPI_PACKAGE/g" \
-		-e "s/#define VERSION/#define NDPI_VERSION/g" \
-		configure || die
+src_test() {
+	pushd tests || die
+
+	./do.sh || die "Failed tests"
+	./do-unit.sh || die "Failed unit tests"
+
+	popd || die
 }
 
 src_install() {
 	default
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN,,}.a || die
-	fi
+
+	rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die
 }
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 48fa5924ac16..7a41a150b02b 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,9 +1,13 @@
 AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
 AUX 2.34.1-opengl-without-X-fixes.patch 953 BLAKE2B 06d9e12a9ccb37950e87c89031d1067c8cea5c9cc4b0f802386d32c4ca8499537c95af799b9f9e9c57008e65c38716b01cf0dfd012900ae32a36d813311b48f3 SHA512 854dcaef25ad6927a288bdfbf842dcec385954abff1af710c9e789cdf4e194a271561b2bd8a695d051f675a3c2219563d834461f19ceee10e2320f6ac2bb5284
+AUX 2.34.3-non-jumbo-fix.patch 1056 BLAKE2B 4d229c01fbfae518725bb802c0fd907a1dc8bd4edd41be2b48075471f31ec84b6f9bae1b97294f46a42ba77a081e3705be3ad49177de28791a495f19ddb4f51e SHA512 1ace5a3c1e775f258c67c59987a0c84ebc7cadd007cc0b79b282712b354cdaf9eb4dd6ef75b85b234ad3b16079ac8dbf2890921165854fc2da51f79cbd5f0e79
+AUX 2.34.3-opengl-without-X-fixes.patch 1436 BLAKE2B 231cdc9a428342d7fe98a1c1fb230b345f29b6a2d45da02cfa674dae1ceffbbcf5d62a77e903f690b59eb49ad7a3e50dffc190ea57bfa953f10fccfeb6dd4dfd SHA512 1af17f79d2a60cdd5337ca5a571787fb2cc1abc7d3f392b6640edc88856e2f8fc3e77625fdfd600d9ba9376a18ec379151d064d5f7ad1b2bfed0db2e0330e2ee
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
 DIST webkitgtk-2.34.1.tar.xz 24996620 BLAKE2B 645326467f3155ab15e15fa6431e2652b4957dcbcc28f43ddcfcf088aab205a34b0442e610d3493cd938067af0f335e7abc95eb2df36b45bc0aeec649c83eaa6 SHA512 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
 DIST webkitgtk-2.34.2.tar.xz 24996572 BLAKE2B eb89965065e39d6cc2b54a4a167a19fee50387a25a5285b5eb369b6f2a7af550bff5b476fc27d5e4348c40e2523b76c31116d9ce2f70578f38ce81b2379143af SHA512 37c40fb067ee9f5bb8786bf2ce92aac885e9c5c2da4bc5f4e81682ccfb5eeb0aa94d5094f6aa99a9af216f542d1823094cf27aea13c7be3e5e6e3f6a9729c7a5
+DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0 SHA512 f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc
 EBUILD webkit-gtk-2.32.4.ebuild 9133 BLAKE2B c7d7e364939545a9529cded1349892d28a215a128630d697d17cd8c906ee31bc1e626bc8251d50b8df28f4e8364fdb1776bc39345e8b8be3b9b26b6431c89509 SHA512 8933e6b923c347740ffe1c280ed42c9435ffdc399c0fc216bec09f3afafedbcc13150998102794738219f151353149e561dfe5f637f96026c3aa3961e0ae09a8
 EBUILD webkit-gtk-2.34.1-r1.ebuild 8983 BLAKE2B f19775f13378a0c8da5e6b2620b77b16c2417ac62a418e5b02c408aed99bd91137b72c64a271d50a14f67a2c1fb12091c58a5c5845dcdc2acb9e0586bc42e7be SHA512 0e15a5e88bb1798601293fee39b4d74bd5d74f36547683b8689ea83903f0014e696f1069f2b398b51206937adaad839cb30990044f42d46fb805e43ca6c541c6
 EBUILD webkit-gtk-2.34.2.ebuild 8983 BLAKE2B f19775f13378a0c8da5e6b2620b77b16c2417ac62a418e5b02c408aed99bd91137b72c64a271d50a14f67a2c1fb12091c58a5c5845dcdc2acb9e0586bc42e7be SHA512 0e15a5e88bb1798601293fee39b4d74bd5d74f36547683b8689ea83903f0014e696f1069f2b398b51206937adaad839cb30990044f42d46fb805e43ca6c541c6
+EBUILD webkit-gtk-2.34.3.ebuild 8268 BLAKE2B 727e2f8cceed5137ac668da87bf09b4b0a4f33443b3d0b0478279ee0a542d92f15d848840ba7d8527091957762166be6ad9b01d6e4c70284ad6e13b66b228fc2 SHA512 3f3f19f6ee99db72b8b7559b12d5230c3d0e1e2ddc07d3642caeafa2c7bb13550ea890714a91ff5f3463676b0794a7bf945212fe322f48c95b4085a02f674b54
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch
new file mode 100644
index 000000000000..74790d9f6cef
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch
@@ -0,0 +1,31 @@
+From f8efe9f2d128a897c0b2a054bf05200cb842d9b2 Mon Sep 17 00:00:00 2001
+From: "don.olmstead@sony.com"
+ <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Sun, 3 Oct 2021 23:00:17 +0000
+Subject: [PATCH] Non-unified build fixes, early October 2021 edition
+ https://bugs.webkit.org/show_bug.cgi?id=231143
+
+Unreviewed non-unified build fixes.
+---
+leio: Trimmed to what's relevant to webkitgtk-2.34 branch
+gyakovlev: removed TextTrackClient.h include addition
+
+ Source/WebCore/inspector/agents/InspectorCanvasAgent.h | 2 ++
+ 1 files changed, 2 insertions(+)
+
+diff --git a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h
+index 7f1012aa2a24..4c7c23995276 100644
+--- a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h
++++ b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h
+@@ -44,6 +44,8 @@ class InjectedScriptManager;
+ namespace WebCore {
+ 
+ class CanvasRenderingContext;
++class Frame;
++
+ #if ENABLE(WEBGL)
+ class InspectorShaderProgram;
+ class WebGLProgram;
+-- 
+2.32.0
+
diff --git a/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch b/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch
new file mode 100644
index 000000000000..5608500376ff
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.34.3-opengl-without-X-fixes.patch
@@ -0,0 +1,46 @@
+https://bugs.webkit.org/show_bug.cgi?id=208907
+
+From c67efa2bbe2094b40b4e104bb26497c2aff5ce68 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 9 May 2020 23:11:52 +0300
+Subject: [PATCH] Clean up OpenGLShims.h conditionals in a few places to fix
+ some build configurations
+
+---
+ Source/WebCore/platform/graphics/GLContext.cpp             | 3 +++
+ Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp | 5 ++++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/Source/WebCore/platform/graphics/GLContext.cpp b/Source/WebCore/platform/graphics/GLContext.cpp
+index b217988b990..1ba0eb8a482 100644
+--- a/Source/WebCore/platform/graphics/GLContext.cpp
++++ b/Source/WebCore/platform/graphics/GLContext.cpp
+@@ -28,6 +28,9 @@
+ 
+ #if USE(GLX)
+ #include "GLContextGLX.h"
++#endif
++
++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
+ #include "OpenGLShims.h"
+ #endif
+ 
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
+index 3515be452b2..82cce70f14b 100644
+--- a/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
++++ b/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
+@@ -64,7 +64,10 @@
+ 
+ #if USE(GLX)
+ #include <GL/glx.h>
+-#include <WebCore/OpenGLShims.h>
++#endif
++
++#if !USE(OPENGL_ES) && !USE(LIBEPOXY) && !USE(ANGLE)
++#include "WebCore/OpenGLShims.h"
+ #endif
+ 
+ #if USE(GSTREAMER)
+-- 
+2.20.1
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
new file mode 100644
index 000000000000..b4da0e93b88e
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit check-reqs cmake flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Various compile-time optionals for gtk+-3.22.0 - ensure it
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	virtual/jpeg:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.14:1.0
+		>=media-libs/gst-plugins-base-1.14:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.14.4-r1:1.0
+		>=media-libs/gst-plugins-bad-1.14:1.0 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt )
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#		jit? ( sys-apps/paxctl ) )
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch
+	eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE and default off PRIVATE option still@2.34.1, see
+		# https://bugs.webkit.org/show_bug.cgi?id=225563
+		# https://bugs.webkit.org/show_bug.cgi?id=224888
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_SYSTEMD=$(usex systemd) # Whether to enable journald logging
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/jsc" "${ED}/usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}/usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+}
diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index 28d03ef05307..c654526f043e 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1,3 +1,3 @@
 DIST xdp-tools-1.2.0.tar.gz 233676 BLAKE2B 488bd24c5b0c25cb90cc434c0d7cecaf0cf2818d949008fabf4a1245f773e1a1e7a6520c4155df5a6364b0cc8ce2ae49b7b428209b762ecd11f9d6adc10cc57b SHA512 484e5aed6d695665e9e7edec8033b6034281fb215c758a8a8600b5b2215c7decb538efbafa4204306497197a329c3ad7c51beb33717fbe0296a345a1aca8c0a9
-EBUILD xdp-tools-1.2.0.ebuild 1200 BLAKE2B a081ef45114c1adec1397b67a5ec18a54df31767bf1a595ad4b666e3f630df7c7e5b0957898a959b939ff57b08757b7e9653c29a67746ce1e1157f79c44b20af SHA512 4543181307809e11a6447a661a54cebf8f38ad8d6ee377ae32c2b4347907e86a06b104bf6bd9dad82dc4dd587673133afca1f671e589f3671f6ccaddf18af1ff
+EBUILD xdp-tools-1.2.0.ebuild 1212 BLAKE2B 0285acf6ed3603a39145af5e0a0857522cab27f0e79f57ec1714aabf82d92d6f96d159c132b00e4c44d7e302c7993c262215c79808606da04835c95aa53dcd11 SHA512 74dcc46f7ebb4a867bf6bed1f04da606fa8c388ef4a720d9d4ad5b38d65deae0b77e89a880cdb6ab0d24ce15cbb7a5e02957a7a82553968569f36ff96b278c42
 MISC metadata.xml 448 BLAKE2B 5e76000a49c2578dc872010907deab803bf25d58e5383b81f8953f3ac8549f017895c7afa39a2b8c3eb47efb66c5c322177032542cdffec41de733502da41ce4 SHA512 4010fb44ad655a9c58e3328623652d2f6c10aee934daeaaa2c5738c44b086cc2674e011e5de0b6e6a058c24131a16be679e971a692800458492cf3addbd761c2
diff --git a/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild b/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild
index 1c7f80eb7c0d..f15f1f30f4f4 100644
--- a/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild
+++ b/net-libs/xdp-tools/xdp-tools-1.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-2 LGPL-2.1 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="+doc +tools"
 
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 655c2ea6baa0..98c0a249a330 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -1,5 +1,5 @@
 DIST zeromq-4.3.3.tar.gz 2117050 BLAKE2B 69bd1544fa76232ecf860b364592762c4170c327c444bf79a916947e1c370eb8c6c20b2ae271374d70bde11db9116ef6a64262e287982e5f41d6a5029649348f SHA512 4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1
 DIST zeromq-4.3.4.tar.gz 2486520 BLAKE2B 3c10989a9359a79317adaa8bf6e138357196b82078656911437ee848a347759acc1ef49feda5e1a8912974026e55907b9ffd5172111ddb83ba8cf92dd6715379 SHA512 e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e
-EBUILD zeromq-4.3.3-r1.ebuild 1447 BLAKE2B d800a1dbe54ba94b039b798d9fe7610a62e3ebcde63fba5205063305dbd0bf2fc80a4e1ce57120abd03904e201e159e62e2724935ebae3fc086c343116ef6fd9 SHA512 ac5b1d8570b6c6ee0de56615e4296a18148be0fd29bfad7a404f7d995d22d2d893399ffb2c6b31ca036b622556d3bb3274640ff224d41a49213f66f353302a21
-EBUILD zeromq-4.3.4-r1.ebuild 1459 BLAKE2B 10cdbd13d96649c08cf3f65a9a1509a3bd41294436267676a1f52afc08a775b0ad711f2f911f58bd8e9d72961fbc3f1cadc8add6887371be9b9430526d568b0f SHA512 bdee0c7805f77c91b793d2bf0ea5d65e3924708312b74cfb19adf0e2afe6e6953bfb8fbbe30c6127edbf0cc6cb690c0fc65a67b6e0a397ad18036e8adc5b3622
+EBUILD zeromq-4.3.3-r1.ebuild 1434 BLAKE2B 2ef0bdd7421a2a831b6494b8b4e919f83a4451f2065c448afa780e1740b04b9e3d1fc083af3fcb988f343deb5b55dbb833e2f8e10861b4d19830fc5e987b7d48 SHA512 1e2c77d3150800989e0e32ee8026c7e7523be71f98eb6269e5e2b1963faaa9cb11b50a8f1a6b9ee6df2c0492c3ce3bdbeb7916528dd9af2590bc2df6a5a80bbc
+EBUILD zeromq-4.3.4-r1.ebuild 1446 BLAKE2B 84364a1da2bfdd156c34a83679bcc76ece824e38f3023e2d42907f64c4ab852d7de6e38c1a8007983507bc98502290452f0cdbe80127f90c81b0dcb990ec8ea8 SHA512 c81f69c90a255c9536162774c465415d8133a7a7c03438bc285a0f1519e49816ce35295123cde08d668200d3a48db6e2723f6c804afa4542ae21818b4ffcc0bc
 MISC metadata.xml 1625 BLAKE2B e8c1e2a40f768db02b55dc045ef54863b8de6010345c78fd9ab42b95890e32aff0bb108d00191412f32aeb201bce16e803838b2b60c22d132f12b6f652129d3d SHA512 1cad56aa313c4f1c5791bc94a5df828b190252ea75c0e3ee39946b49d87d5906b3f1ae5006e03d2693517d31e9950f5d842a393ece44fd3e50024df81c386ba0
diff --git a/net-libs/zeromq/zeromq-4.3.3-r1.ebuild b/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
index da4a09e97c25..f507ff1b89b5 100644
--- a/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0/5"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind elibc_Darwin"
+IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
index a326c9f95e1a..2e385aa17e29 100644
--- a/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0/5"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind elibc_Darwin"
+IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind"
 RESTRICT="!test? ( test )"
 
 RDEPEND="