gentoo auto-resync : 14:07:2024 - 12:27:13

16 files changed, 4 insertions, 399 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 52d7c23b68bb..84d7cb31c28d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnpupnp/Manifest b/net-libs/libnpupnp/Manifest
index 6ffdedc13a50..d1c1155775f8 100644
--- a/net-libs/libnpupnp/Manifest
+++ b/net-libs/libnpupnp/Manifest
@@ -1,5 +1,3 @@
-DIST libnpupnp-6.1.1.tar.gz 549925 BLAKE2B b7d8db7ddf58f77ee855dd6e82567a8e0edf1cbad468e2f4fa9a813908ec3c25a304fd3f41c592f5dfda46831998bf74a39a1be4cb3cd63cdac55f5aa2bc08a0 SHA512 905c0dfc7f018a80380406682550271893d795a1964bb5e7c4a56c6934ce06b9b6e29a2c5a7a9c4bf1a5a2348637ad6af3fd99cd38d7bba9d935fdbec6a6dce5
 DIST libnpupnp-6.1.3.tar.gz 448010 BLAKE2B 3bba4abac3702fc5f675110aacdebba0e0850cbf5edfe357944415aff4319c375674fc30418cbf74bfcc6a43ab4c8e308310f20cdb87eb5a9f3338895facf4f8 SHA512 763bf891a45efd1e022259839ac258b961a81a0e1e45d0b14c8a84a1ee3cdd02897ab98b9c4264871e2ec9cbc6cd315311d0a058f3fa0040b0f1198d1bd4b986
-EBUILD libnpupnp-6.1.1.ebuild 852 BLAKE2B 2b0f81f1c8b03e27b691658f994fae6db0359faa1a4855cd6c03cc41ebc9378d6b7878741b448362bc768520cb08867fb31e41dfe205b75e09203db46f88779a SHA512 36193dc55749a53b9402c1d6b9bb4e7cdcafa96abb98f3b4a39c59543b2eb8ce03ae40edca004463b3a0d4d5137d8ef27762226fb8c66be9958a05fe81aa5c5e
-EBUILD libnpupnp-6.1.3.ebuild 493 BLAKE2B 880a96df116c17641eb798c5035a05a9b1c08b644884b8e623d69749b13360d117c70aa4800161701d63e58b8f7f444c7e3631ffaf3b5c86687095ffe0b7c9dd SHA512 42fc1f1d7a6ad79e5356207bba6541745f9a98d18ad97137f5cab0e0f5abacf3e30c22b7e3adbc4546fab27dd1efa9074a0c8945b6a9222d6fd8da989b63c7c5
+EBUILD libnpupnp-6.1.3.ebuild 491 BLAKE2B 2458a0acfbe7be59021770859a9e46cd64b076ffac81af61add19de5f0cf7387a700533838b9e34b2d4016afb7aa07ea0474768b3f05223dca936f8d89683672 SHA512 73b4caa4e784e78a5a5e47fc08f489c067fc9d1e07380f7157aefd1f36b233bc151c9c869c4c6b1445dcc01ab6192846e3730300cec0c7141fb17594db19e01a
 MISC metadata.xml 536 BLAKE2B 10f40312537ef0896c90f23ff327c320fd6c983227f182b46fa2d2d3bbe83044894f07449c9c119c5aa89dc8a889405f14437c0a84c6c52d0116818f9d169d39 SHA512 82d22e0273ed07ff51ce763851f8ea0070e10f6665763543cf96518ab9ef53005c88588cfe3f94855da74a17eae68118d263f12478f0928aca4cad6cce849677
