gentoo resync : 16.01.2021

30 files changed, 419 insertions, 820 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index d71d9ab94543..7a8e483b0f60 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index a95a37f1931c..9052eb2c5f47 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,7 +1,9 @@
 DIST gupnp-1.2.7.tar.xz 142928 BLAKE2B 094e9569c501ae32def1335c8129d5585a2bec37d86c2317a2c9b2d965db5ce0ae6c19017bd44fb718709cf068f93ed75d08ab7e30c5f265e1ce45a9a9352897 SHA512 83d012989f9aab578c9bdb4dd95d316003938a39cc997949622b56523dd7081e09093c48c0016d738ca0040a00b3e6218ba59cad9e49e05f4106213160e7c409
 DIST gupnp-1.3.1.tar.xz 152484 BLAKE2B bfed35567da37f420568ae90acb8c33674f5ef754d00722ce11ec381c602f7aee86502276a3e6bb04abd98d49826ff11518bf6283d2c4be9c4ddf48fb880627f SHA512 ee632d42803cb689926839336c2427c9622c40d1a43e69ef4c48dd26714649d544772697b4a440861dc896a13faba6793b02b7b9ab7c5288b6cf125abbb2d477
 DIST gupnp-1.4.1.tar.xz 152964 BLAKE2B 1c59461f670731b5095e04f6dfb5a64ce5a2dde4f5c5c46c137475d88f9154c1c7a01a7be88d22c8d0a1193b4cda0227396769540311627706621681a8b69161 SHA512 c1aedcb03741e833fc17d3f799b7786a2df229e51feea0911e759f1fa4e92369799f358fef2bc03430728fba84bd188ac0c0aa08f359ee75f81cc20b90032763
+DIST gupnp-1.4.2.tar.xz 154636 BLAKE2B df0378493dec2b5576cb3130598e36d86dd1fce106b5486134691000ca87eeaa593806c82029b9fe35b40a5210db6026c6b28b16a44ed444934ec8e9ff858cf5 SHA512 c585f3e63e8735b82e84e3daa209dbe8d0709be79c7701a1f05ad61aa5201aee5d4e879facb1b164b274fe52add64cdbf657d32930d7cea1b6ee262f7c26b682
 EBUILD gupnp-1.2.7.ebuild 2052 BLAKE2B 0225c191c8d26d9a740a9d0ad214f8694bbfd7de3d056a9e5b0d5774b59a77864afb18d16a7f256ceb11788f004566497d981d1dd349c0ab36122962cda6f701 SHA512 72c03166a9484f774fe368ae9122d1e311ad0a6967518df3317db92e844a6489f7946d540a153a863beee3a60eae11cf68b501a53100f0dcf7fb594901f489f0
 EBUILD gupnp-1.3.1.ebuild 2100 BLAKE2B 4f87192c4d15c0c8852dd7fa24fec4a6d92c9d4f1a6b2e4d25b20fb6b32bb672ead10d80f05d053b95b6268ac26e08a91b7b194a0be2161d1deeca0f3b458944 SHA512 666c3122cd81881ac9c8a9f9f4b7029b3306cb60dee478448bfc82efa8cdb4d25dba39e2054be3f0b00cc5dfaa7c7b3bc36e99380775f51f4e4e92f986d58d3d
 EBUILD gupnp-1.4.1.ebuild 2100 BLAKE2B 4f87192c4d15c0c8852dd7fa24fec4a6d92c9d4f1a6b2e4d25b20fb6b32bb672ead10d80f05d053b95b6268ac26e08a91b7b194a0be2161d1deeca0f3b458944 SHA512 666c3122cd81881ac9c8a9f9f4b7029b3306cb60dee478448bfc82efa8cdb4d25dba39e2054be3f0b00cc5dfaa7c7b3bc36e99380775f51f4e4e92f986d58d3d
