From 2d59d9c83194b51fb7f560347181dce189aa4dc8 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Wed, 31 May 2023 04:39:10 +0100
Subject: [PATCH] net-misc/trurl: add 0.7

Signed-off-by: Sam James <sam@gentoo.org>
---
 net-misc/trurl/Manifest                       |  1 +
 .../trurl/files/trurl-0.7-fix-makefile.patch  | 21 ++++++++
 net-misc/trurl/trurl-0.7.ebuild               | 52 +++++++++++++++++++
 net-misc/trurl/trurl-9999.ebuild              |  6 +--
 4 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 net-misc/trurl/files/trurl-0.7-fix-makefile.patch
 create mode 100644 net-misc/trurl/trurl-0.7.ebuild

diff --git a/net-misc/trurl/Manifest b/net-misc/trurl/Manifest
index 5895b55fcee5c..f1676f774faf9 100644
--- a/net-misc/trurl/Manifest
+++ b/net-misc/trurl/Manifest
@@ -1 +1,2 @@
 DIST trurl-0.5.tar.gz 28792 BLAKE2B e552d04599628ea17e19627a1aa24871bf71fb100253f6eb945a9062ad0db98ea0a87125cc2c6a5f05f8c0296953c972b8fc9a6d5c01bdbc74d9ab9e28b9094c SHA512 1bf81030e8c904e551180b5c51f37ebe382345f397165695b47554e3c712c568351a53a7527891807f89127ea270b72632b24388db4c8efee3e9994cae1def47
+DIST trurl-0.7.tar.gz 36624 BLAKE2B a63e8ec7f0b57006b5fa7a1d2ade1284dc2076474ef0425574ecb9b452c49d9a6148461a97e760287340d67a924612c1eb1fe188b6597b8147f818c18681190f SHA512 9ecccd9b688d7bddba760bbd408a1b864d5818b2c538904662ab81b13bca6226d03a4d209c74841c83ee368e656243e92bc7f7be876dbd5c1736b7fc2c3f82d6
diff --git a/net-misc/trurl/files/trurl-0.7-fix-makefile.patch b/net-misc/trurl/files/trurl-0.7-fix-makefile.patch
new file mode 100644
index 0000000000000..f1ecb28d3aaa7
--- /dev/null
+++ b/net-misc/trurl/files/trurl-0.7-fix-makefile.patch
@@ -0,0 +1,21 @@
+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.7.ebuild
new file mode 100644
index 0000000000000..2a3befe7c83de
--- /dev/null
+++ b/net-misc/trurl/trurl-0.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit toolchain-funcs python-any-r1
+
+DESCRIPTION="Command line tool for URL parsing and manipulation"
+HOMEPAGE="https://curl.se/trurl/ https://daniel.haxx.se/blog/2023/04/03/introducing-trurl/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/curl/trurl"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/curl/trurl/archive/refs/tags/${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${P}
+
+	KEYWORDS="~amd64 ~arm ~arm64"
+fi
+
+LICENSE="curl"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Older curls may work but not all features will be present
+DEPEND=">=net-misc/curl-7.81.0"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7-fix-makefile.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_compile() {
+	tc-export CC
+
+	default
+}
+
+src_test() {
+	emake PYTHON3="${EPYTHON}" test
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+}
diff --git a/net-misc/trurl/trurl-9999.ebuild b/net-misc/trurl/trurl-9999.ebuild
index fe0c58e18fdd5..2a3befe7c83de 100644
--- a/net-misc/trurl/trurl-9999.ebuild
+++ b/net-misc/trurl/trurl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit toolchain-funcs python-any-r1
 
 DESCRIPTION="Command line tool for URL parsing and manipulation"
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/curl/trurl/archive/refs/tags/${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-${P}
 
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
 LICENSE="curl"
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.5-fix-makefile.patch
+	"${FILESDIR}"/${PN}-0.7-fix-makefile.patch
 )
 
 pkg_setup() {