gentoo resync : 12.03.2021

36 files changed, 849 insertions, 315 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 970fd9845953..31be6a60338e 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 aa39d8b3bca9..ff424cda15ad 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -2,7 +2,9 @@ AUX courier-authlib-r2 978 BLAKE2B e49effed437cc9fd76404054e014a87bf2a207c68c1a4
 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
 EBUILD courier-authlib-0.69.0-r1.ebuild 4511 BLAKE2B 2dd9250efd5570d1b7daccf670648bff90301c57df511503058dec0585601a954cb8ed5a58121ac32dd4c0410854148e25ce45f871ce47333595ada90aa878fe SHA512 76786b563120a896110e987b86587a80211cb49f84af86861bfafa301134d13f16997d7411da6caad0466a63ecddcccfaff5cd6e71110766413128f808098180
 EBUILD courier-authlib-0.70.0.ebuild 4520 BLAKE2B ba78dad0a14640b96ced9c2c96285fc2186047cc3c190aa07ae50ecbae5e4630af04588735aa09545f26a9b8d40c1b4b122c44930de57ea26df9bc87021e8b30 SHA512 97dd3146d345d2b41c18391afd3861de59712eccf9f2412439b8ffbcb08df2ad922d113e5f29a73f45c41e160afa1387f2e898932a2c88de47062a6066487878
 EBUILD courier-authlib-0.71.0.ebuild 4512 BLAKE2B 56e372434a4c745776ed0a95a94c153f486b975455d91bb8438c5e2e0af7bf2560841584d1875cb96e68827b9ce5439b949da2b4eb0a2415f0f64b46cb93d856 SHA512 556c8594b9e689caef5b196d15688d7e86962450af7bb94010b4cb85e2d43a2c45368b5e0389a7c668021b52fe3f8f2820ed659cd2f5f53af266184dd6f11fa0
+EBUILD courier-authlib-0.71.1.ebuild 4522 BLAKE2B a460178e96200383b969c96373264a97c081f8b25aa767d1175a49ff1b60e08f90f27d54d1b1bd07dff9895de842ce6eab4d31bc5e4868fdfed5eb0aeccfa48d SHA512 5c881c789884467565c047be9d37494701fe3a4cb640011905e406f2d4ae82d533baa0f6eb5fc122e6b0a5501bbef590ffec5fb8fec39365541f2ee35c2beb89
 MISC metadata.xml 301 BLAKE2B e5d19d103b9de3e5b34a1b466b3d1fa4fa170fbaa4e81b99eb970ad73b89d7fe3e7b64ea1e60f978f15c17a5058c38ee5324677886efc36e71004c749d909260 SHA512 f0811e6512fca5f760e4b2c745e9245dee529801cf1897d38c4fc817995f5a1edd56f58227f2e8a1fe93c78b1d97fa5f84c6db27e6c3feaa36c8901015d3cd25
diff --git a/net-libs/courier-authlib/courier-authlib-0.71.1.ebuild b/net-libs/courier-authlib/courier-authlib-0.71.1.ebuild
new file mode 100644
index 000000000000..6d4fc71061e8
--- /dev/null
+++ b/net-libs/courier-authlib/courier-authlib-0.71.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DESCRIPTION="Courier authentication library"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="https://www.courier-mta.org/authlib/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb crypt debug gdbm ldap libressl mysql pam postgres sqlite static-libs"
+
+RESTRICT="!berkdb? ( test )"
+
+DEPEND="net-mail/mailbase
+		>=net-libs/courier-unicode-2.1.2
+		gdbm? ( sys-libs/gdbm )
+		!gdbm? ( sys-libs/db:= )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+		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-unicode/Manifest b/net-libs/courier-unicode/Manifest
index dbd3c7250b6a..1955d537f9c7 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -1,4 +1,6 @@
+DIST courier-unicode-2.1.2.tar.bz2 445242 BLAKE2B 118afeefbb0d957f3a0b7a39e573edbdc3fa1d85c1028f4aca46137402f01a6b4d5df11c48e9d8235483ba277e187863d3f8f7b1cf426a1b5f2d40eb243cca4f SHA512 97d1c12917a1d415b4dfb8155e2573e0e4101112433107e252e393765fa88edd5aa8d349a2c201ea951bf0e9d51ac0f0c6444494c308fbe9909929364661bc24
 DIST courier-unicode-2.1.tar.bz2 447917 BLAKE2B 0d225849322ccaacea9eef49225952ac5219ab2967f30ca1c0412b73790b77682a077c2c08cff7b606cc1fdc6542db7e0895afdf7ba34f73e2a71aba5311df99 SHA512 1ee0bb3a548bfae4ebdc92ff8eeff5d22705c0df55e37e98880a12f1bfb186034e0c1ea2e1f03073b40e1d11147828304be93467d5d51e394fe39fd57bbbb46e
 EBUILD courier-unicode-2.1-r1.ebuild 523 BLAKE2B 0a5ce7fcdf36958ae4afd09130257d37309524e3363f670be5c4d32d6f1b152980e0d7a8c5e88135e671faef175e9966d820bcbb844c8552e7c161296564b619 SHA512 6e4f24532522e80972bfe3e95d2f996b63bc9fa9cc921f18c1f01cf4e95cd5539200a2a8d081a31130888b832ea4e2c720aa2adb733bcc433a17a20b30b26466
+EBUILD courier-unicode-2.1.2.ebuild 531 BLAKE2B 9f1fd38475d02afcf9a161501f54884b3ecaccb6738917630e8a80dfde9d50701bfc432584ddf0adbba7c6c8fea6f1946f5f5d7ff226e2c88eeb8220a75a5e12 SHA512 63658aa656ccdec8a9941c23a422f55bca14ba8977288ec96a8ffacc11880878bf9832780cd55b47c684a36b5b206c762405d710d4f527eefa2de221890c14bc
 EBUILD courier-unicode-2.1.ebuild 477 BLAKE2B f5fbf470d191e1eb07c8ac5c237b2db221eca2f616e1bdbaa7576dab6eb9252f5a2ad32ab6aca8c3f853960afcb54579ef86a6310cc3c64bf15fe0bce8516273 SHA512 61e3262dc8e9414fd6d1b8623505e3fb3f32290d327fe64d27bc33766e528d89362e3f24cee9a9a93a4bd54f5a64b36ce06a0468710056ee38de157bde1cfb99
 MISC metadata.xml 293 BLAKE2B 85c442aa45e6a97917305b7e9326f8445f5911a3a3913d3540250b83361a16bc07810b8288a692082d9a2203bd696ba87d8fa1b6ba47c046f6d96577d07400af SHA512 39ee602134069ac766933c31bacbab2de9f40aa8bab6450660ce5319a95e285f4d4c463df41f22d7fd7e1c8584634a4b3ada8962941143fe8d4120cbb11515f0
diff --git a/net-libs/courier-unicode/courier-unicode-2.1.2.ebuild b/net-libs/courier-unicode/courier-unicode-2.1.2.ebuild
new file mode 100644
index 000000000000..6948fe87918a
--- /dev/null
+++ b/net-libs/courier-unicode/courier-unicode-2.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Unicode library used by the courier mail server"
+HOMEPAGE="https://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 4e0903ea1e1f..505d8e67c4b4 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -3,5 +3,5 @@ DIST glib-networking-2.64.3.tar.xz 189760 BLAKE2B 5f067aacd0d7724367eabf961d81fb
 DIST glib-networking-2.66.0.tar.xz 193920 BLAKE2B bba3c74a3676c15fbe3b9cb97aafb3c9320ebb6f7be1479a66cefd233aa5a548a605be74156445e6a54e8cdb307a09e2916f6d8736640ee38fce9ca289de195f SHA512 697798864746b40542873257a789290cacee425467e32c0eb096c87e124b37510753a990ef5d350f1db85c24da88e448bca9d8d8b4308123a74feac299176de5
 EBUILD glib-networking-2.62.4.ebuild 1730 BLAKE2B c4184f83f4ba69b5b061208f4df37a16bfb27521e3b5e69d4a4bf123568348979744cfca1030364cb2800497dcd468d70be2896f619a790467cb5ffa355fb2c5 SHA512 4a85bfa3ecebbe651797e0913ed85438001ae44e4989d4d820c1004d70498918a012f1d4baa4f1b467ff345fbbf7ea3a2cbad76e0e5dd24a201caef04b538ac8
 EBUILD glib-networking-2.64.3.ebuild 1730 BLAKE2B 2e6cee2c446169ebd9859fa8b432320a454811e12af7dc222c16f80738c34c64a122f8f6a3d31524ce84385f6236f42a0bc6ce2675523c193f9834b8866d619b SHA512 0c0cd2a47c7f4d452eda6cc62bff74d96310befb353076629085ea63c3d6837830207b36b9183626faa1bd3cdebd9d05d864d06e93ec829e1f579be68862a332
