commit:     dbf0cc3a4b54f5d2d44552798166e02777376fb2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  6 08:20:06 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov  6 09:39:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf0cc3a

dev-vcs/git: Removed old.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 dev-vcs/git/Manifest              |   9 -
 dev-vcs/git/git-2.13.5.ebuild     | 680 ------------------------------------
 dev-vcs/git/git-2.14.2.ebuild     | 699 --------------------------------------
 dev-vcs/git/git-2.15.0_rc2.ebuild | 699 --------------------------------------
 4 files changed, 2087 deletions(-)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 714621c0f6e..d5e00496694 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,18 +1,9 @@
-DIST git-2.13.5.tar.xz 4756436 SHA256 
21c9e29caac86d244ac7af78bc3422746dabb903cb3952a1ceefd801020ad1a1 SHA512 
4a0b55d19f15cf0ca388d43b650c1ccadbc32964925e5d0a3107ae84c38506af957335ceb0cbb5468ffbe0f5283f8e188aa51c9e915b3249126eb37c304be9ec
 WHIRLPOOL 
7a3c9971f37de366801be6a6d1d28a1d02b2f3fe98a508465c01d600913efd0ae4d241fb690686beb2ae9b0321ba4f7eb5b313ec47fb04eb7d0e0e51170c6750
 DIST git-2.13.6.tar.xz 4756820 SHA256 
bce97e403bea34f50378e90ade10c12666b2382cc247551b63dc5604e03b2523 SHA512 
ed39784205e1077f886eebdfb34a205fb0433071de29f673a79ea32bca31a2ba9bdabba208c9679ea2f6f295bafad52a7e7852b5bd2ccb1e6c99a1d2e76e8ada
 WHIRLPOOL 
aeadb595a3fc9b74b143478436f4511d15735e5e01bbaf84bc60ef6c3bb91d94aa29ea1bd700a08d3aea3341de4cee5c4d5ced0b550a223faaadd37774cd3492
-DIST git-2.14.2.tar.xz 4800208 SHA256 
50e9723996114ad1eec4dda89960d9fe34461749ae42031008a261fedd03c7a1 SHA512 
fe99486e0aef8d73dace3081bbd62bc6d08bc13868b98c905f7833458fdfc464eea504ae2961f4a2f38892cb0e76b533a50a2cacdf07c9ad9f8106e7ac1c353c
 WHIRLPOOL 
af0d166fc00aea8a4a77984e8bf92f6fb3abc854263316961683e5e27c8adbe1d73a3384b4d14c2ce762d75fd95f67da9a95a3fd3eca4d6747eb1850ab7b084e
 DIST git-2.14.3.tar.xz 4802252 SHA256 
5330960dd52467f6e5bf1931b9fd42b76d3f8ce9bc75150b54ecfb57d407151d SHA512 
e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643
 WHIRLPOOL 
2ea153e7e32653a86d166c151c2dde5b1e3e1220cfead1ad771ae183aa0f73f04c77f51811f8a0f005f4c3590a288dcd98be8211dfcb989ef7d29328185f1de9
-DIST git-2.15.0.rc2.tar.xz 4838680 SHA256 
df624082e8e26ea94a6794da7a14861ff3724d98f1368ebbf85520741083f895 SHA512 
7a9415ecac4a0ee5f7058efaec5e72f857fd4972ebcedfb04924e431a2d093ee146a16e88fe053990367488ed550b8f7d9fa7db03819a2dc39bc0a6b013171a0
 WHIRLPOOL 
4bc4f74d28306ccb60a3ab60d6f0daa3a1a4897e054589fb7c374f53269ab4b3e62cd386368a91a5736632183a09d69878350aa0f18c76e41b74c7c89aeaf63e
 DIST git-2.15.0.tar.xz 4892056 SHA256 
107116489f10b758b51af1c5dbdb9a274917b0fb67dc8eaefcdabc7bc3eb3e6a SHA512 
994704b440ebce104a99d815dd713af3173f29e70646d7135c3fcd1ac4694a26e499f0732843606c397cbf6108809eb397546c837623a4adbe1ccb2fc825cb64
 WHIRLPOOL 
f03b8ba84c9e1e78680571af94b7b166774eab002ceb724c94c02b58d40b70fff7fc314ab5ee95cd2c8ae3dcf02355c8bb5f280f201efb8105c2015bda94cc71
-DIST git-htmldocs-2.13.5.tar.xz 1110236 SHA256 
f5f10d821544446547dc91798772f36d7515a824c9a28f22521f0094e1a4dc08 SHA512 
0ba006ddc35325052be4d969a3a966ec1be7954dcc1676b9914953720e56f3c9a4522541d964c6ff08a921c35f983213eacd00b99db5d97b97ea8f5c1181ed73
 WHIRLPOOL 
