dev-vcs/git: Bump to version 2.27.0_rc0
authorLars Wendler <polynomial-c@gentoo.org>
Wed, 20 May 2020 18:37:42 +0000 (20:37 +0200)
committerLars Wendler <polynomial-c@gentoo.org>
Wed, 20 May 2020 19:13:54 +0000 (21:13 +0200)
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
dev-vcs/git/Manifest
dev-vcs/git/git-2.27.0_rc0.ebuild [new file with mode: 0644]

index dc5ca43f1c94f54a717f249e79d6424ab467d931..3eeff57650963a159bff755e155769e81d041505 100644 (file)
@@ -2,11 +2,14 @@ DIST git-2.23.3.tar.xz 5716108 BLAKE2B 9d0e63e075d8e64bf2772bdd3e49e9907ae093bcf
 DIST git-2.24.3.tar.xz 5774192 BLAKE2B a8bea56f85a12863565325984a303ac2d964e0371de5252252a736a376a22cc1695da15b46d35bdec8a36c2ebd7ba7040727265acee37892350aad08209ed15f SHA512 b2fbafd0faa06a304e960f78696f5c033eb5330b18af28c0d169af86aa836dada0c3cf349993b1c9a6129d0c42788167a393f9db9be981610318dca5743b2c87
 DIST git-2.25.4.tar.xz 5880976 BLAKE2B a3ac79918ba174a93844d9518a2f1c6970abe2cd31acea260742d3c03a31a03131f53603a3bd3e525a60f8ebcfbbaa3b92228e2486717ca2d389a978e39bd5ec SHA512 ca2ecc561d06dbb393fe47d445f0d69423d114766d9bcc125ef1d6d37e350ad903c456540cea420c1a51635b750cde3901e4196f29ce95b315fda11270173450
 DIST git-2.26.2.tar.xz 6007864 BLAKE2B efce003a95e24dbb6e14feebd35874c9ed1a5c06d7f0722d4dfefae830613b64b81faa41d5952400fa382b385d15d48829f8ee3b4d065e134bd38fa0e10bf570 SHA512 5d92d07b171c5cd6e89a29c1211c73c1c900cd51c74d690aebfb4a3d0e93b541b09b42b6d6a1a82f5c3d953096771f9a8605c63be139f559f58698c1a0eabcfc
+DIST git-2.27.0.rc0.tar.xz 6054064 BLAKE2B 46ecae68b111be2d5d2e2664dd80864ad7e3b0b6ee4725baf3a4f3aa95f1434188c6a2641df67376006ff5c1540e89d68999a1e12af8d36ed4d47a994feb3224 SHA512 796d39845e3e18445660b280b6041fda3f5b3bd367f892048871b3a4cd6e6e21c84cee9e4ed8cb0778cda8f9518e8dff3351f63dccecade9431db6fa4ed6b034
 DIST git-htmldocs-2.23.3.tar.xz 1295344 BLAKE2B 7a6d8198cf8285717f11731ea907ea06786c486701a729d071deedc5437a595dab355ae2d0ac2814b10503ab4161e76a1245663a9ce35ce48d03be9905315db3 SHA512 2c86c03f29f1a4fc2acb17a17a9e1a3df2ec95138895f5c8e776859772ebc7b95c24af0e328508ccf1ea85b7adaa86a9aedc4d0c353ffc91ad5810ecc9a48059
 DIST git-htmldocs-2.24.3.tar.xz 1307828 BLAKE2B 5d6dda03e2c51346326a1258a14a0ee16fab7fe83c80b4a1a0b307a6343db851d89b96afcf616e10ad5831352a90332ac602e5713444855327e11be8992a5274 SHA512 14289fb46cff48bece0cdafea9ef201facdb58eafce4b735ce50489356deb993c481ac1b6e96a2f98cfe30434280997c47f2cca0bdb2b6e85c31cb7cf17cc257
 DIST git-htmldocs-2.25.4.tar.xz 1296896 BLAKE2B 4f6469acdcd699698bd1f19bd0d911fd522c1890115f25c087a7870b855eb9354340fe17e9e6aaec7fb27cd951fe28cadbf26e1aeadc76f3c3a1cde4d23e42cd SHA512 e10c6fa52e213a2b18290fed375f6e176eef17b0a19f6906f09d6228d18bece88ff0ec97d871db0ba29fc0fbff73740312ab01eab809bd6a9a41c8b295cf8d67
 DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B e0de88c5c41646d5fb9b54e2ee873c7904e1b85c67f971499f0227eb2dd59cabd4ffc58c468cf8a7a7466920af972dbc7f95d78003e487edac9a15a9c49b80a2 SHA512 b577693180b4fc035af211e3b83e98ad5e1bfbb98706924858df6558383b82ca05f870bdae90f8a14c8bf664f091ee928af52dcdebdfb98dc7387fdfe2e3a396
