Autobump.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

3 files changed, 606 insertions, 2 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 6ce06f6c0a7b..2987157fce70 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.177 2013/01/21 16:16:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.178 2013/01/28 21:22:19 robbat2 Exp $
+
+*git-1.8.1.2 (28 Jan 2013)
+
+  28 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +git-1.8.1.2.ebuild:
+  Autobump.
 
   21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> git-1.7.12.4.ebuild:
   Stable for sparc, wrt bug #436704
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 70fdb14832bb..091489616b4b 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -22,6 +22,7 @@ DIST git-1.7.8.6.tar.gz 3546112 SHA256 45be602d0ca64eb44282cec7a5a7286487f7e9ed0
 DIST git-1.8.0.2.tar.gz 4231410 SHA256 c06d5d29389e90583d16ec41d5be931593196f6842f9b14e910a0b5781c10e07 SHA512 b278eed9571f2d6449aef18f94fe0937c2f54d1ad9bc2a6b54d3082b550e1377b896aeb412438991219c454179b2590241b37e8ddfcf7096fe49bca564956779 WHIRLPOOL f61474fd1a7a76cb64c1202ff4270e0e84dfd82165eeeefda454127a69e778763c124da899ae0d95d9e737872f1bbbd46f66d9aa0d6d6cad1aa065001c6cc711
 DIST git-1.8.0.tar.gz 4225055 SHA256 ccc32f18ea12ea730a7d1d9d3d7bf51447439299a99d4d326f49f1f8bb488974 SHA512 9b251a77db39eb17a670c4b9673d20d256744edabfdd304656b083c523f9e41d063ada9002f399a81ddc8b7684af788ded59e1362affa15f7b56ccc5db15fd51 WHIRLPOOL cf771ef5633a8a4e652f4226d6eaeb75673e922d35a71e66a7bce0deb6de1bd74a0192f7cda63e0fba8c0df0c36878609efb989914ac7ecfb172f906e7d218c2
 DIST git-1.8.1.1.tar.gz 4295398 SHA256 8b5bd081dc38f3e14acc86f234231a9a46d1e9a990c8c732aed6856d2714dff6 SHA512 75a75f97206e3150f1d7a31dea9aec002494ae10831cd0022f8ae32f0273b12ea162e1e25d31946b4f7287dd6f486a2fc9947ad3a40b08346a85ff68e5a8a19a WHIRLPOOL c2adbd9d543c0058216e69134fe0b7cd73cd4136d3820ef07f755e7c6b8eaf6b23e0da4a8414c8c070a64711692ca7481ccfca590d858d59ee582a0dcf2783a0
+DIST git-1.8.1.2.tar.gz 4297221 SHA256 07d210a37deec465b4d00e4907c732dee5c5d23c7d90c1b582e7ab754bcf24c7 SHA512 de74961d14d4220393f015aed81b6fcd2da6939381ccf7b455a89e9ef41a74e8aa39d8772a8a20ae3c2067247c0d137ac56a413c6bb044f80bfadeb6174e835f WHIRLPOOL 5d3b24d2968e7f11a082be1d1bfd5d0928d16843e2caacf9bd08ace674a2a666ca0e98442dadc6e638a877891e4460ff75a116d4f9985f3e4b2b407b7945ad9a
 DIST git-1.8.1.tar.gz 4298533 SHA256 285cc1a9c8751ea62fa568e2462f286fa535e0d847f06ae686c8180e53360c2e SHA512 dab54534c200413ae45726dad7aab53f2debe5642f4e613ae3d9901a08a918a66c6ba531a779ea0c73240b38158f071a7e98b9da3c4add33beb7fd37b9eeebcd WHIRLPOOL 2c9f8514c51acd815e776148e06661b542e31c19561880772c8baa5bb10c77a72bb1d787cc1606a713d7b0eb8180f5942147690903212d33d837740d66059a41
 DIST git-htmldocs-1.6.4.5.tar.bz2 772113 SHA256 12c13ead869918d8470d68c7331675c56a192eae819c283a398aaf9f0f7555d2 SHA512 155dfe08b752a268a680dfb3df3d7bf1453976824aa33eb6f98598db9ba52b56e770a31f9770013076dd518f212ec3e7cfd13408d77a0ba1c2ad6bc4921ddc22 WHIRLPOOL 59e25e92e4c1ca61af8b967c3e310886f520d93de230886c6ec9b86e370c1d8f8ce56edb1fa29365348f987c746a58e3954e8d891138a4459eb2149005e4bb29
 DIST git-htmldocs-1.7.12.3.tar.gz 1797128 SHA256 ec8e10b989e8f94d1607ecece7d4a2e91fa07e5f47e02944fdab3b7904f51a3f SHA512 cc4a4763ee3c34dbeea2df59401f9d927e10a4db9c6c1ea13ff62b9ae12b88e24b6ad19f98cdc7d287e8dd7d634d145eda369c6ec387854f902d8eb0022c2b61 WHIRLPOOL 4f40a391041e34e7c648deee31464b73cc6d58ef84f9f9ff666fc9f517e186c5df281f576536be8b14015ca49ce7011e8f29182dd06b56ef7a83897316d2b6b0
