From 781ce789353f3393d5dba59e725e7ff4c3b2230f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:07:32 +0000 Subject: [PATCH] dev-vcs/git: Sync with Gentoo It's from Gentoo commit d870cadac7b9654edf9063e58784ad5c7c1b2da0. --- .../portage-stable/dev-vcs/git/Manifest | 3 + ...n-use-test_environment-conditionally.patch | 63 +++ .../dev-vcs/git/git-2.48.1.ebuild | 2 +- .../dev-vcs/git/git-2.49.0-r1.ebuild | 480 ++++++++++++++++++ .../dev-vcs/git/git-9999-r1.ebuild | 117 +++-- .../dev-vcs/git/git-9999-r2.ebuild | 117 +++-- .../dev-vcs/git/git-9999-r3.ebuild | 116 +++-- .../dev-vcs/git/git-9999.ebuild | 117 +++-- 8 files changed, 790 insertions(+), 225 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.49.0-meson-use-test_environment-conditionally.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest index 162e1a8379..ad40e84a4c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest @@ -1,9 +1,12 @@ 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 diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.49.0-meson-use-test_environment-conditionally.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.49.0-meson-use-test_environment-conditionally.patch new file mode 100644 index 0000000000..d9df28c4b5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.49.0-meson-use-test_environment-conditionally.patch @@ -0,0 +1,63 @@ +From 310a34bace801d288e369c6a01a8d04ffc4c3c06 Mon Sep 17 00:00:00 2001 +Message-ID: <310a34bace801d288e369c6a01a8d04ffc4c3c06.1741975400.git.sam@gentoo.org> +From: Sam James +Date: Fri, 14 Mar 2025 18:00:15 +0000 +Subject: [PATCH] meson: use test_environment conditionally. + +test_environment is only defined with -Dtests, so use it conditionally +and define a stub environment() instead, to avoid erroring out: + +``` +$ meson setup -Dtests=false -Dcontrib=subtree build +[...] + +contrib/subtree/meson.build:15:27: ERROR: Unknown variable "test_environment". +``` + +Do the same for 'netrc' in contrib/ as it uses the same pattern. +--- + contrib/credential/netrc/meson.build | 8 ++++++-- + contrib/subtree/meson.build | 8 ++++++-- + 2 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/contrib/credential/netrc/meson.build b/contrib/credential/netrc/meson.build +index a990dbb86d..6d815d01c4 100644 +--- a/contrib/credential/netrc/meson.build ++++ b/contrib/credential/netrc/meson.build +@@ -7,8 +7,12 @@ credential_netrc = custom_target( + install_dir: get_option('libexecdir') / 'git-core', + ) + +-credential_netrc_testenv = test_environment +-credential_netrc_testenv.set('CREDENTIAL_NETRC_PATH', credential_netrc.full_path()) ++if get_option('tests') ++ credential_netrc_testenv = test_environment ++ credential_netrc_testenv.set('CREDENTIAL_NETRC_PATH', credential_netrc.full_path()) ++else ++ credential_netrc_testenv = environment() ++endif + + test('t-git-credential-netrc', + shell, +diff --git a/contrib/subtree/meson.build b/contrib/subtree/meson.build +index 9c72b23625..d18f188216 100644 +--- a/contrib/subtree/meson.build ++++ b/contrib/subtree/meson.build +@@ -12,8 +12,12 @@ git_subtree = custom_target( + install_dir: get_option('libexecdir') / 'git-core', + ) + +-subtree_test_environment = test_environment +-subtree_test_environment.prepend('PATH', meson.current_build_dir()) ++if get_option('tests') ++ subtree_test_environment = test_environment ++ subtree_test_environment.prepend('PATH', meson.current_build_dir()) ++else ++ subtree_test_environment = environment() ++endif + + test('t7900-subtree', shell, + args: [ 't7900-subtree.sh' ], +-- +2.48.1 + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.48.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.48.1.ebuild index 99cdc1b166..38036e16bd 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.48.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.48.1.ebuild @@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then 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" + 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 diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.0-r1.ebuild new file mode 100644 index 0000000000..e5f4bb671f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.49.0-r1.ebuild @@ -0,0 +1,480 @@ +# 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 +) + +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 + + 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/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild index f90f10f55f..e5f4bb671f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild @@ -148,7 +148,8 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch + "${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch + "${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch ) pkg_setup() { @@ -194,7 +195,33 @@ src_prepare() { } 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) @@ -204,9 +231,18 @@ src_configure() { $(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+=( @@ -215,6 +251,15 @@ src_configure() { 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() { @@ -247,25 +292,19 @@ git_emake() { 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 + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -275,9 +314,6 @@ src_compile() { 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() { @@ -285,20 +321,11 @@ src_test() { 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 @@ -310,15 +337,10 @@ src_install() { 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 / @@ -335,17 +357,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 - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -355,15 +366,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 - dobin contrib/credential/libsecret/git-credential-libsecret - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -376,7 +378,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=( @@ -418,8 +420,6 @@ src_install() { 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 @@ -444,7 +444,12 @@ src_install() { fi if use tk ; then - git_emake -C gitk-git DESTDIR="${D}" install + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild index f90f10f55f..e5f4bb671f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild @@ -148,7 +148,8 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch + "${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch + "${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch ) pkg_setup() { @@ -194,7 +195,33 @@ src_prepare() { } 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) @@ -204,9 +231,18 @@ src_configure() { $(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+=( @@ -215,6 +251,15 @@ src_configure() { 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() { @@ -247,25 +292,19 @@ git_emake() { 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 + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -275,9 +314,6 @@ src_compile() { 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() { @@ -285,20 +321,11 @@ src_test() { 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 @@ -310,15 +337,10 @@ src_install() { 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 / @@ -335,17 +357,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 - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -355,15 +366,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 - dobin contrib/credential/libsecret/git-credential-libsecret - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -376,7 +378,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=( @@ -418,8 +420,6 @@ src_install() { 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 @@ -444,7 +444,12 @@ src_install() { fi if use tk ; then - git_emake -C gitk-git DESTDIR="${D}" install + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild index b9d2fdd442..e5f4bb671f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild @@ -148,7 +148,8 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch + "${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch + "${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch ) pkg_setup() { @@ -194,7 +195,33 @@ src_prepare() { } 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) @@ -204,10 +231,18 @@ src_configure() { $(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+=( @@ -216,6 +251,15 @@ src_configure() { 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() { @@ -248,25 +292,19 @@ git_emake() { 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 + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -276,9 +314,6 @@ src_compile() { 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() { @@ -286,20 +321,11 @@ src_test() { 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 @@ -311,15 +337,10 @@ src_install() { 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 / @@ -336,17 +357,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 - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -356,15 +366,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 - dobin contrib/credential/libsecret/git-credential-libsecret - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -377,7 +378,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=( @@ -419,8 +420,6 @@ src_install() { 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 @@ -445,7 +444,12 @@ src_install() { fi if use tk ; then - git_emake -C gitk-git DESTDIR="${D}" install + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild index f90f10f55f..e5f4bb671f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild @@ -148,7 +148,8 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" PATCHES=( - "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch + "${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch + "${FILESDIR}"/${PN}-2.49.0-meson-use-test_environment-conditionally.patch ) pkg_setup() { @@ -194,7 +195,33 @@ src_prepare() { } 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) @@ -204,9 +231,18 @@ src_configure() { $(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+=( @@ -215,6 +251,15 @@ src_configure() { 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() { @@ -247,25 +292,19 @@ git_emake() { 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 + + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_compile + ) + fi if use doc ; then @@ -275,9 +314,6 @@ src_compile() { 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() { @@ -285,20 +321,11 @@ src_test() { 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 @@ -310,15 +337,10 @@ src_install() { 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 / @@ -335,17 +357,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 - # diff-highlight dobin contrib/diff-highlight/diff-highlight newdoc contrib/diff-highlight/README README.diff-highlight @@ -355,15 +366,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 - dobin contrib/credential/libsecret/git-credential-libsecret - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -376,7 +378,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=( @@ -418,8 +420,6 @@ src_install() { 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 @@ -444,7 +444,12 @@ src_install() { fi if use tk ; then - git_emake -C gitk-git DESTDIR="${D}" install + ( + EMESON_SOURCE="${S}"/gitk-git + BUILD_DIR="${WORKDIR}"/gitk-git_build + meson_src_install + ) + git_emake -C git-gui DESTDIR="${D}" install fi