diff --git a/net-libs/libnpupnp/libnpupnp-6.1.1.ebuild b/net-libs/libnpupnp/libnpupnp-6.1.1.ebuild
deleted file mode 100644
index cc6a0334d4dd..000000000000
--- a/net-libs/libnpupnp/libnpupnp-6.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A C++ base UPnP library, derived from Portable UPnP, a.k.a libupnp"
-HOMEPAGE="https://framagit.org/medoc92/npupnp"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-libs/expat
-	net-libs/libmicrohttpd:=
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--enable-debug \
-		--enable-device \
-		--enable-gena \
-		--enable-ipv6 \
-		--enable-optssdp \
-		--enable-reuseaddr \
-		--enable-soap \
-		--enable-ssdp \
-		--enable-tools \
-		--enable-webserver
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libnpupnp/libnpupnp-6.1.3.ebuild b/net-libs/libnpupnp/libnpupnp-6.1.3.ebuild
index 95bffb2a221d..1b39d463d420 100644
--- a/net-libs/libnpupnp/libnpupnp-6.1.3.ebuild
+++ b/net-libs/libnpupnp/libnpupnp-6.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/net-libs/libupnpp/Manifest b/net-libs/libupnpp/Manifest
index 84c39c25cdd8..1806eea192a8 100644
--- a/net-libs/libupnpp/Manifest
+++ b/net-libs/libupnpp/Manifest
@@ -1,5 +1,3 @@
-DIST libupnpp-0.26.3.tar.gz 485173 BLAKE2B 9afc516118410bd5ddffe8f59848f25f5fc1da3247127b0fee2d1d6cb18c21247c14628e0e82d1d5ecc640d217a5b463bb692e39864740966a83025801173f9b SHA512 78f9f3fabfbe3f79dc75153e95dc12e6a45064ee853ba19d8e0354baa37e7a2f673d4bc27b73196d91053f976fca7d5837b60de485a48150f6d20217ecedfc78
 DIST libupnpp-0.26.5.tar.gz 127254 BLAKE2B ea34f4bac12a75bb63c6e3f05d10fb5b7e37083d4ee98b5b9c28c7078d4e864f200cbb42cd4a8c1e6c7f567f062d0682f827f36e0afa27047881d8887e7e1531 SHA512 619de7f1448dd7473af8bc980e6806c60a6223b26ebcccb1e0a857af48868fe81d8f28cdc713d84c720072f07630751149d1ab5b2a1c5a0890822308ce7bd18e
-EBUILD libupnpp-0.26.3.ebuild 566 BLAKE2B 72b6e0734841f17e7666776c9becd16b68f3cb7a384d73a06fff3051a1124b54517e1408e340e94e1fadd9663093957958906cc80845760dd0138132c5d96b4e SHA512 38e01153177b77d25dc9c58a2cbe855371f59d4a7a4201f3e9b71c187fef552114038f9f488c75659d372ce13263031dade438de6350f63cb06a777f5221c2e7
-EBUILD libupnpp-0.26.5.ebuild 473 BLAKE2B 8acf2c717b8155452d40e1b8d6044609a55fed3afb23c4a83fa1bc478a756630cee5dfa8fc4d7afa837869d47b4a9aea973d23a43005bd006c9d7d5f091db616 SHA512 476298e13542f36ca9f7c2b44358f9172275e46b3db226188f95e5cef74e814f0793854ed3049a4317a2aa032e7cc24b1d12fc620cdf082f7c299f2714dc9020
+EBUILD libupnpp-0.26.5.ebuild 471 BLAKE2B f6a40dc96bb39ccf94b8de349a24d4ff3ed80de4cfc815d21163d60abd5f1efbdba189f153622b726b37df1ecdf6eea5b21c5d598da6a7cad6201ac1b0152b0f SHA512 12c6c620dff80a3d33bab6f5835395d7a4157df1817e59205426959c3a61ce435b3dfefb2339bbde06c71224f735fca77dfda04749e4d57680ab54f7b64dcc45
 MISC metadata.xml 218 BLAKE2B a724c5fc41f88a8b75cf9091c58241ae839c3d8a0275a28e4b61e76d8d51865b3dc363752961f61562b702b9e70c49643533164340360ac2d1fd41f8487d5c82 SHA512 e4a1847c2fb757c0e4fef284e730e49814e005f0fd7fcc12a3a4ed70867160635cede513455be1e88ca1b7fd8e671655ac6475be3ea8fe47d979523970ed2851