-EBUILD glib-networking-2.66.0.ebuild 1738 BLAKE2B e9bc3723ca060aec3819a03ead05ccd0166952428b9d09161f36e730cd635e44816d35f641deb3e4cebc6edd075d0b0e61a2ca259e1104533a2c64e11e42d876 SHA512 8eacfba16e1b462d7870c4f2811a183181c6c35892ad847c4fdcba1a06ca0ea238f58c37cd20c72b191e4dfe67ee9d1bf937e972c4bcd9ed4450bee9cc69562b
+EBUILD glib-networking-2.66.0.ebuild 1737 BLAKE2B 884e76bf5d410629ead60596404728eb4b7f0cd97ab9ca3863e5b0c2a9b0a20a824ac29b7938b78b6f64cbf6650315b087b488719bc5c6e411b6334d41ceada8 SHA512 450990fe682cda41c169ef323c387a466fb59007717af17734c4a78f82cbaa993be4e125b4bd88c83374cb3832c4bcf06fcac0507d10dca09ee601477ef74677
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.66.0.ebuild b/net-libs/glib-networking/glib-networking-2.66.0.ebuild
index ab26b1fdccea..3b2f65a990f0 100644
--- a/net-libs/glib-networking/glib-networking-2.66.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.66.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.64.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 662412c41f13..1655fdba12cf 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,6 +2,8 @@ AUX gnutls-3.6.15-skip-dtls-seccomp-tests.patch 477 BLAKE2B 4c1add5ab8041b7847c0
 AUX gnutls-3.7.0-ignore-duplicate-certificates.patch 11218 BLAKE2B 2d2b03b17dd482e11c4d51e8947459f0543f6f053be4175bd324b3395af31b77fd689613842abd147ae2cfe6ad4f0abf3f9dd80dec69685b36097828a0008dfc SHA512 65e0a4660caee99ca2d129227061a165fa7a0f5aee085a1ab5e4bf4939549e268d2988d601bc3a719c64e19597fd45bb19b3e6f721ac7ba290249c67e345096b
 DIST gnutls-3.6.15.tar.xz 6081656 BLAKE2B 6c52419037e41e817087a2577a6b73969cf065453ecf88e2f87152f544a177e4ad0ef825ae9dab243312e0223a953ab28e532bd2dbf96cb9498618415bc7f654 SHA512 f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
 DIST gnutls-3.7.0.tar.xz 6129176 BLAKE2B 3b03e7017ac1d715c740f8f09b0690dd1c983dcfd5faef0740cf66ac785c1a84e959f85808aa10a6eebd745d96ca0293681049911ea663aeff85fedfa2567aad SHA512 5cf1025f2d0a0cbf5a83dd7f3b22dafd1769f7c3349096c0272d08573bb5ff87f510e0e69b4bbb47dad1b64476aa5479804b2f4ceb2216cd747bbc53bf42d885
+DIST gnutls-3.7.1.tar.xz 6038388 BLAKE2B 1d55eb441827c7148d63bcad37bf7bc62d539ee9bc7e14c2fe5ec1d0bdcadd75e2cbc98ba104523b24c8dfd9526b4595475a818d206971cc012fac509cd33a6f SHA512 0fe801f03676c3bd970387f94578c8be7ba6030904989e7d21dffdc726209bab44c8096fbcb6d51fed2de239537bd00df2338ee9c8d984a1c386826b91062a95
 EBUILD gnutls-3.6.15.ebuild 4303 BLAKE2B c4aa9aed6ba8b99aaae8c3541d087afe299e37beaf78167876535b49aa9f7bc5ef624d5b04d4124df074ae08c63dccdb543e4bcdf9347cf6c4ac86938d60c62e SHA512 61a3ff29bd0821b07a7792b0d5d1520eb1abadc87119b8ba1cdc30980c299e47e40637cee61621607d860f7b66a38cc17714938995e7c477d1a85fd4b5b4e001
 EBUILD gnutls-3.7.0-r1.ebuild 4308 BLAKE2B c72d05e3119bf539a2f5058ba2d917c28f05700d20a7e5773ad8ef3d3bcffb1ec5603e5238d42aef2e2ecf8d7d8755cdef181ded939cb683a93e2ae416506f16 SHA512 35e6036471eb50cea51e52614dc169972d8cba4da7e36b6f0e9c357e3c9d54e7cab828c84fd86ad6d960ad8807d3d599acb1c1109cbe29cfb3ccc351610633a3
+EBUILD gnutls-3.7.1.ebuild 4240 BLAKE2B a53df62983590ce9052deb810b474563b7d5c046e3de5fcfb026c78962f7237f798be322e940cf78ba1949863bd0aac48606cb87f8e3f0be1af49bed43050f41 SHA512 e54a53d940060f0fa5e037478aa49a6eed4bf3293806a8045e8850918dd7b4cff54cd7786178fe9f17124ef8de2ef7b20cf2e85f5ea8e946ca153c782e51eaa5
 MISC metadata.xml 1258 BLAKE2B 4dbd1ceb49d79ae699d79471e636807b79f68d6e81f403d8c458eb5110dbf172d5839ea1550a32581bac1da039549731d397e91069570a76c8ef0c871feccad5 SHA512 749eb5f798cd04170a5dcf44c2e7fbc26e19210217791d92c0fdb1a53586a219c183686c74385bed1ff0f743b9972fa1d92fc216f53d3870127d39a6b3adb87a
diff --git a/net-libs/gnutls/gnutls-3.7.1.ebuild b/net-libs/gnutls/gnutls-3.7.1.ebuild
new file mode 100644
index 000000000000..ece149c18554
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.7.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
+HOMEPAGE="https://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1+"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind"
+
+REQUIRED_USE="
+	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen:= )
+	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-2:=[networking] )
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1:=[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)"
+BDEPEND=">=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	tools? ( sys-devel/autogen )
+	valgrind? ( dev-util/valgrind )
+	test-full? (
+		app-crypt/dieharder
+		>=app-misc/datefudge-1.22
+		dev-libs/softhsm:2[-bindist]
+		net-dialup/ppp
+		net-misc/socat
+	)"
+
+DOCS=(
+	README.md
+	doc/certtool.cfg
+)
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# don't try to use system certificate store on macOS, it is
+	# confusingly ignoring our ca-certificates and more importantly
+	# fails to compile in certain configurations
+	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	local libconf=()
+
+	# TPM needs to be tested before being enabled
+	libconf+=( --without-tpm )
+
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	local myeconfargs=(
+		$(multilib_native_enable manpages)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable guile)
+		$(multilib_native_use_enable seccomp seccomp-tests)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test-full full-test-suite)
+		$(multilib_native_use_enable tools)
+		$(multilib_native_use_enable valgrind valgrind-tests)
+		$(use_enable cxx)
+		$(use_enable dane libdane)
+		$(use_enable nls)
+		$(use_enable openssl openssl-compatibility)
+		$(use_enable sslv2 ssl2-support)
+		$(use_enable sslv3 ssl3-support)
+		$(use_enable static-libs static)
+		$(use_enable tls-heartbeat heartbeat-support)
+		$(use_with idn)
+		$(use_with pkcs11 p11-kit)
+		--disable-rpath
+		--with-default-trust-store-file="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt"
+		--without-included-libtasn1
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/libetpan/Manifest b/net-libs/libetpan/Manifest
index 0a2baa2256d7..e44cbfbd953f 100644
--- a/net-libs/libetpan/Manifest
+++ b/net-libs/libetpan/Manifest
@@ -3,5 +3,5 @@ AUX libetpan-1.9.4-CVE-2020-15953.patch 2880 BLAKE2B a31fcc50b16d6644ce091aaf7f3
 AUX libetpan-1.9.4-berkdb_lookup.patch 1036 BLAKE2B 594741b66faa63de15acab4ce1f344fb22d2fa7c5c6cf75d2bd6c890d4117bda5978738d98a3ee3adf69f9ddb41922e36cd261ee71e9d8f012423cd99acc19a9 SHA512 561e0b82e080a31e668cc354be36e54101742b8d32f1067f53536afdd9e0cde2eecbd5516b93e8c304f60a1b083c6e68b4442afcca88235471f0038144202194
 AUX libetpan-1.9.4-pkgconfig_file_no_ldflags.patch 809 BLAKE2B 0b615bb488f28f468f6224362788fcdb11def5b6907c10d0bf0eee5d9d9bd6af32e9b011d4af43d3a7d8cd78086875faa4d229c96fca1895cad9576756442b45 SHA512 b830b2d2a04173bbbdb7b62f9f855eab25bbe3d970fbd69c37213ece957b4d682f36002b9694b4dcf89232ace2d809902561003b5f6fb76ec5ae0db9e6e462e0
 DIST libetpan-1.9.4.tar.gz 5000025 BLAKE2B dd98169134b7448d3dd129814d8011a3fa915b16f4763344230a89d02626b64ddea57495b4c21fd8f651164c36c95ad98ee9db073273b230e6af403b845aa681 SHA512 7b7047d084fb4ce0c91821c2ad78e921d6d009106851afb7f5b068713c84ebe6926f6bf7a7423f263eeebef617511e44f6b65448d892bbc058c447235fd55c0f
-EBUILD libetpan-1.9.4-r1.ebuild 2238 BLAKE2B 688f847a48de8d22ae83e8b13404d8d4c34ab1fbb96ba2de01aa41cb28ea372a88ee1ca648d679bee7a22e3072d42833d7550ffccf1e800756bd6e48864faa98 SHA512 a4c9533c6f9a711f562dd849401412d493a8304a24fe4ad3f86a628f85b62711c60b22da537c3ba52aaff1164bc22d1621044debd4fca37c91d6494c52987725
+EBUILD libetpan-1.9.4-r1.ebuild 2237 BLAKE2B 0b6b78907f5e6279b6738f0fe641afdcc0333ace80438118b6a41540f64a4bc19bcaebeee1e4d313d5f43dda84d39e0c2d6547af1690edd6652892eee37434f4 SHA512 008ad7bd15b3a171bae751976e614f242a40972d50e9c04e3f7dea78e1e258c3870486869ce0f9ab90c9c7f33ded29677ca82b059932eba0315d4f0f78968162
 MISC metadata.xml 828 BLAKE2B c33cbf260d3d2f9529101c441cf49fcce001deec2b23c22a63715ff2ecc0e105c46a37e0aaf9641449d88e57b148d5fbca534a3b81475ffe795aeb07f5c1441f SHA512 5e13ad73cf38a8e4690506fc56f3482d72675622d3882c4cae335c5146c6cd9a942eca23834d1a010d3edb7deca8325d9f4ff576b59a3879b47966489fd28a65
