gentoo auto-resync : 18:04:2023 - 11:55:01

5 files changed, 58 insertions, 58 deletions

diff --git a/net-misc/trurl/Manifest b/net-misc/trurl/Manifest
index 062c5e9884e9..76507a9ea167 100644
--- a/net-misc/trurl/Manifest
+++ b/net-misc/trurl/Manifest
@@ -1,8 +1,7 @@
-DIST trurl-0.2.tar.gz 9095 BLAKE2B 1fab191158ca914c6a8e561095edc5329f7b565849dc1add85d17c05062f46fa82160bc6595c16e28a216821ffab7944edbce3be4a38895191f3c901ccef611f SHA512 e6ad68183acefb09985b453d0bdc7d0afe9e4c916c4e32fe67cee9afd23aa437e0b538cdc9456bc2ed93dc8996c9c64efeeff74a1415f044d0c1e52d0f5f00c7
-DIST trurl-0.3.tar.gz 11622 BLAKE2B 013554669c2c9ed8fc8090977d3a729bacb0200078283785b5ff9526317b0923de99ce33747358dd643e977fd67e024182ca03ae8153c05a9c14ce050f6c20df SHA512 c7361bc49439219177e6150804ee665103d37b80145d308fd02a4260134bb098d937279cb8c23a6192f307f9464ab0f34a34997251fdff13db623a9765b90e0c
+AUX trurl-0.5-fix-makefile.patch 589 BLAKE2B 2e243b7706cfa6c5d409b5e5f57e1dfe7e5b6e8af991a81ff109db46f75cf6bb1a5227198a31cc5f9abd27d0fa0d65e702b8768ef818e086ab7bd1c47498f2a6 SHA512 9d08aa9fbc93f442e057a958ee2c5d98d7582dbf9acef4b797c1e011521559e4c1ba0271036f6a95d5f331bb64c4ac84f0f2fa72dae819c30869d06e2ea6c5b6
 DIST trurl-0.4.tar.gz 23602 BLAKE2B c780fc52010f868fddbe1a06feb1ed1df627eb9ff8916d0212c8196c1efeb282b06900d2259dbaa4abdbc3c68002b1f3dfeb308c4ae2202578c40c112120b77c SHA512 7d106bf7dd39fb39316a9890bc562a5824dc046acfa50b97954e87ba455b479a2b86cfbf09a130dd39000abbc2e0fdc7038109410cf44c97812489d410693a01
-EBUILD trurl-0.2.ebuild 784 BLAKE2B 91afabaad66e80c008b11da3b7444d2ece5cde11a2e87ef1e608f2201f0acfb7ce3854bdbc0c2accfb6429097bd8c60dd4a21ba392a0f9ed7cbd6eee9641a261 SHA512 0bffc39b1d294fc7d1aa6f8f2c51475e0761f981bbbf13db301adb173fe2c609c6524418b40be249e44ebf98ad2d983e302a1cf0b843816362d840d08e8f34f5
-EBUILD trurl-0.3.ebuild 806 BLAKE2B 7198cbb82d203a0a012534d41bd09fbeba3aacc209e5439510ec205ed5ce67646060786b2f64a2eab73b22ca6cb5d0e8ba87e3ad12e53ec673bdb0ef843f37f9 SHA512 57a0236d7ce7da4c7c34ca917133eab362be42e7b19eefa31ece25b7dbae5bf4c2f1d5f84b5726a8c0bd0e5c485dd8e0174468ce62feb8161859cc35761ffaf8
+DIST trurl-0.5.tar.gz 28792 BLAKE2B e552d04599628ea17e19627a1aa24871bf71fb100253f6eb945a9062ad0db98ea0a87125cc2c6a5f05f8c0296953c972b8fc9a6d5c01bdbc74d9ab9e28b9094c SHA512 1bf81030e8c904e551180b5c51f37ebe382345f397165695b47554e3c712c568351a53a7527891807f89127ea270b72632b24388db4c8efee3e9994cae1def47
 EBUILD trurl-0.4.ebuild 866 BLAKE2B 15442b900a37f2fda2c876a1bfa1c56e2575126af4a320652c11013d7ce09a4fcacd65bf5a6ab8467a02080fb00d84e8d880272c20a6c2ea0c57e6bdb1a384ad SHA512 bbcdc06d0b47a4af64d1175e0febe22ca64c89716fce0bf993de5e72b7bd39ad8631dfcc6c334f6f24493d2bd04b0fe01ac242b1af856a8792f4dbe2b7b8a986