+EBUILD gupnp-1.4.2.ebuild 2100 BLAKE2B 4f87192c4d15c0c8852dd7fa24fec4a6d92c9d4f1a6b2e4d25b20fb6b32bb672ead10d80f05d053b95b6268ac26e08a91b7b194a0be2161d1deeca0f3b458944 SHA512 666c3122cd81881ac9c8a9f9f4b7029b3306cb60dee478448bfc82efa8cdb4d25dba39e2054be3f0b00cc5dfaa7c7b3bc36e99380775f51f4e4e92f986d58d3d
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gupnp/gupnp-1.4.2.ebuild b/net-libs/gupnp/gupnp-1.4.2.ebuild
new file mode 100644
index 000000000000..21a2db719466
--- /dev/null
+++ b/net-libs/gupnp/gupnp-1.4.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org meson-multilib python-single-r1 vala xdg
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp"
+
+LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
+SLOT="0/1.2-0" # <API version>-<soname>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="connman gtk-doc +introspection networkmanager vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( connman networkmanager )
+"
+
+# prefix: uuid dependency can be adapted to non-linux platforms
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.66:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.3.0:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.2 )
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	virtual/pkgconfig
+	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
+	vala? ( $(vala_depend)
+		>=net-libs/gssdp-1.3.0:0[vala]
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	xdg_src_prepare
+}
+
+multilib_src_configure() {
+	local backend=system
+	use kernel_linux && backend=linux
+	use connman && backend=connman
+	use networkmanager && backend=network-manager
+
+	local emesonargs=(
+		-Dcontext_manager=${backend}
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
+}
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 0e11b1f818ca..2186ef78977b 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -1,13 +1,16 @@
 DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
 DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871
 DIST bitcoin-0.21.1.knots20210629.patches.tar.xz 623916 BLAKE2B c6b669270b7f9718c8452a1c28280b6005edee299a3ab8d754dbf722d021576871ddce200342bf157dd5158c058686aa3dde913970779d8c2e560b8df772821c SHA512 ba058554453efc7ad036b8cc945ba403a6bd4e30dae0fbcee7fbe2f0ce90854a867fe49b0522595c081930d406bdf56987982f403fc8299b3c776eea4672abae
+DIST bitcoin-21.2.knots20210629.patches.tar.xz 711680 BLAKE2B da49c6ab075b2478482daeafefcad507f12718e4ed2af847e64aa30ff0839876b9a5b68bc53f2327c9e18df51870d50f7e7d6b2215d5fde1d147567d9d60ffa5 SHA512 e0386f2712053475548c3d7fa927117d1fefa27d447c1398bec152e601a9be0af7a1b03f83f5345b03af252b372091548ce75075f42e4831f4e85f622531962b
 DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e99e7f42d8f335f016335b6bf3637c733d993696872f0a4c655cc58fc0394dfdf9916e13f0d7fbdcebf25fbdc9a165227e3c59133033644c0 SHA512 daab5860b7c7e137b6bf350cdc153e6e19172e49935640d1f6fe1f1be1e4df805b1db7fd30b0f95a560106956adab70cc6282fe933ae9de153cb971dd280f83d
 DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46
+DIST bitcoin-v0.21.2.tar.gz 7768110 BLAKE2B fe8616235caba29ebf3a36d1a8484d5d534db0f7a6486822e88f8322eb9b7220b1c7539feee5b9486129eb97d5a6810b8542e627a6bf3451094821f56cd8d9f8 SHA512 4b3554b0f4a5f68d42a9bec273558098239c5b8be35248d1957d00076a8c57bf3d6cfb7af57b7340b0df7aea49c9bf2607a58cbb1573482527be4bd6da812dc0
 DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
 EBUILD libbitcoinconsensus-0.20.1.ebuild 2338 BLAKE2B 8a430de5b3110161dd2274cb49f704e448bbdc847e2bc0a762e1d6dc5858b3bf76639287aeab91bf1b25013010511df9e00ac1bcad224bd780ab69fe051f3ef4 SHA512 ce6847c95c6f2f1df8b085adf48548322e1a9d156bc69867189402579ef25436382c561b12ae6c8f5a987c55a31a8777c257992bb6c215c76209e476a59486be
 EBUILD libbitcoinconsensus-0.21.0.ebuild 2346 BLAKE2B 8cc7e7119962ca3598ee292773e10f4f5cd1c6a2c4079f55866b346e8e458bfc4ce7d122454f62461b81f5468b286e354c5a2ee61a39d427e8fc684c09f39cdd SHA512 95f09e34f4ba134ae829a86bdd9d0b035b07aed4af6d1ad085b7fed6d95edc5b718f3523084391ff7af3c560717fe3d485664fe1394dd72c51855798a0eaf029
 EBUILD libbitcoinconsensus-0.21.1.ebuild 2981 BLAKE2B fc9f64b99f54afe25ccad8de115012c50384196e85788a698093a72111661a6ab12753b79fe273719e204710bb5f975352a3715d1610977823e8a2579db64c05 SHA512 f984e35fb0c069c2cfc29856ff2b96619711fe039126de5bb37e66a877f5c5eb8b74be89fdbf38cb98428d81b3d072127717ff80181d4493cf2a8562e309ab18
+EBUILD libbitcoinconsensus-21.2.ebuild 2884 BLAKE2B fe68c6f4aa8914056f54312b1a252176b46408f70df0b5183522170f32a557959e13d044b528d39a04fc58bb7da4f30a4b1c772b12f8ace7503fa465e2bae497 SHA512 8e0ef5b549cdd683d3f2b69a720db82fe841e1955938d27ff5bd35867cc8a6fc430187ddf418b1f50d54042bc1351a08d066bc2a3ed3523b94c123e3ad2ee58b
 EBUILD libbitcoinconsensus-22.0.ebuild 3185 BLAKE2B 1e9d3291a2fa7e4658935b5c5cec55a9390956b7b47a4ee0d5ce241ce77e722cbdfb773746592e3fb64dc58fd7a763abdabdfd91d8906cc4f03beae5e5c383fa SHA512 7ea138cf0736ba7a9cfdc59d53a2e70af9fb4e1f0c2141ae30006a2ae6396bb1648adba51c8312f56940254b0f350b5218a041627a53d12da5a69e00ea932c83
 MISC metadata.xml 710 BLAKE2B 3d75198b842caa94dd3de1bca5cabc08559fcf3d03cea90602ebc8eabb4f1be96ee9aca89500096048655be67c4d09ae466e2d7094c77d905bc0b19ef2e99c6a SHA512 0384b791e087d1b2475d0c4fc355d5d9c160d7841e85d41a0c3c827269a0ec2d71e05f81fe68c65f32a1eb57aaf6609dd1c3a6663171e312650e5461ef563518
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild
new file mode 100644
index 000000000000..2fa948c0c2f8
--- /dev/null
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-21.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+BITCOINCORE_COMMITHASH="af591f2068d0363c92d9756ca39c43db85e5804c"
+KNOTS_PV="${PV}.knots20210629"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Bitcoin Core consensus library"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz
+	https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm knots"
+
+DEPEND="
+	>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/automake-1.13
+"
+
+DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2021/09/29/release-0.${PV}/"
+	fi
+	if has_version "<${CATEGORY}/${PN}-0.21.1" ; then
+		ewarn "CAUTION: BITCOIN PROTOCOL CHANGE INCLUDED"
+		ewarn "This release adds enforcement of the Taproot protocol change to the Bitcoin"
+		ewarn "rules, beginning in November. Protocol changes require user consent to be"
+		ewarn "effective, and if enforced inconsistently within the community may compromise"
+		ewarn "your security or others! If you do not know what you are doing, learn more"
+		ewarn "before November. (You must make a decision either way - simply not upgrading"
+		ewarn "is insecure in all scenarios.)"
+		ewarn "To learn more, see https://bitcointaproot.cc"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}_p2-fixes.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}_p3-features.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}_p4-branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}_p5-ts.patch"
+	fi
+
+	eapply_user
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm)
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--with-libs
+		--disable-util-cli
+		--disable-util-tx
+		--disable-util-wallet
+		--disable-bench
+		--without-daemon
+		--without-gui
+		--disable-fuzz
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 3d44b238a7b5..d8b83050eea5 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,8 +1,4 @@
-DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
-DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
 DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b SHA512 a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6
