gentoo auto-resync : 16:08:2024 - 12:22:56

5 files changed, 35 insertions, 29 deletions

diff --git a/net-misc/trurl/Manifest b/net-misc/trurl/Manifest
index 660b4de804a5..74483b70b264 100644
--- a/net-misc/trurl/Manifest
+++ b/net-misc/trurl/Manifest
@@ -1,5 +1,5 @@
-AUX trurl-0.7-fix-makefile.patch 601 BLAKE2B a773200bd930135da41eddfe64187f6a07449db45e072e9e0c375c9dca55175a885f224c7823dedb31aee7c2ea20bd983e86c7112804e3bdf163535b36f3f79d SHA512 2850448f989dce86cf22963772bb1f09ca557405c59e6716aa740b6fd7a0ef5ae23156d737bfb3900b9256124f823da57cfa43dfead921fadd65f67ee454c911
-DIST trurl-0.7.tar.gz 36624 BLAKE2B a63e8ec7f0b57006b5fa7a1d2ade1284dc2076474ef0425574ecb9b452c49d9a6148461a97e760287340d67a924612c1eb1fe188b6597b8147f818c18681190f SHA512 9ecccd9b688d7bddba760bbd408a1b864d5818b2c538904662ab81b13bca6226d03a4d209c74841c83ee368e656243e92bc7f7be876dbd5c1736b7fc2c3f82d6
-EBUILD trurl-0.7.ebuild 1059 BLAKE2B fef8f31f9ef4d72960711eef4ac92d55466a8d8dea058a0ca165aeaa38448a063afc321bb9016967a5b4d42b8c9b5d52f130644821ece9e13b0d0d74c2c8e3de SHA512 eee32d0a1415d7de72a6fe6b6c0540abb42cb03440b2334d704eeff253de38c23fb319b4721a8e21921bff92e9c41db5b132d9da8b52a91ab754143cec0304a5
-EBUILD trurl-9999.ebuild 1059 BLAKE2B fef8f31f9ef4d72960711eef4ac92d55466a8d8dea058a0ca165aeaa38448a063afc321bb9016967a5b4d42b8c9b5d52f130644821ece9e13b0d0d74c2c8e3de SHA512 eee32d0a1415d7de72a6fe6b6c0540abb42cb03440b2334d704eeff253de38c23fb319b4721a8e21921bff92e9c41db5b132d9da8b52a91ab754143cec0304a5
+AUX trurl-0.14-fix-makefile.patch 674 BLAKE2B 4cf603b09ca872b009c53e9e99450687df89ee261c25166bfb62b94d8784d0c1ea9397238368e3f09358abe17855b79d1f598e05c04131aa33ac6557d7bfd668 SHA512 9198e27b1156738e03812eb0b424097a32eaa2ced77b1db26da1e9b1a95e88b3e4a2d0158f61ef5e1656e4cb0a41b55afbdafb003b41a10ef0f9fa9ed95b1eb5
+DIST trurl-0.14.tar.gz 47830 BLAKE2B 15be36ef5c5989cf15d3983827055c793f15ae59efe8e02cc2f55ad9b19c528bb568aacc0583590017a6d6a3a74db1bd6bd3e18d3fee1c7c7d86e71f503d57f7 SHA512 25c1a3035095065368c8a11547e1d918b6f688e293982895a7bc27d9e161c0193ceccfaa0c2440f5c42a8ba4d5176a3f6a4fb843f5fa573328ef9baf5a438165
+EBUILD trurl-0.14.ebuild 1082 BLAKE2B 198495c0b7ce13c5b48c5f6d13b3923bbb7ba07f861408455a9c3bcc52f3bd0d404d46c175952722456b990155a21714739faeda8073bd77297dc507a913bce5 SHA512 285581f204632e2dc712e4c2071c5d46edeccf6079a8143ba79eca03c76c76efef01108bfe9ffa10abd93cee84b7d8e110b7abd7202ef80c22bfe8e75fcef6e1
+EBUILD trurl-9999.ebuild 1082 BLAKE2B 198495c0b7ce13c5b48c5f6d13b3923bbb7ba07f861408455a9c3bcc52f3bd0d404d46c175952722456b990155a21714739faeda8073bd77297dc507a913bce5 SHA512 285581f204632e2dc712e4c2071c5d46edeccf6079a8143ba79eca03c76c76efef01108bfe9ffa10abd93cee84b7d8e110b7abd7202ef80c22bfe8e75fcef6e1
 MISC metadata.xml 315 BLAKE2B 4ae563841f80987d7156bfa13ab36c79f42b60d598dd5425cd877489f874e09cf8d13fa858b1ddb476cebc6a9af1383865bef0d1f82f6ad51aab58e05a225201 SHA512 c0c5e3d8cef3912c447145a6a8131056c13e6865e40eccb1ba422ae3e8ffa0038f7938133e1d05c7686be0886f44f479db53746a6fc2656d7c2d7b0e7e057766