+DIST git-htmldocs-2.27.0.rc0.tar.xz 1325528 BLAKE2B 4846bd9e2260b99b8186ffd8b3d9a9fcfd27c21319b929415ab1a9cb19c75106974161dbf0afb16267c73a5db6b5ed3120677f62b9bfcac8b8aabacb0c432fb9 SHA512 af650c7f41b8f4716c02975af2f8c5dc2d8237661d8438b07dc5c8ab6064b9a008f9d0818aad4ffaa2dff15bf4503d6d1c679bdc3ba8503e243b362649dffd83
 DIST git-manpages-2.23.3.tar.xz 449464 BLAKE2B bfc0153e43724df7210110e836d47f17258e45a876aa9bf4604c3f38e690e0e5379d4394df96c3dd84ea4d7371b7843729e6fb5d4b43fd7d4a9b4c3f4062a922 SHA512 a7b5fc48a5b840eb9b668b441ad3c30f65adc73c22cda461ffaca1cfddf154bf1974cab6c372b4534fd45a43a2e2ab96513364845a7db4285b88e31bf7619f8e
 DIST git-manpages-2.24.3.tar.xz 454796 BLAKE2B b340b33593e596a7a87385110fea53a96b68f0b0c5c02e046a1aff5ff7c7a6bf3d7a55c4d33796db8e84824df72451ad51db9fc44df4840ecd0183c0ef49eba0 SHA512 22709e159196da27befc26eef3ab40dab9700c95abf6892860a81c8e5df7d85ad423c877e6c88949cfc611c4dfebd956f02a78f0340c1cd4d58c48f80e3e1cce
 DIST git-manpages-2.25.4.tar.xz 459344 BLAKE2B b0ac88f691984f39f6cfbf41d2d61ab443573974277536641daddf0e9b7755ea9cb6bc96ecf3c14479809036171e461eff72cb498c63a56eea041341b8a65af5 SHA512 a67b881f289d5b3e2187ad55c5176258c30108c73fc7c18d50c1a6b42b241ce46dba28acf2f7bfc994b044444a6678096a35ad60936ea6cba07b52ddf647da17
 DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f5596548f076f5fec5dfc6c752e8b3caa5f64ba182c1566b67878b19fbb115297e08def1bf9d2711c7334cbb8e1b20fc039a1 SHA512 9591e94683a6b49d8b9f2afddc826576023fdfa6de6db4af3a28a2af00b175d5be710d86a31d0f1b8320cc38b6f27698e17fb3e8c1f2b0c5ced37296ef1109b6
