From 19056658e507e7316b2a9e743abae94201501a1d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 13 Jan 2025 07:07:02 +0000 Subject: [PATCH] dev-vcs/git: Sync with Gentoo It's from Gentoo commit de507853de11a25486bc95aeeafc2cd86e7e92b4. --- .../portage-stable/dev-vcs/git/Manifest | 9 +- .../git/files/git-2.47.0-maintenance.patch | 85 ----- .../git/files/git-2.48.0-doc-deps.patch | 42 +++ .../git/files/git-2.48.0_rc2-meson-deps.patch | 91 +++++ ...git-2.47.0-r1.ebuild => git-2.47.1.ebuild} | 5 +- ...git-2.47.0.ebuild => git-2.48.0-r1.ebuild} | 354 ++++------------- .../dev-vcs/git/git-9999-r1.ebuild | 357 ++++-------------- .../dev-vcs/git/git-9999-r2.ebuild | 357 ++++-------------- .../dev-vcs/git/git-9999-r3.ebuild | 357 ++++-------------- .../dev-vcs/git/git-9999.ebuild | 5 +- 10 files changed, 437 insertions(+), 1225 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.47.0-maintenance.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.48.0-doc-deps.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.47.0-r1.ebuild => git-2.47.1.ebuild} (99%) rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.47.0.ebuild => git-2.48.0-r1.ebuild} (57%) diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest index 350fc36788..7fc0a52237 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest @@ -1,12 +1,15 @@ DIST git-2.44.2.tar.xz 7435020 BLAKE2B 625071528e6575af86aa51d7d5baeaa9b1b8be0e9f2b13f9f1c948a6dc0e9e03e227462c6ed9e8b80c413f02840f4f6b5d73487e0722d30835233480ea93caf3 SHA512 4dc70065fb1f47678cbed0d055f7734fce5cc26eeb627bda928056a80253053b230200db4b2936319df5b5b577eaaa1186a8bb041a205ac600d691e5663117ed DIST git-2.45.2.tar.xz 7487680 BLAKE2B 477acc786c26e0b04843ad6d07333607b2274d587263d72c6d036cade725e6f62f8c773903f401c799de71527d0473589afc507eec02f445e0c148dd7cbf407c SHA512 dce30d0d563f3f76ef49c8dc88105e0cf0941c8cd70303418d9d737f840ffba36bcc575c380c75080edf64af74487e1a680db146ec5f527a32104e887d4ceb73 DIST git-2.46.2.tar.xz 7581344 BLAKE2B 1ea2a166bd2717d581020a9921cf7e82dc2c77e2a9bd6bc70f4b6396c214c74b30e8ae6815eba33bd2995f7a6e2570b96c51acbfce25ab85e05d5fdbd09d870c SHA512 d8d1cec9a4ddc7b1892b7f5b3c808d235bcd4bfb1714ce0ce0e721242acc94f9ae7c2ae3181311feb5b458b04e89cd32acd3e9c90adbc4e86e05e7d5589d8a00 -DIST git-2.47.0.tar.xz 7652728 BLAKE2B f1d767aad6a917efe0c2e7f52163daca796640fb7f7ac8c1d6ead91ce3019f9a5ddd7ce8890ff37aaff1320d1b0b59399469fc9cb0f66cfc6893d2b3bbeee56e SHA512 58683aa59dba25ffec9fe2c185267c77b34d573e9738c133a15d25071e37095e99486c231c35b8f71aabe3c1e305238b56d2c10039318bfc08f137919bad66ec +DIST git-2.47.1.tar.xz 7654244 BLAKE2B 5dd5d1bde226469d8de0952456dbaa408739f8613cfefdd76715e6a2bc1fdf8695740f005cc3b2caab876fccfbff0609201a827e0bd9837ec68056ba2a41da34 SHA512 6abe551c464b307bc3f6f474257e0be3e1a9eba1406af6463216b796c55a35356009c2f7bd9b4fa2d1798da5f885a3843f6ad8750ab69595f748f9ea8ed76fea +DIST git-2.48.0.tar.xz 7723336 BLAKE2B 63d0ac06aef75120ff2aab34b76039cc9e2606a4e69ee36fed868df7243318abac6550e03054bebc9b65a086c54a4f00d95affcc121fa690a3a580cb352ecbb3 SHA512 0b8b6633d65f20830577a073a78f13cedf4f43c8634d5d62918cddca9ca8b75519e6674307782e0eacb9e8e920a04014aa2a0f5cd2e75be06728e9160f794c9e DIST git-htmldocs-2.44.2.tar.xz 1559412 BLAKE2B 9a62ab1d70b009a9bc29250c49ca835a46928703a73ec004ea57e7dc74212c5a29d7e0784cd752c8d2c1e23b70702e2c2f280904dfedefb3d4a687002a950596 SHA512 2a82e3c37aaca91643976d21fac3bd82b23fe2374856d73b0ba726339450ea6f8a5e8e38326546292f83923e28da280ca3bed549afff1aad684ebfb3926e4992 DIST git-htmldocs-2.45.2.tar.xz 1569148 BLAKE2B 5013a13da54d87728f621a09d04dee1cba7b44d230360394b86e04269bf276399cf44de74ffc14a76ec1724e1015b630300d551b3a268273a768e0edc1a7fa45 SHA512 272bb31d8d43b270d5281c5d1beadea8e5a580c738ece2580d2c6ba7e7fe6fdbca71b672a2811273119495e62613f7a4d34764b4dfbc26e4dbf9dee5797fb440 DIST git-htmldocs-2.46.2.tar.xz 1553104 BLAKE2B 9a7b784c1a01153dc660b4fe6eaa3ceac2d30eeb96015ab4ec73296811d27cc84715abd19f723ad16c64028114c2aceee2727380e7c9f8ff220ae4538dcc9c62 SHA512 51c5363ac48f04118071218ea095dae97676ac299a482511ef55e9267724f08e7c021ffa15418d9e32e676333ba31643c9049860f154f58a67d9604e141376c3 -DIST git-htmldocs-2.47.0.tar.xz 1564012 BLAKE2B 9d9d234ac8c7eb6861a2ee1bd9000ae7150b33346adf8e830712c0fa2c068e5173a52ff0f937f64a2f2a2270853ca7d62965361d124a98bfe4e39d63a8e0aae6 SHA512 4e8cfabfcdfaa12d23ba21ee3612a841e1731c174cb1d73c9fee12a345e5ee792c1ad0f5c15b4f73ad6eb4496a1e3450aaacdd65e5f875e60c9eb355cc4134fe +DIST git-htmldocs-2.47.1.tar.xz 1564776 BLAKE2B ff8c313e00867423ddb122572e730868541ab22c76cb73aad54ee5dab298c4a8fdc29d50ebdceb658d7799132258dad9ffcaa582439a74463a8c212c3d82005c SHA512 7df2c572413d42f954c0ca01577f9324a60810dd712a8a36b0b503708d9795a90ffa95ee96b13c082796e276bcbc65094de32ade0f71ff744f6e45869cbbb4d7 +DIST git-htmldocs-2.48.0.tar.xz 1579956 BLAKE2B 012afa8f22ef59e0e96a2c72d04f634d5ac4266e5d0b7eb5e3b51815bbdc30299606eee2a57066b54025a2622ca6ac4e4945348aab10ba0967e52a8f84225ba6 SHA512 3d02d6d64ae174103d266f67e1e0b5251b4427e13ea0b802f1a29211d6134e2adea6aa211d8bf22180ccf29ff2c13e19309021d01acd1954a84bff622d343a27 DIST git-manpages-2.44.2.tar.xz 574316 BLAKE2B ecfca8e05ca682097376ce6a1e8b9de8fcc36472860321987be12291a53d1a92befb950fd856775df65f28300b267b80975775cba046cfb89159887e8cba5516 SHA512 2ad6d922acf46028b3b7dd5a686c0396e5452e4d50b32ba9af0cc51cc3431003524b91279e2a795065a179af3d760ce72530580295ed09a53673274cf9567cc6 DIST git-manpages-2.45.2.tar.xz 576428 BLAKE2B c89ebd25c0caf391fcd29cc8609252daf2cf742a8cc78ce5b64931befb126c951ebb7504bc8ccbee06b81727dc3e4ded67c69adf8d737f4df38dfda758e3c734 SHA512 d39a5c92c1cfcae145713b8ff1a84258947392a3cf1490e3f7d4f87836d05e79dc4fecbff16b7c1bc314572d6d32aa2c29e7fcde993b549b2fab71620734c19b DIST git-manpages-2.46.2.tar.xz 584812 BLAKE2B dd5592a1fd61b6eda0afa4f9292ce86dd14bca6a88016f96c53617f6505f27cc9a2ba9437c6330bb8003b3f57cd1e75bf441bf2a2168554bbda9c26db37db4cb SHA512 ce7a2a1fbb9376182b8ce3ed772fbeeef2cf338bc06bf9bcf3c07a65419e41b3754d6851a44886d0b07dfd82f8eefe7b8b1d9f5c28ed6b6a0ea4168ed457e121 -DIST git-manpages-2.47.0.tar.xz 586352 BLAKE2B 87a1de077672e3246df26d2603221bcd06ed1844bf43a092afb630335a7da62866f497144b97106aec8565fd847010aa20e64ee24a87fc05d3e24884047e9a89 SHA512 898bf91b88910a8046fc4eefc1bfb98910d38db28846e4e04c44664f34723e406566622fd443ff332556545ca90c6519557389b75f159bbaf07044ab0cc83ac5 +DIST git-manpages-2.47.1.tar.xz 586432 BLAKE2B df4eafa03ba235202c361d16fd6db1c6b2a4fea5501f62dcd7b53e3764542a2b70ab44e1525d5f4437dad9505c507ba88aa14b1e8e828713b81cb66b6d9a73c2 SHA512 9acd5207e6c2751ec87708eedc4f060ee6bed0841564f787cd3fd5dbce712c4c2afbb9ce4e85a466fb52a8f399420ca24c7cd4eb8e14edb7ea7a5c06e3c82a5e +DIST git-manpages-2.48.0.tar.xz 590480 BLAKE2B 73e61821d48b524331d8b2bc56047065307cab7b2831cc869cc76d9e3b1da6bdbda8184e14f17cb7bf1efdb26f6dd87682e259b69b597c12fff00ee6a98377c9 SHA512 f9f5844b39361d379e66f68e327bd99693ae4c3f0bb3a85de4c1a36e665771f69afced98fb454d2f6574284c08e1043a75b0af7a774912a2b2ec958994fcc17d diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.47.0-maintenance.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.47.0-maintenance.patch deleted file mode 100644 index 085d4adac3..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.47.0-maintenance.patch +++ /dev/null @@ -1,85 +0,0 @@ -https://lore.kernel.org/git/CAG=Um+0mJW-oAH+YLC3dWEU64JwS-zMkkTiFWYBe4g6HMbe-iA@mail.gmail.com/ -https://github.com/git/git/commit/c95547a394a35dc26afa686454086d2db6e51ea4 - -From c95547a394a35dc26afa686454086d2db6e51ea4 Mon Sep 17 00:00:00 2001 -From: Patrick Steinhardt -Date: Thu, 10 Oct 2024 07:33:01 +0200 -Subject: [PATCH] builtin/gc: fix crash when running `git maintenance start` - -It was reported on the mailing list that running `git maintenance start` -immediately segfaults starting with b6c3f8e12c (builtin/maintenance: fix -leak in `get_schedule_cmd()`, 2024-09-26). And indeed, this segfault is -trivial to reproduce up to a point where one is scratching their head -why we didn't catch this regression in our test suite. - -The root cause of this error is `get_schedule_cmd()`, which does not -populate the `out` parameter in all cases anymore starting with the -mentioned commit. Callers do assume it to always be populated though and -will e.g. call `strvec_split()` on the returned value, which will of -course segfault when the variable is uninitialized. - -So why didn't we catch this trivial regression? The reason is that our -tests always set up the "GIT_TEST_MAINT_SCHEDULER" environment variable -via "t/test-lib.sh", which allows us to override the scheduler command -with a custom one so that we don't accidentally modify the developer's -system. But the faulty code where we don't set the `out` parameter will -only get hit in case that environment variable is _not_ set, which is -never the case when executing our tests. - -Fix the regression by again unconditionally allocating the value in the -`out` parameter, if provided. Add a test that unsets the environment -variable to catch future regressions in this area. - -Reported-by: Shubham Kanodia -Signed-off-by: Patrick Steinhardt -Signed-off-by: Junio C Hamano ---- a/builtin/gc.c -+++ b/builtin/gc.c -@@ -1794,7 +1794,7 @@ static const char *get_frequency(enum schedule_priority schedule) - * | Input | Output | - * | *cmd | return code | *out | *is_available | - * +-------+-------------+-------------------+---------------+ -- * | "foo" | false | NULL | (unchanged) | -+ * | "foo" | false | "foo" (allocated) | (unchanged) | - * +-------+-------------+-------------------+---------------+ - * - * GIT_TEST_MAINT_SCHEDULER set to “foo:./mock_foo.sh,bar:./mock_bar.sh” -@@ -1812,8 +1812,11 @@ static int get_schedule_cmd(const char *cmd, int *is_available, char **out) - struct string_list_item *item; - struct string_list list = STRING_LIST_INIT_NODUP; - -- if (!testing) -+ if (!testing) { -+ if (out) -+ *out = xstrdup(cmd); - return 0; -+ } - - if (is_available) - *is_available = 0; ---- a/t/t7900-maintenance.sh -+++ b/t/t7900-maintenance.sh -@@ -646,6 +646,22 @@ test_expect_success !MINGW 'register and unregister with regex metacharacters' ' - maintenance.repo "$(pwd)/$META" - ' - -+test_expect_success 'start without GIT_TEST_MAINT_SCHEDULER' ' -+ test_when_finished "rm -rf systemctl.log script repo" && -+ mkdir script && -+ write_script script/systemctl <<-\EOF && -+ echo "$*" >>../systemctl.log -+ EOF -+ git init repo && -+ ( -+ cd repo && -+ sane_unset GIT_TEST_MAINT_SCHEDULER && -+ PATH="$PWD/../script:$PATH" git maintenance start --scheduler=systemd -+ ) && -+ test_grep -- "--user list-timers" systemctl.log && -+ test_grep -- "enable --now git-maintenance@" systemctl.log -+' -+ - test_expect_success 'start --scheduler=' ' - test_expect_code 129 git maintenance start --scheduler=foo 2>err && - test_grep "unrecognized --scheduler argument" err && - diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.48.0-doc-deps.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.48.0-doc-deps.patch new file mode 100644 index 0000000000..847e96368f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.48.0-doc-deps.patch @@ -0,0 +1,42 @@ +https://lore.kernel.org/git/79de1bcf31f708960a889066ce3d986e55155ad8.1736577530.git.sam@gentoo.org/ + +From 79de1bcf31f708960a889066ce3d986e55155ad8 Mon Sep 17 00:00:00 2001 +Message-ID: <79de1bcf31f708960a889066ce3d986e55155ad8.1736577546.git.sam@gentoo.org> +From: Sam James +Date: Sat, 11 Jan 2025 06:37:48 +0000 +Subject: [PATCH] meson: fix perl dependencies for Documentation + +We need an explicit `depends: documentation_deps` so that all of our +Documentation targets know they require asciidoc.conf. This shows up +as parallel build failures with it not yet being available. + +Other targets look OK already. + +Signed-off-by: Sam James +--- + Documentation/technical/meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Documentation/technical/meson.build b/Documentation/technical/meson.build +index 21dfb8b5c9..8c93da3566 100644 +--- a/Documentation/technical/meson.build ++++ b/Documentation/technical/meson.build +@@ -42,6 +42,7 @@ api_index = custom_target( + '@OUTPUT@', + ], + env: script_environment, ++ depends: documentation_deps, + input: api_docs, + output: 'api-index.txt', + ) +@@ -60,6 +61,7 @@ foreach article : api_docs + articles + command: asciidoc_html_options, + input: article, + output: fs.stem(article) + '.html', ++ depends: documentation_deps, + install: true, + install_dir: get_option('datadir') / 'doc/git-doc/technical', + ) +-- +2.48.0.rc2 + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch new file mode 100644 index 0000000000..533a8b1080 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.48.0_rc2-meson-deps.patch @@ -0,0 +1,91 @@ +https://lore.kernel.org/git/371571630df201b0b0c680f6437decc6c60ecd3b.1736307757.git.sam@gentoo.org/ + +From 371571630df201b0b0c680f6437decc6c60ecd3b Mon Sep 17 00:00:00 2001 +Message-ID: <371571630df201b0b0c680f6437decc6c60ecd3b.1736307813.git.sam@gentoo.org> +From: Sam James +Date: Wed, 8 Jan 2025 03:40:55 +0000 +Subject: [PATCH] meson: fix perl dependencies + +`generate_perl_command` needs `depends: [git_version_file]` and the uses +in top-level meson.build were fine, but the ones in perl/ weren't, causing +parallel build failures in some cases as GIT-BUILD-OPTIONS wasn't yet +available. + +Signed-off-by: Sam James +--- a/perl/FromCPAN/Mail/meson.build ++++ b/perl/FromCPAN/Mail/meson.build +@@ -4,4 +4,5 @@ test_dependencies += custom_target( + command: generate_perl_command, + install: true, + install_dir: get_option('datadir') / 'perl5/FromCPAN/Mail', ++ depends: [git_version_file], + ) +--- a/perl/FromCPAN/meson.build ++++ b/perl/FromCPAN/meson.build +@@ -4,6 +4,7 @@ test_dependencies += custom_target( + command: generate_perl_command, + install: true, + install_dir: get_option('datadir') / 'perl5/FromCPAN', ++ depends: [git_version_file], + ) + + subdir('Mail') +--- a/perl/Git/LoadCPAN/Mail/meson.build ++++ b/perl/Git/LoadCPAN/Mail/meson.build +@@ -4,4 +4,5 @@ test_dependencies += custom_target( + command: generate_perl_command, + install: true, + install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN/Mail', ++ depends: [git_version_file], + ) +--- a/perl/Git/LoadCPAN/meson.build ++++ b/perl/Git/LoadCPAN/meson.build +@@ -4,6 +4,7 @@ test_dependencies += custom_target( + command: generate_perl_command, + install: true, + install_dir: get_option('datadir') / 'perl5/Git/LoadCPAN', ++ depends: [git_version_file], + ) + + subdir('Mail') +--- a/perl/Git/SVN/Memoize/meson.build ++++ b/perl/Git/SVN/Memoize/meson.build +@@ -4,4 +4,5 @@ test_dependencies += custom_target( + command: generate_perl_command, + install: true, + install_dir: get_option('datadir') / 'perl5/Git/SVN', ++ depends: [git_version_file], + ) +--- a/perl/Git/SVN/meson.build ++++ b/perl/Git/SVN/meson.build +@@ -14,6 +14,7 @@ foreach source : [ + command: generate_perl_command, + install: true, + install_dir: get_option('datadir') / 'perl5/Git/SVN', ++ depends: [git_version_file], + ) + endforeach + +--- a/perl/Git/meson.build ++++ b/perl/Git/meson.build +@@ -11,6 +11,7 @@ foreach source : [ + command: generate_perl_command, + install: true, + install_dir: get_option('datadir') / 'perl5/Git', ++ depends: [git_version_file], + ) + endforeach + +--- a/perl/meson.build ++++ b/perl/meson.build +@@ -4,6 +4,7 @@ test_dependencies += custom_target( + command: generate_perl_command, + install: true, + install_dir: get_option('datadir') / 'perl5', ++ depends: [git_version_file], + ) + + subdir('Git') +-- +2.48.0.rc2.29.g7bab57bd98 + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.47.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.47.1.ebuild similarity index 99% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.47.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.47.1.ebuild index 02512210c1..9701a056aa 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.47.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.47.1.ebuild @@ -149,9 +149,6 @@ PATCHES=( # Make submodule output quiet "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch - - # Backport fix for git-maintenance - "${FILESDIR}"/${P}-maintenance.patch ) pkg_setup() { @@ -327,7 +324,7 @@ git_emake() { src_configure() { # https://lore.kernel.org/git/87ed3apy2u.fsf@gentoo.org/ - append-cflags -std=gnu17 + append-cflags $(test-flags-CC -std=gnu17) exportmakeopts } diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.47.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.48.0-r1.ebuild similarity index 57% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.47.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.48.0-r1.ebuild index 17a8afd1ac..2097a69cfd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.47.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.48.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{10..13} ) -inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 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="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test" +IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd" # Common to both DEPEND and RDEPEND DEPEND=" @@ -122,7 +122,11 @@ BDEPEND=" ) keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) + test? ( + app-arch/unzip + app-crypt/gnupg + dev-lang/perl + ) " # Live ebuild builds man pages and HTML docs, additionally @@ -144,11 +148,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - # Avoid automagic CVS, bug #350330 - "${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch + "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch ) pkg_setup() { @@ -163,72 +163,6 @@ pkg_setup() { fi } -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - - $(usev elibc_musl NO_REGEX=NeedsStartEnd) - $(usev !cvs NO_CVS=YesPlease) - $(usev !iconv NO_ICONV=YesPlease) - $(usev !nls NO_GETTEXT=YesPlease) - $(usev !perforce NO_PYTHON=YesPlease) - $(usev !subversion NO_SVN_TESTS=YesPlease) - $(usev !tk NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # Broken assumptions because of static build system - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # Can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - fi - - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - - if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - myopts+=( ASCIIDOC8=YesPlease ) - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - src_unpack() { if [[ ${PV} != *9999 ]] ; then unpack ${MY_P}.tar.${SRC_URI_SUFFIX} @@ -243,95 +177,63 @@ src_unpack() { fi else git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . || die fi } -src_prepare() { - if ! use safe-directory ; then - # This patch neuters the "safe directory" detection. - # bugs #838271, #838223 - PATCHES+=( - "${FILESDIR}"/git-2.46.2-unsafe-directory.patch +src_configure() { + local emesonargs=( + $(meson_feature curl) + $(meson_feature cgi gitweb) + $(meson_feature webdav expat) + $(meson_feature iconv) + $(meson_feature nls gettext) + $(meson_feature pcre pcre2) + $(meson_feature perl) + $(meson_feature perforce python) + $(meson_use test tests) + -Dperl_cpan_fallback=false + ) + + # For non-live, we use a downloaded docs tarball instead. + if [[ ${PV} == *9999 ]] || use doc ; then + emesonargs+=( + -Ddocs="man$(usev doc ',html')" ) fi - default - - if use prefix ; then - # bug #757309 - 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 \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die + meson_src_configure } git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - local mymakeargs=( - ${MY_MAKEOPTS} - prefix="${EPREFIX}"/usr htmldir="${EPREFIX}"/usr/share/doc/${PF}/html - perllibdir="$(use perl && perl_get_raw_vendorlib)" sysconfdir="${EPREFIX}"/etc + perllibdir="$(use perl && perl_get_raw_vendorlib)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + LDFLAGS="${LDFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" - - # TODO: --verbose? - GIT_TEST_OPTS="--no-color" - OPTAR="$(tc-getAR)" OPTCC="$(tc-getCC)" OPTCFLAGS="${CFLAGS}" OPTLDFLAGS="${LDFLAGS}" - CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config" - CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)" - CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)" - PERL_PATH="${EPREFIX}/usr/bin/perl" PERL_MM_OPT="" - PYTHON_PATH="${PYTHON_PATH}" - V=1 + "$@" ) emake "${mymakeargs[@]}" } -src_configure() { - exportmakeopts -} - src_compile() { - git_emake - - if use perl && use cgi ; then - git_emake gitweb - fi + meson_src_compile if use perl ; then git_emake -C contrib/credential/netrc @@ -341,170 +243,60 @@ src_compile() { git_emake -C contrib/credential/osxkeychain fi - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man - if use doc ; then - git_emake info html - fi - else - if use doc ; then - git_emake info - fi - fi - popd &>/dev/null || die - if use keyring ; then git_emake -C contrib/credential/libsecret fi - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - git_emake -C contrib/diff-highlight - if use mediawiki ; then git_emake -C contrib/mw-to-git fi + + if use tk ; then + git_emake -C gitk-git + fi + + if use doc ; then + # Workaround fragments that still use the Makefile and can't + # find the bits from Meson's out-of-source build + ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die + fi + + git_emake -C contrib/diff-highlight + git_emake -C contrib/subtree git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1 } src_test() { - local disabled=( - # We make safe-directory optional - t0033-safe-directory.sh - ) - - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]] ; then - if [[ ${cvs} -eq 1 ]] ; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then - let cvs=${cvs}+1 - fi - - if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then - let cvs=${cvs}+1 - fi - - if [[ ${cvs} -lt 3 ]] ; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - if [[ -f "${i}" ]] ; then - mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - fi - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc # t0610-reftable-basics.sh uses $A local -x A= - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results + meson_src_test - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!" - - popd &>/dev/null || die - if use perl ; then - emake -C contrib/credential/netrc testverbose - fi + # TODO: Needs help finding built git with meson + #if use perl ; then + # git_emake -C contrib/credential/netrc testverbose + #fi } src_install() { - git_emake DESTDIR="${D}" install + meson_src_install if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi + 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] find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html local d for d in / /howto/ /technical/ ; do @@ -516,8 +308,6 @@ src_install() { fi done docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info newbashcomp contrib/completion/git-completion.bash ${PN} bashcomp_alias git gitk @@ -543,10 +333,6 @@ src_install() { dodoc git-subtree.txt popd &>/dev/null || die - if use mediawiki ; then - git_emake -C contrib/mw-to-git DESTDIR="${D}" install - fi - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -562,9 +348,7 @@ src_install() { dodoc contrib/contacts/git-contacts.txt if use keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die + dobin contrib/credential/libsecret/git-credential-libsecret fi dodir /usr/share/${PN}/contrib @@ -596,7 +380,7 @@ src_install() { cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}" done - if use perl && use cgi ; then + if use cgi ; then # We used to install in /usr/share/${PN}/gitweb # but upstream installs in /usr/share/gitweb # so we will install a symlink and use their location for compat with other @@ -618,9 +402,15 @@ src_install() { fi if use perl ; then - pushd contrib/credential/netrc &>/dev/null || die - dobin git-credential-netrc - popd &>/dev/null || die + dodir "$(perl_get_vendorlib)" + mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die + mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die + + dobin contrib/credential/netrc/git-credential-netrc + fi + + if use mediawiki ; then + git_emake -C contrib/mw-to-git DESTDIR="${D}" install fi if ! use subversion ; then @@ -640,6 +430,10 @@ src_install() { systemd_dounit "${FILESDIR}/git-daemon.socket" fi + if use tk ; then + git_emake -C gitk-git DESTDIR="${D}" install + fi + perl_delete_localpod # Remove disabled linguas diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild index 39ba0bb5ef..2097a69cfd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{10..13} ) -inherit flag-o-matic toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 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="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test" +IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd" # Common to both DEPEND and RDEPEND DEPEND=" @@ -122,7 +122,11 @@ BDEPEND=" ) keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) + test? ( + app-arch/unzip + app-crypt/gnupg + dev-lang/perl + ) " # Live ebuild builds man pages and HTML docs, additionally @@ -144,11 +148,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - # Avoid automagic CVS, bug #350330 - "${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch + "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch ) pkg_setup() { @@ -163,72 +163,6 @@ pkg_setup() { fi } -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - - $(usev elibc_musl NO_REGEX=NeedsStartEnd) - $(usev !cvs NO_CVS=YesPlease) - $(usev !iconv NO_ICONV=YesPlease) - $(usev !nls NO_GETTEXT=YesPlease) - $(usev !perforce NO_PYTHON=YesPlease) - $(usev !subversion NO_SVN_TESTS=YesPlease) - $(usev !tk NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # Broken assumptions because of static build system - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # Can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - fi - - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - - if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - myopts+=( ASCIIDOC8=YesPlease ) - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - src_unpack() { if [[ ${PV} != *9999 ]] ; then unpack ${MY_P}.tar.${SRC_URI_SUFFIX} @@ -243,98 +177,63 @@ src_unpack() { fi else git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . || die fi } -src_prepare() { - if ! use safe-directory ; then - # This patch neuters the "safe directory" detection. - # bugs #838271, #838223 - PATCHES+=( - "${FILESDIR}"/git-2.46.2-unsafe-directory.patch +src_configure() { + local emesonargs=( + $(meson_feature curl) + $(meson_feature cgi gitweb) + $(meson_feature webdav expat) + $(meson_feature iconv) + $(meson_feature nls gettext) + $(meson_feature pcre pcre2) + $(meson_feature perl) + $(meson_feature perforce python) + $(meson_use test tests) + -Dperl_cpan_fallback=false + ) + + # For non-live, we use a downloaded docs tarball instead. + if [[ ${PV} == *9999 ]] || use doc ; then + emesonargs+=( + -Ddocs="man$(usev doc ',html')" ) fi - default - - if use prefix ; then - # bug #757309 - 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 \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die + meson_src_configure } git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - local mymakeargs=( - ${MY_MAKEOPTS} - prefix="${EPREFIX}"/usr htmldir="${EPREFIX}"/usr/share/doc/${PF}/html - perllibdir="$(use perl && perl_get_raw_vendorlib)" sysconfdir="${EPREFIX}"/etc + perllibdir="$(use perl && perl_get_raw_vendorlib)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + LDFLAGS="${LDFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" - - # TODO: --verbose? - GIT_TEST_OPTS="--no-color" - OPTAR="$(tc-getAR)" OPTCC="$(tc-getCC)" OPTCFLAGS="${CFLAGS}" OPTLDFLAGS="${LDFLAGS}" - CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config" - CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)" - CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)" - PERL_PATH="${EPREFIX}/usr/bin/perl" PERL_MM_OPT="" - PYTHON_PATH="${PYTHON_PATH}" - V=1 + "$@" ) emake "${mymakeargs[@]}" } -src_configure() { - # https://lore.kernel.org/git/87ed3apy2u.fsf@gentoo.org/ - append-cflags -std=gnu17 - - exportmakeopts -} - src_compile() { - git_emake - - if use perl && use cgi ; then - git_emake gitweb - fi + meson_src_compile if use perl ; then git_emake -C contrib/credential/netrc @@ -344,170 +243,60 @@ src_compile() { git_emake -C contrib/credential/osxkeychain fi - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man - if use doc ; then - git_emake info html - fi - else - if use doc ; then - git_emake info - fi - fi - popd &>/dev/null || die - if use keyring ; then git_emake -C contrib/credential/libsecret fi - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - git_emake -C contrib/diff-highlight - if use mediawiki ; then git_emake -C contrib/mw-to-git fi + + if use tk ; then + git_emake -C gitk-git + fi + + if use doc ; then + # Workaround fragments that still use the Makefile and can't + # find the bits from Meson's out-of-source build + ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die + fi + + git_emake -C contrib/diff-highlight + git_emake -C contrib/subtree git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1 } src_test() { - local disabled=( - # We make safe-directory optional - t0033-safe-directory.sh - ) - - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]] ; then - if [[ ${cvs} -eq 1 ]] ; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then - let cvs=${cvs}+1 - fi - - if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then - let cvs=${cvs}+1 - fi - - if [[ ${cvs} -lt 3 ]] ; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - if [[ -f "${i}" ]] ; then - mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - fi - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc # t0610-reftable-basics.sh uses $A local -x A= - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results + meson_src_test - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!" - - popd &>/dev/null || die - if use perl ; then - emake -C contrib/credential/netrc testverbose - fi + # TODO: Needs help finding built git with meson + #if use perl ; then + # git_emake -C contrib/credential/netrc testverbose + #fi } src_install() { - git_emake DESTDIR="${D}" install + meson_src_install if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi + 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] find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html local d for d in / /howto/ /technical/ ; do @@ -519,8 +308,6 @@ src_install() { fi done docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info newbashcomp contrib/completion/git-completion.bash ${PN} bashcomp_alias git gitk @@ -546,10 +333,6 @@ src_install() { dodoc git-subtree.txt popd &>/dev/null || die - if use mediawiki ; then - git_emake -C contrib/mw-to-git DESTDIR="${D}" install - fi - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -565,9 +348,7 @@ src_install() { dodoc contrib/contacts/git-contacts.txt if use keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die + dobin contrib/credential/libsecret/git-credential-libsecret fi dodir /usr/share/${PN}/contrib @@ -599,7 +380,7 @@ src_install() { cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}" done - if use perl && use cgi ; then + if use cgi ; then # We used to install in /usr/share/${PN}/gitweb # but upstream installs in /usr/share/gitweb # so we will install a symlink and use their location for compat with other @@ -621,9 +402,15 @@ src_install() { fi if use perl ; then - pushd contrib/credential/netrc &>/dev/null || die - dobin git-credential-netrc - popd &>/dev/null || die + dodir "$(perl_get_vendorlib)" + mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die + mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die + + dobin contrib/credential/netrc/git-credential-netrc + fi + + if use mediawiki ; then + git_emake -C contrib/mw-to-git DESTDIR="${D}" install fi if ! use subversion ; then @@ -643,6 +430,10 @@ src_install() { systemd_dounit "${FILESDIR}/git-daemon.socket" fi + if use tk ; then + git_emake -C gitk-git DESTDIR="${D}" install + fi + perl_delete_localpod # Remove disabled linguas diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild index 39ba0bb5ef..2097a69cfd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{10..13} ) -inherit flag-o-matic toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 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="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test" +IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd" # Common to both DEPEND and RDEPEND DEPEND=" @@ -122,7 +122,11 @@ BDEPEND=" ) keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) + test? ( + app-arch/unzip + app-crypt/gnupg + dev-lang/perl + ) " # Live ebuild builds man pages and HTML docs, additionally @@ -144,11 +148,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - # Avoid automagic CVS, bug #350330 - "${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch + "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch ) pkg_setup() { @@ -163,72 +163,6 @@ pkg_setup() { fi } -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - - $(usev elibc_musl NO_REGEX=NeedsStartEnd) - $(usev !cvs NO_CVS=YesPlease) - $(usev !iconv NO_ICONV=YesPlease) - $(usev !nls NO_GETTEXT=YesPlease) - $(usev !perforce NO_PYTHON=YesPlease) - $(usev !subversion NO_SVN_TESTS=YesPlease) - $(usev !tk NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # Broken assumptions because of static build system - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # Can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - fi - - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - - if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - myopts+=( ASCIIDOC8=YesPlease ) - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - src_unpack() { if [[ ${PV} != *9999 ]] ; then unpack ${MY_P}.tar.${SRC_URI_SUFFIX} @@ -243,98 +177,63 @@ src_unpack() { fi else git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . || die fi } -src_prepare() { - if ! use safe-directory ; then - # This patch neuters the "safe directory" detection. - # bugs #838271, #838223 - PATCHES+=( - "${FILESDIR}"/git-2.46.2-unsafe-directory.patch +src_configure() { + local emesonargs=( + $(meson_feature curl) + $(meson_feature cgi gitweb) + $(meson_feature webdav expat) + $(meson_feature iconv) + $(meson_feature nls gettext) + $(meson_feature pcre pcre2) + $(meson_feature perl) + $(meson_feature perforce python) + $(meson_use test tests) + -Dperl_cpan_fallback=false + ) + + # For non-live, we use a downloaded docs tarball instead. + if [[ ${PV} == *9999 ]] || use doc ; then + emesonargs+=( + -Ddocs="man$(usev doc ',html')" ) fi - default - - if use prefix ; then - # bug #757309 - 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 \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die + meson_src_configure } git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - local mymakeargs=( - ${MY_MAKEOPTS} - prefix="${EPREFIX}"/usr htmldir="${EPREFIX}"/usr/share/doc/${PF}/html - perllibdir="$(use perl && perl_get_raw_vendorlib)" sysconfdir="${EPREFIX}"/etc + perllibdir="$(use perl && perl_get_raw_vendorlib)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + LDFLAGS="${LDFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" - - # TODO: --verbose? - GIT_TEST_OPTS="--no-color" - OPTAR="$(tc-getAR)" OPTCC="$(tc-getCC)" OPTCFLAGS="${CFLAGS}" OPTLDFLAGS="${LDFLAGS}" - CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config" - CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)" - CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)" - PERL_PATH="${EPREFIX}/usr/bin/perl" PERL_MM_OPT="" - PYTHON_PATH="${PYTHON_PATH}" - V=1 + "$@" ) emake "${mymakeargs[@]}" } -src_configure() { - # https://lore.kernel.org/git/87ed3apy2u.fsf@gentoo.org/ - append-cflags -std=gnu17 - - exportmakeopts -} - src_compile() { - git_emake - - if use perl && use cgi ; then - git_emake gitweb - fi + meson_src_compile if use perl ; then git_emake -C contrib/credential/netrc @@ -344,170 +243,60 @@ src_compile() { git_emake -C contrib/credential/osxkeychain fi - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man - if use doc ; then - git_emake info html - fi - else - if use doc ; then - git_emake info - fi - fi - popd &>/dev/null || die - if use keyring ; then git_emake -C contrib/credential/libsecret fi - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - git_emake -C contrib/diff-highlight - if use mediawiki ; then git_emake -C contrib/mw-to-git fi + + if use tk ; then + git_emake -C gitk-git + fi + + if use doc ; then + # Workaround fragments that still use the Makefile and can't + # find the bits from Meson's out-of-source build + ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die + fi + + git_emake -C contrib/diff-highlight + git_emake -C contrib/subtree git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1 } src_test() { - local disabled=( - # We make safe-directory optional - t0033-safe-directory.sh - ) - - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]] ; then - if [[ ${cvs} -eq 1 ]] ; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then - let cvs=${cvs}+1 - fi - - if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then - let cvs=${cvs}+1 - fi - - if [[ ${cvs} -lt 3 ]] ; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - if [[ -f "${i}" ]] ; then - mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - fi - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc # t0610-reftable-basics.sh uses $A local -x A= - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results + meson_src_test - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!" - - popd &>/dev/null || die - if use perl ; then - emake -C contrib/credential/netrc testverbose - fi + # TODO: Needs help finding built git with meson + #if use perl ; then + # git_emake -C contrib/credential/netrc testverbose + #fi } src_install() { - git_emake DESTDIR="${D}" install + meson_src_install if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi + 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] find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html local d for d in / /howto/ /technical/ ; do @@ -519,8 +308,6 @@ src_install() { fi done docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info newbashcomp contrib/completion/git-completion.bash ${PN} bashcomp_alias git gitk @@ -546,10 +333,6 @@ src_install() { dodoc git-subtree.txt popd &>/dev/null || die - if use mediawiki ; then - git_emake -C contrib/mw-to-git DESTDIR="${D}" install - fi - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -565,9 +348,7 @@ src_install() { dodoc contrib/contacts/git-contacts.txt if use keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die + dobin contrib/credential/libsecret/git-credential-libsecret fi dodir /usr/share/${PN}/contrib @@ -599,7 +380,7 @@ src_install() { cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}" done - if use perl && use cgi ; then + if use cgi ; then # We used to install in /usr/share/${PN}/gitweb # but upstream installs in /usr/share/gitweb # so we will install a symlink and use their location for compat with other @@ -621,9 +402,15 @@ src_install() { fi if use perl ; then - pushd contrib/credential/netrc &>/dev/null || die - dobin git-credential-netrc - popd &>/dev/null || die + dodir "$(perl_get_vendorlib)" + mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die + mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die + + dobin contrib/credential/netrc/git-credential-netrc + fi + + if use mediawiki ; then + git_emake -C contrib/mw-to-git DESTDIR="${D}" install fi if ! use subversion ; then @@ -643,6 +430,10 @@ src_install() { systemd_dounit "${FILESDIR}/git-daemon.socket" fi + if use tk ; then + git_emake -C gitk-git DESTDIR="${D}" install + fi + perl_delete_localpod # Remove disabled linguas diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild index 39ba0bb5ef..2097a69cfd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{10..13} ) -inherit flag-o-matic toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 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="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test" +IUSE="+curl cgi cvs doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion test tk +webdav xinetd" # Common to both DEPEND and RDEPEND DEPEND=" @@ -122,7 +122,11 @@ BDEPEND=" ) keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg ) + test? ( + app-arch/unzip + app-crypt/gnupg + dev-lang/perl + ) " # Live ebuild builds man pages and HTML docs, additionally @@ -144,11 +148,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - # Avoid automagic CVS, bug #350330 - "${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch - - # Make submodule output quiet - "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch + "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch ) pkg_setup() { @@ -163,72 +163,6 @@ pkg_setup() { fi } -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local extlibs myopts - - myopts=( - ASCIIDOC_NO_ROFF=YesPlease - - $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - - $(usev elibc_musl NO_REGEX=NeedsStartEnd) - $(usev !cvs NO_CVS=YesPlease) - $(usev !iconv NO_ICONV=YesPlease) - $(usev !nls NO_GETTEXT=YesPlease) - $(usev !perforce NO_PYTHON=YesPlease) - $(usev !subversion NO_SVN_TESTS=YesPlease) - $(usev !tk NO_TCLTK=YesPlease) - ) - - if use blksha1 ; then - myopts+=( BLK_SHA1=YesPlease ) - fi - - if use curl ; then - use webdav || myopts+=( NO_EXPAT=YesPlease ) - else - myopts+=( NO_CURL=YesPlease ) - fi - - # Broken assumptions because of static build system - myopts+=( - NO_FINK=YesPlease - NO_DARWIN_PORTS=YesPlease - INSTALL=install - TAR=tar - SHELL_PATH="${EPREFIX}/bin/sh" - SANE_TOOL_PATH= - OLD_ICONV= - NO_EXTERNAL_GREP= - ) - - # Can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die - - if use pcre; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - fi - - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=( - NEEDS_LIBICONV=YesPlease - HAVE_CLOCK_MONOTONIC=1 - ) - - if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then - myopts+=( HAVE_GETDELIM=1 ) - fi - fi - - myopts+=( ASCIIDOC8=YesPlease ) - - export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs[@]}" -} - src_unpack() { if [[ ${PV} != *9999 ]] ; then unpack ${MY_P}.tar.${SRC_URI_SUFFIX} @@ -243,98 +177,63 @@ src_unpack() { fi else git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . || die fi } -src_prepare() { - if ! use safe-directory ; then - # This patch neuters the "safe directory" detection. - # bugs #838271, #838223 - PATCHES+=( - "${FILESDIR}"/git-2.46.2-unsafe-directory.patch +src_configure() { + local emesonargs=( + $(meson_feature curl) + $(meson_feature cgi gitweb) + $(meson_feature webdav expat) + $(meson_feature iconv) + $(meson_feature nls gettext) + $(meson_feature pcre pcre2) + $(meson_feature perl) + $(meson_feature perforce python) + $(meson_use test tests) + -Dperl_cpan_fallback=false + ) + + # For non-live, we use a downloaded docs tarball instead. + if [[ ${PV} == *9999 ]] || use doc ; then + emesonargs+=( + -Ddocs="man$(usev doc ',html')" ) fi - default - - if use prefix ; then - # bug #757309 - 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 \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die + meson_src_configure } git_emake() { - # bug #320647: PYTHON_PATH - local PYTHON_PATH="" - use perforce && PYTHON_PATH="${PYTHON}" - local mymakeargs=( - ${MY_MAKEOPTS} - prefix="${EPREFIX}"/usr htmldir="${EPREFIX}"/usr/share/doc/${PF}/html - perllibdir="$(use perl && perl_get_raw_vendorlib)" sysconfdir="${EPREFIX}"/etc + perllibdir="$(use perl && perl_get_raw_vendorlib)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + LDFLAGS="${LDFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)" - - # TODO: --verbose? - GIT_TEST_OPTS="--no-color" - OPTAR="$(tc-getAR)" OPTCC="$(tc-getCC)" OPTCFLAGS="${CFLAGS}" OPTLDFLAGS="${LDFLAGS}" - CURL_CONFIG="${ESYSROOT}/usr/bin/curl-config" - CURL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libcurl)" - CURL_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libcurl)" - PERL_PATH="${EPREFIX}/usr/bin/perl" PERL_MM_OPT="" - PYTHON_PATH="${PYTHON_PATH}" - V=1 + "$@" ) emake "${mymakeargs[@]}" } -src_configure() { - # https://lore.kernel.org/git/87ed3apy2u.fsf@gentoo.org/ - append-cflags -std=gnu17 - - exportmakeopts -} - src_compile() { - git_emake - - if use perl && use cgi ; then - git_emake gitweb - fi + meson_src_compile if use perl ; then git_emake -C contrib/credential/netrc @@ -344,170 +243,60 @@ src_compile() { git_emake -C contrib/credential/osxkeychain fi - pushd Documentation &>/dev/null || die - if [[ ${PV} == *9999 ]] ; then - git_emake man - if use doc ; then - git_emake info html - fi - else - if use doc ; then - git_emake info - fi - fi - popd &>/dev/null || die - if use keyring ; then git_emake -C contrib/credential/libsecret fi - pushd contrib/subtree &>/dev/null || die - git_emake git-subtree - # git-subtree.1 requires the full USE=doc dependency stack - use doc && git_emake git-subtree.html git-subtree.1 - popd &>/dev/null || die - - git_emake -C contrib/diff-highlight - if use mediawiki ; then git_emake -C contrib/mw-to-git fi + + if use tk ; then + git_emake -C gitk-git + fi + + if use doc ; then + # Workaround fragments that still use the Makefile and can't + # find the bits from Meson's out-of-source build + ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die + fi + + git_emake -C contrib/diff-highlight + git_emake -C contrib/subtree git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1 } src_test() { - local disabled=( - # We make safe-directory optional - t0033-safe-directory.sh - ) - - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]] ; then - if [[ ${cvs} -eq 1 ]] ; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then - let cvs=${cvs}+1 - fi - - if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then - let cvs=${cvs}+1 - fi - - if [[ ${cvs} -lt 3 ]] ; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - if [[ -f "${i}" ]] ; then - mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - fi - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc # t0610-reftable-basics.sh uses $A local -x A= - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results + meson_src_test - # And bail if there was a problem - [[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!" - - popd &>/dev/null || die - if use perl ; then - emake -C contrib/credential/netrc testverbose - fi + # TODO: Needs help finding built git with meson + #if use perl ; then + # git_emake -C contrib/credential/netrc testverbose + #fi } src_install() { - git_emake DESTDIR="${D}" install + meson_src_install if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi + 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] find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html local d for d in / /howto/ /technical/ ; do @@ -519,8 +308,6 @@ src_install() { fi done docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info newbashcomp contrib/completion/git-completion.bash ${PN} bashcomp_alias git gitk @@ -546,10 +333,6 @@ src_install() { dodoc git-subtree.txt popd &>/dev/null || die - if use mediawiki ; then - git_emake -C contrib/mw-to-git DESTDIR="${D}" install - fi - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -565,9 +348,7 @@ src_install() { dodoc contrib/contacts/git-contacts.txt if use keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - dobin git-credential-libsecret - popd &>/dev/null || die + dobin contrib/credential/libsecret/git-credential-libsecret fi dodir /usr/share/${PN}/contrib @@ -599,7 +380,7 @@ src_install() { cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}" done - if use perl && use cgi ; then + if use cgi ; then # We used to install in /usr/share/${PN}/gitweb # but upstream installs in /usr/share/gitweb # so we will install a symlink and use their location for compat with other @@ -621,9 +402,15 @@ src_install() { fi if use perl ; then - pushd contrib/credential/netrc &>/dev/null || die - dobin git-credential-netrc - popd &>/dev/null || die + dodir "$(perl_get_vendorlib)" + mv "${ED}"/usr/share/perl5/Git.pm "${ED}/$(perl_get_vendorlib)" || die + mv "${ED}"/usr/share/perl5/Git "${ED}/$(perl_get_vendorlib)" || die + + dobin contrib/credential/netrc/git-credential-netrc + fi + + if use mediawiki ; then + git_emake -C contrib/mw-to-git DESTDIR="${D}" install fi if ! use subversion ; then @@ -643,6 +430,10 @@ src_install() { systemd_dounit "${FILESDIR}/git-daemon.socket" fi + if use tk ; then + git_emake -C gitk-git DESTDIR="${D}" install + fi + perl_delete_localpod # Remove disabled linguas diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild index 39ba0bb5ef..17a8afd1ac 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{10..13} ) -inherit flag-o-matic toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" @@ -323,9 +323,6 @@ git_emake() { } src_configure() { - # https://lore.kernel.org/git/87ed3apy2u.fsf@gentoo.org/ - append-cflags -std=gnu17 - exportmakeopts }