gentoo resync : 27.03.2021

41 files changed, 386 insertions, 636 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index e98ac0895c31..3a35bd60632d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index ca680a3b9c3f..701f467cba72 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -3,7 +3,5 @@ AUX axhttpd.initd 515 BLAKE2B cd09293cd4741269493860cf9e18feb23f1ee496eb23145674
 AUX config 3064 BLAKE2B baedffe4b9e8696a0f933ba761db3f3b8d4d2cf4b910c22077857a43ebcd31ad388423a8c12257a41481a63466d3d4ca85ecd05c75dfa1c9552d17ade2834aaa SHA512 6589e3912ba9231db660b8afe71a6e233807108a8662860667dcae3b6cc4d77fa405503d6eb9d520669cd26fb67f418095b6174b88527c290818fc6400cb65b0
 AUX explicit-libdir-r1.patch 1578 BLAKE2B 1495850dff9ad1dab1e4820158cff5f706ea3420d664ae2fcb7ae9200790e52fbac093ac510812b80d0eaa177a5d210b6b9c43e80d0317ae4621fe3c18b65c01 SHA512 8e10b10eb6959e309e504a0ff2c16795e258f0fab57b97ffb3b64a6c3b84de8e782cc1697983ed7ff0a05a211e43146ecf39588782e8d3c813a4aa053d94557a
 DIST axTLS-2.1.5.tar.gz 1318286 BLAKE2B a4f7cb551f3569fbc9a3a7e0e8faa929a5310fdb412283487fedd4a58e36a65529ebd9aec859027ca6df8e69db85b9f908b56f8d37284548b3984da10774ca3d SHA512 d208b174c31a144a779185e77834a34b0fdd15e8cadf4665b8fd76dcb3207955ed687f3d86d1e60f85d108ecccfd900a76e6d045d16a7182001e0b58da09be18
-EBUILD axtls-2.1.5-r1.ebuild 4678 BLAKE2B de0672efc998ede965c0680e0388edbc5f76df9e00649ca77877c8ad10a5d265b6fb99c99a7f49e1172a4e1c3abafe53e576d4f1a6862d8cc1b963befba4b933 SHA512 304a0a97988470d3d9a13969da303f5689c38cd8c5c2a5996ac39db7084bba234d81278ce78aaf243b26446aa228cc909690caa49104d27b006e300774a0dc35
 EBUILD axtls-2.1.5-r100.ebuild 4859 BLAKE2B 11e8ff0ae951c4d844bd00741f61d070216c0bafdd207c234c3f512b1bdff68e95bf351f6e464d9b0c8cdcd7efb3f979feab4bf22347de54e60ab165e9e7d6f1 SHA512 ea8bf4f5b387c91aa8e77f73282d45a90183c90237d302cb3060e8fe06a3c9fcf7414800b06d8c533aaae33662eb3a58fb002ef6d2c997c6b1637e3ae054dec9
-EBUILD axtls-2.1.5.ebuild 4672 BLAKE2B fcae6be59c45d8041d395bd73c0f6d6f3d99418a93310ffab9613cbb35e335c67f947ea9fcbf05ee8d317da34fe8733b05608f89004fdfc59e9e0ae6d036527f SHA512 4e103608244c3026cd8dda2967c9635e393c7f288282b63017c409a0e5e89f61496df5c5410163eaac8ad74ffd6b18d063a2f02602a70773df9cc8fe2136d5f9
 MISC metadata.xml 632 BLAKE2B b83cd23e97a4fdd09ea7354c1245dd65e54c50b418538c2ef71ae9054626861b6516268fcd37485ba19d1981024c47d869cdce00b276473200a7352c29072b1a SHA512 bfd387d998bcf2a457ff01752b553307b0de430cb9372115b366ab80a10866ede54b8ee149c726aba6f12c8cc3c5ea089dc5b25083e95594d8912e181a8626b0
