gentoo auto-resync : 31:05:2023 - 09:23:01

7 files changed, 46 insertions, 16 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c0db4050cf6b..122365d20c9b 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index f6dce6e447f8..b6585c53e5ee 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -4,6 +4,6 @@ DIST netifrc-0.7.5.tar.gz 86884 BLAKE2B 6ca9b8034fe69767910814021df783710cf6b6a4
 EBUILD netifrc-0.7.3-r1.ebuild 2072 BLAKE2B cb870e8d15264a0159abd7bb6454045c80402081ce021de25ec78e76a71bcf136d8d48cdf8308e8c19176e000ceb649fec3c53e13cad0294270e4364149a9815 SHA512 dd35e00d33a06f0159b7cfe71a0f95cbfbddf9d397975400f03384998b35533fee4e1bd36b16be95527b2b12f09e21e6e3eb96803c2f845c8ff65b5c78124063
 EBUILD netifrc-0.7.3.ebuild 2059 BLAKE2B 04bce3c3cdf9b43384e6918de8e91b59ee43fa74a23715c409bff93a7861b968225e604d40a412cb20440d0f3afaa53ea750eeded1a4b674074ee2e306da9ed5 SHA512 c907ae80e8b9a4552b2f5129efe0133ea48341584cae701acc3b37f3a172936413a0a6f9bb93e04b98139590230373121a0bd24cdfd5e4a3dddc7e64bd87fe5f
 EBUILD netifrc-0.7.4.ebuild 2078 BLAKE2B b913955dca57c09b86e38a2eba96525f8b2bec3b3b1f7e8412dea978b234d280120b3e492fbb6cff94ea02cc95204d39c33b2b722d9676ca4881292117c32a04 SHA512 c782893e1c88ae5f3fc916d31f790f652625d953be780e9b8c6a6691940848cd22d665708c5b46d34e110e0e026b78fdebc3ef8bde22cbca91271aaabe577685
-EBUILD netifrc-0.7.5.ebuild 2079 BLAKE2B 250c429d6c7e44369f33df76d40ba7c20b91d655abfcdce637242d74027d2d0ea90ae3e8f80f2c693592b21f5233b72b24d5422e31fced67f10bd173e804f18b SHA512 ac28723fba6b29313daa59eabf44b063df0f9190ca3143b6c73a23c7203ca7055b40c7389b8b76b2d69e5dbf1f3d01354c56d7c081c12c6009a8b76781982056
+EBUILD netifrc-0.7.5.ebuild 2077 BLAKE2B 3da53e4934351ce13df2f3835012d7e25bdd9726052dd4402b1d91ae641ce6d005facc2bde0750d32d60a9658143fd4116e5c966d13dedd170cc1d56b5f68ee4 SHA512 bdfd3e786d567578618778251cbe9a736110d54b120ecdb4b2460b60d24cd293550725d0de15e14f895971a079337af463206c11c683513492bf4ae851e2a546
 EBUILD netifrc-9999.ebuild 2080 BLAKE2B 76d60bca2a2ffd8804e78020dcb750d2cb79e2eae57160d210384c49a0e122a66e0c3ff3163abcc9bc8bd435a4044e02ae37905ac4ecddf1ad34945ebc602d8f SHA512 89d90b589da0980142a5cc5be13f5d1bfd305ce4e3b41648425649ff23c1d886a35a7cc395e95702d1cccb5582b63027d61e6041bf2fd7830d4f8e49bb4bdc9d
 MISC metadata.xml 590 BLAKE2B c31ae830efc67c90566de9c4b3c4c7edaaea06f4e248295405d73e89e3fa61c925999e6cdfb89d37e1bd484442fe196c966ae256faa03355a31d331340b0f1ce SHA512 c1b6c24f5ee1cafde0e950fcbfa926f35529f991c1eb91436473d4d0ac8d338941b9b18bab62319fce712a3a14d04fd57019e433e584f4f2fc52a3591b8585f6
diff --git a/net-misc/netifrc/netifrc-0.7.5.ebuild b/net-misc/netifrc/netifrc-0.7.5.ebuild
index 553db211752f..e31fe4b745c9 100644
--- a/net-misc/netifrc/netifrc-0.7.5.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/trurl/Manifest b/net-misc/trurl/Manifest
index 7fd6f4b94663..2e9c49659970 100644
--- a/net-misc/trurl/Manifest
+++ b/net-misc/trurl/Manifest
@@ -1,7 +1,8 @@
 AUX trurl-0.5-fix-makefile.patch 589 BLAKE2B 2e243b7706cfa6c5d409b5e5f57e1dfe7e5b6e8af991a81ff109db46f75cf6bb1a5227198a31cc5f9abd27d0fa0d65e702b8768ef818e086ab7bd1c47498f2a6 SHA512 9d08aa9fbc93f442e057a958ee2c5d98d7582dbf9acef4b797c1e011521559e4c1ba0271036f6a95d5f331bb64c4ac84f0f2fa72dae819c30869d06e2ea6c5b6
