gentoo auto-resync : 22:12:2022 - 01:55:45

21 files changed, 0 insertions, 1200 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 33035cc73b9f..75ee500b5042 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 4dc40fc18df4..cb5d27a56f37 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,7 +1,5 @@
 AUX gsoap-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch 614 BLAKE2B b54c19d6a465c71d3f7e4ac42ccc0add193b4b50b0047450583ee7c22d652b620e72f218ec5f87048331bd61e232b5ad1d2298f1ffdc17079ccdcf1d8f300aae SHA512 7a63d83db669ea0eba5dd43fb7a65e8a8b6bf6d397bf3884ab84eb5661f2b4fb0f19a9aead2851772d3d84e6b2ec470b67a2589f82fa28f7a27cb9b59d7890d8
 AUX gsoap-2.8.91-shared_libs.patch 6463 BLAKE2B 7d31673c56e53b146b8cc8f1ed9403a574b1a1c16aca169e1811ad822a9f389693d7e93821920366c3fe41e01ae15282a87795c68a1176de07f76e8e55c5af38 SHA512 2fc865443e6da4d9426f2b6cbded9ce0d31b47df37bed6f0a12ac715d1a4e4de4d53bc4df612275d8f42d7fcc9ad00fbdee3109ec073edd8760af4676f792d09
-DIST gsoap_2.8.106.zip 32740371 BLAKE2B b4904290ec5d8ebfc326bfd8d2c99e68c88cc9a07440d97ed8a442331c9f74549f75118f3e237f0796eba060b988d521c3af2bb9485d06e8277c5f18ade8cd82 SHA512 c461870fc563f848bfbdbc492cc5a26fece0d0c9a56092cb06ca3139e88c340969f23865e72187e1141a8f707f14ab6806e6a0b739b3c531161deefd6fbe510a
 DIST gsoap_2.8.114.zip 34599617 BLAKE2B fe68b057fa288b033f068be33e3f8871af8daf812d77a2fc87399f6750a4a8e23cb323dade3385c9b2147b2cde46980e9c52d393eff6eb16fa52cdbcc7a62537 SHA512 205d38a36c56780fd34bad8ea56525a04d4dc5b58af55676783c78d6eecf47dd0e9c86b0106f68127cfb2f45cb94f6ac9ebe353d1c6687e9faa13badb4a9690a
-EBUILD gsoap-2.8.106-r1.ebuild 1572 BLAKE2B a9a6708dd73166fff0ef87b4fd2a2c8826d11bbec8c7f8c4799d2604adfbc584b07fd06847e8150e6be469014f114076bb6935cb5b2188bb87d894c844cea0a1 SHA512 201d1c907c069657aa41bfc09644dc4a69404500636bbbe9228c109f6a05bd2b016770c8fb49d9fa75e2b157517804835261ae48417fabca17831b5c9f6c167a
 EBUILD gsoap-2.8.114-r1.ebuild 1572 BLAKE2B a9a6708dd73166fff0ef87b4fd2a2c8826d11bbec8c7f8c4799d2604adfbc584b07fd06847e8150e6be469014f114076bb6935cb5b2188bb87d894c844cea0a1 SHA512 201d1c907c069657aa41bfc09644dc4a69404500636bbbe9228c109f6a05bd2b016770c8fb49d9fa75e2b157517804835261ae48417fabca17831b5c9f6c167a
 MISC metadata.xml 249 BLAKE2B 6fef7c508be7fb79b2efbecf4acf23f37b519350ff2302604047ee5b6fbd6f82e590199edaece99dbe6d6546c5158e54a40fab8e372b739f9431849ce82baf3a SHA512 1b646829358569b7654b1f94f1aad14941f1a9f748408d149bf4a8af1c608952fcda3d9edbedc4298d85c0e86e2c469e72813fa237acbb2eb15da712bd0123ee