@@ -33,6 +34,7 @@ DIST git-htmldocs-1.7.8.6.tar.gz 1688622 SHA256 7c7447fe136349b1807caba1c00fe6a4
 DIST git-htmldocs-1.8.0.2.tar.gz 1809932 SHA256 edba4dcc9dc131b32ba05d5cb9334a9ba7af3ca6c91795068b56d7e0d3b0f43a SHA512 f63f8b1e9efd96a5450ef5b31be992fe49fb5c8de8f79d9835ff5884dc4a4ba9e87c8c7f8e59e67250df880ee7221d2e4de754bd0af5d86a117bd4ee5d306dae WHIRLPOOL bc5508ae94024157ef1fb2fe19269eaa5189bb41a603390ec5d61ce9547ae9f68cad49a7b4b3da47f09a9a9a8258c8e76fab1fd03a222454fe48e4288524641c
 DIST git-htmldocs-1.8.0.tar.gz 1807615 SHA256 b5837f19815c5259355fc2ac1ea320bd869680218b82b9a0802ca015c0e24363 SHA512 bb3315640595e384b206af2e40aa82b80e50327da1792e72536754892aa6037b7624681e5a1142461019f5382a60247f1c4480e0a049bdd8d5308fa5ec1588a1 WHIRLPOOL 18024bfa6343cfe2c3bbbb3a9ea7221ef587cc09bb1c82f9466f846698abf2bbc1844806db0c73a14cf9eb623e406b0d6a1e19bb2022ddcfb861bb18ddeb835d
 DIST git-htmldocs-1.8.1.1.tar.gz 2051039 SHA256 6a1a9369c68a41544376677d5317f89c1720ee40cca645eeddb04c0a5b733763 SHA512 12e06ea3f1bd923994e53ca52ff394b563e8d00bd3af2ab015bddc87deaf00a81697e03586d95b67700b17feb22cee0b2ae98cf0d54addf997bdd7a3b16fffa6 WHIRLPOOL 86d43d96a5bb7526542ebe4ad7ce52889e1170ad073b2259f0adb65eb5e35255422d1affdfedfd5c987553e5db61a82a75b915f0bead97310bf71fd37dfd97ad
+DIST git-htmldocs-1.8.1.2.tar.gz 2051331 SHA256 280a8a2980822ea7cf69b5b25c5d45028004f1d454998984e97feded16e6443e SHA512 e1e5611b3ca86b1514f3d6585207b2c16803e64f047c140d5a3115bf3ca4f97950b58c00f54ceda62fe7810e7243c7944540c4681d73a9ec0d22515c1c5e60a6 WHIRLPOOL 0d4fd321202cac4bdaa76ee6325e33fa7fffb7f8a8207ad76659ed1f17f95d8d7629149b07764d847a931756b3fc4176e7d2cee16c9ab4b6843d4b00c3cf3b19
 DIST git-htmldocs-1.8.1.tar.gz 2050088 SHA256 a2de50dcb0825e00ccd8a93f036adc5540b4d7062f6799f056aa543cd53747ac SHA512 d8ffbbd5c9655620ce23a2916f6227ba9435f2b5fb26f9a61d6fe1a780cddeb0a7be13559677dc8e18bb90b7cc2b5be5386743b135c119c9faa44114b2fa849b WHIRLPOOL 47dcfe212205f7171e87f36f4e6edbc9b8f37e257c4ae71d54f09d854a2f8fea7f48c8041b51c86dcea457c2dfdc334bcd0bfd25ed7036dc79949db3a7915303
 DIST git-manpages-1.6.4.5.tar.bz2 254368 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0bdae702b1fe58ad8ebab32a0bb7ba447 SHA512 9874bd63e138a2973f5912385e7972d17cd7bfebac7c67bca96ab041912ade4f2485d6536312c452d2b2fd6e89c1fec40b40cbd0ea91486db1d1b7e7e68c867e WHIRLPOOL 72ec9606acd277d90c5c6a46206c63991be7c256f43a1b866fe6da721434131646043fb5b03d448f1c75a3ffea92f4cf1b05e8a846919800e146e15a160dab04
 DIST git-manpages-1.7.12.3.tar.gz 521149 SHA256 fa85885f813c5081071629e3dd8832cad730b8e481f33e9cbb00edfb3af4f24f SHA512 f91bf027d59046507ae98f36066bddf61bcf10121674557efe7a497c992a1efd993835c6acdbf1a4fe4aef1364556e00e66fce2dcb162b26bd3fe3109ab83001 WHIRLPOOL a2d40a46b4566157a5987c2f5af6e68528b29ea54fb842922182a1b0de7e45b8b8b10ca0221694f4e730a6e01b902869f3566155d81a4db8297c49a089a3c175