-EBUILD libbtbb-2018.08.1.ebuild 3470 BLAKE2B 6084d483155c28553328fca02da898c9e37ff4a9d01b82c6aa86a75157c95b130d93a1384042f41cdeefe4e4a77e50dd391598ae50668903302f07a4ac75b109 SHA512 d24a516eb987b1d23812980e937856bba04f20f8dbcf9ab8980f528068d7b9aae2c9464f988f0d89e072b1c3bff27263095ca24428bf583549e479292c769617
-EBUILD libbtbb-2018.12.1.ebuild 3467 BLAKE2B 3a525773dac747916a2824a792ba82a7b536d02f437ad54df462ef025d87f485a4509705ce49c0af624ad108b32888019b083a321dc4ba30340551737ecea320 SHA512 98b8925a4b828464897d868682f1d3642c17761cbb17f1fd584df7141b2ee6f503e845463110c5aac507e62e63c86109b2287818ee14ee175949e7a5a3d8ea64
-EBUILD libbtbb-2020.12.1.ebuild 3404 BLAKE2B 0960f98c48cc5505ced0faf31ecc0d43f71db64cecad00737818a6202721e2bf323b531b892876ce5d28adb537f323366c9e2e393db7098f3b7c76176ca1096c SHA512 2812a860a5d8c70922efb2b91f55db79dd28913a3962c398698cdcf980b365f8430272fcfe528fa1c2600be1946a6033fc2504f735e9edf1f1df026682780791
-EBUILD libbtbb-9999.ebuild 3404 BLAKE2B 0960f98c48cc5505ced0faf31ecc0d43f71db64cecad00737818a6202721e2bf323b531b892876ce5d28adb537f323366c9e2e393db7098f3b7c76176ca1096c SHA512 2812a860a5d8c70922efb2b91f55db79dd28913a3962c398698cdcf980b365f8430272fcfe528fa1c2600be1946a6033fc2504f735e9edf1f1df026682780791
-MISC metadata.xml 505 BLAKE2B abc72cf649277ff23c66e4a63937d41760065c2a6a8c589f988122ca5ea1990bd1389b635e018c7ce51186f1955dc567fec5785510dd5c724dd473f27f62d9df SHA512 d2da37b4a13d9806114e31b19be4ac0f8d623075059a550eeaeae3635f46490c4dd9e4ec1ab37bb34f7cb8d69ffe649706053faeadc39ebde630dead67874766
+EBUILD libbtbb-2020.12.1-r1.ebuild 745 BLAKE2B 214dafb5b2ece999dd014febde3d5827fc2e8db9b9c553a4f6acb55ad511c1a04d617e1ae3fe06599befddee36c4e32dd8f6f835ded26504ba948a95777006a6 SHA512 5affa7fdf883fa18a23568d3eb15b8292e94cb4d6fc76e587075b9406288a3f18f8f88081265aa2b13156c9762cd20208c37a0efdc819f015553827cdd9999c8
+EBUILD libbtbb-9999.ebuild 748 BLAKE2B 328e0187f9f8464d61e0d57bc6b17943f9ba8cd6d81d3bba5c4a7a354ef9fd1b307bab56ef58ab71e0a1ac0721566dcd66350a42dd0cb2c0761699f182dd7f9c SHA512 fe0f2ab74855bb46dba810e6377d6b2506450e7fcbf9772d3921af6f381843cff55d298210fef693b7a83ba559c5c5fd546cc37401a5a45e47b254ddc985730f
+MISC metadata.xml 390 BLAKE2B cbfb13f815455794d6bca3136c1b8b058536bb43b749c83d88605449c4bd7305969944802a98826d4a8599ca72de56f9bd7c9aeebd5aaf8c97566466a2bb875f SHA512 dc9bb923f75a0e387dd17c515aa15dfd4e5e4bba8d4409c1d277b669647f002020dda58641e293fe1cbbddf7bff02cb16458546055f660478d073159c06b228b
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
deleted file mode 100644
index 23524a6f4e36..000000000000
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
-	inherit git-r3
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S=${WORKDIR}/${PN}-${MY_PV}
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
-	wireshark-plugins? (
-		>=net-analyzer/wireshark-1.8.3-r1:=
-	)
-"
-DEPEND="${RDEPEND}
-	wireshark-plugins? ( dev-libs/glib
-			virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
-	if has_version '>=net-analyzer/wireshark-2.2.0'; then
-		plugins=""
-	elif has_version '>=net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btbredr"
-	elif has_version '<net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btle btsm"
-	fi
-}
-
-src_prepare() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_prepare
-
-	if use wireshark-plugins; then
-		which_plugins
-		for i in ${plugins}
-		do
-			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_prepare
-		done
-	fi
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	local mycmakeargs=(
-		-DENABLE_PYTHON=OFF
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		-DBUILD_ROOT="${ED}"
-	)
-	cmake-utils_src_configure
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
-			)
-			cmake-utils_src_configure
-		done
-	fi
-}
-
-src_compile() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_compile
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_compile
-		done
-	fi
-}
-
-src_test() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_test
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_test
-		done
-	fi
-}
-
-src_install() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_install
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_install
-		done
-	fi
-}
diff --git a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild b/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
deleted file mode 100644
index f4a117ca3006..000000000000
--- a/net-libs/libbtbb/libbtbb-2018.12.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
-	inherit git-r3
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S=${WORKDIR}/${PN}-${MY_PV}
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
-	wireshark-plugins? (
-		>=net-analyzer/wireshark-1.8.3-r1:=
-	)
-"
-DEPEND="${RDEPEND}
-	wireshark-plugins? ( dev-libs/glib
-			virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
-	if has_version '>=net-analyzer/wireshark-2.2.0'; then
-		plugins=""
-	elif has_version '>=net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btbredr"
-	elif has_version '<net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btle btsm"
-	fi
-}
-
-src_prepare() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_prepare
-
-	if use wireshark-plugins; then
-		which_plugins
-		for i in ${plugins}
-		do
-			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_prepare
-		done
-	fi
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	local mycmakeargs=(
-		-DENABLE_PYTHON=OFF
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		-DBUILD_ROOT="${ED}"
-	)
-	cmake-utils_src_configure
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
-			)
-			cmake-utils_src_configure
-		done
-	fi
-}
-
-src_compile() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_compile
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_compile
-		done
-	fi
-}
-
-src_test() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_test
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_test
-		done
-	fi
-}
-
-src_install() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_install
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_install
-		done
-	fi
-}
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
new file mode 100644
index 000000000000..c6a7e694e720
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library to decode Bluetooth baseband packets"
+HOMEPAGE="https://github.com/greatscottgadgets/libbtbb"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+	inherit git-r3
+else
+	MY_PV=${PV/\./-}
+	MY_PV=${MY_PV/./-R}
+	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+	KEYWORDS="amd64 arm x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="static-libs"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PYTHON=OFF
+		-DBUILD_STATIC_LIB=$(usex static-libs)
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
deleted file mode 100644
index edbf18eed8ff..000000000000
--- a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
-	inherit git-r3
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S=${WORKDIR}/${PN}-${MY_PV}
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
-	wireshark-plugins? (
-		>=net-analyzer/wireshark-1.8.3-r1:=
-	)
-"
-DEPEND="${RDEPEND}
-	wireshark-plugins? ( dev-libs/glib
-			virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
-	if has_version '>=net-analyzer/wireshark-2.2.0'; then
-		plugins=""
-	elif has_version '>=net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btbredr"
-	elif has_version '<net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btle btsm"
-	fi
-}
-
-src_prepare() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_prepare
-
-	if use wireshark-plugins; then
-		which_plugins
-		for i in ${plugins}
-		do
-			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_prepare
-		done
-	fi
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	local mycmakeargs=(
-		-DENABLE_PYTHON=OFF
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		-DBUILD_ROOT="${ED}"
-	)
-	cmake_src_configure
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
-			)
-			cmake_src_configure
-		done
-	fi
-}
-
-src_compile() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_compile
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_compile
-		done
-	fi
-}
-
-src_test() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_test
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_test
-		done
-	fi
-}
-
-src_install() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_install
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_install
-		done
-	fi
-}
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index edbf18eed8ff..9085d00e99ef 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,150 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
+DESCRIPTION="Library to decode Bluetooth baseband packets"
+HOMEPAGE="https://github.com/greatscottgadgets/libbtbb"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
 	inherit git-r3
 else
 	MY_PV=${PV/\./-}
 	MY_PV=${MY_PV/./-R}
-	S=${WORKDIR}/${PN}-${MY_PV}
 	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
-	wireshark-plugins? (
-		>=net-analyzer/wireshark-1.8.3-r1:=
-	)
-"
-DEPEND="${RDEPEND}
-	wireshark-plugins? ( dev-libs/glib
-			virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
-	if has_version '>=net-analyzer/wireshark-2.2.0'; then
-		plugins=""
-	elif has_version '>=net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btbredr"
-	elif has_version '<net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btle btsm"
-	fi
-}
-
-src_prepare() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_prepare
-
-	if use wireshark-plugins; then
-		which_plugins
-		for i in ${plugins}
-		do
-			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_prepare
-		done
-	fi
-}
+IUSE="static-libs"
 
 src_configure() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
 	local mycmakeargs=(
 		-DENABLE_PYTHON=OFF
 		-DBUILD_STATIC_LIB=$(usex static-libs)
-		-DBUILD_ROOT="${ED}"
 	)
 	cmake_src_configure
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
-			)
-			cmake_src_configure
-		done
-	fi
-}
-
-src_compile() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_compile
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_compile
-		done
-	fi
-}
-
-src_test() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_test
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_test
-		done
-	fi
-}
-
-src_install() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_install
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_install
-		done
-	fi
 }
diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index d7061daf597c..52a7dfec9b49 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -5,9 +5,6 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<use>
-		<flag name="wireshark-plugins">Build the wireshark plugins for bluetooth baseband sniffing</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">greatscottgadgets/libbtbb</remote-id>
 		<remote-id type="sourceforge">libbtbb</remote-id>
diff --git a/net-libs/libmrss/Manifest b/net-libs/libmrss/Manifest
index 1cf16261ca9a..ba72eb0e5323 100644
--- a/net-libs/libmrss/Manifest
+++ b/net-libs/libmrss/Manifest
@@ -1,3 +1,3 @@
 DIST libmrss-0.19.2.tar.gz 375238 BLAKE2B e01682d9223d3f2cea444b5e6b5e9b6e476782ef0ae1c4a85d5ea8e8e5383d5317f2d35eff93347e6b5fde0778060c212b8e489915f50b20f098f7e94805e148 SHA512 0997ced472b767174977b7623484c57bfd0b901a9650cb7f7738ad7393153752ebfc1f717e2eacfb5f7eb319140599128d73de7e095327ee089cd1f85ab42b24
