summaryrefslogtreecommitdiff
path: root/dev-vcs/git
diff options
context:
space:
mode:
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/Manifest12
-rw-r--r--dev-vcs/git/files/git-2.49.0-diff-implement-config.diff.renames-copies-harder.patch160
-rw-r--r--dev-vcs/git/git-2.49.0-r1.ebuild4
-rw-r--r--dev-vcs/git/git-2.49.0-r2.ebuild496
-rw-r--r--dev-vcs/git/git-9999-r1.ebuild9
-rw-r--r--dev-vcs/git/git-9999-r2.ebuild9
-rw-r--r--dev-vcs/git/git-9999-r3.ebuild9
-rw-r--r--dev-vcs/git/git-9999.ebuild9
8 files changed, 698 insertions, 10 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index de1a66f5b4f9..cfb8b034df6f 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -6,6 +6,7 @@ AUX git-2.48.0-doc-deps.patch 1431 BLAKE2B df7168b1098748ba0ae8e73f77b3dd3398478
AUX git-2.48.1-docs.patch 1770 BLAKE2B e4aab0bf066cac536a7cd41398f041d8a55541b07c72df9f829d2c75b736bd0ae03ad2cf7e0dfffc088244244034a2b8f1453fa9df45f4f7a004ed85d5c6c5b0 SHA512 591daebc8a0c8afe34abd9242284984497d761dd6ce5492080746a0283ab286caa55df56e3e7d41d6a0c21f3422eb2d908ad1e0adf7a26b4742f4994f31af312
AUX git-2.48.1-macos-no-fsmonitor.patch 1328 BLAKE2B 3d126f9462d8ac7544c3c0780dba78cdd01dd95e286ee5dfe5dfbf8d3ba02aeb404bea0e2462f5de6270145a335d0f6cc2616eb7f9ffba49bafce0b3bd69a20d SHA512 70f9b98b89b5253211d32b0c1ba5826dbd2bcd4ce8d0315ff8404cb6361b09e8289eeafd6ed2c5798ca9b2cfea555114c7179716c76ed970de2664cb6ee19940
AUX git-2.48.1-parallel-build.patch 2869 BLAKE2B d159e1f81b44904b0a0aef8597026eb3ebd2d33b0bfc04145ae132619b3a3f856583f4e2a7e043adaf9daaf97a051cea5e3259d1b1c517c4807b71fe15553889 SHA512 c206756c19fc22832a20e869aa919a4d968275fc3a5e67e671cb5c4707a06958ddcc664ae1d630ac49a70562c04e60bd80a1f8748fbf24672e4b2e5a2b0c900a
+AUX git-2.49.0-diff-implement-config.diff.renames-copies-harder.patch 6500 BLAKE2B a38b45d87a483e7a8761f89c70987397bc22ac85a9b6598d047e0ad3d948727809c2fe2c1fa65ecc0d01753e31a62a006a1021abc855e9d1157257c392fcf760 SHA512 39831d55258f986efbe6b32a4b682cc87da52dc11d318a846d943e6a5d73763a77952331eda6435d18fafc9d5c58d7e02033c47b6b09237191b15c7c18c117a9
AUX git-2.49.0-docs.patch 1789 BLAKE2B 8677f0aa3e3434579303d868ba6b34b1d1e8a9f6672157d613f1039b605c326ec0996cc11a48204288be518e280e6d3e94d9b0482c07803a668b65042facdd7d SHA512 44e7e8d51f8556d4d571d1e036a554772fb8672866211d10b1484916a55eb4b86779006986e4ab7542f0ae3f2c970a4480ff92285fe64addf12f8f5e315a5852
AUX git-2.49.0-meson-use-test_environment-conditionally.patch 2178 BLAKE2B e7f6441216c0abd78b602aceb31472c29ef7eeec9cb97ca8b5d6562266a0f733dbaadd9ee9710db5e1903deff5f01c83dd1d7fb3f57b5b41e5f25587b3fd3016 SHA512 1353feff339f51721d7fa265e1b0ebbc8ab3da5bb942a3052841ecb93e8b0d901523b8e36c533f4843d50897cc10ac9d325d2d324c83a8e524e2cfc698f8539b
AUX git-daemon-r2.initd 378 BLAKE2B 1e4e553f550ee1cb428bec21dbaeede12daa87ef89664bfed0ab7c1ec15d32cf738f7adde23db7f76e9a7a2aeadc132affa3c42709e2ed789745240f8f72096b SHA512 a78043543e540a814eb1d1c76fbde7fd5cbc9f6dbe7486bc21a0cbb24a613f7a8661acb5460df474a7a0c5284b61bc9e700fa384163db6fc423645f699cc119a
@@ -24,9 +25,10 @@ DIST git-manpages-2.48.1.tar.xz 590608 BLAKE2B 54ff646cd1d5ce93e8e37eef4682e81a1
DIST git-manpages-2.49.0.tar.xz 594760 BLAKE2B c5a1810e1369cc94c93716db5baf9d217e9c47c824cab8e978128ff7e8fe38119b64dd43fe4186e561f2b230d9e82ec254da0080b9a568dc31ae7ea73e46d612 SHA512 6347bf0d580634c3c78ff93578e088b31ccd5ebd844678a1255f82c5ceb1a301829701daf4212d8ca0f508fcd03cfef52b727a11f1c6d37346adbd709d0b041a
EBUILD git-2.45.3.ebuild 16448 BLAKE2B 849adc38c76ee0dba0523cad77db4a06b74b891815555578dff3a40db29b91a17f2cdd6e0727cbf842781bb3f5c215cf880f7949f157fc2f9dfbd13afc2768b9 SHA512 f1ebde7f07478fd40aedc5eca9826e1fc4684f1f808dbd29e2cbdd620df130646a5acf5f54cf160b92bb4aa1fe31afddde3101814ebb9c4a5505021806f1d23b
EBUILD git-2.48.1.ebuild 12109 BLAKE2B 6e541a886a1d207fe32a60c7b8288befe5c6ed5b5c3bcdf415f318492de33f473aabbc8c49b098bca0128fd5b836a1f65e23b6a4f52ff158c1cea71710bb1884 SHA512 3730d732e1064cfb57e1236ce70c3d7acdf1f895f43b8b8c7c77ce6e3c7611598ed04e8e3d3a616b41c07b99dd6b32e3230560bad01ab91c1a85b27423a58b30
-EBUILD git-2.49.0-r1.ebuild 12090 BLAKE2B cf2d2cfebd7507b9957c59ced7a85fef87856f93e9f70a13e215b69ba431e41f66f27115f531c69deed3c883d1c83b3957bd59c57ae9fb15774e9ac3cf535d51 SHA512 0ed6213adbef0f1c00d7103321793814946dd7f284280318f713214e7af8d1d67acfbfcc6b849f0b750b9ef11719103f5c80054db08dcedcc58a96f5d254d40a
-EBUILD git-9999-r1.ebuild 12051 BLAKE2B 01fb23f531a8df4390dd470e1be5d708d72eb195f74da5f6035f94203a7b282f19f18a6dd43c098c5bc92f48e5eae774b3aabae76294451f539c50989e2c0190 SHA512 cb896a6a45636f5e8fa6f3f24fd9a0a871bb1697058f6ce324a6d24d9ef7e04e6aa3372fe3524e144394ca5ce1d752e62565c1e506d2b52551c0788117c40f2b
-EBUILD git-9999-r2.ebuild 12051 BLAKE2B 01fb23f531a8df4390dd470e1be5d708d72eb195f74da5f6035f94203a7b282f19f18a6dd43c098c5bc92f48e5eae774b3aabae76294451f539c50989e2c0190 SHA512 cb896a6a45636f5e8fa6f3f24fd9a0a871bb1697058f6ce324a6d24d9ef7e04e6aa3372fe3524e144394ca5ce1d752e62565c1e506d2b52551c0788117c40f2b
-EBUILD git-9999-r3.ebuild 12051 BLAKE2B 01fb23f531a8df4390dd470e1be5d708d72eb195f74da5f6035f94203a7b282f19f18a6dd43c098c5bc92f48e5eae774b3aabae76294451f539c50989e2c0190 SHA512 cb896a6a45636f5e8fa6f3f24fd9a0a871bb1697058f6ce324a6d24d9ef7e04e6aa3372fe3524e144394ca5ce1d752e62565c1e506d2b52551c0788117c40f2b
-EBUILD git-9999.ebuild 12051 BLAKE2B 01fb23f531a8df4390dd470e1be5d708d72eb195f74da5f6035f94203a7b282f19f18a6dd43c098c5bc92f48e5eae774b3aabae76294451f539c50989e2c0190 SHA512 cb896a6a45636f5e8fa6f3f24fd9a0a871bb1697058f6ce324a6d24d9ef7e04e6aa3372fe3524e144394ca5ce1d752e62565c1e506d2b52551c0788117c40f2b
+EBUILD git-2.49.0-r1.ebuild 12027 BLAKE2B 9cab226cd6a7c5f50a0dd25aa444b630d853854ebe20549da8127133a0759c76cbd1d89ddc390459a9c4242ca989416d09ba7df706f7e131c8d2f2050cf69217 SHA512 601bb3c85dcc65a22be796221a178fbd768b7a0e629e0ef0e06eed9842e136a3584faa22409be7399386cf0b07e1a9501d2034f361e9dfd01aad6216e51ff2fd
+EBUILD git-2.49.0-r2.ebuild 12264 BLAKE2B b7b5de5c09ba21eab2f270f4fc9a7f28b0e5b921e15cf1b4515f8ce6a1f15cdda3b3b50d342f4c558c7ea53528b6146e69d7fb465606e2e69c864655ecebf7bf SHA512 032ebeea901a01e32bbfaf0141abe26f119d4983cb83c19b219e59a9ae315d540adb6e9ab3d1b6228ae85a1280c9a4f8bcdd257148b6b32fa2effbbf559342bb
+EBUILD git-9999-r1.ebuild 12264 BLAKE2B b7b5de5c09ba21eab2f270f4fc9a7f28b0e5b921e15cf1b4515f8ce6a1f15cdda3b3b50d342f4c558c7ea53528b6146e69d7fb465606e2e69c864655ecebf7bf SHA512 032ebeea901a01e32bbfaf0141abe26f119d4983cb83c19b219e59a9ae315d540adb6e9ab3d1b6228ae85a1280c9a4f8bcdd257148b6b32fa2effbbf559342bb
+EBUILD git-9999-r2.ebuild 12264 BLAKE2B b7b5de5c09ba21eab2f270f4fc9a7f28b0e5b921e15cf1b4515f8ce6a1f15cdda3b3b50d342f4c558c7ea53528b6146e69d7fb465606e2e69c864655ecebf7bf SHA512 032ebeea901a01e32bbfaf0141abe26f119d4983cb83c19b219e59a9ae315d540adb6e9ab3d1b6228ae85a1280c9a4f8bcdd257148b6b32fa2effbbf559342bb
+EBUILD git-9999-r3.ebuild 12264 BLAKE2B b7b5de5c09ba21eab2f270f4fc9a7f28b0e5b921e15cf1b4515f8ce6a1f15cdda3b3b50d342f4c558c7ea53528b6146e69d7fb465606e2e69c864655ecebf7bf SHA512 032ebeea901a01e32bbfaf0141abe26f119d4983cb83c19b219e59a9ae315d540adb6e9ab3d1b6228ae85a1280c9a4f8bcdd257148b6b32fa2effbbf559342bb
+EBUILD git-9999.ebuild 12264 BLAKE2B b7b5de5c09ba21eab2f270f4fc9a7f28b0e5b921e15cf1b4515f8ce6a1f15cdda3b3b50d342f4c558c7ea53528b6146e69d7fb465606e2e69c864655ecebf7bf SHA512 032ebeea901a01e32bbfaf0141abe26f119d4983cb83c19b219e59a9ae315d540adb6e9ab3d1b6228ae85a1280c9a4f8bcdd257148b6b32fa2effbbf559342bb
MISC metadata.xml 2041 BLAKE2B 309964a6982f6f14cecc40b4021d96d2e28c49789480bc4037879375cb5277c2eb500ff36800657e783c36f541265db20b464fc39ce2ac39ff4cda881854662f SHA512 a8dd2f76985690cded8555a0b82e5004b4d93ccc45988fdc04ef8ed3e17ef73d2b83dc9fb6b913e5f9d2b78ebe715e9eb32bfce607318d0e8c0834987eabe5b6
diff --git a/dev-vcs/git/files/git-2.49.0-diff-implement-config.diff.renames-copies-harder.patch b/dev-vcs/git/files/git-2.49.0-diff-implement-config.diff.renames-copies-harder.patch
new file mode 100644
index 000000000000..27159f71ffa2
--- /dev/null
+++ b/dev-vcs/git/files/git-2.49.0-diff-implement-config.diff.renames-copies-harder.patch
@@ -0,0 +1,160 @@
+https://lore.kernel.org/git/20240311213928.1872437-1-sam@gentoo.org/
+
+From dd8ed5e247032dc94f9b92aaa8be987154f58c27 Mon Sep 17 00:00:00 2001
+Message-ID: <dd8ed5e247032dc94f9b92aaa8be987154f58c27.1741976834.git.sam@gentoo.org>
+From: Sam James <sam@gentoo.org>
+Date: Fri, 16 Feb 2024 22:07:54 +0000
+Subject: [PATCH 1/2] diff: implement config.diff.renames=copies-harder
+
+This patch adds a config value for 'diff.renames' called 'copies-harder'
+which make it so '-C -C' is in effect always passed for 'git log -p',
+'git diff', etc.
+
+This allows specifying that 'git log -p', 'git diff', etc should always act
+as if '-C --find-copies-harder' was passed.
+
+It has proven this especially useful for certain types of repository (like
+Gentoo's ebuild repositories) because files are often copies of a previous
+version:
+
+Suppose a directory 'sys-devel/gcc' contains recipes for building
+GCC, with one file for each supported upstream branch:
+ gcc-13.x.build.recipe
+ gcc-12.x.build.recipe
+ gcc-11.x.build.recipe
+ gcc-10.x.build.recipe
+
+gcc-13.x.build.recipe was started as a copy of gcc-12.x.build.recipe
+(which was started as a copy of gcc-11.x.build.recipe, etc.). Previous versions
+are kept around to support parallel installation of multiple versions.
+
+Being able to easily observe the diff relative to other recipes within the
+directory has been a quality of life improvement for such repo layouts.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ Documentation/config/status.adoc | 4 +++-
+ diff.c | 11 +++++++++--
+ diff.h | 1 +
+ diffcore-rename.c | 6 ++++--
+ merge-ort.c | 2 +-
+ merge-recursive.c | 2 +-
+ 7 files changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/Documentation/config/status.adoc b/Documentation/config/status.adoc
+index 8caf90f51c..e15add32a3 100644
+--- a/Documentation/config/status.adoc
++++ b/Documentation/config/status.adoc
+@@ -33,7 +33,9 @@ status.renames::
+ Whether and how Git detects renames in linkgit:git-status[1] and
+ linkgit:git-commit[1] . If set to "false", rename detection is
+ disabled. If set to "true", basic rename detection is enabled.
+- If set to "copies" or "copy", Git will detect copies, as well.
++ If set to "copies" or "copy", Git will detect copies, as well. If set
++ to "copies-harder", Git will spend extra cycles to find more copies even
++ in unmodified paths, see '--find-copies-harder' in linkgit:git-diff[1] (Gentoo patch).
+ Defaults to the value of diff.renames.
+
+ status.showStash::
+diff --git a/diff.c b/diff.c
+index c89c15d98e..743a504f6f 100644
+--- a/diff.c
++++ b/diff.c
+@@ -212,6 +212,8 @@ int git_config_rename(const char *var, const char *value)
+ {
+ if (!value)
+ return DIFF_DETECT_RENAME;
++ if (!strcasecmp(value, "copies-harder"))
++ return DIFF_DETECT_COPY_HARDER;
+ if (!strcasecmp(value, "copies") || !strcasecmp(value, "copy"))
+ return DIFF_DETECT_COPY;
+ return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0;
+@@ -4900,8 +4902,12 @@ void diff_setup_done(struct diff_options *options)
+ else
+ options->flags.diff_from_contents = 0;
+
+- if (options->flags.find_copies_harder)
++ /* Just fold this in as it makes the patch-to-git smaller */
++ if (options->flags.find_copies_harder ||
++ options->detect_rename == DIFF_DETECT_COPY_HARDER) {
++ options->flags.find_copies_harder = 1;
+ options->detect_rename = DIFF_DETECT_COPY;
++ }
+
+ if (!options->flags.relative_name)
+ options->prefix = NULL;
+@@ -5340,7 +5346,8 @@ static int diff_opt_find_copies(const struct option *opt,
+ if (*arg != 0)
+ return error(_("invalid argument to %s"), opt->long_name);
+
+- if (options->detect_rename == DIFF_DETECT_COPY)
++ if (options->detect_rename == DIFF_DETECT_COPY ||
++ options->detect_rename == DIFF_DETECT_COPY_HARDER)
+ options->flags.find_copies_harder = 1;
+ else
+ options->detect_rename = DIFF_DETECT_COPY;
+diff --git a/diff.h b/diff.h
+index ff0348e4a9..08cb6f587c 100644
+--- a/diff.h
++++ b/diff.h
+@@ -561,6 +561,7 @@ int git_config_rename(const char *var, const char *value);
+
+ #define DIFF_DETECT_RENAME 1
+ #define DIFF_DETECT_COPY 2
++#define DIFF_DETECT_COPY_HARDER 3
+
+ #define DIFF_PICKAXE_ALL 1
+ #define DIFF_PICKAXE_REGEX 2
+diff --git a/diffcore-rename.c b/diffcore-rename.c
+index 91b77993c7..1219882f0d 100644
+--- a/diffcore-rename.c
++++ b/diffcore-rename.c
+@@ -302,7 +302,8 @@ static int find_identical_files(struct hashmap *srcs,
+ }
+ /* Give higher scores to sources that haven't been used already */
+ score = !source->rename_used;
+- if (source->rename_used && options->detect_rename != DIFF_DETECT_COPY)
++ if (source->rename_used && options->detect_rename != DIFF_DETECT_COPY &&
++ options->detect_rename != DIFF_DETECT_COPY_HARDER)
+ continue;
+ score += basename_same(source, target);
+ if (score > best_score) {
+@@ -1407,7 +1408,8 @@ void diffcore_rename_extended(struct diff_options *options,
+ trace2_region_enter("diff", "setup", options->repo);
+ info.setup = 0;
+ assert(!dir_rename_count || strmap_empty(dir_rename_count));
+- want_copies = (detect_rename == DIFF_DETECT_COPY);
++ want_copies = (detect_rename == DIFF_DETECT_COPY ||
++ detect_rename == DIFF_DETECT_COPY_HARDER);
+ if (dirs_removed && (break_idx || want_copies))
+ BUG("dirs_removed incompatible with break/copy detection");
+ if (break_idx && relevant_sources)
+diff --git a/merge-ort.c b/merge-ort.c
+index 46e78c3ffa..94699789bd 100644
+--- a/merge-ort.c
++++ b/merge-ort.c
+@@ -4921,7 +4921,7 @@ static void merge_start(struct merge_options *opt, struct merge_result *result)
+ * sanity check them anyway.
+ */
+ assert(opt->detect_renames >= -1 &&
+- opt->detect_renames <= DIFF_DETECT_COPY);
++ opt->detect_renames <= DIFF_DETECT_COPY_HARDER);
+ assert(opt->verbosity >= 0 && opt->verbosity <= 5);
+ assert(opt->buffer_output <= 2);
+ assert(opt->obuf.len == 0);
+diff --git a/merge-recursive.c b/merge-recursive.c
+index 884ccf99a5..b979d43b85 100644
+--- a/merge-recursive.c
++++ b/merge-recursive.c
+@@ -3771,7 +3771,7 @@ static int merge_start(struct merge_options *opt, struct tree *head)
+ assert(opt->branch1 && opt->branch2);
+
+ assert(opt->detect_renames >= -1 &&
+- opt->detect_renames <= DIFF_DETECT_COPY);
++ opt->detect_renames <= DIFF_DETECT_COPY_HARDER);
+ assert(opt->detect_directory_renames >= MERGE_DIRECTORY_RENAMES_NONE &&
+ opt->detect_directory_renames <= MERGE_DIRECTORY_RENAMES_TRUE);
+ assert(opt->rename_limit >= -1);
+--
+2.48.1
+
diff --git a/dev-vcs/git/git-2.49.0-r1.ebuild b/dev-vcs/git/git-2.49.0-r1.ebuild
index 47eece354ef0..386116e4e078 100644
--- a/dev-vcs/git/git-2.49.0-r1.ebuild
+++ b/dev-vcs/git/git-2.49.0-r1.ebuild
@@ -257,7 +257,9 @@ src_configure() {
# otherwise.
#
# Fixes https://bugs.gentoo.org/952004
- sed -i "s/subdir('coccinelle')/# subdir('coccinelle')/" "${WORKDIR}/git-${PV}/contrib/meson.build" || die
+ emesonargs+=(
+ -Dcoccinelle=disabled
+ )
fi
meson_src_configure
diff --git a/dev-vcs/git/git-2.49.0-r2.ebuild b/dev-vcs/git/git-2.49.0-r2.ebuild
new file mode 100644
index 000000000000..a479b24dfe0a
--- /dev/null
+++ b/dev-vcs/git/git-2.49.0-r2.ebuild
@@ -0,0 +1,496 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 meson
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+
+if [[ ${PV} == *9999 ]]; then
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+
+ inherit git-r3
+ # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+ # See https://git-scm.com/docs/gitworkflows#_graduation
+ # In order of stability:
+ # 9999-r0: maint
+ # 9999-r1: master
+ # 9999-r2: next
+ # 9999-r3: seen
+ case ${PVR} in
+ 9999) EGIT_BRANCH=maint ;;
+ 9999-r1) EGIT_BRANCH=master ;;
+ 9999-r2) EGIT_BRANCH=next;;
+ 9999-r3) EGIT_BRANCH=seen ;;
+ esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="xz"
+ SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+
+ [[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
+
+ SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
+ SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
+ SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
+
+ if [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ fi
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+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="
+ dev-libs/openssl:=
+ sys-libs/zlib
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ keyring? (
+ app-crypt/libsecret
+ dev-libs/glib:2
+ )
+ iconv? ( virtual/libiconv )
+ pcre? ( dev-libs/libpcre2:= )
+ perl? ( dev-lang/perl:=[-build(-)] )
+ tk? ( dev-lang/tk:= )
+"
+RDEPEND="
+ ${DEPEND}
+ gpg? ( app-crypt/gnupg )
+ perl? (
+ dev-perl/Error
+ dev-perl/MailTools
+ dev-perl/Authen-SASL
+ >=virtual/perl-libnet-3.110.0-r4[ssl]
+ cgi? (
+ dev-perl/CGI
+ highlight? ( app-text/highlight )
+ )
+ cvs? (
+ >=dev-vcs/cvsps-2.1:0
+ dev-perl/DBI
+ dev-perl/DBD-SQLite
+ )
+ mediawiki? (
+ dev-perl/DateTime-Format-ISO8601
+ dev-perl/HTML-Tree
+ dev-perl/MediaWiki-API
+ )
+ subversion? (
+ dev-vcs/subversion[-dso(-),perl]
+ dev-perl/libwww-perl
+ dev-perl/TermReadKey
+ )
+ )
+ perforce? ( ${PYTHON_DEPS} )
+ selinux? ( sec-policy/selinux-git )
+"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+BDEPEND="
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ app-text/xmlto
+ sys-apps/texinfo
+ )
+ keyring? ( virtual/pkgconfig )
+ nls? ( sys-devel/gettext )
+ test? (
+ app-arch/unzip
+ app-crypt/gnupg
+ dev-lang/perl
+ )
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ BDEPEND+=" app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ mediawiki? ( perl )
+ perforce? ( ${PYTHON_REQUIRED_USE} )
+ subversion? ( perl )
+ webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch
+ "${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch
+
+ # This patch isn't merged upstream but is kept in the ebuild by
+ # demand from developers. It's opt-in (needs a config option)
+ # and the documentation mentions that it is a Gentoo addition.
+ "${FILESDIR}"/${PN}-2.49.0-diff-implement-config.diff.renames-copies-harder.patch
+)
+
+pkg_setup() {
+ if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned!"
+ fi
+
+ if use perforce ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]] ; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+
+ cd "${S}" || die
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+
+ if use doc ; then
+ pushd "${S}"/Documentation &>/dev/null || die
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ popd &>/dev/null || die
+ fi
+ else
+ git-r3_src_unpack
+ 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
+ )
+ fi
+
+ default
+}
+
+src_configure() {
+ local contrib=(
+ completion
+ subtree
+
+ $(usev perl 'contacts')
+ )
+ local credential_helpers=(
+ $(usev keyring 'libsecret')
+ $(usev perl 'netrc')
+ )
+
+ # Needs macOS Frameworks that can't currently be built with GCC.
+ if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+ credential_helpers+=( osxkeychain )
+ fi
+
+ local native_file="${T}"/meson.ini.local
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ # We don't want to bake /usr/bin/sh from usrmerged systems into
+ # binaries. /bin/sh is required by POSIX.
+ sh='/bin/sh'
+ EOF
+
+ local emesonargs=(
+ --native-file "${native_file}"
+
+ $(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)
+
+ -Dcontrib=$(IFS=, ; echo "${contrib[*]}" )
+ -Dcredential_helpers=$(IFS=, ; echo "${credential_helpers[*]}" )
+
+ -Dmacos_use_homebrew_gettext=false
+ -Dperl_cpan_fallback=false
+ # TODO: allow zlib-ng
+ -Dzlib_backend=zlib
+ )
+
+ [[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false )
+
+ # For non-live, we use a downloaded docs tarball instead.
+ if [[ ${PV} == *9999 ]] || use doc ; then
+ emesonargs+=(
+ -Ddocs="man$(usev doc ',html')"
+ )
+ fi
+
+ if [[ ${PV} != *9999 ]] ; then
+ # Non-live ebuilds download the sources from a tarball which does not
+ # include a .git directory. Coccinelle assumes it exists and fails
+ # otherwise.
+ #
+ # Fixes https://bugs.gentoo.org/952004
+ emesonargs+=(
+ -Dcoccinelle=disabled
+ )
+ fi
+
+ meson_src_configure
+
+ if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ emesonargs=()
+ meson_src_configure
+ )
+ fi
+}
+
+git_emake() {
+ local mymakeargs=(
+ prefix="${EPREFIX}"/usr
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+ sysconfdir="${EPREFIX}"/etc
+ perllibdir="$(use perl && perl_get_raw_vendorlib)"
+
+ CC="$(tc-getCC)"
+ CFLAGS="${CFLAGS}"
+ LDFLAGS="${LDFLAGS}"
+ PKG_CONFIG="$(tc-getPKG_CONFIG)"
+ OPTAR="$(tc-getAR)"
+ OPTCC="$(tc-getCC)"
+ OPTCFLAGS="${CFLAGS}"
+ OPTLDFLAGS="${LDFLAGS}"
+
+ PERL_PATH="${EPREFIX}/usr/bin/perl"
+ PERL_MM_OPT=""
+
+ V=1
+
+ "$@"
+ )
+
+ emake "${mymakeargs[@]}"
+}
+
+src_compile() {
+ meson_src_compile
+
+ if use mediawiki ; then
+ git_emake -C contrib/mw-to-git
+ fi
+
+ if use tk ; then
+ git_emake -C git-gui
+
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_compile
+ )
+
+ 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
+}
+
+src_test() {
+ # t0610-reftable-basics.sh uses $A
+ local -x A=
+
+ meson_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]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+
+ local d
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.adoc
+ done
+ docinto /
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ bashcomp_alias git gitk
+ # Not really a bash-completion file (bug #477920)
+ # but still needed uncompressed (bug #507480)
+ insinto /usr/share/${PN}
+ doins contrib/completion/git-prompt.sh
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ exeinto /usr/libexec/git-core/
+ newexe contrib/git-resurrect.sh git-resurrect
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ exeinto /usr/libexec/git-core/
+ doexe contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # diff-highlight - done above
+ # emacs - removed upstream
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - built seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ local contrib_objects=(
+ buildsystems
+ fast-import
+ hooks
+ remotes2config.sh
+ rerere-train.sh
+ stats
+ workdir
+ )
+ local i
+ for i in "${contrib_objects[@]}" ; do
+ cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
+ done
+
+ 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
+ # distros
+ dosym ../gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+ if [[ -d "${d}" ]] ; then
+ find "${d}" -name .packlist -delete || die
+ fi
+ done
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if use perl ; then
+ 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
+ fi
+
+ if use mediawiki ; then
+ git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if ! use prefix ; then
+ newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ if use tk ; then
+ (
+ EMESON_SOURCE="${S}"/gitk-git
+ BUILD_DIR="${WORKDIR}"/gitk-git_build
+ meson_src_install
+ )
+
+ git_emake -C git-gui DESTDIR="${D}" install
+ fi
+
+ perl_delete_localpod
+
+ # Remove disabled linguas
+ # we could remove sources in src_prepare, but install does not
+ # handle missing locale dir well
+ rm_loc() {
+ if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+ rm -r "${ED}/usr/share/locale/${1}" || die
+ fi
+ }
+ plocale_for_each_disabled_locale rm_loc
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+ elog "completion."
+ elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+ elog "Note that the prompt bash code is now in that separate script"
+ fi
+
+ optfeature_header "Some scripts require additional dependencies:"
+ optfeature git-quiltimport dev-util/quilt
+ optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
+}
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 6c2d648b8535..a479b24dfe0a 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -150,6 +150,11 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch
"${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch
+
+ # This patch isn't merged upstream but is kept in the ebuild by
+ # demand from developers. It's opt-in (needs a config option)
+ # and the documentation mentions that it is a Gentoo addition.
+ "${FILESDIR}"/${PN}-2.49.0-diff-implement-config.diff.renames-copies-harder.patch
)
pkg_setup() {
@@ -256,7 +261,9 @@ src_configure() {
# otherwise.
#
# Fixes https://bugs.gentoo.org/952004
- sed -i "s/subdir('coccinelle')/# subdir('coccinelle')/" "${WORKDIR}/git-${PV}/contrib/meson.build" || die
+ emesonargs+=(
+ -Dcoccinelle=disabled
+ )
fi
meson_src_configure
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 6c2d648b8535..a479b24dfe0a 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -150,6 +150,11 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch
"${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch
+
+ # This patch isn't merged upstream but is kept in the ebuild by
+ # demand from developers. It's opt-in (needs a config option)
+ # and the documentation mentions that it is a Gentoo addition.
+ "${FILESDIR}"/${PN}-2.49.0-diff-implement-config.diff.renames-copies-harder.patch
)
pkg_setup() {
@@ -256,7 +261,9 @@ src_configure() {
# otherwise.
#
# Fixes https://bugs.gentoo.org/952004
- sed -i "s/subdir('coccinelle')/# subdir('coccinelle')/" "${WORKDIR}/git-${PV}/contrib/meson.build" || die
+ emesonargs+=(
+ -Dcoccinelle=disabled
+ )
fi
meson_src_configure
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 6c2d648b8535..a479b24dfe0a 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -150,6 +150,11 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch
"${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch
+
+ # This patch isn't merged upstream but is kept in the ebuild by
+ # demand from developers. It's opt-in (needs a config option)
+ # and the documentation mentions that it is a Gentoo addition.
+ "${FILESDIR}"/${PN}-2.49.0-diff-implement-config.diff.renames-copies-harder.patch
)
pkg_setup() {
@@ -256,7 +261,9 @@ src_configure() {
# otherwise.
#
# Fixes https://bugs.gentoo.org/952004
- sed -i "s/subdir('coccinelle')/# subdir('coccinelle')/" "${WORKDIR}/git-${PV}/contrib/meson.build" || die
+ emesonargs+=(
+ -Dcoccinelle=disabled
+ )
fi
meson_src_configure
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 6c2d648b8535..a479b24dfe0a 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -150,6 +150,11 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch
"${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch
+
+ # This patch isn't merged upstream but is kept in the ebuild by
+ # demand from developers. It's opt-in (needs a config option)
+ # and the documentation mentions that it is a Gentoo addition.
+ "${FILESDIR}"/${PN}-2.49.0-diff-implement-config.diff.renames-copies-harder.patch
)
pkg_setup() {
@@ -256,7 +261,9 @@ src_configure() {
# otherwise.
#
# Fixes https://bugs.gentoo.org/952004
- sed -i "s/subdir('coccinelle')/# subdir('coccinelle')/" "${WORKDIR}/git-${PV}/contrib/meson.build" || die
+ emesonargs+=(
+ -Dcoccinelle=disabled
+ )
fi
meson_src_configure
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-06 22:36:43 +0000