gentoo auto-resync : 26:02:2024 - 11:40:32

6 files changed, 13 insertions, 7 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index e346ff397e83..f1369cc9c377 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 3a807abedac0..a9af48a8354f 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -34,9 +34,9 @@ EBUILD git-2.41.0.ebuild 16215 BLAKE2B d222c7ab8eb3d2ad87d062862509ae3bdb73a407b
 EBUILD git-2.43.0.ebuild 16215 BLAKE2B 9c107d29ffb8fa159e1cb0fa75b3e80631617d706a9cb2dd13042798ffdf8229d1061800cd71735ac686262a404e62a0e756da408c3c9e6f337fe9dd25808c1e SHA512 016713c536d0617bc4e0f0cb849384b83031d882ca68f8a13d8617f9a32ed846520209bf4173270f55358eaaf58c1badff99bbfbff2dad790dd9e4b473f8d8a5
 EBUILD git-2.43.1.ebuild 16223 BLAKE2B 891cbd7f42e31c538c8912213320d58732feda4012fff5efad16f4eff7bea651b563b479965803bf88e65c31e52c1ac9c1672b16f66f79637352fdf9847af9ff SHA512 4f4dbf397d17ae78a2b9782d888c9e6b2d3113689f4fcf6e679441e32ffda936298044e106e198a1db94101601d65abb25c52b285fca1872246779adc9d08e4a
 EBUILD git-2.43.2.ebuild 16223 BLAKE2B 891cbd7f42e31c538c8912213320d58732feda4012fff5efad16f4eff7bea651b563b479965803bf88e65c31e52c1ac9c1672b16f66f79637352fdf9847af9ff SHA512 4f4dbf397d17ae78a2b9782d888c9e6b2d3113689f4fcf6e679441e32ffda936298044e106e198a1db94101601d65abb25c52b285fca1872246779adc9d08e4a
-EBUILD git-2.44.0.ebuild 16223 BLAKE2B 891cbd7f42e31c538c8912213320d58732feda4012fff5efad16f4eff7bea651b563b479965803bf88e65c31e52c1ac9c1672b16f66f79637352fdf9847af9ff SHA512 4f4dbf397d17ae78a2b9782d888c9e6b2d3113689f4fcf6e679441e32ffda936298044e106e198a1db94101601d65abb25c52b285fca1872246779adc9d08e4a
+EBUILD git-2.44.0.ebuild 16314 BLAKE2B c119e65d5c9a2d2e151b76ce2765fb580c12fa794e08cd927521499708dac1e5349f07168339906928a027ce9753eaca87f3907a0b82ee7740e86094014f1c73 SHA512 cfcbffd99621ff352e91c7aa2cbd547c3d94ae35e1dd1265a0008c00f9893e0df3d213b7cb9376198f99394d25d7d65f8fbfefae56aea2ca893841cbd8691c8b
 EBUILD git-9999-r1.ebuild 16210 BLAKE2B d2d6f22e5ac56d4d79a86004f5ae84fcf1673b8fc84970d68e5ebe1c23ed92bb4485e6fba052a6f4c48d669dc1a7cc84b6f2a5c1007f7b1955c55688dc91731d SHA512 50300cb6219d212f55a5ee0ecd8c4e4504bcbd8510f1e951db6e92911f9767827910d7d5e71add9308823bf445ad94e400c3c21e6a8eb4797baab32a653c0d67
 EBUILD git-9999-r2.ebuild 16210 BLAKE2B d2d6f22e5ac56d4d79a86004f5ae84fcf1673b8fc84970d68e5ebe1c23ed92bb4485e6fba052a6f4c48d669dc1a7cc84b6f2a5c1007f7b1955c55688dc91731d SHA512 50300cb6219d212f55a5ee0ecd8c4e4504bcbd8510f1e951db6e92911f9767827910d7d5e71add9308823bf445ad94e400c3c21e6a8eb4797baab32a653c0d67
-EBUILD git-9999-r3.ebuild 16210 BLAKE2B d2d6f22e5ac56d4d79a86004f5ae84fcf1673b8fc84970d68e5ebe1c23ed92bb4485e6fba052a6f4c48d669dc1a7cc84b6f2a5c1007f7b1955c55688dc91731d SHA512 50300cb6219d212f55a5ee0ecd8c4e4504bcbd8510f1e951db6e92911f9767827910d7d5e71add9308823bf445ad94e400c3c21e6a8eb4797baab32a653c0d67
+EBUILD git-9999-r3.ebuild 16301 BLAKE2B 47c4d269e720f304c81ca3a37411fed80fd92bceb707b6914bb8526966526ebee2113cda197ca747d57ac990bb409f1b178ca3d3842b1c505f7d8ef3a346bad8 SHA512 2bbdb46b27e93711a663ee3cb98ba7c51d7d65a416b70f4a710a0088cfd1274646e59fd732723fd1c4882310455c99131becfab0b906dbc2ef013a26039caf2e
 EBUILD git-9999.ebuild 16210 BLAKE2B d2d6f22e5ac56d4d79a86004f5ae84fcf1673b8fc84970d68e5ebe1c23ed92bb4485e6fba052a6f4c48d669dc1a7cc84b6f2a5c1007f7b1955c55688dc91731d SHA512 50300cb6219d212f55a5ee0ecd8c4e4504bcbd8510f1e951db6e92911f9767827910d7d5e71add9308823bf445ad94e400c3c21e6a8eb4797baab32a653c0d67
 MISC metadata.xml 2041 BLAKE2B 309964a6982f6f14cecc40b4021d96d2e28c49789480bc4037879375cb5277c2eb500ff36800657e783c36f541265db20b464fc39ce2ac39ff4cda881854662f SHA512 a8dd2f76985690cded8555a0b82e5004b4d93ccc45988fdc04ef8ed3e17ef73d2b83dc9fb6b913e5f9d2b78ebe715e9eb32bfce607318d0e8c0834987eabe5b6