-EBUILD libmrss-0.19.2-r1.ebuild 1182 BLAKE2B 9795978e597580867d9372136ab06cf18ef77cc3fddf899a3f88723124f619bfbcc07104d70776a5e4295e3cf529863e071790f2b0deec5deda52cca55a597ab SHA512 c0747a1c5aa943a57a30b27abeeea7b3faeffb4c55204f790c7f580996a40e6bab0edfc1eec0ca8a3638ba172c4a29ba455536411deacd3e15af3ec895b2c06a
+EBUILD libmrss-0.19.2-r1.ebuild 1189 BLAKE2B f870eaee209a1c06a9863dbdb2f86b1a6b5fac1b8acc7cb37691e9125b02656467dfadabb9d7ac65e6c482121af0bff3e22a935b45d888436e52ca971c1d4f51 SHA512 15ebe7f28bb5742ec1ef2cd7e4c5fbed5b0dea5e07220016ba3e797fe533b1a53a31eda83bf751cbd808136dde4303a634bd65ae29dc83d4695a4ba89056cd35
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
index 094466ef4985..05c56f50afa4 100644
--- a/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
+++ b/net-libs/libmrss/libmrss-0.19.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/net-libs/libnxml/Manifest b/net-libs/libnxml/Manifest
index e9c16f257d44..005e77687eb7 100644
--- a/net-libs/libnxml/Manifest
+++ b/net-libs/libnxml/Manifest
@@ -1,3 +1,3 @@
 DIST libnxml-0.18.3.tar.gz 361977 BLAKE2B babe5773f102889d52d0d63511984201e220205925b703221559cf73c8e380b78b3788ff48bdc2da382746bb95acf4c9a70c69d689c4fd7db3be4bd65f44000d SHA512 fc420a4b773eca68608ac1d509930a0528c3a41b53fc7cc340c09fd53f92a88afb4091e810d97d59e73a8beeaaeed52dd3c880273ef512a5305800b3ef46717a
-EBUILD libnxml-0.18.3-r1.ebuild 1116 BLAKE2B ac5477bfc79ef62ef3b491439ee0c094f118de90002e81f6d3aa24d2d0349ad76fce1419935d13eda45f85f3cf92c933559f3e1551117aee4f2455125c834578 SHA512 d38c1bd4ead63c0b5afd96d3b90a9f3983a6e5902aa7138e13ee03717e606f79bf035f483f4c59df259f4bf382228d459f2970ec72ca9c74fc18573c9a12190b
+EBUILD libnxml-0.18.3-r1.ebuild 1123 BLAKE2B faf9f28b22116825bbe73bd271cce9d7ee9a1e5753791b716c773db62a1da90bf8bfbf508594d319be42fd8430db70fb7fdcbc3e30029dc58c318bc0d6dc9016 SHA512 cd71d9e2fec57bfc393f9d9f46f2b2c151851bf6f70adb9c7b8c9a45d3791dab72682dcbf595fdaf6b4304c635cab00df052b30d4840b50ace11a99fa2c32292
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
index 9a1d82c9061e..1f4b284d7def 100644
--- a/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
+++ b/net-libs/libnxml/libnxml-0.18.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="doc examples"
 
 RDEPEND="net-misc/curl"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 9f98989a149a..5c29b0df947b 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,9 +1,7 @@
 DIST mbedtls-2.16.12.tar.gz 2702190 BLAKE2B 3cbe0bcfd0eca279d9b4b3816416b8e778f0aa38d368d810701e65140f0d1524afabe4fd1a1a65297f872a7dfafb7d2feeb7382fe8ea2b180f24551ceac53c26 SHA512 40c4487cc40afcf929bc7158d735a869ebada41c811f63a10d74e9b9644960e2a0aeb7c7c9841c0aef815425990847d47e7f42f9bafe0b2a959e769e3d74ebe9
-DIST mbedtls-2.27.0.tar.gz 4212185 BLAKE2B 31840e5a518643495f319cac8e0c876bdca5dbdee6524d30cace3538d5fb5ba7847dd653f61f775f5c3c384ac0533afdbf6172b3e523db515eceecc29fadd2da SHA512 9503ef75f08d2574e0800b2e3b6f030461cbd97c74863a20e5688ced7558b0b6f87cbe33cbd003e69c825d0321393fe9b00b0be190ab408138414b99d5102994
 DIST mbedtls-2.28.0.tar.gz 3712239 BLAKE2B 1141465bc5b73e7fd94bbd02c79290093fd075626be93aea839a54ebff81fb00917f0a4fe7911fee983a36147fa4922d258714a330b40b0da4764a3b2419df8b SHA512 2ddc161caeebe8bf1e8cf23c398f65ceff699eb6487a7bcaf6a665879aac5458e21e26b06370085cbdae6ce6b5394afece656aa6307bbb3f5b701bcb41f3dd64
 DIST mbedtls-3.1.0.tar.gz 3766628 BLAKE2B a52e8fb9a3b88c1cf7cb0c8f5598f90a1c9ca05dbc399432293c3acb77aaf0a1b92a9792bda986b47e925736b21c83de1c891b21d45fd2dc8cb5d7d1b09168e7 SHA512 c374fafad89f8793ed1a302634a403b855317d9759377d4bade13c61857d0317a2fc144ab3a9aaee52901ff7a3c4b4b0e7e81ebe5510ab4d228103def01ae628
 EBUILD mbedtls-2.16.12.ebuild 2646 BLAKE2B d3ec300834294fa08d45e57f47f970f3c69b903ceea0b83a9a65ad19ae79570f94876583c39e1a88269f6a08c768524c1c4a1261bffc77ad46189f4d4152b81c SHA512 07c7991767aaee6d291ae6dc313eb49d9344aca3b9cd9aa76cd5110d3a71f394074cb6f83b6e785c2eedaf5f63d4a491280a4a9533a678a62627202c5293cabb
-EBUILD mbedtls-2.27.0-r1.ebuild 2713 BLAKE2B 04a6a635d0cea7ca5ee974c7e3203519b06a39709db2813962d251eb1f3ea2679ac127e5d6358b0ebd05fe70473a64b7670476298195e5070c96ebe77cb36d52 SHA512 3cbd1b1e297ede691c62a283442267141491c59d6b57d65ee2312dee399f6d55c954317586e0245e2ae8622d50890098f91e2cf3fce78256c72fed49a7a7282e
 EBUILD mbedtls-2.28.0-r1.ebuild 2713 BLAKE2B 688b43d616de8eaeaa432ad433ff0276c54dcfb86f1b27ac5e2a33a3a5d6b1ee8ba11aee3b5585ddf11bc07740e85e725dce7246b5a4fe5db89a9c7c2ba38729 SHA512 d00846dc9d6d391f12728d6c6b92a29fbc9a118c4c4ec2380260ea2970eddd185d148946709a20e9809c26c9c54ef19b66353c2a4f60c999a009518a51728c63
 EBUILD mbedtls-3.1.0.ebuild 2416 BLAKE2B 1f10d91faee5f4d8db8a3dd82da4308e156a280ffd1860764726189212cda26f5d4c8f71abf2de81002c16b5335f39ba5a08605c9eb023668cb25b7b6bb6add1 SHA512 95baf23bb04e80b76c4a394d30712a28dd7575b68aa84730b9293733492dc463b6b3533c620608551828d3c48c39a2b7eccf7832ac4e59afffb06b0b550285fa
 MISC metadata.xml 847 BLAKE2B a79da594cc8f9491335ebef15bdbf2255e1d02780d3434779f51ccb8dcc319c350205dd6eee75143e50c79c987c50045db374442425a2cf582faf1e5c0ad8b92 SHA512 574394f0955d67f13524a5ea411249dd63e6b313f144e0f6b2e2b44bb0d6d311e93fd44a386174dc8f2f4960105e396b74f60e7c2fd1dea3ac3b493a862820a4