diff --git a/net-libs/libupnpp/libupnpp-0.26.3.ebuild b/net-libs/libupnpp/libupnpp-0.26.3.ebuild
deleted file mode 100644
index d0c5cec12aa7..000000000000
--- a/net-libs/libupnpp/libupnpp-0.26.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-libs/expat
-	net-libs/libnpupnp
-	net-misc/curl
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	default_src_install
-	find "${ED}" -name '*.la' -delete || die "Couldn't delete .la files"
-}
diff --git a/net-libs/libupnpp/libupnpp-0.26.5.ebuild b/net-libs/libupnpp/libupnpp-0.26.5.ebuild
index ebcc007281ee..3a5d54e39669 100644
--- a/net-libs/libupnpp/libupnpp-0.26.5.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.26.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-libs/expat
diff --git a/net-libs/serf/Manifest b/net-libs/serf/Manifest
index ba2a4bae667a..726b70cf05b3 100644
--- a/net-libs/serf/Manifest
+++ b/net-libs/serf/Manifest
@@ -1,13 +1,4 @@
-AUX serf-1.3.8-openssl.patch 960 BLAKE2B ba24959e39cafd03d041e349806b03feeca52fc1432fa96a39cf44fe392ad5e25bfc11e305d20b752f0469445f3a0932bd1d1de0646c3a95a9c24aec36560d81 SHA512 902f0b28a0166bb2c30127600eeacd8117ab9c8a21787aec7f6ee77b94554a613ec1bdcaef3bbbd730254c9c26a7c40b47906b296ca869af909ec18d9f2ad59b
 AUX serf-1.3.8-static-lib.patch 1922 BLAKE2B 66e518933fd12141916e93955d9648149de4d82f82ba66b9c574a21720d7bad61ea2d575363426d297f1649d394cfac4fcd8b5f963dd307d60db2f08fa3e2a2f SHA512 c5d7cbc7ed7632e3ead1a1eec36106a4e50f89c42b7099d8e6bc2a3021b4b3058c16cb1aef1fedbb26e6bd5b4d0b12b34567d40c38c0f1c5cb6528e924db9e84
-AUX serf-1.3.9-libressl.patch 1220 BLAKE2B e1ef55dfd5e93b59dba6bf0dbd2378c241781f89b282691f9f7cb577430affdcfc933c4ef25da2fb2130f7af67ee003cdbe66c452a888b7c5b8cca0dc11a6fef SHA512 89957ae479cfb12b94c1e60c1dca832fef9ba3ca91f835226e035d0dbbd9ef7a8ac7e99abce879774bacc3800d0d3e7743c61fd3bd9f26d0a2632a010679ad99
-AUX serf-1.3.9-openssl-3-bio-ctrl.patch 708 BLAKE2B 20c6116838461540a7040537ad40394f9ae7ae23bc972bc4f9d66f79d2d3167f6ccda54066ba6e921050b9fdda4aab6a6f86b098f2b71fc4086b6a4075b7a8d8 SHA512 b7631c6cfd76ca42e2f999bb328f147214d5f12546a26cd2ff90f774164db2458f0045c07fb0cbdc5b54c09f5c6f6b461365ab0d6326aa5e0151454c9a9a2495
-AUX serf-1.3.9-openssl-3-errgetfunc.patch 402 BLAKE2B d142dc567dad42966ff7a9bf84e5354e8778df7d696c260b1c895718e01311e51f1141f58cb6d4827b4f9631f11da286ce0eaaedf60e8d6b0517fbeadd3ebf96 SHA512 2f8b8ee93255aae2633f73c16fdec498db6885d25c4d31a5623170a629b616ab4e56bfe6f8db13d8617cc994ec775b1d90777d5596452f14e97338648d5af10c
-AUX serf-1.3.9-python3-check.patch 2896 BLAKE2B b757a9d1d3c4d5f9928e70a0182b3c7a0756ddea3b081378a7180f334eca697cccc5fe637dc8226d72daafbe5440aa595def447f76a52ab9f11e8bc626be846b SHA512 2538c2c80f924fa823a28e00e40688af0a38cb94ae2302cee83070645017e8321a0647e947a98c9d541228054acb8e470a465e4f2d5782b99a9b782aac86dfc1
-AUX serf-1.3.9-python3.patch 965 BLAKE2B 0f7444b19ec1f2b32c165ddf08d96113cb22ca3518eb7257885a582ed50dd3119a6459a52f134d149729cfc967265d6b9c478ec5d6f08a8a589bb5db0893d7bf SHA512 cf6726b860b876503820d8a42ff821f932bd1bf9a6157c98ebcbe77ebe71835ab4d2395fb9463fa187ef457100ededa59f9a7c430f98735c59f878cff600ff07
-AUX serf-1.3.9-python3_byte.patch 1079 BLAKE2B 7e8c328d101c3642cc82be9f92f26e9af49ada5df040da088e35869efddeaaf043cba06fe6c626380e9a68b10f1f5a61e393405d039bb7b59d9d00d00d95e066 SHA512 b02b3eb8fa27a7a133ebe6bd958f378bcc5daf9a1871e5a4015ec8fb292736cf65ba7776ef3297ceb3b4fb767ae4f22cc44e0e3b4a222887c73107e3c03e4533
 DIST serf-1.3.10.tar.bz2 147744 BLAKE2B fed9ef4d5b16a5f1276a4a6f72ab938db18d4bd51c2a58311d2918f52f891bdb636f947cdc612b12a8978f75d27715b7695f21730d1b8a0545746281535369fc SHA512 19165274d35c694935cda33f99ef92a7663a5d9c540fb7fd6792aa0efe39941b2fa87ff8b61afd060c6676baec634fd33dc2e9d34ecbee45ed99dfaed077802c