diff --git a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
index b2a3b73aff0c..596b7ddb55b7 100644
--- a/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
+++ b/net-libs/libetpan/libetpan-1.9.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/dinhviethoa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb gnutls ipv6 liblockfile libressl lmdb sasl ssl static-libs"
 
 # BerkDB is only supported up to version 6.0
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index 8141b527fa76..ea4c216d3bfc 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,5 @@
 DIST libmbim-1.18.0.tar.xz 474768 BLAKE2B 3dce8e1fa0e57cdf75174d0145006b38213fcd2de9166589f2d3ddd7a17dae3b308ce7a7338d388543c8ba83b6a9d2bf12051cbde1666fc43580314d9906704b SHA512 510af324563a6a4f9a9d656d6724398cf5c5ba07424962d5407dd05867ef36da40e1ee6c8be8040c6a67e764bc059d24282db45ce3d47075fcf4d7416245b28d
 DIST libmbim-1.24.4.tar.xz 512524 BLAKE2B 4f91d1fd4d993b3e28f7508f4fbc3d6f4467db1c27307a3c4bd006ad9cdb40800513641fabf37deb673f5926d7a0f0d4806e3bd62a3ad8825227631d35c67d5b SHA512 bb0b82c64213e5b382a807c5c4c36751138c343419dc6abf1605573c91620af1a6de45587eab7341265f950548924fa65fa4bfedba0659b2f9eb80fa23ae88bc
 EBUILD libmbim-1.18.0.ebuild 819 BLAKE2B d3b37644e4b06d321f51a145f0d23d6cb36232744bb766fb6beb0c738a7dcada12d733eb27b50622f6c4a5eae0392ce606b67a6f7f6668fc0b6a6f46d0252f24 SHA512 45ab3fbb709839c8834d5ce305ca358ad9ee6bce593b086a60b40d31998b1083e27336ba310e8d2d7b3cb2a99006059f77b601d140ed9c9eaeec54ba32149708
-EBUILD libmbim-1.24.4.ebuild 840 BLAKE2B 5ee4f3725245c318b3c38e2643a7d9ef764f50594ff40c8a4c7a084fb591423cde05ef9c50de7cf8618bcbc5f7de181878c9a3cbf132a6f8b8bc5fc137687c28 SHA512 aaa3f24fcdab54c27c1f99a9f117f480ee2c7f077986909ea6cf27ef96c43fa4439e2d4a7659202b0a7d9579b940edfc770872218b8fd963e1c414cbd2fb766f
+EBUILD libmbim-1.24.4.ebuild 837 BLAKE2B 2d9c7ba727896518e4199014bdc792096a85e47714cfa12dd03b6a5f5144674e8b660a98ba68236ab3cb01676ef69f5c36a886d438563b0e77ec5adc77f7cce6 SHA512 eb25b94b6d01446ab6dc1e75d7e22406bdc3dff92e4bd46980be0b0435961e3f79628cdbf1d82406831deaa3e4189c0d1c7b6537e54191d613806763a2def220
 MISC metadata.xml 241 BLAKE2B 5323e3cc2a6d62c9fe301f465f7e03b145f6877adc893cf9e3f0fe4863fce3423f3471f62fce04fafc65428fb4781d2d74d796281d9332d0707e45bedec9a1a0 SHA512 d85c72d707e2c7290ff4bf18bbbd34b938cddb7e09528c5d10fa7f141122e3836687c2fff91c1000791457b7f808d3222fe671755a0fc25c157d80c908bc3cae
diff --git a/net-libs/libmbim/libmbim-1.24.4.ebuild b/net-libs/libmbim/libmbim-1.24.4.ebuild
index 6aa324455bcc..7b8777e5076d 100644
--- a/net-libs/libmbim/libmbim-1.24.4.ebuild
+++ b/net-libs/libmbim/libmbim-1.24.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86"
 IUSE="udev"
 
 RDEPEND=">=dev-libs/glib-2.48:2
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index b2f474c17187..6bda10cf8427 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,5 +1,4 @@
 AUX libpcap-1.10.0-usbmon.patch 620 BLAKE2B 463f446051bd6df5afd679ee95c13792ab4ce1962cd8cd1de7acfc1c40c887741ee0a8a5725566781833711e4c8286942ba6e0fb2ee262e2177df82f2175942d SHA512 77fc6eb400bbf265ed1290bead8c317bdcdbeaf5a73aacfd95c3a1e77dfe8d5a33dfe49043462051552e3550273219b10939fc2cf4eda7298317c7b4490428ea
-AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a2a1bdb97e5c1334e64b27cd969ea6a2f8d9d6301e4a4ec48dec2cec0e53cd68c887bbc445ab056a1f603696a34e SHA512 489c2f20e7935e47d478efb1077e3cf3806614651cdbd6312d0378989c71409e870f9d0fb9d496cf00b7076d8d001714c56d0444144eedbab47c6ed3afd3bf90
 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.tar.gz 920263 BLAKE2B 40b9f3562161dbdd30065757ae045bc3b6447a954dd3019e932cdc9c794e0f47e8eb0480144bfd7765122a3efa750caa0c77abbb98ce29ad79a84ceaedcb9e3f SHA512 d77f05aff76aefbd280e5e24eb4a23b6f3b31c9aacff77d556259325273083f185c451b7ad40b57ac63c9114510e8f768fb99907b1ee54fa95b80f21d7d6500f
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-usbmon.patch b/net-libs/libpcap/files/libpcap-1.8.1-usbmon.patch
deleted file mode 100644
index 0b69e43a3f7d..000000000000
--- a/net-libs/libpcap/files/libpcap-1.8.1-usbmon.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1493,10 +1493,9 @@
- 	AC_DEFINE(PCAP_SUPPORT_USB, 1, [target host supports USB sniffing])
- 	USB_SRC=pcap-usb-linux.c
- 	AC_MSG_RESULT(yes)
--	ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
--	if test $? -ne 0 ; then
--	  ac_usb_dev_name="usbmon"
--	fi
-+
-+	ac_usb_dev_name="usbmon"
-+
- 	AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
- 	AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
- 	#
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 59edf8cecbbb..6949bf333793 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,6 +1,6 @@
 DIST libqmi-1.22.2.tar.xz 947124 BLAKE2B 662cf58cb3fe48b5bbe167ac552b12ecff2944d1098e47b5a8c216a65c42c5e5c462f16625c4572e0e27e69a55cdfad76777468a42f8887f5b3984313c70747b SHA512 5785b56a60db8fb2566b6a712a18ec2ae74ce1da257473ab6b7cdea3163298ebee6c60a3158a7041aa759bd717eee4b16d9eeaa6b15d9b6e911bc8c8c44bd3d8
 DIST libqmi-1.26.6.tar.xz 1127552 BLAKE2B 1dba56c867c688c991fde7bb019234a05d77092f0725498d677a7ff620c56e58e17c873c773d96ee2131bfeac8cdbec86dadacd8fcc2f751f4e9a8d2c75efe5b SHA512 6c5e05fc158a085e1f652ff31cef65762c026cb09eb630153fddccb15e19187141e74c79818ebe00a058c5624891981cfce4d56545d4150ebb3b6e8d7bddb5ba
 EBUILD libqmi-1.22.2.ebuild 1125 BLAKE2B 0f46e9c7304e7fa676f02af18dab551ed8bbab8f0da220da37d4304f966eebe85a4574b6a693d12ad4159b753a5b05fbd6cb7dd63ebb817cbd2bb79291a28ed3 SHA512 58546939e8a9f18dd2d0028bcefb9b937f94dc034f0554cae9be7cd5d79769a5a02ddb79e9899f6442ee648f2c3f962ac42e329443d6368dd35080202e421910
-EBUILD libqmi-1.26.6.ebuild 1169 BLAKE2B 1bada98c611f1dad5b52af359ae5e56b92ed3b70fbbd88495c05f49454a8c9c6c954c3f62a187f294c3b093f98aec62e27e3193c4869c77f6b3954a4a01f7389 SHA512 535d09ac3ac4e2d4eda22f28e9825314915c982987ca0d929872234f873cd7e832c76becb50adc997989bfc365d093869834f0de1e6e6d6e8d49bf32dfd69f08
+EBUILD libqmi-1.26.6.ebuild 1166 BLAKE2B 113cbda395e408443271776adc2a825126d3d88419527dc3448868702f1ed3368235db43482fbd833cac6ef2b1b7b44da8b06dc226d396401ea6357c2685bc5b SHA512 40a6b05f26783e4bbcbe84aa7eb40388774c50270a5de62b1310af47092a8b65f911cd7c9508ace3407d0ffd29d2ddd8b0a2149c2354add7c11248ff2296e9f4
 EBUILD libqmi-9999.ebuild 1169 BLAKE2B 1bada98c611f1dad5b52af359ae5e56b92ed3b70fbbd88495c05f49454a8c9c6c954c3f62a187f294c3b093f98aec62e27e3193c4869c77f6b3954a4a01f7389 SHA512 535d09ac3ac4e2d4eda22f28e9825314915c982987ca0d929872234f873cd7e832c76becb50adc997989bfc365d093869834f0de1e6e6d6e8d49bf32dfd69f08
 MISC metadata.xml 416 BLAKE2B f391913e78bcdb06b9c686a460059b4ee38861fa09fa0d50c19418ac3e1d966efd2646694d89d240d13f0a9bf2eb910d952288de153699b9564040efed8b04ab SHA512 4ebf9f46a3c7c6e18e0eb83341bac1b087bb6471a0f3f11663975b8a6e0e1a78f8db680a628dc693c4c3eb825d50717f0b7ed086d90c9d33818f094de2611fe2