diff --git a/net-libs/gsoap/gsoap-2.8.106-r1.ebuild b/net-libs/gsoap/gsoap-2.8.106-r1.ebuild
deleted file mode 100644
index 22f9de64a49a..000000000000
--- a/net-libs/gsoap/gsoap-2.8.106-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN}-2.8"
-
-DESCRIPTION="A cross-platform open source C and C++ SDK for SOAP/XML Web services"
-HOMEPAGE="http://gsoap2.sourceforge.net"
-SRC_URI="mirror://sourceforge/gsoap2/gsoap_${PV}.zip"
-
-LICENSE="|| ( gSOAP-1.3b GPL-2+-with-openssl-exception ) GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc debug examples ipv6 gnutls +ssl"
-
-RDEPEND="
-	sys-libs/zlib
-	gnutls? ( net-libs/gnutls )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/flex
-	sys-devel/bison
-"
-
-PATCHES=(
-	# Fix Pre-ISO headers
-	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# enable shared libs https://bugs.gentoo.org/583398
-	"${FILESDIR}/${PN}-2.8.91-shared_libs.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		# Don't include xlocale.h as it got removed in >=glibc-2.26
-		--disable-xlocale
-		$(use_enable debug)
-		$(use_enable gnutls)
-		$(usex ipv6 --enable-ipv6 '')
-		$(usex ssl '' --disable-ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# yes, we also install the license-file since
-	# it contains info about how to apply the licenses
-	dodoc *.txt
-
-	docinto html
-	dodoc changelog.md
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins -r gsoap/samples/*
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc -r gsoap/doc/*
-	fi
-}
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index bdb5d8ef7b97..4fa073612ee8 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -1,7 +1,4 @@
-DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
-DIST libmnl-1.0.4.tar.bz2.sig 543 BLAKE2B f69e72a1fef9688bae27ca9934e835cc42bb725d930cd2c4c46672328ed0d797a3fa95e1e9adf2adf4f1725f30ed55047e61d7848a9eae0974f0b0e661dc35bf SHA512 0cdce209d63d318cc1e842d84d48776c4c23eb297ba8415030a3b086550f13778e2c80197b2e7170414619595002d403fddc08ff13327c0ac732ff2d5080c19c
 DIST libmnl-1.0.5.tar.bz2 314791 BLAKE2B 760ec6f7eaf3f2c6be6edf848551e4c7d16ae7cbe49f9cde297f5df06174fb7f9f490118942225558f0a89dabe9a4901c1b3b23fa1203132e36b86e6332564d6 SHA512 16fa48e74c9da7724a85c655dfb0abd8369392627934639d65de951543e1447ac3e048d231248f1ce8861443c2ef62654a85a81feeedbbffaf2e5744f6cf4c9f
 DIST libmnl-1.0.5.tar.bz2.sig 566 BLAKE2B 4454f969cbc21f86c12905eb80dd7237f368bbb30e38202ef114edf77806091cda164870e825aca4305a925077d181662724412f8475866c7fbe2572b0b1da50 SHA512 bb75ae3b5520d8b9372d70da7c1a27fa3d8e50a26a05fe56397dead4d7d5ad4003e6e576becd1200a5c9ed42fe5a97273acc8c50f1fd3181688f0d0b8c607dfc
-EBUILD libmnl-1.0.4.ebuild 1048 BLAKE2B 9fb91afab3baae874370ea03c94bda4e406ed1669d19263be089baecfebe48dc0c50729f50d0e977a75b1502c3250d3eb99df8804edee6d0aa85e65786a1908d SHA512 2fba1ed42f69b0ca29ba9e792c8c8f0900f3e1884e468a47ae9116bcda864d086224c05d9e101e59ded852d61e4a243972bf2d67582020975fec98b5659bbd79
 EBUILD libmnl-1.0.5.ebuild 944 BLAKE2B aee7364119bfed664decf8d650a211be71d3cab3d77fd2f0b3d4968414400e49cfc10d3ea0221c4e00c1a1daeacb86b3cdd2bc478bcebed35fb4a506b06e4adf SHA512 bb5287f459707c28c11726c00091b284f14012df826d6c2a069cef0781e15deefd3285a6b122e4ad89723aea57672ec324b92937a7f5619c10f34446def9d0c8
 MISC metadata.xml 747 BLAKE2B 6b8a167f9426273a8974ea913645aefcc33c35c15d211a345d36d50e051075e6ddfb1a69b90838ea06977bd5d3b119b322d2790a97d3be5becc235ebabf6af4e SHA512 0aa2921ab4f971c72d9f980f30ad02fbe21af1dde7810acaf5f13a1b3f572a397b88960925487a51089e4c8d5debcc0674305c5f1d9cf7546be5e6e8ba072844
diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild b/net-libs/libmnl/libmnl-1.0.4.ebuild
deleted file mode 100644
index f20f483b05a2..000000000000
--- a/net-libs/libmnl/libmnl-1.0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit usr-ldscript verify-sig
-
-DESCRIPTION="Minimalistic netlink library"
-HOMEPAGE="https://netfilter.org/projects/libmnl/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
-	verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
-
-LICENSE="LGPL-2.1"
-SLOT="0/0.2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux"
-IUSE="examples static-libs"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
-
-DEPEND="elibc_musl? ( sys-libs/queue-standalone )"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a mnl
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die
-		dodoc -r examples/
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnetfilter_cthelper/Manifest b/net-libs/libnetfilter_cthelper/Manifest
index d8c663fbaf50..a4c19caf653b 100644
--- a/net-libs/libnetfilter_cthelper/Manifest
+++ b/net-libs/libnetfilter_cthelper/Manifest
@@ -1,8 +1,4 @@
-AUX libnetfilter_cthelper-1.0.0-clang-export.patch 12273 BLAKE2B 644fed60ba6e7b3476a4264fef8ad3fc553c3c6fa889a24d0fa85b50e1b1d407ed58f3fe9187f4933ea9d471b1ef0b6baa8f2922957a1733fc1a7eed6794219c SHA512 e7eb99bbf29b95b18c7ff25d8c6fd080f8b77a451cd5d7fe737705c3f5c93f2a078f703fcc91f0d04f3ac0e18bcacc34483bc764bbf6a441d72d41fe539a594a
-DIST libnetfilter_cthelper-1.0.0.tar.bz2 275229 BLAKE2B 622a4e27629d97a0ab2b5032e972914f2ab8764ab60ab7090b173ceabfe9648e09452e931dacb822090c5f816b553b8e73b8f8a4ee431db9f6dd092d9d4283ee SHA512 f0372daee0edbf4c27ee80eadd4ce786a4b67b39c0b9d22e88bc9adcbdffd6676eb9df01b933ee64d2fcea9c05a9ca9070c94e907277d69acbd22ae9a3c74e45
-DIST libnetfilter_cthelper-1.0.0.tar.bz2.sig 543 BLAKE2B 827f11d4f9b666e46d486f04711009a62ec8880cc230ab87960a0cf0ff8410394e188d3102d5278059e6ba6aae827684d2ec8c0031bcddbae0a470c2165cc50a SHA512 048a0789f50b9dbb8f56776ec700657d7eabd16b442197755bc37201076b51279b8016bfb45543c51da0d023daa8b022e198bf28d004991fc1bd97192021d4c2
 DIST libnetfilter_cthelper-1.0.1.tar.bz2 291739 BLAKE2B cc5ae85dca896c0b8b1b704e0c5cc201677f48c2765520dc992a1b218d1334e04c592ba48cf06efe32a5089c7ad70fa44cbb2b40f2e8400d7ef9d2976a6425ee SHA512 f0591edd579aee92b62446e2b8fef6af9c404848c42c8da76850bb01aec3567442612f53cf8d3af6ba4d6d920487bff310a4e547bccf595478b1f96b4280eada
 DIST libnetfilter_cthelper-1.0.1.tar.bz2.sig 566 BLAKE2B 2904ddbe9bea0ea4a126bdd286a0d3eaf8e850e49cb3cb0ec196d424bbf91b89abe8ada8c1c5db29b5764c2d003de1212885a9f6676fee454237801ba02bc5a4 SHA512 991f1e20673eb290fc9b4b35c5dd0c27223398e560f4807b5497fc6b69780594cbae026481dbdf1862a25da7537f60b7d938038a8310cf3b0cd207ca1d3672e6
-EBUILD libnetfilter_cthelper-1.0.0-r1.ebuild 939 BLAKE2B d5c016b117a4b7a8eaf562fe4dc9470500e315888c393169f733d389a3f0049790ba27b2cef8a940307f775aa085d6a589861b09ce477041600b8fa5ad9f4fe8 SHA512 7aece23cbb48d29db52aef7f3ed22410218720c8cc401645d08787cf97c37103b1b15178a5c177934d25680bcaeaf4bd22d0eb1eff8d6dac7103b09b92450739
 EBUILD libnetfilter_cthelper-1.0.1-r1.ebuild 959 BLAKE2B 40b79d81589537c843b6bd1d5becd6234c143b946bcc8465badab3fb974230a8c19331e296a6c583643945c4045a653cb520947675a71104f11a86856625820e SHA512 0cc73b71631fae5d198d41ab41504cbc60929010517cc3b1a508eb7799114094ceb2f28de03a37eb5bf3bd37a11c55507a285ca72bdbe5f738d2ff7e59166a9e
 MISC metadata.xml 381 BLAKE2B 8ecab4404b863f9412227e54b55e1eb4fef71888e57346770e8a67d0a10b671899f723dbf3dad2c09d99f701bad98c4d58b556b566908b55621fad5a29ca0ad9 SHA512 7294460cfe3b2eb8fcee0eb29c7c75e3abd740986bf3499c46b302a67036dd55e95af65495c8e285f82bb15a29ba73b129d90d3317cfe246f88d04a2dd4ba695
diff --git a/net-libs/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0-clang-export.patch b/net-libs/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0-clang-export.patch
deleted file mode 100644
index 4958bcd6ac39..000000000000
--- a/net-libs/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0-clang-export.patch
+++ /dev/null
@@ -1,387 +0,0 @@
-fix from upstream
-
-From f58c5b09fb59baf07c942d373fc4d522b27e73c6 Mon Sep 17 00:00:00 2001
-From: Kevin Cernekee <cernekee@chromium.org>
-Date: Wed, 4 Jan 2017 14:30:26 -0800
-Subject: [PATCH] Use __EXPORTED rather than EXPORT_SYMBOL
-
-clang is sensitive to the ordering of
-__attribute__((visibility("default"))) relative to the function
-body.  gcc is not.  So if we try to re-declare an existing function
-with default visibility, clang prints a warning and generates
-a broken .so file in which nfct_helper_* are not exported to library
-callers.
-
-Move the attribute up into the function definition to make clang happy.
-
-Signed-off-by: Kevin Cernekee <cernekee@chromium.org>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- doxygen.cfg.in              |  2 +-
- src/internal.h              |  5 ++-
- src/libnetfilter_cthelper.c | 83 ++++++++++++++++++---------------------------
- 3 files changed, 36 insertions(+), 54 deletions(-)
-
-diff --git a/doxygen.cfg.in b/doxygen.cfg.in
-index cac9b0510b4d..190b7cd6e716 100644
---- a/doxygen.cfg.in
-+++ b/doxygen.cfg.in
-@@ -72,7 +72,7 @@ RECURSIVE              = YES
- EXCLUDE                = 
- EXCLUDE_SYMLINKS       = NO
- EXCLUDE_PATTERNS       = */.git/* .*.d
--EXCLUDE_SYMBOLS        = EXPORT_SYMBOL
-+EXCLUDE_SYMBOLS        = 
- EXAMPLE_PATH           = 
- EXAMPLE_PATTERNS       = 
- EXAMPLE_RECURSIVE      = NO
-diff --git a/src/internal.h b/src/internal.h
-index 3a88d1a1f7d8..5d781718ddad 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -3,10 +3,9 @@
- 
- #include "config.h"
- #ifdef HAVE_VISIBILITY_HIDDEN
--#	define __visible	__attribute__((visibility("default")))
--#	define EXPORT_SYMBOL(x)	typeof(x) (x) __visible
-+#	define __EXPORTED	__attribute__((visibility("default")))
- #else
--#	define EXPORT_SYMBOL
-+#	define __EXPORTED
- #endif
- 
- #endif
-diff --git a/src/libnetfilter_cthelper.c b/src/libnetfilter_cthelper.c
-index f8f58e6c9c5e..af543a17fafa 100644
---- a/src/libnetfilter_cthelper.c
-+++ b/src/libnetfilter_cthelper.c
-@@ -99,17 +99,16 @@ struct nfct_helper {
-  * In case of success, this function returns a valid pointer, otherwise NULL
-  * s returned and errno is appropriately set.
-  */
--struct nfct_helper *nfct_helper_alloc(void)
-+struct nfct_helper __EXPORTED *nfct_helper_alloc(void)
- {
- 	return calloc(1, sizeof(struct nfct_helper));
- }
--EXPORT_SYMBOL(nfct_helper_alloc);
- 
- /**
-  * nfct_helper_free - release one helper object
-  * \param nfct_helper pointer to the helper object
-  */
--void nfct_helper_free(struct nfct_helper *h)
-+void __EXPORTED nfct_helper_free(struct nfct_helper *h)
- {
- 	int i;
- 
-@@ -119,7 +118,6 @@ void nfct_helper_free(struct nfct_helper *h)
- 	}
- 	free(h);
- }
--EXPORT_SYMBOL(nfct_helper_free);
- 
- /**
-  * nfct_helper_policy_alloc - allocate a new helper policy object
-@@ -127,21 +125,19 @@ EXPORT_SYMBOL(nfct_helper_free);
-  * In case of success, this function returns a valid pointer, otherwise NULL
-  * s returned and errno is appropriately set.
-  */
--struct nfct_helper_policy *nfct_helper_policy_alloc(void)
-+struct nfct_helper_policy __EXPORTED *nfct_helper_policy_alloc(void)
- {
- 	return calloc(1, sizeof(struct nfct_helper_policy));
- }
--EXPORT_SYMBOL(nfct_helper_policy_alloc);
- 
- /**
-  * nfct_helper_free - release one helper policy object
-  * \param nfct_helper pointer to the helper object
-  */
--void nfct_helper_policy_free(struct nfct_helper_policy *p)
-+void __EXPORTED nfct_helper_policy_free(struct nfct_helper_policy *p)
- {
- 	free(p);
- }
--EXPORT_SYMBOL(nfct_helper_policy_free);
- 
- /**
-  * nfct_helper_policy_attr_set - set one attribute of the helper object
-@@ -149,7 +145,7 @@ EXPORT_SYMBOL(nfct_helper_policy_free);
-  * \param type attribute type you want to set
-  * \param data pointer to data that will be used to set this attribute
-  */
--void
-+void __EXPORTED
- nfct_helper_policy_attr_set(struct nfct_helper_policy *p,
- 			    enum nfct_helper_policy_attr_type type,
- 			    const void *data)
-@@ -170,7 +166,6 @@ nfct_helper_policy_attr_set(struct nfct_helper_policy *p,
- 		break;
- 	}
- }
--EXPORT_SYMBOL(nfct_helper_policy_attr_set);
- 
- /**
-  * nfct_helper_attr_set_str - set one attribute the helper object
-@@ -178,23 +173,21 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_set);
-  * \param type attribute type you want to set
-  * \param name string that will be used to set this attribute
-  */
--void
-+void __EXPORTED
- nfct_helper_policy_attr_set_str(struct nfct_helper_policy *p,
- 				enum nfct_helper_policy_attr_type type,
- 				const char *name)
- {
- 	nfct_helper_policy_attr_set(p, type, name);
- }
--EXPORT_SYMBOL(nfct_helper_policy_attr_set_str);
- 
--void
-+void __EXPORTED
- nfct_helper_policy_attr_set_u32(struct nfct_helper_policy *p,
- 				enum nfct_helper_policy_attr_type type,
- 				uint32_t value)
- {
- 	nfct_helper_policy_attr_set(p, type, &value);
- }
--EXPORT_SYMBOL(nfct_helper_policy_attr_set_u32);
- 
- /**
-  * nfct_helper_attr_set - set one attribute of the helper object
-@@ -202,7 +195,7 @@ EXPORT_SYMBOL(nfct_helper_policy_attr_set_u32);
-  * \param type attribute type you want to set
-  * \param data pointer to data that will be used to set this attribute
-  */
--void
-+void __EXPORTED
- nfct_helper_attr_set(struct nfct_helper *h,
- 		     enum nfct_helper_attr_type type, const void *data)
- {
-@@ -250,7 +243,6 @@ nfct_helper_attr_set(struct nfct_helper *h,
- 		break;
- 	}
- }
--EXPORT_SYMBOL(nfct_helper_attr_set);
- 
- /**
-  * nfct_helper_attr_set_str - set one attribute the helper object
-@@ -258,44 +250,40 @@ EXPORT_SYMBOL(nfct_helper_attr_set);
-  * \param type attribute type you want to set
-  * \param name string that will be used to set this attribute
-  */
--void
-+void __EXPORTED
- nfct_helper_attr_set_str(struct nfct_helper *nfct_helper, enum nfct_helper_attr_type type,
- 		    const char *name)
- {
- 	nfct_helper_attr_set(nfct_helper, type, name);
- }
--EXPORT_SYMBOL(nfct_helper_attr_set_str);
- 
--void
-+void __EXPORTED
- nfct_helper_attr_set_u8(struct nfct_helper *nfct_helper,
- 			 enum nfct_helper_attr_type type, uint8_t value)
- {
- 	nfct_helper_attr_set(nfct_helper, type, &value);
- }
--EXPORT_SYMBOL(nfct_helper_attr_set_u8);
- 
--void
-+void __EXPORTED
- nfct_helper_attr_set_u16(struct nfct_helper *nfct_helper,
- 			 enum nfct_helper_attr_type type, uint16_t value)
- {
- 	nfct_helper_attr_set(nfct_helper, type, &value);
- }
--EXPORT_SYMBOL(nfct_helper_attr_set_u16);
- 
--void
-+void __EXPORTED
- nfct_helper_attr_set_u32(struct nfct_helper *nfct_helper,
- 			 enum nfct_helper_attr_type type, uint32_t value)
- {
- 	nfct_helper_attr_set(nfct_helper, type, &value);
- }
--EXPORT_SYMBOL(nfct_helper_attr_set_u32);
- 
- /**
-  * nfct_helper_attr_unset - unset one attribute the helper object
-  * \param nfct_helper pointer to the helper object
-  * \param type attribute type you want to set
-  */
--void
-+void __EXPORTED
- nfct_helper_attr_unset(struct nfct_helper *nfct_helper, enum nfct_helper_attr_type type)
- {
- 	switch(type) {
-@@ -307,7 +295,6 @@ nfct_helper_attr_unset(struct nfct_helper *nfct_helper, enum nfct_helper_attr_ty
- 		break;
- 	}
- }
--EXPORT_SYMBOL(nfct_helper_attr_unset);
- 
- /**
-  * nfct_helper_attr_get - get one attribute the helper object
-@@ -317,8 +304,9 @@ EXPORT_SYMBOL(nfct_helper_attr_unset);
-  * This function returns a valid pointer to the attribute data. If a
-  * unsupported attribute is used, this returns NULL.
-  */
--const void *nfct_helper_attr_get(struct nfct_helper *helper,
--				 enum nfct_helper_attr_type type)
-+const void __EXPORTED *
-+nfct_helper_attr_get(struct nfct_helper *helper,
-+		     enum nfct_helper_attr_type type)
- {
- 	const void *ret = NULL;
- 
-@@ -358,7 +346,6 @@ const void *nfct_helper_attr_get(struct nfct_helper *helper,
- 	}
- 	return ret;
- }
--EXPORT_SYMBOL(nfct_helper_attr_get);
- 
- /**
-  * nfct_helper_attr_get_str - get one attribute the helper object
-@@ -368,13 +355,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get);
-  * This function returns a valid pointer to the beginning of the string.
-  * If the attribute is unsupported, this returns NULL.
-  */
--const char *
-+const char __EXPORTED *
- nfct_helper_attr_get_str(struct nfct_helper *nfct_helper,
- 			 enum nfct_helper_attr_type type)
- {
- 	return (const char *)nfct_helper_attr_get(nfct_helper, type);
- }
--EXPORT_SYMBOL(nfct_helper_attr_get_str);
- 
- /**
-  * nfct_helper_attr_get_u8 - get one attribute the helper object
-@@ -384,12 +370,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_str);
-  * This function returns a unsigned 8-bits integer. If the attribute is
-  * unsupported, this returns NULL.
-  */
--uint8_t nfct_helper_attr_get_u8(struct nfct_helper *nfct_helper,
--				  enum nfct_helper_attr_type type)
-+uint8_t __EXPORTED
-+nfct_helper_attr_get_u8(struct nfct_helper *nfct_helper,
-+			enum nfct_helper_attr_type type)
- {
- 	return *((uint8_t *)nfct_helper_attr_get(nfct_helper, type));
- }
--EXPORT_SYMBOL(nfct_helper_attr_get_u8);
- 
- /**
-  * nfct_helper_attr_get_u16 - get one attribute the helper object
-@@ -399,12 +385,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u8);
-  * This function returns a unsigned 16-bits integer. If the attribute is
-  * unsupported, this returns NULL.
-  */
--uint16_t nfct_helper_attr_get_u16(struct nfct_helper *nfct_helper,
--				  enum nfct_helper_attr_type type)
-+uint16_t __EXPORTED
-+nfct_helper_attr_get_u16(struct nfct_helper *nfct_helper,
-+			 enum nfct_helper_attr_type type)
- {
- 	return *((uint16_t *)nfct_helper_attr_get(nfct_helper, type));
- }
--EXPORT_SYMBOL(nfct_helper_attr_get_u16);
- 
- /**
-  * nfct_helper_attr_get_u32 - get one attribute the helper object
-@@ -414,12 +400,12 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u16);
-  * This function returns a unsigned 32-bits integer. If the attribute is
-  * unsupported, this returns NULL.
-  */
--uint32_t nfct_helper_attr_get_u32(struct nfct_helper *nfct_helper,
--				  enum nfct_helper_attr_type type)
-+uint32_t __EXPORTED
-+nfct_helper_attr_get_u32(struct nfct_helper *nfct_helper,
-+			 enum nfct_helper_attr_type type)
- {
- 	return *((uint32_t *)nfct_helper_attr_get(nfct_helper, type));
- }
--EXPORT_SYMBOL(nfct_helper_attr_get_u32);
- 
- /**
-  * nfct_helper_snprintf - print helper object into one buffer
-@@ -431,9 +417,10 @@ EXPORT_SYMBOL(nfct_helper_attr_get_u32);
-  * This function returns -1 in case that some mandatory attributes are
-  * missing. On sucess, it returns 0.
-  */
--int nfct_helper_snprintf(char *buf, size_t size,
--			 struct nfct_helper *helper,
--			 unsigned int type, unsigned int flags)
-+int __EXPORTED
-+nfct_helper_snprintf(char *buf, size_t size,
-+		     struct nfct_helper *helper,
-+		     unsigned int type, unsigned int flags)
- {
- 	int ret;
- 
-@@ -454,7 +441,6 @@ int nfct_helper_snprintf(char *buf, size_t size,
- 
- 	return ret;
- }
--EXPORT_SYMBOL(nfct_helper_snprintf);
- 
- /**
-  * @}
-@@ -490,7 +476,7 @@ EXPORT_SYMBOL(nfct_helper_snprintf);
-  * - Command NFNL_MSG_ACCT_DEL, to delete one specific nfct_helper object (if
-  *   unused, otherwise you hit EBUSY).
-  */
--struct nlmsghdr *
-+struct nlmsghdr __EXPORTED *
- nfct_helper_nlmsg_build_hdr(char *buf, uint8_t cmd,
- 			    uint16_t flags, uint32_t seq)
- {
-@@ -509,7 +495,6 @@ nfct_helper_nlmsg_build_hdr(char *buf, uint8_t cmd,
- 
- 	return nlh;
- }
--EXPORT_SYMBOL(nfct_helper_nlmsg_build_hdr);
- 
- static void
- nfct_helper_nlmsg_build_policy(struct nlmsghdr *nlh,
-@@ -530,7 +515,7 @@ nfct_helper_nlmsg_build_policy(struct nlmsghdr *nlh,
-  * \param nlh: netlink message that you want to use to add the payload.
-  * \param nfct_helper: pointer to a helper object
-  */
--void
-+void __EXPORTED
- nfct_helper_nlmsg_build_payload(struct nlmsghdr *nlh, struct nfct_helper *h)
- {
- 	struct nlattr *nest;
-@@ -593,7 +578,6 @@ nfct_helper_nlmsg_build_payload(struct nlmsghdr *nlh, struct nfct_helper *h)
- 	if (h->bitset & (1 << NFCTH_ATTR_STATUS))
- 		mnl_attr_put_u32(nlh, NFCTH_STATUS, ntohl(h->status));
- }
--EXPORT_SYMBOL(nfct_helper_nlmsg_build_payload);
- 
- static int
- nfct_helper_nlmsg_parse_tuple_cb(const struct nlattr *attr, void *data)
-@@ -795,7 +779,7 @@ nfct_helper_nlmsg_parse_attr_cb(const struct nlattr *attr, void *data)
-  * This function returns -1 in case that some mandatory attributes are
-  * missing. On sucess, it returns 0.
-  */
--int
-+int __EXPORTED
- nfct_helper_nlmsg_parse_payload(const struct nlmsghdr *nlh,
- 				struct nfct_helper *h)
- {
-@@ -832,7 +816,6 @@ nfct_helper_nlmsg_parse_payload(const struct nlmsghdr *nlh,
- 	}
- 	return 0;
- }
--EXPORT_SYMBOL(nfct_helper_nlmsg_parse_payload);
- 
- /**
-  * @}
--- 
-2.11.0
-
diff --git a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
deleted file mode 100644
index 20c16c749112..000000000000
--- a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info verify-sig
-
-DESCRIPTION="Userspace library for interface to user-space helper for conntrack"
-HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cthelper/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
-	verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
-
-BDEPEND="virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-netfilter )"
-RDEPEND="net-libs/libmnl:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-clang-export.patch
-)
-
-CONFIG_CHECK="~NF_CT_NETLINK_HELPER"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	kernel_is lt 3 6 0 && ewarn "requires at least 3.6.0 kernel version"
-}
diff --git a/net-libs/libnetfilter_cttimeout/Manifest b/net-libs/libnetfilter_cttimeout/Manifest
index 53348508b6fd..b4fb163021d6 100644
--- a/net-libs/libnetfilter_cttimeout/Manifest
+++ b/net-libs/libnetfilter_cttimeout/Manifest
@@ -1,8 +1,4 @@
-AUX libnetfilter_cttimeout-1.0.0-clang-export.patch 8628 BLAKE2B 8e0b283c0ee2b5a41116bf3c87f30ed0c13c9711160b64c6f8b2403e9590bb058e42afa5be38d60a2c6156462d31f55dff07d008f14e54661dbd0e60da80886c SHA512 d288dc0ad2fe6e15fa425a5e125e2d953e34bd6fbb7f57f7b7fadec030e7caefa39a4fbe9e7be90ce5aa7f5b4a44ad0e9df1c98ff6100f134ac3839653a542b1
-DIST libnetfilter_cttimeout-1.0.0.tar.bz2 275065 BLAKE2B 8b0f952bcd4184141a434abe25f807ad07bb74713a3506d335c5368ddce2809596c77e5e534337d897fb6268afa137f6d98cfd314b0b33b4996e4a0df4d8eba6 SHA512 d64f592be022d02b6e6627470f9aed75114b0c7177012d31d868ee7eb39fca330a7638c9a209ff489d4a8c0549b8fcfd33582c6d36ee519b920cf27429301c85
-DIST libnetfilter_cttimeout-1.0.0.tar.bz2.sig 543 BLAKE2B bc9e58c48d2a1337a52b8f1a48ada14e9799d811b6134c52f71c31fbca72451defbc7c74c9676ac1dec2487cbb7f9a8ec692579b9383306e54d8c95dcf038cfc SHA512 0b1ef30da8a5871a526243285d176194959d79d96eb50e0e126ec363926fb6e8d3ae13375fc52fb496cdf2c326d77587656d1316c5aebf8c4683b380740beeef
 DIST libnetfilter_cttimeout-1.0.1.tar.bz2 292649 BLAKE2B b51d631ee6b4c3bb34cf1394e2a3216a6ac4d89773bafecd058b31bdf78bf5eb255d3cb2539ca591f64c95cdf7f0db720a5b78e90009e0c7c208219ed454686f SHA512 3f7886b2b8c67fb45d9f6d03f8a327d0f04072abf75ec0fa310f4a321a1749607e79b48f47c8b8488f9833734689419264afada0cbc1f0360a5ae9e17d4a1100
 DIST libnetfilter_cttimeout-1.0.1.tar.bz2.sig 566 BLAKE2B eecbb2c7453ab1db598c4e02e7a0d5c29d68cb2788537ce22783bc0856ed6f6c64d66cdd9e2438fa901ebaf1c5dcad6b3a816678de2410cd414a5bf387f8ced0 SHA512 da491294392d94ddf7f1267607bc631ffc564a9e21b439b60a13b7d1259b7a80bc0d4f70208a79f0b674c26ac434c924216775bbe968d56bce5f3fa587eef3fb
-EBUILD libnetfilter_cttimeout-1.0.0-r1.ebuild 955 BLAKE2B ca2d2e4fef13d7fa4fba62b157ae2a7234c9e4e2e04343a07fad1d8be22accb9e1e914636dcb66f01e15a46a4156f51d0d73701b3e8f63b2454cafeeca938cae SHA512 2633be4aea5c8d4d236bac23e9b2d6119e6a704da24e8dfe1342339ad82e7b985f336c601d34ccda66e657c0392f06bb9fc1f88b7f1c6136493a72f32fa41374
 EBUILD libnetfilter_cttimeout-1.0.1.ebuild 974 BLAKE2B 69aae39e9a19d9ea885702bc16603530a9279bd9271bea88160a2ba1c4e7311c013c2db15a8f680a7aeeca85b11425235221efdc148c8c7c775a6ae11ba223af SHA512 24c106b95df645b6718109802fe0816adf0c377d48fb4386b8d745025c1e24348a6de0c21c1736569eafb69039ed451372f9b9ed69162fef0b73296a11ffda11
 MISC metadata.xml 375 BLAKE2B e79373a8cb0bcb5656035de8d0e24ea6a5b1fba4b4cfba83596a8c1ba8b212039e4dce3b328122688a8e8ce8cb864aa11a0413af33a9663c1356aae9f53f615d SHA512 68e7e0ad45bcb6c8e0f1f737b6fb70ad7120231a09adcbe665f542fb08567e5abc32fc55e22c2a989696962bf56b61757d092150ee4e882b2df979298f233ffc
diff --git a/net-libs/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0-clang-export.patch b/net-libs/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0-clang-export.patch
deleted file mode 100644
index ba706d3807df..000000000000
--- a/net-libs/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0-clang-export.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-fix from upstream
-
-From d0c4e39d12f903e06db262656cff2e24d267bed7 Mon Sep 17 00:00:00 2001
-From: Kevin Cernekee <cernekee@chromium.org>
-Date: Wed, 4 Jan 2017 14:30:25 -0800
-Subject: [PATCH] Use __EXPORTED rather than EXPORT_SYMBOL
-
-clang is sensitive to the ordering of
-__attribute__((visibility("default"))) relative to the function
-body.  gcc is not.  So if we try to re-declare an existing function
-with default visibility, clang prints a warning and generates
-a broken .so file in which nfct_timeout_* are not exported to library
-callers.
-
-Move the attribute up into the function definition to make clang happy.
-
-Signed-off-by: Kevin Cernekee <cernekee@chromium.org>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- doxygen.cfg.in               |  2 +-
- src/internal.h               |  5 ++---
- src/libnetfilter_cttimeout.c | 44 +++++++++++++++++---------------------------
- 3 files changed, 20 insertions(+), 31 deletions(-)
-
-diff --git a/doxygen.cfg.in b/doxygen.cfg.in
-index 8e5d4495eb41..09c3ce00e422 100644
---- a/doxygen.cfg.in
-+++ b/doxygen.cfg.in
-@@ -72,7 +72,7 @@ RECURSIVE              = YES
- EXCLUDE                = 
- EXCLUDE_SYMLINKS       = NO
- EXCLUDE_PATTERNS       = */.git/* .*.d
--EXCLUDE_SYMBOLS        = EXPORT_SYMBOL nfct_timeout _container_policy_cb
-+EXCLUDE_SYMBOLS        = nfct_timeout _container_policy_cb
- EXAMPLE_PATH           = 
- EXAMPLE_PATTERNS       = 
- EXAMPLE_RECURSIVE      = NO
-diff --git a/src/internal.h b/src/internal.h
-index 3a88d1a1f7d8..5d781718ddad 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -3,10 +3,9 @@
- 
- #include "config.h"
- #ifdef HAVE_VISIBILITY_HIDDEN
--#	define __visible	__attribute__((visibility("default")))
--#	define EXPORT_SYMBOL(x)	typeof(x) (x) __visible
-+#	define __EXPORTED	__attribute__((visibility("default")))
- #else
--#	define EXPORT_SYMBOL
-+#	define __EXPORTED
- #endif
- 
- #endif
-diff --git a/src/libnetfilter_cttimeout.c b/src/libnetfilter_cttimeout.c
-index 7844a1f9c19a..a0a71851b0eb 100644
---- a/src/libnetfilter_cttimeout.c
-+++ b/src/libnetfilter_cttimeout.c
-@@ -187,7 +187,7 @@ struct nfct_timeout {
-  * In case of success, this function returns a valid pointer, otherwise NULL
-  * s returned and errno is appropriately set.
-  */
--struct nfct_timeout *nfct_timeout_alloc(void)
-+struct nfct_timeout __EXPORTED *nfct_timeout_alloc(void)
- {
- 	struct nfct_timeout *t;
- 
-@@ -197,19 +197,17 @@ struct nfct_timeout *nfct_timeout_alloc(void)
- 
- 	return t;
- }
--EXPORT_SYMBOL(nfct_timeout_alloc);
- 
- /**
-  * nfct_timeout_free - release one conntrack timeout object
-  * \param t pointer to the conntrack timeout object
-  */
--void nfct_timeout_free(struct nfct_timeout *t)
-+void __EXPORTED nfct_timeout_free(struct nfct_timeout *t)
- {
- 	if (t->timeout)
- 		free(t->timeout);
- 	free(t);
- }
--EXPORT_SYMBOL(nfct_timeout_free);
- 
- /**
-  * nfct_timeout_attr_set - set one attribute of the conntrack timeout object
-@@ -217,7 +215,7 @@ EXPORT_SYMBOL(nfct_timeout_free);
-  * \param type attribute type you want to set
-  * \param data pointer to data that will be used to set this attribute
-  */
--int
-+int __EXPORTED
- nfct_timeout_attr_set(struct nfct_timeout *t, uint32_t type, const void *data)
- {
- 	switch(type) {
-@@ -236,7 +234,6 @@ nfct_timeout_attr_set(struct nfct_timeout *t, uint32_t type, const void *data)
- 	t->attrset |= (1 << type);
- 	return 0;
- }
--EXPORT_SYMBOL(nfct_timeout_attr_set);
- 
- /**
-  * nfct_timeout_attr_set_u8 - set one attribute of the conntrack timeout object
-@@ -244,12 +241,11 @@ EXPORT_SYMBOL(nfct_timeout_attr_set);
-  * \param type attribute type you want to set
-  * \param data pointer to data that will be used to set this attribute
-  */
--int
-+int __EXPORTED
- nfct_timeout_attr_set_u8(struct nfct_timeout *t, uint32_t type, uint8_t data)
- {
- 	return nfct_timeout_attr_set(t, type, &data);
- }
--EXPORT_SYMBOL(nfct_timeout_attr_set_u8);
- 
- /**
-  * nfct_timeout_attr_set_u16 - set one attribute of the conntrack timeout object
-@@ -257,23 +253,21 @@ EXPORT_SYMBOL(nfct_timeout_attr_set_u8);
-  * \param type attribute type you want to set
-  * \param data pointer to data that will be used to set this attribute
-  */
--int
-+int __EXPORTED
- nfct_timeout_attr_set_u16(struct nfct_timeout *t, uint32_t type, uint16_t data)
- {
- 	return nfct_timeout_attr_set(t, type, &data);
- }
--EXPORT_SYMBOL(nfct_timeout_attr_set_u16);
- 
- /**
-  * nfct_timeout_attr_unset - unset one attribute of the conntrack timeout object
-  * \param t pointer to the conntrack timeout object
-  * \param type attribute type you want to set
-  */
--void nfct_timeout_attr_unset(struct nfct_timeout *t, uint32_t type)
-+void __EXPORTED nfct_timeout_attr_unset(struct nfct_timeout *t, uint32_t type)
- {
- 	t->attrset &= ~(1 << type);
- }
--EXPORT_SYMBOL(nfct_timeout_attr_unset);
- 
- /**
-  * nfct_timeout_policy_attr_set_u32 - set one attribute of the policy
-@@ -281,7 +275,7 @@ EXPORT_SYMBOL(nfct_timeout_attr_unset);
-  * \param type attribute type you want to set
-  * \param data data that will be used to set this attribute
-  */
--int
-+int __EXPORTED
- nfct_timeout_policy_attr_set_u32(struct nfct_timeout *t,
- 				 uint32_t type, uint32_t data)
- {
-@@ -319,18 +313,17 @@ nfct_timeout_policy_attr_set_u32(struct nfct_timeout *t,
- 
- 	return 0;
- }
--EXPORT_SYMBOL(nfct_timeout_policy_attr_set_u32);
- 
- /**
-  * nfct_timeout_policy_attr_unset - unset one attribute of the policy
-  * \param t pointer to the conntrack timeout object
-  * \param type attribute type you want to set
-  */
--void nfct_timeout_policy_attr_unset(struct nfct_timeout *t, uint32_t type)
-+void __EXPORTED
-+nfct_timeout_policy_attr_unset(struct nfct_timeout *t, uint32_t type)
- {
- 	t->attrset &= ~(1 << type);
- }
--EXPORT_SYMBOL(nfct_timeout_policy_attr_unset);
- 
- /**
-  * nfct_timeout_policy_attr_to_name - get state name from protocol state number
-@@ -340,7 +333,8 @@ EXPORT_SYMBOL(nfct_timeout_policy_attr_unset);
-  * This function returns NULL if unsupported protocol or state number is passed.
-  * Otherwise, a pointer to valid string is returned.
-  */
--const char *nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state)
-+const char __EXPORTED *
-+nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state)
- {
- 	if (timeout_protocol[l4proto].state_to_name == NULL) {
- 		printf("no array state name\n");
-@@ -354,7 +348,6 @@ const char *nfct_timeout_policy_attr_to_name(uint8_t l4proto, uint32_t state)
- 
- 	return timeout_protocol[l4proto].state_to_name[state];
- }
--EXPORT_SYMBOL(nfct_timeout_policy_attr_to_name);
- 
- /**
-  * @}
-@@ -438,8 +431,9 @@ nfct_timeout_snprintf_default(char *buf, size_t size,
-  * This function returns -1 in case that some mandatory attributes are
-  * missing. On sucess, it returns 0.
-  */
--int nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t,
--			  unsigned int type, unsigned int flags)
-+int __EXPORTED
-+nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t,
-+		      unsigned int type, unsigned int flags)
- {
- 	int ret = 0;
- 
-@@ -454,7 +448,6 @@ int nfct_timeout_snprintf(char *buf, size_t size, const struct nfct_timeout *t,
- 
- 	return ret;
- }
--EXPORT_SYMBOL(nfct_timeout_snprintf);
- 
- /**
-  * @}
-@@ -477,7 +470,7 @@ EXPORT_SYMBOL(nfct_timeout_snprintf);
-  * - CTNL_MSG_TIMEOUT_GET: get conntrack timeout object.
-  * - CTNL_MSG_TIMEOUT_DEL: delete conntrack timeout object.
-  */
--struct nlmsghdr *
-+struct nlmsghdr __EXPORTED *
- nfct_timeout_nlmsg_build_hdr(char *buf, uint8_t cmd,
- 			     uint16_t flags, uint32_t seq)
- {
-@@ -496,14 +489,13 @@ nfct_timeout_nlmsg_build_hdr(char *buf, uint8_t cmd,
- 
- 	return nlh;
- }
--EXPORT_SYMBOL(nfct_timeout_nlmsg_build_hdr);
- 
- /**
-  * nfct_timeout_nlmsg_build_payload - build payload from ct timeout object
-  * \param nlh: netlink message that you want to use to add the payload.
-  * \param t: pointer to a conntrack timeout object
-  */
--void
-+void __EXPORTED
- nfct_timeout_nlmsg_build_payload(struct nlmsghdr *nlh,
- 				 const struct nfct_timeout *t)
- {
-@@ -532,7 +524,6 @@ nfct_timeout_nlmsg_build_payload(struct nlmsghdr *nlh,
- 	}
- 
- }
--EXPORT_SYMBOL(nfct_timeout_nlmsg_build_payload);
- 
- static int
- timeout_nlmsg_parse_attr_cb(const struct nlattr *attr, void *data)
-@@ -629,7 +620,7 @@ timeout_parse_attr_data(struct nfct_timeout *t, const struct nlattr *nest)
-  * This function returns -1 in case that some mandatory attributes are
-  * missing. On sucess, it returns 0.
-  */
--int
-+int __EXPORTED
- nfct_timeout_nlmsg_parse_payload(const struct nlmsghdr *nlh,
- 				 struct nfct_timeout *t)
- {
-@@ -654,7 +645,6 @@ nfct_timeout_nlmsg_parse_payload(const struct nlmsghdr *nlh,
- 	}
- 	return 0;
- }
--EXPORT_SYMBOL(nfct_timeout_nlmsg_parse_payload);
- 
- /**
-  * @}
--- 
-2.11.0
-
diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
deleted file mode 100644
index a81fcb8e124e..000000000000
--- a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info verify-sig
-
-DESCRIPTION="netlink interface for conntrack timeout infrastructure in kernel's packet filter"
-HOMEPAGE="https://www.netfilter.org/projects/libnetfilter_cttimeout/"
-SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
-	verify-sig? ( https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
-
-BDEPEND="virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-netfilter )"
-RDEPEND="net-libs/libmnl:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-clang-export.patch
-)
-
-CONFIG_CHECK="~NF_CT_NETLINK_TIMEOUT"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	kernel_is lt 3 4 0 && ewarn "requires at least 3.4.0 kernel version"
-}
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index 5d15de3f0961..9c0ff8b4d3d3 100644
--- a/net-libs/libnfnetlink/Manifest
+++ b/net-libs/libnfnetlink/Manifest
@@ -1,8 +1,4 @@
-DIST 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch 677 BLAKE2B 189c57ffc8eeb6a83e46fd1d53390e977294f7d3a269d3ffab07e1fce04083a7b4b956e93e02f4f81ce6db4ec5be785b16d1c75ed7e0b4fef9883154d9407e18 SHA512 fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41
-DIST libnfnetlink-1.0.1.tar.bz2 320641 BLAKE2B 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3 SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104
-DIST libnfnetlink-1.0.1.tar.bz2.sig 543 BLAKE2B e82c79edc77aa68b99549491650eb1888ef81c186918a452d813fb3b793b76e0334a909161a5b1b56a71ffe51b3293f6b0fe5d36b33c473dd50fa222a0844cb0 SHA512 f3ef8429e3da1bca815b186e96dfee93317f7a5712c63a4cc404648a0ee77353fae058a519681bdf684e82d1a230e717f4d34e8eaf0318e9a76dd05104fdf382
 DIST libnfnetlink-1.0.2.tar.bz2 298844 BLAKE2B 81c954f6ca2738b321e9319d20741aa15376e88e5f7a0ce1cfa2b02cd104f98d020ab6206bfbc79fc66655f8e40a17bfb65cbce0b1684d9373b809de5a433fc4 SHA512 a5e9ae22831f1d17703f83953f3b0ef898e8b3fa7f0f771b038db51816ddae3158574380ac4d45c09fb8fbb8677e2ccdcc5c4736e3b09de06eac99f899130854
 DIST libnfnetlink-1.0.2.tar.bz2.sig 566 BLAKE2B 9e87fc7917dd2f8b29de642ef819bca957bd6223417e167e21770450ce2eeff717ab06079ac75c689184f9188e785b663fca81cdda30b87310bfb1b456b03dd2 SHA512 3dcb980fb209c9faa9774f0393bc3b4b5fa6e899330f0d0dcb92307984f696b869de27c22dd54d7f181bddd72e104b38e8617af6bb3d6fe992a96da172b10457
-EBUILD libnfnetlink-1.0.1.ebuild 1772 BLAKE2B 76510962a4b596991e9903025c86a1acc048022ac8e0543713decc9f0ff5ab0f80333c550bdfeb5bcc2539a8c2fd4e0b602d93ef47bec0f86dc529eb11c5f40a SHA512 9eeac406c0b62528c74f8281e796cc354d82db10b99d19430c1e054b3ae128020f29e691934d81d6c8df4d4dea2a30d02dacd7197c32575656564d81a45f448f
 EBUILD libnfnetlink-1.0.2.ebuild 1495 BLAKE2B 254545c33fee13caa1fb6df7a8c32b6a3481992f854d81d2274e3a91c05a868c5e93b9af7f258b730cb10a6b63bf13256f8deb7c61ab642b927bb759418e9ed4 SHA512 97c4b2c2bae7e545a9adfe4a52083f30d91ebef8255303e83acc4ca9ca1e5aa4a859accf6bc2fdbfe1ee63d2c8f7a41478179062fa2d6c6674848d100552240f
 MISC metadata.xml 365 BLAKE2B f3b124b86c63821ea2f57659d3d514a328a661f3926a217b0509dca752cd6bd4f4c857b81b10a0be67e2957e2143dd8e8face7c71156b068b04c648779d89bab SHA512 cca4096d0a1dfb8be6410a240065ee8960ea132fe31f5b437db5acc92294ad823f97edf50c8c0f4a6e85303e4f2c39a30469bb493be6c11ee533bda0bc9b2c31
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
deleted file mode 100644
index 338e11cddd33..000000000000
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info verify-sig
-
-PATCH_BLOB=04aef8a4dedf267dd5744afb134ef8046e77f613
-PATCH_FN=${PATCH_BLOB}-musl-fix-includes.patch
-
-DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
-HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
-SRC_URI="
-	http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
-	https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> ${PATCH_FN}
-	verify-sig? ( http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
-
-PATCHES=( "${DISTDIR}/${PATCH_FN}" )
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 18 ; then
-		ewarn "${PN} requires at least 2.6.18 kernel version"
-	fi
-
-	#netfilter core team has changed some option names with kernel 2.6.20
-	error_common=' is not set when it should be. You can activate it in the Core Netfilter Configuration'
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
-		ERROR_IP_NF_CONNTRACK_NETLINK="CONFIG_IP_NF_CONNTRACK_NETLINK:\t${error_common}"
-	else
-		CONFIG_CHECK="~NF_CT_NETLINK"
-		ERROR_NF_CT_NETLINK="CONFIG_NF_CT_NETLINK:\t${error_common}"
-	fi
-
-	check_extra_config
-}
-
-src_unpack() {
-	default
-
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libnids/Manifest b/net-libs/libnids/Manifest
index caf3bb2aac12..7aa739b5f21e 100644
--- a/net-libs/libnids/Manifest
+++ b/net-libs/libnids/Manifest
@@ -3,8 +3,6 @@ AUX libnids-1.24-libdir.patch 1614 BLAKE2B 7fd082ee26ba798bdc61049c65b7e7a50118c
 AUX libnids-1.24-no-inline.patch 1259 BLAKE2B 1ac7190a455e71617df1297f64d718ebb099cc6ad113a27de65f59b6eaf65225999a10dcb6adc524365580dc9662758a7cc452b81951f3b1d4942c29eed87254 SHA512 95e632891a4aea8792ab88f78d3bc2cdae203ad23b86033b829b743071a08ef57ee78256eb2958483d2946a2fa40582a7003c8b5471b5500591373ae789a2a14
 AUX libnids-1.24-static-libs.patch 1018 BLAKE2B 6e3e691ca350233074e662d04b269d710a6d85d51de138072d021f96319ec7a3853dda117075d0eea07e913bf11280d93541848e592f4e0a34656c0ed917e9f1 SHA512 975354be03729c54f33340c7aa8ddd7d6d4f1eba19ee6096433a7e69b90ed84ab20f654ee28877b6db3b7f07cbdf29a20229784f69f1d7d8a29a81128554179e
 AUX libnids-1.26-revert-SONAME-bump.patch 772 BLAKE2B b18cd174289268c73b32559c7112cfe862d418240ca2a8c06bf12b40c1b28bff8dca8cd5cd141cec413d7c34b3f523d02d589f0dc4dc4f5086524e9a5a56a7ab SHA512 6e369b4fe73a107b13bc619b9efda67a894a4d5bbc3c43f04d272fa658d6792a0cc515a376c38b565a687d65814a87b563fad6938e17678d9702c18e4764a4af
-DIST libnids-1.24.tar.gz 151021 BLAKE2B ce545a8e3f4b61284ef7f2e6d1ce37aa537adef2686281468b4aaa509479d58073b9f6a5fbb7f03e33fa28ec18c01c8af49e0ce8a2d314ba5da5cbbba0fd7dcc SHA512 2046900023e853d7dbd7061c9f47d8a8ba26320991ca34198249019c1b9a6f75010574f9f022d02976272a384cf769394c4cc3ae536fc6164716cadc4770bb53
 DIST libnids-1.26.tar.gz 146172 BLAKE2B c84329a8da493f49d340d263835070c948a00d8400cd3e7a2a727b567f672b7af8017446281879ec19cb6d9e89eb07564c463fdf0521aa441ad5dc6ac2b97c73 SHA512 d582287f2c64241895ae437e501e92ef68adc8eac1a3df597d089634b994faee35d8b1cc018bbf20ced440bcd286af28f48c6f88da740a7c3de935ce3723561d
-EBUILD libnids-1.24-r8.ebuild 1199 BLAKE2B e961b542b65561c290c50b7760a7a08f2393aaae0a9b1e45b2a00550e005a4e404c2b6bf83c611ed1b5a84f2bbef3505c41df51e63e3e809bb22e333e50a1552 SHA512 693b40bfa675398ef8752ea3b2b1827150d1a89661fa9ff390ceac5e23683dd9700ebf283380abd8a098c2d409b974fbef6ccb3d9570fea0df50979622b63159
 EBUILD libnids-1.26-r1.ebuild 1393 BLAKE2B 7c4818bbf2caa3fffdc0c34bc1230af495f793befdadbbdb6b4fb126eface6ad81c7b7541786ae1a82cabcdfaca56574465d20bd5344169612f32d1ba645bdf6 SHA512 391e7a6ae0129f92dfbb3665fa1c3fb1be2b9d4ef59f1a0a7c05cfe1adce540a1020f67d865882ea500f5794c99912375fbdd77a4f62b9b41e0493488f2293ca
 MISC metadata.xml 745 BLAKE2B eb058e3cf9439a1bb8c79ad2c2671233b577c95bcb523d1e265d6bbb46ed559b1071994e3c7ea7da1d4a13f1a91305d2991db60e78540adaa805d2b854262aa5 SHA512 17c92d2a9c023b611ae5522b52e8cc33c189c3602012210d9515ebd059e02516b0276f0f6a5fe40973083c47061f1de4a07f711dd1e47f395cbb5d8226e4f4a7
diff --git a/net-libs/libnids/libnids-1.24-r8.ebuild b/net-libs/libnids/libnids-1.24-r8.ebuild
deleted file mode 100644
index a993c8d91295..000000000000
--- a/net-libs/libnids/libnids-1.24-r8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="an implementation of an E-component of Network Intrusion Detection System"
-HOMEPAGE="http://libnids.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="amd64 ppc x86"
-IUSE="+glib +libnet static-libs"
-
-RDEPEND="!net-libs/libnids:1.1
-	net-libs/libpcap
-	glib? ( dev-libs/glib:2 )
-	libnet? ( >=net-libs/libnet-1.1.0-r3 )"
-DEPEND="${RDEPEND}"
-BDEPEND="glib? ( virtual/pkgconfig )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-libdir.patch
-	"${FILESDIR}"/${P}-static-libs.patch
-	"${FILESDIR}"/${P}-no-inline.patch
-)
-
-src_prepare() {
-	default
-	eautoconf
-}
-
-src_configure() {
-	tc-export AR
-
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--enable-shared \
-		$(usex glib '' --disable-libglib) \
-		$(use_enable libnet)
-}
-
-src_compile() {
-	emake shared $(usex static-libs static '')
-}
-
-src_install() {
-	local tgt
-	for tgt in _installshared $(usex static-libs _install ''); do
-		emake install_prefix="${D}" ${tgt}
-	done
-
-	dodoc CHANGES CREDITS MISC README doc/*
-}
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index 0f0e861b8246..221ef4ac79aa 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,6 +1,3 @@
-DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
 DIST libpsl-0.21.1.tar.gz 9199351 BLAKE2B 87c72651303a7870fd3f742e9ce8028e0dd48d3ded78ae7dea317ce54b98975f372429399b6a2d6746fd8e074d6a3ed13772b6c173f96c3a86aa7d726fd75586 SHA512 a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5
-EBUILD libpsl-0.21.0.ebuild 1472 BLAKE2B a7cf81aa75d5e94b895e0a5aaabad8bd56671c68debe6c880840e8603436de78e0b81df32c22c6bd3f39e0f0a0e9ebeb82b20a4d16785e9b1a7419660141a269 SHA512 632b1a44ad5fc3bc44628f91f8526ba2146d03dfba842a2dcc85555e91829997598e568a22f017a339f6009ff5851695853e9d33570bdb00023c7752f067053b
 EBUILD libpsl-0.21.1-r1.ebuild 1586 BLAKE2B e1930de07ea863f81ea65ee1c10d9c97d88ce94cad90fcf702a54b26ed5d6d302cf22d09cf9323703260d095aacc1ad9799fcd989c28bd38a0c6777a90879814 SHA512 fe39e8e8519d6c9c84a379b69e3afce77cd952ab6476893c7a100a5b800dfdd5863c9c73cebb12432122db81b01bcac4dd5ccb905e38a67a4cc9fb9813ac7772
-EBUILD libpsl-0.21.1.ebuild 1500 BLAKE2B d48c07c3c632966fe1dd82608155a643dc16c781e2423d57cdbf6e5ba948e5cef96d61e8af44be52010cf4a128527aeb35d84fa155d327620f267cbed8f94b53 SHA512 2602518e75fa365c956b20edb93deb1215265d677beb4eecf78ad9e0c953f9b4eb36dc4a85fcb1cdbb98488d20490e7ff5ab5329dfb4f7e5b969f3b3898d65b9
 MISC metadata.xml 255 BLAKE2B 36ae66735664b8ed69846146d268e59f89bbea0d01d46f692709b9bfc521f70875a331b0995442435566e1896d9090bc9d9a6b9a63bf5de51b55d9a095f60d7a SHA512 4ce190fd174d39c74bce7eec22d651f9f15248ebbb7a2ffb68f7c9bae01ed412b6652285fcbb055770896d8ea0a1241c3aea30c2a0f4c223aba3b1dd723f1b9e
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
deleted file mode 100644
index aee4fd8128fc..000000000000
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit multilib-minimal python-any-r1
-
-DESCRIPTION="C library for the Public Suffix List"
-HOMEPAGE="https://github.com/rockdaboot/libpsl"
-SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="icu +idn +man"
-
-RDEPEND="
-	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
-	idn? (
-		dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-		net-dns/libidn2:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	man? ( dev-libs/libxslt )
-"
-
-pkg_pretend() {
-	if use icu && use idn ; then
-		ewarn "\"icu\" and \"idn\" USE flags are enabled. Using \"idn\"."
-	fi
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-asan
-		--disable-cfi
-		--disable-ubsan
-		--disable-static
-		$(use_enable man)
-	)
-
-	# Prefer idn even if icu is in USE as well
-	if use idn ; then
-		myeconfargs+=(
-			--enable-builtin=libidn2
-			--enable-runtime=libidn2
-		)
-	elif use icu ; then
-		myeconfargs+=(
-			--enable-builtin=libicu
-			--enable-runtime=libicu
-		)
-	else
-		myeconfargs+=( --disable-runtime )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/net-libs/libpsl/libpsl-0.21.1.ebuild b/net-libs/libpsl/libpsl-0.21.1.ebuild
deleted file mode 100644
index b6447e9ca7fc..000000000000
--- a/net-libs/libpsl/libpsl-0.21.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit multilib-minimal python-any-r1
-
-DESCRIPTION="C library for the Public Suffix List"
-HOMEPAGE="https://github.com/rockdaboot/libpsl"
-SRC_URI="https://github.com/rockdaboot/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="icu +idn +man"
-
-RDEPEND="
-	icu? ( !idn? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) )
-	idn? (
-		dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-		net-dns/libidn2:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	man? ( dev-libs/libxslt )
-"
-
-pkg_pretend() {
-	if use icu && use idn ; then
-		ewarn "\"icu\" and \"idn\" USE flags are enabled. Using \"idn\"."
-	fi
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-asan
-		--disable-cfi
-		--disable-ubsan
-		--disable-static
-		$(use_enable man)
-	)
-
-	# Prefer idn even if icu is in USE as well
-	if use idn ; then
-		myeconfargs+=(
-			--enable-builtin=libidn2
-			--enable-runtime=libidn2
-		)
-	elif use icu ; then
-		myeconfargs+=(
-			--enable-builtin=libicu
-			--enable-runtime=libicu
-		)
-	else
-		myeconfargs+=( --disable-runtime )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index dfb346e59cca..212c4e646c86 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -1,7 +1,4 @@
-AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a5824479d110e2bd235a4decc79456f11d3c57d1288c0043fc15c466998b9e52687a9a0d59fe3269c043cb2daaf88f SHA512 f5636e0745f81d4a7c85efa45238bf26cf70b5c43fbf32e9746a7ad534dd33abf10b7547ac7361ae7d5f7b5fa422a1a3028b8ffaa9fe0e5b843934a056e0b0ce
 AUX loudmouth-1.5.4-freeaddrinfo-musl.patch 1207 BLAKE2B 54c939bf18c50cb2aceaaaa3b2014093c0a2aacc000a2c0274ce90f328883750ea3a63a7ba454ae85072b8c0ab0a01fb1245217b8fe949f6b2a78acbbc30f7af SHA512 477fa04f1f2734596fd2f50ba1a44e0f9e9db09758d1942a2943d5b0120d5b08a851e55a8ccea36ab96f956539947e37a980e8f057fa21466a49887e981cedf7
-DIST loudmouth-1.5.3.tar.bz2 375974 BLAKE2B c9707fe18560104456a624a61437240a16bb6bbaf544cdf775f6d6c64fdbeb6eb8f7042eb13fcdeb36c89bb8d9522c2eba02c24987757c0f0ac8748d92a2b166 SHA512 ab6b16b4e644b69cdb7d8df1753d1bb5b43c2f1e76944e639339169b332e1b5c6a4246053c5b8a579ee9b53c845cef610b0040dfdffeb857180b6bab71adfcce
 DIST loudmouth-1.5.4.tar.bz2 361323 BLAKE2B 1d8453625262e4f9dc8d603619b71cac073831462164a10a92a5118c212293ae4ad9a0ca276b07b7919a0aebce633b4afaabb015ecf4b33e7c641a4273edc64a SHA512 49a08f0130b9ee56f07586d244504c81242723865a136b03e1049f32b1aa1e6c49e9b76b38f0cfb812ef4c66f73b7d83914a58e9a93e0496207e06c2b5efa9d8
-EBUILD loudmouth-1.5.3-r3.ebuild 1088 BLAKE2B ba43d3d9a0426d742891569b93145ad08f7708a8982faa4a9603f2adca5a33e55c0dbe3fd029b7c2c31cd9384da6d899d86c956805c37633bb777311295d439e SHA512 86b049d3058a4862e4907b1835659b6a3db182f5b90223cf79d6620d936d8feb0e6f51a629957084ce259b481e69966a1c376aece76f16ac7da91b48ff07ef25
 EBUILD loudmouth-1.5.4.ebuild 1200 BLAKE2B 2248043ac6cb57f30e4b615936ae1b49efade75c86311478a6214176b67965742d9aa3ba4c4ffe0d52a0e7ce8ba8140aa93b945fbd8f4d78fb84d778d846c760 SHA512 762c8b73ed1ce923dcf0329acf8b1ac5ac1924480d3cb7635670daf177b324f93385bcb977662ea9b2a53d9c160bd1f1313e07f70f406837981180fe66cbc88a
 MISC metadata.xml 479 BLAKE2B b0aeda3b9f2d5114387fee46bc82a36d6753defdbbeb1f4ecb4ead66f4738527402e42e001e8c8b953403563ece6f554bee5deac88799d7a0e07013f5ce25359 SHA512 f35c42cd967cc0832434dbbf04a1999c7585accd646af68e55f39e15363e47837aa094bce6536d991dff8385fe28cf7e0600180ead347033d61c4752f1ed0a83
diff --git a/net-libs/loudmouth/files/loudmouth-1.5.3-gcc7.patch b/net-libs/loudmouth/files/loudmouth-1.5.3-gcc7.patch
deleted file mode 100644
index 83e0aea69d74..000000000000
--- a/net-libs/loudmouth/files/loudmouth-1.5.3-gcc7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Bug: https://bugs.gentoo.org/618330
-Upstream commit: https://github.com/mcabber/loudmouth/commit/01fdfa0f5d1b8502b92d2e78d757e9b19661d054
-
-From 01fdfa0f5d1b8502b92d2e78d757e9b19661d054 Mon Sep 17 00:00:00 2001
-From: tmp170422 <tmp131110@ya.ru>
-Date: Sun, 14 May 2017 12:18:32 +0300
-Subject: [PATCH] An apparent typo
-
----
- loudmouth/lm-sasl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/loudmouth/lm-sasl.c b/loudmouth/lm-sasl.c
-index 00cf9b7..38cd88c 100644
---- a/loudmouth/lm-sasl.c
-+++ b/loudmouth/lm-sasl.c
-@@ -529,7 +529,7 @@ sasl_md5_prepare_response (LmSASL *sasl, GHashTable *challenge)
-     }
- 
-     nonce = g_hash_table_lookup (challenge, "nonce");
--    if (nonce == NULL || nonce == '\0') {
-+    if (nonce == NULL || nonce[0] == '\0') {
-         g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SASL,
-                "%s: server didn't provide a nonce in the challenge",
-                G_STRFUNC);
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
deleted file mode 100644
index 13e7508b5b20..000000000000
--- a/net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight C Jabber library"
-HOMEPAGE="https://mcabber.com"
-SRC_URI="https://mcabber.com/files/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~ppc-macos"
-
-IUSE="asyncns ssl openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-# Automagic libidn dependency
-RDEPEND="
-	>=dev-libs/glib-2.16:2
-	net-dns/libidn:=
-	ssl? (
-		!openssl? ( >=net-libs/gnutls-1.4.0:0= )
-		openssl? ( dev-libs/openssl:0= )
-	)
-	asyncns? ( >=net-libs/libasyncns-0.3 )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	test? ( dev-libs/check )
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc7.patch
-)
-
-src_configure() {
-	local myconf
-
-	if use ssl; then
-		if ! use openssl; then
-			myconf="${myconf} --with-ssl=gnutls"
-		else
-			myconf="${myconf} --with-ssl=openssl"
-		fi
-	else
-		myconf="${myconf} --with-ssl=no"
-	fi
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with asyncns) \
-		${myconf}
-}