diff --git a/net-libs/axtls/axtls-2.1.5-r1.ebuild b/net-libs/axtls/axtls-2.1.5-r1.ebuild
deleted file mode 100644
index f628f4d67dee..000000000000
--- a/net-libs/axtls/axtls-2.1.5-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib multilib-minimal savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-#	make menuconfig
-#
-# Now configure axtls as you want.  Finally save your config file:
-#
-#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version.  You can then run emerge again with
-# your configuration by doing
-#
-#	USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-code"
-
-LICENSE="BSD GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	httpd? (
-		cgi-lua? ( dev-lang/lua:0= )
-		cgi-php? ( dev-lang/php[cgi] )
-	)"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
-	static? ( httpd )
-	cgi-lua? ( httpd )
-	cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
-	use httpd && {
-		ebegin "Creating axtls user and group"
-		enewgroup ${AXTLS_GROUP}
-		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
-	}
-}
-
-src_prepare() {
-	tc-export AR CC
-
-	eapply "${FILESDIR}/explicit-libdir-r1.patch"
-
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
-	sed -i -e 's: -g::' config/Rules.mak || die
-	sed -i -e 's: -g::' config/makefile.conf || die
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-use_flag_config() {
-	cp "${FILESDIR}"/config config/.config || die
-
-	#Respect CFLAGS/LDFLAGS
-	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
-		config/.config || die
-	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDFLAGS}\":" \
-		config/.config || die
-
-	#The logic is that the default config file enables everything and we disable
-	#here with sed unless a USE flags says to keep it
-	if use httpd; then
-		if ! use static; then
-			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
-				config/.config || die
-		fi
-		if ! use cgi-php && ! use cgi-lua; then
-			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
-				config/.config || die
-		fi
-		if ! use cgi-php; then
-			sed -i -e 's:,.php::' config/.config || die
-		fi
-		if ! use cgi-lua; then
-			sed -i -e 's:\.lua,::' \
-				-e 's:lua:php:' \
-				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
-				config/.config || die
-		fi
-	else
-		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
-			config/.config || die
-	fi
-
-	emake -j1 oldconfig < <(yes n) > /dev/null
-}
-
-multilib_src_configure() {
-	#Per-ABI substitutions.
-	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
-		Makefile || die
-
-	#Use CC as the host compiler for mconf
-	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
-		config/Rules.mak || die
-
-	if use savedconfig; then
-		restore_config config/.config
-		if [[ -f config/.config ]]; then
-			ewarn "Using saved config, all other USE flags ignored"
-		else
-			ewarn "No saved config, seeding with the default"
-			cp "${FILESDIR}"/config config/.config || die
-		fi
-		emake -j1 oldconfig < <(yes '') > /dev/null
-	else
-		use_flag_config
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use savedconfig; then
-		save_config config/.config
-	fi
-
-	emake PREFIX="${ED}/usr" install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
-	fi
-
-	# The build system needs to install before it builds docs
-	if multilib_is_native_abi && use doc; then
-		emake docs
-		dodoc -r docsrc/html
-	fi
-}
-
-multilib_src_install_all() {
-	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
-		mv "${ED}"/usr/bin/{,ax}htpasswd || die
-	fi
-
-	if use httpd; then
-		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
-		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
-	fi
-
-	docompress -x /usr/share/doc/${PF}/README
-	dodoc README
-}
diff --git a/net-libs/axtls/axtls-2.1.5.ebuild b/net-libs/axtls/axtls-2.1.5.ebuild
deleted file mode 100644
index 87f9e7cb335d..000000000000
--- a/net-libs/axtls/axtls-2.1.5.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib multilib-minimal savedconfig toolchain-funcs user
-
-################################################################################
-# axtls CONFIG MINI-HOWTO
-#
-# Note: axtls is highly configurable and uses mconf, like the linux kernel.
-# You can configure it in a couple of ways:
-#
-# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
-# you want, and possibly a lot more.
-#
-# 2) You can create your own configuration file by doing
-#
-#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
-#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
-#	make menuconfig
-#
-# Now configure axtls as you want.  Finally save your config file:
-#
-#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
-#
-# where ${PV} is the current version.  You can then run emerge again with
-# your configuration by doing
-#
-#	USE="savedconfig" emerge axtls
-#
-################################################################################
-
-MY_PN=${PN/tls/TLS}
-
-DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
-HOMEPAGE="http://axtls.sourceforge.net/"
-SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-code"
-
-LICENSE="BSD GPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86"
-
-IUSE="httpd cgi-lua cgi-php static static-libs doc"
-
-# TODO: add ipv6, and c#, java, lua, perl bindings
-# Currently these all have some issue
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="
-	httpd? (
-		cgi-lua? ( dev-lang/lua:0= )
-		cgi-php? ( dev-lang/php[cgi] )
-	)"
-
-#Note1: static, cgi-* makes no sense if httpd is not given
-REQUIRED_USE="
-	static? ( httpd )
-	cgi-lua? ( httpd )
-	cgi-php? ( httpd )"
-
-AXTLS_GROUP="axtls"
-AXTLS_USER="axtls"
-
-pkg_setup() {
-	use httpd && {
-		ebegin "Creating axtls user and group"
-		enewgroup ${AXTLS_GROUP}
-		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
-	}
-}
-
-src_prepare() {
-	tc-export AR CC
-
-	eapply "${FILESDIR}/explicit-libdir-r1.patch"
-
-	#We want CONFIG_DEBUG to avoid stripping
-	#but not for debugging info
-	sed -i -e 's: -g::' config/Rules.mak || die
-	sed -i -e 's: -g::' config/makefile.conf || die
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-use_flag_config() {
-	cp "${FILESDIR}"/config config/.config || die
-
-	#Respect CFLAGS/LDFLAGS
-	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
-		config/.config || die
-	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
-		config/.config || die
-
-	#The logic is that the default config file enables everything and we disable
-	#here with sed unless a USE flags says to keep it
-	if use httpd; then
-		if ! use static; then
-			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
-				config/.config || die
-		fi
-		if ! use cgi-php && ! use cgi-lua; then
-			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
-				config/.config || die
-		fi
-		if ! use cgi-php; then
-			sed -i -e 's:,.php::' config/.config || die
-		fi
-		if ! use cgi-lua; then
-			sed -i -e 's:\.lua,::' \
-				-e 's:lua:php:' \
-				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
-				config/.config || die
-		fi
-	else
-		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
-			config/.config || die
-	fi
-
-	emake -j1 oldconfig < <(yes n) > /dev/null
-}
-
-multilib_src_configure() {
-	#Per-ABI substitutions.
-	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
-		Makefile || die
-
-	#Use CC as the host compiler for mconf
-	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
-		config/Rules.mak || die
-
-	if use savedconfig; then
-		restore_config config/.config
-		if [[ -f config/.config ]]; then
-			ewarn "Using saved config, all other USE flags ignored"
-		else
-			ewarn "No saved config, seeding with the default"
-			cp "${FILESDIR}"/config config/.config || die
-		fi
-		emake -j1 oldconfig < <(yes '') > /dev/null
-	else
-		use_flag_config
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use savedconfig; then
-		save_config config/.config
-	fi
-
-	emake PREFIX="${ED}/usr" install
-
-	if ! use static-libs; then
-		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a || die
-	fi
-
-	# The build system needs to install before it builds docs
-	if multilib_is_native_abi && use doc; then
-		emake docs
-		dodoc -r docsrc/html
-	fi
-}
-
-multilib_src_install_all() {
-	if [[ -f "${ED}"/usr/bin/htpasswd ]]; then
-		mv "${ED}"/usr/bin/{,ax}htpasswd || die
-	fi
-
-	if use httpd; then
-		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
-		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
-	fi
-
-	docompress -x /usr/share/doc/${PF}/README
-	dodoc README
-}
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 505d8e67c4b4..c8072b43f46a 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,7 +1,9 @@
 DIST glib-networking-2.62.4.tar.xz 186004 BLAKE2B 0fbf41cc916a76d23382eb6ae84316e5328c682c4e440f304a978be897f81778e96a201a19dfdc4bd912c144d4013b4cb6344a2a0031fc2898f4af31ef0b43fa SHA512 cd233eeed7ffb8458f4e0316a08927713899e64ce2654aa34f267ccf09d2516e7dee79012dd9e1488d3e8c0e1795c3525523bf8dc5f82a71c1b202942c38363a
 DIST glib-networking-2.64.3.tar.xz 189760 BLAKE2B 5f067aacd0d7724367eabf961d81fba9d77a7057cc60ffc7bada0f55a7eff0bcc2388e8298792636c77252b9494a6a7d36bcfd227bdfbbf66e5d45cf77dfc1bb SHA512 01251f7f95d1c331e883d5ee7857bad0c0d6308991e437ff54ed63e718bb30a12e872755e0611e2bf6ccb2a01c52ba865fe0d94ac69dbab37d74afe063a0590d
 DIST glib-networking-2.66.0.tar.xz 193920 BLAKE2B bba3c74a3676c15fbe3b9cb97aafb3c9320ebb6f7be1479a66cefd233aa5a548a605be74156445e6a54e8cdb307a09e2916f6d8736640ee38fce9ca289de195f SHA512 697798864746b40542873257a789290cacee425467e32c0eb096c87e124b37510753a990ef5d350f1db85c24da88e448bca9d8d8b4308123a74feac299176de5
+DIST glib-networking-2.68.0.tar.xz 237992 BLAKE2B dab2b692c48366ba71325e1808d51a1d7614c29c21448f6d95388c262ec7c6d647489be933595d4e38151d1eef70385181d891d6613e6d1a0a2c95b3b0d764e9 SHA512 3961851d1c39352bc6cbacbc966a7ad075467ca17006eca432ea0646b660fed85951951aee72597a8a595420e6160fd91dca612c241a0505f4f0a67922ef1771
 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 1737 BLAKE2B 884e76bf5d410629ead60596404728eb4b7f0cd97ab9ca3863e5b0c2a9b0a20a824ac29b7938b78b6f64cbf6650315b087b488719bc5c6e411b6334d41ceada8 SHA512 450990fe682cda41c169ef323c387a466fb59007717af17734c4a78f82cbaa993be4e125b4bd88c83374cb3832c4bcf06fcac0507d10dca09ee601477ef74677
+EBUILD glib-networking-2.68.0.ebuild 2084 BLAKE2B 186a10f4c6bb5d5a029c1bf7c94ad911ef215ab30399f48cb4f715cecfe45bd1e23dad51527f9a8d2bd1971c36c4abccb5a9b4ecb4ad3a8c2bea61e77ff60c57 SHA512 4470c628b24ff3df4eeb27d640530c2557940a35d9001c75ab62a8aec399f8096b660f009b939ceedf668f537f64bbbd5c816c8649d07352118ef63783bb4dbf
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.68.0.ebuild b/net-libs/glib-networking/glib-networking-2.68.0.ebuild
new file mode 100644
index 000000000000..5d4e94cae8f7
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.68.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson multilib-minimal xdg
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
+
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.67.0:2[${MULTILIB_USEDEP}]
+	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/gnutls-3.6.5:=[${MULTILIB_USEDEP}]
+	ssl? ( app-misc/ca-certificates )
+	gnome? ( gnome-base/gsettings-desktop-schemas )
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/gnutls[pkcs11] )
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+src_prepare() {
+	xdg_src_prepare
+
+	if ! use test ; then
+		# Don't build tests unconditionally
+		# This is a hack to avoid needing gnutls[pkcs11] when USE=-test
+		# It may become a real runtime dependency in future
+		# Please check!
+		# bug #777462
+		sed -i "/^subdir('tls\/tests')/d" meson.build || die
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dgnutls=enabled
+		-Dopenssl=disabled
+		$(meson_feature libproxy)
+		$(meson_feature gnome gnome_proxy)
+		-Dinstalled_tests=false
+		-Dstatic_modules=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	multilib_pkg_postrm() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/net-libs/libcapi/Manifest b/net-libs/libcapi/Manifest
index b25089ef68f4..14ac5d39b33b 100644
--- a/net-libs/libcapi/Manifest
+++ b/net-libs/libcapi/Manifest
@@ -1,4 +1,4 @@
 AUX libcapi-3.0.7-remove-libcapi20dyn.patch 890 BLAKE2B 308336e32618662b644d03b808df27da49d2dd6088caaa5c74ec5e18674919736649f9d01b19fe4f52749421b21c57338236ddc940505975a927f4921c621634 SHA512 7e5216d7dab21d397da85b6b8c6c5a3e4cd3b0a724ff30baeb9a4651981e1cf3cdae64f6b2a628026132e492d49f142a249db0a99f82cdb281efeddacd3a986e
 DIST libcapi20-3.0.7.tar.bz2 474174 BLAKE2B f1d1838882aafa48c76b9843c0c1cb8fb8774bab3a6ae79825c12ed5558f09257d8229266fd1729e77fdda575b30c729613521520acd1dbf636891fcf7d33b18 SHA512 c14e493f34fbd8477aed8efc0e6ee8dc07c6007be75610d59a15ce23f48cd5cd53da1b1ac64c11e7516df5aff40877c76ce7a6d72b5c7b1d24beee7592a51bbe
 EBUILD libcapi-3.0.7-r1.ebuild 730 BLAKE2B b5cc3adbe86af91df5f546e20e5d94ecc904d8f57f467b2487f5f7f60928aae115b8de864722e1af0533d4a1381c88c6175e8524cf33aeaf1f43470ded37d335 SHA512 f910b8a05bec1d4c39c7a1bb9482b7b021890a27bddc8801ad885362e5811bab6cb7eb9e32ce37a9ab000c6a414695f9e01c12ee4f6575eef72c4cacd2b61376
-MISC metadata.xml 247 BLAKE2B 2b0debd151e3491250440c82b4a798dc2f0b66d7596743046db44dcd61da4db89c08109295eda8649f595ffd4673579cba68f48e8466bc0294c30c50c17b1e23 SHA512 150c10fea209759328d07c0c018cfe5e89e632e4a5e1954f12ed48e75e0a7a7f9fc084cde4214fcf074b9504dc78b79e788c05db6cecc9521f6afdd852892c9a
+MISC metadata.xml 249 BLAKE2B 8bf164710d8652adfa4a7795ecc17866c07aafbf2ef81e0f8b9ed47cea9378aae74d530fddcbfbc4ee2d1d9ddf4b42a5246df7194ef7e1adf526d2f7a34de606 SHA512 0d72ce1b7c28360771f17093f3184e100e5beb2ebb873d5c47b80ced074bf9a7fe083e0cea8b1867bfc6d40c552dc4cd28f701fac69964321ba7f96fe4f9bbb8
diff --git a/net-libs/libcapi/metadata.xml b/net-libs/libcapi/metadata.xml
index 8c68ad9f558e..c74c9b0352cf 100644
--- a/net-libs/libcapi/metadata.xml
+++ b/net-libs/libcapi/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>NP-Hardass@gentoo.org</email>
-		<name>NP-Hardass</name>
+		<email>np-hardass@gentoo.org</email>
+		<name>Adam Feldman</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest
index 270791701c68..de264dc0cd97 100644
--- a/net-libs/libhackrf/Manifest
+++ b/net-libs/libhackrf/Manifest
@@ -1,4 +1,6 @@
 DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
+DIST hackrf-2021.03.1.tar.xz 13661964 BLAKE2B 0a00b2d24cc6ac7ca36f66e8f5b3029cfd446a6c5b5427f7d25db6dd191693c1e1c010abd85907813d55c6bd367780c70860b4f7e7f83fb9970d425311893780 SHA512 4a88b877a9f6fee0c8d9496eb265655af4baa678e862ca6147596cd3a1d85dd50315da6531efa54d050847ce5068c4726393b4897d40576888d10a898ad57139
 EBUILD libhackrf-2018.01.1.ebuild 1007 BLAKE2B 6bec7c1a938fa883218ac3e1d2af9280baff3e6ad0552e598fc63ff815debb1c621b5bb413b645934882d6c1ddd349065e866e7e0de2c5760478e03de5cf7af6 SHA512 1696a2d932930bd128e0cbae2b334a290e686263cbf85881994d922f155d31d3558dd1fc37047f531ab5d569814f74bfc30c8f94937af88a59181a73cf75293a
+EBUILD libhackrf-2021.03.1.ebuild 1007 BLAKE2B 2ae026d3684039e642c7665fc39a6b2a57646fe59f479c38a314b5d8b9bd966e310536f93f5fc44e12c3af50bf88e43d6a8be3c9196bcf19db041b854dde10c4 SHA512 d6515e507b109e24e3a73e149cda9a8060a3b11bab40c7cbd883760b2e5c74d8afad0e2a16285b67c9a374c2814be2d9550771167bc2fe3fe6bdb7ed1a30265b
 EBUILD libhackrf-9999.ebuild 1007 BLAKE2B 6bec7c1a938fa883218ac3e1d2af9280baff3e6ad0552e598fc63ff815debb1c621b5bb413b645934882d6c1ddd349065e866e7e0de2c5760478e03de5cf7af6 SHA512 1696a2d932930bd128e0cbae2b334a290e686263cbf85881994d922f155d31d3558dd1fc37047f531ab5d569814f74bfc30c8f94937af88a59181a73cf75293a
 MISC metadata.xml 477 BLAKE2B b801f5f0a79afbd3227a4ee2688b9332824f61b8bda623565d2f36408dc792aacc273495d7ada5a37a69092bedc61b7ca28952738a5969bfe3132253423d437d SHA512 ba679c6d4942d6a0f8efb480f820434676e37148bc60b481e9b7b0fe13b6037ee8c450632a85de25ed08e96b6e3308ee7b54b8a5f5130cd43827ad811d59a825
diff --git a/net-libs/libhackrf/libhackrf-2021.03.1.ebuild b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
new file mode 100644
index 000000000000..c5c30e59473a
--- /dev/null
+++ b/net-libs/libhackrf/libhackrf-2021.03.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils udev
+
+DESCRIPTION="library for communicating with HackRF SDR platform"
+HOMEPAGE="http://greatscottgadgets.com/hackrf/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
+	inherit git-r3
+	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
+	S="${WORKDIR}/hackrf/host/libhackrf"
+else
+	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
+	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="+udev"
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_UDEV_RULES="$(usex udev)"
+	)
+	if use udev; then
+		mycmakeargs+=(
+			-DUDEV_RULES_GROUP=usb
+			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	use udev && einfo "Users in the usb group can use hackrf."
+}
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index ea4c216d3bfc..3ca48924d389 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -2,4 +2,4 @@ DIST libmbim-1.18.0.tar.xz 474768 BLAKE2B 3dce8e1fa0e57cdf75174d0145006b38213fcd
 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 837 BLAKE2B 2d9c7ba727896518e4199014bdc792096a85e47714cfa12dd03b6a5f5144674e8b660a98ba68236ab3cb01676ef69f5c36a886d438563b0e77ec5adc77f7cce6 SHA512 eb25b94b6d01446ab6dc1e75d7e22406bdc3dff92e4bd46980be0b0435961e3f79628cdbf1d82406831deaa3e4189c0d1c7b6537e54191d613806763a2def220