020963c8544dba6acc4b0e681a844b6a9f332b3b3469c056d678791afacab54f4badd956137b21d3a5d2ea465a83f05d815a2c066f71fade41a58e8f802088bd
 DIST git-htmldocs-2.13.6.tar.xz 1110668 SHA256 
cdc39ecc8d1ce09f7b865832ebbc466441beb61d1aad4c7796514520220dabf0 SHA512 
9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc
 WHIRLPOOL 
126d8ae25c71dc4e6a6eb20ba611cd2eaf94ea8f4f89fde82b2d05044e93f425d9812559db5599b557a1a8f5832cc41d0651b421d265219c257351fe7fb41f2b
-DIST git-htmldocs-2.14.2.tar.xz 1115940 SHA256 
a36661e81e5b21e788cd84e11860bcd0cafa402eff06e6371415a5a0e0b80dfb SHA512 
c5dda319713a98b9f655a04fbb4dfcba4cc60fe22586bae73a88111d96cd8da989060b8450549a32a5c5bf5bc8ce735e73055ce72b8bf5d3b4fcec2040fa196b
 WHIRLPOOL 
1b47b798ae00f29e84862b973f4e284076eba84992f52b92903b56d50f0a463aac011fdcb3ea0b4859d2cf8661eb24c5faf4569ed22de952e293df95ca9a0438
 DIST git-htmldocs-2.14.3.tar.xz 1116824 SHA256 
9d28b922ad861bf747ca34a4f083efa3ce41ca39cccb0dfab8bdcf0b58694ccb SHA512 
a73160724f944832f915ff29c557e2a968d6c5ae5c4e9759d96444af8841e52a1193d50a74f01deb1ec5ef03b3301897bd85c5ebb82ac22d8188d528629d74d4
 WHIRLPOOL 
748cf71a16871cb91e84f7fdd4a2f6beeaf05d514a7e6ea34d02256a8196d0f9814db252c98d6178643ae183f31813cadf9b7056b61ab4478c157e2236cc71bd
-DIST git-htmldocs-2.15.0.rc2.tar.xz 1132916 SHA256 
4b5b38eb028356cda303add5d6132b94b744c2b7d4aadd7fe99ee2b6bf24e964 SHA512 
5ad647e9db64f3f048560d032ca6bf712b45c64ba87a8443462e392c11bb23d28d094139edac800608202320de0d62944c421b5bedf727aefc78ff3823999626
 WHIRLPOOL 
fb441afed5d1d5bb8432d733febe26d972e334433b35d68c57ce63a773f4b5e189a975ce634a83d7f1405d93d03dfb0e2aaa24b9552dc8ef5c13ec712f930f2d
 DIST git-htmldocs-2.15.0.tar.xz 1132908 SHA256 
79b2029855eeab2a01f38baeeabf6fbd222ea6de02457f0d5b9f2325cf96c514 SHA512 
a3ed8dd5ba7a35eb89b375a04bea2aee8ad08744ba4e0016842595491fd9ed95cebc969108865f4075271301fecc75e89393f83ac384abf8b74a0b3acee3b67e
 WHIRLPOOL 
8857bb03b1ce7b958950daf171f5797c39711b868fd901f92c88682c9ce4aeabfd3013a49d74c922f23f09a04520534e45b4b3d498f945137b5f4b02a8f3e1a0
-DIST git-manpages-2.13.5.tar.xz 407640 SHA256 
1dde688dda9162605ae27e4ad1b55c65c056b3e7cd70972b7e1d6bd2b743394d SHA512 
42637b264b4a1a73defe22f314cb8ca0bc171fd722252cd926a9fd74a8f89d129da0648ed85b72f44948795c6ae1f33f4f141f11b07688533c8654be0983fbc0
 WHIRLPOOL 
9b4a3440c4d1da7089d020e146de7401502cdbae0d82a0052f665cfab84d48de5aa5602d78b8d2f29507e280a16ab4bc2ea4a753fc948a7102eef0240ab3ab2d
 DIST git-manpages-2.13.6.tar.xz 407660 SHA256 
9c92ed09c3343c770a1afd9dbb1192b00ebb1b3d3e25e21a2dcb1a4e9a494d1d SHA512 
b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f
 WHIRLPOOL 
