Revision and version bump. Remove 1.5.0.6
authorFernando J. Pereda <ferdy@gentoo.org>
Wed, 4 Apr 2007 10:43:02 +0000 (10:43 +0000)
committerFernando J. Pereda <ferdy@gentoo.org>
Wed, 4 Apr 2007 10:43:02 +0000 (10:43 +0000)
Package-Manager: portage-2.1.2.2

dev-util/git/ChangeLog
dev-util/git/Manifest
dev-util/git/files/digest-git-1.5.0.6 [deleted file]
dev-util/git/files/digest-git-1.5.0.7 [new file with mode: 0644]
dev-util/git/files/digest-git-1.5.1 [new file with mode: 0644]
dev-util/git/git-1.5.0.7.ebuild [moved from dev-util/git/git-1.5.0.6.ebuild with 97% similarity]
dev-util/git/git-1.5.1.ebuild [new file with mode: 0644]

index 8b6879d4d9d3df9e3ca7a1238bc71acec82a09c0..b2062270e2e160ff394414a66254d0de8e34d4ac 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.176 2007/03/29 12:43:07 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.177 2007/04/04 10:43:02 ferdy Exp $
+
+*git-1.5.1 (04 Apr 2007)
+*git-1.5.0.7 (04 Apr 2007)
+
+  04 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.0.6.ebuild,
+  +git-1.5.0.7.ebuild, +git-1.5.1.ebuild:
+  Revision and version bump. Remove 1.5.0.6
 
 *git-1.5.0.6 (29 Mar 2007)
 
index 0619d5e23bf42c5d040604b549c81a131f8e1cb7..f99b996ad799515bb22e29ea5daceafce98d26d8 100644 (file)
@@ -25,17 +25,20 @@ DIST git-1.4.1.1.tar.bz2 752419 RMD160 1e8c8cc2ee0685fb0ece9e0ee0720cb608140c05
 DIST git-1.4.2.4.tar.bz2 787793 RMD160 03664bb1c98c7d9dc8c6f1dfa56149d807fd5164 SHA1 ff80a407cbad5b759adaecf434b37b293a167096 SHA256 1efbbee0e3e8704b25ef6fbc9519ba6f94a21aee48a231b986408627a4017632
 DIST git-1.4.4.3.tar.bz2 888091 RMD160 06184ee7e16c12687b4a644c38d23ff7732e4c54 SHA1 d41b8e62b2c0b5f3ea994bed4618a44cbcfb319e SHA256 5485e66a811f8a047124f1358ded268916fcf07ecccb9345f429b4ea8b76603e
 DIST git-1.4.4.4.tar.bz2 888482 RMD160 a507e7d636e771fb3ed03054d3d70e6758385c28 SHA1 b9243da9071d28f616b530eff94a46fb223cc368 SHA256 b2117774fb96d53f4b07d89df389ee0097f29637c859ec8fecc020cf37622657
-DIST git-1.5.0.6.tar.bz2 1052288 RMD160 ad67f2b6495d1664248c15784eda17e46816285d SHA1 c2a1ecfbbf81c65c8f7a9899205a1893b73cd650 SHA256 3a47a2940dabdb83495a7fcd32196844689eb154467d5bc9cf273c600e553264
+DIST git-1.5.0.7.tar.bz2 1053367 RMD160 c8ad03381005152d2513e0d12099d976ccad42a9 SHA1 1e0d09f27cd8eb3ac96590ed4c1baba459d5359e SHA256 6fae7d1de3f4ec2b04423d6af194bf75c9262785997c80fc4e1cd5e62b1b7ada
+DIST git-1.5.1.tar.bz2 1116847 RMD160 9acc58b4ae03e01b08bef014adc198168fc7eaa0 SHA1 cbfa03c55887bc561704089e6a522fb3827ad779 SHA256 e033d99b951f287548360799deb006d0f565193e3f24a60e63b3978164a6cb8b
 DIST git-htmldocs-1.4.1.1.tar.bz2 263120 RMD160 4a50c2cec7ecd612690ee5dd0f7fbe69f11fe1bf SHA1 6a22f41064f1db29e69a65ad2177e9f6e18aea77 SHA256 8e4ccf995645fe08f7644b62535c4054515355942b5f3551fcbebd3f5ec36d1d
 DIST git-htmldocs-1.4.2.4.tar.bz2 283907 RMD160 6aaa9e601cc16d4e45176e58fbbc87a332afb243 SHA1 e05b2ef0a5354b8c6ff4d043d620e0b229cda7a9 SHA256 90f3ad4bced74bbadfc6f02a1c3d222a6bcf13d940b9aef368b7cbae083c1f86
 DIST git-htmldocs-1.4.4.3.tar.bz2 325744 RMD160 52c8f9088ca969255ff93f719563b65f43a59a9f SHA1 1ab02de5bae511f07b19c6048626160d99ff145c SHA256 cca1f7dec9dd063d78920e4d2f7a9a47fa57cfd883b872883b60795541c2c585
 DIST git-htmldocs-1.4.4.4.tar.bz2 325718 RMD160 cf55f807769e8aa731d512b654e847089d25ea0e SHA1 66192a27b74aef8e673252174dda8c9be23dcd7a SHA256 196e901cd416f48b8068a10914455a27aa542bc821f677a705a69fb950145975
