mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
Sam James
@@ -5,6 +5,7 @@ DIST git-2.51.1.tar.xz 7865216 BLAKE2B 3bb26baee468498f882eb3bf995c58cf441a9e753
|
||||
DIST git-2.51.2.tar.xz 7865980 BLAKE2B d567f52da82cabc5d2e4f542f02209aa170536864769fa49c9a24c5129e0603a940b1adf6dedf892c8971d947400a104d312b376f3f6aa23029cb57dffc9acb4 SHA512 547c3e522d9e6a2c2ccab24ee0c7f4f2d29878759563356e3a2ae9675884b7044ce5a236803170a203b79443760eb18a7089eec02bd105316e3ab045ab7603a7
|
||||
DIST git-2.52.0.tar.xz 7957064 BLAKE2B f228174814b1048f12543a6a20f771017991f9a23778f12fc32020b38837990eb19bc69e891078692ac4ad4ae1cb2e0e77400760964e09c491046e4ed8b16f96 SHA512 965e5ebb72d1f080d64e34bdb75f0bb1689c9dd41dcf63b020d986bad49808ac09bfb1115962bc0c5b95bac8622367ac4cd09aa89266f73d2137fe94c90dd3ed
|
||||
DIST git-2.53.0.tar.xz 7993096 BLAKE2B a23ccb2f793d37347e892f6094ad589510c93011a53fb2c14cdcbfbe6d87413edb4585a98253e4ca5124217f66ad783f4fa584f38dc25ffa34772da01dc45f02 SHA512 f9c0c0f527e10fe3eb524e368b1a24088bfd41097d8cac7854dae7ff21ab8ab2a1716384be53ea6174023ca5a2af3eeddca1d9feb57e447713f82e061df55c8d
|
||||
DIST git-2.54.0.tar.xz 8126372 BLAKE2B 68ee0623ff5a695a35dae2f31e3f410ebd4b6a8296c7c9fd03f53668878e9164b78ca82869c8a0719b3fae981f514f2022c45b39df7174b5e883348bdd269a82 SHA512 cb363917124edc245c9f6745e6e0c4093990275b4d57f9d2213c655b304ac81b05ece8d88546122727495ebc48a5ae19ab166a3ee43b6b8c68da488ac0270064
|
||||
DIST git-htmldocs-2.49.1.tar.xz 1602244 BLAKE2B 8d6df9ff42660123577933a95971bdd47d94b650b2cb8abafa4f4cbd981d016d3d3fdcbb08f22616ee44f928fc0aaac4f0ffee8a1d1d0c659240fcc2db9e2a25 SHA512 39db559a507b732d18ce1fa3ac513e87ca27b1d5df0f6d26cdead7b5add4eb29889d4c81e09b25c6fdbd813a0f13c833a22a4b6bbba6dea3b126e841a61424f8
|
||||
DIST git-htmldocs-2.50.1.tar.xz 1615796 BLAKE2B 6d340b552075bce7d724824eefd03540d558e24c07b49e48f1bb4262a5b3632b6aa7782bb02b15aaf424d22e5460bffee066f1e2bb0018791dcec8afa79dd3b8 SHA512 ebe437851b039bab4ec83be807583a23beaf43073248ffdcddee2328fc621b5b712c094faac3ee15a783f5a0cbdd92c2635879426007e8ef0ddcb70f227782f9
|
||||
DIST git-htmldocs-2.51.0.tar.xz 1627664 BLAKE2B 17106db9d7edf8717281d5af88ec9b53c91f6ba56552d5952d25ff593b4d227194df53a33dd52eb4791dd5044a7d867f8bed2371087e6dfdb4a0110e09f70055 SHA512 55460724b73bc42ebb611a4c0657f59040e8e7b28d56cb26814ae97c1b13ce3577e57e5a66f2749a93b7b3496b8a665ce5a2c31ba471eadb3267813915dc7051
|
||||
@@ -12,6 +13,7 @@ DIST git-htmldocs-2.51.1.tar.xz 1629412 BLAKE2B e135a355e84c4bd1a1d1e54dd6ff875b
|
||||
DIST git-htmldocs-2.51.2.tar.xz 1629724 BLAKE2B ed8593f9ccbd8017656af7193914638c25be7ed2a449d3509d49949a1eff2134b3a9c163802155610e32cb07f9ea4eced9ebd0758eb0f36b0ff028c0ee0462f0 SHA512 cafb7fa2f0a3be6bff006f65c8462047e6f2c80482b09df7c45e7caba12acee670ddb886c125dcc751a5d701ebf812737f981bd0bcbc3035432de26db981929a
|
||||
DIST git-htmldocs-2.52.0.tar.xz 1657524 BLAKE2B c21219b1059ee593ea850464473ba3466f83b44932261b70abecb7837a0e5c2434d71e29c495ac33faad9a34bda061b81187f691c57e8dc9557a56f8030dbeea SHA512 6fee6834bbd1400acef575fd206f58fb15472d45bad8f4ca9066930a3b4b1be8a633bb94c11f83644177266a06e2c4bb8a9478f10c4f1742016f59d07612c5e4
|
||||
DIST git-htmldocs-2.53.0.tar.xz 1675212 BLAKE2B b3df781089a91c36b91f46ee7801162ef925cfaee470813b0c33e58690a7494b1946ec487538769a153ec275d9dd13e5386fb8552185f274ca07e1e2e1a88afd SHA512 0c752d1aa78747f2ce9f73c3fca06ac69b543c4b546bfd13e1b22552a41a417982feee60adc6e525c88c6887e98c3b843c680ea6fd3a250f7e8317338dee3036
|
||||
DIST git-htmldocs-2.54.0.tar.xz 1695136 BLAKE2B bfb8d7ee1f33b545534928a09901b863dd775e42651a032366cb8549e3e5980dc92d8a0d6f74aee27e715521c28dad9625954c661f5fa165ff8149546d2a4238 SHA512 f6ccd8bbe3664096b7d50ffbc0b4c7fa77776047b396f9247dfee7744115807dddfd447819b6e50a0a0c46ce830c59567bc642af13d1cb732ae417daeb919ce2
|
||||
DIST git-manpages-2.49.1.tar.xz 594536 BLAKE2B b29aea1817053fefacc9a16abb86ea9fb4f2f239a268661a357cda16ab02b55ff3736b0c7d870fcacf4867bd063e14177bc46109115845fdea26b1870ff5f463 SHA512 0fbd824bfd68c72e8a6509989ffd016d1256cc3c5dfe4634170de2a07cdbdb4506f4b9136fa3176ac56c6f20f518a16758f1391bbd658be0caa8ebcc34158feb
|
||||
DIST git-manpages-2.50.1.tar.xz 598416 BLAKE2B c47be82829562057a99da3dc801958c2f7d1eeabb5af3c28cc3a66ec03a02b96e2d1d670ce39f7ab1d39fc113abe896c73b2126129cd98c3d33292267f160690 SHA512 9de90823bfb815ce31938794b80bf8526d162125afe23084114c47d360235a8d63b6fcdf78613bd91ee492b8d8c614d026cce51733bdd63bffe533f7da616d05
|
||||
DIST git-manpages-2.51.0.tar.xz 602200 BLAKE2B 12b103871dcd8173e88e2eb96621620682c19aecfb6ecbd7a9b3d8bb7358eed78c00af0738c502c5ff71ac8d85894c68ed33f395aed426d580210d4c1d36faf6 SHA512 ee2eb3bc90a63cb28ccdc8716b2d610b55eefbc0da255b7360695bc686ba52841b147c879a4f8b2ecdb767814b815929f7e0dd57fa612a87ef5e36b862056144
|
||||
@@ -19,3 +21,4 @@ DIST git-manpages-2.51.1.tar.xz 602552 BLAKE2B a8781e1b7b040b39ca17ee9ea20688bc1
|
||||
DIST git-manpages-2.51.2.tar.xz 602340 BLAKE2B 856c4531ed27b53f390f738774d758813f717b378bd64e4736e8627fe898b34b64b8d4b9fb686573f21d90d8db859062371586c440f3c6efca38346a04f7120b SHA512 d6443f22590797eb6947fbb317e2ec52beeabd6d3117425e23d93085952c4d9eaa8d26ae677a8f4d73938f9611ac636f5f26e29527cc96d1a6612c2853103a94
|
||||
DIST git-manpages-2.52.0.tar.xz 607864 BLAKE2B 6736100b503afd95aa7d6d9878a5c9420b44c5755b31c99e4b6db4a567db0984a6a786d2fac07baea95bf2b758c68fef042b75b10c848732add19fe17f3243bf SHA512 8e7998ed101fa4c7e9707721cbbc61e07bab56647c69f2d46d16c30465a825e223429cfab1ddfa58302a0563a12a8e5886133566bc6a1097ab0970d8ae4458d7
|
||||
DIST git-manpages-2.53.0.tar.xz 614136 BLAKE2B c2c309de1853ffceee4b3a334e2983fbfa5ce6a40ac60215aded917cff45b4e5eef7a38812cafec2515dd5538ceec8333a50525df09e15c012b4968435578487 SHA512 babb19223cd0da4e930449a4e246007283b5787b19b1c7ea341969bf6321f3de1164db9d1920de16535c4b18d03935c6e3fc329d9e2308aec4b4cb70514518a9
|
||||
DIST git-manpages-2.54.0.tar.xz 622912 BLAKE2B cca36435ec488cd2e1bbecd34885be5e0faaec4320c19fffb2a829b5f3b93241bf09a4464112544a7da73b8b434c0a7d838c69a49d0adc8859ba4ae1806a58c7 SHA512 c046d7c3d204587f16085621acde11d7df06ee194a38ff8aacf2ff2d9e446cc5c056a1557512aed150db30097da1e0b165507e9944f8b25249402a356b50d4bd
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From 0f7b6cf83c868a009c9843522429ba6810990ae6 Mon Sep 17 00:00:00 2001
|
||||
Message-ID: <0f7b6cf83c868a009c9843522429ba6810990ae6.1776707419.git.sam@gentoo.org>
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Tue, 18 Nov 2025 18:10:03 +0000
|
||||
Subject: [PATCH 1/2] rust: don't pass --quiet to cargo
|
||||
|
||||
This obscures that cargo is being invoked at all and it means even
|
||||
ninja --verbose has no mention of it other than invoking the target.
|
||||
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
---
|
||||
src/cargo-meson.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/cargo-meson.sh b/src/cargo-meson.sh
|
||||
index 75f3cd1265..26a6d3bb16 100755
|
||||
--- a/src/cargo-meson.sh
|
||||
+++ b/src/cargo-meson.sh
|
||||
@@ -31,7 +31,7 @@ case "$(cargo -vV | sed -n 's/^host: \(.*\)$/\1/p')" in
|
||||
LIBNAME=libgitcore.a;;
|
||||
esac
|
||||
|
||||
-cargo build --lib --quiet --manifest-path="$SOURCE_DIR/Cargo.toml" --target-dir="$BUILD_DIR" "$@"
|
||||
+cargo build --lib --manifest-path="$SOURCE_DIR/Cargo.toml" --target-dir="$BUILD_DIR" "$@"
|
||||
RET=$?
|
||||
if test $RET -ne 0
|
||||
then
|
||||
--
|
||||
2.53.0
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 1fe93707dbb6d9c5214250f576151cb5cec3762f Mon Sep 17 00:00:00 2001
|
||||
Message-ID: <1fe93707dbb6d9c5214250f576151cb5cec3762f.1776707419.git.sam@gentoo.org>
|
||||
In-Reply-To: <0f7b6cf83c868a009c9843522429ba6810990ae6.1776707419.git.sam@gentoo.org>
|
||||
References: <0f7b6cf83c868a009c9843522429ba6810990ae6.1776707419.git.sam@gentoo.org>
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Tue, 18 Nov 2025 18:10:47 +0000
|
||||
Subject: [PATCH 2/2] rust: respect $CARGO environment variable
|
||||
|
||||
Respect the CARGO environment variable if set. Gentoo uses this to
|
||||
control the version of rust/cargo for a build.
|
||||
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
---
|
||||
src/cargo-meson.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/cargo-meson.sh b/src/cargo-meson.sh
|
||||
index 26a6d3bb16..b7b9578861 100755
|
||||
--- a/src/cargo-meson.sh
|
||||
+++ b/src/cargo-meson.sh
|
||||
@@ -31,7 +31,7 @@ case "$(cargo -vV | sed -n 's/^host: \(.*\)$/\1/p')" in
|
||||
LIBNAME=libgitcore.a;;
|
||||
esac
|
||||
|
||||
-cargo build --lib --manifest-path="$SOURCE_DIR/Cargo.toml" --target-dir="$BUILD_DIR" "$@"
|
||||
+${CARGO:-cargo} build --lib --manifest-path="$SOURCE_DIR/Cargo.toml" --target-dir="$BUILD_DIR" "$@"
|
||||
RET=$?
|
||||
if test $RET -ne 0
|
||||
then
|
||||
--
|
||||
2.53.0
|
||||
|
||||
460
dev-vcs/git/git-2.54.0.ebuild
Normal file
460
dev-vcs/git/git-2.54.0.ebuild
Normal file
@@ -0,0 +1,460 @@
|
||||
# Copyright 1999-2026 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_{11..14} )
|
||||
RUST_OPTIONAL=1
|
||||
inherit flag-o-matic toolchain-funcs perl-module shell-completion optfeature
|
||||
inherit plocale python-single-r1 rust 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 ~arm64-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 +nls +pcre perforce +perl rust +safe-directory selinux subversion test tk +webdav xinetd"
|
||||
|
||||
# Common to both DEPEND and RDEPEND
|
||||
DEPEND="
|
||||
dev-libs/openssl:=
|
||||
virtual/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-alternatives/gpg )
|
||||
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
|
||||
)
|
||||
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 )
|
||||
rust? ( ${RUST_DEPEND} )
|
||||
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 )
|
||||
perforce? ( ${PYTHON_REQUIRED_USE} )
|
||||
subversion? ( perl )
|
||||
webdav? ( curl )
|
||||
"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.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.50.0-diff-implement-config.diff.renames-copies-harder.patch
|
||||
|
||||
"${FILESDIR}"/${PN}-2.54.0-0001-rust-don-t-pass-quiet-to-cargo.patch
|
||||
"${FILESDIR}"/${PN}-2.54.0-0002-rust-respect-CARGO-environment-variable.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
|
||||
|
||||
if use rust ; then
|
||||
rust_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 tk gitk)
|
||||
$(meson_feature tk git_gui)
|
||||
$(meson_feature iconv)
|
||||
$(meson_feature nls gettext)
|
||||
$(meson_feature pcre pcre2)
|
||||
$(meson_feature perl)
|
||||
$(meson_feature perforce python)
|
||||
$(meson_feature rust)
|
||||
$(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 )
|
||||
[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
|
||||
|
||||
# For non-live, we use a downloaded docs tarball instead.
|
||||
if [[ ${PV} == *9999 ]] || use doc ; then
|
||||
emesonargs+=(
|
||||
-Ddocs="man$(usev doc ',html')"
|
||||
-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/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
|
||||
}
|
||||
|
||||
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 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
|
||||
|
||||
# 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
|
||||
newzshcomp contrib/completion/git-completion.zsh _${PN}
|
||||
# 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
|
||||
|
||||
# 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
|
||||
# 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
|
||||
# subtree - built seperately
|
||||
# svnimport - use git-svn
|
||||
# thunderbird-patch-inline - fixes thunderbird
|
||||
local contrib_objects=(
|
||||
buildsystems
|
||||
fast-import
|
||||
rerere-train.sh
|
||||
stats
|
||||
)
|
||||
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 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
|
||||
|
||||
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
|
||||
|
||||
if has_version app-shells/zsh ; then
|
||||
elog 'There are two competing zsh completions available for Git.'
|
||||
elog 'One is from app-shells/zsh, the other from dev-vcs/git.'
|
||||
elog 'To choose between them, order the entries of $fpath so that your'
|
||||
elog 'desired completion is earlier in the list or symlink the relevant'
|
||||
elog 'script into a personal override directory early on fpath.'
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user