-DIST serf-1.3.9.tar.bz2 145132 BLAKE2B 59776f85b409b2eaea81f3e07b0301515e20cbd2aa0ef05c1c38aa8152a6d5627e526e4bc160abb1fd438e9fa46f97096c639860729d2ea8e0b2fcfcf8222002 SHA512 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
 EBUILD serf-1.3.10.ebuild 1847 BLAKE2B c2b82faded6c21ce8f41710959e6fd42337847ebcb8d5477ffbba29c538f9fce0555b63486c4dc0e35627b86dcab7f600e03721cb129251244279d7a6fceda8c SHA512 39c12c7e8c95f3e4c43a182184b32a64e32ad5c2194a0d442d6ddefcefb72f327deee4d6ebbabd2f1f97bbd6dbd7bc4ffe3e1cdb005580afc26fe229a1651913
-EBUILD serf-1.3.9-r4.ebuild 2187 BLAKE2B 239e0c488972e1535cd32bb8dae10f25eaad37e49125cb441f38caacfad7ffbebff0e5cbc9705238f9a612a699fb6b047a8d036d86113164f7e6007a306e76d9 SHA512 5e5a57e7f462f8353bafdd4bb7c15e9d57a43506ffcad6bd5af0fbf6fab04b4ea264f8cbd2521af776558843120d7081577b1bf74bad11aba5967a610c84876f
 MISC metadata.xml 242 BLAKE2B 9323724392947eec7347e9052aadab6d31da88b1fe94720fdd3993f37aeb74d00e43a34ec26642c79b0d471bd0146aaaf3489a3ab341445c6ddfcf305c581989 SHA512 c20cc4c38ff85c11dafe9981b45f20d2343d817cdfbb0c1e8cb77b0964e5d2b74762dfb8384c9fb47e8f0427b1f3f3e38a3a81f81c76ca30ade4a0994db14cea