-DIST git-htmldocs-1.5.0.6.tar.bz2 449334 RMD160 37b44e000d1e23fc2eb2518831053900557d2de4 SHA1 1f89b22b73a9b1b90306f8d4bfe6c1574f6bb698 SHA256 aa273393217ae4413204e494adb57588d0a6a881933f4bd1a7138b9ef6b33cda
+DIST git-htmldocs-1.5.0.7.tar.bz2 450009 RMD160 0292aa6e166b5ccc3dd89eaeb0b56ab9a98b25f8 SHA1 4767bc6c617d1b5906acc3cc869b870c9743d294 SHA256 9f9dd3beb5b267080a556239bb0a99b5d2ac396cdd15b38c932976a0ec24b823
+DIST git-htmldocs-1.5.1.tar.bz2 465654 RMD160 e3aaf861db1534e89c594e94ae81e4731cb3b4e6 SHA1 9b1db614e5084697d79ea8eda1a7bb1c12ac4e84 SHA256 611643c1db52ce106dfc139465deae10dc2667d7c238365974bedb6e371a3cce
 DIST git-manpages-1.4.1.1.tar.bz2 83956 RMD160 894b8717e9e4099f7aacb97a3673e81c09e23daf SHA1 c899fbdef72bdfdb29c03e3372ee736781d58289 SHA256 2b2759a15eb9432e972743846c7299518e542e99a23a7318c540f0086e746ee4
 DIST git-manpages-1.4.2.4.tar.bz2 90375 RMD160 0b3d486d04a5a64aab273c75823c603f307fcd02 SHA1 961b3981f074663ec64bbbc5b82fdab0c45b7919 SHA256 6e0520fd779225e79957871d981ddfc9e93f157374de88f654d4f20958557518
 DIST git-manpages-1.4.4.3.tar.bz2 104756 RMD160 b10969ec6702606ea348d9a6fe05831e28fbcc00 SHA1 decdee44cca3f89843a290402c30422dde9edfa1 SHA256 7f11c3f55a86fc7e445e6bf97d049564e586902bb53e48c6048b7ce0ad90675e
 DIST git-manpages-1.4.4.4.tar.bz2 103840 RMD160 488e8ad8514180ed1d2d2d0d5e948351d4092f29 SHA1 17d7246560049ebcab7e7a67c2b82e8fb233e42e SHA256 73f136bd93683fa559b22c8770acaebce70699798f6797e840d23a2a5cffa3a4