diff --git a/dev-vcs/git/git-2.44.0.ebuild b/dev-vcs/git/git-2.44.0.ebuild
index 1ca16eafce51..5a670b6ce658 100644
--- a/dev-vcs/git/git-2.44.0.ebuild
+++ b/dev-vcs/git/git-2.44.0.ebuild
@@ -261,7 +261,10 @@ src_prepare() {
 
 	if use prefix ; then
 		# bug #757309
-		eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch
+		sed -i \
+			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
+			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
+			config.mak.uname || die
 	fi
 
 	sed -i \
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index a2c9d157f9ed..d2b1f4666e4b 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -261,7 +261,10 @@ src_prepare() {
 
 	if use prefix ; then
 		# bug #757309
-		eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch
+		sed -i \
+			-e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \
+			-e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \
+			config.mak.uname || die
 	fi
 
 	sed -i \
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 7d2c5b5703c2..d3618a55849e 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -7,6 +7,6 @@ EBUILD tortoisehg-6.2.3.ebuild 2286 BLAKE2B 28dc72c911cb1574f9872f857b14a086532f
 EBUILD tortoisehg-6.3.2.ebuild 2369 BLAKE2B 33f0a33cb8e0407cd98fbf6f005c31f06122f3fd0f173a122b02c4a1784da79c9c828db6885081329bd63148220b31209e738545474f2e82c8f3f94e3f113388 SHA512 0f3820a1fe27bc4e97f1ef229ce51b7f6026779593e6ead79593c512c2a576b2392ea51434f092012345affc5c0fdf99933c3eb9617414c0980f6a222b2e37b0
 EBUILD tortoisehg-6.4.2.ebuild 2371 BLAKE2B eca66ff4f1d05ac1bd36c5851ea43f8f5c4cd6843b04d6fc1c3d26682ee9b250a6a964f50bf11512cc4051e8917ff3a7b48830eb984409ad53f5679c84c84122 SHA512 f3ba92581ed1be3c07a2b88737cc68c707f480b8a747939749fa12d2841008eea2871073ee1a553c2ff4e3b599cbdb3933f3fc5bec3400de216303a9441146e8
 EBUILD tortoisehg-6.4.5.ebuild 2370 BLAKE2B b3b171f22766adfe731b1225e8ebc95c5a71993bbe7b1a34342a53b7989c5e649ff628c64cd4dffbf42b48ce39e6c3526081aacb2e683286e0c101767f04eb41 SHA512 ad7989657c7c5e0d0701349c18eb6c1268c23335c9901e3fa8f821a3460eb8dff86b3d040a887813a37a0c1a8cb692bb2ce6919e92ea102b617924dd1111ace6
-EBUILD tortoisehg-6.5.1.ebuild 2372 BLAKE2B 726b3ca7578d5776d6f0b65927f9ce3418c47daa1c452570f56de0fca7aa271f64d13442c861eea510fe6bd6190a7c2a8251122c26203f6952a240e5fbf4c26a SHA512 2a3402839f9555adad8e7a1757d918342f8d904becdf33288fd2dcc6e5a3aa4d858102f5105064da68b9d03db5bbe24d9ee7ddb28577ac1f54d3f68b1672ff39
+EBUILD tortoisehg-6.5.1.ebuild 2370 BLAKE2B 3183105b138f71a1a85a7de181a21f00e3cde0d0c3ab2a00fbec2a42200e625a3e0bd6273221e8ce763a0aac3e30b51456e70bbe61bc38ef40e41550c1fa6d4f SHA512 01f9acfa19f2ce2accefb15dd529890fc77156777ca9e4e13f7daed03c67c3d45d288cb6fadea6ea2d3b025cd85b722a28b0718cc3be2b2787a628250754fe7e
 EBUILD tortoisehg-9999.ebuild 2372 BLAKE2B 95d4ac68665dcf08e3bcf8a3319e8135ab6dcd6633e2735906a0d4cdf73956b195895f90a22eb6c9a75a61d2a1e999e4cfee00dc1f2993d6099312b274421bbb SHA512 f7c49e299d9f042a42b6df96cb53c5f767e06060cb034b0cb33c0870842b311cbf93fbf7cc37315a1c73cfd7716a2189d1ede874b27219f22adcad5c5010a4bf
 MISC metadata.xml 805 BLAKE2B b09f8454c68278c180c84a62c54410909d731307058fcfb973d48b304269ae4eac6d4e61d4f04857813659029869097e3ba5a4d2bb6fea698797b364ba588cbe SHA512 33aa011e53112a7e1589205bf563fefb3db2cc931f4643a03abfc6baafd1b57c59a4f712814dfd3e3e1eb6b299fb34af53bcb2d1c08accaed6989f23b3e41acc
diff --git a/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild
index fb677516f59d..04c4dc09091d 100644
--- a/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ DISTUTILS_USE_PEP517=setuptools
 inherit desktop distutils-r1 optfeature xdg-utils
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz"
 	HG_DEPEND=">=dev-vcs/mercurial-6.2[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '>=dev-vcs/mercurial-6.3.2[${PYTHON_USEDEP}]' python3_11 )