-DIST trurl-0.4.tar.gz 23602 BLAKE2B c780fc52010f868fddbe1a06feb1ed1df627eb9ff8916d0212c8196c1efeb282b06900d2259dbaa4abdbc3c68002b1f3dfeb308c4ae2202578c40c112120b77c SHA512 7d106bf7dd39fb39316a9890bc562a5824dc046acfa50b97954e87ba455b479a2b86cfbf09a130dd39000abbc2e0fdc7038109410cf44c97812489d410693a01
+AUX trurl-0.7-fix-makefile.patch 601 BLAKE2B a773200bd930135da41eddfe64187f6a07449db45e072e9e0c375c9dca55175a885f224c7823dedb31aee7c2ea20bd983e86c7112804e3bdf163535b36f3f79d SHA512 2850448f989dce86cf22963772bb1f09ca557405c59e6716aa740b6fd7a0ef5ae23156d737bfb3900b9256124f823da57cfa43dfead921fadd65f67ee454c911
 DIST trurl-0.5.tar.gz 28792 BLAKE2B e552d04599628ea17e19627a1aa24871bf71fb100253f6eb945a9062ad0db98ea0a87125cc2c6a5f05f8c0296953c972b8fc9a6d5c01bdbc74d9ab9e28b9094c SHA512 1bf81030e8c904e551180b5c51f37ebe382345f397165695b47554e3c712c568351a53a7527891807f89127ea270b72632b24388db4c8efee3e9994cae1def47
-EBUILD trurl-0.4.ebuild 866 BLAKE2B 15442b900a37f2fda2c876a1bfa1c56e2575126af4a320652c11013d7ce09a4fcacd65bf5a6ab8467a02080fb00d84e8d880272c20a6c2ea0c57e6bdb1a384ad SHA512 bbcdc06d0b47a4af64d1175e0febe22ca64c89716fce0bf993de5e72b7bd39ad8631dfcc6c334f6f24493d2bd04b0fe01ac242b1af856a8792f4dbe2b7b8a986
+DIST trurl-0.7.tar.gz 36624 BLAKE2B a63e8ec7f0b57006b5fa7a1d2ade1284dc2076474ef0425574ecb9b452c49d9a6148461a97e760287340d67a924612c1eb1fe188b6597b8147f818c18681190f SHA512 9ecccd9b688d7bddba760bbd408a1b864d5818b2c538904662ab81b13bca6226d03a4d209c74841c83ee368e656243e92bc7f7be876dbd5c1736b7fc2c3f82d6
 EBUILD trurl-0.5.ebuild 1058 BLAKE2B d0377339add2be9d1795b006a15e7683a20ad131410f417085ebd199450ab04698cfba1a7e4eafa0fb6c1d48ed1279eef6428afe0a3481c0c50fe4aa0a42984b SHA512 b1bbbe4a1b05a5cf07146288e533fbdff7de95e4e9ba732e29206be6aecd0c8fd9a7fd891f808dc5184b3b6174fb392e76f402ed76a39e4b1532ba4a2cc79813
-EBUILD trurl-9999.ebuild 1046 BLAKE2B 9cb09bf57a16182c7fdea1aad3911f3a02ff4cecb5d41845415ef931a03d091585f44c1b711e742b7b40f9cb246ba115c12cb9cefe3e049498cac365eb04e2bd SHA512 3a1e1c988de376537ea7c7997e69dd3ef181dc8f266fced0889fffe6abdabfec56029b2d80587e1ea2ef9c163ba99782ccc16f2c466f27258d446d23962b6d27
+EBUILD trurl-0.7.ebuild 1059 BLAKE2B fef8f31f9ef4d72960711eef4ac92d55466a8d8dea058a0ca165aeaa38448a063afc321bb9016967a5b4d42b8c9b5d52f130644821ece9e13b0d0d74c2c8e3de SHA512 eee32d0a1415d7de72a6fe6b6c0540abb42cb03440b2334d704eeff253de38c23fb319b4721a8e21921bff92e9c41db5b132d9da8b52a91ab754143cec0304a5
+EBUILD trurl-9999.ebuild 1059 BLAKE2B fef8f31f9ef4d72960711eef4ac92d55466a8d8dea058a0ca165aeaa38448a063afc321bb9016967a5b4d42b8c9b5d52f130644821ece9e13b0d0d74c2c8e3de SHA512 eee32d0a1415d7de72a6fe6b6c0540abb42cb03440b2334d704eeff253de38c23fb319b4721a8e21921bff92e9c41db5b132d9da8b52a91ab754143cec0304a5
 MISC metadata.xml 315 BLAKE2B 4ae563841f80987d7156bfa13ab36c79f42b60d598dd5425cd877489f874e09cf8d13fa858b1ddb476cebc6a9af1383865bef0d1f82f6ad51aab58e05a225201 SHA512 c0c5e3d8cef3912c447145a6a8131056c13e6865e40eccb1ba422ae3e8ffa0038f7938133e1d05c7686be0886f44f479db53746a6fc2656d7c2d7b0e7e057766
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 000000000000..f1ecb28d3aaa
--- /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.4.ebuild b/net-misc/trurl/trurl-0.7.ebuild
index 78443cfb2991..2a3befe7c83d 100644
--- a/net-misc/trurl/trurl-0.4.ebuild
+++ b/net-misc/trurl/trurl-0.7.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+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/"
@@ -15,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"
@@ -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.7-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
 }
diff --git a/net-misc/trurl/trurl-9999.ebuild b/net-misc/trurl/trurl-9999.ebuild
index fe0c58e18fdd..2a3befe7c83d 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() {