From 18f850bb4cedde39678b12a67f82f29eef2dab63 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Mar 2025 00:29:23 +0000 Subject: gentoo auto-resync : 16:03:2025 - 00:29:23 --- dev-vcs/git/Manifest | 10 +- dev-vcs/git/git-2.49.0-r1.ebuild | 480 +++++++++++++++++++++++++++++++++++++++ dev-vcs/git/git-2.49.0.ebuild | 466 ------------------------------------- dev-vcs/git/git-9999-r1.ebuild | 30 ++- dev-vcs/git/git-9999-r2.ebuild | 30 ++- dev-vcs/git/git-9999-r3.ebuild | 30 ++- dev-vcs/git/git-9999.ebuild | 30 ++- 7 files changed, 573 insertions(+), 503 deletions(-) create mode 100644 dev-vcs/git/git-2.49.0-r1.ebuild delete mode 100644 dev-vcs/git/git-2.49.0.ebuild (limited to 'dev-vcs/git') diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index a05ef5abf0ef..07159a938d1e 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -26,9 +26,9 @@ DIST git-manpages-2.49.0.tar.xz 594760 BLAKE2B c5a1810e1369cc94c93716db5baf9d217 EBUILD git-2.45.2.ebuild 16448 BLAKE2B eecc66b8793b6a99e40c28fea1ef68bbb25902981bf18a09d7e8f2e6c00a27133b3fc2318f9460acba64d341cf6ad8970d2e855e6c4baffc982ec8830db8d2f8 SHA512 47dd7ec8dbd7256bfcdcb810abd6d47aababde17e68343cf5941dd529232ca0ecd321c2d1aa23f17ce8bd501203d39ddfa1bf3e4bb63c84f9c06e5c76fff5179 EBUILD git-2.45.3.ebuild 16448 BLAKE2B 849adc38c76ee0dba0523cad77db4a06b74b891815555578dff3a40db29b91a17f2cdd6e0727cbf842781bb3f5c215cf880f7949f157fc2f9dfbd13afc2768b9 SHA512 f1ebde7f07478fd40aedc5eca9826e1fc4684f1f808dbd29e2cbdd620df130646a5acf5f54cf160b92bb4aa1fe31afddde3101814ebb9c4a5505021806f1d23b EBUILD git-2.48.1.ebuild 12070 BLAKE2B a3229350b02f44ff2be649d73bb56fe2741c2981e04c48cc49425ee00d78da4ebde7329d492f4ec725234e77cfeb3d060b2cf46cb9fb8a6a1c9e7978575da3f3 SHA512 6fb503653a7d1ef93cb889db38db6a31c2ae49454e5f939e41e0580ba45d317bb0ef322d7c365426632348c41a2a256b7e39645cdf09e772128328a504559aeb -EBUILD git-2.49.0.ebuild 11563 BLAKE2B a5bdc01980b0760162a8c4a4e818d1b4c09d7c74aade6627db51b8fb27a0e453204ee20ed3d74718073b6ab9ce297579e786da3e984b04a3dba7c6697abf9d06 SHA512 1575f93b306a0ecc94a2b69ec3adcfc21ac266e5adb14033bedacfc09ed60936f3c39fad519edb558f16ebb26acbd2bc6926fe23c221a64d2e74e84cd7fecabc -EBUILD git-9999-r1.ebuild 11563 BLAKE2B a5bdc01980b0760162a8c4a4e818d1b4c09d7c74aade6627db51b8fb27a0e453204ee20ed3d74718073b6ab9ce297579e786da3e984b04a3dba7c6697abf9d06 SHA512 1575f93b306a0ecc94a2b69ec3adcfc21ac266e5adb14033bedacfc09ed60936f3c39fad519edb558f16ebb26acbd2bc6926fe23c221a64d2e74e84cd7fecabc -EBUILD git-9999-r2.ebuild 11563 BLAKE2B a5bdc01980b0760162a8c4a4e818d1b4c09d7c74aade6627db51b8fb27a0e453204ee20ed3d74718073b6ab9ce297579e786da3e984b04a3dba7c6697abf9d06 SHA512 1575f93b306a0ecc94a2b69ec3adcfc21ac266e5adb14033bedacfc09ed60936f3c39fad519edb558f16ebb26acbd2bc6926fe23c221a64d2e74e84cd7fecabc -EBUILD git-9999-r3.ebuild 11563 BLAKE2B a5bdc01980b0760162a8c4a4e818d1b4c09d7c74aade6627db51b8fb27a0e453204ee20ed3d74718073b6ab9ce297579e786da3e984b04a3dba7c6697abf9d06 SHA512 1575f93b306a0ecc94a2b69ec3adcfc21ac266e5adb14033bedacfc09ed60936f3c39fad519edb558f16ebb26acbd2bc6926fe23c221a64d2e74e84cd7fecabc -EBUILD git-9999.ebuild 11563 BLAKE2B a5bdc01980b0760162a8c4a4e818d1b4c09d7c74aade6627db51b8fb27a0e453204ee20ed3d74718073b6ab9ce297579e786da3e984b04a3dba7c6697abf9d06 SHA512 1575f93b306a0ecc94a2b69ec3adcfc21ac266e5adb14033bedacfc09ed60936f3c39fad519edb558f16ebb26acbd2bc6926fe23c221a64d2e74e84cd7fecabc +EBUILD git-2.49.0-r1.ebuild 11704 BLAKE2B 6ce434e0a7598c34425565eb6b9563f6d1091e8228f953b557c04980d46fcf9e06eea48da50ba6a93096fb064da8a3c37633b4f5da1f6c6bfbf1737eabe036bd SHA512 cba36dc613a471ba4a49497d84cf918925d398c30b2e8e3d08cdc6a332ada62dbced82223dfbaaf74c248f64e07d2bbad2c40c57328531eb3d59e74ac98507be +EBUILD git-9999-r1.ebuild 11704 BLAKE2B 6ce434e0a7598c34425565eb6b9563f6d1091e8228f953b557c04980d46fcf9e06eea48da50ba6a93096fb064da8a3c37633b4f5da1f6c6bfbf1737eabe036bd SHA512 cba36dc613a471ba4a49497d84cf918925d398c30b2e8e3d08cdc6a332ada62dbced82223dfbaaf74c248f64e07d2bbad2c40c57328531eb3d59e74ac98507be +EBUILD git-9999-r2.ebuild 11704 BLAKE2B 6ce434e0a7598c34425565eb6b9563f6d1091e8228f953b557c04980d46fcf9e06eea48da50ba6a93096fb064da8a3c37633b4f5da1f6c6bfbf1737eabe036bd SHA512 cba36dc613a471ba4a49497d84cf918925d398c30b2e8e3d08cdc6a332ada62dbced82223dfbaaf74c248f64e07d2bbad2c40c57328531eb3d59e74ac98507be +EBUILD git-9999-r3.ebuild 11704 BLAKE2B 6ce434e0a7598c34425565eb6b9563f6d1091e8228f953b557c04980d46fcf9e06eea48da50ba6a93096fb064da8a3c37633b4f5da1f6c6bfbf1737eabe036bd SHA512 cba36dc613a471ba4a49497d84cf918925d398c30b2e8e3d08cdc6a332ada62dbced82223dfbaaf74c248f64e07d2bbad2c40c57328531eb3d59e74ac98507be +EBUILD git-9999.ebuild 11704 BLAKE2B 6ce434e0a7598c34425565eb6b9563f6d1091e8228f953b557c04980d46fcf9e06eea48da50ba6a93096fb064da8a3c37633b4f5da1f6c6bfbf1737eabe036bd SHA512 cba36dc613a471ba4a49497d84cf918925d398c30b2e8e3d08cdc6a332ada62dbced82223dfbaaf74c248f64e07d2bbad2c40c57328531eb3d59e74ac98507be MISC metadata.xml 2041 BLAKE2B 309964a6982f6f14cecc40b4021d96d2e28c49789480bc4037879375cb5277c2eb500ff36800657e783c36f541265db20b464fc39ce2ac39ff4cda881854662f SHA512 a8dd2f76985690cded8555a0b82e5004b4d93ccc45988fdc04ef8ed3e17ef73d2b83dc9fb6b913e5f9d2b78ebe715e9eb32bfce607318d0e8c0834987eabe5b6 diff --git a/dev-vcs/git/git-2.49.0-r1.ebuild b/dev-vcs/git/git-2.49.0-r1.ebuild new file mode 100644 index 000000000000..e5f4bb671f79 --- /dev/null +++ b/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/dev-vcs/git/git-2.49.0.ebuild b/dev-vcs/git/git-2.49.0.ebuild deleted file mode 100644 index 133f0889e801..000000000000 --- a/dev-vcs/git/git-2.49.0.ebuild +++ /dev/null @@ -1,466 +0,0 @@ -# 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' - # Avoid automagic installation of gitk-gui. - $(usev !tk "wish='wish-falseified'") - 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 -} - -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 - 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 - - # 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 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 - git_emake -C git-gui DESTDIR="${D}" install - fi - - perl_delete_localpod - - # Remove disabled linguas - # we could remove sources in src_prepare, but install does not - # handle missing locale dir well - rm_loc() { - if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then - rm -r "${ED}/usr/share/locale/${1}" || die - fi - } - plocale_for_each_disabled_locale rm_loc -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - elog "Please read /usr/share/bash-completion/completions/git for Git bash command" - elog "completion." - elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - elog "Note that the prompt bash code is now in that separate script" - fi - - optfeature_header "Some scripts require additional dependencies:" - optfeature git-quiltimport dev-util/quilt - optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx -} diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 133f0889e801..e5f4bb671f79 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -211,15 +211,12 @@ src_configure() { 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' - # Avoid automagic installation of gitk-gui. - $(usev !tk "wish='wish-falseified'") EOF local emesonargs=( @@ -254,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() { @@ -292,6 +298,13 @@ src_compile() { 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 @@ -308,11 +321,6 @@ 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() { @@ -436,6 +444,12 @@ src_install() { 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 diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 133f0889e801..e5f4bb671f79 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -211,15 +211,12 @@ src_configure() { 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' - # Avoid automagic installation of gitk-gui. - $(usev !tk "wish='wish-falseified'") EOF local emesonargs=( @@ -254,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() { @@ -292,6 +298,13 @@ src_compile() { 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 @@ -308,11 +321,6 @@ 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() { @@ -436,6 +444,12 @@ src_install() { 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 diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 133f0889e801..e5f4bb671f79 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -211,15 +211,12 @@ src_configure() { 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' - # Avoid automagic installation of gitk-gui. - $(usev !tk "wish='wish-falseified'") EOF local emesonargs=( @@ -254,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() { @@ -292,6 +298,13 @@ src_compile() { 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 @@ -308,11 +321,6 @@ 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() { @@ -436,6 +444,12 @@ src_install() { 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 diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 133f0889e801..e5f4bb671f79 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -211,15 +211,12 @@ src_configure() { 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' - # Avoid automagic installation of gitk-gui. - $(usev !tk "wish='wish-falseified'") EOF local emesonargs=( @@ -254,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() { @@ -292,6 +298,13 @@ src_compile() { 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 @@ -308,11 +321,6 @@ 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() { @@ -436,6 +444,12 @@ src_install() { 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 -- cgit v1.2.3