gentoo auto-resync : 08:12:2024 - 02:07:28

13 files changed, 0 insertions, 1353 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index fa5e99330303..9ce8ad3e8608 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index fb336b12288d..1a073e548c86 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,28 +1,9 @@
-AUX gnutls-3.8.5-fix-rsaes-pkcs1-systemd-wide-config.patch 7361 BLAKE2B ca74ef7ca3070f2b44b6958547595acaac0c3aa783a6a67897ad9536f32f27838df6538bbe2fa5cb6430279c81373dd9bec9c7828db5d88492f8f24b679be045 SHA512 0319255a2427b993a6191b42cb034876909c6ff3cf5132cda60bc4bdff6f3fb1db191c6394beb9457d0abd99e375505c2c572f74a2ca263996eaedc7e186d318
 AUX gnutls-3.8.7.1-configure-brotli.patch 5647 BLAKE2B 7d19434915ad74687ebd4540f6abe3ee153ee8e2c5a44ede6955f7d70993fdb746f08ad26e74b13a404a9e26200e482b86507f370e7bb0b6671e29ec3c5cd7ac SHA512 2418bab977fccbe33bc05966fc4f60336e34c9eaef8592588531f18ad0f85e4498bb9f59fe98395f2ecaa8be3eb75b8ddaee72d51c6a903b3f44c9bc4e1b95d2
 AUX gnutls-3.8.7.1-tests.patch 1372 BLAKE2B 56cbc8d129acfd84eaf9b2094952bd7d8837f244c620f47c09d12f7a531d251dcdb7273dfe66f8bb62cebc1a24209a1dc67e9b9b1b86c8af755e9464d3f0f100 SHA512 54925063c7571500860627f3d3e60c91d540bedd79da6582c8575e08b08f96fac776e61c835f2ead35eab9e0db57c9ce9e83a4f201a1357326da6b702d0025ed
-DIST gnutls-3.7.8.tar.xz 6029220 BLAKE2B 0a21e63c7cb0ba4eeff23593c7282e0b4d704fa2d2a1cd5289998fd04b58ea36fc343f872225ad05478e278b1cdebbcd0fd376459abcb58547f8fa1488485530 SHA512 4199bcf7c9e3aab2f52266aadceefc563dfe2d938d0ea1f3ec3be95d66f4a8c8e5494d3a800c03dd02ad386dec1738bd63e1fe0d8b394a2ccfc7d6c6a0cc9359
-DIST gnutls-3.7.8.tar.xz.sig 1250 BLAKE2B 66c6a335c3b2290a4e44ffa6ae715ad71d2bcd7df485c1d2d9490985d9dcd445768d6eb021ad3a61614431183c6652254c63ebd8abd0f0a03d3164a6193b6192 SHA512 cecf9843e8683a278d065b663dc98ac2b5fcad1905ee25333038c93c2289b518c974629367e77e66552ac1c9d122d551616edba35cb0c4204202ec676f1a2db7
-DIST gnutls-3.7.9.tar.xz 6377212 BLAKE2B c8263381132b0c96f23a580823cfaf57112056876e5f2cc21aec4eeddec641b0c01fa02ff9493ea686f49fd917190b06f89379eb448a510cf4d50fe3a0742851 SHA512 56ccbab5f214f9e3cf10a43dd90dedc1e10a38d08b8359a4305dc05c59ddb4a1d3680b282077b6446605c31675a4261cd0579c2c0d976e0b2ced02e6dba224c1
-DIST gnutls-3.7.9.tar.xz.sig 685 BLAKE2B 2e7ba793d026cf96c54c75a81160c58cf21d6d5f034a603ffe88d5fa4cbfa1d4fd590efbe81fbee7790cd4956776085b7827fead67c9b07f1d7eadd405815eb7 SHA512 906227a0d6f57878e85e9acdf754d20b7628a7a95b40aeffced398a0a0c6220f5e32191a9f988f55b8b903bf55212179dce2abcc08c2bb3397a2704dd2319438
-DIST gnutls-3.8.0.tar.xz 6378480 BLAKE2B 64784e9c0ac4dcab2c9e90d7d17d0bd8a0021224be285c12a53673f3a52aa3f189152b1b0b4aaae5a8fb41951361af1fd04a5b535774c4a26c26eb895519af40 SHA512 2507b3133423fdaf90fbd826ccb1142e9ff6fc90fcd5531720218f19ddf0e6bbb8267d23bad35c0954860e5a4179da74823e0c8357db56a14f252e6ec9d59629
-DIST gnutls-3.8.0.tar.xz.sig 684 BLAKE2B c5dbed12b8233ed8502dac16b77d6043591296f4b9ddb0445271e8fe875c2a05b9663ad6523cca6355faaa9d244cc6e6fb8ff0d65fee47b36ab6b57f57d89f64 SHA512 9db8db74aa0ebd871287b07b6a8a9f4ce90188633618e669fe07cb8bb314b624c14761f6fe1970e2fbffa87f7c0d6daa4b0fa838bd05f74b8b18cd1b5325c654
-DIST gnutls-3.8.3.tar.xz 6463720 BLAKE2B 27a4bb4d8a5697e2187113351b2ad1e849bca7bcfb556c1b54fc2d02bef16e2789e7c437ac8db8fe6d2bcfc0e3e3467bbff2dd5d2fc0adb9bf8bda81cb89e452 SHA512 74eddba01ce4c2ffdca781c85db3bb52c85f1db3c09813ee2b8ceea0608f92ca3912fd9266f55deb36a8ba4d01802895ca5d5d219e7d9caec45e1a8534e45a84
-DIST gnutls-3.8.3.tar.xz.sig 580 BLAKE2B 25875eb17d9e59bf1f1b6a61dfc7657d838ac154dbb3e26c8df1995884077878ca607de62a8ce3b9287df1ea7ff523c0abc7c4548f1ca789c308eb6bda0edbaa SHA512 5b2ca0648ca5feeda1de933de2bbaf71fadb70e830a8f0d494d2f0380b6d0d7b79445257cc79e59bba1a7ff639ab4573da3e3e124eb80c20ac6141e29a4827ff
-DIST gnutls-3.8.5.tar.xz 6491504 BLAKE2B 30ea0e213b426df896af7cddfc39a7c50fd3130f99ced8386dc55e851122a37f6171722d2cb4abb68b9d2523cd3ba044b01248d740571a3bdd0cadf555894cdf SHA512 4bac1aa7ec1dce9b3445cc515cc287a5af032d34c207399aa9722e3dc53ed652f8a57cfbc9c5e40ccc4a2631245d89ab676e3ba2be9563f60ba855aaacb8e23c
-DIST gnutls-3.8.5.tar.xz.sig 119 BLAKE2B 62ff7b33fb80422774f8252f574560679b7dc4fa56fa680a4cf570320fa9692aa6f8b6a7e4683a684572287cfd22168f58679d2dc4cc507dc50269ed126990fd SHA512 b0f7a8ec348765112cac75fd732e066adaa1595bb83024cfeff6633aba35277d8aceda145c733c3d95f1e0eb4d34fead2479abdb08d6041362094a235460fa67
-DIST gnutls-3.8.6.tar.xz 6517476 BLAKE2B 58910e252231c02cfaa1183b38f3127f61aa991d266078bef8fb65709930a2d2dda1adad5fa32cdb203fda65955bcab9193ce71b5fba0b74e6a36a218bc0dd94 SHA512 58631c456dfb43f8cb6a1703ffa91c593a33357f37dc146e808d88692e19c7ac10aeabea40bee9952205be97e00648879e9f0fa80e670e8e695f8633ba726513
-DIST gnutls-3.8.6.tar.xz.sig 119 BLAKE2B 044d0e31a5fa402daa73e88ce140f57e30cb143324c7cce1515a3bc6c444fe2f1fa2dd954dec69de09c7b4726766e17ec05410bbbbcf5b35dda1cb0f6452a0a5 SHA512 3f9552cdf5fa96184fbe394dd484fb55e6a3577d1e048aea373b82cda335ea0f174f2fb11926dc58532c1f950cd10a6a35bc36e9fe813a1259eae5c5364920b2
 DIST gnutls-3.8.7.1.tar.xz 6695404 BLAKE2B 43334190ce1e45c5302b195f17d06e767d1bea7376278bfbc6ff181a2f57423ba5f334c00ae1833938c7a7a8d15cf607ac862e57435a756ccfa98527d469fd3a SHA512 429cea78e227d838105791b28a18270c3d2418bfb951c322771e6323d5f712204d63d66a6606ce9604a92d236a8dd07d651232c717264472d27eb6de26ddc733
 DIST gnutls-3.8.7.1.tar.xz.sig 580 BLAKE2B ca627d7b3f089205c94f556bee9c06428ada9e0116bb50486dc7dd70f611ae744416d96b17452749d102ccd16bf7b400577b1886a7c8be55833c9e2fde85f9ae SHA512 53ebdaa9775ae22f7eb5e7d6f5411ec667c9c880cea84e23651b6d1994fb1398c09d8efa39b21c96f8be29fa09c2436bdd732a061308956ca1650e3e1878ed57
 DIST gnutls-3.8.8.tar.xz 6696460 BLAKE2B d1498b0b9f14789599fd5b984d5370b632611f2702e9f4fc504ddba2a3e0dd4137bec858eb6150d031f9f50e6b3a3a7d905864f0a9f50a1f01e5ea8f37a44ba8 SHA512 4f617c63e8e8392e400d72c9e39989fcd782268b4a4c4e36bbfb0444a4b5bcb0f53054f04a6dce99ab89c0f38f57430c95aaaec6eb9209b8e9329140abf230c3
 DIST gnutls-3.8.8.tar.xz.sig 580 BLAKE2B 11a30f09e3a478615df2c6a0e40c0b9b2aad5794a82ae0cc871fcf3699b5d9725c9d04708c6f0b983da6e21f90a81f7550e723d0d04f97d1a16d526efbe91b1e SHA512 fdff792511e9e5de203a1dfd66bf521c12fb74a19de651ffa1f7359dafdd1dad59ae57d0f95fa363c4167f798e6b624b4ae1f84d4e0737ff690c2fb0e5a5bdce