-DIST git-manpages-1.5.0.6.tar.bz2 126880 RMD160 723a5ffe88ee4c2aa2dfebe7c7c263a2f32fdcd6 SHA1 5e43a8ff25d96ff71d073b5c376512a17ea5f673 SHA256 501a3ef4d56a342aaef10d04be5a105a1e466457d1f3196d64faa29ec4ddeb85
+DIST git-manpages-1.5.0.7.tar.bz2 126927 RMD160 37028035ea1aca310c79bd079ae1d1e65ca9fe32 SHA1 66de3c514b1942920b66f434350f55e2ff70f90e SHA256 df6879361c0e671e3a228e3bd9954d9f712a7c74e9e151e4ca89bb6037d4dbba
+DIST git-manpages-1.5.1.tar.bz2 131561 RMD160 47825ae5708b5e5fd81dc6c297d89e084230e96a SHA1 a0e314cafe5e7e7228e0a240442b45300e5ec658 SHA256 4b85b57e07828f0eac2c0fddb4ade4b8efcc0bfdaa7a090752a8d07f19c299ea
 EBUILD git-1.4.1.1.ebuild 4338 RMD160 c60faee4041943f56b2b64abde8b26bc7a9d1e17 SHA1 47c42f4ff8d3100a645226934fb9da442e07bae5 SHA256 d0435724636b6ff0749af989a7d493284df3eb38d2c0bcd1b0f29a33d726e606
 MD5 62bdf011ee3296485f8c8fbc2f3ecd35 git-1.4.1.1.ebuild 4338
 RMD160 c60faee4041943f56b2b64abde8b26bc7a9d1e17 git-1.4.1.1.ebuild 4338
@@ -52,14 +55,18 @@ EBUILD git-1.4.4.4.ebuild 4257 RMD160 5da21ba7d97aa3d0c9238b633c70c916445d8bcd S
 MD5 844bef7b02245814e4362aa29566e57b git-1.4.4.4.ebuild 4257
 RMD160 5da21ba7d97aa3d0c9238b633c70c916445d8bcd git-1.4.4.4.ebuild 4257
 SHA256 963f02c4077e2ca70a12f7300caa552a0bfccf76d57dc8b02a1ed3099efe3493 git-1.4.4.4.ebuild 4257
-EBUILD git-1.5.0.6.ebuild 4376 RMD160 4f8a86f84853b864572210ff442158e670d965af SHA1 8ced75385a7d1d0fbbe394e5c7f493db8be1befc SHA256 65767c1bed5ea20fa3f3b87e87c8c8ca6e68969de0f70109b1f811bcf1fef898
-MD5 a3feb9790c1ed5f9a370d2fa2ad5aa7a git-1.5.0.6.ebuild 4376
-RMD160 4f8a86f84853b864572210ff442158e670d965af git-1.5.0.6.ebuild 4376
-SHA256 65767c1bed5ea20fa3f3b87e87c8c8ca6e68969de0f70109b1f811bcf1fef898 git-1.5.0.6.ebuild 4376
-MISC ChangeLog 25305 RMD160 93ad6606d198eed910a1656ba8ff54295eb73d6d SHA1 f5643f39d04a98d8de47349ef99cd8f6b19b908d SHA256 0e5e2a056e9ff29f28f97b4db76750f5b2d368a24d2e1922f4652926ae3d310a
-MD5 4ece77ab24e254693174d0f6fdcdbda6 ChangeLog 25305
-RMD160 93ad6606d198eed910a1656ba8ff54295eb73d6d ChangeLog 25305
-SHA256 0e5e2a056e9ff29f28f97b4db76750f5b2d368a24d2e1922f4652926ae3d310a ChangeLog 25305
+EBUILD git-1.5.0.7.ebuild 4376 RMD160 3fd691a453bbe35d962fe4fe40387e51f71b2a70 SHA1 1778a0d9bb3078ec0f49c1f6925e60eeaee074ff SHA256 1ea7cdeb7a6dd8fc8bf412aa64e01c4e5534a34152616600fcc26e8a55209ec9
+MD5 044118f8daf7d3b3cf5c0d0a9f0fba59 git-1.5.0.7.ebuild 4376
+RMD160 3fd691a453bbe35d962fe4fe40387e51f71b2a70 git-1.5.0.7.ebuild 4376
+SHA256 1ea7cdeb7a6dd8fc8bf412aa64e01c4e5534a34152616600fcc26e8a55209ec9 git-1.5.0.7.ebuild 4376
+EBUILD git-1.5.1.ebuild 4374 RMD160 99b57a14ca6b555d5dbddfa64ff7999d06d94391 SHA1 7c65a57f1e51862f2ab8f78ca09046f41e20af7e SHA256 c287d955c27d18d2a8ff97b8bebe85e3c2efb0ac6a980b85e0e98e5aac73167f
+MD5 7a88c0dfe1848ae94832cfdf12c0c44f git-1.5.1.ebuild 4374
+RMD160 99b57a14ca6b555d5dbddfa64ff7999d06d94391 git-1.5.1.ebuild 4374
+SHA256 c287d955c27d18d2a8ff97b8bebe85e3c2efb0ac6a980b85e0e98e5aac73167f git-1.5.1.ebuild 4374
+MISC ChangeLog 25519 RMD160 ebf1c0f71ae245ef0c737dc8055d173649fa95a8 SHA1 452c9f1d06aaa03504694462ddf7262ea89fcfb2 SHA256 76ebd39ac71db144c9713139d5b53ef49992c082ac02a91261d437bbd48cea50
+MD5 99c1e116c73cf3e877bcdbdb0644a58b ChangeLog 25519
+RMD160 ebf1c0f71ae245ef0c737dc8055d173649fa95a8 ChangeLog 25519
+SHA256 76ebd39ac71db144c9713139d5b53ef49992c082ac02a91261d437bbd48cea50 ChangeLog 25519
 MISC metadata.xml 253 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a SHA1 7c2340e011ce57927ff31d7e3397ef4bb1c7ad27 SHA256 1f2e9f9f57e781c296ac5c39c54eabf82a47b7facd0698b296bc76f50799432c
 MD5 22c5a3ad567fa12332dab8687b9c2d1c metadata.xml 253
 RMD160 e09bab6a5a422f501b8e07a3983c5790e00ac92a metadata.xml 253
