[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

["Sam James" <sam@gentoo.org>]

commit:     6bc8f48fa548c8681f2e1ca3caf08073bdb60e46
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 23:27:56 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 08:54:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bc8f48f

dev-vcs/git: add 2.45.0_rc1, sync live

hg-to-git has been removed upstream.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-vcs/git/Manifest                                      |  3 +++
 dev-vcs/git/{git-9999-r3.ebuild => git-2.45.0_rc1.ebuild} |  5 ++---
 dev-vcs/git/git-9999-r1.ebuild                            | 10 ++++++----
 dev-vcs/git/git-9999-r2.ebuild                            | 10 ++++++----
 dev-vcs/git/git-9999-r3.ebuild                            |  5 ++---
 dev-vcs/git/git-9999.ebuild                               | 10 ++++++----
 6 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 93e0024bb33c..df7b09dd4524 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -3,13 +3,16 @@ DIST git-2.41.0.tar.xz 7273624 BLAKE2B 9119e1d1ff0ff332559a6609707846c2af7c61bea
 DIST git-2.43.0.tar.xz 7382996 BLAKE2B 5da19211df56e306eb95cef65b2a987134d2f0853dc1db30e1cc99d0357b3f5ab7f1e434e73948d7b6ad6b7bfc44f75349479f46050ee63a6516c72b774b4eba SHA512 d0c1694ae23ff7d523e617b98d7c9a9753a2ee58f92c21b67a192d1c57398a62ff9c1a34558ae31af8dc8d95122c219f39f654e99a3b4e7cfc3dd07be9e13203
 DIST git-2.43.2.tar.xz 7388636 BLAKE2B 3c0d59d361b928efedfc06426f4c2c0f3852b3501d091f31a0466d226eddb31964a18bd4051ac0c0c11cf6827e6a9ede821b4532abf4e9b15204679f86690247 SHA512 0d95b8ac65bd76acb60c3b4d80242aeda8b2ab3dda7c8586ce46cc1ddedc000494b45fd269295033b82f38662cde08d366c63aa3ff39030500952342c9d3b280
 DIST git-2.44.0.tar.xz 7429952 BLAKE2B 6dc145e20e737763fb738ccb4a65ba2f8d6f35bb4e30520a0c79f4fcc0eaaaf4e99a9be00eaa9e14dec231ed122d54be7dfa9212a3e5a75707730256391896d4 SHA512 9e4b9c8a8e28cd50c0db75a93eae8a3423aa7e51c4312af1e1cdaf408e93f306c23aa747f0a97f27c11ab0e2f5e6283e52c8b61c9fe6be5b9b18673a43ce1780
+DIST git-2.45.0.rc1.tar.xz 7477208 BLAKE2B 104b19a2e0926421df019853370c3015b3994ca1e6a9461dd914a396d2873495e7dc80563dad2eb995dd8c8906b60c0ece45e29dbcc316d49ce9495b301821d9 SHA512 2bb9cd586c57a31a84d1599d5c88ab0f793c5caf1baa61ec0300463deddec6859cc53791bc1b7af36a2aeaf75940aac0bfd9784dd931d671502733c5c556d1ff
 DIST git-htmldocs-2.39.3.tar.xz 1506828 BLAKE2B 732e86ee004a44230d8f10eac16a14fbfb348d4278001011a0d22ba91240fbe65cad341b0547b649db3ce7fc67fc6fb544c896e7ba4bd7f1fa3c9b42371febf9 SHA512 7616c9c6600759f06973d36d5233b3909da72f39318410f5522b890d282a74e7585433c7195fed4792d5b7955292a466abcc2185ffdc23d0e8928ad58d7db1bf
 DIST git-htmldocs-2.41.0.tar.xz 1525692 BLAKE2B 4ea74130e21fed3ebbe09b849eddc48654fa7563299d8c2173856741d3c490a1672ac6b2005f716d6ae2d7759f92caafc56ccbf2408ba8ec87266b9c10530d73 SHA512 8a28f330f21e1da901ef8575509b56cede1a8f1d03e49fca802e561095c137c9ef23f3d6bd33d0e8a537bc1f93131ce7aafc92d4a9b0a80ade67249f22ff69d5
 DIST git-htmldocs-2.43.0.tar.xz 1543348 BLAKE2B 456655da42ca5cf0e1422e636a6dd67f6068ae768f8a619e6f1aadbf2adee728aea7f3078bee286f31460c5f2bd5a77882d8bb8cb2f01d3641f56a4106105846 SHA512 0d3bf3522dfdae564fa11255f02a4e02c762edc2c637d439063659800b2f1535e077069e2012e2cdb8d1e985e6c8a6011ee336051801e646624216d845023218
 DIST git-htmldocs-2.43.2.tar.xz 1545440 BLAKE2B 8e6943ed5c5ab13ee7f8f2e124a3dc1e6883bb5b6782be4a7b6fecc3e02bb51f41b057ec5f36b0e9557f05d676795544516585cffca8e025c762377be1815912 SHA512 18c8e0fc3351f708aa677ee5daeb61f8727ce94763d4a7067462af7b90dc1ee5c67e4ea6e770db08dd99a5196b7f3fa2c4673ce9e25ab3365be8175fcf5fe66c
 DIST git-htmldocs-2.44.0.tar.xz 1557284 BLAKE2B e44a03def2fb3eed2ff694b074b79e870a17d1f00d6fdb2c447ef0e8582b98481ad7c6b0924e785f20fb7e96960d9e9e149eadff6a89eb8c9fe0256da5f27b54 SHA512 4c7cc4da879afae6f85daa49bd1b58884344187f4ce70bcddb962538ef7a10a6e776585facc584502ac15531a49d09562a8a8d63a24536e30415be709893c502
+DIST git-htmldocs-2.45.0.rc1.tar.xz 1566856 BLAKE2B b08129e9c87640f16685a36225ff56ba8be713b043862048747dbe445e8c8427f1f1d6a5fe14a968bfd7bd5cf467fdc96b254a5ea29a44a6995e0c7490de7b97 SHA512 9f88b46b8c4d2d47ef843479bf54b6830e5c1836cf3cd55594d19f2204aeabf092ff6b72670f11b2d0b88e772375c8b8f589e10d466763da11ac398c6ca2aa85
 DIST git-manpages-2.39.3.tar.xz 557428 BLAKE2B 4eb85035f7056a12c3f1276d26f99b3337b97721f8f4b0b3c74d2a484171bfdf74f566a03e175ba32b389c940ed7be66ce2933442ec77089d5db3aaeb2ed2557 SHA512 06414741667b990ff3a28f7cb29b502df3d4cc757d525438994af005c71d429ca969563a74d1d2b44185e5c40107ac8838b390835a8a947e542ce3636b43f98b
 DIST git-manpages-2.41.0.tar.xz 565060 BLAKE2B 082f2272314981b21606aef22bf18f0fe1d8a29fce0ce29e451cbad986e8f9c398906632b694de1b328accda61e85f25fd8875ee2e104cb9a7da8873d48e1495 SHA512 118afe9af79f2747c1f762b51fa2cdce7b46396ab4321f57826a351575acf30d9a486e2713e558cab6f6b353724cef3f0f1eab587b181f547324e96e3fee0b91
 DIST git-manpages-2.43.0.tar.xz 570356 BLAKE2B 87d405f59ac600742546dfa97f9a723264b865301e1538a60bb8f985489a288982b682d0e5f784bd17f43287ad1f418b187de0b7b137d043520ea32481a44ae0 SHA512 a90e7fad0505843b4fa2e6a862f4acf4f777b0fdd86097c51bcba0c18daf81f4facf9ae3fee7cfae8c439a54dc3dbc476372b8926a738b9449550ee1f94a3c4a
 DIST git-manpages-2.43.2.tar.xz 570496 BLAKE2B 5d0be8f51edddf5b6a0c18d21a1ee8c23c92977370d25e04144cae882505e9235486219964bcfca1f21dca7eb3533d4d91acda07eb66687a96ca488e6f4cc15c SHA512 09ab36dc8e9dc8d0ed29610ba6fe5bff8c76d01e9b36d1443bfa4d729d4c8c6849620188856f226b07ba1259e0a617454e470d852e2464ce2c408888a3e57347
 DIST git-manpages-2.44.0.tar.xz 573444 BLAKE2B 47bf8513a6e594468e361f1a4469f657ab492a1ffb9702808f15e76a49c444ea5382e92f849dfd995ff9bed22acafde74f6559ceb9f5dddaec08e927c5d68de7 SHA512 415dbecf4c26ad7f96dccbc4e0268657b9b341e8d24697bf46207a4b9155d189a469abac83135c3cb1c514fb5bad31f8e587f33e01a02f1d55de26ec3a4373b7
+DIST git-manpages-2.45.0.rc1.tar.xz 576076 BLAKE2B bce26ec9e73bb82c1f353bca715f3f90bbced0ff875faa4e7bbae0a077d56ceb00bc6bcce5ac3cd4c640b275d3a0be8de2fc64ea7222a99d6dff512cc253f129 SHA512 994f56e2c784dfb86641513f08346e0e37d5f962ed26fd946b0fe6380a4508d5638e7763971ebd8d6f1ebdb3fb79a5182f88609a0c01f9b56203a053b9990439

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-2.45.0_rc1.ebuild
similarity index 99%
copy from dev-vcs/git/git-9999-r3.ebuild
copy to dev-vcs/git/git-2.45.0_rc1.ebuild
index d2b1f4666e4b..d375f35e5ccf 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-2.45.0_rc1.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
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
@@ -570,7 +570,6 @@ src_install() {
 	local contrib_objects=(
 		buildsystems
 		fast-import
-		hg-to-git
 		hooks
 		remotes2config.sh
 		rerere-train.sh

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index a2c9d157f9ed..d375f35e5ccf 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.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
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
@@ -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 \
@@ -567,7 +570,6 @@ src_install() {
 	local contrib_objects=(
 		buildsystems
 		fast-import
-		hg-to-git
 		hooks
 		remotes2config.sh
 		rerere-train.sh

diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index a2c9d157f9ed..d375f35e5ccf 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.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
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
@@ -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 \
@@ -567,7 +570,6 @@ src_install() {
 	local contrib_objects=(
 		buildsystems
 		fast-import
-		hg-to-git
 		hooks
 		remotes2config.sh
 		rerere-train.sh

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index d2b1f4666e4b..d375f35e5ccf 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.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
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
@@ -570,7 +570,6 @@ src_install() {
 	local contrib_objects=(
 		buildsystems
 		fast-import
-		hg-to-git
 		hooks
 		remotes2config.sh
 		rerere-train.sh

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index a2c9d157f9ed..d375f35e5ccf 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.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
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi
 
@@ -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 \
@@ -567,7 +570,6 @@ src_install() {
 	local contrib_objects=(
 		buildsystems
 		fast-import
-		hg-to-git
 		hooks
 		remotes2config.sh
 		rerere-train.sh