-EBUILD gnutls-3.7.8.ebuild 4504 BLAKE2B 9b3df4b7b680c2efb73182c2309b39f193a769e19d8d20cefa158a7ad4183c5d8fa4e86ab0a2b5d5cc8d47b84d954f66c1554038b22b73b7320ad401a033f543 SHA512 a341655c8b5b5952128099268ffacb17206743398b28b8c8f53cc40be41330c107434af0921fd395ebd375a04d9cdf5e14b0705dd9936972b4349f276c242649
-EBUILD gnutls-3.7.9.ebuild 4512 BLAKE2B 9a1dd19f94ec1edf8f1798ffb1b10b485af6450719a15cea1216f0232927dd88dd5c47bd896cebb4e5ccffc04abd9c7c3646948837faadf6056a96b26c7e3eda SHA512 805dab1353b17e40c8dfabbe551a66e80138deb0d76249cf3838d8197def7038572d96b275b3934c09b5d01cbb42cfcdbf20adea16b4259c7c3ffaf24a7f3b64
-EBUILD gnutls-3.8.0.ebuild 4561 BLAKE2B 4399f737cc5d91a608e734da1e0cf2d105f5e64f5f7d1b37c27c4a26facad5210d3c537a87e01765a1a6d8153f7db967a1453a67efb64634b562606646942863 SHA512 31faf9beaa6d9dea7d10a0db71c32a9c0fd437aab085a3f6f4e62555c8dfddb332128ce03a9563537d1e749c17d8a9a5720d30acba5ae5bd70a3a91cca17dc2c
-EBUILD gnutls-3.8.3.ebuild 4677 BLAKE2B be3fc934a9679240d0204241454ae0e645a06cb4c30225d08bde1577935cd32c8cb4474f0ee5bcf56b802976b44eccadb4f1f3725e8c46ea45fc2fc821503bf8 SHA512 dde7e3d081e6e19fa3f8ced508d3a610d01130e9fbaf39eaef29663efc5de79dc37c9a934cefb71cb1662ffd346a4d8675f9992da3e24b48bdbe66d189f3a3ad
-EBUILD gnutls-3.8.5-r1.ebuild 4825 BLAKE2B d327eaaa3df3504c1e3d259bf08ec33add92031d64f03777316cc79cb8815a842a080178c103b64661c5072ef788cb0a0df8e9881faba9e04570e56f751f4f63 SHA512 801a48ee7391e2b566187f65c69d889e60fe4ef75e2b86fed335cc518cfc47b263bc2dd729a3b395909fa494c8fe7e71624bb73efe0db418465113643b58af1c
-EBUILD gnutls-3.8.6-r1.ebuild 4975 BLAKE2B 876c25994a237a7cf7350cd55b6c6d24e3b8e612fa831565304bf2e40a3e1f9bdb17aba551f3451c6ed6af20411de537b31fd56ae70b607fb5e1b2c64972f4a8 SHA512 1c78635487921a1cb78fad16600db3856738bd58424c4227a12aa86980c5b03ef88c50fb148ad970e039b773955768a65504d6e0cb62c17ddfc6b4bf557ca78a
 EBUILD gnutls-3.8.7.1-r1.ebuild 5216 BLAKE2B d135031bcfa83717d332fef0696a5448b9c04eef8991715f659d42934b363e939e5a2c93cacfb697fe1391590c94eef4c0cc020c76ba2aa27be3760a032d7988 SHA512 98205166b666c1350404fc5874ba33a1b22136b4e7f866c1f71f6fe44603be0fe9ffa39b5522584973871aa26d45351be2176409d17b7720e85e950bc4ccde32
 EBUILD gnutls-3.8.8.ebuild 5118 BLAKE2B bdc3e7b07870db0ed9b2bc264fcc6d00c187dcb41c06d643dd2ffb4207ae23ccda16c777302518e9c7121760943680de2aac1dcf9c207f1ddd28471abbe312cd SHA512 2033a7c08179687b674b74eeccc87c332cd3d44ce8dbee917e45fcebc2fa71bf43f27f579cad1a3d06ea5f27b97df05baf027fb5374b27c577d0b2b3307686b0
 MISC metadata.xml 1181 BLAKE2B 9902770b982d606070b2e34452bd732385f9abdca7ffc89b1a3bcfce9ab471fbd35f87c7fd3aeb610046e50eec13f64ee80d1093f3f9853ec8ecf35521129766 SHA512 b910b2087b83e2dafe3093be4b0d942e2f728b62aa4b3cd8101f681d51752f84b961c8524896cd13d853b96eb5f62f74b7d30edbe84fa42a260eac9e263efcf8