@@ -76,13 +83,16 @@ SHA256 666f5fe026723735f156653f2565168d6c3f902e176d9c009a4c75ae992e475b files/di
 MD5 0edc8e793ae211228a6b9b338d242566 files/digest-git-1.4.4.4 768
 RMD160 ade2fb97dffc61de86d80cffc0b4292ba9027bda files/digest-git-1.4.4.4 768
 SHA256 ace650aa865e2cbf70cf1e76a858085da178e9f98f58f28bbabbc972be98467e files/digest-git-1.4.4.4 768
-MD5 6d03a7f5e9f2e271e9f339b24def69c7 files/digest-git-1.5.0.6 771
-RMD160 bc086e43b4b0cfad486601541fc21a5a657183e2 files/digest-git-1.5.0.6 771
-SHA256 26e3ef84d2c2633b7556d4f266d9dbe29633978d484d0b9ec3346fdd3aba422e files/digest-git-1.5.0.6 771
+MD5 dc48de444cac0305323585a3b55cb359 files/digest-git-1.5.0.7 771
+RMD160 9d6355dc9876a80e62294620d7a60bd2614dbdca files/digest-git-1.5.0.7 771
+SHA256 e83d17bc0cecaec146675934ca0ee7f15d8996c16e587954dc9d6c627772581c files/digest-git-1.5.0.7 771
+MD5 3d5e097ed10afe5231a88061f6f45bec files/digest-git-1.5.1 753
+RMD160 a66fbd84cb9cdd87b330ca92b272df689731d58b files/digest-git-1.5.1 753
+SHA256 cc08e568a94b7c7a55ee7b93eb95421a4074299ed91952ada21b7acc13fd0227 files/digest-git-1.5.1 753
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFGC7RyViELBEf1JB0RAiD5AJ9OjVuxJ08cTBxqxbqFxnJkca4WnQCbBoxR
-+NN0NnUZvC+I7iQhpRdtEd4=
-=FFJM
+iD8DBQFGE4FGViELBEf1JB0RAhTdAJ9UxMdZWAGqtUpMv9S7cyc2AdveqgCcDao8
+dcGAwVt3vYxkBLsbqiNayIg=
+=2DgX
 -----END PGP SIGNATURE-----
