commit: 56d522bbf4d84626a60ca59b10745fe44a017b52
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 1 22:48:50 2025 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Mon Sep 1 22:50:23 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d522bb
net-misc/curl: add 8.16.0_rc2; sync live
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
net-misc/curl/Manifest | 2 ++
.../{curl-9999.ebuild => curl-8.16.0_rc2.ebuild} | 3 +--
net-misc/curl/curl-9999.ebuild | 3 +--
net-misc/curl/files/curl-prefix-5.patch | 29 ++++++++++++++++++++++
4 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 8d7ac6d5bbac..47292be1d757 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -6,3 +6,5 @@ DIST curl-8.14.1.tar.xz 2817248 BLAKE2B
4ce2277d143084823855b714e86047a94d4c52a6
DIST curl-8.14.1.tar.xz.asc 488 BLAKE2B
f664f526dbffa0a1af2b28f51982445f7d9064b3c3b3e6dd04322003db22da2acde5d493c80204b36a9219d42959543c5a0aee47f2365eb713490ff2fc5f475f
SHA512
663b1652bb27338310d1475a8b0422f04e68fca74be11a4b7120de948af4fc0c2b08b75ce5372d657aa89504a27b36b937b5091cb2d932297a7490d5e390d99f
DIST curl-8.15.0.tar.xz 2773156 BLAKE2B
ae809be87f34d079413129c27e618a6d15c2bf9087fd7e679cefe9b6d8645f0dd092e8c3e1f62b7bd0dffdd0b77e0bc5ac031ffce4e50060ec20b280618c8e68
SHA512
d27e316d70973906ac4b8d2c280f7e99b7528966aa1220c13a38ed45fca2ed6bbde54b8a9d7bed9e283171b92edb621f7b95162ef7d392e6383b0ee469de3191
DIST curl-8.15.0.tar.xz.asc 488 BLAKE2B
4b0bab065a1d2d5b7e5d49989bd4953344d844cafd3036b4cb2ed2dec82e59031832f05c06dc6a801e4668d92c936df74aeff7a5f2c15ff614da4b1673a67501
SHA512
b6aef1c6a1f32c60401494df565a748fa96c1d5098138772c22f6208bafeb8e61402f3077cbc274ea2c05f35ff376d8f736c58554520f8d20fded36d876499a5
+DIST curl-8.16.0-rc2.tar.xz 2782952 BLAKE2B
2d8d28532cb424d63b6a3d9c69d35d19ab3f534f440ffebdb39458b4e2d771ac0804b83d482512a9325202b9447498d6003de6377a304213c2f35e4a17a5c365
SHA512
7cc4f56a05634c651cf7224d3844359498d127f259e531aadefe86f6df3a7fc5f6644c296407d38867ddb716fe3e4951d377592f6d977c196ad1a733374e608f
+DIST curl-8.16.0-rc2.tar.xz.asc 488 BLAKE2B
9d3488e369b8e437359e25785cfb3addbb1cfb81ef74dd8c16f3466ca643efc4f3ccc7864de20fb70c65024406882770d221c5f7ee90da16f07fe13825a71549
SHA512
c180343f1037cf51eb32c61035a4da7e728c2ee7f8d4ca1d464545b9b4044b30963e6b1ce424951a151ff901d7c7f4d56e7a54dacc581fc2c5c3b54349c155eb
diff --git a/net-misc/curl/curl-9999.ebuild
b/net-misc/curl/curl-8.16.0_rc2.ebuild
similarity index 99%
copy from net-misc/curl/curl-9999.ebuild
copy to net-misc/curl/curl-8.16.0_rc2.ebuild
index 807efaf7a12a..f9ed048bec45 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-8.16.0_rc2.ebuild
@@ -173,7 +173,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
)
PATCHES=(
- "${FILESDIR}/${PN}-prefix-4.patch"
+ "${FILESDIR}/${PN}-prefix-5.patch"
"${FILESDIR}/${PN}-respect-cflags-3.patch"
)
@@ -336,7 +336,6 @@ multilib_src_configure() {
$(use_with kerberos gssapi "${EPREFIX}"/usr)
$(use_with sasl-scram libgsasl)
$(use_with psl libpsl)
- --without-msh3
--without-quiche
--without-schannel
--without-winidn
diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index 807efaf7a12a..f9ed048bec45 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -173,7 +173,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
)
PATCHES=(
- "${FILESDIR}/${PN}-prefix-4.patch"
+ "${FILESDIR}/${PN}-prefix-5.patch"
"${FILESDIR}/${PN}-respect-cflags-3.patch"
)
@@ -336,7 +336,6 @@ multilib_src_configure() {
$(use_with kerberos gssapi "${EPREFIX}"/usr)
$(use_with sasl-scram libgsasl)
$(use_with psl libpsl)
- --without-msh3
--without-quiche
--without-schannel
--without-winidn
diff --git a/net-misc/curl/files/curl-prefix-5.patch
b/net-misc/curl/files/curl-prefix-5.patch
new file mode 100644
index 000000000000..77070171aedf
--- /dev/null
+++ b/net-misc/curl/files/curl-prefix-5.patch
@@ -0,0 +1,29 @@
+From 05d97da1f669a1486489897128c2374b562ab176 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <[email protected]>
+Date: Tue, 2 Sep 2025 08:41:51 +1000
+Subject: [PATCH] Update prefix patch for 8.16.0
+
+Signed-off-by: Matt Jolly <[email protected]>
+--- a/curl-config.in
++++ b/curl-config.in
+@@ -141,7 +141,7 @@ while test "$#" -gt 0; do
+ ;;
+
+ --cflags)
+- if test "@includedir@" = '/usr/include'; then
++ if test "@includedir@" = "GENTOO_PORTAGE_EPREFIX@/usr/include"; then
+ echo '@LIBCURL_PC_CFLAGS@'
+ else
+ echo "@LIBCURL_PC_CFLAGS@ -I@includedir@"
+@@ -149,7 +149,7 @@ while test "$#" -gt 0; do
+ ;;
+
+ --libs)
+- if test "@libdir@" != '/usr/lib' -a "@libdir@" != '/usr/lib64'; then
++ if test "@libdir@" != "@GENTOO_PORTAGE_EPREFIX@/usr/lib" -a "@libdir@" !=
"@GENTOO_PORTAGE_EPREFIX@/usr/lib64"; then
+ curllibdir="-L@libdir@ "
+ else
+ curllibdir=''
+--
+2.50.1
+