diff --git a/net-misc/trurl/files/trurl-0.14-fix-makefile.patch b/net-misc/trurl/files/trurl-0.14-fix-makefile.patch
new file mode 100644
index 000000000000..2787f21015fd
--- /dev/null
+++ b/net-misc/trurl/files/trurl-0.14-fix-makefile.patch
@@ -0,0 +1,25 @@
+See https://github.com/curl/trurl/pull/322
+--- a/Makefile
++++ b/Makefile
+@@ -28,10 +28,10 @@ ifndef TRURL_IGNORE_CURL_CONFIG
+ LDLIBS += $$(curl-config --libs)
+ CFLAGS += $$(curl-config --cflags)
+ endif
+-CFLAGS += -W -Wall -Wshadow -Werror -pedantic
++CFLAGS += -W -Wall -Wshadow -pedantic
+ CFLAGS += -Wconversion -Wmissing-prototypes -Wwrite-strings -Wsign-compare -Wno-sign-conversion
+ ifndef NDEBUG
+-CFLAGS += -g
++CFLAGS += -Werror -g
+ endif
+ MANUAL = trurl.1
+ 
+@@ -43,7 +43,7 @@ INSTALL ?= install
+ PYTHON3 ?= python3
+ 
+ $(TARGET): $(OBJS)
+-	$(CC) $(OBJS) -o $(TARGET) $(LDFLAGS) $(LDLIBS)
++	$(CC) $(LDFLAGS) $(OBJS) -o $(TARGET) $(LDLIBS)
+ 
+ trurl.o: trurl.c version.h
+ 
diff --git a/net-misc/trurl/files/trurl-0.7-fix-makefile.patch b/net-misc/trurl/files/trurl-0.7-fix-makefile.patch
deleted file mode 100644
index f1ecb28d3aaa..000000000000
--- a/net-misc/trurl/files/trurl-0.7-fix-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-See https://github.com/curl/trurl/pull/158#issuecomment-1512397801.
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,6 @@
- TARGET = trurl
- OBJS = trurl.o
--LDLIBS = $$(curl-config --libs)
--CFLAGS = $$(curl-config --cflags) -W -Wall -Wshadow -Werror -pedantic -g
-+LDLIBS = $(shell curl-config --libs)
- MANUAL = trurl.1
- 
- PREFIX ?= /usr/local
-@@ -12,7 +11,7 @@ INSTALL ?= install
- PYTHON3 ?= python3
- 
- $(TARGET): $(OBJS)
--	$(CC) $(OBJS) -o $(TARGET) $(LDLIBS) $(LDFLAGS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -Wall $(shell curl-config --cflags) $(LDFLAGS) $(OBJS) -o $(TARGET) $(LDLIBS)
- 
- trurl.o:trurl.c version.h
- 
diff --git a/net-misc/trurl/trurl-0.7.ebuild b/net-misc/trurl/trurl-0.14.ebuild
index 2a3befe7c83d..5dfbbc31163e 100644
--- a/net-misc/trurl/trurl-0.7.ebuild
+++ b/net-misc/trurl/trurl-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.7-fix-makefile.patch
+	"${FILESDIR}"/${PN}-0.14-fix-makefile.patch
 )
 
 pkg_setup() {
@@ -39,6 +39,7 @@ pkg_setup() {
 
 src_compile() {
 	tc-export CC
+	export NDEBUG=1
 
 	default
 }
diff --git a/net-misc/trurl/trurl-9999.ebuild b/net-misc/trurl/trurl-9999.ebuild
index 2a3befe7c83d..5dfbbc31163e 100644
--- a/net-misc/trurl/trurl-9999.ebuild
+++ b/net-misc/trurl/trurl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.7-fix-makefile.patch
+	"${FILESDIR}"/${PN}-0.14-fix-makefile.patch
 )
 
 pkg_setup() {
@@ -39,6 +39,7 @@ pkg_setup() {
 
 src_compile() {
 	tc-export CC
+	export NDEBUG=1
 
 	default
 }