diff --git a/dev-util/git/files/digest-git-1.5.0.6 b/dev-util/git/files/digest-git-1.5.0.6
deleted file mode 100644 (file)
index 45ddd60..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 25a20a1c305e7791e5101424a048b6d2 git-1.5.0.6.tar.bz2 1052288
-RMD160 ad67f2b6495d1664248c15784eda17e46816285d git-1.5.0.6.tar.bz2 1052288
-SHA256 3a47a2940dabdb83495a7fcd32196844689eb154467d5bc9cf273c600e553264 git-1.5.0.6.tar.bz2 1052288
-MD5 8ddb85b573cd5a804aa322372ddbc571 git-htmldocs-1.5.0.6.tar.bz2 449334
-RMD160 37b44e000d1e23fc2eb2518831053900557d2de4 git-htmldocs-1.5.0.6.tar.bz2 449334
-SHA256 aa273393217ae4413204e494adb57588d0a6a881933f4bd1a7138b9ef6b33cda git-htmldocs-1.5.0.6.tar.bz2 449334
-MD5 f32dd471f102be4ff7ed7b273eee90c4 git-manpages-1.5.0.6.tar.bz2 126880
-RMD160 723a5ffe88ee4c2aa2dfebe7c7c263a2f32fdcd6 git-manpages-1.5.0.6.tar.bz2 126880
-SHA256 501a3ef4d56a342aaef10d04be5a105a1e466457d1f3196d64faa29ec4ddeb85 git-manpages-1.5.0.6.tar.bz2 126880
diff --git a/dev-util/git/files/digest-git-1.5.0.7 b/dev-util/git/files/digest-git-1.5.0.7
new file mode 100644 (file)
index 0000000..f4d7cb0
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 f3144aef04e479d54fbf47072ea58dc1 git-1.5.0.7.tar.bz2 1053367
+RMD160 c8ad03381005152d2513e0d12099d976ccad42a9 git-1.5.0.7.tar.bz2 1053367
+SHA256 6fae7d1de3f4ec2b04423d6af194bf75c9262785997c80fc4e1cd5e62b1b7ada git-1.5.0.7.tar.bz2 1053367
+MD5 3fcc9d2118a50fe20b721289260816a5 git-htmldocs-1.5.0.7.tar.bz2 450009
+RMD160 0292aa6e166b5ccc3dd89eaeb0b56ab9a98b25f8 git-htmldocs-1.5.0.7.tar.bz2 450009
+SHA256 9f9dd3beb5b267080a556239bb0a99b5d2ac396cdd15b38c932976a0ec24b823 git-htmldocs-1.5.0.7.tar.bz2 450009
+MD5 74f8792f0ceae63e8ec74fb14598b20d git-manpages-1.5.0.7.tar.bz2 126927
+RMD160 37028035ea1aca310c79bd079ae1d1e65ca9fe32 git-manpages-1.5.0.7.tar.bz2 126927
+SHA256 df6879361c0e671e3a228e3bd9954d9f712a7c74e9e151e4ca89bb6037d4dbba git-manpages-1.5.0.7.tar.bz2 126927
diff --git a/dev-util/git/files/digest-git-1.5.1 b/dev-util/git/files/digest-git-1.5.1
new file mode 100644 (file)
index 0000000..7b7ed83
--- /dev/null
@@ -0,0 +1,9 @@
+MD5 d60eb458742b6da332f80f3bba68de8f git-1.5.1.tar.bz2 1116847
+RMD160 9acc58b4ae03e01b08bef014adc198168fc7eaa0 git-1.5.1.tar.bz2 1116847
+SHA256 e033d99b951f287548360799deb006d0f565193e3f24a60e63b3978164a6cb8b git-1.5.1.tar.bz2 1116847
+MD5 0da84ad3896cb81b53361817662bf33f git-htmldocs-1.5.1.tar.bz2 465654
+RMD160 e3aaf861db1534e89c594e94ae81e4731cb3b4e6 git-htmldocs-1.5.1.tar.bz2 465654
+SHA256 611643c1db52ce106dfc139465deae10dc2667d7c238365974bedb6e371a3cce git-htmldocs-1.5.1.tar.bz2 465654
+MD5 c09c1b68b9e7dee7b89781b8e0e10790 git-manpages-1.5.1.tar.bz2 131561
+RMD160 47825ae5708b5e5fd81dc6c297d89e084230e96a git-manpages-1.5.1.tar.bz2 131561
+SHA256 4b85b57e07828f0eac2c0fddb4ade4b8efcc0bfdaa7a090752a8d07f19c299ea git-manpages-1.5.1.tar.bz2 131561
similarity index 97%
rename from dev-util/git/git-1.5.0.6.ebuild
rename to dev-util/git/git-1.5.0.7.ebuild
index ededd14fb12fad3f9db5aa59d8766c45c1393bbe..1e480136c90ff5e7c512fa1f47858952301d158b 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.0.6.ebuild,v 1.1 2007/03/29 12:43:07 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.0.7.ebuild,v 1.1 2007/04/04 10:43:02 ferdy Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
diff --git a/dev-util/git/git-1.5.1.ebuild b/dev-util/git/git-1.5.1.ebuild
new file mode 100644 (file)
index 0000000..90b9cd5
--- /dev/null
@@ -0,0 +1,160 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.1.ebuild,v 1.1 2007/04/04 10:43:02 ferdy Exp $
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker"
+HOMEPAGE="http://kernel.org/pub/software/scm/git/"
+SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
+               mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
+               doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl ppcsha1 tk webdav"
+
+DEPEND="dev-libs/openssl
+               sys-libs/zlib
+               !app-misc/git
+               curl? ( net-misc/curl )
+               webdav? ( dev-libs/expat )
+               emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+               dev-lang/perl
+               perl? ( dev-perl/Error )
+               tk? ( dev-lang/tk )
+               gtk? ( >=dev-python/pygtk-2.6 )"
+
+S="${WORKDIR}/${MY_P}"
+
+# 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 mozsha1 ; then
+               myopts="${myopts} MOZILLA_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"
+               use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring."
+       fi
+
+       myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
+
+       use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
+
+       export MY_MAKEOPTS=${myopts}
+}
+
+showpkgdeps() {
+       local pkg=$1
+       shift
+       elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       epatch "${FILESDIR}"/${PN}-1.5.0-symlinks.patch
+
+       sed -i \
+               -e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \
+               -e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \
+               -e "s:^\(CC = \).*$:\1$(tc-getCC):" \
+               -e "s:^\(AR = \).*$:\1$(tc-getAR):" \
+               -e 's:ln :ln -s :g' \
+               Makefile || die "sed failed"
+
+       exportmakeopts
+}
+
+src_compile() {
+       emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed"
+
+       if use emacs ; then
+               elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed"
+       fi
+}
+
+src_install() {
+       emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed"
+
+       use tk || rm "${D}"/usr/bin/gitk
+
+       doman "${WORKDIR}"/man?/*
+
+       dodoc README COPYING Documentation/SubmittingPatches
+       if use doc ; then
+               dodoc Documentation/technical/*
+               dodir /usr/share/doc/${PF}/html
+               cp -r "${WORKDIR}"/{*.html,howto} "${D}"/usr/share/doc/${PF}/html
+       fi
+
+       dobashcompletion contrib/completion/git-completion.bash ${PN}
+
+       if use emacs ; then
+               insinto "${SITELISP}"
+               doins contrib/emacs/{,vc-}git.el*
+               elisp-site-file-install "${FILESDIR}"/70git-gentoo.el
+       fi
+
+       if use gtk ; then
+               dobin contrib/gitview/gitview
+               use doc && dodoc contrib/gitview/gitview.txt
+       fi
+
+       insinto /etc/xinetd.d
+       newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+
+       newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+       newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+       fixlocalpod
+}
+
+src_test() {
+       cd "${S}"
+       has_version dev-util/subversion || \
+               MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease"
+       has_version app-arch/unzip || \
+               rm "${S}"/t/t5000-tar-tree.sh
+       # Stupid CVS won't let some people commit as root
+       rm "${S}"/t/t9200-git-cvsexportcommit.sh
+       emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed"
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+       elog "These additional scripts need some dependencies:"
+       echo
+       showpkgdeps git-archimport "dev-util/tla"
+       showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1"
+       showpkgdeps git-svnimport "dev-util/subversion(USE=perl)"
+       showpkgdeps git-svn "dev-util/subversion(USE=perl)" "dev-perl/libwww-perl"
+       showpkgdeps git-quiltimport "dev-util/quilt"
+       showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite"
+       showpkgdeps git-instaweb "|| ( www-servers/lighttpd net-www/apache(SLOT=2) )"
+       showpkgdeps git-send-email "USE=perl"
+       showpkgdeps git-remote "USE=perl"
+       echo
+}
+
+pkg_postrm() {
+       # regenerate site-gentoo if we are merged USE=emacs and unmerged
+       # USE=-emacs
+       has_version virtual/emacs && elisp-site-regen
+}