-MISC metadata.xml 241 BLAKE2B 5323e3cc2a6d62c9fe301f465f7e03b145f6877adc893cf9e3f0fe4863fce3423f3471f62fce04fafc65428fb4781d2d74d796281d9332d0707e45bedec9a1a0 SHA512 d85c72d707e2c7290ff4bf18bbbd34b938cddb7e09528c5d10fa7f141122e3836687c2fff91c1000791457b7f808d3222fe671755a0fc25c157d80c908bc3cae
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libmbim/metadata.xml b/net-libs/libmbim/metadata.xml
index 7fb6dd89c720..39980802b1da 100644
--- a/net-libs/libmbim/metadata.xml
+++ b/net-libs/libmbim/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>chainsaw@gentoo.org</email>
-	<name>Tony Vroon</name>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 </pkgmetadata>
diff --git a/net-libs/libmicrodns/Manifest b/net-libs/libmicrodns/Manifest
index c70984a3a535..002531a3317f 100644
--- a/net-libs/libmicrodns/Manifest
+++ b/net-libs/libmicrodns/Manifest
@@ -1,4 +1,4 @@
 DIST microdns-0.1.2.tar.xz 49420 BLAKE2B 247a82c3bb038487390ba967387e9d4cec638ee5315290387c5b8863afbd45cc0700a3ee6c0308db253a161b5c1d345f77808de96df3f31bfaa2ff74e8fa3c05 SHA512 a6b15c65c74560fdba8973c63ffae9cdde4445f54196bb2d7d6348f6c15f8f162ef0a4e91b969ea3f2a60c701c3cc72799fcfba2fbf08c37f71ba8d5e3409702
 EBUILD libmicrodns-0.1.2.ebuild 725 BLAKE2B dd81aad3f6e4d6522791f1e0fa7860f6caeefa713ebf2535f39c5dca977e8fd283f0f66f778159e128ee74ed04b53c40a875e054a56a4aeed5b1d5c2f76baad4 SHA512 1423533662f14484827d02c23392e5df339f9474f14ac106ea380a8b54b7ba2370062a2014d783358850fb4a7502a2494c40db397e68d288987d5888508874b6
 EBUILD libmicrodns-9999.ebuild 730 BLAKE2B fc009b288958e4452ae2ce696582b16852f47ead90c13f8626a316b3eb67eac6f85ab784fa3ce10267befe6bdc12bbbd17b3958c55707a63da0fa86471e4726b SHA512 7438da9899534764cd8325b80b54be10107162663426ad072f6aaeda422f9a22bcd8353fcb27c6aa33ac6aa59f1cff6cf4b06b26ea5d1f02afce76e6efca839b
