commit: 3ffe4aba4040d02a77a83a34e09da4fbd722ccd0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 18 17:41:57 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 18 17:43:02 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ffe4aba
dev-vcs/git: add 2.52.0
Adds USE=rust as the first release upstream w/ any Rust. It is optional
for now but they will make it mandatory in 3.0.
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-vcs/git/Manifest | 3 +++
dev-vcs/git/{git-9999-r1.ebuild => git-2.52.0.ebuild} | 8 +++++---
dev-vcs/git/git-9999-r1.ebuild | 8 +++++---
dev-vcs/git/git-9999-r2.ebuild | 8 +++++---
dev-vcs/git/git-9999-r3.ebuild | 8 +++++---
dev-vcs/git/git-9999.ebuild | 14 ++++++--------
dev-vcs/git/metadata.xml | 1 +
7 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index b80976784a74..6bbd842d4c7a 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -3,13 +3,16 @@ DIST git-2.50.1.tar.xz 7880972 BLAKE2B
4e5e3168d7dd88cc508920dd773df2ec6b568c70e
DIST git-2.51.0.tar.xz 7857228 BLAKE2B
b385ee2c7aed601435952c983045055c970cdda607d83ae8ba904ee10e5e76bca097ccbe0f22e4e1467c6d606c9eecb952ffb382f351124325b6fd5d87083596
SHA512
2b8c59589266c0c9e58a9f4fda4a970a8a492e2e0ecbafc414fcfacac4a04251f0115b3676f4599a415b53906f1dea312b18a42e9bde455286abd62ec327beaf
DIST git-2.51.1.tar.xz 7865216 BLAKE2B
3bb26baee468498f882eb3bf995c58cf441a9e7537ca3dafbe58cf24a947d37a52749b62e3095446787514f0eb9e1d767d4efbee29a8d63851803e8c6bb4daa6
SHA512
bc22d26bbfad4a549d2fb6bed11eb019c2dee607c86bf8faaa986774e526e5b367d80c9a79ab50358624634d840e8e0d27e0b46411d1aabbf76728b7a7f138dd
DIST git-2.51.2.tar.xz 7865980 BLAKE2B
d567f52da82cabc5d2e4f542f02209aa170536864769fa49c9a24c5129e0603a940b1adf6dedf892c8971d947400a104d312b376f3f6aa23029cb57dffc9acb4
SHA512
547c3e522d9e6a2c2ccab24ee0c7f4f2d29878759563356e3a2ae9675884b7044ce5a236803170a203b79443760eb18a7089eec02bd105316e3ab045ab7603a7
+DIST git-2.52.0.tar.xz 7957064 BLAKE2B
f228174814b1048f12543a6a20f771017991f9a23778f12fc32020b38837990eb19bc69e891078692ac4ad4ae1cb2e0e77400760964e09c491046e4ed8b16f96
SHA512
965e5ebb72d1f080d64e34bdb75f0bb1689c9dd41dcf63b020d986bad49808ac09bfb1115962bc0c5b95bac8622367ac4cd09aa89266f73d2137fe94c90dd3ed
DIST git-htmldocs-2.49.1.tar.xz 1602244 BLAKE2B
8d6df9ff42660123577933a95971bdd47d94b650b2cb8abafa4f4cbd981d016d3d3fdcbb08f22616ee44f928fc0aaac4f0ffee8a1d1d0c659240fcc2db9e2a25
SHA512
39db559a507b732d18ce1fa3ac513e87ca27b1d5df0f6d26cdead7b5add4eb29889d4c81e09b25c6fdbd813a0f13c833a22a4b6bbba6dea3b126e841a61424f8
DIST git-htmldocs-2.50.1.tar.xz 1615796 BLAKE2B
6d340b552075bce7d724824eefd03540d558e24c07b49e48f1bb4262a5b3632b6aa7782bb02b15aaf424d22e5460bffee066f1e2bb0018791dcec8afa79dd3b8
SHA512
ebe437851b039bab4ec83be807583a23beaf43073248ffdcddee2328fc621b5b712c094faac3ee15a783f5a0cbdd92c2635879426007e8ef0ddcb70f227782f9
DIST git-htmldocs-2.51.0.tar.xz 1627664 BLAKE2B
17106db9d7edf8717281d5af88ec9b53c91f6ba56552d5952d25ff593b4d227194df53a33dd52eb4791dd5044a7d867f8bed2371087e6dfdb4a0110e09f70055
SHA512
55460724b73bc42ebb611a4c0657f59040e8e7b28d56cb26814ae97c1b13ce3577e57e5a66f2749a93b7b3496b8a665ce5a2c31ba471eadb3267813915dc7051
DIST git-htmldocs-2.51.1.tar.xz 1629412 BLAKE2B
e135a355e84c4bd1a1d1e54dd6ff875b43145649cdc90696b1650f74ff3a0b2a94190d23ffffc22b621703fbb713d042283a5e65b0ed60860cc892d26b44226e
SHA512
0abfbef358162d03fc033bca23bc95cae0561e8f4852abfd49d53d546005caf0b6f759776c7bbada8353cb340b3b48b0c1cd0415db0bbf04efe591e7b9411fe1
DIST git-htmldocs-2.51.2.tar.xz 1629724 BLAKE2B
ed8593f9ccbd8017656af7193914638c25be7ed2a449d3509d49949a1eff2134b3a9c163802155610e32cb07f9ea4eced9ebd0758eb0f36b0ff028c0ee0462f0
SHA512
cafb7fa2f0a3be6bff006f65c8462047e6f2c80482b09df7c45e7caba12acee670ddb886c125dcc751a5d701ebf812737f981bd0bcbc3035432de26db981929a
+DIST git-htmldocs-2.52.0.tar.xz 1657524 BLAKE2B
c21219b1059ee593ea850464473ba3466f83b44932261b70abecb7837a0e5c2434d71e29c495ac33faad9a34bda061b81187f691c57e8dc9557a56f8030dbeea
SHA512
6fee6834bbd1400acef575fd206f58fb15472d45bad8f4ca9066930a3b4b1be8a633bb94c11f83644177266a06e2c4bb8a9478f10c4f1742016f59d07612c5e4
DIST git-manpages-2.49.1.tar.xz 594536 BLAKE2B
b29aea1817053fefacc9a16abb86ea9fb4f2f239a268661a357cda16ab02b55ff3736b0c7d870fcacf4867bd063e14177bc46109115845fdea26b1870ff5f463
SHA512
0fbd824bfd68c72e8a6509989ffd016d1256cc3c5dfe4634170de2a07cdbdb4506f4b9136fa3176ac56c6f20f518a16758f1391bbd658be0caa8ebcc34158feb
DIST git-manpages-2.50.1.tar.xz 598416 BLAKE2B
c47be82829562057a99da3dc801958c2f7d1eeabb5af3c28cc3a66ec03a02b96e2d1d670ce39f7ab1d39fc113abe896c73b2126129cd98c3d33292267f160690
SHA512
9de90823bfb815ce31938794b80bf8526d162125afe23084114c47d360235a8d63b6fcdf78613bd91ee492b8d8c614d026cce51733bdd63bffe533f7da616d05
DIST git-manpages-2.51.0.tar.xz 602200 BLAKE2B
12b103871dcd8173e88e2eb96621620682c19aecfb6ecbd7a9b3d8bb7358eed78c00af0738c502c5ff71ac8d85894c68ed33f395aed426d580210d4c1d36faf6
SHA512
ee2eb3bc90a63cb28ccdc8716b2d610b55eefbc0da255b7360695bc686ba52841b147c879a4f8b2ecdb767814b815929f7e0dd57fa612a87ef5e36b862056144
DIST git-manpages-2.51.1.tar.xz 602552 BLAKE2B
a8781e1b7b040b39ca17ee9ea20688bc14bdd0a948e1bab2e39e01747770a97f64119e4eacdedd07e3d281469025958ca34d73faacad7c36381e9a9c8f4fe4ab
SHA512
e8f00835472c2078023e28cb9ae1ac2aac8c4e950a8ef453eafe894d9bb8411e3e89108606b3783c00883db2bb041defb0bf9dd5b3558bcbd6b07b7f28c66e92
DIST git-manpages-2.51.2.tar.xz 602340 BLAKE2B
856c4531ed27b53f390f738774d758813f717b378bd64e4736e8627fe898b34b64b8d4b9fb686573f21d90d8db859062371586c440f3c6efca38346a04f7120b
SHA512
d6443f22590797eb6947fbb317e2ec52beeabd6d3117425e23d93085952c4d9eaa8d26ae677a8f4d73938f9611ac636f5f26e29527cc96d1a6612c2853103a94
+DIST git-manpages-2.52.0.tar.xz 607864 BLAKE2B
6736100b503afd95aa7d6d9878a5c9420b44c5755b31c99e4b6db4a567db0984a6a786d2fac07baea95bf2b758c68fef042b75b10c848732add19fe17f3243bf
SHA512
8e7998ed101fa4c7e9707721cbbc61e07bab56647c69f2d46d16c30465a825e223429cfab1ddfa58302a0563a12a8e5886133566bc6a1097ab0970d8ae4458d7
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-2.52.0.ebuild
similarity index 98%
copy from dev-vcs/git/git-9999-r1.ebuild
copy to dev-vcs/git/git-2.52.0.ebuild
index 510dd57b7512..38de93464194 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-2.52.0.ebuild
@@ -7,8 +7,8 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
-
-inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 systemd meson
+RUST_OPTIONAL=1
+inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 rust systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce
+perl +safe-directory selinux subversion test tk +webdav xinetd"
+IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce
+perl rust +safe-directory selinux subversion test tk +webdav xinetd"
# Common to both DEPEND and RDEPEND
DEPEND="
@@ -117,6 +117,7 @@ BDEPEND="
)
keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
+ rust? ( ${RUST_DEPEND} )
test? (
app-arch/unzip
app-crypt/gnupg
@@ -228,6 +229,7 @@ src_configure() {
$(meson_feature pcre pcre2)
$(meson_feature perl)
$(meson_feature perforce python)
+ $(meson_feature rust)
$(meson_use test tests)
-Dcontrib=$(IFS=, ; echo "${contrib[*]}" )
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 510dd57b7512..38de93464194 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -7,8 +7,8 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
-
-inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 systemd meson
+RUST_OPTIONAL=1
+inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 rust systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce
+perl +safe-directory selinux subversion test tk +webdav xinetd"
+IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce
+perl rust +safe-directory selinux subversion test tk +webdav xinetd"
# Common to both DEPEND and RDEPEND
DEPEND="
@@ -117,6 +117,7 @@ BDEPEND="
)
keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
+ rust? ( ${RUST_DEPEND} )
test? (
app-arch/unzip
app-crypt/gnupg
@@ -228,6 +229,7 @@ src_configure() {
$(meson_feature pcre pcre2)
$(meson_feature perl)
$(meson_feature perforce python)
+ $(meson_feature rust)
$(meson_use test tests)
-Dcontrib=$(IFS=, ; echo "${contrib[*]}" )
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 510dd57b7512..38de93464194 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -7,8 +7,8 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
-
-inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 systemd meson
+RUST_OPTIONAL=1
+inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 rust systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce
+perl +safe-directory selinux subversion test tk +webdav xinetd"
+IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce
+perl rust +safe-directory selinux subversion test tk +webdav xinetd"
# Common to both DEPEND and RDEPEND
DEPEND="
@@ -117,6 +117,7 @@ BDEPEND="
)
keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
+ rust? ( ${RUST_DEPEND} )
test? (
app-arch/unzip
app-crypt/gnupg
@@ -228,6 +229,7 @@ src_configure() {
$(meson_feature pcre pcre2)
$(meson_feature perl)
$(meson_feature perforce python)
+ $(meson_feature rust)
$(meson_use test tests)
-Dcontrib=$(IFS=, ; echo "${contrib[*]}" )
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 510dd57b7512..38de93464194 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -7,8 +7,8 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
-
-inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 systemd meson
+RUST_OPTIONAL=1
+inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 rust systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce
+perl +safe-directory selinux subversion test tk +webdav xinetd"
+IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce
+perl rust +safe-directory selinux subversion test tk +webdav xinetd"
# Common to both DEPEND and RDEPEND
DEPEND="
@@ -117,6 +117,7 @@ BDEPEND="
)
keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
+ rust? ( ${RUST_DEPEND} )
test? (
app-arch/unzip
app-crypt/gnupg
@@ -228,6 +229,7 @@ src_configure() {
$(meson_feature pcre pcre2)
$(meson_feature perl)
$(meson_feature perforce python)
+ $(meson_feature rust)
$(meson_use test tests)
-Dcontrib=$(IFS=, ; echo "${contrib[*]}" )
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index a063ebf119e5..38de93464194 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -7,8 +7,8 @@ GENTOO_DEPEND_ON_PERL=no
# bug #329479: git-remote-testgit is not multiple-version aware
PYTHON_COMPAT=( python3_{11..14} )
-
-inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 systemd meson
+RUST_OPTIONAL=1
+inherit toolchain-funcs perl-module shell-completion optfeature plocale
python-single-r1 rust systemd meson
PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
@@ -58,7 +58,7 @@ S="${WORKDIR}"/${MY_P}
LICENSE="GPL-2"
SLOT="0"
-IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce
+perl +safe-directory selinux subversion test tk +webdav xinetd"
+IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv +nls +pcre perforce
+perl rust +safe-directory selinux subversion test tk +webdav xinetd"
# Common to both DEPEND and RDEPEND
DEPEND="
@@ -117,6 +117,7 @@ BDEPEND="
)
keyring? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
+ rust? ( ${RUST_DEPEND} )
test? (
app-arch/unzip
app-crypt/gnupg
@@ -228,6 +229,7 @@ src_configure() {
$(meson_feature pcre pcre2)
$(meson_feature perl)
$(meson_feature perforce python)
+ $(meson_feature rust)
$(meson_use test tests)
-Dcontrib=$(IFS=, ; echo "${contrib[*]}" )
@@ -245,6 +247,7 @@ src_configure() {
if [[ ${PV} == *9999 ]] || use doc ; then
emesonargs+=(
-Ddocs="man$(usev doc ',html')"
+ -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
)
fi
@@ -334,11 +337,6 @@ src_test() {
src_install() {
meson_src_install
- if use doc ; then
- cp -r "${ED}"/usr/share/doc/git-doc/.
"${ED}"/usr/share/doc/${PF}/html || die
- rm -rf "${ED}"/usr/share/doc/git-doc/ || die
- fi
-
# Depending on the tarball and manual rebuild of the documentation, the
# manpages may exist in either OR both of these directories.
find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
diff --git a/dev-vcs/git/metadata.xml b/dev-vcs/git/metadata.xml
index 9d25e400d1b3..47fec3c42047 100644
--- a/dev-vcs/git/metadata.xml
+++ b/dev-vcs/git/metadata.xml
@@ -26,6 +26,7 @@
<flag name="highlight">GitWeb support for
<pkg>app-text/highlight</pkg></flag>
<flag name="mediawiki">Support pulling and pushing from MediaWiki</flag>
<flag name="perforce">Add support for Perforce version control system
(requires manual installation of Perforce client)</flag>
+ <flag name="rust">Build components using Rust, starting with 2.52 with
varint. This will become mandatory upstream with Git 3.0.</flag>
<flag name="safe-directory">Respect the safe.directory setting</flag>
<flag name="subversion">Include git-svn for <pkg>dev-vcs/subversion</pkg>
support</flag>
<flag name="tk">Include the 'gitk' and 'git gui' tools</flag>
