commit: ff1b5b5d420157e637e880ae92379830632dd110
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 1 06:44:33 2026 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Thu Jan 1 06:44:57 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff1b5b5d
net-misc/curl: add 8.18.0_rc3; update live
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
net-misc/curl/Manifest | 2 ++
.../{curl-9999.ebuild => curl-8.18.0_rc3.ebuild} | 6 ++--
net-misc/curl/curl-9999.ebuild | 2 +-
net-misc/curl/files/curl-prefix-6.patch | 35 ++++++++++++++++++++++
4 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index ccd5ccbb6dd7..a766eb25485e 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -4,3 +4,5 @@ DIST curl-8.16.0.tar.xz 2788632 BLAKE2B
573d56779481abf0b7d20225bba4f068cb726f23
DIST curl-8.16.0.tar.xz.asc 488 BLAKE2B
d213bd447c668118b49b7356dc99e710de927b93f81325802bae5e286b61481da6ed30f23c7f4f3cfb0f01222db88602ff4e510f4a1401e98511eb0c72ac6abb
SHA512
591568e997c0d955a00152ce5bdfb4586d84b42f5c1e15df503514fb4eb4bf289a98b1ebdad23913119c67c27d51a6e6f4065ee6f7657b971c3a581c928a0d82
DIST curl-8.17.0.tar.xz 2797000 BLAKE2B
a7a804afe058f323b40177bcb4ffc523decde92da3da0a051f2dc1b566131250a96afe1ebf2bebc071993c893bddeef883ef33ddc0a9bee86d4e54402a546fba
SHA512
fc6349def40c3c259de2a568631507df17dff83e78a2edbb93f069586dce594439fdc88bef7ce2bed7491f35800b8c0c181c8c88e6ef656cc3c18f9834681eca
DIST curl-8.17.0.tar.xz.asc 488 BLAKE2B
88b72cb9c0acd8a06956eca31047dfadfe110dc07290adbe50b9451a71d4282acaa05c8a149787d71cf13cf1b42e8df9594d0e8a2b1cadbfca5eb50550f32609
SHA512
e77d4cb1f4961aa0df3d76f1a8c55a0b9005ed557adf745f3ab24d33cee2d0e4bd06cecb9d911e76409852e7755129873cc7d24936c846ff1b854903c0f086b2
+DIST curl-8.18.0-rc3.tar.xz 2797608 BLAKE2B
5259ab4d8efeb155ecbb0d49be991e52f510aeef297b47881f28171a26064fa4a38b83039e358511fb38d23e5f12756870fb8e3bb96ef4df4fb070fe0d44de10
SHA512
1139b79a6c4356fdf6f368812402c2f9bafcbaec6323c367aef85c4d00ffda9541a87ef476ce9a099142ef6f824b562c9dc840878add60a616f0e441fef44801
+DIST curl-8.18.0-rc3.tar.xz.asc 488 BLAKE2B
cd56a5433797612daded8ffeb05d3d84e4ff2f6d9320fa745b5c27ce057405bdf3596b2cfdff83ca18daffde530a46161d2d277053ac0b5178d0b8bbe056c17d
SHA512
fac23b293cec82596ddd7757c0984e3977259c5116ddef719fad2a39a3723cf7cb5d85d12c5c5b2542f34a5411aa6f42f4fb08729fde6c564cd3567f2a3f0434
diff --git a/net-misc/curl/curl-9999.ebuild
b/net-misc/curl/curl-8.18.0_rc3.ebuild
similarity index 98%
copy from net-misc/curl/curl-9999.ebuild
copy to net-misc/curl/curl-8.18.0_rc3.ebuild
index 1b2ccf8c874c..740bb4d55abd 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-8.18.0_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -151,7 +151,7 @@ BDEPEND="
verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
"
-DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ.md,BUGS.md,CONTRIBUTE.md} )
MULTILIB_WRAPPED_HEADERS=(
/usr/include/curl/curlbuild.h
@@ -176,7 +176,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
)
PATCHES=(
- "${FILESDIR}/${PN}-prefix-5.patch"
+ "${FILESDIR}/${PN}-prefix-6.patch"
"${FILESDIR}/${PN}-respect-cflags-3.patch"
)
diff --git a/net-misc/curl/curl-9999.ebuild b/net-misc/curl/curl-9999.ebuild
index 1b2ccf8c874c..fd5bbc4b51e6 100644
--- a/net-misc/curl/curl-9999.ebuild
+++ b/net-misc/curl/curl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/net-misc/curl/files/curl-prefix-6.patch
b/net-misc/curl/files/curl-prefix-6.patch
new file mode 100644
index 000000000000..8a6131acf5d3
--- /dev/null
+++ b/net-misc/curl/files/curl-prefix-6.patch
@@ -0,0 +1,35 @@
+From 57297a390f0f4b90ed3c68f56180b3481d0b54af Mon Sep 17 00:00:00 2001
+From: Matt Jolly <[email protected]>
+Date: Sun, 28 Dec 2025 08:57:50 +1000
+Subject: [PATCH] Update prefix patch for 8.18
+
+Signed-off-by: Matt Jolly <[email protected]>
+---
+ curl-config.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/curl-config.in b/curl-config.in
+index a1c8185..107d629 100644
+--- 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' && test "@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.51.0
+