diff --git a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
deleted file mode 100644
index 7436d6b627e9..000000000000
--- a/net-libs/mbedtls/mbedtls-2.27.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/"
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="Apache-2.0"
-SLOT="0/7.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cmac cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	programs? (
-		dev-libs/openssl:0=
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-enable_mbedtls_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/mbedtls/config.h || die
-}
-
-src_prepare() {
-	use cmac && enable_mbedtls_option MBEDTLS_CMAC_C
-	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
-		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
-		-DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
-		-DENABLE_TESTING=$(usex test)
-		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
-		-DINSTALL_MBEDTLS_HEADERS=ON
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DMBEDTLS_FATAL_WARNINGS=OFF # Don't use -Werror, #744946
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	use doc && multilib_is_native_abi && cd "${S}" && emake apidoc
-}
-
-multilib_src_test() {
-	# psa isn't ready yet, it might be in 3.x(?) but certainly not
-	# at the moment.
-	# bug #718390
-	local myctestargs=(
-		-E "(psa_crypto|psa_its-suite)"
-	)
-
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake_src_test
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( apidoc )
-
-	einstalldocs
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/neon/Manifest b/net-libs/neon/Manifest
index 46ee2144695b..701e99a2f4a2 100644
--- a/net-libs/neon/Manifest
+++ b/net-libs/neon/Manifest
@@ -3,9 +3,11 @@ DIST neon-0.31.0.tar.gz 867476 BLAKE2B 84981d0fcca97bfa495f9e8cbf060a06e04c931ce
 DIST neon-0.31.1.tar.gz 867810 BLAKE2B 7b7d0c8ab635446c98f3db7072f1dabbb74ad9f579086f209bb3af5460363520be38886a299d22dc0f27a091f322c6d5972a00d4e6c612c710dca12e7620f850 SHA512 00d7297c102ee828d84eb28c9b6a57e66290904acf5327f8a6d3d1759ffacf88329bb2157dcef418c69e93d1370ccbd591829da06c01c3f44aea6c7b92462c13
 DIST neon-0.31.2.tar.gz 867914 BLAKE2B 8ae1301dd5f9ac1a6b518f99919a1b7e7b7c6499413b523ff82e00d364d6d9c5ad96875795330e2fd9c42a42b073e3eea51b6cc0ee9e9a21850763f0cdd0b97e SHA512 1e402b40a0445f68ed24d2697ee60d21636f61ebc98edcde37ff9e26c54430acabf3969ac22a942d1dd51bddee0f312c04073b423b0af3a3e7c9bf60cd53e48c
 DIST neon-0.32.1.tar.gz 880434 BLAKE2B 91b942cb0d7184f4da26d7d45e846a0f80aa834226e5ff0689df75650da79cbfad0854c718dbffdd31cc0f09f25458ea37ca39bb38071643a6a609ef6102b896 SHA512 a231865c3aad3668f6effded97a58eb981655f64c71b0954fcb2e667bdec50895d11bf296f4f454bd63e6ce9b02c2fd13cbb17cb82631e16f100000ecd7e1977
+DIST neon-0.32.2.tar.gz 880651 BLAKE2B 3629eee38e10ada5e001bf0afb77c70814083bf553596fc150a6cf21f0b66cf4de28841b242f68faaeb44fa5e0ad260939102b015d2a543ef59012876256b364 SHA512 2580a3c8c3cf4aff2d399f72a721ccfb4e68434ef92da4af8103c126812d779b9fbe5cafbab512c79f4365bbb3d3eac61568748136470e86f7aa7b98b27053c8
 EBUILD neon-0.30.2.ebuild 2637 BLAKE2B ca7d46b167c16691eed84c4fa6f20a8b177b5f74a92be193a8f4d544aac3cc1a5f9efcd727029a96e3395fb7b59ae5cd86defee9de8f1282e5850164d34e1fa9 SHA512 6e39206178a702501252a5b651b6bc7b78027ea0964fb62d82cd3fff8c2328a469e649bb2b69930782c8d06f0a383989c81ac02de6ce239a6acc2cd73598e957
 EBUILD neon-0.31.0.ebuild 2645 BLAKE2B 1fa391bc79023f61977c500cc1dba20482332eaee623632e92c6556df3d256c4638ccaa642ff4561b4572aecfb92cb73c9ce27b77e212d56c923beeef15d04cb SHA512 353a070a4ef590388e29b91442fc30c6ec1be79289765d53afc190d4d89ccb26034b076cedde1bf27c492a43b534ecda7e584f918141bb510516a1d4860e8823
 EBUILD neon-0.31.1.ebuild 2652 BLAKE2B ce07b714de82accd30783ae03fd9243c41adbaf8470891f7a37301b5eafc5a885ee5beee4f2dffe2cad34c966306ba68a1e4b4a4d0b0ae76a107a7b74b8e6194 SHA512 7ac1d4a62ddde50d7406d90760aeccbe68ff4cd36a2933faddecaa20724c904c9d4a007810b56632a63e2fd7fc8aff014755c3019191f52ff44aa97d3bd1ad10
 EBUILD neon-0.31.2.ebuild 2652 BLAKE2B e718aeeb582f1d0ea1fb0460dfdee36bb29241a22848ff5cbe4831a6ed9b8b909098583e228c3c2d9ba33199999b3d2a322ae58915d48a542bf4e0235031c31f SHA512 5107c9be940005e1bff5b20bdf878b96c0ee94817812139f5f7c3875020c64731eda7a22221b0519b769936143d868757849314ba48403e1140ab0402e69582f
 EBUILD neon-0.32.1.ebuild 2717 BLAKE2B 3ed9eb1069ef0485205f74755902268a26fd2b7e475c8e27534bc82701193e7c573b77cc4f8272bd59685c8225c2863a810fb009fed100ef23de23bc56b9fe71 SHA512 7376c1fb7d34f0c9d983b3f1640a72f8fa15db2bd0657eced6a0b4aa56c044a61f80ea45b49ef9f1987d8f70d2118d13a9fd0e2b6118c9b5b11a6c339ec68958
+EBUILD neon-0.32.2.ebuild 2717 BLAKE2B 50b3a737198c4176ccf4ae722690c58777fdd4ffb43002214155050c7f29b3fdd92fec57b62e3d6bbe623c39f06e8934b6305bc7658410e00f20f94318744ed8 SHA512 b7bdc5b90305558fbb0acea64c08b2bf5b9529703bc0649a0fbbe3b7e1532f8c6647172a5b05e119de60eb72bda3e1cda1088a8ad45fc9f3d93698d10102bf47
 MISC metadata.xml 1413 BLAKE2B c90629adef6f151c3584782110a60c0f3dc5729faa222b347348ee24f20f137711fa2f075cea72629729be803fed5cbd562f96005717b6fc3fda52c32c471bbb SHA512 f06e7f2864d42a47b385d836c793652ae8699e495dc7d21d33277025c27af8f35ee674ce15109159c0cd4aa61cea9bfedbd14d7730d4cbd222432d69acdb6757
diff --git a/net-libs/neon/neon-0.32.2.ebuild b/net-libs/neon/neon-0.32.2.ebuild
new file mode 100644
index 000000000000..b318674ec7f0
--- /dev/null
+++ b/net-libs/neon/neon-0.32.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2001-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="HTTP and WebDAV client library"
+HOMEPAGE="https://notroj.github.io/neon/"
+SRC_URI="https://notroj.github.io/neon/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc expat gnutls kerberos libproxy nls pkcs11 ssl static-libs zlib"
+RESTRICT="test"
+
+RDEPEND="expat? ( dev-libs/expat:0=[${MULTILIB_USEDEP}] )
+	!expat? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
+	libproxy? ( net-libs/libproxy:0=[${MULTILIB_USEDEP}] )
+	nls? ( virtual/libintl:0=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			app-misc/ca-certificates
+			net-libs/gnutls:0=[${MULTILIB_USEDEP}]
+		)
+		!gnutls? (
+			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+		)
+		pkcs11? ( dev-libs/pakchois:0=[${MULTILIB_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	virtual/pkgconfig
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/neon-config
+)
+
+src_prepare() {
+	# Use CHOST-prefixed version of xml2-config for cross-compilation.
+	sed -e "s/AC_CHECK_PROG(XML2_CONFIG,/AC_CHECK_TOOL(XML2_CONFIG,/" -i macros/neon-xml-parser.m4 || die "sed failed"
+
+	# Fix compatibility with OpenSSL >=1.1.
+	sed -e "s/RSA_F_RSA_PRIVATE_ENCRYPT/RSA_F_RSA_OSSL_PRIVATE_ENCRYPT/" -i src/ne_pkcs11.c || die "sed failed"
+
+	eapply_user
+
+	AT_M4DIR="macros" eautoreconf
+
+	elibtoolize
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if has_version sys-libs/glibc; then
+		einfo "Enabling SSL library thread-safety using POSIX threads..."
+		myconf+=(--enable-threadsafe-ssl=posix)
+	fi
+
+	if use expat; then
+		myconf+=(--with-expat)
+	else
+		myconf+=(--with-libxml2)
+	fi
+
+	if use ssl; then
+		if use gnutls; then
+			myconf+=(--with-ssl=gnutls --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt")
+		else
+			myconf+=(--with-ssl=openssl)
+		fi
+	fi
+
+	econf \
+		--enable-shared \
+		$(use_with kerberos gssapi) \
+		$(use_with libproxy) \
+		$(use_enable nls) \
+		$(use_with pkcs11 pakchois) \
+		$(use_enable static-libs static) \
+		$(use_with zlib) \
+		"${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install-{config,headers,lib,man,nls}
+
+	if multilib_is_native_abi && use doc; then
+		(
+			docinto html
+			dodoc -r doc/html/*
+		)
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -type f -delete || die
+
+	dodoc AUTHORS BUGS NEWS README.md THANKS TODO
+}
diff --git a/net-libs/ntirpc/Manifest b/net-libs/ntirpc/Manifest
index 6a7cc6e19740..0c7807390320 100644
--- a/net-libs/ntirpc/Manifest
+++ b/net-libs/ntirpc/Manifest
@@ -1,5 +1,5 @@
 DIST ntirpc-3.4.tar.gz 387376 BLAKE2B db4d0fd22f1ea46da6e40a613848f9fd396bd85cf01968f5ab976627ab787e8d1bc2a57a8bb87f2ffcaf63b8e59c6ea41145ed9ccafc66d4ba420a15c9a78901 SHA512 913bc9f3208ddb667a7fab6e06585ba15ac3dd1979a15846f49114f54a270c2174a00afc3009d6158851aed779046743dd1ea704227122079164c07b394c01ad
 DIST ntirpc-4.0.tar.gz 388389 BLAKE2B b997430a119c900cfd8792af530d7baec629d7afa076838ca22b83631a461df2f267c6b786582bbefc98db870d054f37c9e9c0c3201f9a130f3f3806168043c1 SHA512 7bafad650bcebbf53a9958abdcacb8dfa9ac46c9798ac39e82c2ae3215b3e5b5a6b916bb95e3c70e7bc1a09b26a46b00bad236b2400538e9695b1c347f0672d9
-EBUILD ntirpc-3.4.ebuild 735 BLAKE2B fda86f45c8b96b14197e772659e34b779b3c2813ad47468ff2b57eaf0608e9d7ef7bed29850cabf8abf378c84f77fe8e9b1bd8b0445d47f1158a5b2bd7fe9f56 SHA512 49d1d92954d8c4f6fafe04a55fdd680358b31fe5405951ac821348097f2c6ee6732f2dc301a1b78f8b00600c0406a7d09ce13cd2338590fd2d640261487bf491
-EBUILD ntirpc-4.0.ebuild 735 BLAKE2B 2491eef0852dad3ef87f23c630719ff34375f4a4d90417a7f18feef225e56401e40a5b3d05586b92085b4c9b033a2e39eab2100b5e2a8249b61a070c25ccf32f SHA512 41e9c84e75f510a68a16136a2264eb338e32d70f4e189b2ec8f7c658f2554216566fef0b2c83eb8078894a1a208247cc9acad22499999219508dd6221f73dff2
+EBUILD ntirpc-3.4-r1.ebuild 738 BLAKE2B b984c6432dc4d15e8a762397b3dfd6ba2f3213e2b9233d86297644624302dd96fe709f1317f3cf4869e4800735882f42bd0dea107fd0589df8221b51d96885d1 SHA512 88d30e63cc0feb0ae67db51a1b05e43401a97c350b796f46bd41fc9928358849f3df02abaec4e526d001e1091dc540c850056e11386a2f3e68a59043821251ca
+EBUILD ntirpc-4.0-r1.ebuild 738 BLAKE2B b984c6432dc4d15e8a762397b3dfd6ba2f3213e2b9233d86297644624302dd96fe709f1317f3cf4869e4800735882f42bd0dea107fd0589df8221b51d96885d1 SHA512 88d30e63cc0feb0ae67db51a1b05e43401a97c350b796f46bd41fc9928358849f3df02abaec4e526d001e1091dc540c850056e11386a2f3e68a59043821251ca
 MISC metadata.xml 428 BLAKE2B 18d449071b1cd5730c5ca97050f4c7c3f3354957598df3a71b2742793e14247843c640d7102f40d793b6b867a889da41aaae8a1c9c302732cbb5bf2be1d6a954 SHA512 a1e34d6248066744284ac224fa63983856fae50037b137f586ade1f7595c9129b88a9a092f3dd8dfc678066905fc92a4aeea11620bb450473d36933f93d1028e
diff --git a/net-libs/ntirpc/ntirpc-4.0.ebuild b/net-libs/ntirpc/ntirpc-3.4-r1.ebuild
index 8688e4cc9382..e7d899f9943f 100644
--- a/net-libs/ntirpc/ntirpc-4.0.ebuild
+++ b/net-libs/ntirpc/ntirpc-3.4-r1.ebuild
@@ -17,8 +17,8 @@ IUSE="gssapi rdma"
 # Since the GSS option only controls some extra files to be enabled,
 # there's nothing to list in the depend string for it.
 RDEPEND="
-	dev-libs/userspace-rcu
-	rdma? ( sys-fabric/librdmacm )
+	dev-libs/userspace-rcu:=
+	rdma? ( sys-cluster/rdma-core )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-libs/ntirpc/ntirpc-3.4.ebuild b/net-libs/ntirpc/ntirpc-4.0-r1.ebuild
index 6e63e824706b..e7d899f9943f 100644
--- a/net-libs/ntirpc/ntirpc-3.4.ebuild
+++ b/net-libs/ntirpc/ntirpc-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,8 +17,8 @@ IUSE="gssapi rdma"
 # Since the GSS option only controls some extra files to be enabled,
 # there's nothing to list in the depend string for it.
 RDEPEND="
-	dev-libs/userspace-rcu
-	rdma? ( sys-fabric/librdmacm )
+	dev-libs/userspace-rcu:=
+	rdma? ( sys-cluster/rdma-core )
 "
 DEPEND="
 	${RDEPEND}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index b2b4d9c9b8fa..5fe9028404a0 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,8 +1,9 @@
 AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
+AUX 2.34.3-jumbo-fix.patch 2430 BLAKE2B 0896f652262284cee74bec5f84f9bf8a88884f8c4182cbbc72dc59de5778856807772ecc92b9eb75c40eb021b0732ef81435e8894b46c8c10d833474e8c077c6 SHA512 c131daff77815eda541a376dc8904cffe7a75d9eb00fdf07ae872072aaa09493c2d01ae94122a0e6f43bdd8c8ba9aceb01821fb56b803c1b5f894d0e08abad53
 AUX 2.34.3-non-jumbo-fix.patch 1056 BLAKE2B 4d229c01fbfae518725bb802c0fd907a1dc8bd4edd41be2b48075471f31ec84b6f9bae1b97294f46a42ba77a081e3705be3ad49177de28791a495f19ddb4f51e SHA512 1ace5a3c1e775f258c67c59987a0c84ebc7cadd007cc0b79b282712b354cdaf9eb4dd6ef75b85b234ad3b16079ac8dbf2890921165854fc2da51f79cbd5f0e79
 AUX 2.34.3-opengl-without-X-fixes.patch 1436 BLAKE2B 231cdc9a428342d7fe98a1c1fb230b345f29b6a2d45da02cfa674dae1ceffbbcf5d62a77e903f690b59eb49ad7a3e50dffc190ea57bfa953f10fccfeb6dd4dfd SHA512 1af17f79d2a60cdd5337ca5a571787fb2cc1abc7d3f392b6640edc88856e2f8fc3e77625fdfd600d9ba9376a18ec379151d064d5f7ad1b2bfed0db2e0330e2ee
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
 DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0 SHA512 f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc
 EBUILD webkit-gtk-2.32.4.ebuild 9133 BLAKE2B c7d7e364939545a9529cded1349892d28a215a128630d697d17cd8c906ee31bc1e626bc8251d50b8df28f4e8364fdb1776bc39345e8b8be3b9b26b6431c89509 SHA512 8933e6b923c347740ffe1c280ed42c9435ffdc399c0fc216bec09f3afafedbcc13150998102794738219f151353149e561dfe5f637f96026c3aa3961e0ae09a8
-EBUILD webkit-gtk-2.34.3.ebuild 8266 BLAKE2B 754573cae584af0b855e30136fa4885a6730ec6f80b08bba74942fbe4eddb0538be06c4775df1943794b5a9b6f83a0125f70d5eec8fe8202f32eaa6ab4d9c612 SHA512 6b2e09bdefa19fbd3d57b9833b648353099abff0b26b1374d3739a1919851c7febb65ec974a2dec2921d1b35eea6914f27e344d78fe8c405e1cb5c79b77b8901
+EBUILD webkit-gtk-2.34.3.ebuild 8340 BLAKE2B 20de943304b61764da5a55212e24fc912bf7cf532ca3b85c42fca83c9632005d5f76b9c7924838c8b709648b504b2f098b2e99b58e6f8b7543294b4b209227ab SHA512 59ce1fc154a8c29f00e2c4f63bb4d4efb8a96e4956095e32ace53ece576dbac19ff0033911a32d5166b11caa98ba67ea8d4266b1790e3cb2dcf4c25517e91bc1
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch
new file mode 100644
index 000000000000..97c5c0c8e4b6
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch
@@ -0,0 +1,70 @@
+From b60c2e4d1770660280d97cae9e82f3040ab97229 Mon Sep 17 00:00:00 2001
+From: "philn@webkit.org"
+ <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Sat, 11 Sep 2021 11:34:42 +0000
+Subject: [PATCH] [GLIB] MediaSession is not enabled
+ https://bugs.webkit.org/show_bug.cgi?id=217991 <rdar://problem/70740119>
+
+leio: Extracted to include only the side-effect of fixing unity builds on
+some machine configurations.
+Thanks-To gen2dev
+---
+ Source/WebCore/platform/PlatformScreen.h            | 6 ++++++
+ Source/WebCore/platform/graphics/ImageFrame.h       | 6 ++++++
+ Source/WebCore/platform/graphics/ImageOrientation.h | 6 ++++++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h
+index d3f12a6538b8..d47d193e8bee 100644
+--- a/Source/WebCore/platform/PlatformScreen.h
++++ b/Source/WebCore/platform/PlatformScreen.h
+@@ -48,6 +48,12 @@ OBJC_CLASS UIScreen;
+ typedef struct CGColorSpace *CGColorSpaceRef;
+ #endif
+ 
++// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values.
++// As a workaround, we explicitly undef them here.
++#if defined(None)
++#undef None
++#endif
++
+ namespace WebCore {
+ 
+ class DestinationColorSpace;
+diff --git a/Source/WebCore/platform/graphics/ImageFrame.h b/Source/WebCore/platform/graphics/ImageFrame.h
+index 9843aac40eb4..92e1d4486c5f 100644
+--- a/Source/WebCore/platform/graphics/ImageFrame.h
++++ b/Source/WebCore/platform/graphics/ImageFrame.h
+@@ -33,6 +33,12 @@
+ #include "NativeImage.h"
+ #include <wtf/Seconds.h>
+ 
++// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values.
++// As a workaround, we explicitly undef them here.
++#if defined(None)
++#undef None
++#endif
++
+ namespace WebCore {
+ 
+ class ImageFrame {
+diff --git a/Source/WebCore/platform/graphics/ImageOrientation.h b/Source/WebCore/platform/graphics/ImageOrientation.h
+index d990a3dc555f..5de271e52352 100644
+--- a/Source/WebCore/platform/graphics/ImageOrientation.h
++++ b/Source/WebCore/platform/graphics/ImageOrientation.h
+@@ -30,6 +30,12 @@
+ #include "FloatSize.h"
+ #include <wtf/EnumTraits.h>
+ 
++// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values.
++// As a workaround, we explicitly undef them here.
++#if defined(None)
++#undef None
++#endif
++
+ namespace WebCore {
+ 
+ struct ImageOrientation {
+-- 
+2.32.0
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index a21471f285eb..a6cb56d76a50 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd wayland +X"
 
@@ -159,6 +159,7 @@ pkg_setup() {
 src_prepare() {
 	eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch
 	eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.34.3-jumbo-fix.patch # bug 830638
 	cmake_src_prepare
 	gnome2_src_prepare
 }
@@ -183,7 +184,7 @@ src_configure() {
 	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
 	# --no-keep-memory doesn't work on ia64, bug #502492
 	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
 	fi
 
 	# Ruby situation is a bit complicated. See bug 513888
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index c54be60a8fbe..f89a86c7e31f 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -4,10 +4,7 @@ AUX wvstreams-4.6.1-gcc47.patch 1308 BLAKE2B 4c49bb694eb50452f3d158ef9e8c8097861
 AUX wvstreams-4.6.1-parallel-make.patch 1882 BLAKE2B 03c40c90d63c72065ad29dcb7436a37e5d5037595c285671a5c7c1b76a74723e63ac7eba024326e7452b4c9af507b2925609faed0496c384c04980044dea28b6 SHA512 d7fffbd7940495f2e34d3317b8f0066f6caa98e213df00bf31e3f42fa6821c9fd017e3052f7ff98303a8d8bb61d9b24a14b87ddd18199038e083e42cf253c17e
 AUX wvstreams-4.6.1_p14-llvm.patch 11598 BLAKE2B a7f4019da421702ecfedc461079ad39a4b3776b3fb570ae50ddff64c0d2f9d4bd3752050daf1143d7bf86e62c33cb823f4a4f5b76c618f3b51908ff706dd1b9a SHA512 db0856afd7c0bcf976ef697c300817efbb2d4cf22f4c0832e87011025c9b43f7aab64ee335de2acee2dda7a59412a138e44ca89bb8b6df010b871bde427d16e3
 AUX wvstreams-4.6.1_p14-xplc-module.patch 806 BLAKE2B 066262f3e42617dbae0ff982af21933b1567f23119f9f83152afb1f8da8ea79fdc09f6b01a01ecb03626c7007b70d52f921f1f637089a9813d061dcc9de3dc9c SHA512 e1b74f6481cc55b1f6750d08c2f4ae4d11575e99cfd94b5bcc658f54ac4756e885dac98a82eb7f2b6e02d33f1b4ac75b91087640e3195deff8887d752ee2e0c0
-AUX wvstreams-99999-openssl-ldflags.patch 349 BLAKE2B d8df661e5219b7890e338ed21a570194a93d64142ce6e96f81c141cdb4ae33c6e785fe863278347e2b7903df13a5390305a18568fca9880c2ac45534458671ec SHA512 a8b90e1bbda676ba4303c7a31fc896955c3a0aea0ba4d8a69514210a4baa1cc4228de43b648788cfca2e6b607040daaa520568c7d15b258d04b803bba6375637
-AUX wvstreams-99999-soname.patch 273 BLAKE2B ef364e25848b4727a0e8b75f155ac2807f1d8cc976ea72af3191ca25a0dbb5d4345030812fad7af839e1c126db185b6ce48fb50d2211e810954f2f714717854e SHA512 c8388a5ac1e0bbbf1574c97004ae7381a466a7182614cc7345cc3f9639771e6696ce32ce03b98604a05618be03c30cb95079085e7c1c935c42dcfe5e9453f886
 DIST wvstreams_4.6.1-14.debian.tar.xz 21124 BLAKE2B 2af6ec180c3130dd7def733e5ea569fd0a81cd2c2411daca25e6042dcbe78792bafc4b13f1c1fffddb6cd66273f11c62f54b415c975cbea0af052b18ff0955d1 SHA512 93ea7c4fbab542bd552d6e91ae0c49a27ad8aded177ae6474943acb08d204ab31eac49b3f416b4d90a38ea697f3641c09651a64f9c40d12543d454aadf2ad9e4
 DIST wvstreams_4.6.1.orig.tar.gz 1118456 BLAKE2B 62243d9adc6ff5d01b7dfeb2ce24e8e530914e6ac4540e542dc3cee31e00d32211ad1c6085d7f5bd6e5fd85ff66e8c93afa37cec81f976590ba150f039dc8580 SHA512 59d64e527d86394b768b35254bf95ea59c412c0e092393ea3c84ec3202949150439bb6093bd7350b64ad4767acdb8feb38806c03de4e5cf238ed893f41db4a4a
 EBUILD wvstreams-4.6.1_p14-r2.ebuild 2185 BLAKE2B 1441ab9abd8f919d92450b65f58cdc86acd2bc9f19c421cec7912cd60f6c39d2085a8e0dcffd9a60798a8dac27c005b9f400e9146f21a21a6384759b94892b17 SHA512 43661a82f9c809d665fb5acb4ef5e62cf536dfd85f541d7e2d3bb8f8eb4aae5090bc3234451e52307b9d682bc7403bd5680a0f5431c088c9b6fd3241953999d7
-EBUILD wvstreams-99999.ebuild 1954 BLAKE2B 188f934ab0945635c235230e58fe3a0f6accadaca83fbe9a45fb8c8d2c1752b59ef95273eeefdbbfe52e233d2c3c3f49770a8a789cc200314052b9ceaaf2edf8 SHA512 702d728fa1f017aceb0f8ac5747ffe86f54fee6e970c78bcd9ace186fed2ac546778d974f4851c1742f91b0efb99e34519bfee5940f12f29039c2a1844d24748
 MISC metadata.xml 524 BLAKE2B e72c616489a0515aa0d228246654f2e9b19d54d2f836ab78218b5680427f574bb04955413cccfd1a34669b46f8d885e59ed2dceb7753d15a1f49f85da7f3d866 SHA512 23af80ab073e5418109263f916e48b99731f357f14679648d28b44ae421627529ac6d5e29a566bb29bc5f5232376d1ba8fc232647f2b738d3ac08b6c1eddad76
diff --git a/net-libs/wvstreams/files/wvstreams-99999-openssl-ldflags.patch b/net-libs/wvstreams/files/wvstreams-99999-openssl-ldflags.patch
deleted file mode 100644
index 0bf2bc4a7b02..000000000000
--- a/net-libs/wvstreams/files/wvstreams-99999-openssl-ldflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/config.ac
-+++ b/config.ac
-@@ -444,7 +444,6 @@
- if test "$with_openssl" != "no"; then
-     if test "$with_openssl" != ""; then
-         WV_APPEND(CPPFLAGS, [-I$with_openssl/include])
--        WV_APPEND(LDFLAGS, [-L$with_openssl])
-     fi
-     AC_CHECK_HEADERS(openssl/ssl.h,, [with_openssl=no],
-                      [#define OPENSSL_NO_KRB5])
diff --git a/net-libs/wvstreams/files/wvstreams-99999-soname.patch b/net-libs/wvstreams/files/wvstreams-99999-soname.patch
deleted file mode 100644
index 9dd0d8ab8260..000000000000
--- a/net-libs/wvstreams/files/wvstreams-99999-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/default.so.do
-+++ b/default.so.do
-@@ -47,7 +47,7 @@
-     redo-ifchange "$OUT/$2.a"
-     ln -s $2.a "$sofile"
- else
--    $CXX -o "$sofile" -shared \
-+    $CXX -o "$sofile" -shared -Wl,-soname,$sofile \
-         $zdefs \
-         $LDFLAGS \
-         $obj $libdep $libs
diff --git a/net-libs/wvstreams/wvstreams-99999.ebuild b/net-libs/wvstreams/wvstreams-99999.ebuild
deleted file mode 100644
index 11e465328157..000000000000
--- a/net-libs/wvstreams/wvstreams-99999.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-AT_NOELIBTOOLIZE=yes
-inherit autotools flag-o-matic git-r3 multiprocessing toolchain-funcs out-of-source
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="https://github.com/apenwarr/wvstreams"
-EGIT_REPO_URI="https://github.com/apenwarr/wvstreams"
-
-LICENSE="GPL-2"
-SLOT="0/5.0"
-KEYWORDS=""
-IUSE="+dbus debug doc pam static-libs +zlib"
-
-RDEPEND="
-	<dev-libs/openssl-1.1:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	dbus? ( >=sys-apps/dbus-1.4.20 )
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/redo
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-99999-openssl-ldflags.patch
-	"${FILESDIR}"/${PN}-99999-soname.patch
-)
-
-src_prepare() {
-	sed -i -e 's|-pre||g' config.ac || die
-
-	default
-
-	ln -s config.ac configure.ac || die
-	eautoreconf
-}
-
-my_src_configure() {
-	append-flags -fno-strict-aliasing
-	append-flags -fno-tree-dce -fno-optimize-sibling-calls #421375
-
-	tc-export AR CC CXX
-
-	econf \
-		$(use_enable debug) \
-		$(use_with dbus) \
-		$(use_with pam) \
-		$(use_with zlib) \
-		--cache-file="${BUILD_DIR}"/config.cache \
-		--disable-optimization \
-		--localstatedir=/var \
-		--without-qt \
-		--without-valgrind
-}
-
-my_src_compile() {
-	redo -j$(makeopts_jobs) || die
-
-	if use doc; then
-		doxygen "${S}"/Doxyfile || die
-	fi
-}
-
-my_src_test() {
-	redo -j$(makeopts_jobs) test || die
-}
-
-my_src_install() {
-	DESTDIR="${D}" redo -j$(makeopts_jobs) install || die
-
-	local lib
-	for lib in $(find "${BUILD_DIR}" -name '*.so' -type l | grep -v libwvstatic); do
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins "${BUILD_DIR}"/pkgconfig/$(basename ${lib/.so}).pc
-	done
-
-	if use doc; then
-		#the list of files is too big for dohtml -r Docs/doxy-html/*
-		docinto html
-		dodoc -r Docs/doxy-html/*
-	fi
-
-	if ! use static-libs; then
-		find "${D}/usr/$(get_libdir)" -name '*.a' -delete || die
-	fi
-}