+DIST git-manpages-2.27.0.rc0.tar.xz 470760 BLAKE2B 4910fe4c32c07f9bb8e917c4e60abd20febee7e56e79192a91ca0ef5bbfa48509f34a408a0aba86a086b2cf1b7b6d38cce90f7e1fc4467651f91b10a69808df7 SHA512 e4c821c4ea285a8ab48171302b86cce0f2cd30333b3e37760dcdd21c156ba6cfed203b256c01b12390d91a9ddf8fd816fdc7a564e9c96f32e4432d87249e1be5
diff --git a/dev-vcs/git/git-2.27.0_rc0.ebuild b/dev-vcs/git/git-2.27.0_rc0.ebuild
new file mode 100644 (file)
index 0000000..35ba555
--- /dev/null
@@ -0,0 +1,728 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+       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) EGIT_BRANCH=maint ;;
+               9999-r1) EGIT_BRANCH=master ;;
+               9999-r2) EGIT_BRANCH=next;;
+               9999-r3) EGIT_BRANCH=pu ;;
+       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_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 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+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"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+       gnome-keyring? ( app-crypt/libsecret )
+       !libressl? ( dev-libs/openssl:0= )
+       libressl? ( dev-libs/libressl:= )
+       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? ( >=app-editors/emacs-23.1:* )
+       iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+       gpg? ( app-crypt/gnupg )
+       perl? (
+               dev-perl/Error
+               dev-perl/MailTools
+               dev-perl/Authen-SASL
+               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} )
+"
+
+# 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
+       )
+       nls? ( sys-devel/gettext )
+       test? ( app-crypt/gnupg )
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+       BDEPEND="${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 )
+       subversion? ( perl )
+       webdav? ( curl )
+       pcre-jit? ( pcre )
+       perforce? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+       # bug #350330 - automagic CVS when we don't want it is bad.
+       "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
+
+       "${FILESDIR}"/git-2.2.0-svn-fe-linking.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
+               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
+}
+
+# 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 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_PTHREADS=YesPlease)
+               $(usex 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
+               use webdav || myopts+=( NO_EXPAT=YesPlease )
+       else
+               myopts+=( NO_CURL=YesPlease )
+       fi
+
+       # broken assumptions, because of static build system ...
+       myopts+=(
+               NO_FINK=YesPlease
+               NO_DARWIN_PORTS=YesPlease
+               INSTALL=install
+               TAR=tar
+               SHELL_PATH="${EPREFIX}/bin/sh"
+               SANE_TOOL_PATH=
+               OLD_ICONV=
+               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
+       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 )
+       fi
+       if [[ ${CHOST} == *-solaris* ]]; then
+               myopts+=(
+                       NEEDS_LIBICONV=YesPlease
+                       HAVE_CLOCK_MONOTONIC=1
+               )
+               if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
+                       myopts+=( HAVE_GETDELIM=1 )
+               fi
+       fi
+
+       if has_version '>=app-text/asciidoc-8.0' ; then
+               myopts+=( ASCIIDOC8=YesPlease )
+       fi
+
+       # 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
+
+       export MY_MAKEOPTS="${myopts[@]}"
+       export EXTLIBS="${extlibs[@]}"
+}
+
+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
+               #cp "${FILESDIR}"/GIT-VERSION-GEN .
+       fi
+
+}
+
+src_prepare() {
+       # add experimental patches to improve mediawiki support
+       # see patches for origin
+       if use mediawiki-experimental ; then
+               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
+               )
+       fi
+
+       default
+
+       sed -i \
+               -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+               -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+               -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+               -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
+
+       # Fix docbook2texi command
+       sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+               Documentation/Makefile || die
+}
+
+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 \
+               "$@"
+}
+
+src_configure() {
+       exportmakeopts
+}
+
+src_compile() {
+       git_emake || die "emake failed"
+
+       if use emacs ; then
+               elisp-compile contrib/emacs/git{,-blame}.el
+       fi
+
+       if use perl && use cgi ; then
+               git_emake \
+                       gitweb \
+                       || die "emake gitweb (cgi) failed"
+       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
+       fi
+
+       pushd Documentation &>/dev/null || die
+       if [[ ${PV} == *9999 ]] ; then
+               git_emake man \
+                       || die "emake man failed"
+               if use doc ; then
+                       git_emake info html \
+                               || die "emake info html failed"
+               fi
+       else
+               if use doc ; then
+                       git_emake info \
+                               || die "emake info html failed"
+               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
+       fi
+
+       pushd contrib/subtree &>/dev/null || die
+       git_emake git-subtree
+       # git-subtree.1 requires the full USE=doc dependency stack
+       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
+
+       if use mediawiki ; then
+               pushd contrib/mw-to-git &>/dev/null || die
+               git_emake
+               popd &>/dev/null || die
+
+       fi
+}
+
+src_install() {
+       git_emake install || die "make install failed"
+
+       if [[ ${CHOST} == *-darwin* ]]; then
+               dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+       fi
+
+       # Depending on the tarball and manual rebuild of the documentation, the
+       # manpages may exist in either OR both of these directories.
+       find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+       find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+       dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+       use doc && dodir /usr/share/doc/${PF}/html
+       local d
+       for d in / /howto/ /technical/ ; do
+               docinto ${d}
+               dodoc Documentation${d}*.txt
+               if use doc ; then
+                       docinto ${d}/html
+                       dodoc Documentation${d}*.html
+               fi
+       done
+       docinto /
+       # Upstream does not ship this pre-built :-(
+       use doc && doinfo Documentation/{git,gitman}.info
+
+       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
+
+       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
+       exeinto /usr/libexec/git-core/
+       newexe contrib/git-resurrect.sh git-resurrect
+
+       # git-subtree
+       pushd contrib/subtree &>/dev/null || die
+       git_emake install || die "Failed to emake install for git-subtree"
+       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"
+       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
+       fi
+
+       # diff-highlight
+       dobin contrib/diff-highlight/diff-highlight
+       newdoc contrib/diff-highlight/README README.diff-highlight
+
+       # git-jump
+       exeinto /usr/libexec/git-core/
+       doexe contrib/git-jump/git-jump
+       newdoc contrib/git-jump/README git-jump.txt
+
+       # git-contacts
+       exeinto /usr/libexec/git-core/
+       doexe contrib/contacts/git-contacts
+       dodoc contrib/contacts/git-contacts.txt
+
+       if use gnome-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
+       # examples - these are stuff that is not used in Git anymore actually
+       # git-jump - done above
+       # gitview - installed above
+       # p4import - excluded because fast-import has a better one
+       # patches - stuff the Git guys made to go upstream to other places
+       # persistent-https - TODO
+       # mw-to-git - TODO
+       # subtree - build  seperately
+       # svnimport - use git-svn
+       # thunderbird-patch-inline - fixes thunderbird
+       local contrib_objects=(
+               buildsystems
+               fast-import
+               hg-to-git
+               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 perl && 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 test -d "${d}" ; then find "${d}" \
+                               -name .packlist \
+                               -delete || die
+                       fi
+               done
+       else
+               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*
+       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-r1.initd git-daemon
+               newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+               systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+               systemd_dounit "${FILESDIR}/git-daemon.socket"
+       fi
+
+       perl_delete_localpod
+
+       # Remove disabled linguas
+       # we could remove sources in src_prepare, but install does not
+       # handle missing locale dir well
+       rm_loc() {
+               if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+                       rm -r "${ED}/usr/share/locale/${1}" || die
+               fi
+       }
+       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}) ${@}"
+}
+
+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."
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}