diff --git a/net-libs/libqmi/libqmi-1.26.6.ebuild b/net-libs/libqmi/libqmi-1.26.6.ebuild
index 51ac0339e070..9a4f1b1bd6f5 100644
--- a/net-libs/libqmi/libqmi-1.26.6.ebuild
+++ b/net-libs/libqmi/libqmi-1.26.6.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 51317ba0c15e..91a503988854 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,9 +1,11 @@
 DIST libtorrent-1.2.10.tar.gz 3586008 BLAKE2B 71971124930462feb5f5083fed38ccadcfd1a2aed0d000a06cd7e0898b40a1451722cd79fdf0b1da3477047b26c7f7e3c1f74086a141770a7d143c916e96b6bb SHA512 e6de939fb6527783695e0b6623ddbe27f85842a36c0899b93ea0284cb3c6f3d14b8c39e29316adb3bf9acac7804f38385cc06854a32df28e7f4f6839af9f382d
 DIST libtorrent-1.2.11.tar.gz 3591610 BLAKE2B fab5d780dc5e1a855b60326cefdca6bcfb7459d4d37429e1c475434ca6ca2f465ffb6188ff519f49f2612941fe4806152511400a1c6fe121ade3ed35c6f40a79 SHA512 d502286f67bf462f14169daafe12b94ca723598530c85360c3a4b3c73535202b63632036248fdecc942cb559e66e6a5cb5afa830dc78bbff72a6c9a330710b62
+DIST libtorrent-1.2.12.tar.gz 3604064 BLAKE2B e0eb00aba90e3d5e3ba1bf3984e2eb606583007137288ccf93961185744ccc2a69922063a9004a2ebe627d7657c582eaee9f7ad2971de0dc41351bd59ed23953 SHA512 78be4c12e12f593154eda0960aaf9583fe27310e0223dbb21220400c5339744c9b2b11afa880fea30f77b4c0d07345937ff8a20d58d2d4ed7dcda84601380e20
 DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
 EBUILD libtorrent-rasterbar-1.2.10.ebuild 2708 BLAKE2B 8745111f5bcf2a4884fad006764883e315623912fb318ec8fb590b30d27f1fb6915003a72d056441c56bd8c4eb920798c5dba7b853fe08a40ad6d7b17fb1f53e SHA512 b7f71dab2e5064ab464b0ee0a0febf08ed81c7dfbd96816b664240d143448639da76f3bbf8953ecc6b5176992132005b1d6131078dab1084e064220400d106ad
 EBUILD libtorrent-rasterbar-1.2.11.ebuild 2734 BLAKE2B 07e2131ed944aba14b9a7695dd8e299ff764939d38bd4d10e143e8064ae18adf5fc09eddd56b673abdaec3aec9d2ab6efdab4cd3c3d51ac0fbf7867b5884092a SHA512 cc23501ebefed51d244761873f41dcfcc4ddf273919bab6db5a1e4ad874b946c8ebb7b5e2491504f971dd33831105ca854509b71d94ad4c867eb3e64380cc111
+EBUILD libtorrent-rasterbar-1.2.12.ebuild 2734 BLAKE2B 07e2131ed944aba14b9a7695dd8e299ff764939d38bd4d10e143e8064ae18adf5fc09eddd56b673abdaec3aec9d2ab6efdab4cd3c3d51ac0fbf7867b5884092a SHA512 cc23501ebefed51d244761873f41dcfcc4ddf273919bab6db5a1e4ad874b946c8ebb7b5e2491504f971dd33831105ca854509b71d94ad4c867eb3e64380cc111
 EBUILD libtorrent-rasterbar-1.2.6.ebuild 2497 BLAKE2B 8edf61b53b535a41473ccb22013104ade8a2b84e35313eba0ec31565a88f503a0566740e40fac4d0c368ac6ee47cc5988759f7fa53bfede4528a02ca4a50fa87 SHA512 4da7cb098dc68f4eb7b0f456ed2b233b1050e11e543c4484a01767051d386ebf4ce0fd6a6357f00da9b11b87299df9efbe610b770607d96436e0a32217c2fd7f
 EBUILD libtorrent-rasterbar-1.2.9.ebuild 2708 BLAKE2B 8745111f5bcf2a4884fad006764883e315623912fb318ec8fb590b30d27f1fb6915003a72d056441c56bd8c4eb920798c5dba7b853fe08a40ad6d7b17fb1f53e SHA512 b7f71dab2e5064ab464b0ee0a0febf08ed81c7dfbd96816b664240d143448639da76f3bbf8953ecc6b5176992132005b1d6131078dab1084e064220400d106ad
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12.ebuild
new file mode 100644
index 000000000000..295a3b24f665
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools flag-o-matic distutils-r1
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/libtorrent-${PV}"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+src_prepare() {
+	mkdir -p "${S}"/build-aux || die
+	touch "${S}"/build-aux/config.rpath || die
+	append-cxxflags -std=c++14
+	eautoreconf
+
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
+
+	# prepend -I${S}/... to ensure bindings use the right headers
+	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable debug logging)
+		$(use_enable dht)
+		$(use_enable examples)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-boost="${ESYSROOT}/usr"
+		--with-libiconv
+		--enable-logging
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myeconfargs[@]}" \
+				--enable-python-binding \
+				--with-boost-python="boost_${EPYTHON/./}"
+				# git rid of c++11
+				sed s/-std=c++11//g < bindings/python/compile_cmd > bindings/python/compile_cmd.new || die
+				mv -f bindings/python/compile_cmd.new bindings/python/compile_cmd || die
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 391f35c83bfe..4e3ed4a85080 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,13 +1,5 @@
 AUX libupnp-1.6.19-docs-install.patch 387 BLAKE2B 0b9718be9e26b2e72b5c276d851ce6c4f66d2e41863569ac0ff49ddee95a4858f2f60d4c792439aeb3969bec83f0dede2631298cb6c6d46a76b317282f967d77 SHA512 b9c3ff0014f3b0d4f62b4b52948356581e09b5beefa548ddbe9a93084d2df0708557c22fafe919c867a9e48e5c19d09bfdded2619c8dde67cc44a3c12721671c
 AUX libupnp-1.6.21-cflags.patch 905 BLAKE2B 576747e560b4612fbd3432187c9fe8106bbbca2d8f19eb4b76315809dfe77e492570058997e39cbb530069013f01c5683c1beb63436142c3ed4733526a6e4d7c SHA512 3ecc83863e4cf35b9f0ba10b7982aaa103bb2eea7e0f256757fc5ef6a912a57dfdc237e6b20f29cc948f38816f1a57aff88aa0da7d7263658f584eb27ef7c8fe
-DIST libupnp-1.12.1.tar.gz 786818 BLAKE2B e44847dda5a7aeabb22a5b76cdc48d1dc69e70f7ecac85824199bf8d6e9b802cb717f2959f70690cc00babf1b554a0cb031995f80c28246b9eec670ebe7aaa90 SHA512 e4741f9245378529a15b8be7acec5af52d802ce84b82f110dab44c30da65fc2514d51d3bee6311643eb28146ea90bb3c97f44f800edb4f3ccccc1681f3e70f80
 DIST libupnp-1.14.0.tar.gz 788668 BLAKE2B 8e77f49c6eacbaff2d4194f281f73e882d282b1af400b2d8e08111b7cb0b89305f3f06b8e0ebdf8eab35de39bcd2cd30be3ecb575d560c652e96bd7831eade40 SHA512 d7cf50e168aff2ef3ad08b4c383108d5044e4c9d2923088bb93423ee5fc555c32f0254f307cb86ea7c18197612cf2d2c6c681f82d99a6f01a68f86a21c6eecb7
-DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1ad3a918f556a7d37a6e994b67d825608edd3fd788a5b5979de72e3b25288225af3b5b8c58f54395682eef50bfc2d2 SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
-DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
-DIST libupnp-1.8.7.tar.gz 786079 BLAKE2B 5f7764c1392f881f420f27e21084f5c98a6fce711f82a3e83dd21e22bf01f25348cbea377b2fae2d69133e4926ae3f8bffcd870e31c4f29b0fe20214842765d5 SHA512 c02b82e33e4c4d85257f0d282e3c4fc1b14a9f42eebdf12318ce6fb75e620bb0c103f9531e87be744fe70898aae9f67db4b5a187a23bcace33427a5fe7d3293d
-EBUILD libupnp-1.12.1.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
 EBUILD libupnp-1.14.0.ebuild 1082 BLAKE2B b0cb48b4ecc17ab31c3f81f7494e08dfe6d88131c7beda7af563f2121dbd668acc487ec44404889b7dbe528b0653625dc86618c93e9169ea1808a47b0b612781 SHA512 c60ace6978721467d52116c7d9d5ae23cef7ace0c48bc67b47d0a455f3dddcf05c207383105e7b241e76a6868f09f41564d00850e8ac933700ae67e0ff095b4e
-EBUILD libupnp-1.6.21.ebuild 1045 BLAKE2B c18ad1a6bd1921fd36231a872a3a6cb5f02cffd54eafd1a38578ad233679fd24220dfaa5cc71fe16a66a042b72c6e77189304465bb3e2f82d81bb19df4aafb46 SHA512 fb3556c66d4f250e6a84524457f97fcaccddf8a7f41cb1f98ab38cb9a6de78118482b9051d67aecc2d57bb9f034e12f5b265bdbd5f26ef309f692c7d37cdff4b
-EBUILD libupnp-1.6.25.ebuild 1045 BLAKE2B fec4de0cd91eb2621093f2e781c69a156a80c31cb84d625f2ff11cb9ae0ec7ae3f50d21e9a43d617c2ea9d89839feea1cc7b14559fbe87039f1d646793d3a144 SHA512 ed91708822c127df4d44ae12c48e7865cfee01baed2065ef86be50e3dce31c4a1ae83de0477f743a63c112139943a018b16a66f8c48d49765e78b2dc85a5ee18
-EBUILD libupnp-1.8.7.ebuild 1067 BLAKE2B 64e132b3283a88afff2ba7cc8a9eb114f08cf534df53796b96846e63056423cb6ea22fa391ba874c6e8d6a137157fd31d4ffb0ecfc9956e7a695ff6997b8f643 SHA512 130ca1144bd4770a1f8423ba3fcf63ff6c375b1486fc809f72f64bd96d3fc95135e58ead319ffc00dc8927827436dc139280b6c52294aa4494b45407c9ab0d8a
 MISC metadata.xml 703 BLAKE2B d58f26b13f9fbb325262d2e1321fd1fb9ad2d5a9197d513d6be56cbca8dbf4f0d62f035fa08122c581949bfc99efe6b40f309b7ab640c3be6e254958ce161077 SHA512 138228cb53146848897306aa3a398655dd0cf8a3d52b16379de4c5a9c7e302602533e1abe4fa111bb6c870a9e5758a2f3cbb5f45e4a9b5820c6e475a08dfb6cf
