diff options
Diffstat (limited to 'dev-vcs/git/git-9999.ebuild')
| -rw-r--r-- | dev-vcs/git/git-9999.ebuild | 625 |
1 files changed, 275 insertions, 350 deletions
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 9d9a24a7ff94..d375f35e5ccf 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -1,31 +1,33 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd 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 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # 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: pu - case "${PVR}" in + # 9999-r3: seen + case ${PVR} in 9999) EGIT_BRANCH=maint ;; 9999-r1) EGIT_BRANCH=master ;; 9999-r2) EGIT_BRANCH=next;; - 9999-r3) EGIT_BRANCH=pu ;; + 9999-r3) EGIT_BRANCH=seen ;; esac fi @@ -34,51 +36,55 @@ MY_P="${PN}-${MY_PV}" DOC_VER="${MY_PV}" -DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" +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="mirror://kernel/software/scm/git" - [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' - SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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 ~ia64 ~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="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc keyring +gpg highlight +iconv mediawiki +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND -CDEPEND=" - gnome-keyring? ( app-crypt/libsecret ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) +DEPEND=" + dev-libs/openssl:= sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) - emacs? ( virtual/emacs ) + 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="${CDEPEND} +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 ) @@ -94,64 +100,64 @@ RDEPEND="${CDEPEND} dev-perl/MediaWiki-API ) subversion? ( - dev-vcs/subversion[-dso,perl] + 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 -DEPEND="${CDEPEND} +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) + keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" + test? ( app-crypt/gnupg ) +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" + BDEPEND+=" app-text/asciidoc" fi SITEFILE="50${PN}-gentoo.el" -S="${WORKDIR}/${MY_P}" REQUIRED_USE=" cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) - mediawiki-experimental? ( mediawiki ) + perforce? ( ${PYTHON_REQUIRED_USE} ) subversion? ( perl ) webdav? ( curl ) - pcre-jit? ( pcre ) - perforce? ( ${PYTHON_REQUIRED_USE} ) " -PATCHES=( - # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch +RESTRICT="!test? ( test )" - "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch +PATCHES=( + # Avoid automagic CVS, bug #350330 + "${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch # Make submodule output quiet "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch ) pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then + 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." + ewarn "have been warned!" fi + if use perforce ; then python-single-r1_pkg_setup fi @@ -160,23 +166,24 @@ pkg_setup() { # This is needed because for some obscure reasons future calls to make don't # pick up these exports if we export them in src_unpack() exportmakeopts() { - local myopts=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease - $(usex cvs '' NO_CVS=YesPlease) - $(usex elibc_musl NO_REGEX=YesPlease '') - $(usex iconv '' NO_ICONV=YesPlease) - $(usex nls '' NO_GETTEXT=YesPlease) + $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex perforce '' NO_PYTHON=YesPlease) - $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads '' NO_PTHREAD=YesPlease) - $(usex tk '' NO_TCLTK=YesPlease) + + $(usev elibc_musl NO_REGEX=NeedsStartEnd) + $(usev !cvs NO_CVS=YesPlease) + $(usev !iconv NO_ICONV=YesPlease) + $(usev !nls NO_GETTEXT=YesPlease) + $(usev !perforce NO_PYTHON=YesPlease) + $(usev !subversion NO_SVN_TESTS=YesPlease) + $(usev !tk NO_TCLTK=YesPlease) ) if use blksha1 ; then myopts+=( BLK_SHA1=YesPlease ) - elif use ppcsha1 ; then - myopts+=( PPC_SHA1=YesPlease ) fi if use curl ; then @@ -185,7 +192,7 @@ exportmakeopts() { myopts+=( NO_CURL=YesPlease ) fi - # broken assumptions, because of static build system ... + # Broken assumptions because of static build system myopts+=( NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease @@ -197,69 +204,38 @@ exportmakeopts() { NO_EXTERNAL_GREP= ) - # For svn-fe - extlibs=( -lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '') ) - - # can't define this to null, since the entire makefile depends on it + # Can't define this to null, since the entire makefile depends on it sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi - fi -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=( -# NO_MMAP=YesPlease -# NO_IPV6=YesPlease -# NO_STRLCPY=YesPlease -# NO_MEMMEM=YesPlease -# NO_MKDTEMP=YesPlease -# NO_MKSTEMPS=YesPlease -# ) -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=( NO_NSEC=YesPlease ) - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=( NO_FNMATCH_CASEFOLD=YesPlease ) + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) fi + if [[ ${CHOST} == *-solaris* ]]; then myopts+=( NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ + + if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - if [[ "${CHOST}" == *-uclibc* ]] ; then - myopts+=( NO_NSEC=YesPlease ) - use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) - fi + myopts+=( ASCIIDOC8=YesPlease ) export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" } src_unpack() { - if [[ ${PV} != *9999 ]]; then + 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} @@ -267,24 +243,30 @@ src_unpack() { fi else git-r3_src_unpack - #cp "${FILESDIR}"/GIT-VERSION-GEN . + #cp "${FILESDIR}"/GIT-VERSION-GEN . || die fi } src_prepare() { - # add experimental patches to improve mediawiki support - # see patches for origin - if use mediawiki-experimental ; then + if ! use safe-directory ; then + # This patch neuters the "safe directory" detection. + # bugs #838271, #838223 PATCHES+=( - "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch - "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch - "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch + "${FILESDIR}"/git-2.37.2-unsafe-directory.patch ) fi default + if use prefix ; then + # bug #757309 + sed -i \ + -e 's:/usr/local/opt/gettext/:/do/not/look/elsewhere/:g' \ + -e 's:/opt/homebrew/:/do/not/look/elsewhere/:g' \ + config.mak.uname || die + fi + sed -i \ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ @@ -292,7 +274,7 @@ src_prepare() { -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die + Makefile || die # Fix docbook2texi command sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ @@ -303,22 +285,37 @@ git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" use perforce && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(use perl && perl_get_raw_vendorlib)" \ - sysconfdir="${EPREFIX}"/etc \ - DESTDIR="${D}" \ - GIT_TEST_OPTS="--no-color" \ - OPTAR="$(tc-getAR)" \ - OPTCC="$(tc-getCC)" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - PERL_PATH="${EPREFIX}/usr/bin/perl" \ - PERL_MM_OPT="" \ - PYTHON_PATH="${PYTHON_PATH}" \ - V=1 \ + + local mymakeargs=( + ${MY_MAKEOPTS} + + prefix="${EPREFIX}"/usr + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html + perllibdir="$(use perl && perl_get_raw_vendorlib)" + sysconfdir="${EPREFIX}"/etc + + CC="$(tc-getCC)" + CFLAGS="${CFLAGS}" + PKG_CONFIG="$(tc-getPKG_CONFIG)" + + # TODO: --verbose? + GIT_TEST_OPTS="--no-color" + + OPTAR="$(tc-getAR)" + OPTCC="$(tc-getCC)" + OPTCFLAGS="${CFLAGS}" + OPTLDFLAGS="${LDFLAGS}" + + PERL_PATH="${EPREFIX}/usr/bin/perl" + PERL_MM_OPT="" + + PYTHON_PATH="${PYTHON_PATH}" + + V=1 "$@" + ) + + emake "${mymakeargs[@]}" } src_configure() { @@ -326,64 +323,31 @@ src_configure() { } src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi + git_emake if use perl && use cgi ; then - git_emake \ - gitweb \ - || die "emake gitweb (cgi) failed" + git_emake gitweb fi - if [[ ${CHOST} == *-darwin* ]]; then - pushd contrib/credential/osxkeychain &>/dev/null || die - git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \ - || die "emake credential-osxkeychain" - popd &>/dev/null || die + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then + git_emake -C contrib/credential/osxkeychain fi pushd Documentation &>/dev/null || die if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" + git_emake man if use doc ; then - git_emake info html \ - || die "emake info html failed" + git_emake info html fi else if use doc ; then - git_emake info \ - || die "emake info html failed" + git_emake info fi fi popd &>/dev/null || die - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv=() - use nls && use !elibc_glibc && nlsiconv+=( -lintl ) - use iconv && use !elibc_glibc && nlsiconv+=( -liconv ) - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv[@]}" \ - || die "emake svn-fe failed" - if use doc ; then - # svn-fe.1 requires the full USE=doc dependency stack - git_emake svn-fe.1 \ - || die "emake svn-fe.1 failed" - git_emake svn-fe.html \ - || die "svn-fe.html failed" - fi - popd &>/dev/null || die - fi - - if use gnome-keyring ; then - pushd contrib/credential/libsecret &>/dev/null || die - git_emake || die "emake git-credential-libsecret failed" - popd &>/dev/null || die + if use keyring ; then + git_emake -C contrib/credential/libsecret fi pushd contrib/subtree &>/dev/null || die @@ -392,22 +356,132 @@ src_compile() { use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die - pushd contrib/diff-highlight &>/dev/null || die - git_emake - popd &>/dev/null || die + git_emake -C contrib/diff-highlight if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake - popd &>/dev/null || die + git_emake -C contrib/mw-to-git + fi +} + +src_test() { + local disabled=( + # We make safe-directory optional + t0033-safe-directory.sh + ) + + local tests_cvs=( + t9200-git-cvsexportcommit.sh + t9400-git-cvsserver-server.sh + t9401-git-cvsserver-crlf.sh + t9402-git-cvsserver-refs.sh + t9600-cvsimport.sh + t9601-cvsimport-vendor-branch.sh + t9602-cvsimport-branches-tags.sh + t9603-cvsimport-patchsets.sh + t9604-cvsimport-timestamps.sh + ) + + local tests_perl=( + t3701-add-interactive.sh + t5502-quickfetch.sh + t5512-ls-remote.sh + t5520-pull.sh + t7106-reset-unborn-branch.sh + t7501-commit.sh + ) + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot=( + t0001-init.sh + t0004-unwritable.sh + t0070-fundamental.sh + t1004-read-tree-m-u-wf.sh + t3700-add.sh + t7300-clean.sh + ) + # t9100 still fails with symlinks in SVN 1.7 + local test_svn=( t9100-git-svn-basic.sh ) + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled+=( t5000-tar-tree.sh ) fi + + local cvs=0 + use cvs && let cvs=${cvs}+1 + if [[ ${EUID} -eq 0 ]] ; then + if [[ ${cvs} -eq 1 ]] ; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled+=( ${tests_cvs[@]} ) + fi + einfo "Skipping other tests that require being non-root" + disabled+=( ${tests_nonroot[@]} ) + else + if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then + let cvs=${cvs}+1 + fi + + if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then + let cvs=${cvs}+1 + fi + + if [[ ${cvs} -lt 3 ]] ; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled+=( ${tests_cvs[@]} ) + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled+=( ${tests_perl[@]} ) + fi + + einfo "Disabling tests that fail with SVN 1.7" + disabled+=( ${test_svn[@]} ) + + # Reset all previously disabled tests + pushd t &>/dev/null || die + local i + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled[@]} ; do + if [[ -f "${i}" ]] ; then + mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" + fi + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die + + # Clean old results first, must always run + nonfatal git_emake clean + popd &>/dev/null || die + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + local rc + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + pushd t &>/dev/null || die + nonfatal git_emake aggregate-results + + # And bail if there was a problem + [[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!" } src_install() { - git_emake install || die "make install failed" + git_emake DESTDIR="${D}" install - if [[ ${CHOST} == *-darwin* ]]; then + if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain fi @@ -437,16 +511,6 @@ src_install() { insinto /usr/share/${PN} doins contrib/completion/git-prompt.sh - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED%/}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - #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 @@ -455,19 +519,17 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install for git-subtree" + git_emake DESTDIR="${D}" install if use doc ; then # Do not move git subtree install-man outside USE=doc! - git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" + git_emake DESTDIR="${D}" install-man install-html fi newdoc README README.git-subtree dodoc git-subtree.txt popd &>/dev/null || die if use mediawiki ; then - pushd contrib/mw-to-git &>/dev/null || die - git_emake install - popd &>/dev/null || die + git_emake -C contrib/mw-to-git DESTDIR="${D}" install fi # diff-highlight @@ -484,30 +546,17 @@ src_install() { doexe contrib/contacts/git-contacts dodoc contrib/contacts/git-contacts.txt - if use gnome-keyring ; then + if use keyring ; then pushd contrib/credential/libsecret &>/dev/null || die dobin git-credential-libsecret popd &>/dev/null || die fi - if use subversion ; then - pushd contrib/svn-fe &>/dev/null || die - dobin svn-fe - dodoc svn-fe.txt - if use doc ; then - # Do not move svn-fe.1 outside USE=doc! - doman svn-fe.1 - docinto html - dodoc svn-fe.html - fi - popd &>/dev/null || die - fi - dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above # diff-highlight - done above - # emacs - installed above + # emacs - removed upstream # examples - these are stuff that is not used in Git anymore actually # git-jump - done above # gitview - installed above @@ -521,7 +570,6 @@ src_install() { local contrib_objects=( buildsystems fast-import - hg-to-git hooks remotes2config.sh rerere-train.sh @@ -530,10 +578,7 @@ src_install() { ) local i for i in "${contrib_objects[@]}" ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" + cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}" done if use perl && use cgi ; then @@ -541,26 +586,25 @@ src_install() { # but upstream installs in /usr/share/gitweb # so we will install a symlink and use their location for compat with other # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb + 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 test -d "${d}" ; then find "${d}" \ - -name .packlist \ - -delete || die + 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 + rm -rf "${ED}"/usr/share/gitweb fi if ! use subversion ; then - rm -f "${ED%/}"/usr/libexec/git-core/git-svn \ - "${ED%/}"/usr/share/man/man1/git-svn.1* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -568,8 +612,8 @@ src_install() { newins "${FILESDIR}"/git-daemon.xinetd git-daemon fi - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon + 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" @@ -581,141 +625,22 @@ src_install() { # 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 + if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } - l10n_for_each_disabled_locale_do rm_loc -} - -src_test() { - local disabled=() - local tests_cvs=( - t9200-git-cvsexportcommit.sh - t9400-git-cvsserver-server.sh - t9401-git-cvsserver-crlf.sh - t9402-git-cvsserver-refs.sh - t9600-cvsimport.sh - t9601-cvsimport-vendor-branch.sh - t9602-cvsimport-branches-tags.sh - t9603-cvsimport-patchsets.sh - t9604-cvsimport-timestamps.sh - ) - local tests_perl=( - t3701-add-interactive.sh - t5502-quickfetch.sh - t5512-ls-remote.sh - t5520-pull.sh - t7106-reset-unborn-branch.sh - t7501-commit.sh - ) - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot=( - t0001-init.sh - t0004-unwritable.sh - t0070-fundamental.sh - t1004-read-tree-m-u-wf.sh - t3700-add.sh - t7300-clean.sh - ) - # t9100 still fails with symlinks in SVN 1.7 - local test_svn=( t9100-git-svn-basic.sh ) - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled+=( t5000-tar-tree.sh ) - fi - - local cvs=0 - use cvs && let cvs=${cvs}+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ ${cvs} -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled+=( ${tests_cvs[@]} ) - fi - einfo "Skipping other tests that require being non-root" - disabled+=( ${tests_nonroot[@]} ) - else - [[ ${cvs} -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=${cvs}+1 - [[ ${cvs} -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=${cvs}+1 - if [[ ${cvs} -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled+=( ${tests_cvs[@]} ) - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled+=( ${tests_perl[@]} ) - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled+=( ${test_svn[@]} ) - - # Reset all previously disabled tests - pushd t &>/dev/null || die - local i - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled[@]} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i Makefile || die - - # Clean old results first, must always run - nonfatal git_emake clean - popd &>/dev/null || die - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - local rc - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - pushd t &>/dev/null || die - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" + plocale_for_each_disabled_locale rm_loc } pkg_postinst() { - use emacs && elisp-site-regen - 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" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo - use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed." -} + 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 -pkg_postrm() { - use emacs && elisp-site-regen + 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 } |