-EBUILD trurl-9999.ebuild 866 BLAKE2B 15442b900a37f2fda2c876a1bfa1c56e2575126af4a320652c11013d7ce09a4fcacd65bf5a6ab8467a02080fb00d84e8d880272c20a6c2ea0c57e6bdb1a384ad SHA512 bbcdc06d0b47a4af64d1175e0febe22ca64c89716fce0bf993de5e72b7bd39ad8631dfcc6c334f6f24493d2bd04b0fe01ac242b1af856a8792f4dbe2b7b8a986
+EBUILD trurl-0.5.ebuild 1046 BLAKE2B 9cb09bf57a16182c7fdea1aad3911f3a02ff4cecb5d41845415ef931a03d091585f44c1b711e742b7b40f9cb246ba115c12cb9cefe3e049498cac365eb04e2bd SHA512 3a1e1c988de376537ea7c7997e69dd3ef181dc8f266fced0889fffe6abdabfec56029b2d80587e1ea2ef9c163ba99782ccc16f2c466f27258d446d23962b6d27
+EBUILD trurl-9999.ebuild 1046 BLAKE2B 9cb09bf57a16182c7fdea1aad3911f3a02ff4cecb5d41845415ef931a03d091585f44c1b711e742b7b40f9cb246ba115c12cb9cefe3e049498cac365eb04e2bd SHA512 3a1e1c988de376537ea7c7997e69dd3ef181dc8f266fced0889fffe6abdabfec56029b2d80587e1ea2ef9c163ba99782ccc16f2c466f27258d446d23962b6d27
 MISC metadata.xml 315 BLAKE2B 4ae563841f80987d7156bfa13ab36c79f42b60d598dd5425cd877489f874e09cf8d13fa858b1ddb476cebc6a9af1383865bef0d1f82f6ad51aab58e05a225201 SHA512 c0c5e3d8cef3912c447145a6a8131056c13e6865e40eccb1ba422ae3e8ffa0038f7938133e1d05c7686be0886f44f479db53746a6fc2656d7c2d7b0e7e057766
diff --git a/net-misc/trurl/files/trurl-0.5-fix-makefile.patch b/net-misc/trurl/files/trurl-0.5-fix-makefile.patch
new file mode 100644
index 000000000000..66a152991ca4
--- /dev/null
+++ b/net-misc/trurl/files/trurl-0.5-fix-makefile.patch
@@ -0,0 +1,22 @@
+See https://github.com/curl/trurl/pull/158#issuecomment-1512397801.
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,6 @@
+ TARGET = trurl
+ OBJS = trurl.o
+-LDLIBS != curl-config --libs
+-CFLAGS != curl-config --cflags
+-CFLAGS += -W -Wall -pedantic -g
++LDLIBS = $(shell curl-config --libs)
+ MANUAL = trurl.1
+ 
+ PREFIX ?= /usr/local
+@@ -13,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.2.ebuild b/net-misc/trurl/trurl-0.2.ebuild
deleted file mode 100644
index d746c034e362..000000000000
--- a/net-misc/trurl/trurl-0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Command line tool for URL parsing and manipulation"
-HOMEPAGE="https://daniel.haxx.se/blog/2023/04/03/introducing-trurl/ https://github.com/curl/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"
-fi
-
-LICENSE="curl"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=net-misc/curl-7.62.0"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-lang/perl )"
-
-src_compile() {
-	tc-export CC
-
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-}
diff --git a/net-misc/trurl/trurl-0.3.ebuild b/net-misc/trurl/trurl-0.5.ebuild
index 5c9ebf0edda3..fe0c58e18fdd 100644
--- a/net-misc/trurl/trurl-0.3.ebuild
+++ b/net-misc/trurl/trurl-0.5.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+PYTHON_COMPAT=( python3_{9..11} )
+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/"
@@ -23,14 +24,18 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND=">=net-misc/curl-7.62.0"
+# Older curls may work but not all features will be present
+DEPEND=">=net-misc/curl-7.81.0"
 RDEPEND="${DEPEND}"
-BDEPEND="
-	test? (
-		dev-lang/perl
-		virtual/perl-JSON-PP
-	)
-"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5-fix-makefile.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
 
 src_compile() {
 	tc-export CC
@@ -38,6 +43,10 @@ src_compile() {
 	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 78443cfb2991..fe0c58e18fdd 100644
--- a/net-misc/trurl/trurl-9999.ebuild
+++ b/net-misc/trurl/trurl-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+PYTHON_COMPAT=( python3_{9..11} )
+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/"
@@ -26,12 +27,15 @@ 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? (
-		dev-lang/perl
-		virtual/perl-JSON-PP
-	)
-"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5-fix-makefile.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
 
 src_compile() {
 	tc-export CC
@@ -39,6 +43,10 @@ src_compile() {
 	default
 }
 
+src_test() {
+	emake PYTHON3="${EPYTHON}" test
+}
+
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
 }