mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-27 00:21:44 +02:00
dev-vcs/git: Sync with Gentoo
It's from Gentoo commit c1a18b049286635b0890f7021afcbd7818f94080.
This commit is contained in:
Flatcar Buildbot
parent
7d39037118
commit
38a2ffe9c4
@ -1,12 +1,9 @@
|
||||
DIST git-2.45.2.tar.xz 7487680 BLAKE2B 477acc786c26e0b04843ad6d07333607b2274d587263d72c6d036cade725e6f62f8c773903f401c799de71527d0473589afc507eec02f445e0c148dd7cbf407c SHA512 dce30d0d563f3f76ef49c8dc88105e0cf0941c8cd70303418d9d737f840ffba36bcc575c380c75080edf64af74487e1a680db146ec5f527a32104e887d4ceb73
|
||||
DIST git-2.45.3.tar.xz 7492256 BLAKE2B 51c08789487070c33ff7c6c2135203010f12641eaf9908bf70724255e72bed24a7f0b7cc0b5c947081dad22041d0ee80c53971e5634510d35d797747338cd2d8 SHA512 b5b98bcc886f6a015b54193a9481092d4bfdc3689c479a8751e63529ce1dd1db226f2da38d26f25f54b81fe2c3c48d8edbe18af534fff65f6fcaa4c50923f93b
|
||||
DIST git-2.48.1.tar.xz 7723580 BLAKE2B 092ed16fab3b3e56c81cb91db48e4db1f41b6d91d4855a7c73fb642f1fd0272823a92b8963644ef33517c61956bca89a95e4b4dc3e9237cb0520aa37c0770966 SHA512 75c89ab4ca83adc46989a4b05a9b482b40a7ba69d15aa1c1f27d0cee37c2908e154a75d59b0a0a540647352b9c55020f1a5ad309f0eff78e9fd8e631ef9e4606
|
||||
DIST git-2.49.0.tar.xz 7771796 BLAKE2B c9a58cb4bcbc33d3c6ede2ce6e6131af3998669419c8d8e4317c52ee14ae4bfcdd209780c6dda31cd772bdb703096729de17f21579bf7f0bb830bc6c9e1d7ffd SHA512 81a16415890305fc6cfd14ade8bee76779feba01f51c5446f40c14211654342c68ef0911859fa6e8e9ff0a718847bb44ee4156d03a19c9165df19ba91e09e1f0
|
||||
DIST git-htmldocs-2.45.2.tar.xz 1569148 BLAKE2B 5013a13da54d87728f621a09d04dee1cba7b44d230360394b86e04269bf276399cf44de74ffc14a76ec1724e1015b630300d551b3a268273a768e0edc1a7fa45 SHA512 272bb31d8d43b270d5281c5d1beadea8e5a580c738ece2580d2c6ba7e7fe6fdbca71b672a2811273119495e62613f7a4d34764b4dfbc26e4dbf9dee5797fb440
|
||||
DIST git-htmldocs-2.45.3.tar.xz 1527700 BLAKE2B 1baf8df995d6a31b550d91425c94ac63425eb4efc5a334dd5a312cf1c8da84e132c30dbbb192d9bcdfcabfa9f7b758ff2445ed8d634ad31723d3835bef2ca49c SHA512 4e8b16e77f7606c279e7793cbd6f8e18973213339f56a379dbf1fc074b7d1f032783bb956de0ebb58fad7e8954b7a75ab990b265f1858b32321e7c33de414601
|
||||
DIST git-htmldocs-2.48.1.tar.xz 1580120 BLAKE2B 4d57fc0ab8256d4cf5984696485610329f63bccce8ad6bcda20bca9abbaac0725dfac0aef385a62371c2c8e7d26e86c62e0de36321f40a3da667fa2b92e43ef4 SHA512 703f237c129d3d54cea9104dc1d47ad8881400a1c90e1a55153e63912c8e7d03e1000fef5cd1962933e8a600d71e11f28a94214853047ac8e748dc53ba906ac5
|
||||
DIST git-htmldocs-2.49.0.tar.xz 1602472 BLAKE2B d3b0d49b7f7046dfd802145e37760d31ef048ecbbfb75e5bf904edd8d0d0cad56c118d843e06d1d72b159917f6bd0f6fa2413bba3f6ba0de041d8e8fdc247f94 SHA512 effc0ecb3e84febb80de208ad4b8bb3859c171aedac24fdd4f52c07d33dedef16c20ac16bc6c6fbbb9d30b0926c08be22c78405614732d5e2cf24e90bd93384f
|
||||
DIST git-manpages-2.45.2.tar.xz 576428 BLAKE2B c89ebd25c0caf391fcd29cc8609252daf2cf742a8cc78ce5b64931befb126c951ebb7504bc8ccbee06b81727dc3e4ded67c69adf8d737f4df38dfda758e3c734 SHA512 d39a5c92c1cfcae145713b8ff1a84258947392a3cf1490e3f7d4f87836d05e79dc4fecbff16b7c1bc314572d6d32aa2c29e7fcde993b549b2fab71620734c19b
|
||||
DIST git-manpages-2.45.3.tar.xz 576480 BLAKE2B 61eeccea65dcae72e0151459ad4a225d455fd6c57dc55394aa2e5e8f3179643f63eb64c8d75ac51ae467b8c277df2ac9777c55134efcc05805bef16019171b30 SHA512 c06b97a8f2c43c7a11355dea95e4766bc58978a70c30d5ee4af86e45dadd5be11d1ba30e1750535c067169af7b6497d2d03ae5cc1f36aff1b96a80a1f34dbc1c
|
||||
DIST git-manpages-2.48.1.tar.xz 590608 BLAKE2B 54ff646cd1d5ce93e8e37eef4682e81a1c95f99903b2d760f70e51f2c9f02378f6de5464a5fcca24c08f8327ec114cdd1684eee07fd2512af7e9615c47104a99 SHA512 b086ac89e77b1af58beff26576fb5c3a1dfe8641315ab0b60819dcf0ba9e5be4173deaa77fa1f95d8594895a583ed629c469714b0a5e87fecd36e5be397ba8f5
|
||||
DIST git-manpages-2.49.0.tar.xz 594760 BLAKE2B c5a1810e1369cc94c93716db5baf9d217e9c47c824cab8e978128ff7e8fe38119b64dd43fe4186e561f2b230d9e82ec254da0080b9a568dc31ae7ea73e46d612 SHA512 6347bf0d580634c3c78ff93578e088b31ccd5ebd844678a1255f82c5ceb1a301829701daf4212d8ca0f508fcd03cfef52b727a11f1c6d37346adbd709d0b041a
|
||||
|
||||
49
sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.48.1-docs.patch
vendored
Normal file
49
sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.48.1-docs.patch
vendored
Normal file
@ -0,0 +1,49 @@
|
||||
[This is the same as git-2.49.1-docs.patch, but modified to apply to 2.48.1.]
|
||||
|
||||
https://public-inbox.org/git/20250316060605.166364-1-eschwartz@gentoo.org/T/
|
||||
|
||||
From: Eli Schwartz <eschwartz@gentoo.org>
|
||||
To: git@vger.kernel.org
|
||||
Cc: Patrick Steinhardt <ps@pks.im>,
|
||||
Sam James <sam@gentoo.org>
|
||||
Subject: [PATCH] meson: fix perl detection when docs are enabled, but perl bindings aren't
|
||||
Date: Sun, 16 Mar 2025 02:06:05 -0400
|
||||
Message-ID: <20250316060605.166364-1-eschwartz@gentoo.org>
|
||||
X-Mailer: git-send-email 2.48.1
|
||||
Precedence: bulk
|
||||
X-Mailing-List: git@vger.kernel.org
|
||||
List-Id: <git.vger.kernel.org>
|
||||
List-Subscribe: <mailto:git+subscribe@vger.kernel.org>
|
||||
List-Unsubscribe: <mailto:git+unsubscribe@vger.kernel.org>
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The `perl` variable in meson.build is assigned to a program lookup,
|
||||
which may have the value "not-found object" if configuring with
|
||||
`-Dperl=disabled`.
|
||||
|
||||
There is already a list of other cases where we do need a perl command,
|
||||
even when not building perl bindings. Building documentation should be
|
||||
one of those cases, but was missing from the list. Add it.
|
||||
|
||||
Fixes:
|
||||
|
||||
```
|
||||
$ meson setup builddir/ -Ddocs=man -Dperl=disabled -Dtests=false
|
||||
[...]
|
||||
Documentation/meson.build:308:22: ERROR: Tried to use not-found external program in "command"
|
||||
```
|
||||
|
||||
Bug: https://bugs.gentoo.org/949247
|
||||
Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -749,7 +749,7 @@ endif
|
||||
# features. It is optional if you want to neither execute tests nor use any of
|
||||
# these optional features.
|
||||
perl_required = get_option('perl')
|
||||
-if get_option('tests') or get_option('gitweb').enabled()
|
||||
+if get_option('tests') or get_option('gitweb').enabled() or get_option('docs') != []
|
||||
perl_required = true
|
||||
endif
|
||||
|
||||
@ -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
|
||||
|
||||
49
sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.49.0-docs.patch
vendored
Normal file
49
sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.49.0-docs.patch
vendored
Normal file
@ -0,0 +1,49 @@
|
||||
https://public-inbox.org/git/20250316060605.166364-1-eschwartz@gentoo.org/T/
|
||||
|
||||
From: Eli Schwartz <eschwartz@gentoo.org>
|
||||
To: git@vger.kernel.org
|
||||
Cc: Patrick Steinhardt <ps@pks.im>,
|
||||
Sam James <sam@gentoo.org>
|
||||
Subject: [PATCH] meson: fix perl detection when docs are enabled, but perl bindings aren't
|
||||
Date: Sun, 16 Mar 2025 02:06:05 -0400
|
||||
Message-ID: <20250316060605.166364-1-eschwartz@gentoo.org>
|
||||
X-Mailer: git-send-email 2.48.1
|
||||
Precedence: bulk
|
||||
X-Mailing-List: git@vger.kernel.org
|
||||
List-Id: <git.vger.kernel.org>
|
||||
List-Subscribe: <mailto:git+subscribe@vger.kernel.org>
|
||||
List-Unsubscribe: <mailto:git+unsubscribe@vger.kernel.org>
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The `perl` variable in meson.build is assigned to a program lookup,
|
||||
which may have the value "not-found object" if configuring with
|
||||
`-Dperl=disabled`.
|
||||
|
||||
There is already a list of other cases where we do need a perl command,
|
||||
even when not building perl bindings. Building documentation should be
|
||||
one of those cases, but was missing from the list. Add it.
|
||||
|
||||
Fixes:
|
||||
|
||||
```
|
||||
$ meson setup builddir/ -Ddocs=man -Dperl=disabled -Dtests=false
|
||||
[...]
|
||||
Documentation/meson.build:308:22: ERROR: Tried to use not-found external program in "command"
|
||||
```
|
||||
|
||||
Bug: https://bugs.gentoo.org/949247
|
||||
Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -772,7 +772,7 @@ endif
|
||||
# features. It is optional if you want to neither execute tests nor use any of
|
||||
# these optional features.
|
||||
perl_required = get_option('perl')
|
||||
-if get_option('tests') or get_option('gitweb').enabled() or 'netrc' in get_option('credential_helpers')
|
||||
+if get_option('tests') or get_option('gitweb').enabled() or 'netrc' in get_option('credential_helpers') or get_option('docs') != []
|
||||
perl_required = true
|
||||
endif
|
||||
|
||||
--
|
||||
2.48.1
|
||||
@ -151,6 +151,7 @@ PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.48.0-doc-deps.patch
|
||||
"${FILESDIR}"/${PN}-2.48.1-parallel-build.patch
|
||||
"${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch
|
||||
"${FILESDIR}"/${PN}-2.48.1-docs.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
|
||||
@ -150,6 +150,7 @@ RESTRICT="!test? ( test )"
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch
|
||||
"${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch
|
||||
"${FILESDIR}"/${PN}-2.49.0-docs.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
@ -250,6 +251,17 @@ src_configure() {
|
||||
)
|
||||
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
|
||||
|
||||
@ -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,14 @@ REQUIRED_USE="
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
# Avoid automagic CVS, bug #350330
|
||||
"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
|
||||
"${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch
|
||||
"${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch
|
||||
"${FILESDIR}"/${PN}-2.49.0-docs.patch
|
||||
|
||||
# Make submodule output quiet
|
||||
"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.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() {
|
||||
@ -163,72 +170,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,7 +184,6 @@ src_unpack() {
|
||||
fi
|
||||
else
|
||||
git-r3_src_unpack
|
||||
#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
|
||||
fi
|
||||
|
||||
}
|
||||
@ -253,240 +193,159 @@ src_prepare() {
|
||||
# This patch neuters the "safe directory" detection.
|
||||
# bugs #838271, #838223
|
||||
PATCHES+=(
|
||||
"${FILESDIR}"/git-2.37.2-unsafe-directory.patch
|
||||
"${FILESDIR}"/git-2.46.2-unsafe-directory.patch
|
||||
)
|
||||
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
|
||||
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
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
# Fix docbook2texi command
|
||||
sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
|
||||
Documentation/Makefile || die
|
||||
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() {
|
||||
# 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
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
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
|
||||
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() {
|
||||
local disabled=(
|
||||
# We make safe-directory optional
|
||||
t0033-safe-directory.sh
|
||||
)
|
||||
# t0610-reftable-basics.sh uses $A
|
||||
local -x A=
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
# And bail if there was a problem
|
||||
[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
|
||||
meson_src_test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
git_emake DESTDIR="${D}" install
|
||||
meson_src_install
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
|
||||
dobin contrib/credential/osxkeychain/git-credential-osxkeychain
|
||||
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
|
||||
@ -494,19 +353,13 @@ src_install() {
|
||||
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
|
||||
docinto ${d}
|
||||
dodoc Documentation${d}*.txt
|
||||
if use doc ; then
|
||||
docinto ${d}/html
|
||||
dodoc Documentation${d}*.html
|
||||
fi
|
||||
dodoc Documentation${d}*.adoc
|
||||
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
|
||||
@ -521,21 +374,6 @@ src_install() {
|
||||
exeinto /usr/libexec/git-core/
|
||||
newexe contrib/git-resurrect.sh git-resurrect
|
||||
|
||||
# git-subtree
|
||||
pushd contrib/subtree &>/dev/null || die
|
||||
git_emake DESTDIR="${D}" install
|
||||
if use doc ; then
|
||||
# Do not move git subtree install-man outside USE=doc!
|
||||
git_emake DESTDIR="${D}" install-man install-html
|
||||
fi
|
||||
newdoc README README.git-subtree
|
||||
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
|
||||
@ -545,17 +383,6 @@ src_install() {
|
||||
doexe contrib/git-jump/git-jump
|
||||
newdoc contrib/git-jump/README git-jump.txt
|
||||
|
||||
# git-contacts
|
||||
exeinto /usr/libexec/git-core/
|
||||
doexe contrib/contacts/git-contacts
|
||||
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
|
||||
fi
|
||||
|
||||
dodir /usr/share/${PN}/contrib
|
||||
# The following are excluded:
|
||||
# completion - installed above
|
||||
@ -568,7 +395,7 @@ src_install() {
|
||||
# patches - stuff the Git guys made to go upstream to other places
|
||||
# persistent-https - TODO
|
||||
# mw-to-git - TODO
|
||||
# subtree - build seperately
|
||||
# subtree - built seperately
|
||||
# svnimport - use git-svn
|
||||
# thunderbird-patch-inline - fixes thunderbird
|
||||
local contrib_objects=(
|
||||
@ -585,7 +412,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
|
||||
@ -606,6 +433,16 @@ src_install() {
|
||||
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*
|
||||
@ -623,6 +460,16 @@ src_install() {
|
||||
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
|
||||
@ -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() {
|
||||
@ -250,6 +255,17 @@ src_configure() {
|
||||
)
|
||||
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
|
||||
|
||||
@ -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() {
|
||||
@ -250,6 +255,17 @@ src_configure() {
|
||||
)
|
||||
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
|
||||
|
||||
@ -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() {
|
||||
@ -250,6 +255,17 @@ src_configure() {
|
||||
)
|
||||
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
|
||||
|
||||
@ -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() {
|
||||
@ -250,6 +255,17 @@ src_configure() {
|
||||
)
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user