@@ -44,6 +46,7 @@ DIST git-manpages-1.7.8.6.tar.gz 501678 SHA256 559b7a6ba8eaad655d725765b75aff9c6
 DIST git-manpages-1.8.0.2.tar.gz 523757 SHA256 b04f0e7277927e8fb91c1c1f7b951b6d2770cfa6a7b69145462214954751be98 SHA512 0d443a1fd6f8b234012e33b5b5cd2bb83a6d0d9ae72b623a2fbc96163fc5b6c727c34094e87166559669afdf2d26af3681ebbb68ecfec33a949968a07a47c9d0 WHIRLPOOL 80f80a4e60dcf7ad15a09ccfc9e17b66b00dae0da41ca7a46891483572e3f720c574f5a7626670f6eabe3ee6d08283f072d6b794de06233382968977a9248a25
 DIST git-manpages-1.8.0.tar.gz 523324 SHA256 8914907f9d22b9a6a0ade9a8addda9a84a2db35b23cbd404f2682cebc9114205 SHA512 651b876c3c9253b1b8e7e9209af448d04606b67cf1933d5509ca9c91833477e4b6f620a775fbd961d90bed371aba3ce3976d6316c0cb904df11e210f9f9f3096 WHIRLPOOL 34de3e23b74a1305ab97d41681f114802bdb492fa40152f522627a292f61b690d33658fe1770579decf3c5c8d98315962bf9156785ce44eec0a26171a96be1b4
 DIST git-manpages-1.8.1.1.tar.gz 528447 SHA256 6db801dd94d78ebd3e6d46b3b09ec8c470f7138389e45758b0fc6d3ff5a32506 SHA512 9939e5a3292d4dd30cf8dadd4d82ef6ec421ffa62c82d5b8325b54766b7da85a2f00648130156fbb136928eee763f1817cfde8d1bbce39e24664dbb17b168a1e WHIRLPOOL ac21e1f6ab4fa5dd9ca726deeecadd1db4f1b85b83e4a2a1b5a8b7b80e115fbd36088362b37bb99fc99c6a89a749434102eba9f1e25e040090acaa9971774874
