Version bump (bug #493348)

3 files changed, 628 insertions, 2 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 0d6ddd191f6d..2eaad9906692 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.227 2013/11/21 01:04:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.228 2013/12/04 23:07:42 polynomial-c Exp $
+
+*git-1.8.4.5 (04 Dec 2013)
+
+  04 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> +git-1.8.4.5.ebuild:
+  Version bump (bug #493348).
 
 *git-1.8.4.4 (21 Nov 2013)
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index d24104faa9d0..8f7ba8139894 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -29,6 +29,7 @@ DIST git-1.8.3.2.tar.gz 4474347 SHA256 2f798db86859c85608fe4120f52a1b1cb13ca9c4d
 DIST git-1.8.4.2.tar.gz 4672520 SHA256 8d18552bd5689a4c8e7cda6e44bea8aaa82beef2ac79b4b7cf329fe9438cf71a SHA512 84ec63686610248be17c5ba5f93b5fb33928d038eb68a72931ce02e533ba98f248fd83ecd9c4c1d1b4eda462f423cc75dc0f550d7df34acea7ef801392c03345 WHIRLPOOL 618524712c48bd2b37c1ef7603cce4bcc157ce80b8b3a3008a94a9126ab395cabecb6f3bdae64dd64994cde9b3fcb109786479f4e02e22bef29862219bf98801
 DIST git-1.8.4.3.tar.gz 4677316 SHA256 d2a71b1b23dc25eb65821cb6ccf9cba8d5910b68f64e9b71c6aa6778d13b08ee SHA512 a8ce4640230ace12867f894e892c62aa67c88db56397972a1f2ed4e26bd65fb4cdeeb1628cbbcff21d7717e3b82948c4561d727ff6da00fc5052d7c98c9bce44 WHIRLPOOL a6915112c0b079f3d62eeb84bc40840f18baf2c9a5f44a1c929eac95c8c1df95f844402354fbb8ee1140c80a6cc59be95006cf71387a224e332a0680a439a523
 DIST git-1.8.4.4.tar.gz 4677446 SHA256 eba6f0e83566f95ffccf80e381cb215697584f53d05e22d8ad100f83c5ab283f SHA512 6cd03f6d7cb123c4c7b703bb350b82a831ba115a731861f5d12e6826acb558f47421c669dbde485526659ab67ea876e1fa150bd192520180217023e430875bca WHIRLPOOL 43dcb3491c62e176ee0d3830e728171cfda1892693e1ced70b73ca7ae6935ccca52db6dbd027d5fe4e549c3e5e706050698dea93dcdb323bb52eecf2fa950dad
+DIST git-1.8.4.5.tar.gz 4677738 SHA256 37772b18b8184bb3b746963b8e1047a1205447df68c2b25698351434f8092d90 SHA512 56060aebf013becf884e27bf2a71a140c17055e0214a6a461ad3476d1d7017f63f3e2231047040adc5c42c2a08b0e75c9ae12b50c913c6689494337f3f7ad8e2 WHIRLPOOL 4dc0e1fbb8bf1d02706ec3943f506cf4f28a5f9146797dc35ac5401db752810220e1da109e3ce0750a8b2e2d7b7340ce223fe55c0279a1fdf60c457117da64c9
 DIST git-1.8.4.tar.gz 4657745 SHA256 89c73500b823a7672e23ddac1452ae14f44471c358865a6f18e835ded7a2d099 SHA512 80175d24a9ce16c4d51ba2b3ff0bb88f369422ec9b926d357a0369e1cd1afe9d5fe9ed272218c57b1542d1b75822642cb55f700327e7fdec27ea6bb135059d1a WHIRLPOOL 0dfc692643d85e1e5cea2a4521b77b1ca78da4119896397bf1deac23f1530e42b517e3ef40dc9dfb2216b50e3107e9a5319026dfc6925905f6243d29e2885e14
 DIST git-htmldocs-1.6.4.5.tar.bz2 772113 SHA256 12c13ead869918d8470d68c7331675c56a192eae819c283a398aaf9f0f7555d2 SHA512 155dfe08b752a268a680dfb3df3d7bf1453976824aa33eb6f98598db9ba52b56e770a31f9770013076dd518f212ec3e7cfd13408d77a0ba1c2ad6bc4921ddc22 WHIRLPOOL 59e25e92e4c1ca61af8b967c3e310886f520d93de230886c6ec9b86e370c1d8f8ce56edb1fa29365348f987c746a58e3954e8d891138a4459eb2149005e4bb29
 DIST git-htmldocs-1.7.12.4.tar.gz 1798333 SHA256 580de99c9fd8bed49132cf137af643d64e1450a7917b77c1343a784048a95930 SHA512 fddd27cc98ef1d263aa663655f778dd708223bbddc792098548f0ae68981eccd0427007c82c011e9eb5c860272bd65a4f4032e46f77ec8cf16f051814092585c WHIRLPOOL 1d1feaccf6006e9b880964cddce0565a7fc6bf8f8c96198fd0dd4e48de165718a7a63f5c44b61cd1b40e7f080b8c495fcd9cba5749684f5e255b7fb8eb252552
@@ -42,6 +43,7 @@ DIST git-htmldocs-1.8.3.2.tar.gz 2115320 SHA256 805b7fc4399daf9258e8cc28ecc3dd04
 DIST git-htmldocs-1.8.4.2.tar.gz 2206047 SHA256 7fd16881ad5534c1f8c93617fdf8fa3762a66eb6d3cd7a66256db33cf8a0b0e8 SHA512 ad9c09bfdb5df7bd59ab06f53f17a56ce5a825901607ce9373a7c8e611453788bdcb58a37e83ccde267e234e16ec82566869365f1da77f58da59c041adf0a9a1 WHIRLPOOL 8a2b8990bd19a8a9ecd048f250169546a65f305c4d5c29571a8aa61d442b0ed038a198d9ae3a2b7bfcedffa311bbd9f6a1b135c5b5df91a72dc9614b51defe04
 DIST git-htmldocs-1.8.4.3.tar.gz 2206916 SHA256 e932defdb938fb86c05bd812ef7f1d7e95e2413be710f9b5d9a7a83dcf820fd3 SHA512 e7f65092920aef874c9d22f0315e47a095f47834e640d1bdb236c8d70090f90b5e068d7608aa512555781f1a1edc0d56c4554536ed548f17dbeb7c380450eeae WHIRLPOOL 63edc84d05ac7c3f8698326013b3d963f5a26cb4e6914e38863a6e849f8766cb66a498df8057d7767d3d51ec6c01c5fca8fa22f253ea8a6adde8f6a2173b7962
 DIST git-htmldocs-1.8.4.4.tar.gz 2207278 SHA256 fd9914b0f150c5b0289a2f34f71118df7111bcac69f6af34969066ce7bb371cf SHA512 1c56345253ad9174ed9e5fbc536d097b669ba34a0f41eb7a69f26721518b78f75fda14d33342c61a08297d37635b61db5138e1c8ee58638a5d97d0c7f9109646 WHIRLPOOL 6bed5bf2612b639433727dffa045285ed0dd9f6910223c0350e2f11fc98bc0f37811af934b41b709d077724756bdba41195de0f8ed9bce7ae33338bc61e174aa
+DIST git-htmldocs-1.8.4.5.tar.gz 2207155 SHA256 ecaaef864b1794301af4af17a4d378966ac1dbeee9a82f524d1ebc0b6d6da299 SHA512 1bb5d8fd2884f0bd39ff0924579a4bd16d225da10ae78cb3c535133d187b9306dce55d14a2df7fa0a40c6fa1df523eec2e118e2f5268dd624bbdb6c65fd32363 WHIRLPOOL ca5ce52d02eac3f079ab89eb5e41640c9dee724c8a3356b362eae0ba120cb9640c5f6a4576ae98fd42002f84ad066ed3e6254fdc77b95731ac1b17549b5911e5
 DIST git-htmldocs-1.8.4.tar.gz 2202854 SHA256 98d97fd8ea87d2416a5f62550a1db59bcf19ad5bed3d276e8b9e07ffe861eb30 SHA512 339a926210f3ba57522c26d53cce5be585c656ac4bb092357f78d61c4caa6991d062ee77b053d4afeefb36e1b6d74bb946cafaecd729c7f4ab3c8bcadf6030c3 WHIRLPOOL 636d2d4594413f9db76845497308e9fe1601488ed44a09881633906b6385b0ab274b1e9ae2636493c3b70f65b68f5b1ef331e945a7dc1199d1cfdd6c73692c1b
 DIST git-manpages-1.6.4.5.tar.bz2 254368 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0bdae702b1fe58ad8ebab32a0bb7ba447 SHA512 9874bd63e138a2973f5912385e7972d17cd7bfebac7c67bca96ab041912ade4f2485d6536312c452d2b2fd6e89c1fec40b40cbd0ea91486db1d1b7e7e68c867e WHIRLPOOL 72ec9606acd277d90c5c6a46206c63991be7c256f43a1b866fe6da721434131646043fb5b03d448f1c75a3ffea92f4cf1b05e8a846919800e146e15a160dab04
 DIST git-manpages-1.7.12.4.tar.gz 521602 SHA256 4075b60250f9bc5b5323266764c889f028521dbe1f5c10f470a167cc75105005 SHA512 0cabb41e7e599111c64f3382d4688891d1c76c5550ad27a08b6ca2e62fe826b971fa757a6a815731b8b88d1302ea886f199944497a0a10fbbfea41eafae50512 WHIRLPOOL c33b93023feab4a5f6f63cab5cb1e82e42f2fc14bd590ced246ebfc45311e3ff93855864f521af12916bde58ac4fe2ccb055e667936e85883192dd0904873735
@@ -55,6 +57,7 @@ DIST git-manpages-1.8.3.2.tar.gz 542769 SHA256 599bc8f6c56986a994a237cfebb53b4fa
 DIST git-manpages-1.8.4.2.tar.gz 565198 SHA256 f7e8326a62398026c3e721e06499f09d3fab78fe67d1c75e07fa14b6b59801b7 SHA512 52fbfadaac06f65525d16441d51b038a56dcaf63ffa4bfe4593c6f65b0db994ab59cce7332f02529583fe63afae62d6351ce20dce38de1d0c398ae5e39ebf2f0 WHIRLPOOL fd08877e18fe5f65380acbc33d699d1f300c693aed9123af8ee01202826bd3e4061cac0fc6865c59a18a21a579898aaa78b5031710242f9878fe25552c3aee8c
 DIST git-manpages-1.8.4.3.tar.gz 565288 SHA256 2ea22bc9efa0ef0ce2ecb5ec04c90544505b82a115805aff193acb03768dfc1d SHA512 a85a44d3a17397856dcb2585917395780e2e60ffc200cc1af7af06fc84f146b577675bd18a8641755768f9af60ed562a67b428779ca0674fe2b8368877842922 WHIRLPOOL 3f4d2107a7b5e1563dac90e17e466cedd42afa733328a229afc2845ae06d6016aba50454f1db13816a20765273a8b0e4a6ff1c71fd40b9e22dcf4308bb6521c8
 DIST git-manpages-1.8.4.4.tar.gz 565132 SHA256 34865527d564629db4d5e0595de3a8a8354d3886d0a2f93fcb481bb68674a1b0 SHA512 6524a768131c3f93154ee861a5160b214dde8a13c1c7951a1604cd165fee1de341bac2d051b294c41ba6e333365fb97fa964d6c9907ea0ea77807b2c94406216 WHIRLPOOL d10718c479e4415c727b1ae9b12acae01152fc89a1a318f2f8d17b88de0bbba34df7d242114f5784a945a94f8c02ec6706c9e6b23983905c85dddf5c9e21684c
+DIST git-manpages-1.8.4.5.tar.gz 565177 SHA256 8cf38e3a48425fe74c4a71286633ea895bd03d32481ea5112e9682a6adb3b4bf SHA512 6f9d56da7493ae50275f259ca65649a4dbada3a3d0e32e0a418ed73c2e2661c90f23cfe9a62800cbceec1db86a2bb7b93eccaaf28c282cb5046c2aea3f928774 WHIRLPOOL 1f92c6437214f9d8d998a916cf34399be4f49a5c2dd5fe930850ae3b7ef10da66594c8d4544fa313b485bdcfd9259322c5ba0b83f9403263c80d12b19ca8c5f0
 DIST git-manpages-1.8.4.tar.gz 564928 SHA256 2b7eac1de1569201172363b0054ea9ee4c872587514e6322f534befabf5769c3 SHA512 88a2b0c6d972281330816cdbbdcb15a764966de528ce52a6fcb664da2350fd021ba7194f99705361eb7cacde10d0607c6b70a753e7299dbff12f7a8841aa741a WHIRLPOOL 6df0f1490bc4cd57fa7c60edee16bfae53d6f9adbdd705d946a7ff6d044eec8c465862db86d8c7ac0f43ea1bf99e97284eb1ef2c931a89f14be319f718fe54f0
 EBUILD git-1.6.4.5.ebuild 10408 SHA256 0107590ab8f9fb6dd5160ae3fff7f52c9e3348686bf03df450b7551c9464dcd5 SHA512 513fcaab682cdc8e32012afcca0c13877fd6452df32e37504519002c00de318875e3c0179bd98d81925acee171801b7bf82e1d9a1a7e0c63889b280f01b44663 WHIRLPOOL 1de545062584bfa0ff1f8db92610533085fb636e14ad57bf621d94a7167dbdfc1a30aec601567550fa3b194b96d6daa1f1cb71e8833e2af3d3d3d2de848b2e2e
 EBUILD git-1.7.12.4.ebuild 15320 SHA256 d1f39b24cd4a1e8d8e255555b26024873fd7d63959302592480aaf6cfd68c9f3 SHA512 5034c4d71bd93287a0fdf0862646cf7801560015805d80b835631d29f646002aec074515772b3e445fac523aa629d66969839902df254f18eb1f25e1ee928b1b WHIRLPOOL 4956965813ed4482f1dcb2a037996ffb1d7a06a0b15643168147e24166f09b643bea08a5a0fff6ba086bd1f982aa915a059d520b3597faa63fe244b32e0f4a6b
@@ -70,8 +73,9 @@ EBUILD git-1.8.3.2.ebuild 17390 SHA256 a7b1ae7ebc3a793b43172aa3565f3206fd95a8b6e
 EBUILD git-1.8.4.2.ebuild 17770 SHA256 4a5e63e12e5ebd98df0dd8d66a27d2892f7a58b230596cd8917df9512efebd52 SHA512 d292cb293cb8944cee2e4b4446fb23592bd2d2e1d5f61ff87857a33fdd2081ecefbb569a45e5e3daa076ac7aea3c8833111daf3ca59aec26d1ddeac8ffedec8e WHIRLPOOL 0ba53a66a363cbbdc996d9de991107bf4eca9d7887f8509ee7d039149aa3a1154dece6ab7922788b7b94f206207dc533659ed0fab59087157c6d785dac3446d8
 EBUILD git-1.8.4.3.ebuild 17770 SHA256 9dc84c164ccd8cb9e10fd232ec861e688842e35a794647cb2d9819cdbb86dfa7 SHA512 ad63c4cdc97dd5d3f37fb30d98ab29ddb5d012669d83d4df94fe743f10ff5aab7c94aa7cc7a72a12b6deae68058b9afae4292181af0bafc58278dc12c6f02dfc WHIRLPOOL 1ed4ec921cb5696ecb81d4e7d3b82955f5aacb18e60984fe52519feaa1c06f3fc338c19b55300b2c481366c585a2041211fcbc7bd5ca5148a4445e000a4653a0
 EBUILD git-1.8.4.4.ebuild 17770 SHA256 8de46aa81a39bb641ffef90f464a751c6d69e78cc95482e77a9d0546a68dd9c6 SHA512 cccd36a6e27c45c04b0a06c17ec980a3679f99e5d97bff29561328a18a8380f42622979ed5b4f6190a9aa0d1a94c2fb3633d426f43c3f08928bb655b2592873c WHIRLPOOL 9d78b2db5fac919e09c8ca207bcf51392f7e784bb13175420381e83f5bd28febf53faeda9c7dd6114493dfcc8bbcdfcb0eff67ec7cf5d43a3c1d529c464877cf
+EBUILD git-1.8.4.5.ebuild 17770 SHA256 8de46aa81a39bb641ffef90f464a751c6d69e78cc95482e77a9d0546a68dd9c6 SHA512 cccd36a6e27c45c04b0a06c17ec980a3679f99e5d97bff29561328a18a8380f42622979ed5b4f6190a9aa0d1a94c2fb3633d426f43c3f08928bb655b2592873c WHIRLPOOL 9d78b2db5fac919e09c8ca207bcf51392f7e784bb13175420381e83f5bd28febf53faeda9c7dd6114493dfcc8bbcdfcb0eff67ec7cf5d43a3c1d529c464877cf
 EBUILD git-1.8.4.ebuild 17768 SHA256 dc61fa6e3155603a37cf1e6cee7718761f5972b1e6e64f837b32acecf29f36e8 SHA512 e2758cae49c3256006c0c797554f5dcdcea521139909e5bfeb54c0c32040c4650284fcacb6578a4978ebbfe1d5551262b4a488db0e3df28d596b970bb8cdd9c7 WHIRLPOOL 6779712dc5e11dacb254b299afe2a651dab4014b87ea19873c6ca8322b37ca3ac7bfeb1d42cc05d1b1d6883972189d97aba5df213178e98bd26b3b6389bf7708
 EBUILD git-9999.ebuild 17768 SHA256 d69da921aaf09719d91097bd9893db1fd0254deb16d4dfdc35092b87ad6109a3 SHA512 1f175e5c0751aa3cd036f10540ff9073cf39dfd2b230b1da29c3f05d65ca9069fa29adede74fd15fe301a239002901e0a645e7206cfdf219a1bdd14d639d5bc7 WHIRLPOOL ea29989aed53614d21532a9a1bbfb6aac1e50e05d601ea356fd5c394f3c7ed09fac0f9674491adcc89b9c605f2b5c7e8de189d35adbcc24bc69aa122755052cd
-MISC ChangeLog 8726 SHA256 cb9666b40a9e916278e5633abb22f7930579170145a2f3742a8cb37c761a343b SHA512 8a91270f1dec85f91366dd0b5f710fa510029a9f45da5251f8dec5b0e379a0cb42ffd27e185a15f90a53ee537781d80e1f87e14cab2c9df064af553972e71dbb WHIRLPOOL 1a6b46dcf8cd36f5a58b278d345ada645e1e102eb630c2fda56963cbcbeaa8062bd4dd6e397cdcc1acf3c50a818ba745f3126e5231d1cba80fa1d45b653dcb97
+MISC ChangeLog 8860 SHA256 3bcc04b36f6662194eadd75937a9f6a9e278cd969d41b3b34e08fc1d9b97b727 SHA512 2655ae0da1e6cef929da10b764fe95b8c01b180801f442d2a950b170ef9a4d3856692ea859a6691ad34a0f8d1b80708140e82e065cc2b29409a5171ad531be5e WHIRLPOOL 477387ad2983eda98d334788f63eb5fcc1cf917acfc13a7aafc15bfdb139eb56f822a64a9049e2d2dd9345ebc27c4b0bbff69a56d66650bdeb69e3ce05f415d1
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC metadata.xml 2001 SHA256 a47cca001bfa05474eb7fccf92af9eea72d7f57af9eb0730863ed253a051a589 SHA512 265f6355dff77875d22a71613f49db23cb5b65a48691baaf4fb9511dcd897b2155f3ea0afdb6b3c3cf2b22f6ffc5a27991f3df7c3c6f5d5d05e72852db3f1d83 WHIRLPOOL 9e12046ac7ce155069459dd64c0d5de4436e628d5de5342400e631fc9981b98856359152e27a702ce317a9d9f9f65b7184a99ba5e0dd3e427741e1d6095621b8
diff --git a/dev-vcs/git/git-1.8.4.5.ebuild b/dev-vcs/git/git-1.8.4.5.ebuild
new file mode 100644
index 000000000000..4aed5fbb9789
--- /dev/null
+++ b/dev-vcs/git/git-1.8.4.5.ebuild
@@ -0,0 +1,617 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.4.5.ebuild,v 1.1 2013/12/04 23:07:42 polynomial-c Exp $
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_{6,7} )
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+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="gz"
+	SRC_URI_GOOG="http://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 ~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"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	dev-libs/openssl
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl[-build(-)] )
+	tk? ( dev-lang/tk )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+	gnome-keyring? ( gnome-base/gnome-keyring )"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1 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}
+	app-arch/cpio
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	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 )
+	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="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${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="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts="${myopts} USE_LIBPCRE=yes" \
+		&& extlibs="${extlibs} -lpcre"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts="${myopts} NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts="${myopts} NEEDS_LIBICONV=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${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-1.8.4-optional-cvs.patch
+
+	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
+		git_emake EXTLIBS="${EXTLIBS}" || 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
+}
+
+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}
+	newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt
+
+	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}"
+
+	# git-diffall
+	dobin contrib/diffall/git-diffall
+	newdoc contrib/diffall/README git-diffall.txt
+
+	# 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
+
+	# remote-helpers
+	if use python ; then
+		python_scriptinto /usr/libexec/git-core/
+		python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg}
+		python_optimize
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# credential/gnome-keyring TODO
+	# diff-highlight - done above
+	# diffall - 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 ciabot convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh rerere-train.sh \
+		stats vim 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.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
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.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/bash-completion/git-prompt for Git bash prompt"
+	einfo "Note that the prompt bash code is now in the seperate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}