commit:     6064b8095a426e5e985ad64632ac58674c9fcea9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 14:23:15 2015 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 14:23:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6064b809

dev-vcs/git: Removed vulnerable versions (bug #562884).

Package-Manager: portage-2.2.25
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-vcs/git/Manifest         |   6 -
 dev-vcs/git/git-2.3.9.ebuild | 636 -------------------------------------------
 dev-vcs/git/git-2.4.9.ebuild | 636 -------------------------------------------
 3 files changed, 1278 deletions(-)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 036c119..f187536 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -4,9 +4,7 @@ DIST git-2.0.5.tar.xz 3437996 SHA256 
f5a63f5073c7f10d0676d0dabb46df48f2af77624fe
 DIST git-2.1.4.tar.xz 3544804 SHA256 
a04968b9b10cbcb31a7054aa3a0d11ac47c83556ecd270ddef1987df5d3d053e SHA512 
17333eda9600287be1f366271f314619354f6bc9b7f867d59a9493441e71a963340cedf728b5954ac6311f5426a928a2beacfa7775e1a4d439b58e0dcf310a0b
 WHIRLPOOL 
fc20c64e0d494a13834c71ffa5c727018fc3940f4dc65ae4eda6ba14af2faf2864d779e706b503c69a16858ca051878e27bcfe1883c3c206dda6129a1bc5aceb
 DIST git-2.2.3.tar.xz 3592292 SHA256 
d56ba6a2b9ef51ec165b98b1894a36fbb635c6abb22674fd61ffc80603b967d9 SHA512 
772466ccbbe06d83a03b244dd157c30f51e0fb06995a55070b262f8dd67ced454013fdc86690210c54db914252439be0bfccabbbfffddebb6bc047db946e9b92
 WHIRLPOOL 
2b60036db65cbcb1c2c2db68ec1747f6c309f9368c4f879c8b91964e16708c641e5a8b7d7b79431193b8d78d1c73e8e694ffe5f407701d7d7719f2d568bff180
 DIST git-2.3.10.tar.xz 3625052 SHA256 
8d1eba6e4ad4ef57f87d25535956b5752c341f222407329025f8704537219ed8 SHA512 
23cd192bf19be648377767c0b45e895e5284b5fc7558be566ce5f59516d94921212f4944daad5ab650c99c10a58628626bd3d8f23d3b4c9d0d3fa4ce17a8eb9f
 WHIRLPOOL 
f6ff0675e75ac0dad5af264f9bcb18d29b6e615d73b68ad97caf1efce353ddb96c51c8e3c6bb633e00a961b757e3bbf55a7a5e130f707696f81324ee8b16ba44
-DIST git-2.3.9.tar.xz 3622952 SHA256 
90c2b4bc8cb081115d34269b2d061fb8c7961cf08406c345b278c43d7dcd25f7 SHA512 
e02565b9b0176158418358a811735dde0e630adae1cc8401a3a578fdce69efb6d8893815ee749820ade8b8aa0f3b8b42ff85322bf98dad55de77298eeca50510
 WHIRLPOOL 
451717d03304ba38f964801be909f0265b03adef8cacd62dd1bb1af34e1c6cc4caef064f784e34984cdb9f1f8f7e3f9b93ab67c116f63a1c9486b96a5bde3e91
 DIST git-2.4.10.tar.xz 3695176 SHA256 
b631b2b26f5593833a29cd833b8071b4eaf7b212fba180e587b526f51c2331df SHA512 
08f7f63fd4820f155aec08373fd4f5abbe5a4c8f98a73a824897ba68901fb274b4cf47b8751cd2bea358cbb9c09934f7857aa440de69b46ee88a4bba852f5ced
 WHIRLPOOL 
3ec53b7355f1895c95b91e1fa85f185801acdb0317384099e4d7914208c3d762d536ed83e099c96a168d696e37e3f8a491459de59c7dd59dce9c49fb75af836b
-DIST git-2.4.9.tar.xz 3692824 SHA256 
0f5fba41639d3224fee02f40393e2053ee9468fa7b88d64c5b97f7e65667bd2b SHA512 
d5df1f725d5af8449e091ee50f6c4371c2b1699d80d499321a751ecf6c61d75c6c3a286ea60661ae1608bf92c94e2c8977ad08731e153830bd5c5b4587d8ba82
 WHIRLPOOL 
a670eeb5abbcf844324b2444d87ecc9eb8c2899d6f37da6aef9f27edbe53d90086907642aac14536396b61d4520cd4e7b77124f4d54cc7f9f9e5a769741e4d03
 DIST git-2.5.4.tar.xz 3747552 SHA256 
e08d2d384e1c8c474d336c3583ed5cd396c76455155a4e65bfa97699fc38472a SHA512 
25964bc59301b11994c94bab618613bc87ef788d356af55a26c77861a939f2b67cf37be98199e81d5c2a63e8d9c043b4fc6fb481316cc4d8bb6a1f382eddf33e
 WHIRLPOOL 
e62efd86c5e0d1b040816978cc28a41d00a7c095513482b0df1d4addc87bd89ce20dbb1b77e3ec3d9bd0722de3237e451b05f687fdb6419fa419708921049222
 DIST git-2.6.2.tar.xz 3812636 SHA256 
646e37abbc69d5c1b153e30c82ec3346d176e2b499b44281d08565ad8e00a670 SHA512 
b112c792442d2d6905c6d9ac4598b7f7ae7caf12ab353b2dc6cc7e72a162dd7225cd4cfd8cb4abb29ddddc68b0473e6f872a08240ab6e0a43c92e6c4cf63289e
 WHIRLPOOL 
167ad95aba0d56c77f972f41001853af87a84fbdc0fc8462dac455a0a20c7306a846eedea0a4f3ec0663e32ae2f683abe2fe8fa8300e3ff9d6f55e80d43af51a
 DIST git-2.6.3.tar.xz 3819080 SHA256 
d697e4d3d76830996c05bfc2a1d88aa726415b276a884a40d137575e5d597da3 SHA512 
c388235806c5cc67e6ee4ba56225b91f27c09305cbc4f988199a45897c0bf065b9e44f18bd671bb0483133598e5bfa08382742caaca8a77ca117b039bf59d024
 WHIRLPOOL 
8fb5f88e3fa6ae6c9ef6c0ec79d433989b89ed0557ac80c815861841942d1675535ffcb5d5f2fe8069af45554f6c66db0ef715bd844da1e028b41be561ba5b8f
@@ -16,9 +14,7 @@ DIST git-htmldocs-2.0.5.tar.xz 944792 SHA256 
90eaf745d6ee197718fdde9c98919918ad1
 DIST git-htmldocs-2.1.4.tar.xz 959144 SHA256 
7665daecd77c2f9be8b316eb69a1fda3f383f759e71d346a137c8cf39501d886 SHA512 
7734d671ab6ca8374f54546b0987821d0c66d136d50f9cbb1ff7c06da25330e46a10ede41d10a60c80847afa68999298c2f90dfe99d51bd862590f02344e1cbd
 WHIRLPOOL 
97326a00a1f613cf95dbeaf8938842855299d21e6963e2040b3bf9ee02a745c8156ea552e2b87248a98d5f0ecd6560a546a4a49b6635ca034ff2e92504bbb00a
 DIST git-htmldocs-2.2.3.tar.xz 976124 SHA256 
1e979c86d5447a4a4965de6a1a532e30ae6337e886a2d8fc61749806b2bf024d SHA512 
3fe7f70b1ea4bbd60d64928802de1ea4eb35a305cbd243933876d89dfe05901cea71e3811bedb28e8ac0f0f1409afbf31884a78a8be0648b3666a0c7fcee8212
 WHIRLPOOL 
b5348b121b9e3a11fe120ed8a379b99bba42711ea185aaf956c58d92fe3cb96969e0b60cb7c483cc5e39711a965b6a7eaa0b931477229faffff8e3326d5bf0aa
 DIST git-htmldocs-2.3.10.tar.xz 988072 SHA256 
628ef79383039db857aab6ad4cb627573104e618461c2c6ee58fa39a3512d115 SHA512 
cd8b050979cc13aab6e9b74d7a8042f33decaea639a1fc57ea4a5839563202fecfda95295e38404a825c05d393458aebf592bfd9b0c75eae44638a2bc9e33535
 WHIRLPOOL 
a21430705753b533ba03696b80fb210fec4b8869821cbd940d3881c080f12816d161c05d8e483764d79c337ce7fe93f741b6a3b35afe2cc69bd9e4d7a1c8de51
-DIST git-htmldocs-2.3.9.tar.xz 987824 SHA256 
bd2921280fafca0ef051baf407aa561f80c2bf51c69115aa3cfd48d4b50ef9f9 SHA512 
c239cfbd1601ec38bc37a95834d5840fdb83362ea6ca2f8c0f48a5b3f0beed73aef47736e1b5e65a77a4fe1aec3e1b48807437a600fb36c7b2553194f4824daa
 WHIRLPOOL 
fef5ce4447d10d6f116bb425d678af53f9e8c8a3238153d241afd6109647f04045c0bc4782afda63e3d43df89cc864dc3d7d01cddbf9a71de566d7cbc1508e7e
 DIST git-htmldocs-2.4.10.tar.xz 996588 SHA256 
f2c523ea114caac7c5cf51a20a420a215411762fabff2da9febfc2917af835ef SHA512 
60fc5a2b6665ec7fc10680608b5689a24fa211fe7393f010a8099c6fb0a9582f20cebc7cad0653b62750677d79a80fcd6e8e96fb440acb3fc7c7c0ffc00779d3
 WHIRLPOOL 
30585753a7b08dfa812c74832d35168d3615d8bf71c3c853efb125348538b5fb7cc4b3f1cfef725082ade144b5362394991186967f6026cee8c91dd41e30290e
-DIST git-htmldocs-2.4.9.tar.xz 995724 SHA256 
6000eb00fee2adc4d5a8fd8ace857049e6fb623aa7ec9087d983c29953319cd6 SHA512 
42905ae5383e5f0444ec868a1d742bada31cf25eac582b95ab6e6334a3dfefd05d2e08a1c2f7c0354a841703cbac2c6dc25437ca9f681a5bb0a121dc94d2d938
 WHIRLPOOL 
9791ab122cf680f060d274c6a7bcdd1aaf0660f83ed4e91073fed1dd2f2b16e96e938fcbf04e03373768b8036e3f8dd0be54639f8d24bce59501c970e4225d73
 DIST git-htmldocs-2.5.4.tar.xz 1009820 SHA256 
cb36b3b7198a3fa49f2677bba83f1e57a1a40250a181d9e86232cb8febcc8053 SHA512 
af833635632ba5c65524bfef00f291a41fd37ba7bd9ca4b65b4c0eb9329b888d2e8757fe29f33bd25a75e1841d67a20dff49f43d35a502ef3b29599d073dcd6a
 WHIRLPOOL 
e5f55c3dbdf69d946295c5c19b95a79168d34645ced8e6a837ec8b5dd948008487288159f63a2f81a36fbdf3f413d3fdefd008b0157785df37431ccb9127284e
 DIST git-htmldocs-2.6.2.tar.xz 1017776 SHA256 
7cd13ccbe397dc742920b403957a7c769728dfe3eacc7bb91aa230ca8ab1e1c8 SHA512 
d6173b5425fc0e8a9cf386b769ad67fd423fa5c426a75790130baa82ba157d53b4b226ddf119cf5311014c7dce1d71b540ddf7bb2e295e7650edd67617b1cb43
 WHIRLPOOL 
71b66548fb47d4c543c6a36072dce795444bd4a72a1bd01080404e6284c4044f386240b077b19ed89eea921686ce8e7d1dcdc19b476f36c6d767ac4a6d7f2d23
 DIST git-htmldocs-2.6.3.tar.xz 1020504 SHA256 
1e08dac903f06f9739e22ae700ff811c79bd7742775060d630c1e53236bbd9a0 SHA512 
82c9b09065b9b9db6a064e8507a5a386e7f6748f3c5b7302172805b30714174e0c75226089418514ae78fedbedd921556c4c27d1fa5f3d70124a1aa30c43fc65
 WHIRLPOOL 
31fc4c91a15fc24a160418153471eaf82e49fc2ee9e22b7a8df60e5fd3877faeb01049503fd66f59970dc89ec8f65785447dd6eba1a2de1c67df32e85302a187
@@ -28,9 +24,7 @@ DIST git-manpages-2.0.5.tar.xz 359000 SHA256 
3cf1581da2a19c0651df445ee5f801e1086
 DIST git-manpages-2.1.4.tar.xz 361252 SHA256 
01070bc96e88231f6f279b031fed2919efea8b442fe724f37349ad951d010b04 SHA512 
35fe0dd9e0fe9547362abc0e9c5b066abc13a4137b4ea62569fa5b1ae93831da0686e8783be946a9b87274fbc2322ef93425b9d3fc1257023176c772b21b79b2
 WHIRLPOOL 
9f199eb94657149b51cb20fb55878cb1cf83fa3741906ce37a66b0157df9ca4dae66754fe264019e6bd8e7d286040fec718b89ca4b40b803c059c46521a5cc61
 DIST git-manpages-2.2.3.tar.xz 369884 SHA256 
bf6a4b5ae1267a252b93079e9b7fec2dc6f0a179ac05b9d7f351d183d354164c SHA512 
499493956b2a0634e3d5b4f3904a37b6dda1985ceb388eead4701365081605df6cc0c3db79e0aa0bf32d2fa201fd94201d66d5ee487fceaaa0fa4409a17eb6ad
 WHIRLPOOL 
0abf61527dcf71ed0e6dfbccf67d77ecc674122765adca584e38aa70ba7103b8d6ac6173c0383c4c964acbd603391e687809457320640461bc29a336c4fe7932
 DIST git-manpages-2.3.10.tar.xz 371884 SHA256 
dd7f92d9f23f6293c18a0859208b7f236e71e6fe09f041c98f8b4b9ee7f913ed SHA512 
324d5541d331708f9e0407becc378f955a44423e526502b04ba665596c1803e966a65d60bad21ae43320fb5b9616d8150c3b23095f1f47dfaf94e8ce0e2ad31e
 WHIRLPOOL 
41d6427b39b7c6e3c7e2d6d9997285806059ea746b81047083d3610ba661fbb51ebd100b68cb5ff2015b245a723a3f070e52ffb4bb38e2b9a132cee80ccebd3a
-DIST git-manpages-2.3.9.tar.xz 371580 SHA256 
132cd914bf57ab66d75a72001b6defa514181fab3f4555f8d6933a7efe987530 SHA512 
76100ba16f2fb5dc2e85a49d46ba420c52920f38f7f1feb2589c2bdc76100929badd147324a0f563d0280724f06a95929caa8e85336987783493d3a02db0ed28
 WHIRLPOOL 
24f5279122b74da69f366e5aec35029b6322891b5c670067b2cfc76696257d1c9bc2e6d674f2b2d740d4a27a439b89c3186e8bc41cdc8912e29635c4b3575929
 DIST git-manpages-2.4.10.tar.xz 373968 SHA256 
da712c07d84bb3da10be9fb56c15289c77828d3011179ab71f090e77e52a03d9 SHA512 
d5a978109db70f3d50d02ad17c93229206f2d5a2dd3dd7e9fb266ca7b76b85ad92f63120df885b88b5a33fe1dce0686ae92fc50749cb3b6275cb48812eb031a9
 WHIRLPOOL 
decb0b5bf81b25e4562f639e03c2b60b0c470338be0ac298f3d62deb54538de0961a81c6a8ced17ef5877df6de5c17b49fe96e77f00dd2038d2d1189c8f48e7c
-DIST git-manpages-2.4.9.tar.xz 373644 SHA256 
0adc425adb13d669fcc90fa28d5fff3e64d8c9feb49d0565ec031b7bddcc4e02 SHA512 
0df6359b8119b023b2d375bba08539cad4c0718184c5027b99827490fc17bbcff5da227a9b13bbdb5a82a45567cb83984dab050faafea1b7939532397f6688a0
 WHIRLPOOL 
20b8e34bfa4c5c20cf92368676f3a98949ed8c12a9c5b90f7cd052387492afb0e1521bf328e4bff43c4e8aeff8784d88b79498e47bffd093bc751e49046034e9
 DIST git-manpages-2.5.4.tar.xz 378296 SHA256 
bdd8db3b8cd35d01b2631d1f3c1174e5bc1b62b3e0177ae1954d83743aa93ea9 SHA512 
ccd675d8d9c117042083800fa4ae7a876a7873cf13844c92f731e46553d316a949d445c80e4b57824792a6b369623085053d25baeb4f8b79801b5849f06eb084
 WHIRLPOOL 
a2149da3217826c1c4951aa0fa0900e388ea806511559d0e01c4e17a565470048e55e988b12e6da3d7b52b11d410d27b4da0cac4d2d88e3f6860f22664cd8ac9
 DIST git-manpages-2.6.2.tar.xz 381332 SHA256 
1041b6f32eed0a04255bec22ada3bad3c212bee9986a99f3782248780d32fc3a SHA512 
d0ffdd721417a64f6136fd0de601096c1a07bb069630e23ba99b6a37eb94a6a12e1d17cf5af03af880dca328275720d306126a2aa235737be04b06c34ef35f50
 WHIRLPOOL 
61d9c17d095664ac781c479a189028fdd7a8eec043d3ca992f9c898905cea1044df8efa06ec19c543c7688f9f2e4bd176db377080e1f31b6b917278efa3e087b
 DIST git-manpages-2.6.3.tar.xz 381588 SHA256 
ae23f90a097437c896d6ab7becf597faa96ca8f0d1cd7efbcb1758ea2f59f2b4 SHA512 
e39c93fde14d69188e2a82cd35ef413f37de5d98e071c248b4ebbd4ee8c2796b88cf5a12da3a3f12bbe414e3fc370f22ad926c45c78466988274639476431447
 WHIRLPOOL 
8ed12bd9a853a43a4f8c17470f87d61ca38075beeb34ec9b87fc22fe734e03dbfd6edebc451542562134fafdc2c471ae3bc956c5b61ab0e5475f318027a0b543

diff --git a/dev-vcs/git/git-2.3.9.ebuild b/dev-vcs/git/git-2.3.9.ebuild
deleted file mode 100644
index 739ff76..0000000
--- a/dev-vcs/git/git-2.3.9.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common 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="GIT - the stupid content tracker, the revision control system 
heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/";
-if [[ ${PV} != *9999 ]]; then
-       SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
-       SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.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}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       )"
-       KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 gtk highlight +iconv 
mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs 
subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       dev-libs/openssl:0=
-       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 )
-       gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-       gpg? ( app-crypt/gnupg )
-       mediawiki? (
-               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? ( gtk?
-       (
-               >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-               >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-       )
-               ${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 )
-       subversion? ( perl )
-       webdav? ( curl )
-       gtk? ( python )
-       python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-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"
-# 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"
-       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-2_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-       # install mediawiki perl modules also in vendor_dir
-       # hack, needs better upstream solution
-       epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-       epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       epatch_user
-
-       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/gitweb.cgi \
-                       || die "emake gitweb/gitweb.cgi failed"
-       fi
-
-       if [[ ${CHOST} == *-darwin* ]]; then
-               cd "${S}"/contrib/credential/osxkeychain || die "cd 
credential/osxkeychain"
-               git_emake || 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/gnome-keyring
-               git_emake || die "emake git-credential-gnome-keyring failed"
-       fi
-
-       cd "${S}"/contrib/subtree
-       git_emake
-       use doc && git_emake doc
-
-       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
-               use doc && dohtml -p ${d} Documentation${d}*.html
-       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
-
-       if use python && use gtk ; then
-               python_doscript "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       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/gnome-keyring
-               dobin git-credential-gnome-keyring
-       fi
-
-       if use subversion ; then
-               cd "${S}"/contrib/svn-fe
-               dobin svn-fe
-               dodoc svn-fe.txt
-               use doc && doman svn-fe.1 && dohtml svn-fe.html
-               cd "${S}"
-       fi
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # credential/gnome-keyring TODO
-       # 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
-       for i in \
-               buildsystems convert-objects fast-import \
-               hg-to-git hooks remotes2config.sh rerere-train.sh \
-               stats workdir \
-               ; 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.service" 
"git-daemon@.service"
-               systemd_dounit "${FILESDIR}/git-daemon.socket"
-       fi
-
-       perl_delete_localpod
-}
-
-src_test() {
-       local disabled="" #t7004-tag.sh" #520270
-       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
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/dev-vcs/git/git-2.4.9.ebuild b/dev-vcs/git/git-2.4.9.ebuild
deleted file mode 100644
index 0c71a90..0000000
--- a/dev-vcs/git/git-2.4.9.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common 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="GIT - the stupid content tracker, the revision control system 
heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/";
-if [[ ${PV} != *9999 ]]; then
-       SRC_URI_SUFFIX="xz"
-       SRC_URI_GOOG="https://git-core.googlecode.com/files";
-       SRC_URI_KORG="mirror://kernel/software/scm/git"
-       SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-                       
${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.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}
-                       
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-                       )"
-       KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 gtk highlight +iconv 
mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs 
subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-       dev-libs/openssl:0=
-       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 )
-       gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
-       gpg? ( app-crypt/gnupg )
-       mediawiki? (
-               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? ( gtk?
-       (
-               >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
-               >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-       )
-               ${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 )
-       subversion? ( perl )
-       webdav? ( curl )
-       gtk? ( python )
-       python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-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"
-# 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"
-       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-2_src_unpack
-               cd "${S}"
-               #cp "${FILESDIR}"/GIT-VERSION-GEN .
-       fi
-
-}
-
-src_prepare() {
-       # bug #350330 - automagic CVS when we don't want it is bad.
-       epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-       # install mediawiki perl modules also in vendor_dir
-       # hack, needs better upstream solution
-       epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-       epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-       epatch_user
-
-       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 "cd 
credential/osxkeychain"
-               git_emake || 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/gnome-keyring
-               git_emake || die "emake git-credential-gnome-keyring failed"
-       fi
-
-       cd "${S}"/contrib/subtree
-       git_emake
-       use doc && git_emake doc
-
-       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
-               use doc && dohtml -p ${d} Documentation${d}*.html
-       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
-
-       if use python && use gtk ; then
-               python_doscript "${S}"/contrib/gitview/gitview
-               dodoc "${S}"/contrib/gitview/gitview.txt
-       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/gnome-keyring
-               dobin git-credential-gnome-keyring
-       fi
-
-       if use subversion ; then
-               cd "${S}"/contrib/svn-fe
-               dobin svn-fe
-               dodoc svn-fe.txt
-               use doc && doman svn-fe.1 && dohtml svn-fe.html
-               cd "${S}"
-       fi
-
-       dodir /usr/share/${PN}/contrib
-       # The following are excluded:
-       # completion - installed above
-       # credential/gnome-keyring TODO
-       # 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
-       for i in \
-               buildsystems convert-objects fast-import \
-               hg-to-git hooks remotes2config.sh rerere-train.sh \
-               stats workdir \
-               ; 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.service" 
"git-daemon@.service"
-               systemd_dounit "${FILESDIR}/git-daemon.socket"
-       fi
-
-       perl_delete_localpod
-}
-
-src_test() {
-       local disabled="" #t7004-tag.sh" #520270
-       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
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

Reply via email to