-MISC metadata.xml 333 BLAKE2B 0f3fc0a6fbc0a01665682e8476ad50797ba07395af2dea30183508fcc2ce52bfd7433908ed98f197a75adadcfe89ecdd58438ebb331f3dbbdf426b5f40a75a3e SHA512 ad45172e29ddcb372a24c2d116e89979d4050c8b79d37c303625667b486692c8e3cb08a96cdf0cab76278644656df2987b752194eaf81661e9c230db356188ff
+MISC metadata.xml 335 BLAKE2B 13f264aaae32978ea66d2eed1c5d676bb05a92661b39a091e7ebf0414c54a4a90f75957a53835b98141bccaa30489e97d7b3e42be1150f55f65a281c2a0198fb SHA512 d269590062ab329441b416d02456299b1db0d1d8a86f1e176355e8efed5b3a02f86717ae488ff027c1947986833d66988b5fb803c45cc3f65facfb77e5874b0a
diff --git a/net-libs/libmicrodns/metadata.xml b/net-libs/libmicrodns/metadata.xml
index d6ab47c58160..71d3410c3c2a 100644
--- a/net-libs/libmicrodns/metadata.xml
+++ b/net-libs/libmicrodns/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>NP-Hardass@gentoo.org</email>
-		<name>NP-Hardass</name>
+		<email>np-hardass@gentoo.org</email>
+		<name>Adam Feldman</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">videolabs/libmicrodns</remote-id>
diff --git a/net-libs/libnetconf2/Manifest b/net-libs/libnetconf2/Manifest
new file mode 100644
index 000000000000..4c05da1c175c
--- /dev/null
+++ b/net-libs/libnetconf2/Manifest
@@ -0,0 +1,3 @@
+DIST libnetconf2-1.1.36.tar.gz 294950 BLAKE2B 20eca2ba26353dff8636c48c06fe2dfc79603234c2def66a12dc7946050a81fb8d2a7c082aa6b6b3b1632eecba84e129739e659fd76a8c30bc500526e3ef48da SHA512 6a992a8d6e933661ba8f4de56f951e2fcdc1c8807d220528866afbdf0a5b6bafb6a99d78eb5cd8a7970519687a6121cb49517946a2beae5e496b80c2d95a34b2
+EBUILD libnetconf2-1.1.36.ebuild 843 BLAKE2B 9df9be4d65e1c09f8f190b2460815a33d9337f66807cd6a817dfb236f0ffd7752e962b840870539a8d1ac6bcdcfb3cd3e2de7f167873a225236188e59f04a871 SHA512 f53a4cedc5abf3451623fb8dbd8dd6ab5216b1e8a78d1d564361c28c38f14210b166e1552c3d43c7840bcb4f8cfa7d7f96335dd25319f6ab0c6b28c6df1715d1
+MISC metadata.xml 451 BLAKE2B 978f667c90ce54ea7919efb05ffdd032f7eb8d4f8360987da83e6f6610d5428afbb0ff8b447e0d82a1399cad2fb2f75bb62a73e98b3342ff7e1c3adf2e6c425f SHA512 9b66e4d2309627dee98cedc5debe1fd0e6079593b1733a5d8eac7af420a23082e86426f742ea10cf0928f730f15127e9808a27bb347488086982b665ea305504
diff --git a/net-libs/libnetconf2/libnetconf2-1.1.36.ebuild b/net-libs/libnetconf2/libnetconf2-1.1.36.ebuild
new file mode 100644
index 000000000000..b56ba4d23efb
--- /dev/null
+++ b/net-libs/libnetconf2/libnetconf2-1.1.36.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="C library for building NETCONF servers and clients"
+HOMEPAGE="https://github.com/CESNET/libnetconf2"
+SRC_URI="https://github.com/CESNET/libnetconf2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	net-libs/libyang:=
+	net-libs/libssh:0=[server]"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_src_compile doc
+}
+
+src_install() {
+	cmake_src_install
+
+	use doc && dodoc -r doc/.
+}
diff --git a/net-libs/libnetconf2/metadata.xml b/net-libs/libnetconf2/metadata.xml
new file mode 100644
index 000000000000..4856bf68220b
--- /dev/null
+++ b/net-libs/libnetconf2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">CESNET/libnetconf2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/libnetfilter_conntrack/Manifest b/net-libs/libnetfilter_conntrack/Manifest
index e902d8dfb368..c7879fa737c4 100644
--- a/net-libs/libnetfilter_conntrack/Manifest
+++ b/net-libs/libnetfilter_conntrack/Manifest
@@ -3,5 +3,5 @@ DIST libnetfilter_conntrack-1.0.7.tar.bz2 346219 BLAKE2B 85388bb2b185fa04ce697b0
 DIST libnetfilter_conntrack-1.0.8.tar.bz2 331750 BLAKE2B 614f8d80863d6f7d8110b5faf68debe3a9ba0c6737f02fa0de9d0e53d30771581becb052e7cd990b0632e9264cb9cdeb2af26a41e2b1ab9421218ec616e1f8d8 SHA512 ddc70e7e3f2d764ed1e115e4a03fe8848b8c04bd69eea0952e63131dd4dae3c23f33b8be518673e1ec3b5dbf708f5f86eac97be46fe265d95386a5e902bd0b82
 EBUILD libnetfilter_conntrack-1.0.6.ebuild 966 BLAKE2B d569562f6203d2ec131f7082063305e07a0c92807e81ae3641f1a8f61a9bdd0051803cd1b30eaa5a9bfd5f31ff06bc5b68831913c2526469c2393fbc4971f929 SHA512 77a66921f7aba5b1badc9739ff8de3356654be97f2ad1cd9af8313945d55e3de4df4b08830cad5d8110591713414eea340ee2b53567da11933dbccf26bb4605d
 EBUILD libnetfilter_conntrack-1.0.7.ebuild 974 BLAKE2B 9611f3e60d003c259632df0b0ca2ed3f650d4e6b4dce86496463d14ca0ca27e72e6dd91e0e3e9517c2b12af9ee9ec16154868692feab38f28269295f749d2b12 SHA512 bebf993b3b9198f3bb30572e00fb65237ea7a45c0ab2f8e77f8ac1f4c003c61f502346017a377be90ea8eca8a3202ab05fc5311375ba6c8576e0ed71b8fd796f
-EBUILD libnetfilter_conntrack-1.0.8.ebuild 978 BLAKE2B aa6a640ee2dcf969a7ad76551acfd5636926f82db581667101eb089cfa1c70a751599e61671d2e9068975da142a281d367fe327ee3a9b10844bd05abc4e9dfd4 SHA512 e6bf6aef77e4efe72ff289ab2d59d10b82f1c0f55164bd0f86c1fae07a788505f4e8482c8e84434c0f9e8013e742573d41e35c7cdb5efe4ab2a7ec3831a5d756
+EBUILD libnetfilter_conntrack-1.0.8.ebuild 977 BLAKE2B b3dbc99be8449e4927cf7d3dfbfb48f024cf32f441f6c87d7d68bae84e4d16c36280a84bfb1f69f1317b7220c184567dec75113bd9517918e4bcbbdc86570254 SHA512 2267468d53df3d320cb1d29d3c39247cb22686ebd3d9d67c57974eb458a364d0cdf6ed03ae9006011bc1f3dc7ddd30c5f7daa9e56ba02e0f7935c1691e06736b
 MISC metadata.xml 374 BLAKE2B 6717c595149f5ba96cab007d61021da51fa93da6cadc277ebe48cf56c89d0dc78a97b099084cb00879d5650993f1fef5bb57a591629d6773d572be065c75dc3b SHA512 25429c178b3bcac4773cb679c5609a97afbead92eb09292c174964ee6122593f16bf2aa586f5f70fec6dc47d1facb1f4b6f739c81439afac48f401eab0802c1b
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
index 4cca37b449ef..b4386fd62ab4 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-libs/libnetfilter_queue/Manifest b/net-libs/libnetfilter_queue/Manifest
index f825570818dc..50f8152f40c0 100644
--- a/net-libs/libnetfilter_queue/Manifest
+++ b/net-libs/libnetfilter_queue/Manifest
@@ -3,5 +3,5 @@ DIST libnetfilter_queue-1.0.4.tar.bz2 312699 BLAKE2B 29d553c36af551cbaa3b1b4382a
 DIST libnetfilter_queue-1.0.5.tar.bz2 313856 BLAKE2B 0d7806fd23961f6b80f6ef63faf0fe10307a34495337a7f6dd4f0eb76b5ba8a96292b86285e0740f83414417810e47f47b1400c7d83fb4d8fc6f58954f4bd9df SHA512 732a44b602e5efaa4f5582ea25ff8f5ec8f4dca5c0e725cd93fe2d441db80416b25c6018147be90acb262d7428eb5b21b3f7b5920e612d115061ec6a19d67f85
 EBUILD libnetfilter_queue-1.0.3.ebuild 723 BLAKE2B 5904b5c2c5289c1eb44a1970b08e020698c46fa7eecfb600deb3dd8fc1657cca027eddecc73b0d8abdc6de2cc0c337952a7b9c4cb3fc2dbf16add36abbd91425 SHA512 c4cd950c48d2d1d842bec72000e66ce776d39becff0e89373a68f08663c19f7aa084ebc215c99d5676842c867eea9959aa9dc174181de28b1a4631069b7ca9b5
 EBUILD libnetfilter_queue-1.0.4.ebuild 895 BLAKE2B 2839c19ee5ebbe3dd18348ed49cd88843fab057bf878a5b860d5374d4bff43133ca94cbbcc9b4892471632716f46bf3484073ba6edd8211ab24ef280a696924c SHA512 b4bf7aca2998a878e8c71fa7f6cd3f8bd45f66735503f4dd523dabe937cd988ed56a6ac2a7ecbcef6b4f9918cc9872810bb2b60986ed464fc78005672176288a