f25b4b20462806a722067aecb7aa0526f00536630c8f71bd7be1ecc0ff4fec07db2fa79d69d911f3e1a2eaca9fe73ad76e76e7ef7afbb83698db42a540e4cfef
-DIST git-manpages-2.14.2.tar.xz 411160 SHA256 
6dd350d1e9d00159a549f0fad08a9f954b1d12576fc8d5865fbed9dee15105fc SHA512 
64f9e22ed98cde1dec9afb719c2f7254d5da1eceab2e7d3291d37792fa1b9fc83633ac42a4f47961a6721b325d58818e67ffb14085d5e8f9bed1b691f22d79d7
 WHIRLPOOL 
902889bed82289773c029ac7c9625f4972559e0365cc04dfb661ae14fd7e1757d3820d75b3591d72dded98107ad7a1e2e31590452699858ca3a94fcc375ac0eb
 DIST git-manpages-2.14.3.tar.xz 411324 SHA256 
5b0e3d93bafd539046b67778db0b5d627fe08ee5ef1be8b5b924517ed141b001 SHA512 
3e1215bdc28df84fd26ba40f6aedfa9f2140c170af48148b1b89d28e8b411686376715920f86d9db9aa18f4a3f4e8f68082da7632febbcbc7fc956f32807da50
 WHIRLPOOL 
8f7ef94204fc0658b65228af5bb96077f78e92e37054627d83f817690476a6983abdb551222f9400e55d35201c07d0993eaedb262d41db44839d5a2fa30b19a8
-DIST git-manpages-2.15.0.rc2.tar.xz 412668 SHA256 
5fff26704ef20de480a5dbfed1ff102c8e66c6d2dddbcedb62780e1dffdeeafc SHA512 
ef0a2ce093789b1c1fd64739ed6206a2c3ae99405dfbaa0c1ea4c15b6236c89a8a13ed92e6ede87749d260f9194b6c5306dbe9fd4a7c70b32a5e10efaf9db35e
 WHIRLPOOL 
2a5d352332f050c127ff9691918737058e8340ab3418a3754025325c3ebe0de0af110ddf5e90bcb3cbce4b76d0dcfb1d65b65345f6a0bc7b383a7429dabda646
 DIST git-manpages-2.15.0.tar.xz 412688 SHA256 
22ad09441490f77bca781168fc66fd6576f0175407c5a95c1cdc96dfd3731c77 SHA512 
4101d11c0cc2bd91fa496f11546ec439bc136cb40c7146d53532ab4c525b299741be64a5c4061ff0d5ae5c049d798c7662c7f1500d856f78e8ed653d2ce28aa5
 WHIRLPOOL 
4d84f7cab9cb346e5c39a2c28c82c732f356de83ecfaaf93a6b01364e8b2a25a67322c72bb97c675392cda718144d07d279a23e0ca6ef72f309eaa801cd90ceb