diff --git a/net-libs/gnutls/files/gnutls-3.8.5-fix-rsaes-pkcs1-systemd-wide-config.patch b/net-libs/gnutls/files/gnutls-3.8.5-fix-rsaes-pkcs1-systemd-wide-config.patch
deleted file mode 100644
index 6905f793ab4f..000000000000
--- a/net-libs/gnutls/files/gnutls-3.8.5-fix-rsaes-pkcs1-systemd-wide-config.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-https://bugs.gentoo.org/930752
-https://bugs.gentoo.org/930529
-https://gitlab.com/gnutls/gnutls/-/issues/1540
-https://gitlab.com/gnutls/gnutls/-/merge_requests/1830
-https://gitlab.com/gnutls/gnutls/-/commit/2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d
-
-From 2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d Mon Sep 17 00:00:00 2001
-From: Zoltan Fridrich <zfridric@redhat.com>
-Date: Wed, 10 Apr 2024 12:51:33 +0200
-Subject: [PATCH] Fix RSAES-PKCS1-v1_5 system-wide configuration
-
-Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
---- a/lib/priority.c
-+++ b/lib/priority.c
-@@ -1018,6 +1018,12 @@ struct cfg {
- 	bool force_ext_master_secret_set;
- };
- 
-+static inline void cfg_init(struct cfg *cfg)
-+{
-+	memset(cfg, 0, sizeof(*cfg));
-+	cfg->allow_rsa_pkcs1_encrypt = true;
-+}
-+
- static inline void cfg_deinit(struct cfg *cfg)
- {
- 	if (cfg->priority_strings) {
-@@ -1095,6 +1101,12 @@ struct ini_ctx {
- 	size_t curves_size;
- };
- 
-+static inline void ini_ctx_init(struct ini_ctx *ctx)
-+{
-+	memset(ctx, 0, sizeof(*ctx));
-+	cfg_init(&ctx->cfg);
-+}
-+
- static inline void ini_ctx_deinit(struct ini_ctx *ctx)
- {
- 	cfg_deinit(&ctx->cfg);
-@@ -1423,9 +1435,6 @@ static inline int cfg_apply(struct cfg *cfg, struct ini_ctx *ctx)
- 		_gnutls_default_priority_string = cfg->default_priority_string;
- 	}
- 
--	/* enable RSA-PKCS1-V1_5 by default */
--	cfg->allow_rsa_pkcs1_encrypt = true;
--
- 	if (cfg->allowlisting) {
- 		/* also updates `flags` of global `hash_algorithms[]` */
- 		ret = cfg_hashes_set_array(cfg, ctx->hashes, ctx->hashes_size);
-@@ -2217,22 +2226,73 @@ update_system_wide_priority_string(void)
- 	return 0;
- }
- 
-+/* Returns false on parse error, otherwise true.
-+ * The system_wide_config must be locked for writing.
-+ */
-+static inline bool load_system_priority_file(void)
-+{
-+	int err;
-+	FILE *fp;
-+	struct ini_ctx ctx;
-+
-+	cfg_init(&system_wide_config);
-+
-+	fp = fopen(system_priority_file, "re");
-+	if (fp == NULL) {
-+		_gnutls_debug_log("cfg: unable to open: %s: %d\n",
-+				  system_priority_file, errno);
-+		return true;
-+	}
-+
-+	/* Parsing the configuration file needs to be done in 2 phases:
-+	 * first parsing the [global] section
-+	 * and then the other sections,
-+	 * because the [global] section modifies the parsing behavior.
-+	 */
-+	ini_ctx_init(&ctx);
-+	err = ini_parse_file(fp, global_ini_handler, &ctx);
-+	if (!err) {
-+		if (fseek(fp, 0L, SEEK_SET) < 0) {
-+			_gnutls_debug_log("cfg: unable to rewind: %s\n",
-+					  system_priority_file);
-+			if (fail_on_invalid_config)
-+				exit(1);
-+		}
-+		err = ini_parse_file(fp, cfg_ini_handler, &ctx);
-+	}
-+	fclose(fp);
-+	if (err) {
-+		ini_ctx_deinit(&ctx);
-+		_gnutls_debug_log("cfg: unable to parse: %s: %d\n",
-+				  system_priority_file, err);
-+		return false;
-+	}
-+	cfg_apply(&system_wide_config, &ctx);
-+	ini_ctx_deinit(&ctx);
-+	return true;
-+}
-+
- static int _gnutls_update_system_priorities(bool defer_system_wide)
- {
--	int ret, err = 0;
-+	int ret;
-+	bool config_parse_error = false;
- 	struct stat sb;
--	FILE *fp;
- 	gnutls_buffer_st buf;
--	struct ini_ctx ctx;
- 
- 	ret = gnutls_rwlock_rdlock(&system_wide_config_rwlock);
--	if (ret < 0) {
-+	if (ret < 0)
- 		return gnutls_assert_val(ret);
--	}
- 
- 	if (stat(system_priority_file, &sb) < 0) {
- 		_gnutls_debug_log("cfg: unable to access: %s: %d\n",
- 				  system_priority_file, errno);
-+
-+		(void)gnutls_rwlock_unlock(&system_wide_config_rwlock);
-+		ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock);
-+		if (ret < 0)
-+			goto out;
-+		/* If system-wide config is unavailable, apply the defaults */
-+		cfg_init(&system_wide_config);
- 		goto out;
- 	}
- 
-@@ -2240,63 +2300,27 @@ static int _gnutls_update_system_priorities(bool defer_system_wide)
- 	    system_priority_last_mod == sb.st_mtime) {
- 		_gnutls_debug_log("cfg: system priority %s has not changed\n",
- 				  system_priority_file);
--		if (system_wide_config.priority_string) {
-+		if (system_wide_config.priority_string)
- 			goto out; /* nothing to do */
--		}
- 	}
- 
- 	(void)gnutls_rwlock_unlock(&system_wide_config_rwlock);
- 
- 	ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock);
--	if (ret < 0) {
-+	if (ret < 0)
- 		return gnutls_assert_val(ret);
--	}
- 
- 	/* Another thread could have successfully re-read system-wide config,
- 	 * skip re-reading if the mtime it has used is exactly the same.
- 	 */
--	if (system_priority_file_loaded) {
-+	if (system_priority_file_loaded)
- 		system_priority_file_loaded =
- 			(system_priority_last_mod == sb.st_mtime);
--	}
- 
- 	if (!system_priority_file_loaded) {
--		_name_val_array_clear(&system_wide_config.priority_strings);
--
--		gnutls_free(system_wide_config.priority_string);
--		system_wide_config.priority_string = NULL;
--
--		fp = fopen(system_priority_file, "re");
--		if (fp == NULL) {
--			_gnutls_debug_log("cfg: unable to open: %s: %d\n",
--					  system_priority_file, errno);
-+		config_parse_error = !load_system_priority_file();
-+		if (config_parse_error)
- 			goto out;
--		}
--		/* Parsing the configuration file needs to be done in 2 phases:
--		 * first parsing the [global] section
--		 * and then the other sections,
--		 * because the [global] section modifies the parsing behavior.
--		 */
--		memset(&ctx, 0, sizeof(ctx));
--		err = ini_parse_file(fp, global_ini_handler, &ctx);
--		if (!err) {
--			if (fseek(fp, 0L, SEEK_SET) < 0) {
--				_gnutls_debug_log("cfg: unable to rewind: %s\n",
--						  system_priority_file);
--				if (fail_on_invalid_config)
--					exit(1);
--			}
--			err = ini_parse_file(fp, cfg_ini_handler, &ctx);
--		}
--		fclose(fp);
--		if (err) {
--			ini_ctx_deinit(&ctx);
--			_gnutls_debug_log("cfg: unable to parse: %s: %d\n",
--					  system_priority_file, err);
--			goto out;
--		}
--		cfg_apply(&system_wide_config, &ctx);
--		ini_ctx_deinit(&ctx);
- 		_gnutls_debug_log("cfg: loaded system config %s mtime %lld\n",
- 				  system_priority_file,
- 				  (unsigned long long)sb.st_mtime);
-@@ -2332,9 +2356,8 @@ static int _gnutls_update_system_priorities(bool defer_system_wide)
- out:
- 	(void)gnutls_rwlock_unlock(&system_wide_config_rwlock);
- 
--	if (err && fail_on_invalid_config) {
-+	if (config_parse_error && fail_on_invalid_config)
- 		exit(1);
--	}
- 
- 	return ret;
- }
---- a/tests/system-override-allow-rsa-pkcs1-encrypt.sh
-+++ b/tests/system-override-allow-rsa-pkcs1-encrypt.sh
-@@ -19,9 +19,8 @@
- # You should have received a copy of the GNU Lesser General Public License
- # along with this program.  If not, see <https://www.gnu.org/licenses/>
- 
--: ${srcdir=.}
--TEST=${srcdir}/rsaes-pkcs1-v1_5
--CONF=${srcdir}/config.$$.tmp
-+TEST=${builddir}/rsaes-pkcs1-v1_5
-+CONF=config.$$.tmp
- export GNUTLS_SYSTEM_PRIORITY_FILE=${CONF}
- export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1
- 
-@@ -38,15 +37,33 @@ cat <<_EOF_ > ${CONF}
- allow-rsa-pkcs1-encrypt = true
- _EOF_
- 
--${TEST} && fail "RSAES-PKCS1-v1_5 expected to succeed"
-+${TEST}
-+if [ $? != 0 ]; then
-+	echo "${TEST} expected to succeed"
-+	exit 1
-+fi
-+echo "RSAES-PKCS1-v1_5 successfully enabled"
- 
- cat <<_EOF_ > ${CONF}
- [overrides]
- allow-rsa-pkcs1-encrypt = false
- _EOF_
- 
--${TEST} || fail "RSAES-PKCS1-v1_5 expected to fail"
-+${TEST}
-+if [ $? = 0 ]; then
-+	echo "${TEST} expected to fail"
-+	exit 1
-+fi
-+echo "RSAES-PKCS1-v1_5 successfully disabled"
- 
- unset GNUTLS_SYSTEM_PRIORITY_FILE
- unset GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID
-+
-+${TEST}
-+if [ $? != 0 ]; then
-+	echo "${TEST} expected to succeed by default"
-+	exit 1
-+fi
-+echo "RSAES-PKCS1-v1_5 successfully enabled by default"
-+
- exit 0
--- 
-GitLab
diff --git a/net-libs/gnutls/gnutls-3.7.8.ebuild b/net-libs/gnutls/gnutls-3.7.8.ebuild
deleted file mode 100644
index 6be515c16a4e..000000000000
--- a/net-libs/gnutls/gnutls-3.7.8.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc
-inherit libtool multilib-minimal verify-sig
-
-DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
-HOMEPAGE="https://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3 LGPL-2.1+"
-SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
-
-REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND="
-	dev-build/gtk-doc-am
-	>=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist(-)]
-		net-dialup/ppp
-		net-misc/socat
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20221017 )"
-
-DOCS=( README.md doc/certtool.cfg )
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug #520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# don't try to use system certificate store on macOS, it is
-	# confusingly ignoring our ca-certificates and more importantly
-	# fails to compile in certain configurations
-	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	# Note that this may add a libltdl dep when enabled. Check configure.ac.
-	libconf+=(
-		--without-tpm
-		--without-tpm2
-	)
-
-	# hardware-accel is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# -fanalyzer substantially slows down the build and isn't useful for
-	# us. It's useful for upstream as it's static analysis, but it's not
-	# useful when just getting something built.
-	export gl_cv_warn_c__fanalyzer=no
-
-	local myeconfargs=(
-		--disable-valgrind-tests
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable guile)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with brotli)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		$(use_with zlib)
-		$(use_with zstd)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		--with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.7.9.ebuild b/net-libs/gnutls/gnutls-3.7.9.ebuild
deleted file mode 100644
index 2ec7b1cae480..000000000000
--- a/net-libs/gnutls/gnutls-3.7.9.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc
-inherit libtool multilib-minimal verify-sig
-
-DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
-HOMEPAGE="https://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3 LGPL-2.1+"
-SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
-
-REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	guile? ( >=dev-scheme/guile-2:=[networking] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND="
-	dev-build/gtk-doc-am
-	>=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist(-)]
-		net-dialup/ppp
-		net-misc/socat
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20221017 )"
-
-DOCS=( README.md doc/certtool.cfg )
-
-HTML_DOCS=()
-
-pkg_setup() {
-	# bug #520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=(
-		doc/gnutls.html
-	)
-}
-
-src_prepare() {
-	default
-
-	# don't try to use system certificate store on macOS, it is
-	# confusingly ignoring our ca-certificates and more importantly
-	# fails to compile in certain configurations
-	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	# Note that this may add a libltdl dep when enabled. Check configure.ac.
-	libconf+=(
-		--without-tpm
-		--without-tpm2
-	)
-
-	# hardware-accel is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# -fanalyzer substantially slows down the build and isn't useful for
-	# us. It's useful for upstream as it's static analysis, but it's not
-	# useful when just getting something built.
-	export gl_cv_warn_c__fanalyzer=no
-
-	local myeconfargs=(
-		--disable-valgrind-tests
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable guile)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with brotli)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		$(use_with zlib)
-		$(use_with zstd)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		--with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.8.0.ebuild b/net-libs/gnutls/gnutls-3.8.0.ebuild
deleted file mode 100644
index ed1b5cceb359..000000000000
--- a/net-libs/gnutls/gnutls-3.8.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc
-inherit libtool multilib-minimal verify-sig
-
-DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
-HOMEPAGE="https://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3 LGPL-2.1+"
-# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot
-# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds.
-# Subslot format:
-# <libgnutls.so number>.<libgnutlsxx.so number>
-SLOT="0/30.30"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
-REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)"
-BDEPEND="
-	dev-build/gtk-doc-am
-	>=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test-full? (
-		app-crypt/dieharder
-		>=app-misc/datefudge-1.22
-		dev-libs/softhsm:2[-bindist(-)]
-		net-dialup/ppp
-		net-misc/socat
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20221017 )"
-
-DOCS=( README.md doc/certtool.cfg )
-
-HTML_DOCS=()
-
-src_prepare() {
-	default
-
-	# bug #520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=( doc/gnutls.html )
-
-	# don't try to use system certificate store on macOS, it is
-	# confusingly ignoring our ca-certificates and more importantly
-	# fails to compile in certain configurations
-	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	# Note that this may add a libltdl dep when enabled. Check configure.ac.
-	libconf+=(
-		--without-tpm
-		--without-tpm2
-	)
-
-	# hardware-accel is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# -fanalyzer substantially slows down the build and isn't useful for
-	# us. It's useful for upstream as it's static analysis, but it's not
-	# useful when just getting something built.
-	export gl_cv_warn_c__fanalyzer=no
-
-	local myeconfargs=(
-		--disable-valgrind-tests
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with brotli)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		$(use_with zlib)
-		$(use_with zstd)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		--with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.8.3.ebuild b/net-libs/gnutls/gnutls-3.8.3.ebuild
deleted file mode 100644
index ea66f59ef9f4..000000000000
--- a/net-libs/gnutls/gnutls-3.8.3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc
-inherit libtool multilib-minimal verify-sig
-
-DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
-HOMEPAGE="https://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3 LGPL-2.1+"
-# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot
-# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds.
-# Subslot format:
-# <libgnutls.so number>.<libgnutlsxx.so number>
-SLOT="0/30.30"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
-REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)
-"
-BDEPEND="
-	dev-build/gtk-doc-am
-	>=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test-full? (
-		app-crypt/dieharder
-		|| ( sys-libs/libfaketime >=app-misc/datefudge-1.22 )
-		dev-libs/softhsm:2[-bindist(-)]
-		net-dialup/ppp
-		net-misc/socat
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20231129 )
-"
-
-DOCS=( README.md doc/certtool.cfg )
-
-HTML_DOCS=()
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# gnulib FPs
-	MIN
-	alignof
-	static_assert
-)
-
-src_prepare() {
-	default
-
-	# bug #520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=( doc/gnutls.html )
-
-	# don't try to use system certificate store on macOS, it is
-	# confusingly ignoring our ca-certificates and more importantly
-	# fails to compile in certain configurations
-	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	# Note that this may add a libltdl dep when enabled. Check configure.ac.
-	libconf+=(
-		--without-tpm
-		--without-tpm2
-	)
-
-	# hardware-accel is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# -fanalyzer substantially slows down the build and isn't useful for
-	# us. It's useful for upstream as it's static analysis, but it's not
-	# useful when just getting something built.
-	export gl_cv_warn_c__fanalyzer=no
-
-	local myeconfargs=(
-		--disable-valgrind-tests
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with brotli)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		$(use_with zlib)
-		$(use_with zstd)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		--with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.8.5-r1.ebuild b/net-libs/gnutls/gnutls-3.8.5-r1.ebuild
deleted file mode 100644
index 5bfc89130ed7..000000000000
--- a/net-libs/gnutls/gnutls-3.8.5-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc
-inherit libtool multilib-minimal verify-sig
-
-DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
-HOMEPAGE="https://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3 LGPL-2.1+"
-# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot
-# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds.
-# Subslot format:
-# <libgnutls.so number>.<libgnutlsxx.so number>
-SLOT="0/30.30"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
-REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)
-"
-BDEPEND="
-	dev-build/gtk-doc-am
-	>=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test-full? (
-		app-crypt/dieharder
-		|| ( sys-libs/libfaketime >=app-misc/datefudge-1.22 )
-		dev-libs/softhsm:2[-bindist(-)]
-		net-dialup/ppp
-		net-misc/socat
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20240415 )
-"
-
-DOCS=( README.md doc/certtool.cfg )
-
-HTML_DOCS=()
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# gnulib FPs
-	MIN
-	alignof
-	static_assert
-)
-
-PATCHES=(
-	# Should no longer be needed for the next release
-	# bug #930529
-	"${FILESDIR}"/${PN}-3.8.5-fix-rsaes-pkcs1-systemd-wide-config.patch
-)
-
-src_prepare() {
-	default
-
-	# bug #520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=( doc/gnutls.html )
-
-	# don't try to use system certificate store on macOS, it is
-	# confusingly ignoring our ca-certificates and more importantly
-	# fails to compile in certain configurations
-	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	# Note that this may add a libltdl dep when enabled. Check configure.ac.
-	libconf+=(
-		--without-tpm
-		--without-tpm2
-	)
-
-	# hardware-accel is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# -fanalyzer substantially slows down the build and isn't useful for
-	# us. It's useful for upstream as it's static analysis, but it's not
-	# useful when just getting something built.
-	export gl_cv_warn_c__fanalyzer=no
-
-	local myeconfargs=(
-		--disable-valgrind-tests
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with brotli)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		$(use_with zlib)
-		$(use_with zstd)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		--with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.8.6-r1.ebuild b/net-libs/gnutls/gnutls-3.8.6-r1.ebuild
deleted file mode 100644
index 837990300e74..000000000000
--- a/net-libs/gnutls/gnutls-3.8.6-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnutls.asc
-inherit libtool multilib-minimal verify-sig flag-o-matic
-
-DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
-HOMEPAGE="https://www.gnutls.org/"
-SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3 LGPL-2.1+"
-# As of 3.8.0, the C++ library is header-only, but we won't drop the subslot
-# component for it until libgnutls.so breaks ABI, to avoid pointless rebuilds.
-# Subslot format:
-# <libgnutls.so number>.<libgnutlsxx.so number>
-SLOT="0/30.30"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli +cxx dane doc examples +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools zlib zstd"
-REQUIRED_USE="test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
-RESTRICT="!test? ( test )"
-
-# >=nettle-3.10 as a workaround for bug #936011
-RDEPEND="
-	>=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
-	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
-	>=dev-libs/nettle-3.10:=[gmp,${MULTILIB_USEDEP}]
-	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] )
-	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
-	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		seccomp? ( sys-libs/libseccomp )
-	)
-"
-BDEPEND="
-	dev-build/gtk-doc-am
-	>=virtual/pkgconfig-0-r1
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test-full? (
-		app-crypt/dieharder
-		|| ( sys-libs/libfaketime >=app-misc/datefudge-1.22 )
-		dev-libs/softhsm:2[-bindist(-)]
-		net-dialup/ppp
-		net-misc/socat
-	)
-	verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20240415 )
-"
-
-DOCS=( README.md doc/certtool.cfg )
-
-HTML_DOCS=()
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	# gnulib FPs
-	MIN
-	alignof
-	static_assert
-)
-
-src_prepare() {
-	default
-
-	# bug #520818
-	export TZ=UTC
-
-	use doc && HTML_DOCS+=( doc/gnutls.html )
-
-	# don't try to use system certificate store on macOS, it is
-	# confusingly ignoring our ca-certificates and more importantly
-	# fails to compile in certain configurations
-	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# should be gone on next release, for gnulib memset_s breakage
-		append-cppflags -D__STDC_WANT_LIB_EXT1__=1
-		# alloca usage, similar
-		sed -i -e '$a#include <alloca.h>' config.h.in || die
-	fi
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-multilib_src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	local libconf=()
-
-	# TPM needs to be tested before being enabled
-	# Note that this may add a libltdl dep when enabled. Check configure.ac.
-	libconf+=(
-		--without-tpm
-		--without-tpm2
-	)
-
-	# hardware-accel is disabled on OSX because the asm files force
-	#   GNU-stack (as doesn't support that) and when that's removed ld
-	#   complains about duplicate symbols
-	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
-
-	# -fanalyzer substantially slows down the build and isn't useful for
-	# us. It's useful for upstream as it's static analysis, but it's not
-	# useful when just getting something built.
-	export gl_cv_warn_c__fanalyzer=no
-
-	local myeconfargs=(
-		--disable-valgrind-tests
-		$(multilib_native_enable manpages)
-		$(multilib_native_use_enable doc gtk-doc)
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable seccomp seccomp-tests)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable test-full full-test-suite)
-		$(multilib_native_use_enable tools)
-		$(use_enable cxx)
-		$(use_enable dane libdane)
-		$(use_enable nls)
-		$(use_enable openssl openssl-compatibility)
-		$(use_enable sslv2 ssl2-support)
-		$(use_enable sslv3 ssl3-support)
-		$(use_enable static-libs static)
-		$(use_enable tls-heartbeat heartbeat-support)
-		$(use_with brotli)
-		$(use_with idn)
-		$(use_with pkcs11 p11-kit)
-		$(use_with zlib)
-		$(use_with zstd)
-		--disable-rpath
-		--with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		--with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
-		--without-included-libtasn1
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index c2ca1adcb45d..ea3761e5392b 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,8 +1,5 @@
-DIST libpcap-1.10.4.tar.gz 952153 BLAKE2B 05a7eafc1e1817f7844008db89d8fb10cd2525c22f7ee6c9e3d582b14229412f38ccced5e9d80a96dd459ef9eab12eccb5c1dd4978ddc9f66267469212005e4c SHA512 1f6d6ddd07dae7c557054cb246437ecdaf39d579592a5a6bdf1144eea6cb5a779ac4ca647cfed11ec1b0bb18efc63b845444e497070bacefaaed19a5787ae5e1
-DIST libpcap-1.10.4.tar.gz.sig 442 BLAKE2B d0eb5da9a57003848b24d458e50a201d0bb8876a12e63f6627bf9dc1a784e780610cd0c858243cc75a63999b40bc64507b078777ae844ede7c07eef9f4f9e0d5 SHA512 34aa401c2e162d708c61b78b445af2fe4ddc0e57de9124b5cc3a05679ffbc3834088160f83892d827e25c65b33313fe71aa73c2de09935d387252ab315ca5ee1
 DIST libpcap-1.10.5.tar.gz 974772 BLAKE2B c0bb29c5c308cb21244a9c63d3daa19033eb21fbd721607c057f04b2ae6b2527fb1cfeeb2b29b7c3535d5d6256aa5fdf5aa22ce48aa4f88a3cc8a81029a98116 SHA512 e599a31f2f1c03bdf386defa613ea9f08f80459c87068c2dd36c55c1bd678e2622cdce6333f0a776f16812df7bd4d6747820d1c35c7a2f1d7ad4a2ffb45dbe24
 DIST libpcap-1.10.5.tar.gz.sig 442 BLAKE2B 6816bb76c6b41b292a29edcff7d89e71511d25190da7e4f26296fbae2690e476b5072f44b5ff1c9e43f31403a37e23d69c18e1f2483488fe8d742cbe3f768312 SHA512 183ed0f6a93679550dc5a589422e92023a92be8fe29f79fb296e966f26e3693e1c6d47c5e88bccbb6004cb19b6419c9d7cd998f4e2255f5594a7f5f6e84ecdc9