+DIST git-manpages-1.8.1.2.tar.gz 528481 SHA256 2612e79bc5437c6bd77b9a131474d8ca35e19d7173f13f301b4ee0511bf3df7a SHA512 a0e3d2db91ad548e13eb30c2abd8dcbf46819228c7f6bb836d55d0a0082c10e6dece0463b88e320aabe700297dbe20e15817f991989c639b0059faf6ac4a4fe7 WHIRLPOOL d3877b4a7d2e96835024aae6e7ea05f518c7d8d2489bea187490ba048dfca94056cff46aed5df2eb40d28f570923f829b87b387cc0852662691c6228dc05ee9b
 DIST git-manpages-1.8.1.tar.gz 528158 SHA256 c0be93b4bd611776a560ad37954131a8dc1f91b8ca66be9c159137c8fef44ce9 SHA512 45b2aca5953dad6786e8f42c7989131d39c97c69d483c5cded361bb0f80bf8583aa04baa576c0066225ffe28164cbf4068761c33b9c5fde991544f501e789045 WHIRLPOOL d745d99974bba1e2d3ed5095bbdc8b8381234829648ea7fb4cd9a35f9e9d4b809a8057994966e7a14ff490f53bb30b301d1464ccb793be101c649485131c15c1
 EBUILD git-1.6.4.5.ebuild 10408 SHA256 0107590ab8f9fb6dd5160ae3fff7f52c9e3348686bf03df450b7551c9464dcd5 SHA512 513fcaab682cdc8e32012afcca0c13877fd6452df32e37504519002c00de318875e3c0179bd98d81925acee171801b7bf82e1d9a1a7e0c63889b280f01b44663 WHIRLPOOL 1de545062584bfa0ff1f8db92610533085fb636e14ad57bf621d94a7167dbdfc1a30aec601567550fa3b194b96d6daa1f1cb71e8833e2af3d3d3d2de848b2e2e
 EBUILD git-1.7.12-r1.ebuild 14856 SHA256 c51ae3be2cf004e4bf93e017536c49a362779f6816760893d5eb756eafaa56d9 SHA512 e44fe720b85578e5aaa4aba2cb764d6f56c0e0e2391432467148b6e748e821f15f503d61e91c4e0b7e78cf614f6b0c30fd0d2899110ad76890d9e55497d6d48b WHIRLPOOL 6ae32308494ed13f0234674d54f69c09726fb7ecd8f3210558466879cd7a8238102169a9ae81e55375f09b727d3088f326498663f309018fd36ab670b3cf2825
@@ -59,8 +62,9 @@ EBUILD git-1.8.0-r1.ebuild 17164 SHA256 206b245eb27acd8ba62c999657f99b38e3d472d1
 EBUILD git-1.8.0.2.ebuild 17163 SHA256 f9788578e0175dd10ea040574f16afaa36a062fb9ce4a53a261579811e8cb8ed SHA512 f8e6c5ac8edc1a623cab8e74b0cc6fc38ae48925efb9af6c43fb92d510eda691d6ca77912b3c8b87b655bf0c9163612c3d72ab92ee43ba7029f1448730104bd7 WHIRLPOOL f94d1d89377f8778b254edf4ab21f2d27ca31ac410bf84d974dedd34783a046ee17509489aeb6cf3c22b7bb1d61dd4762bbc547b36fe318318b7e26ede040c9a
 EBUILD git-1.8.0.ebuild 15358 SHA256 d14583eae36328c2c0cb910e371ef2a1041c12b42be58c778e21b6096edbd880 SHA512 258b3c503c2e605689753447f59770e5d3baaf2d781affb8723a30707b901f39c6a42bcb49253251e686d60fc2ab63cf9eb53194d6c6fdab20f23726726ebc90 WHIRLPOOL 7b1414b53c20faa05086e7af84a92dc0e622cd27d56edb80e4d02b07c23c12a69449d079762543399ae9fc2d625ffd1b0cf1ff6d2078392d4bb862fd4a3a51db
 EBUILD git-1.8.1.1.ebuild 17163 SHA256 a1e43cacdcf26c1d587cd273b295509d43884b535075d62b85d1ac2651990b8f SHA512 903a113e39865ebe512cf6953b558c8d6006b774d350b1b81e1bc08be8da5cc19ce5e5b7cf1c863ac206eb51f7e8d340d89873d9dfb5a09033545448407d6c72 WHIRLPOOL 427ad662b66823b12c0d66dbe552aca76a1d44d3dc5cd969bf513d6b16d65842a788e48ee88ae3609c86e6a081acca5b9c3a7537950e65c34c91cd36b82c06b4