diff --git a/dev-vcs/git/git-2.13.5.ebuild b/dev-vcs/git/git-2.13.5.ebuild
deleted file mode 100644
index 5046a24af69..00000000000
--- a/dev-vcs/git/git-2.13.5.ebuild
+++ /dev/null
@@ -1,680 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="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: pu
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=maint
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module 
bash-completion-r1 python-single-r1 systemd ${SCM}
-
-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="http://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 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-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 +perl +python ppcsha1 tk 
+threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       gnome-keyring? ( app-crypt/libsecret )
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:= )
-       sys-libs/zlib
-       pcre? ( dev-libs/libpcre )
-       perl? ( dev-lang/perl:=[-build(-)] )
-       tk? ( dev-lang/tk:0= )
-       curl? (
-               net-misc/curl
-               webdav? ( dev-libs/expat )
-       )
-       emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-       gpg? ( app-crypt/gnupg )
-       mediawiki? (
-               dev-perl/DateTime-Format-ISO8601
-               dev-perl/HTML-Tree
-               dev-perl/MediaWiki-API
-       )
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       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 )
-                       subversion? ( dev-vcs/subversion[-dso,perl] 
dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-       doc? (
-               app-text/asciidoc
-               app-text/docbook2X
-               sys-apps/texinfo
-               app-text/xmlto
-       )
-       nls? ( sys-devel/gettext )
-       test? ( app-crypt/gnupg )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-       DEPEND="${DEPEND}
-               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 )
-       python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-       # install mediawiki perl modules also in vendor_dir
-       # hack, needs better upstream solution
-       "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-       "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-       "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.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 python ; 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 myopts
-
-       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 broken build system ...
-       myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-       myopts+=" INSTALL=install TAR=tar"
-       myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-       myopts+=" SANE_TOOL_PATH="
-       myopts+=" OLD_ICONV="
-       myopts+=" 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
-
-       use iconv \
-               || myopts+=" NO_ICONV=YesPlease"
-       use nls \
-               || myopts+=" NO_GETTEXT=YesPlease"
-       use tk \
-               || myopts+=" NO_TCLTK=YesPlease"
-       use pcre \
-               && myopts+=" USE_LIBPCRE=yes" \
-               && extlibs+=" -lpcre"
-       use perl \
-               && myopts+=" INSTALLDIRS=vendor" \
-               || myopts+=" NO_PERL=YesPlease"
-       use python \
-               || myopts+=" NO_PYTHON=YesPlease"
-       use subversion \
-               || myopts+=" NO_SVN_TESTS=YesPlease"
-       use threads \
-               && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-               || myopts+=" NO_PTHREADS=YesPlease"
-       use cvs \
-               || myopts+=" NO_CVS=YesPlease"
-       use elibc_musl \
-               && myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#      if [[ ${CHOST} == *-mint* ]] ; then
-#              myopts+=" NO_MMAP=YesPlease"
-#              myopts+=" NO_IPV6=YesPlease"
-#              myopts+=" NO_STRLCPY=YesPlease"
-#              myopts+=" NO_MEMMEM=YesPlease"
-#              myopts+=" NO_MKDTEMP=YesPlease"
-#              myopts+=" 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"
-               myopts+=" HAVE_CLOCK_MONOTONIC=1"
-               myopts+=" HAVE_GETDELIM=1"
-       fi
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts+=" ASCIIDOC8=YesPlease"
-       myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       [[ "${CHOST}" == *-uclibc* ]] && \
-               myopts+=" NO_NSEC=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-       export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-       if [[ ${PV} != *9999 ]]; then
-               unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-               cd "${S}"
-       else
-               git-r3_src_unpack
-               cd "${S}"
-               #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 "sed failed"
-
-       # Never install the private copy of Error.pm (bug #296310)
-       sed -i \
-               -e '/private-Error.pm/s,^,#,' \
-               perl/Makefile.PL
-
-       # Fix docbook2texi command
-       sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-
-       # Fix git-subtree missing DESTDIR
-       sed -i \
-               -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-               -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-               contrib/subtree/Makefile
-}
-
-git_emake() {
-       # bug #326625: PERL_PATH, PERL_MM_OPT
-       # bug #320647: PYTHON_PATH
-       PYTHON_PATH=""
-       use python && PYTHON_PATH="${PYTHON}"
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix="${EPREFIX}"/usr \
-               htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-               sysconfdir="${EPREFIX}"/etc \
-               PYTHON_PATH="${PYTHON_PATH}" \
-               PERL_MM_OPT="" \
-               GIT_TEST_OPTS="--no-color" \
-               V=1 \
-               "$@"
-       # This is the fix for bug #326625, but it also causes breakage, see bug
-       # #352693.
-       # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       if use perl ; then
-       git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-       git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-       fi
-       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
-               cd "${S}"/contrib/credential/osxkeychain || die
-               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-                       || die "emake credential-osxkeychain"
-       fi
-
-       cd "${S}"/Documentation
-       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
-
-       if use subversion ; then
-               cd "${S}"/contrib/svn-fe
-               # 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
-                       git_emake svn-fe.{1,html} || die "emake svn-fe.1 
svn-fe.html failed"
-               fi
-               cd "${S}"
-       fi
-
-       if use gnome-keyring ; then
-               cd "${S}"/contrib/credential/libsecret
-               git_emake || die "emake git-credential-libsecret failed"
-       fi
-
-       cd "${S}"/contrib/subtree || die
-       git_emake
-       use doc && git_emake doc
-
-       cd "${S}"/contrib/diff-highlight || die
-       git_emake
-
-       if use mediawiki ; then
-               cd "${S}"/contrib/mw-to-git
-               git_emake
-       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
-       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
-       cd "${S}"/contrib/subtree
-       git_emake install || die "Failed to emake install git-subtree"
-       if use doc ; then
-               git_emake install-man install-doc || die "Failed to emake 
install-doc install-mangit-subtree"
-       fi
-       newdoc README README.git-subtree
-       dodoc git-subtree.txt
-       cd "${S}"
-
-       if use mediawiki ; then
-               cd "${S}"/contrib/mw-to-git
-               git_emake install
-               cd "${S}"
-       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
-               cd "${S}"/contrib/credential/libsecret
-               dobin git-credential-libsecret
-       fi
-
-       if use subversion ; then
-               cd "${S}"/contrib/svn-fe
-               dobin svn-fe
-               dodoc svn-fe.txt
-               if use doc ; then
-                       doman svn-fe.1
-                       docinto html
-                       dodoc svn-fe.html
-               fi
-               cd "${S}"
-       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
-       )
-       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 /usr/share/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
-
-               find "${ED}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       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="${disabled} t5000-tar-tree.sh"
-       fi
-
-       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="${disabled} ${tests_cvs}"
-               fi
-               einfo "Skipping other tests that require being non-root"
-               disabled="${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="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       einfo "Disabling tests that fail with SVN 1.7"
-       disabled="${disabled} ${test_svn}"
-
-       # Reset all previously disabled tests
-       cd "${S}/t"
-       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 "${S}"/t/Makefile
-
-       # Clean old results first, must always run
-       cd "${S}/t"
-       nonfatal git_emake clean
-
-       # Now run the tests, keep going if we hit an error, and don't terminate 
on
-       # failure
-       cd "${S}"
-       einfo "Start test run"
-       #MAKEOPTS=-j1
-       nonfatal git_emake --keep-going test
-       rc=$?
-
-       # Display nice results, now print the results
-       cd "${S}/t"
-       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
-       einfo "Please read /usr/share/bash-completion/git for Git bash command 
completion"
-       einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-       einfo "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
-}

