gentoo auto-resync : 20:02:2023 - 08:19:52

3 files changed, 13 insertions, 7 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 90a1bfc3410c..98a605a36799 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 12e3e2e27bfe..f967b9b8fc1e 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -9,5 +9,5 @@ DIST curl-7.87.0.tar.xz.asc 488 BLAKE2B 031d8236b357bd3c519548b181254dc0aea1efc1
 DIST curl-7.88.0.tar.xz 2571564 BLAKE2B 8fae8136a8a52c58b2860b6c3b342d59bb0c9a743f94c3ea3620cbb180f1ebd1310ace17e23d9c4bd2ec4b1dd72777779b2e1fbe66bb47b54a60b02247e3a07d SHA512 2008cbc67694f746b7449f087a19b2a9a4950333d6bac1cdc7d80351aa38d8d9b442087dedbc7b0909a419d3b10f510521c942aac012d04a53c32bdb15dce5f0
 DIST curl-7.88.0.tar.xz.asc 488 BLAKE2B 9714e26c1308b036f7b19c909447e20d0c3611b0995845a8fb1a356d74e68027399acaafb69244411787cf2abbcbca446f237ce1277228c33caf0adc97364dbf SHA512 6f3d9a5f8fcec64652f872adf994ff3d0162fba1b483a0e359522173bf29ef3d26eeda7c328207fa1fa974a45e62674a3a8ebec21830ab3981b56851d5804ade
 EBUILD curl-7.87.0-r2.ebuild 8660 BLAKE2B ce66897406af36dfd872020b5db67428a65954392393529da1678d0b9dec061d05bf52c7debe03d7dab8c051936ab7634f73dea443e094048cd052c76a0f89cb SHA512 b3a9805fab31995d9162f1bdb6159af9f69532c48c6a966be1b08c8a3c21ac3e7ff7f0513a8c33d2973173e1e5400d6e34abca1aa79581fad178e6a98c375adf
-EBUILD curl-7.88.0-r1.ebuild 8414 BLAKE2B 8ad26a35d3485c82e9a6f8e80ffffa036a77d8bb7a6a590553db5bf397470271ee00a26bae321edaab5bf48f9fb4e7c1fba7457dacb0db012a87833ee7170878 SHA512 1ef1fe83d74f1c449e78ade7d3fae538b494f522a64da11657d543b7401c0995d7b647b4107e75d0d41984a33ec3543ebe21f2b593e9619212f115a465db5476
+EBUILD curl-7.88.0-r2.ebuild 8838 BLAKE2B 8f9aea3e019d596e4200485941d017a2924b97aa17ea67978ab7721166d50be258e2a4e7d8991a9d4954a2a141ce4ed7b579cae801f11315d80cfaa946b19d4d SHA512 6cfd138a994450906fd60ea0d2f56ae3bc47ccc327014f7f3248054ece0a343faa43074e4d27cb1f048fc90973069dd2bea7fd84e6b2e1428c360e4eda91ddad
 MISC metadata.xml 2289 BLAKE2B a351f315d1913abff2fec9c559b2b74ddc0a60bfb293d20a62e20a2072e820f88295dc88ab32a622855cd962b90b739b0270ba88e097ca6b41c21f7f4f72987b SHA512 45cafa3eac6aaf777de55e025ef64ac039e6d300a760fc86b2eb1b77153f5242181a09082e443e525923e30e804a9ae90e902fb7f252a24214ac88929c3b89fe
diff --git a/net-misc/curl/curl-7.88.0-r1.ebuild b/net-misc/curl/curl-7.88.0-r2.ebuild
index a95ae998050a..4917e660639d 100644
--- a/net-misc/curl/curl-7.88.0-r1.ebuild
+++ b/net-misc/curl/curl-7.88.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-inherit autotools prefix multilib-minimal verify-sig
+inherit autotools multilib-minimal prefix verify-sig
 
 DESCRIPTION="A Client that groks URLs"
 HOMEPAGE="https://curl.se/"
@@ -75,6 +75,8 @@ BDEPEND="dev-lang/perl
 	virtual/pkgconfig
 	test? (
 		sys-apps/diffutils
+		http2? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+		nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
 	)
 	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
 
@@ -99,6 +101,10 @@ PATCHES=(
 src_prepare() {
 	default
 
+	# Some tests (HTTP/#) rely on ssl certificates that are stored VCS which breaks
+	# with out-of-tree builds.
+	sed -i "s:my \$path   = getcwd():my \$path   = \"${S}/tests\":" tests/http*-server.pl \
+		|| die "Unable to update test locations"
 	eprefixify curl-config.in
 	eautoreconf
 }
@@ -228,6 +234,9 @@ multilib_src_configure() {
 		$(use_with rtmp librtmp)
 		--without-schannel
 		--without-secure-transport
+		--without-test-caddy
+		--without-test-httpd
+		--without-test-nghttpx
 		$(use_enable websockets)
 		--without-winidn
 		--without-wolfssl
@@ -235,12 +244,9 @@ multilib_src_configure() {
 		$(use_with zstd)
 	)
 
-	# Do not supply a test httpd/caddy/etc
-	if use test; then
+	if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then
 		myconf+=(
-			--without-test-caddy
-			--without-test-httpd
-			--without-test-nghttpx
+			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
 		)
 	fi