+EBUILD git-1.8.1.2.ebuild 17163 SHA256 fbb511f30b087f9ac3a8e7b708307b510290b97026f523d0694016cb77ba1b27 SHA512 bea9dfa05ae3aad51be3f6cae161e022d152bb5cc2cf246bbbe6501b52c56ae5bcc7015723ed7524712182b2ce97df8813767e777c7047b541a27cbf10286fa4 WHIRLPOOL 5c5113be3ea99a586eb57539724984147535021922af6644e3b54a83f2e3461d84c0957c661e5c3fa36444515572334b7f24e9dd8a9fa91894783f1218fe3e3f
 EBUILD git-1.8.1.ebuild 17161 SHA256 b2bc65db13265937f222bf10267610b8cd7eabd2eff244140255843518d878ec SHA512 a5e9d6d30f0ccc0438eca4d7f2d48e3fa2e76af1c10be18ccc5dfd6232a343bebc5a4e07373cba5c7feebc84c13ec709148dddd4d8e96ee5a7ab086a5f366066 WHIRLPOOL 7bb1d14736c3ec53a25af2059adf3c3ecdcff26415bb7ca5c0a7522072489aa602715d6e514893e0ecda3d9d2131cf66ad7d81be0e0100acb5afc15fce506e96
 EBUILD git-9999.ebuild 17161 SHA256 a9fe07171ea5f267843c0b070522e0b2c74d78811f51c9fb2beef3925b65570a SHA512 574798b98369b27f1f1bef983a6563523495eb6f33fd9f05bc692ccaaebf86f59ef3bc41cea896a9143b05193d26a46df15b75a94aa9e718f14ce4f4bb20d06c WHIRLPOOL 0b5599824093bd44c259ad56594bbbfbb2ac16d061059835816fd2010b61405021e0aff99466c8d359e92cfaf08c30e6d8d052400defea046877c51d045eddcd
-MISC ChangeLog 1499 SHA256 cfad218368100ddcbc51a692f78db19c579f036421b7ed8b733783e3e4fb31ed SHA512 e6d4ae7718bcd78920387db13b0e8dee001a2ba18a150379c1ee6e41ee77ae8d138d7dd0042752a103fb2bbd22d92d7f4d964321aa9de0c31d34a7c1c9b18dc7 WHIRLPOOL 155ccb32954b84bafb1648bd3961ea80124ca3932ab2db8aa3e636ed7cc60aa08a46c0cf6be9094d383eaa722e26e78cf028b3e9b32dbc4f4908b5831a41ca04
+MISC ChangeLog 1618 SHA256 2ffff27ecec6d25a5384d2898b05fe0f963777bfa5835db0c65fea74f9ecfecf SHA512 926befe27d407998479efe390077815e467382dd5ba2316d14b1cd5474df01f3f463910b899afa83cfd00b3051e026a44a214c3fca55933234d1c182ac719229 WHIRLPOOL 02a3278c76a9effef5f4c084fd607e47148f0c8f3b9a149a105c6908e0195c4112fcc3707cfa3774cba6fd84cce9f9e75d5077ca4dfc82d37384930933994a01
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC metadata.xml 1821 SHA256 3f0864988fd1d6ca97db612f9157275bf00336143969acb9d82ca6e6523127f5 SHA512 9f2d7adaf973837028f0c7cb305ac9917a88f07490ee172e570fc70860385de5c2b00edd6c22a37c9448d9260f51554e87b32b24e3bbbcc521f9ce5bbcb1fce0 WHIRLPOOL 7c135c44361168708252533d60a05f2c7d4b202c96c212e75d3057fa5ad80928c7d7452359b7e068c7a1f41dd4276c5917ac47ae010ec93821b2a9a3518f7aa9
diff --git a/dev-vcs/git/git-1.8.1.2.ebuild b/dev-vcs/git/git-1.8.1.2.ebuild
new file mode 100644
index 000000000000..6a695151a356
--- /dev/null
+++ b/dev-vcs/git/git-1.8.1.2.ebuild
@@ -0,0 +1,595 @@
+# 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.1.2.ebuild,v 1.1 2013/01/28 21:22:19 robbat2 Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${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 ${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 ~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
+		dev-python/pygtksourceview:2
+	) )"
+
+# 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 )
+"
+
+pkg_setup() {
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false 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_set_active_version 2
+		python_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="
+
+	# 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"
+	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"
+	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}"
+}
+
+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 #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
+	# funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0.
+	#epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		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 -i 's/DOCBOOK2X_TEXI=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 -a)"
+	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" \
+		"$@"
+	# 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 \
+			|| die "emacs modules failed"
+	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 || 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} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# 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} || die
+	fi
+
+	if use python && use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/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
+	newbin 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
+	dobin contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.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
+	# 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 \
+		blameview buildsystems ciabot continuous 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
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	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="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.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 ]] && \
+			built_with_use 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
+	use python && python_mod_optimize git_remote_helpers
+	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
+	use python && python_mod_cleanup git_remote_helpers
+}