diff --git a/dev-vcs/git/git-2.14.2.ebuild b/dev-vcs/git/git-2.14.2.ebuild
deleted file mode 100644
index d079a65a75e..00000000000
--- a/dev-vcs/git/git-2.14.2.ebuild
+++ /dev/null
@@ -1,699 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-       SCM="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
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module 
bash-completion-r1 python-single-r1 systemd ${SCM}
-
-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="http://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 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-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 +perl +python 
ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       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? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-       gpg? ( app-crypt/gnupg )
-       mediawiki? (
-               dev-perl/DateTime-Format-ISO8601
-               dev-perl/HTML-Tree
-               dev-perl/MediaWiki-API
-       )
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       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 )
-                       subversion? ( dev-vcs/subversion[-dso,perl] 
dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-       doc? (
-               app-text/asciidoc
-               app-text/docbook2X
-               sys-apps/texinfo
-               app-text/xmlto
-       )
-       nls? ( sys-devel/gettext )
-       test? ( app-crypt/gnupg )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-       DEPEND="${DEPEND}
-               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 )
-       python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-       # install mediawiki perl modules also in vendor_dir
-       # hack, needs better upstream solution
-       "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-       "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-       "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.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 python ; 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 myopts
-
-       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"
-       myopts+=" INSTALL=install TAR=tar"
-       myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-       myopts+=" SANE_TOOL_PATH="
-       myopts+=" OLD_ICONV="
-       myopts+=" 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
-
-       use iconv \
-               || myopts+=" NO_ICONV=YesPlease"
-       use nls \
-               || myopts+=" NO_GETTEXT=YesPlease"
-       use tk \
-               || myopts+=" NO_TCLTK=YesPlease"
-       if use pcre; then
-               if use pcre-jit; then
-                       myopts+=" USE_LIBPCRE2=YesPlease"
-                       extlibs+=" -lpcre2-8"
-               else
-                       myopts+=" USE_LIBPCRE1=YesPlease"
-                       myopts+=" NO_LIBPCRE1_JIT=YesPlease"
-                       extlibs+=" -lpcre"
-               fi
-       fi
-       use perl \
-               && myopts+=" INSTALLDIRS=vendor" \
-               || myopts+=" NO_PERL=YesPlease"
-       use python \
-               || myopts+=" NO_PYTHON=YesPlease"
-       use subversion \
-               || myopts+=" NO_SVN_TESTS=YesPlease"
-       use threads \
-               && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-               || myopts+=" NO_PTHREADS=YesPlease"
-       use cvs \
-               || myopts+=" NO_CVS=YesPlease"
-       use elibc_musl \
-               && myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#      if [[ ${CHOST} == *-mint* ]] ; then
-#              myopts+=" NO_MMAP=YesPlease"
-#              myopts+=" NO_IPV6=YesPlease"
-#              myopts+=" NO_STRLCPY=YesPlease"
-#              myopts+=" NO_MEMMEM=YesPlease"
-#              myopts+=" NO_MKDTEMP=YesPlease"
-#              myopts+=" 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"
-               myopts+=" HAVE_CLOCK_MONOTONIC=1"
-               grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
-                       myopts+=" HAVE_GETDELIM=1"
-       fi
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts+=" ASCIIDOC8=YesPlease"
-       myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       [[ "${CHOST}" == *-uclibc* ]] && \
-               myopts+=" NO_NSEC=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-       export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-       if [[ ${PV} != *9999 ]]; then
-               unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-               cd "${S}"
-       else
-               git-r3_src_unpack
-               cd "${S}"
-               #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 "sed failed"
-
-       # Never install the private copy of Error.pm (bug #296310)
-       sed -i \
-               -e '/private-Error.pm/s,^,#,' \
-               perl/Makefile.PL
-
-       # Fix docbook2texi command
-       sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-
-       # Fix git-subtree missing DESTDIR
-       sed -i \
-               -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-               -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-               contrib/subtree/Makefile
-}
-
-git_emake() {
-       # bug #326625: PERL_PATH, PERL_MM_OPT
-       # bug #320647: PYTHON_PATH
-       PYTHON_PATH=""
-       use python && PYTHON_PATH="${PYTHON}"
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix="${EPREFIX}"/usr \
-               htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-               sysconfdir="${EPREFIX}"/etc \
-               PYTHON_PATH="${PYTHON_PATH}" \
-               PERL_MM_OPT="" \
-               GIT_TEST_OPTS="--no-color" \
-               V=1 \
-               "$@"
-       # This is the fix for bug #326625, but it also causes breakage, see bug
-       # #352693.
-       # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       if use perl ; then
-       git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-       git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-       fi
-       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
-               cd "${S}"/contrib/credential/osxkeychain || die
-               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-                       || die "emake credential-osxkeychain"
-       fi
-
-       cd "${S}"/Documentation
-       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
-
-       if use subversion ; then
-               cd "${S}"/contrib/svn-fe
-               # 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
-                       git_emake svn-fe.{1,html} || die "emake svn-fe.1 
svn-fe.html failed"
-               fi
-               cd "${S}"
-       fi
-
-       if use gnome-keyring ; then
-               cd "${S}"/contrib/credential/libsecret
-               git_emake || die "emake git-credential-libsecret failed"
-       fi
-
-       cd "${S}"/contrib/subtree || die
-       git_emake
-       use doc && git_emake doc
-
-       cd "${S}"/contrib/diff-highlight || die
-       git_emake
-
-       if use mediawiki ; then
-               cd "${S}"/contrib/mw-to-git
-               git_emake
-       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
-       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
-       cd "${S}"/contrib/subtree
-       git_emake install || die "Failed to emake install git-subtree"
-       if use doc ; then
-               git_emake install-man install-doc || die "Failed to emake 
install-doc install-mangit-subtree"
-       fi
-       newdoc README README.git-subtree
-       dodoc git-subtree.txt
-       cd "${S}"
-
-       if use mediawiki ; then
-               cd "${S}"/contrib/mw-to-git
-               git_emake install
-               cd "${S}"
-       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
-               cd "${S}"/contrib/credential/libsecret
-               dobin git-credential-libsecret
-       fi
-
-       if use subversion ; then
-               cd "${S}"/contrib/svn-fe
-               dobin svn-fe
-               dodoc svn-fe.txt
-               if use doc ; then
-                       doman svn-fe.1
-                       docinto html
-                       dodoc svn-fe.html
-               fi
-               cd "${S}"
-       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
-       )
-       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 /usr/share/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
-
-               find "${ED}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       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="t9128-git-svn-cmd-branch.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="${disabled} t5000-tar-tree.sh"
-       fi
-
-       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="${disabled} ${tests_cvs}"
-               fi
-               einfo "Skipping other tests that require being non-root"
-               disabled="${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="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       einfo "Disabling tests that fail with SVN 1.7"
-       disabled="${disabled} ${test_svn}"
-
-       # Reset all previously disabled tests
-       cd "${S}/t"
-       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 "${S}"/t/Makefile
-
-       # Clean old results first, must always run
-       cd "${S}/t"
-       nonfatal git_emake clean
-
-       # Now run the tests, keep going if we hit an error, and don't terminate 
on
-       # failure
-       cd "${S}"
-       einfo "Start test run"
-       #MAKEOPTS=-j1
-       nonfatal git_emake --keep-going test
-       rc=$?
-
-       # Display nice results, now print the results
-       cd "${S}/t"
-       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
-       einfo "Please read /usr/share/bash-completion/git for Git bash command 
completion"
-       einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-       einfo "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
-}