-EBUILD libnetfilter_queue-1.0.5.ebuild 889 BLAKE2B 7637579b2913256936a41aab2f0299cbdfcdc495ad4851e302504780490664198540347924d823fcd694906d8bde0513b7c860ccadf56df18b5dace2aad40764 SHA512 ffb3dde74a1dca128bdd020e256e54a6a104c4fe4cef68b41cc432051b453fdcfa336f23c02a9a25b771221b8a510988d23e792329a3f1582573e4b3c59746c5
+EBUILD libnetfilter_queue-1.0.5.ebuild 887 BLAKE2B 49df9c2e3d09696558a13388da533d81d79213bff92955eab9b69d9b9151164a41ad4c7ca44dfaa27660aa26499dba2e41bd9c47535d3c0699beabaeb27acfae SHA512 b20f4292fd865b8bb0fb2f2d022c8a3150bcbab982f4610598a77512bf040f63fcf25afa4ad2269ca2771e4fa1361db1d4593e0d66b37b2785655840fa81ff69
 MISC metadata.xml 370 BLAKE2B 5ffcfd5d89a391b532e7d64188fe64b9a99a72c9072aa8bea89157a3b322b0f1ee0edab1ba3d2b088857748ab2e5402dc6ba0db514e9c1ba465bf0b6716b6fc9 SHA512 d81ab4bbba709f4b4dd90ba5029ed20471230817f7c538e502ce3cd533e1439326d101e8e7a34e81c8714699d87f195dd95c2157216f9926baafe7b5c8aeb213
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
index 37342c1a97ec..e809f5a1e1e8 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 6949bf333793..4e42bd534bfe 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -3,4 +3,4 @@ DIST libqmi-1.26.6.tar.xz 1127552 BLAKE2B 1dba56c867c688c991fde7bb019234a05d7709
 EBUILD libqmi-1.22.2.ebuild 1125 BLAKE2B 0f46e9c7304e7fa676f02af18dab551ed8bbab8f0da220da37d4304f966eebe85a4574b6a693d12ad4159b753a5b05fbd6cb7dd63ebb817cbd2bb79291a28ed3 SHA512 58546939e8a9f18dd2d0028bcefb9b937f94dc034f0554cae9be7cd5d79769a5a02ddb79e9899f6442ee648f2c3f962ac42e329443d6368dd35080202e421910
 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
+MISC metadata.xml 424 BLAKE2B 17aae2f0c88f12dd7de0c2ef76687667b5e6c1d0c42e2f584b868f025d0069a56b95d11d8d4f137f8f6e783fdd30f49d191bfd6b42f479057f9967fe66d77a17 SHA512 9104fe16ee4aff27aa0c9861456518ebb0b022b1d37ab7c260c31aa3ad19136bb3338072a1dfdc53a024a3b31e8e6e6bfec14eca2b92d53f8d62b00b213e060e
diff --git a/net-libs/libqmi/metadata.xml b/net-libs/libqmi/metadata.xml
index dacd578ab6f3..7f11f6a849da 100644
--- a/net-libs/libqmi/metadata.xml
+++ b/net-libs/libqmi/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<slots>
 		<subslots>libqmi-glib.so soname version</subslots>
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 5fb6702e1470..61ac3bae6ced 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,4 +1,6 @@
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
 DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b
+DIST libsoup-2.72.0.tar.xz 1477940 BLAKE2B e63a26aa29a4a34c4e4b0a2713818db52b206b04b56d99391648351f87a62dc3455020e8eb0312ef17b2b7d047a7d5731905ecc214085afd4eff25fefa30782b SHA512 ca16772d0d318c4be0c4859db1e32baffa2231b4732f3bf9814aa405febde86395a0fb8bfa1635d70a7b5853d2567403920b9b0d0f5c3c179294352af27e91de
 EBUILD libsoup-2.70.0.ebuild 3000 BLAKE2B 6896ff81e8d0eb822357c8c198e0774a9e563e239433033049e1b89214df733edec33e3f59eaa966978f9c224ca51afeeee821dae29c544e030c0b0fe44a949e SHA512 fe281bafa2b5ad22f69e55ec6631b05a28382a0cb067dcb2f0f480c04616f712458b7504599a95066ba95730ac0cf1306dc12109b2f7c536a3c52088d8facdec
-MISC metadata.xml 467 BLAKE2B d794fe938763955e050add0d57db197ff4445a7b9d6467cdf0f47ab46ca26e1b9cf4fcebbe0e90df798ab08c8a4d7cdc5b547b347e6caa2f5c83f9be698d0396 SHA512 287cf2cc758d653374e5b58aeab4a96fa45ee0846e902cbc5c7f051e31a6b9300aa4e27814b4a2eb27d6386a2bf0a57cf7032dcac081749141bac1f98851487c
+EBUILD libsoup-2.72.0.ebuild 3111 BLAKE2B e5ce14664d617661914f6c757a34e3d428d2da5a8418b6aa821292dbbc2fa15877c0fcf8e7c0873ec5664eba002e6f6410e9e984472aef56cc5b59978f37cc3b SHA512 d5c38cc670d5c1d2cb3fa5d74698d7f9f3fade310302e173e4052cea68f7bbb09ce701d8c3f6efef3dc2988b582715799d855a2816fd36c532137f93e269bba2
+MISC metadata.xml 577 BLAKE2B ce68b60f9438bad0b1fb848dada28796f4c9a8f6ed119b29c26139bf7c146edb7e701f7565e425c27587a911e62bd1ed15cb6d120696ab1ac0f631f9f8145cc4 SHA512 a2937c0036d3decd995f8e83321b7b1e2bd9f6a5fe83ff7061dc1443ef5cfb4714d38c32689cd46065a7efbb5c8f120eed5ebfad650e7ccf4f1d98d9d45afb0d
diff --git a/net-libs/libsoup/libsoup-2.72.0.ebuild b/net-libs/libsoup/libsoup-2.72.0.ebuild
new file mode 100644
index 000000000000..e832e552fd6d
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.72.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson multilib-minimal vala xdg
+
+DESCRIPTION="HTTP client/server library for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.4"
+
+# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146
+IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
+	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
+	sysprof? ( >=dev-util/sysprof-capture-3.38:4[${MULTILIB_USEDEP}] )
+	sys-libs/zlib
+	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	samba? ( net-fs/samba )
+"
+RDEPEND="${DEPEND}
+	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
+"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
+#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
+#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
+#		dev-lang/php[apache2,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+PATCHES=(
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	"${FILESDIR}"/disable-apache-tests.patch
+)
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+	# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
+	sed -e '/hsts/d' -i tests/meson.build || die
+}
+
+src_configure() {
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	# But necessary while apache tests are disabled
+	#addpredict /usr/share/snmp/mibs/.index
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature gssapi)
+		-Dkrb5_config="${CHOST}-krb5-config"
+		$(meson_feature samba ntlm)
+		$(meson_feature brotli)
+		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
+		-Dtls_check=false # disables check, we still rdep on glib-networking
+		-Dgnome=false
+		-Dintrospection=$(multilib_native_usex introspection enabled disabled)
+		-Dvapi=$(multilib_native_usex vala enabled disabled)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		$(meson_feature sysprof)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/net-libs/libsoup/metadata.xml b/net-libs/libsoup/metadata.xml
index 7b6e2d422042..042b1814e4fa 100644
--- a/net-libs/libsoup/metadata.xml
+++ b/net-libs/libsoup/metadata.xml
@@ -10,5 +10,6 @@
 		<flag name="gssapi">Enable GSSAPI support</flag>
 		<flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single
 			Sign-On</flag>
