From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1710609-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5621D15813A
for <garchives@archives.gentoo.org>; Sat, 18 Jan 2025 23:24:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9989DE08EF;
Sat, 18 Jan 2025 23:24:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 848CAE08EF
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jan 2025 23:24:47 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 51380342F9A
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jan 2025 23:24:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F3D3252D
for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jan 2025 23:24:43 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1737242662.2a9686e606eb4463eaf83bf62c64f8ceb2bc241b.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-vcs/git/Manifest dev-vcs/git/git-2.48.1.ebuild
X-VCS-Directories: dev-vcs/git/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 2a9686e606eb4463eaf83bf62c64f8ceb2bc241b
X-VCS-Branch: master
Date: Sat, 18 Jan 2025 23:24:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 261e9fbd-a0d0-4978-aa8a-9311a9ad8883
X-Archives-Hash: 692795fa2370b464cfe64b3b06b13185
commit: 2a9686e606eb4463eaf83bf62c64f8ceb2bc241b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 23:23:24 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 23:24:22 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a9686e6
dev-vcs/git: add 2.48.1
Bug: https://bugs.gentoo.org/948111
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-vcs/git/Manifest | 3 +
dev-vcs/git/git-2.48.1.ebuild | 475 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 478 insertions(+)
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index bec321ca2a70..062c5801e9d5 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -7,6 +7,7 @@ DIST git-2.46.3.tar.xz 7582764 BLAKE2B 98b74fd129e2fdf3603d12aa024865174e624cab5
DIST git-2.47.1.tar.xz 7654244 BLAKE2B 5dd5d1bde226469d8de0952456dbaa408739f8613cfefdd76715e6a2bc1fdf8695740f005cc3b2caab876fccfbff0609201a827e0bd9837ec68056ba2a41da34 SHA512 6abe551c464b307bc3f6f474257e0be3e1a9eba1406af6463216b796c55a35356009c2f7bd9b4fa2d1798da5f885a3843f6ad8750ab69595f748f9ea8ed76fea
DIST git-2.47.2.tar.xz 7655652 BLAKE2B cf465f9050c7959ea7371a501ad99b9a1cd09f7c57a5410a2dff8144176225b814d8dec5dc78b733c4bb755c19d6d52d98ca7ea5fdd7a64afce8acc73c4e9b87 SHA512 a54aa6c8f468534311fa5e8fe9a69d0ea87b18a97f94b62e20882ab431e422975883852cbce03b14c99fd0a7a5b41d15307fdf4f147b601ce9d925b484831e07
DIST git-2.48.0.tar.xz 7723336 BLAKE2B 63d0ac06aef75120ff2aab34b76039cc9e2606a4e69ee36fed868df7243318abac6550e03054bebc9b65a086c54a4f00d95affcc121fa690a3a580cb352ecbb3 SHA512 0b8b6633d65f20830577a073a78f13cedf4f43c8634d5d62918cddca9ca8b75519e6674307782e0eacb9e8e920a04014aa2a0f5cd2e75be06728e9160f794c9e
+DIST git-2.48.1.tar.xz 7723580 BLAKE2B 092ed16fab3b3e56c81cb91db48e4db1f41b6d91d4855a7c73fb642f1fd0272823a92b8963644ef33517c61956bca89a95e4b4dc3e9237cb0520aa37c0770966 SHA512 75c89ab4ca83adc46989a4b05a9b482b40a7ba69d15aa1c1f27d0cee37c2908e154a75d59b0a0a540647352b9c55020f1a5ad309f0eff78e9fd8e631ef9e4606
DIST git-htmldocs-2.44.2.tar.xz 1559412 BLAKE2B 9a62ab1d70b009a9bc29250c49ca835a46928703a73ec004ea57e7dc74212c5a29d7e0784cd752c8d2c1e23b70702e2c2f280904dfedefb3d4a687002a950596 SHA512 2a82e3c37aaca91643976d21fac3bd82b23fe2374856d73b0ba726339450ea6f8a5e8e38326546292f83923e28da280ca3bed549afff1aad684ebfb3926e4992
DIST git-htmldocs-2.44.3.tar.xz 1516580 BLAKE2B 67ad1e0f340883a66ead1be9b344947c655249eb7cb16e0c051d049392ca89093b02db0d4c652ec5f66332897d3479457626b5b73735dbe4b394d35a0471a848 SHA512 44c36e828d04ac032c053deab0f8c7c9f920dd19eae0cc020cd8b5e7b61dd1d58905e6bf90c65f2b77d30c4ea48761eca6cbda4151110ceb5895f47c730bf821
DIST git-htmldocs-2.45.2.tar.xz 1569148 BLAKE2B 5013a13da54d87728f621a09d04dee1cba7b44d230360394b86e04269bf276399cf44de74ffc14a76ec1724e1015b630300d551b3a268273a768e0edc1a7fa45 SHA512 272bb31d8d43b270d5281c5d1beadea8e5a580c738ece2580d2c6ba7e7fe6fdbca71b672a2811273119495e62613f7a4d34764b4dfbc26e4dbf9dee5797fb440
@@ -16,6 +17,7 @@ DIST git-htmldocs-2.46.3.tar.xz 1553392 BLAKE2B bc4116f5d968ed7d7be02fd614fa38bb
DIST git-htmldocs-2.47.1.tar.xz 1564776 BLAKE2B ff8c313e00867423ddb122572e730868541ab22c76cb73aad54ee5dab298c4a8fdc29d50ebdceb658d7799132258dad9ffcaa582439a74463a8c212c3d82005c SHA512 7df2c572413d42f954c0ca01577f9324a60810dd712a8a36b0b503708d9795a90ffa95ee96b13c082796e276bcbc65094de32ade0f71ff744f6e45869cbbb4d7
DIST git-htmldocs-2.47.2.tar.xz 1565576 BLAKE2B dc61579827494028d6210cb40633f0a09cfaa6bbb5e0b1f287a8fcd9ac5bf7590db498907aeb2e86684ee454cd96060002fcb0dba7e96b8ddd5d4e06a4e6d829 SHA512 78d63a452ed866e1abe50b7790a81425e795d924ddc57c78411e73ea248f1c35620aec30287f262058610418ae2ca2cc3e8ca05b45eabbf28b0f25985a0b5bba
DIST git-htmldocs-2.48.0.tar.xz 1579956 BLAKE2B 012afa8f22ef59e0e96a2c72d04f634d5ac4266e5d0b7eb5e3b51815bbdc30299606eee2a57066b54025a2622ca6ac4e4945348aab10ba0967e52a8f84225ba6 SHA512 3d02d6d64ae174103d266f67e1e0b5251b4427e13ea0b802f1a29211d6134e2adea6aa211d8bf22180ccf29ff2c13e19309021d01acd1954a84bff622d343a27
+DIST git-htmldocs-2.48.1.tar.xz 1580120 BLAKE2B 4d57fc0ab8256d4cf5984696485610329f63bccce8ad6bcda20bca9abbaac0725dfac0aef385a62371c2c8e7d26e86c62e0de36321f40a3da667fa2b92e43ef4 SHA512 703f237c129d3d54cea9104dc1d47ad8881400a1c90e1a55153e63912c8e7d03e1000fef5cd1962933e8a600d71e11f28a94214853047ac8e748dc53ba906ac5
DIST git-manpages-2.44.2.tar.xz 574316 BLAKE2B ecfca8e05ca682097376ce6a1e8b9de8fcc36472860321987be12291a53d1a92befb950fd856775df65f28300b267b80975775cba046cfb89159887e8cba5516 SHA512 2ad6d922acf46028b3b7dd5a686c0396e5452e4d50b32ba9af0cc51cc3431003524b91279e2a795065a179af3d760ce72530580295ed09a53673274cf9567cc6
DIST git-manpages-2.44.3.tar.xz 573940 BLAKE2B b57c96e1e73ececbfc88d6ce59bcc65bcc729a3644a4621897f1555578fb57a352aa22cd0720e4d87f9505db44f612dd36f32313fdc4e834dd26c5dac5604a15 SHA512 2201caee9b31a8559a80fbc07fab53b7943a4a05567ffdc59c92a3701f9e27a3bcef07915e40c9caa542e3fb3ca5a34492417926da1ac9bc17bf35551b2cb6fa
DIST git-manpages-2.45.2.tar.xz 576428 BLAKE2B c89ebd25c0caf391fcd29cc8609252daf2cf742a8cc78ce5b64931befb126c951ebb7504bc8ccbee06b81727dc3e4ded67c69adf8d737f4df38dfda758e3c734 SHA512 d39a5c92c1cfcae145713b8ff1a84258947392a3cf1490e3f7d4f87836d05e79dc4fecbff16b7c1bc314572d6d32aa2c29e7fcde993b549b2fab71620734c19b
@@ -25,3 +27,4 @@ DIST git-manpages-2.46.3.tar.xz 584824 BLAKE2B 611b8239df7caf21fd6464581aca6789a
DIST git-manpages-2.47.1.tar.xz 586432 BLAKE2B df4eafa03ba235202c361d16fd6db1c6b2a4fea5501f62dcd7b53e3764542a2b70ab44e1525d5f4437dad9505c507ba88aa14b1e8e828713b81cb66b6d9a73c2 SHA512 9acd5207e6c2751ec87708eedc4f060ee6bed0841564f787cd3fd5dbce712c4c2afbb9ce4e85a466fb52a8f399420ca24c7cd4eb8e14edb7ea7a5c06e3c82a5e
DIST git-manpages-2.47.2.tar.xz 586520 BLAKE2B c9616f95708249f5d68459535b7eb6d3f94254707758f40e2f1f066b67ed8b776c74ddc0e6a7587c7395327360a6bd5e538138edb2c9eac654ddc597be8b9cad SHA512 d3d56d806ed642fc68c5ab4583d9e20c6569df78f4de063267bef709f33bc780c67b63074a8c350fa5895a8ca3bf121a1ea6fc47057c8a0c7706728ea3c99227
DIST git-manpages-2.48.0.tar.xz 590480 BLAKE2B 73e61821d48b524331d8b2bc56047065307cab7b2831cc869cc76d9e3b1da6bdbda8184e14f17cb7bf1efdb26f6dd87682e259b69b597c12fff00ee6a98377c9 SHA512 f9f5844b39361d379e66f68e327bd99693ae4c3f0bb3a85de4c1a36e665771f69afced98fb454d2f6574284c08e1043a75b0af7a774912a2b2ec958994fcc17d
+DIST git-manpages-2.48.1.tar.xz 590608 BLAKE2B 54ff646cd1d5ce93e8e37eef4682e81a1c95f99903b2d760f70e51f2c9f02378f6de5464a5fcca24c08f8327ec114cdd1684eee07fd2512af7e9615c47104a99 SHA512 b086ac89e77b1af58beff26576fb5c3a1dfe8641315ab0b60819dcf0ba9e5be4173deaa77fa1f95d8594895a583ed629c469714b0a5e87fecd36e5be397ba8f5
diff --git a/dev-vcs/git/git-2.48.1.ebuild b/dev-vcs/git/git-2.48.1.ebuild
new file mode 100644
index 000000000000..f90f10f55f15
--- /dev/null
+++ b/dev-vcs/git/git-2.48.1.ebuild
@@ -0,0 +1,475 @@
+# 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.0-doc-deps.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 emesonargs=(
+ $(meson_feature curl)
+ $(meson_feature cgi gitweb)
+ $(meson_feature webdav expat)
+ $(meson_feature iconv)
+ $(meson_feature nls gettext)
+ $(meson_feature pcre pcre2)
+ $(meson_feature perl)
+ $(meson_feature perforce python)
+ $(meson_use test tests)
+ -Dperl_cpan_fallback=false
+ )
+
+ # For non-live, we use a downloaded docs tarball instead.
+ if [[ ${PV} == *9999 ]] || use doc ; then
+ emesonargs+=(
+ -Ddocs="man$(usev doc ',html')"
+ )
+ fi
+
+ 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 perl ; then
+ git_emake -C contrib/credential/netrc
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+ git_emake -C contrib/credential/osxkeychain
+ fi
+
+ if use keyring ; then
+ git_emake -C contrib/credential/libsecret
+ fi
+
+ if use mediawiki ; then
+ git_emake -C contrib/mw-to-git
+ fi
+
+ if use tk ; then
+ git_emake -C gitk-git
+ git_emake -C git-gui
+ fi
+
+ if use doc ; then
+ # Workaround fragments that still use the Makefile and can't
+ # find the bits from Meson's out-of-source build
+ ln -s "${BUILD_DIR}"/Documentation/asciidoc.conf "${S}"/Documentation/asciidoc.conf || die
+ fi
+
+ git_emake -C contrib/diff-highlight
+ git_emake -C contrib/subtree git-subtree
+ # git-subtree.1 requires the full USE=doc dependency stack
+ use doc && git_emake -C contrib/subtree git-subtree.html git-subtree.1
+}
+
+src_test() {
+ # t0610-reftable-basics.sh uses $A
+ local -x A=
+
+ meson_src_test
+
+ # TODO: Needs help finding built git with meson
+ #if use perl ; then
+ # git_emake -C contrib/credential/netrc testverbose
+ #fi
+}
+
+src_install() {
+ meson_src_install
+
+ if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ if use doc ; then
+ cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die
+ rm -rf "${ED}"/usr/share/doc/git-doc/ || die
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+
+ use doc && dodir /usr/share/doc/${PF}/html
+ local d
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ if use doc ; then
+ docinto ${d}/html
+ dodoc Documentation${d}*.html
+ fi
+ 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
+
+ # 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
+
+ # 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
+
+ # git-contacts
+ exeinto /usr/libexec/git-core/
+ doexe contrib/contacts/git-contacts
+ dodoc contrib/contacts/git-contacts.txt
+
+ if use keyring ; then
+ dobin contrib/credential/libsecret/git-credential-libsecret
+ fi
+
+ 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 - build 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
+
+ dobin contrib/credential/netrc/git-credential-netrc
+ fi
+
+ if use mediawiki ; then
+ git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+ fi
+
+ if ! use subversion ; then
+ 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
+ git_emake -C gitk-git DESTDIR="${D}" 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
+}