diff --git a/dev-vcs/git/git-2.15.0_rc2.ebuild 
b/dev-vcs/git/git-2.15.0_rc2.ebuild
deleted file mode 100644
index d079a65a75e..00000000000
--- a/dev-vcs/git/git-2.15.0_rc2.ebuild
+++ /dev/null
@@ -1,699 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-       SCM="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
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module 
bash-completion-r1 python-single-r1 systemd ${SCM}
-
-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="http://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 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-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 +perl +python 
ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       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? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-       gpg? ( app-crypt/gnupg )
-       mediawiki? (
-               dev-perl/DateTime-Format-ISO8601
-               dev-perl/HTML-Tree
-               dev-perl/MediaWiki-API
-       )
-       perl? ( dev-perl/Error
-                       dev-perl/Net-SMTP-SSL
-                       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 )
-                       subversion? ( dev-vcs/subversion[-dso,perl] 
dev-perl/libwww-perl dev-perl/TermReadKey )
-                       )
-       python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-       doc? (
-               app-text/asciidoc
-               app-text/docbook2X
-               sys-apps/texinfo
-               app-text/xmlto
-       )
-       nls? ( sys-devel/gettext )
-       test? ( app-crypt/gnupg )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-       DEPEND="${DEPEND}
-               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 )
-       python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       "${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-       # install mediawiki perl modules also in vendor_dir
-       # hack, needs better upstream solution
-       "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-       "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-       "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.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 python ; 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 myopts
-
-       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"
-       myopts+=" INSTALL=install TAR=tar"
-       myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-       myopts+=" SANE_TOOL_PATH="
-       myopts+=" OLD_ICONV="
-       myopts+=" 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
-
-       use iconv \
-               || myopts+=" NO_ICONV=YesPlease"
-       use nls \
-               || myopts+=" NO_GETTEXT=YesPlease"
-       use tk \
-               || myopts+=" NO_TCLTK=YesPlease"
-       if use pcre; then
-               if use pcre-jit; then
-                       myopts+=" USE_LIBPCRE2=YesPlease"
-                       extlibs+=" -lpcre2-8"
-               else
-                       myopts+=" USE_LIBPCRE1=YesPlease"
-                       myopts+=" NO_LIBPCRE1_JIT=YesPlease"
-                       extlibs+=" -lpcre"
-               fi
-       fi
-       use perl \
-               && myopts+=" INSTALLDIRS=vendor" \
-               || myopts+=" NO_PERL=YesPlease"
-       use python \
-               || myopts+=" NO_PYTHON=YesPlease"
-       use subversion \
-               || myopts+=" NO_SVN_TESTS=YesPlease"
-       use threads \
-               && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-               || myopts+=" NO_PTHREADS=YesPlease"
-       use cvs \
-               || myopts+=" NO_CVS=YesPlease"
-       use elibc_musl \
-               && myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#      if [[ ${CHOST} == *-mint* ]] ; then
-#              myopts+=" NO_MMAP=YesPlease"
-#              myopts+=" NO_IPV6=YesPlease"
-#              myopts+=" NO_STRLCPY=YesPlease"
-#              myopts+=" NO_MEMMEM=YesPlease"
-#              myopts+=" NO_MKDTEMP=YesPlease"
-#              myopts+=" 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"
-               myopts+=" HAVE_CLOCK_MONOTONIC=1"
-               grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
-                       myopts+=" HAVE_GETDELIM=1"
-       fi
-
-       has_version '>=app-text/asciidoc-8.0' \
-               && myopts+=" ASCIIDOC8=YesPlease"
-       myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-       # Bug 290465:
-       # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 
'st_mtim'
-       [[ "${CHOST}" == *-uclibc* ]] && \
-               myopts+=" NO_NSEC=YesPlease"
-
-       export MY_MAKEOPTS="${myopts}"
-       export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-       if [[ ${PV} != *9999 ]]; then
-               unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-               cd "${S}"
-               unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-               use doc && \
-                       cd "${S}"/Documentation && \
-                       unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-               cd "${S}"
-       else
-               git-r3_src_unpack
-               cd "${S}"
-               #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 "sed failed"
-
-       # Never install the private copy of Error.pm (bug #296310)
-       sed -i \
-               -e '/private-Error.pm/s,^,#,' \
-               perl/Makefile.PL
-
-       # Fix docbook2texi command
-       sed -r -i 
's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = 
docbook2texi.pl/' \
-               Documentation/Makefile || die "sed failed"
-
-       # Fix git-subtree missing DESTDIR
-       sed -i \
-               -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-               -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-               contrib/subtree/Makefile
-}
-
-git_emake() {
-       # bug #326625: PERL_PATH, PERL_MM_OPT
-       # bug #320647: PYTHON_PATH
-       PYTHON_PATH=""
-       use python && PYTHON_PATH="${PYTHON}"
-       emake ${MY_MAKEOPTS} \
-               DESTDIR="${D}" \
-               OPTCFLAGS="${CFLAGS}" \
-               OPTLDFLAGS="${LDFLAGS}" \
-               OPTCC="$(tc-getCC)" \
-               OPTAR="$(tc-getAR)" \
-               prefix="${EPREFIX}"/usr \
-               htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-               sysconfdir="${EPREFIX}"/etc \
-               PYTHON_PATH="${PYTHON_PATH}" \
-               PERL_MM_OPT="" \
-               GIT_TEST_OPTS="--no-color" \
-               V=1 \
-               "$@"
-       # This is the fix for bug #326625, but it also causes breakage, see bug
-       # #352693.
-       # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-       exportmakeopts
-}
-
-src_compile() {
-       if use perl ; then
-       git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-       git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-       fi
-       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
-               cd "${S}"/contrib/credential/osxkeychain || die
-               git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-                       || die "emake credential-osxkeychain"
-       fi
-
-       cd "${S}"/Documentation
-       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
-
-       if use subversion ; then
-               cd "${S}"/contrib/svn-fe
-               # 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
-                       git_emake svn-fe.{1,html} || die "emake svn-fe.1 
svn-fe.html failed"
-               fi
-               cd "${S}"
-       fi
-
-       if use gnome-keyring ; then
-               cd "${S}"/contrib/credential/libsecret
-               git_emake || die "emake git-credential-libsecret failed"
-       fi
-
-       cd "${S}"/contrib/subtree || die
-       git_emake
-       use doc && git_emake doc
-
-       cd "${S}"/contrib/diff-highlight || die
-       git_emake
-
-       if use mediawiki ; then
-               cd "${S}"/contrib/mw-to-git
-               git_emake
-       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
-       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
-       cd "${S}"/contrib/subtree
-       git_emake install || die "Failed to emake install git-subtree"
-       if use doc ; then
-               git_emake install-man install-doc || die "Failed to emake 
install-doc install-mangit-subtree"
-       fi
-       newdoc README README.git-subtree
-       dodoc git-subtree.txt
-       cd "${S}"
-
-       if use mediawiki ; then
-               cd "${S}"/contrib/mw-to-git
-               git_emake install
-               cd "${S}"
-       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
-               cd "${S}"/contrib/credential/libsecret
-               dobin git-credential-libsecret
-       fi
-
-       if use subversion ; then
-               cd "${S}"/contrib/svn-fe
-               dobin svn-fe
-               dodoc svn-fe.txt
-               if use doc ; then
-                       doman svn-fe.1
-                       docinto html
-                       dodoc svn-fe.html
-               fi
-               cd "${S}"
-       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
-       )
-       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 /usr/share/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
-
-               find "${ED}"/usr/lib64/perl5/ \
-                       -name .packlist \
-                       -exec rm \{\} \;
-       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="t9128-git-svn-cmd-branch.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="${disabled} t5000-tar-tree.sh"
-       fi
-
-       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="${disabled} ${tests_cvs}"
-               fi
-               einfo "Skipping other tests that require being non-root"
-               disabled="${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="${disabled} ${tests_cvs}"
-               fi
-       fi
-
-       if ! use perl ; then
-               einfo "Disabling tests that need Perl"
-               disabled="${disabled} ${tests_perl}"
-       fi
-
-       einfo "Disabling tests that fail with SVN 1.7"
-       disabled="${disabled} ${test_svn}"
-
-       # Reset all previously disabled tests
-       cd "${S}/t"
-       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 "${S}"/t/Makefile
-
-       # Clean old results first, must always run
-       cd "${S}/t"
-       nonfatal git_emake clean
-
-       # Now run the tests, keep going if we hit an error, and don't terminate 
on
-       # failure
-       cd "${S}"
-       einfo "Start test run"
-       #MAKEOPTS=-j1
-       nonfatal git_emake --keep-going test
-       rc=$?
-
-       # Display nice results, now print the results
-       cd "${S}/t"
-       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
-       einfo "Please read /usr/share/bash-completion/git for Git bash command 
completion"
-       einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-       einfo "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
-}

Reply via email to