+		<flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 6fbd90c1d80b..e3735d19e58e 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -1,5 +1,5 @@
 AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8f41d2cdf07c1285a7abe25e804b2ada3c8d7f0c126f8b6973461279e891d2e3e942e2cea7d1cb352f17541f22757c11f0 SHA512 9da051dd5dda823ae8797b0dadb9a3734590e196898b0985f389492f1225c720dac0ce374ba6d9cc8956820128fc2d7457350248b486f0da4d12cc3bb93e275a
 DIST libssh2-1.9.0_p20200614.tar.gz 482698 BLAKE2B a93c3e61ecba564263e5aa1c10769bd07b5d16def9e6948262e5bbe32d86ae39784b63c608ad4d8a4aa0fcb14c8b55742f90cd2856e043bea5b3d052a31dc871 SHA512 fa34c598149d28b12f5cefbee4816f30a807a1bde89faa3be469f690057cf2ea7dd1a83191b2a2cae3794e307d676efebd7a31d70d9587e42e0926f82a1ae73d
-EBUILD libssh2-1.9.0_p20200614.ebuild 1492 BLAKE2B b5f394530cdba3400546e3c787b94cbf64f87b3600fdfb83c654c7fd49cd9b14e15e340c92db10fdd4f5d8196a66476533e1502913d57e26edff62a258674778 SHA512 e69128f29f65e750a2ccce48543f4d889135cdd4edb71031dfe57efc17cf146588e7532555bdbe8403263aaea77a26e0046a2a443c25958d8905f7e6b3b22432
-EBUILD libssh2-9999.ebuild 1250 BLAKE2B a76d19e2dfba73b98e161d959b686be14b985b6b9833a88c6eb9700590126b290db4c12ade2eea580051e5811108c72b1ce24329dee4aa6dc0fc51f228165f8c SHA512 c40f416a3913e5f452ef2cf6392989cd7a5b87bfe7d35f36cb8e9750cec67056d22b8a41b16920be182827ec4b64a137dbfc097cbd76f83db8eab062de6edcd4
+EBUILD libssh2-1.9.0_p20200614-r1.ebuild 1495 BLAKE2B 162fe67f78e6b6fcc778b8c1669e21a84ba2207a49bb99d904ba1daa69529ef86f331fb3a63161ce5d9df19057a972af9328d4581d216bf7fb702e389c4bc95c SHA512 19eccd133c45ed716f361c313010ddeeb5eca78a56e0d4c28a3a87a94a55111ffe6dd4a0a675206f788c9cd67c83724d6a8c8b74b67798fc301ee3177975ac29
+EBUILD libssh2-9999.ebuild 1253 BLAKE2B 749f87eca997579814b3fccb96001407335f8c8f38c047d9eff7c74c80fad0fb2c6444f6157a6f27eeda3588d1a77f83f8eeb533efa906bf291f7ce012f666ca SHA512 acc1d8d82e90e46163d0a947bffb4128de39d80d59ba9d203911012b1417a3ff3ce08a86b1729763546e8a8c8129c4576ee2c31c5c30dd173b3a20ee3f953811
 MISC metadata.xml 634 BLAKE2B 09afb03a2a77e95f5717d21936668a650f01d0dc44173a57cf6d702d5a51076ae41b1a71974dfbaf66baf3b746af2dbb07e02556aeed793edfff93d0b38e14ba SHA512 4596f1e9a12c3d35d2a0b69e349b12a9bba72e57ea505e10fb814a3d310a7e63f75d1e5628946cd2045260c7466bc654a6770aea5743afa52c742913f7c62960