-EBUILD libpcap-1.10.4.ebuild 2377 BLAKE2B ac8d3a3719b8431ff8dda801c5958b2caa626c9efc14f70fa16a1a77116f0b870d96636703ab50d453a7ff9f3567b8954a0ecade30cca8f7a01926387dc22814 SHA512 7f47214d63ad29ae36a5e01878efc9b3ba9ac7fc35d068b79546ac1fe656f838a9de5a4675d915075a01bbc4fdc0f96dccfd44c64f523d93a5bf0496c47f6a07
 EBUILD libpcap-1.10.5.ebuild 2388 BLAKE2B 042e20f635a2f45731dad6e0c7f31f19a916e6a9a5c0e2a4351b5e2738d6381e1d428c3cb8a4d695d153a49aea7746974049880671f3467e253cfbdf38efdedf SHA512 2e24a82bb50943fca14f26bdeb9b7502c6cad3ef2231e730e24216e8e0dbe82fb94d6ab8ddaec27fdf25d61d42048bb43169f0c4b611bbe228b206481c751c60
 EBUILD libpcap-9999.ebuild 2396 BLAKE2B 50d1e0a02ff2a6f3d5cf600a0cee98924a5a6aff8cdfbb5a78349efdb5ef24b13bbde022282d81593f91b910e9cac872bc3ea27cc0442a8aad339b18076608b1 SHA512 e6dc3c88f030dea951681edb372a200927c25e73dc6e2cb18bf340dce70a6ad5f1436fbb3ab04b267cef100f7ab4aa39859d23119179cf81e99a8ba3768adf47
 MISC metadata.xml 811 BLAKE2B d3c9d3d8ed42bb512b1d1608076d19ee7f3d3f06f5c622bfbe2f4ea1326397bd03fb480f4c01caf8c367b58a3f466f0b94b5e94b14c9d66cc7cbbde3c70651ec SHA512 bbef3e91d4958ec7070871f176aef2934e15d6bb45a45249dbd903b7dc108931c48df691df5810ad0e95c6bca2be707f88646b79b0d42a4a3c8966b6d0918dfb