diff --git a/net-libs/serf/files/serf-1.3.8-openssl.patch b/net-libs/serf/files/serf-1.3.8-openssl.patch
deleted file mode 100644
index 4cc3719303bb..000000000000
--- a/net-libs/serf/files/serf-1.3.8-openssl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-the build doesn't actually use the openssl var for anything useful.
-it blindly adds it to the -I/-L paths which causes problems when you
-cross-compile and when you link (it also adds it to -rpath).  punt
-the setting and forget about it.
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -354,8 +354,6 @@ else:
-     apr_libs = ''
-     apu_libs = ''
- 
--  env.Append(CPPPATH=['$OPENSSL/include'])
--  env.Append(LIBPATH=['$OPENSSL/lib'])
- 
- 
- # If build with gssapi, get its information and define SERF_HAVE_GSSAPI
-@@ -369,8 +369,9 @@ if sys.platform == 'win32':
- # On some systems, the -R values that APR describes never make it into actual
- # RPATH flags. We'll manually map all directories in LIBPATH into new
- # flags to set RPATH values.
--for d in env['LIBPATH']:
--  env.Append(RPATH=':'+d)
-+if env.get('LIBPATH', None):
-+  for d in env['LIBPATH']:
-+    env.Append(RPATH=':'+d)
- 
- # Set up the construction of serf-*.pc
- pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
diff --git a/net-libs/serf/files/serf-1.3.9-libressl.patch b/net-libs/serf/files/serf-1.3.9-libressl.patch
deleted file mode 100644
index bfb07bd5a0ad..000000000000
--- a/net-libs/serf/files/serf-1.3.9-libressl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This backported patch avoids the upstream scons check to prevent unintended
-issues and can be removed next release bump where it may be preferable to
-use the newer cmake build system.
-
-https://bugs.gentoo.org/906123
-https://bugs.gentoo.org/903001
-https://github.com/apache/serf/commit/df0d2d0dbdf88576f26da9c71df3ab6249d351dc
-
-From df0d2d0dbdf88576f26da9c71df3ab6249d351dc Mon Sep 17 00:00:00 2001
-From: Stefan Sperling <stsp@apache.org>
-Date: Tue, 20 Dec 2016 09:57:08 +0000
-Subject: [PATCH] Fix another build problem with LibreSSL.
-
-* SConstruct: Check for OpenSSL_malloc_init() and provide the
-   SERF_HAVE_OPENSSL_MALLOC_INIT feature flag.
-
-* buckets/ssl_buckets.c
-  (init_ssl_libraries): Use SERF_HAVE_OPENSSL_MALLOC_INIT instead
-   of USE_LEGACY_OPENSSL.
-
-git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1775242 13f79535-47bb-0310-9956-ffa450edef68
-
-diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
-index b01e535..27c84c7 100644
---- a/buckets/ssl_buckets.c
-+++ b/buckets/ssl_buckets.c
-@@ -1156,7 +1156,7 @@ static void init_ssl_libraries(void)
-         }
- #endif
- 
--#ifdef USE_OPENSSL_1_1_API
-+#ifndef LIBRESSL_VERSION_NUMBER
-         OPENSSL_malloc_init();
- #else
-         CRYPTO_malloc_init();
diff --git a/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch b/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch
deleted file mode 100644
index 6bf3aba6de47..000000000000
--- a/net-libs/serf/files/serf-1.3.9-openssl-3-bio-ctrl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-bio-ctrl.patch
-https://bugs.gentoo.org/805161
-https://issues.apache.org/jira/projects/SERF/issues/SERF-198
---- a/buckets/ssl_buckets.c
-+++ b/buckets/ssl_buckets.c
-@@ -407,7 +407,7 @@ static int bio_bucket_destroy(BIO *bio)
- 
- static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr)
- {
--    long ret = 1;
-+    long ret = 0;
- 
-     switch (cmd) {
-     default:
-@@ -415,6 +415,7 @@ static long bio_bucket_ctrl(BIO *bio, int cmd, long num, void *ptr)
-         break;
-     case BIO_CTRL_FLUSH:
-         /* At this point we can't force a flush. */
-+        ret = 1;
-         break;
-     case BIO_CTRL_PUSH:
-     case BIO_CTRL_POP:
diff --git a/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch b/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch
deleted file mode 100644
index 2823ee88e17b..000000000000
--- a/net-libs/serf/files/serf-1.3.9-openssl-3-errgetfunc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://src.fedoraproject.org/rpms/libserf/raw/rawhide/f/libserf-1.3.9-errgetfunc.patch
-https://bugs.gentoo.org/805161
---- a/buckets/ssl_buckets.c
-+++ b/buckets/ssl_buckets.c
-@@ -1204,6 +1204,10 @@
-     }
- }
- 
-+#ifndef ERR_GET_FUNC
-+#define ERR_GET_FUNC(ec) (0)
-+#endif
-+
- static int ssl_need_client_cert(SSL *ssl, X509 **cert, EVP_PKEY **pkey)
- {
-     serf_ssl_context_t *ctx = SSL_get_app_data(ssl);
diff --git a/net-libs/serf/files/serf-1.3.9-python3-check.patch b/net-libs/serf/files/serf-1.3.9-python3-check.patch
deleted file mode 100644
index fbbfe36fefe0..000000000000
--- a/net-libs/serf/files/serf-1.3.9-python3-check.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 05eae144c6b3ed85f0829de6278a8f89505506f0 Mon Sep 17 00:00:00 2001
-From: Bert Huijben <rhuijben@apache.org>
-Date: Mon, 2 Nov 2015 17:50:29 +0000
-Subject: [PATCH] * build/check.py   Print a bit more information about the
- failed test. The returncode might   be interesting to track down signal
- problems.
-
-git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1712098 13f79535-47bb-0310-9956-ffa450edef68
----
- build/check.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/build/check.py b/build/check.py
-index fc49d336..75287016 100755
---- a/build/check.py
-+++ b/build/check.py
-@@ -55,13 +55,13 @@
-     print "== Testing %s ==" % (case)
-     try:
-       subprocess.check_call([SERF_RESPONSE_EXE, case])
--    except subprocess.CalledProcessError:
--      print "ERROR: test case %s failed" % (case)
-+    except subprocess.CalledProcessError, x:
-+      print "ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode)
-       sys.exit(1)
- 
-   print "== Running the unit tests =="
-   try:
-     subprocess.check_call(TEST_ALL_EXE)
--  except subprocess.CalledProcessError:
--    print "ERROR: test(s) failed in test_all"
-+  except subprocess.CalledProcessError, x:
-+    print "ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode)
-     sys.exit(1)
-From 773a2ee2ca7a48dd8356707fa6774afcf5b85470 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Branko=20=C4=8Cibej?= <brane@apache.org>
-Date: Sat, 9 Jun 2018 08:10:10 +0000
-Subject: [PATCH] Make the tests run with Python 3.x.
-
-* build/check.py: Add parentheses around 'print' statement arguments
-   so that they work when 'print' is a function.
-
-git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1833223 13f79535-47bb-0310-9956-ffa450edef68
----
- build/check.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/build/check.py b/build/check.py
-index 75287016..e05760f9 100755
---- a/build/check.py
-+++ b/build/check.py
-@@ -52,16 +52,16 @@
- 
-   # Find test responses and run them one by one
-   for case in glob.glob(testdir + "/testcases/*.response"):
--    print "== Testing %s ==" % (case)
-+    print("== Testing %s ==" % (case))
-     try:
-       subprocess.check_call([SERF_RESPONSE_EXE, case])
--    except subprocess.CalledProcessError, x:
--      print "ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode)
-+    except subprocess.CalledProcessError as x:
-+      print("ERROR: test failed in '%s', exit code=%d" % (x.cmd, x.returncode))
-       sys.exit(1)
- 
--  print "== Running the unit tests =="
-+  print("== Running the unit tests ==")
-   try:
-     subprocess.check_call(TEST_ALL_EXE)
--  except subprocess.CalledProcessError, x:
--    print "ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode)
-+  except subprocess.CalledProcessError as x:
-+    print("ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd, x.returncode))
-     sys.exit(1)
diff --git a/net-libs/serf/files/serf-1.3.9-python3.patch b/net-libs/serf/files/serf-1.3.9-python3.patch
deleted file mode 100644
index 7ba43d91968c..000000000000
--- a/net-libs/serf/files/serf-1.3.9-python3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1c0241847e845a8da265aa89f297d3db6ae483b1 Mon Sep 17 00:00:00 2001
-From: Bert Huijben <rhuijben@apache.org>
-Date: Wed, 4 Oct 2017 14:56:22 +0000
-Subject: [PATCH] Fix syntax of a print() in the scons file to unbreak building
- with most recent scons version.
-
-* SConstruct
-  Use Python 3.0 valid syntax to make Scons 3.0.0 happy on both python 3.0
-  and 2.7.
-
-git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1811083 13f79535-47bb-0310-9956-ffa450edef68
----
- SConstruct | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index e5d407b..fab9828 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -199,7 +199,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
- 
- unknown = opts.UnknownVariables()
- if unknown:
--  print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
-+  print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
- 
- apr = str(env['APR'])
- apu = str(env['APU'])
diff --git a/net-libs/serf/files/serf-1.3.9-python3_byte.patch b/net-libs/serf/files/serf-1.3.9-python3_byte.patch
deleted file mode 100644
index ab86af2082d9..000000000000
--- a/net-libs/serf/files/serf-1.3.9-python3_byte.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9d30108b630b77f732ef94d1642b159066ffd890 Mon Sep 17 00:00:00 2001
-From: Andreas Stieger <astieger@apache.org>
-Date: Wed, 8 Nov 2017 17:05:28 +0000
-Subject: [PATCH] Follow-up to r1811083, fix building with scons 3.0.0 and
- Python3
-
-* SConstruct: Append decode('utf-8) to FILE.get_contents() to avoid
-  TypeError: cannot use a string pattern on a bytes-like object
-
-
-git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1814604 13f79535-47bb-0310-9956-ffa450edef68
----
- SConstruct | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index 5f5036b..71e5b0a 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -182,7 +182,7 @@ env.Append(BUILDERS = {
- match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
-                   'SERF_MINOR_VERSION ([0-9]+).*'
-                   'SERF_PATCH_VERSION ([0-9]+)',
--                  env.File('serf.h').get_contents(),
-+                  env.File('serf.h').get_contents().decode('utf-8'),
-                   re.DOTALL)
- MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
- env.Append(MAJOR=str(MAJOR))
diff --git a/net-libs/serf/serf-1.3.9-r4.ebuild b/net-libs/serf/serf-1.3.9-r4.ebuild
deleted file mode 100644
index 0d7c80cd62a3..000000000000
--- a/net-libs/serf/serf-1.3.9-r4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
-
-DESCRIPTION="HTTP client library"
-HOMEPAGE="https://serf.apache.org/"
-SRC_URI="mirror://apache/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="kerberos"
-# Many test failures.
-RESTRICT="test"
-
-RDEPEND="dev-libs/apr:1=
-	dev-libs/apr-util:1=
-	dev-libs/openssl:0=
-	sys-libs/zlib:0=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-build/scons-2.3.0"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.8-static-lib.patch
-	"${FILESDIR}"/${PN}-1.3.8-openssl.patch
-	"${FILESDIR}"/${PN}-1.3.9-python3.patch
-	"${FILESDIR}"/${PN}-1.3.9-python3_byte.patch
-	"${FILESDIR}"/${PN}-1.3.9-python3-check.patch
-	"${FILESDIR}"/${PN}-1.3.9-openssl-3-bio-ctrl.patch
-	"${FILESDIR}"/${PN}-1.3.9-openssl-3-errgetfunc.patch
-	"${FILESDIR}"/${PN}-1.3.9-libressl.patch #903001, 906123
-)
-
-src_prepare() {
-	default
-
-	# https://code.google.com/p/serf/issues/detail?id=133
-	sed -e "/env.Append(CCFLAGS=\['-O2'\])/d" -i SConstruct || die
-
-	# need limits.h for PATH_MAX (only when EXTENSIONS is enabled)
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -D__EXTENSIONS__
-}
-
-src_compile() {
-	myesconsargs=(
-		BUILD_STATIC=no
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		# These config scripts are sent through a shell with an empty env
-		# which breaks the SYSROOT usage in them.  Set the vars inline to
-		# avoid that.
-		APR="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apr-1-config"
-		APU="SYSROOT='${SYSROOT}' ${SYSROOT}${EPREFIX}/usr/bin/apu-1-config"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		CC="$(tc-getCC)"
-		CPPFLAGS="${CPPFLAGS}"
-		CFLAGS="${CFLAGS}"
-		LINKFLAGS="${LDFLAGS}"
-	)
-
-	if use kerberos; then
-		myesconsargs+=( GSSAPI="${SYSROOT}${EPREFIX}/usr/bin/krb5-config" )
-	fi
-
-	escons "${myesconsargs[@]}"
-}
-
-src_test() {
-	escons check
-}
-
-src_install() {
-	escons install --install-sandbox="${D}"
-}