diff --git a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
index edff9820da9c..3e48a3afea49 100644
--- a/net-libs/libssh2/libssh2-1.9.0_p20200614.ebuild
+++ b/net-libs/libssh2/libssh2-1.9.0_p20200614-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ RESTRICT="test"
 RDEPEND="
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
 	!gcrypt? (
-		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+		mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
 		!mbedtls? (
 			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index ecb95eb5807f..9144d2576661 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ RESTRICT="test"
 RDEPEND="
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
 	!gcrypt? (
-		mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+		mbedtls? ( net-libs/mbedtls:0=[${MULTILIB_USEDEP}] )
 		!mbedtls? (
 			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 91a503988854..6fc40997d519 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -4,7 +4,7 @@ DIST libtorrent-1.2.12.tar.gz 3604064 BLAKE2B e0eb00aba90e3d5e3ba1bf3984e2eb6065
 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.11.ebuild 2732 BLAKE2B 4c6bb50dd2d0facf5b8954b139a17bf9333fce3d540f89139589beb9c30dc6c98633e5fb271cac945fb8c33ff3f5e515f5265ba9b93aa9b8d0d93f4eda300bc7 SHA512 f170ff20a157a46edc5d6a013f7e48b42ecffc4ed37a34474733910978a60b2a1d56d1c8bbb3ec4272790fb1cf5a191464fd661ed62de3b44723057ed5251bce
 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
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11.ebuild
index 295a3b24f665..3d1ed4cfc02e 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorren
 
 LICENSE="BSD"
 SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="debug +dht doc examples libressl python +ssl static-libs test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index ec83683344b9..d1babe3c9069 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,5 +1,3 @@
-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.14.0.tar.gz 788668 BLAKE2B 8e77f49c6eacbaff2d4194f281f73e882d282b1af400b2d8e08111b7cb0b89305f3f06b8e0ebdf8eab35de39bcd2cd30be3ecb575d560c652e96bd7831eade40 SHA512 d7cf50e168aff2ef3ad08b4c383108d5044e4c9d2923088bb93423ee5fc555c32f0254f307cb86ea7c18197612cf2d2c6c681f82d99a6f01a68f86a21c6eecb7
 EBUILD libupnp-1.14.0.ebuild 1082 BLAKE2B b0cb48b4ecc17ab31c3f81f7494e08dfe6d88131c7beda7af563f2121dbd668acc487ec44404889b7dbe528b0653625dc86618c93e9169ea1808a47b0b612781 SHA512 c60ace6978721467d52116c7d9d5ae23cef7ace0c48bc67b47d0a455f3dddcf05c207383105e7b241e76a6868f09f41564d00850e8ac933700ae67e0ff095b4e
 MISC metadata.xml 703 BLAKE2B 3c45d613ca370a5dffac938932461d7686e839670743ca7514ffb30c8f632baac6fbbe1fede4e9a1f0caf83808c1d0af4cf184a59763a21a0e2cab9b7e7ca20f SHA512 aabd69bc4b6182452c45172a09007369ce428307dc94dcfe397886045ceb5b302381f0ff0e7fe575fea3fb5d8979ecf5173c7fb0ed402c4045e79a7e494a963e
diff --git a/net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch b/net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch
deleted file mode 100644
index 622f58a9003f..000000000000
--- a/net-libs/libupnp/files/libupnp-1.6.19-docs-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libupnp-1.6.19/upnp/sample/Makefile.am.orig	2013-11-15 19:50:02.000000000 +0400
-+++ libupnp-1.6.19/upnp/sample/Makefile.am	2016-06-03 20:30:43.545081667 +0300
-@@ -65,8 +65,8 @@
- if WITH_DOCUMENTATION
- examplesdir = $(docdir)/examples
- examples_DATA = \
--	$(tv_ctrlpt_SOURCES) \
--	$(tv_device_SOURCES)
-+	$(sort $(tv_ctrlpt_SOURCES) \
-+	$(tv_device_SOURCES) )
- endif
- 
- EXTRA_DIST = \
diff --git a/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch b/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch
deleted file mode 100644
index 3eaf66e80413..000000000000
--- a/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-don't append flags like -O0/-Os which clobber the user's settings
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -539,25 +539,6 @@ AC_PROG_EGREP
- echo "--------------------- Default compilation flags -------------------------------"
- echo host is $host
- echo host_os is $host_os
--case $host_os in
--freebsd*)
--	echo "Using FreeBSD specific compiler settings"
--	# Put FreeBSD specific compiler flags here
--	;;
--*)
--	echo "Using non-specific system compiler settings"
--	if test x"$enable_debug" = xyes; then
--		# AC_PROG_CC already sets CFLAGS to "-g -O2" by default,
--		# but only if CFLAGS was not previously set.
--		#:
--		# Use -O0 in debug so that variables do not get optimized out
--		AX_CFLAGS_GCC_OPTION([-O0, -g])
--	else
--		# add optimise for size
--		AX_CFLAGS_GCC_OPTION([-Os])
--	fi
--	;;
--esac
- 
- AX_CFLAGS_WARN_ALL
- echo "-------------------------------------------------------------------------------"
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 51fae37fc640..5cf9e097315c 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,3 +1,5 @@
 DIST libyang-1.0.215.tar.gz 1666478 BLAKE2B 66fc53458caf43e8473905ce9294efb9a49f0c73206a4c5ef96f7b79e72fff9429aa4245fdb29a7d2b4a23460d771d30a9397ca4d2ce76379675dc4a9f6427fd SHA512 042e7be3a658340eebb5aaf819169a516af5489c366c026b599d673b623811b01a5cc7b2fce0fe39c5deb5cce5b1e0e6dfc4eb85a331fb3203d415011e6d2dad
+DIST libyang-1.0.225.tar.gz 1667054 BLAKE2B eb1bfd555d72aceba7da7ade1a55985caad9d3cc904c5504978c298ef9e08a6848c810d1b62b1fa7076a9f30638b6080a3546c07892d3e8980eb1db337dc4deb SHA512 3366df8c2869454b6da456010ca62b538876cba16fa84e1ed9053acca6d7756c15329c0fb8a62477a1887d6c00cce8449f29954b2d2b0e556d81baa11dc9776d
 EBUILD libyang-1.0.215.ebuild 897 BLAKE2B 404a7b7a0319cb61c2f13f882e6f2ab9563325063c2f4ab4c2f4a62de0598d22c29a02b8efe3165ddd6181c4920e1b7e8001cafde98e5cacb4c6691e70368dd8 SHA512 6834392c435108aa490861c17d4133f610ffe92560807206803dcc0206821a6c50989a917a0b9ce2db63577bbb8eb2c1e92368cab5baadd29fdbb93a1863092d
+EBUILD libyang-1.0.225.ebuild 890 BLAKE2B c26b21d32893072ae441cc3697feb77c5cfebb9ea5ab45d8cc9a0af07ed07cc076832b3b303fb6138b3fe7e3eecb2c7bd898de1b98791495064c7b854736195e SHA512 ec5c85171f8790eab2d20311b2fe086bb90a7c75c4fd6614e85a520642e2a94f3a1675789510799b6ace2aeba9c6790fb535a3e75f744292e332dde00a4e955d
 MISC metadata.xml 326 BLAKE2B e52c1d56ed6f14dee505e8db5bfede4cb326e8a98a50df576244e8f2ce44d964449acbf00ad9bcd27f22546e1a029cfdec22919edd887a2db9e10f471f322af5 SHA512 bb91dc41fa93fae47c0ad7fa99868284e61a3d24b261cb5feb44cdcd91255744de1d860b1b98374e8d4a8ed4e931c2298c28527709f3e8c5b4bb223484edc076
diff --git a/net-libs/libyang/libyang-1.0.225.ebuild b/net-libs/libyang/libyang-1.0.225.ebuild
new file mode 100644
index 000000000000..d56736baef1f
--- /dev/null
+++ b/net-libs/libyang/libyang-1.0.225.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="YANG data modeling language library"
+HOMEPAGE="https://github.com/CESNET/libyang"
+SRC_URI="https://github.com/CESNET/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( app-doc/doxygen[dot] )"
+
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BUILD_TESTS=$(usex test)
+		-DENABLE_LYD_PRIV=yes
+		-DGEN_LANGUAGE_BINDINGS=no
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	multilib_is_native_abi && use doc && cmake_src_compile doc
+}
+
+multilib_src_install_all() {
+	use doc && dodoc -r doc/.
+}
diff --git a/net-libs/openmq-cclient/Manifest b/net-libs/openmq-cclient/Manifest
index 454408cb19c5..7f83d984c2e8 100644
--- a/net-libs/openmq-cclient/Manifest
+++ b/net-libs/openmq-cclient/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile.in-4 1877 BLAKE2B cf373e35ecdc205b92864af496c30e464e24d59dbf175396b5edfd13b04943ff61d9271eee1e616eaec5c669fcb99809bbf665980207f7e4c270a7c20efd46d7 SHA512 ea4d441035f275df31c28a05100377b40e7ae282767f74e247bfba31739b7f6462d5e94938bfc4aac6c4f2d78c792a10d941e01e5b8e0c9cf412bf7d878dcf33
 AUX openmq-cclient-4.4.1-aix-gcc.patch 376 BLAKE2B 14f7a71079468da60aa30a422d79dce2be877928d63cf4c4e802639b94df10afa37d2f41c735f4987067a1a2e564c757016e40ae03cb9612b2a97263af690d7f SHA512 c7899238b90072a26a8bf1700940d30218d59629b8acea8699f101948f2d659ea684fb73ba560adbbe171c36eec3ae244a9f1707349647213518a654d48c5725
 DIST openmq4.4u1b7-final-source.zip 6892740 BLAKE2B 0101648b1688411579b5d1133714b79af24788a548643546de80a708028a1c08af92e2534767eb0bd9f9eddbb16e77a1884880a5d4f9cbe4f0166dbce0b2045e SHA512 4bc51a3bc0a82ae41998ae3d60912d807ff069d6165ea9cfdc1c6eefc9e57b00ad91d6ed2efa032e76be744db3328511bb02023d14a64bd3b64c8667982fbe8c
-EBUILD openmq-cclient-4.4.1.ebuild 1873 BLAKE2B 7f9817d72638ee619bb8373907f9d90f181e037ce4751108a35b1d27a308c6be09d12597a3140eedfa5da6a54e339e838b57bffacafcc039d4ab60ec60e6b6c5 SHA512 4948001c166254179402453c8f291461c94e3a3b779b43c32eb970c917fbcac453a6f6fb2e80245f981b4b1f71bfb05673a3652b45ef3393ef97c35536cb4673
+EBUILD openmq-cclient-4.4.1.ebuild 2034 BLAKE2B ac02d8d893e6120f449d83a283f4fed379b4e3b791c3b4ff21d519ca8c75a818e54166f590a59d5b56ea5f88d66f5af8e12d650d19c30b33e213e88ae6f97d3d SHA512 883e898b3bcde3070ec5e477c93ef6d94658dd4e02fbfde9a4b53498e686e4990416ef91e884088f32849c6639884731ae9df8b5970802aa5f943b2f9e50577e
 MISC metadata.xml 864 BLAKE2B 5b7d8beccae5cf49a47e7986c9720788b8e307b48d45e9890a70dd268d31c7783fbabc2ff616ed82ed6af87dfbd25aabbfb082a220578ad73d2598700dc3c29d SHA512 beb566a77afec231f42d0f44dc4442c621a6341c40716d44f68f32ad517be715925635b721e57a714f38780afa90fbb30e85fb9f8350ef930309bfa0ebcb811a
diff --git a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
index 0036565e6274..11ea9ac736ca 100644
--- a/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
+++ b/net-libs/openmq-cclient/openmq-cclient-4.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit versionator autotools
+inherit autotools epatch versionator
 
 DESCRIPTION="C-Client Library for Open Source Java Message Service (JMS)"
 HOMEPAGE="https://mq.java.net/"
@@ -70,6 +70,11 @@ src_prepare() {
 		AC_OUTPUT(Makefile)
 	EOF
 
+	# bug #778329
+	sed -e 's/--no-undefined/-no-undefined/' \
+		-e "s/'\*Test\*' ')')/'\*Test\*' ')' | grep -v examples)/" \
+		-i "${S}"/Makefile.in || die
+
 	eautoreconf
 }
 
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index e03a59a43b95..42b856bd94d4 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -1,8 +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
 AUX pjproject-2.9-ssl-enable.patch 3515 BLAKE2B d68479ba509513828d8488b60358ba00651c87d0b39b9bc800fe0d38294f2afad43fd7f4ee5c260bd62044d17b010112c59363277739f4ae7d20940943437539 SHA512 5fd3e681801e6e2cd56ec177d71a65422ec22b788adfad3920562616c737188f71097a545d9c59bd6a3d876ba143f90f731d165d8c68da25aa93b03c009753e8
 DIST pjproject-2.10.tar.gz 8768705 BLAKE2B 42d70867e2e0474313426f1e188586d203d6165c28a133a62dedacd2deb2899215212824d9402a48fcc66bb08a17b796d3625e1d51a8aedc9aa4b3a3bf1cb8fa SHA512 a67f083df175b536b4e6a7b7fe39e07d3ee805d6917ec64a50694542a7455c33a100889191044ab3fa679b6656774a6be045621aa53510b5f04cdde9ddd59893
diff --git a/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch b/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch
deleted file mode 100644
index 07efa9ccb8fd..000000000000
--- a/net-libs/pjproject/files/pjproject-2.7.2-libressl.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: /third_party/srtp/crypto/hash/hmac_ossl.c
-===================================================================
---- /third_party/srtp/crypto/hash/hmac_ossl.c	(revision 5725)
-+++ /third_party/srtp/crypto/hash/hmac_ossl.c	(revision 5726)
-@@ -52,6 +52,8 @@
- #include <openssl/evp.h>
- #include <openssl/hmac.h>
-+#include <openssl/opensslv.h>
- 
- #define SHA1_DIGEST_SIZE		20
-+#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
- 
- /* the debug module for authentiation */
-@@ -77,5 +79,5 @@
- /* OpenSSL 1.1.0 made HMAC_CTX an opaque structure, which must be allocated
-    using HMAC_CTX_new.  But this function doesn't exist in OpenSSL 1.0.x. */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
-     {
-         /* allocate memory for auth and HMAC_CTX structures */
-@@ -122,5 +124,5 @@
-     hmac_ctx = (HMAC_CTX*)a->state;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
-     HMAC_CTX_cleanup(hmac_ctx);
- 
-Index: /pjlib/src/pj/ssl_sock_ossl.c
-===================================================================
---- /pjlib/src/pj/ssl_sock_ossl.c	(revision 5725)
-+++ /pjlib/src/pj/ssl_sock_ossl.c	(revision 5726)
-@@ -56,6 +56,10 @@
- #include <openssl/rand.h>
- #include <openssl/opensslconf.h>
--
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#include <openssl/opensslv.h>
-+
-+#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
-+
-+#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
-+	&& OPENSSL_VERSION_NUMBER >= 0x1000200fL
- 
- #   include <openssl/obj_mac.h>
-@@ -115,5 +119,5 @@
- 
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x10100000L
- #  define OPENSSL_NO_SSL2	    /* seems to be removed in 1.1.0 */
- #  define M_ASN1_STRING_data(x)	    ASN1_STRING_get0_data(x)
-@@ -539,5 +543,5 @@
- 
-     /* Init OpenSSL lib */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if USING_LIBRESSL || OPENSSL_VERSION_NUMBER < 0x10100000L
-     SSL_library_init();
-     SSL_load_error_strings();
-@@ -560,5 +564,7 @@
- 	const char *cname;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
-+    || OPENSSL_VERSION_NUMBER < 0x10100000L
-+
- 	meth = (SSL_METHOD*)SSLv23_server_method();
- 	if (!meth)
-@@ -603,5 +609,6 @@
- 	SSL_set_session(ssl, SSL_SESSION_new());
- 
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
-+    && OPENSSL_VERSION_NUMBER >= 0x1000200fL
- 	openssl_curves_num = SSL_get_shared_curve(ssl,-1);
- 	if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves))
-@@ -795,5 +802,6 @@
- 
-     /* Determine SSL method to use */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (USING_LIBRESSL && LIBRESSL_VERSION_NUMBER < 0x2020100fL)\
-+    || OPENSSL_VERSION_NUMBER < 0x10100000L
-     switch (ssock->param.proto) {
-     case PJ_SSL_SOCK_PROTO_TLS1:
-@@ -1232,5 +1240,6 @@
- static pj_status_t set_curves_list(pj_ssl_sock_t *ssock)
- {
--#if !defined(OPENSSL_NO_EC) && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if !USING_LIBRESSL && !defined(OPENSSL_NO_EC) \
-+    && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-     int ret;
-     int curves[PJ_SSL_SOCK_MAX_CURVES];
-@@ -1263,5 +1272,5 @@
- static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock)
- {
--#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
-+#if !USING_LIBRESSL && OPENSSL_VERSION_NUMBER >= 0x1000200fL
-     int ret;
- 
diff --git a/net-libs/pjproject/files/pjproject-2.7.2-ssl-flipflop.patch b/net-libs/pjproject/files/pjproject-2.7.2-ssl-flipflop.patch
deleted file mode 100644
index c984bc629629..000000000000
--- a/net-libs/pjproject/files/pjproject-2.7.2-ssl-flipflop.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- pjproject-2.7.1.ORIG/aconfigure.ac	2018-02-06 11:34:20.973411193 +0000
-+++ pjproject-2.7.1/aconfigure.ac	2018-02-06 13:33:31.525015674 +0000
-@@ -1551,57 +1551,56 @@
-     enable_ssl=no
- fi
- 
--dnl # Include SSL support
-+dnl # Correct --enable vs --disable SSL flipflop logic
- AC_SUBST(ac_no_ssl)
- AC_SUBST(ac_ssl_has_aes_gcm,0)
- AC_ARG_ENABLE(ssl,
- 	      AS_HELP_STRING([--disable-ssl],
- 			     [Exclude SSL support the build (default: autodetect)])
--	      ,
--	      [
--		if test "$enable_ssl" = "no"; then
--		 [ac_no_ssl=1]
--		 AC_MSG_RESULT([Checking if SSL support is disabled... yes])
--	        fi
--	      ],
--	      [
--		AC_MSG_RESULT([checking for OpenSSL installations..])
--                if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
--                    CFLAGS="$CFLAGS -I$with_ssl/include"
--                    LDFLAGS="$LDFLAGS -L$with_ssl/lib"
--                    AC_MSG_RESULT([Using SSL prefix... $with_ssl])
--                fi
--		AC_SUBST(openssl_h_present)
--		AC_SUBST(libssl_present)
--		AC_SUBST(libcrypto_present)
--		AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1])
--		AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"])
--		AC_CHECK_LIB(ssl,SSL_CTX_new,[libssl_present=1 && LIBS="-lssl $LIBS"])
--		if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
--	        	AC_MSG_RESULT([OpenSSL library found, SSL support enabled])
--			
--			# Check if SRTP should be compiled with OpenSSL
--			# support, to enable cryptos such as AES GCM.
--			
--			# EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type.
--			# Update 2.7: our bundled libsrtp has been upgraded to 2.1.0,
--			# so we can omit EVP_CIPHER_CTX definition check now.
--			AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/evp.h>]],
--							  [EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm();])],
--					  [AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1])])
--			if test "x$ac_ssl_has_aes_gcm" = "x1"; then
--				AC_MSG_RESULT([OpenSSL has AES GCM support, SRTP will use OpenSSL])
--			else
--				AC_MSG_RESULT([OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos])
--			fi
--
--			# PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
--			#AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1)
--			AC_DEFINE(PJ_HAS_SSL_SOCK, 1)
-+)
-+
-+dnl # OpenSSL detection
-+AC_MSG_CHECKING([OpenSSL installations])
-+if test "x$enable_ssl" = "xno"; then
-+	ac_no_ssl=1
-+	AC_MSG_RESULT([explicitly disabled])
-+else
-+	if test "x$with_ssl" != "xno" -a "x$with_ssl" != "x"; then
-+		CFLAGS="$CFLAGS -I$with_ssl/include"
-+		LDFLAGS="$LDFLAGS -L$with_ssl/lib"
-+		AC_MSG_RESULT([Using SSL prefix... $with_ssl])
-+	fi
-+	AC_SUBST(openssl_h_present)
-+	AC_SUBST(libssl_present)
-+	AC_SUBST(libcrypto_present)
-+	AC_CHECK_HEADER(openssl/ssl.h,[openssl_h_present=1])
-+	AC_CHECK_LIB(crypto,ERR_load_BIO_strings,[libcrypto_present=1 && LIBS="-lcrypto $LIBS"])
-+	AC_CHECK_LIB(ssl,SSL_CTX_new,[libssl_present=1 && LIBS="-lssl $LIBS"])
-+	if test "x$openssl_h_present" = "x1" -a "x$libssl_present" = "x1" -a "x$libcrypto_present" = "x1"; then
-+	       	AC_MSG_RESULT([OpenSSL library found, SSL support enabled])
-+
-+		# Check if SRTP should be compiled with OpenSSL
-+		# support, to enable cryptos such as AES GCM.
-+
-+		# EVP_CIPHER_CTX is now opaque in OpenSSL 1.1.0, libsrtp 1.5.4 uses it as a transparent type.
-+		# Update 2.7: our bundled libsrtp has been upgraded to 2.1.0,
-+		# so we can omit EVP_CIPHER_CTX definition check now.
-+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/evp.h>]],
-+						  [EVP_CIPHER_CTX *ctx;EVP_aes_128_gcm();])],
-+				  [AC_CHECK_LIB(crypto,EVP_aes_128_gcm,[ac_ssl_has_aes_gcm=1])])
-+		if test "x$ac_ssl_has_aes_gcm" = "x1"; then
-+			AC_MSG_RESULT([OpenSSL has AES GCM support, SRTP will use OpenSSL])
- 		else
--			AC_MSG_RESULT([** OpenSSL libraries not found, disabling SSL support **])
-+			AC_MSG_RESULT([OpenSSL AES GCM support not found, SRTP will only support AES CM cryptos])
- 		fi
--	      ])
-+
-+		# PJSIP_HAS_TLS_TRANSPORT setting follows PJ_HAS_SSL_SOCK
-+		#AC_DEFINE(PJSIP_HAS_TLS_TRANSPORT, 1)
-+		AC_DEFINE(PJ_HAS_SSL_SOCK, 1)
-+	else
-+		AC_MSG_RESULT([** OpenSSL libraries not found, disabling SSL support **])
-+	fi
-+fi
- 
- dnl # Obsolete option --with-opencore-amrnb
- AC_ARG_WITH(opencore-amrnb,