diff --git a/net-libs/libupnp/libupnp-1.12.1.ebuild b/net-libs/libupnp/libupnp-1.12.1.ebuild
deleted file mode 100644
index e370f8a87874..000000000000
--- a/net-libs/libupnp/libupnp-1.12.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools ltprune vcs-snapshot
-
-DESCRIPTION="An Portable Open Source UPnP Development Kit"
-HOMEPAGE="http://pupnp.sourceforge.net/"
-SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
-
-DOCS="ChangeLog"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
-)
-
-src_prepare() {
-	default
-
-	# fix tests
-	chmod +x ixml/test/test_document.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use x86-fbsd &&	append-flags -O1
-	# w/o docdir to avoid sandbox violations
-	econf $(use_enable debug) \
-		$(use_enable blocking-tcp blocking-tcp-connections) \
-		$(use_enable ipv6) \
-		$(use_enable reuseaddr) \
-		$(use_enable static-libs static) \
-		$(use_enable samples)
-}
-
-src_install() {
-	default
-
-	use static-libs || prune_libtool_files
-}
diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild
deleted file mode 100644
index fd3799cd52f3..000000000000
--- a/net-libs/libupnp/libupnp-1.6.21.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools ltprune
-
-DESCRIPTION="An Portable Open Source UPnP Development Kit"
-HOMEPAGE="http://pupnp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux"
-IUSE="debug doc ipv6 static-libs"
-
-DOCS="NEWS README ChangeLog"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.19-docs-install.patch
-	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
-)
-
-src_prepare() {
-	default
-
-	# fix tests
-	chmod +x ixml/test/test_document.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use x86-fbsd &&	append-flags -O1
-	# w/o docdir to avoid sandbox violations
-	econf \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable static-libs static) \
-		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
-}
-
-src_install() {
-	default
-	dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
-	use static-libs || prune_libtool_files
-}
diff --git a/net-libs/libupnp/libupnp-1.6.25.ebuild b/net-libs/libupnp/libupnp-1.6.25.ebuild
deleted file mode 100644
index ae692f9f658f..000000000000
--- a/net-libs/libupnp/libupnp-1.6.25.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools ltprune
-
-DESCRIPTION="An Portable Open Source UPnP Development Kit"
-HOMEPAGE="http://pupnp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="debug doc ipv6 static-libs"
-
-DOCS="NEWS ChangeLog"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.19-docs-install.patch
-	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
-)
-
-src_prepare() {
-	default
-
-	# fix tests
-	chmod +x ixml/test/test_document.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use x86-fbsd &&	append-flags -O1
-	# w/o docdir to avoid sandbox violations
-	econf \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable static-libs static) \
-		$(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
-}
-
-src_install() {
-	default
-	dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}
-	use static-libs || prune_libtool_files
-}
diff --git a/net-libs/libupnp/libupnp-1.8.7.ebuild b/net-libs/libupnp/libupnp-1.8.7.ebuild
deleted file mode 100644
index e370f8a87874..000000000000
--- a/net-libs/libupnp/libupnp-1.8.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools ltprune vcs-snapshot
-
-DESCRIPTION="An Portable Open Source UPnP Development Kit"
-HOMEPAGE="http://pupnp.sourceforge.net/"
-SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
-
-DOCS="ChangeLog"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
-)
-
-src_prepare() {
-	default
-
-	# fix tests
-	chmod +x ixml/test/test_document.sh || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use x86-fbsd &&	append-flags -O1
-	# w/o docdir to avoid sandbox violations
-	econf $(use_enable debug) \
-		$(use_enable blocking-tcp blocking-tcp-connections) \
-		$(use_enable ipv6) \
-		$(use_enable reuseaddr) \
-		$(use_enable static-libs static) \
-		$(use_enable samples)
-}
-
-src_install() {
-	default
-
-	use static-libs || prune_libtool_files
-}
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index 0d5b57b90fb0..0b39c015b73a 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,3 +1,6 @@
+AUX pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch 4724 BLAKE2B a098969ca78f538848a6616d6168dc74dc4d6c09f348e0e6436089341827346f52c3feb43a4de13453df940cad65b02f650c9e3cdfae4b449da0a5140e0fda54 SHA512 49846fd649f664ce29098800d4f9acee95ac4c06ff5499495b5bcc78269a33e9e66e9df126755aba9c48481c3a87040ff0a6bf1e4fc64bdf0492c55d428978f0
+AUX pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch 1564 BLAKE2B 30f7af19ae18c071b62e31a6a049e4e67f7b391a65ab52ef8d5270ef504a4057b35679c580ba056c9b1b3e5813fde5ccc8ca863bead4f62156e39f8c2947e4d2 SHA512 9fb5b8961e7c69cf8a902eaa28cb2147faf8f0809467911454758b793832831240992a3c27ecb722a4ea066df909c0cf12b4b1bf139037f647828eb4cc16fee0
+AUX pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch 3929 BLAKE2B fc7e12b7e8e9ff35556aa153496c2f7decd13bc78493d8c6f24449f063fe9c76b1772f6dc2b6cfc279c9731cc08735b27cd990ac6c4648c18e7f08c2c9fc3810 SHA512 e230041cff87d97947ad8caeb80c4858b8a1d435251d79b281fc0035da04aab549d1d5dc085681d98410da7e37359bb2ed721d132b321cce9a7326e4ff52c40f
 AUX pjproject-2.7.2-libressl.patch 3446 BLAKE2B 47b21f621ffd1990e276459d9692ed7e8a083b93fc8dd0f44225af7cbf8f8390f9790efd61c8c790a0f20da64cb7f47db4fd83a8f0604de9a1bce30d54b3079f SHA512 173fc80e85673c4036b433cbf8152c58862d4716d4d98688cfaebf4c5ed3df76b8d4893709577c1dfff82a02baeeb0220dcae1dafc2e69ea9472056727b0d0fc
 AUX pjproject-2.7.2-ssl-flipflop.patch 4336 BLAKE2B 999150475bd24989f64bb718d082ff1c40d5ba383103371550d2c682578a9c57d58b4029e512ac5a064fae3a526bd6e62fb645ba45b4067c47fd148bcce668aa SHA512 438a61353c0200d3f230b81cc13f565a178d078b4580aa468a9241b5b95f5a2336d039f4aaf99cd57e7b1042f4c0a1cafd00c29191e36c08f2194d984811b8d6
 AUX pjproject-2.9-config_site.h 2168 BLAKE2B 39d526e7a2ca79ea2c1e453d95d420a6245e7a93641227a908660fea553a8b66d5dfb6b7108b49dc0686de6522c2485b72a6e7511096cbfe50bdb2800d559e6f SHA512 d6456b7fa36b3256613eea515b78f0884fa6b56705817cd421a962f3c3302bf0efa69006432dffca49400ef75dc99ebc7639d270aebe5bc2d4a9a9515cc56408
@@ -5,6 +8,7 @@ AUX pjproject-2.9-ssl-enable.patch 3515 BLAKE2B d68479ba509513828d8488b60358ba00
 DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa SHA512 a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
 DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e63894fa06fb1d64e79b60fa4210968fd90ef47e5f5be3629675363c8756ce3bc1834caa9700654ab4c53efe676ee7 SHA512 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd
 DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
+EBUILD pjproject-2.10-r1.ebuild 3401 BLAKE2B 8b5cfd130ae21d8fd48c0365c8e4848255dd36f748552911047c53e38ca0f691bcbe13f810fd56f6310d59fb1c095aa2fb6e5dcb8c4d2ec22a24fb2c212cf69a SHA512 0ff637daf4776ba9520b8c6c7f585791336377ce2126ec757f660733ade933a8f189b405010c92909fc9c1e8c664ea6fdf5e4b438e8b56abc4ac82b27100dfe1
 EBUILD pjproject-2.10.ebuild 3159 BLAKE2B 5ece2e1494f3c116db79c04c687cee76c629d91784f8056c7056edc9989fded215464b59e4f4a93ed57433708715820ea4c475c1bcf6922134cb04b81e88ee4c SHA512 81d0eae10cff044d40fbdc2d7caa41d121ded8c7a1b29e8ab4698a724b9a73366442eb3652c7a234dd5cea65e43a8c2636ad862d8f1dc1493786489ee994570a
 EBUILD pjproject-2.7.2-r2.ebuild 2754 BLAKE2B e26d384028d5a0211c48963100f55daa7df626b39d4d64d25d7c60adc33b2925c1f4c61af822699977a8c07cb437c227990e33a53f98eabeb058cfc111b37557 SHA512 1c1b9856f09f6bae89f3da0ed8b5a622a84402bb3f663b8fc1e9d4f435700e157511ae120fb074fa7bf02df6b031cce138c1c288649751bbc84263e39cf36361
 EBUILD pjproject-2.9-r2.ebuild 3139 BLAKE2B a99817e6681eb3afdef894148d8f864839c92042219d7c4c7ecee832b77de2f59c0f2c2412f1508e2572ed1b0d665d304386bd9e99ee7de9e4cd34c7a085ec88 SHA512 ca61e9530f5a5ce630aa31b1d077236a9fb565bb9c70ab0171f3663a2ad7a2813e967c1581e07b0f18945587c34da061aae6504e390b2b472c9e58775b913621