diff --git a/net-libs/libpcap/libpcap-1.10.4.ebuild b/net-libs/libpcap/libpcap-1.10.4.ebuild
deleted file mode 100644
index 36fa7400bc7a..000000000000
--- a/net-libs/libpcap/libpcap-1.10.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
-	inherit verify-sig
-
-	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-# The project itself has COPYING with BSD, but the files used for
-# the libpcap library itself seem to be a mix of BSD-with-attribution
-# and BSD-4.
-LICENSE="BSD BSD-with-attribution BSD-4"
-SLOT="0"
-IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-	remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
-	rdma? ( sys-cluster/rdma-core )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-alternatives/yacc
-	sys-devel/flex
-	dbus? ( virtual/pkgconfig )
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
-fi
-
-src_prepare() {
-	default
-
-	if ! [[ -f VERSION ]]; then
-		echo ${PV} > VERSION || die
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# bug #884275
-	export LEX=flex
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable bluetooth) \
-		$(use_enable dbus) \
-		$(use_enable rdma) \
-		$(use_enable remote) \
-		$(use_enable usb) \
-		$(use_enable yydebug) \
-		$(use_with netlink libnl) \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-	use test && emake testprogs
-}
-
-multilib_src_test() {
-	testprogs/findalldevstest || die
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index a34fdc60e808..3ee8b5e82987 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1,5 +1,3 @@
-DIST xdp-tools-1.4.2.tar.gz 340864 BLAKE2B c5197330ff917043e03a16346823acab760db5fe903f2e039bd2c178ad34bb04d96a0d6b321fd3565256c39422f3f1f7b475970bd22ab487e30468c96e11c711 SHA512 aedf79859872523d514f18e7a6e8b7999bd1942021968dbba9a7e86cde1c193e31b328bc56d6bf2b3fbc7f266c9df8d942d90a70bbd9d514ce38d56c07cd18ca
 DIST xdp-tools-1.4.3.tar.gz 339989 BLAKE2B 836eb66a2264e9d46124a009a8b3e039da23f28f83460fb3aa724c8ca4c37952979278e3041e9acca44acd68cc94423d73f381febc107c454db7da01f583ae41 SHA512 3ba176e573d02feefc1baf81570b514bc25a61d7be3256ce530128092f07b246b8731430289cdcd874f8846122a4451f0bcd06891565dd1b48beaa10b854c646
-EBUILD xdp-tools-1.4.2.ebuild 2285 BLAKE2B 1782fc7c7fd82f8bf779ee1f9c292c5c0985f3e8fda4c51b67ec7c9b30440d9263b389f285021d289ff4e0bf0fccf454530e46753ffa9dabe1811a8f6077da94 SHA512 33bdd3e3df88cfe77b0d431d9dddf4f9ceac1e86d34706900c67c4e9622726373faf5017bd16be00dfd604ad60e211d3ecb71f4fdc051a0c358603397409dd25
 EBUILD xdp-tools-1.4.3.ebuild 2299 BLAKE2B 4920efd980c7da83b5cc6dc7c38c7aaf32289de1a11204b6a9668dec56d960748fb0809f0a2a7f24c438383a9ac7edff20ffca20bef20c66fe007655f48efb37 SHA512 6c6d25969549ebb0ee96d055458170ae918cecd2bb43bf969f58eaf91d603bfce33956a1ff6fef9eeda59c490e4cab3c0c9c2667544d076b603e80495f4f440a
 MISC metadata.xml 731 BLAKE2B a9c958d31f9ece376e4518e213823c14474df47747205020b76da7a0a67f7ed926ec55002b586143ce84cb965a23ad1794a42862597278682ef3605fc7d07911 SHA512 78774e4bcc6e05d56fe82b0aacd46e4d23e3bd89aa5bb55900adb94648d06b3251c575d4d0b6108cdad0f2ffbabcc2973e50e804b120a73e8923cd679601384f
diff --git a/net-libs/xdp-tools/xdp-tools-1.4.2.ebuild b/net-libs/xdp-tools/xdp-tools-1.4.2.ebuild
deleted file mode 100644
index b447f204968c..000000000000
--- a/net-libs/xdp-tools/xdp-tools-1.4.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The libxdp library and various tools for use with XDP"
-HOMEPAGE="https://github.com/xdp-project/xdp-tools"
-SRC_URI="https://github.com/xdp-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="+tools"
-
-DEPEND="
-	dev-libs/libbpf:=
-	dev-util/bpftool
-	net-libs/libpcap
-	sys-libs/zlib
-	virtual/libelf
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/grep[pcre]
-	>=sys-devel/clang-11.0.0
-"
-
-# Not prebuilt -- we build them -- but they're not ordinary ELF objects either.
-QA_PREBUILT="usr/lib/bpf/*.o"
-
-MAKEOPTS+=" V=1"
-
-src_prepare() {
-	# remove -Werror: #899744
-	sed -i 's/-Werror//g' lib/Makefile lib/defines.mk || die
-	sed -i '/-Werror/d' lib/common.mk lib/libxdp/Makefile \
-		lib/libxdp/tests/Makefile lib/util/Makefile || die
-
-	default
-}
-
-src_configure() {
-	# filter LTO: #861587
-	filter-lto
-
-	# filter LDFLAGS some more: #916591
-	filter-ldflags -Wl,--{icf,lto}*
-
-	# force ld.bfd: #916591
-	tc-ld-force-bfd
-
-	export CC="$(tc-getCC)"
-	export PREFIX="${EPREFIX}/usr"
-	export LIBDIR="${PREFIX}/$(get_libdir)"
-	export BPF_OBJECT_DIR="${PREFIX}/lib/bpf"
-	export PRODUCTION=1
-	export DYNAMIC_LIBXDP=1
-	export FORCE_SYSTEM_LIBBPF=1
-
-	default
-}
-
-src_test() { :; }
-
-src_install() {
-	default
-
-	# To remove the scripts/testing files that are installed.
-	rm -r "${ED}/usr/share/xdp-tools" || die
-	# We can't control static archive generation yet.
-	rm "${ED}/usr/$(get_libdir)/libxdp.a" || die
-
-	use tools || { rm "${ED}/usr/sbin"/* || die; }
-
-	# These are ELF objects but BPF ones.
-	dostrip -x /usr/lib/bpf
-}
-
-pkg_postinst() {
-	elog
-	elog "Many BPF utilities need access to a mounted bpffs virtual file system."
-	elog "Either mount it manually like this:"
-	elog
-	elog "  mount bpffs /sys/fs/bpf -t bpf -o nosuid,nodev,noexec,relatime,mode=700"
-	elog
-	elog "or add the following line to your /etc/fstab to always mount it at boot time:"
-	elog
-	elog "  bpffs  /sys/fs/bpf  bpf  nosuid,nodev,noexec,relatime,mode=700  0 0"
-	elog
-	elog "You can verify that bpffs is mounted with:"
-	elog
-	elog "  mount | grep /sys/fs/bpf"
-	elog
-}