diff --git a/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch b/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch
new file mode 100644
index 000000000000..0d7df686a157
--- /dev/null
+++ b/net-libs/pjproject/files/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch
@@ -0,0 +1,125 @@
+From 67e46c1ac45ad784db5b9080f5ed8b133c122872 Mon Sep 17 00:00:00 2001
+From: sauwming <ming@teluu.com>
+Date: Mon, 8 Mar 2021 17:39:36 +0800
+Subject: [PATCH] Merge pull request from GHSA-8hcp-hm38-mfph
+
+* Check hostname during TLS transport selection
+
+* revision based on feedback
+
+* remove the code in create_request that has been moved
+---
+ pjsip/include/pjsip/sip_dialog.h |  1 +
+ pjsip/src/pjsip/sip_dialog.c     | 15 +++++++++++++++
+ pjsip/src/pjsip/sip_transport.c  | 13 +++++++++++++
+ pjsip/src/pjsip/sip_util.c       | 11 ++++++++---
+ 4 files changed, 37 insertions(+), 3 deletions(-)
+
+diff --git a/pjsip/include/pjsip/sip_dialog.h b/pjsip/include/pjsip/sip_dialog.h
+index a0214d28c..e314c2ece 100644
+--- a/pjsip/include/pjsip/sip_dialog.h
++++ b/pjsip/include/pjsip/sip_dialog.h
+@@ -165,6 +165,7 @@ struct pjsip_dialog
+     pjsip_route_hdr	route_set;  /**< Route set.			    */
+     pj_bool_t		route_set_frozen; /**< Route set has been set.	    */
+     pjsip_auth_clt_sess	auth_sess;  /**< Client authentication session.	    */
++    pj_str_t		initial_dest;/**< Initial destination host.  	    */
+ 
+     /** Session counter. */
+     int			sess_count; /**< Number of sessions.		    */
+diff --git a/pjsip/src/pjsip/sip_dialog.c b/pjsip/src/pjsip/sip_dialog.c
+index 27530e4f2..9571b5a35 100644
+--- a/pjsip/src/pjsip/sip_dialog.c
++++ b/pjsip/src/pjsip/sip_dialog.c
+@@ -467,6 +467,10 @@ pj_status_t create_uas_dialog( pjsip_user_agent *ua,
+ 
+     /* Save the remote info. */
+     pj_strdup(dlg->pool, &dlg->remote.info_str, &tmp);
++    
++    /* Save initial destination host from transport's info */
++    pj_strdup(dlg->pool, &dlg->initial_dest,
++    	      &rdata->tp_info.transport->remote_name.host);
+ 
+ 
+     /* Init remote's contact from Contact header.
+@@ -1192,6 +1196,12 @@ static pj_status_t dlg_create_request_throw( pjsip_dialog *dlg,
+ 	    return status;
+     }
+ 
++    /* Copy the initial destination host to tdata. This information can be
++     * used later by transport for transport selection.
++     */
++    if (dlg->initial_dest.slen)
++    	pj_strdup(tdata->pool, &tdata->dest_info.name, &dlg->initial_dest);
++
+     /* Done. */
+     *p_tdata = tdata;
+ 
+@@ -1822,6 +1832,11 @@ static void dlg_update_routeset(pjsip_dialog *dlg, const pjsip_rx_data *rdata)
+      * transaction as the initial transaction that establishes dialog.
+      */
+     if (dlg->role == PJSIP_ROLE_UAC) {
++    	/* Save initial destination host from transport's info. */
++    	if (!dlg->initial_dest.slen) {
++    	    pj_strdup(dlg->pool, &dlg->initial_dest,
++    	      	      &rdata->tp_info.transport->remote_name.host);
++    	}
+ 
+ 	/* Ignore subsequent request from remote */
+ 	if (msg->type != PJSIP_RESPONSE_MSG)
+diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c
+index bef6d24fe..177274b08 100644
+--- a/pjsip/src/pjsip/sip_transport.c
++++ b/pjsip/src/pjsip/sip_transport.c
+@@ -2335,6 +2335,19 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr,
+ 		    if (!tp_iter->tp->is_shutdown &&
+ 			!tp_iter->tp->is_destroying)
+ 		    {
++			if ((type & PJSIP_TRANSPORT_SECURE) && tdata) {
++			    /* For secure transport, make sure tdata's
++			     * destination host matches the transport's
++			     * remote host.
++			     */
++			    if (pj_stricmp(&tdata->dest_info.name,
++				  	   &tp_iter->tp->remote_name.host))
++			    {
++			    	tp_iter = tp_iter->next;
++			    	continue;
++			    }
++			}
++
+ 			if (sel && sel->type == PJSIP_TPSELECTOR_LISTENER &&
+ 			    sel->u.listener)
+ 			{
+diff --git a/pjsip/src/pjsip/sip_util.c b/pjsip/src/pjsip/sip_util.c
+index a1bf878ea..cf916805d 100644
+--- a/pjsip/src/pjsip/sip_util.c
++++ b/pjsip/src/pjsip/sip_util.c
+@@ -1417,7 +1417,10 @@ PJ_DEF(pj_status_t) pjsip_endpt_send_request_stateless(pjsip_endpoint *endpt,
+      */
+     if (tdata->dest_info.addr.count == 0) {
+ 	/* Copy the destination host name to TX data */
+-	pj_strdup(tdata->pool, &tdata->dest_info.name, &dest_info.addr.host);
++	if (!tdata->dest_info.name.slen) {
++	    pj_strdup(tdata->pool, &tdata->dest_info.name,
++	    	      &dest_info.addr.host);
++	}
+ 
+ 	pjsip_endpt_resolve( endpt, tdata->pool, &dest_info, stateless_data,
+ 			     &stateless_send_resolver_callback);
+@@ -1810,8 +1813,10 @@ PJ_DEF(pj_status_t) pjsip_endpt_send_response( pjsip_endpoint *endpt,
+ 	}
+     } else {
+ 	/* Copy the destination host name to TX data */
+-	pj_strdup(tdata->pool, &tdata->dest_info.name, 
+-		  &res_addr->dst_host.addr.host);
++	if (!tdata->dest_info.name.slen) {
++	    pj_strdup(tdata->pool, &tdata->dest_info.name, 
++		      &res_addr->dst_host.addr.host);
++	}
+ 
+ 	pjsip_endpt_resolve(endpt, tdata->pool, &res_addr->dst_host, 
+ 			    send_state, &send_response_resolver_cb);
+-- 
+2.26.2
+
diff --git a/net-libs/pjproject/files/pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch b/net-libs/pjproject/files/pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch
new file mode 100644
index 000000000000..9dc9016e491a
--- /dev/null
+++ b/net-libs/pjproject/files/pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch
@@ -0,0 +1,45 @@
+From 97b3d7addbaa720b7ddb0af9bf6f3e443e664365 Mon Sep 17 00:00:00 2001
+From: Nanang Izzuddin <nanang@teluu.com>
+Date: Mon, 8 Mar 2021 16:09:34 +0700
+Subject: [PATCH] Merge pull request from GHSA-hvq6-f89p-frvp
+
+---
+ pjmedia/src/pjmedia/sdp_neg.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c
+index f4838f75d..9f76b5200 100644
+--- a/pjmedia/src/pjmedia/sdp_neg.c
++++ b/pjmedia/src/pjmedia/sdp_neg.c
+@@ -304,7 +304,6 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2(
+ {
+     pjmedia_sdp_session *new_offer;
+     pjmedia_sdp_session *old_offer;
+-    char media_used[PJMEDIA_MAX_SDP_MEDIA];
+     unsigned oi; /* old offer media index */
+     pj_status_t status;
+ 
+@@ -323,8 +322,19 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2(
+     /* Change state to STATE_LOCAL_OFFER */
+     neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER;
+ 
++    /* When there is no active local SDP in state PJMEDIA_SDP_NEG_STATE_DONE,
++     * it means that the previous initial SDP nego must have been failed,
++     * so we'll just set the local SDP offer here.
++     */
++    if (!neg->active_local_sdp) {
++	neg->initial_sdp_tmp = NULL;
++	neg->initial_sdp = pjmedia_sdp_session_clone(pool, local);
++	neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local);
++
++	return PJ_SUCCESS;
++    }
++
+     /* Init vars */
+-    pj_bzero(media_used, sizeof(media_used));
+     old_offer = neg->active_local_sdp;
+     new_offer = pjmedia_sdp_session_clone(pool, local);
+ 
+-- 
+2.26.2
+
diff --git a/net-libs/pjproject/files/pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch b/net-libs/pjproject/files/pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch
new file mode 100644
index 000000000000..b036951d9edd
--- /dev/null
+++ b/net-libs/pjproject/files/pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch
@@ -0,0 +1,108 @@
+From 90a16c523bfdf4d43c10506c972c5fd4250b2856 Mon Sep 17 00:00:00 2001
+From: Nanang Izzuddin <nanang@teluu.com>
+Date: Fri, 20 Nov 2020 10:52:22 +0700
+Subject: [PATCH] Race condition between transport destroy and acquire (#2470)
+
+* Handle race condition between transport_idle_callback() and pjsip_tpmgr_acquire_transport2().
+* Add transport destroy state check as additional of transport shutdown state check
+---
+ pjsip/src/pjsip/sip_transaction.c |  2 +-
+ pjsip/src/pjsip/sip_transport.c   | 34 +++++++++++++++++++++++++------
+ 2 files changed, 29 insertions(+), 7 deletions(-)
+
+diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c
+index 2b4ece7df..f663c7f4b 100644
+--- a/pjsip/src/pjsip/sip_transaction.c
++++ b/pjsip/src/pjsip/sip_transaction.c
+@@ -2443,7 +2443,7 @@ static void tsx_update_transport( pjsip_transaction *tsx,
+ 	pjsip_transport_add_ref(tp);
+ 	pjsip_transport_add_state_listener(tp, &tsx_tp_state_callback, tsx,
+ 					    &tsx->tp_st_key);
+-        if (tp->is_shutdown) {
++	if (tp->is_shutdown || tp->is_destroying) {
+ 	    pjsip_transport_state_info info;
+ 
+ 	    pj_bzero(&info, sizeof(info));
+diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c
+index 06fce358c..bef6d24fe 100644
+--- a/pjsip/src/pjsip/sip_transport.c
++++ b/pjsip/src/pjsip/sip_transport.c
+@@ -1071,6 +1071,19 @@ static void transport_idle_callback(pj_timer_heap_t *timer_heap,
+ 	return;
+ 
+     entry->id = PJ_FALSE;
++
++    /* Set is_destroying flag under transport manager mutex to avoid
++     * race condition with pjsip_tpmgr_acquire_transport2().
++     */
++    pj_lock_acquire(tp->tpmgr->lock);
++    if (pj_atomic_get(tp->ref_cnt) == 0) {
++	tp->is_destroying = PJ_TRUE;
++    } else {
++	pj_lock_release(tp->tpmgr->lock);
++	return;
++    }
++    pj_lock_release(tp->tpmgr->lock);
++
+     pjsip_transport_destroy(tp);
+ }
+ 
+@@ -1392,8 +1405,8 @@ PJ_DEF(pj_status_t) pjsip_transport_shutdown2(pjsip_transport *tp,
+     mgr = tp->tpmgr;
+     pj_lock_acquire(mgr->lock);
+ 
+-    /* Do nothing if transport is being shutdown already */
+-    if (tp->is_shutdown) {
++    /* Do nothing if transport is being shutdown/destroyed already */
++    if (tp->is_shutdown || tp->is_destroying) {
+ 	pj_lock_release(mgr->lock);
+ 	pj_lock_release(tp->lock);
+ 	return PJ_SUCCESS;
+@@ -2256,6 +2269,13 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr,
+ 	    return PJSIP_ETPNOTSUITABLE;
+ 	}
+ 
++	/* Make sure the transport is not being destroyed */
++	if (seltp->is_destroying) {
++	    pj_lock_release(mgr->lock);
++	    TRACE_((THIS_FILE,"Transport to be acquired is being destroyed"));
++	    return PJ_ENOTFOUND;
++	}
++
+ 	/* We could also verify that the destination address is reachable
+ 	 * from this transport (i.e. both are equal), but if application
+ 	 * has requested a specific transport to be used, assume that
+@@ -2311,8 +2331,10 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr,
+ 	    if (tp_entry) {
+ 		transport *tp_iter = tp_entry;
+ 		do {
+-		    /* Don't use transport being shutdown */
+-		    if (!tp_iter->tp->is_shutdown) {
++		    /* Don't use transport being shutdown/destroyed */
++		    if (!tp_iter->tp->is_shutdown &&
++			!tp_iter->tp->is_destroying)
++		    {
+ 			if (sel && sel->type == PJSIP_TPSELECTOR_LISTENER &&
+ 			    sel->u.listener)
+ 			{
+@@ -2382,7 +2404,7 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr,
+ 	    TRACE_((THIS_FILE, "Transport found but from different listener"));
+ 	}
+ 
+-	if (tp_ref!=NULL && !tp_ref->is_shutdown) {
++	if (tp_ref!=NULL && !tp_ref->is_shutdown && !tp_ref->is_destroying) {
+ 	    /*
+ 	     * Transport found!
+ 	     */
+@@ -2624,7 +2646,7 @@ PJ_DEF(pj_status_t) pjsip_transport_add_state_listener (
+ 
+     PJ_ASSERT_RETURN(tp && cb && key, PJ_EINVAL);
+ 
+-    if (tp->is_shutdown) {
++    if (tp->is_shutdown || tp->is_destroying) {
+ 	*key = NULL;
+ 	return PJ_EINVALIDOP;
+     }
+-- 
+2.26.2
+
diff --git a/net-libs/pjproject/pjproject-2.10-r1.ebuild b/net-libs/pjproject/pjproject-2.10-r1.ebuild
new file mode 100644
index 000000000000..ec03d01c4a60
--- /dev/null
+++ b/net-libs/pjproject/pjproject-2.10-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
+HOMEPAGE="https://www.pjsip.org/"
+SRC_URI="https://github.com/pjsip/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+
+# g729 not included due to special bcg729 handling.
+CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16"
+VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv vpx"
+SOUND_FLAGS="alsa portaudio"
+IUSE="amr debug epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc
+	${CODEC_FLAGS} g729
+	${VIDEO_FLAGS}
+	${SOUND_FLAGS}"
+
+PATCHES=(
+	"${FILESDIR}/pjproject-2.9-ssl-enable.patch"
+	"${FILESDIR}/pjproject-2.10-race-condition-between-transport-destroy-and-acquire.patch"
+	"${FILESDIR}/pjproject-2.10-CVE-2020-15260-tls-hostname-check.patch"
+	"${FILESDIR}/pjproject-2.10-CVE-2021-21375-negotiation-failure-crash.patch"
+)
+
+RDEPEND="net-libs/libsrtp:=
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	ffmpeg? ( media-video/ffmpeg:= )
+	g729? ( media-libs/bcg729 )
+	gsm? ( media-sound/gsm )
+	ilbc? ( media-libs/libilbc )
+	openh264? ( media-libs/openh264 )
+	opus? ( media-libs/opus )
+	portaudio? ( media-libs/portaudio )
+	resample? ( media-libs/libsamplerate )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	rm configure || die "Unable to remove unwanted wrapper"
+	mv aconfigure.ac configure.ac || die "Unable to rename configure script source"
+	eautoreconf
+
+	cp "${FILESDIR}/pjproject-2.9-config_site.h" "${S}/pjlib/include/pj/config_site.h" || die "Unable to create config_site.h"
+}
+
+src_configure() {
+	local myconf=()
+	local videnable="--disable-video"
+	local t
+
+	use debug || append-cflags -DNDEBUG=1
+	use ipv6 && append-cflags -DPJ_HAS_IPV6=1
+	append-cflags -DPJMEDIA_HAS_SRTP=1
+
+	for t in ${CODEC_FLAGS}; do
+		myconf+=( $(use_enable ${t} ${t}-codec) )
+	done
+	myconf+=( $(use_enable g729 bcg729) )
+
+	for t in ${VIDEO_FLAGS}; do
+		myconf+=( $(use_enable ${t}) )
+		use "${t}" && videnable="--enable-video"
+	done
+
+	[ "${videnable}" = "--enable-video" ] && append-cflags -DPJMEDIA_HAS_VIDEO=1
+
+	LD="$(tc-getCC)" econf \
+		--enable-shared \
+		--with-external-srtp \
+		${videnable} \
+		$(use_enable alsa sound) \
+		$(use_enable amr opencore-amr) \
+		$(use_enable epoll) \
+		$(use_enable opus) \
+		$(use_enable portaudio ext-sound) \
+		$(use_enable resample libsamplerate) \
+		$(use_enable resample resample-dll) \
+		$(use_enable resample) \
+		$(use_enable silk) \
+		$(use_enable speex speex-aec) \
+		$(use_enable ssl) \
+		$(use_with gsm external-gsm) \
+		$(use_with portaudio external-pa) \
+		$(use_with speex external-speex) \
+		$(usex webrtc '' --disable-libwebrtc) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	emake dep LD="$(tc-getCC)"
+	emake LD="$(tc-getCC)"
+}
+
+src_install() {
+	default
+
+	newbin pjsip-apps/bin/pjsua-${CHOST} pjsua
+	newbin pjsip-apps/bin/pjsystest-${CHOST} pjsystest
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r pjsip-apps/src/samples
+	fi
+
+	use static-libs || rm "${ED}/usr/$(get_libdir)"/*.a || die "Error removing static archives"
+}
diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index d0238bb123b9..78d0f8dd5298 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,11 +1,5 @@
-DIST xrootd-ceph-4.12.4.tar.gz 81253 BLAKE2B 0b3d0e347e02b6948550c44487e0edb1c65075407b444b6242fb3e647e3fe91ff2d03ca10f13b5ae05ffa931eaf0b73a75055999a55b74ec20d8e6b853865f67 SHA512 cd793d18f6162a98f50f605177aae1421227226540fe3e632adae3632c053e78f3b53b1e09f6f60a9c64a5a5e5d019aceaf1ab1c11dde81e5c36512b47ac0ac9
-DIST xrootd-ceph-4.12.5.tar.gz 81838 BLAKE2B a61a814741abd04723755122606eef4544769d5cbe3828977617384a8eaddcfae4591f1ac2515020f300feff5cb11b7af362c15719313085e0f76b5157ab862c SHA512 db0fe7f8713ddf91ce200b364d460206ecf2a08153fb561a99e0780db84ad9d716f9f9fbc3994258e9269fce08d16326c4473bdae200c644cbf4d3bd1144a6eb
-DIST xrootd-ceph-5.0.2.tar.gz 81255 BLAKE2B 529d2c361cc7660cdbb481cdbae1fbf4cd706f29df868c645775b96efa7efaaecd9ea8b7d915c15b5ff78ad1395bb8271a3f1c1105ea0b42dced77efa33acaa7 SHA512 9f8de694a9a864ee0a963bb47c603d2cd3a77b4e13efacdd7f35674016358ce3b0a3fc5850098a29774749f54fa82db12c0e56b55d814873c124d9e19c7c23c5
 DIST xrootd-ceph-5.0.3.tar.gz 81835 BLAKE2B 1be45c78dd0ec4b20451cfa4a8a579e076e718509a47fa04027207c12e433338decefb9f82749cc15cae3cad75d97485fe0a7d6582cdcc0739bd222bc1d97b6b SHA512 3338a0ab0446e4c7ee3d232f5cce8f93c49e040b4792aa52f9dcf6f27f6767e6ffbaff17eb30a87c5b3ff713e1b0c4edb24d8d116c91351c4ed0c13963f80fc9
-DIST xrootd-ceph-5.1.0.tar.gz 81939 BLAKE2B 607fe5d31369c88402d7ed993fde3f058f873defe97900f2b7909a3630f6927efeb98c08acd31be68ec7d6b997464f6d3cea5da5d08a3e84570ff670861a50f8 SHA512 cc05a00684bde5ee9adfe61f261393a177d21569f4570d41fbaf65d1276dbc18829d1b532ec10df93a1a60d25fb2de54078b4bf1cb30ab383d4af92178147ee1
-EBUILD xrootd-ceph-4.12.4.ebuild 679 BLAKE2B 6171c6bf61a24f633fbb774d23b398160fe9d00ae797d6c40fc2058ce33c4216e6a1a79846d38e6cf489fa3655772441505b30cf372a19e25f6fe5c2398d4948 SHA512 72c4e43a05aee572e139050e2428046f70e1ce2199698998cabc1f3f391f5dd8369a8ed081a39fca733999ca4cca102a2f7a4baf8de9605b127f2d14f5df2dfd
-EBUILD xrootd-ceph-4.12.5.ebuild 680 BLAKE2B dffac256f61140144d51cbfc72d4c996273be0fa1f55685138d040e3acde5f46ba50b07ed601c5c06cac56c944ea1c22e506f350acbaab33e17b0a77486adc86 SHA512 9f014c81e32d0936307d9c000fb69ab7d992cb14e22a9d111ae582cfd3fa946241108d3ab915f92fdce9bfc4b7f1f8ef50130ca753f86d8f101a3407eddba5cc
-EBUILD xrootd-ceph-5.0.2.ebuild 954 BLAKE2B 7a80536c0f93bd17977c5dcd593a5657378d5c61e22a94865dbeb9b5aafab7c5b0e82a0ce7cf5bbdb4b42e61bc158eeafacca49f61abf04d8bbb94e7a8548ef3 SHA512 a5313627b4adc03f9fd895b447ca57cb083ce2f7547752c8413d8ae28016d157ecab4ee49ae1690abbaef2a7c62275eba352101bb18d74c8703a9e0bec53710e
+DIST xrootd-ceph-5.1.1.tar.gz 81981 BLAKE2B 6f0ddfd2e20c0127223d3d41e614fbefefb8e1ce20ae9a805fc0d01d7c442f0b9b9323ba1761a9b5a160f63bfe1c823384f84c160eb98d316bddc3c1affe2b6c SHA512 fede94cbe614b6c7dced07d1bbe8661706c0e0c98c77cab0a777b62cb7b1a0790ce597bb6764b36b6d2cba9884f23f6d37d54adb5b11cb6d20e32b95a2877ef3
 EBUILD xrootd-ceph-5.0.3.ebuild 953 BLAKE2B 3be28efa893f4d0a7b9a37229e460acea95e45f3714901e499ed05010199722a7e8000faa75b12b55a79fcd1e101a51c9e427604891cae7f71cb95736b188539 SHA512 e0d229329f66f98099a15968b2965a9136c59d6eda74857531cfc56a29e304488ddfd2c37e618983f95fe37d0f0596419f98b1aee429a45a63fe82d29e7625cd
-EBUILD xrootd-ceph-5.1.0.ebuild 954 BLAKE2B 5a3a42d548a67994e6a20fcd5747c7f3e28ad5e67dd65f1b29c5b9f06fa39bca44101283791011a2f3fb2ea8c1577a188deb1cb0ab7db97f522fb23bf9925123 SHA512 d172a7eac4a2f2a23241257cba29df211fdba7bd136dcb7f0960c7f2c1fd19a3f043ad24be1fbf14a312435b16608592d7f303dd86fd2e5de04e9794002706b3
+EBUILD xrootd-ceph-5.1.1.ebuild 954 BLAKE2B 5a3a42d548a67994e6a20fcd5747c7f3e28ad5e67dd65f1b29c5b9f06fa39bca44101283791011a2f3fb2ea8c1577a188deb1cb0ab7db97f522fb23bf9925123 SHA512 d172a7eac4a2f2a23241257cba29df211fdba7bd136dcb7f0960c7f2c1fd19a3f043ad24be1fbf14a312435b16608592d7f303dd86fd2e5de04e9794002706b3
 MISC metadata.xml 496 BLAKE2B e2a202798936cfc2061b2660ab7ad32a4a4c02aab9789e46bdd5981795815505da531ab2891c9022447d2154b6070ddba3e1daa68f25b2373757cbe17d960a6c SHA512 43fa4446767cb279125fdedcaf415af260c42871460fd1144aff7bf47769070da9e9c4fc0e8b32c87fdd879f8dca24586a0764f0ad8a3ba715e1d95e07d60f70
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.ebuild
deleted file mode 100644
index 9936f476eb33..000000000000
--- a/net-libs/xrootd-ceph/xrootd-ceph-4.12.4.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
-
-inherit cmake
-
-DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~amd64-linux"
-
-DEPEND="net-libs/xrootd
-	!<net-libs/xrootd-4.10.0[rbd]
-	sys-cluster/ceph"
-RDEPEND="${DEPEND}"
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so"
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-4.12.5.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-4.12.5.ebuild
deleted file mode 100644
index f701427b94c7..000000000000
--- a/net-libs/xrootd-ceph/xrootd-ceph-4.12.5.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
-
-inherit cmake
-
-DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-
-DEPEND="net-libs/xrootd
-	!<net-libs/xrootd-4.10.0[rbd]
-	sys-cluster/ceph"
-RDEPEND="${DEPEND}"
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so"
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.0.2.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.0.2.ebuild
deleted file mode 100644
index f38a421f4865..000000000000
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=net-libs/xrootd-5.0.0
-	sys-cluster/ceph"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-util/cppunit )"
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrdCeph.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdCephTests\.so"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-		# As of 5.0.0 the default plug-in version is still 4.
-		-DPLUGIN_VERSION=$(ver_cut 1)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.1.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.1.1.ebuild
index bdacb70cc802..bdacb70cc802 100644
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.1.0.ebuild
+++ b/net-libs/xrootd-ceph/xrootd-ceph-5.1.1.ebuild
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 73fd6172241a..37ceac7ba624 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -5,7 +5,7 @@ AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
-DIST xrootd-5.1.0.tar.gz 2862622 BLAKE2B cb166adcd60b263f7fbed22033fe362ed5b32b7a05c76ff2d8a5ab25d730673d0c5d22bc41816083c84c3f14832cca34d801738594c7b58dcebbea9882a7df37 SHA512 f9bb293433e16b86d3395f29cf23f10a4a5447b367aa762219559278b3f75402892be85e0ca914762bfe892ad0dcc05bcfc64ac1ad0316c5855586141b537bad
+DIST xrootd-5.1.1.tar.gz 2869346 BLAKE2B daad5f4e1253dce7d83d144aabbbd24afca9affafc6643b8e7124c68ff8651a3a15ed1b40680a40b737411132ccd0b697d4cacfcdd2bd64d5b5640875684c464 SHA512 aee5373f2064eaa489abc7a560ca61b98f824e8f0b3665dbea82e0362a91a3b4f9e6457d0a304692ae58619ef7c16333a8c69a69d282bd48948a968dd4a06e4f
 EBUILD xrootd-5.0.3.ebuild 2639 BLAKE2B 53277652dfe77b32d5dbeb98f1aea19900f68ae5de1f700191dc08d324e4cfbb068883d9ce2f6bb517389279b6eb884997c4df40d0c9bbecf32a51ee559bd3f6 SHA512 a60b4f76c8e052dc37d58f507704d8013cc8f170b4f24555055b0e0761ec2a6b0bdfd24432de468c4211dade85fa5674a2afd04b601c52980c3648c54bc06e36
-EBUILD xrootd-5.1.0.ebuild 2641 BLAKE2B 667907d947a41fc82698201b7cc7d22ec1cd3263670d9208ea65a0670e7224e38c8daf6a2715f8641e4756cca702f4ca925f26c5320afe9b1200f1b54739bc17 SHA512 7694c5f863ed39a248284836fcdd44b9bcde6aca22dbfa1ff7a9c8cee7edd7cbb1186e4e5bc6ab4e2999da0602c009854c25253002f7122192699b3d766903e4
+EBUILD xrootd-5.1.1.ebuild 2641 BLAKE2B 667907d947a41fc82698201b7cc7d22ec1cd3263670d9208ea65a0670e7224e38c8daf6a2715f8641e4756cca702f4ca925f26c5320afe9b1200f1b54739bc17 SHA512 7694c5f863ed39a248284836fcdd44b9bcde6aca22dbfa1ff7a9c8cee7edd7cbb1186e4e5bc6ab4e2999da0602c009854c25253002f7122192699b3d766903e4
 MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36
diff --git a/net-libs/xrootd/xrootd-5.1.0.ebuild b/net-libs/xrootd/xrootd-5.1.1.ebuild
index 1aeb46c6bf10..1aeb46c6bf10 100644
--- a/net-libs/xrootd/xrootd-5.1.0.ebuild
+++ b/net-libs/xrootd/xrootd-5.1.1.ebuild