* [gentoo-commits] dev/axs:master commit in: dev-perl/PadWalker/, net-print/cups/, dev-vcs/git/, dev-perl/Moo/, ...
@ 2012-06-27 22:19 Ian Stakenvicius
0 siblings, 0 replies; only message in thread
From: Ian Stakenvicius @ 2012-06-27 22:19 UTC (permalink / raw
To: gentoo-commits
commit: eae25e28b18f4658f4c57afbedc476239f6160ad
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 22:18:29 2012 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 22:18:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/axs.git;a=commit;h=eae25e28
Synced with main tree 2012-06-27 ~18:00 EST5EDT , expanded so that all files necessary for this to work as a portage overlay are included
---
dev-perl/IO-Socket-IP/Manifest | 4 +-
dev-perl/Moo/Manifest | 4 +-
dev-perl/PadWalker/Manifest | 4 +-
dev-perl/Role-Tiny/Manifest | 4 +-
dev-perl/Test-Class/Manifest | 4 +-
dev-perl/Variable-Magic/Manifest | 4 +-
dev-vcs/git/Manifest | 52 +----
dev-vcs/git/git-1.7.7.6.ebuild | 527 -----------------------------------
dev-vcs/git/git-1.7.7.7.ebuild | 527 -----------------------------------
dev-vcs/git/git-1.7.8.1.ebuild | 519 ----------------------------------
dev-vcs/git/git-1.7.8.2.ebuild | 519 ----------------------------------
dev-vcs/git/git-1.7.8.3.ebuild | 519 ----------------------------------
dev-vcs/git/git-1.7.8.4.ebuild | 519 ----------------------------------
dev-vcs/git/git-1.7.8.5.ebuild | 519 ----------------------------------
dev-vcs/git/git-1.7.8.6.ebuild | 4 +-
dev-vcs/git/git-1.7.8.ebuild | 519 ----------------------------------
eclass/vdr-plugin-2.eclass | 9 +-
media-gfx/graphite2/Manifest | 2 +-
net-print/cups/Manifest | 6 +-
net-print/cups/cups-1.5.2-r4.ebuild | 5 +-
net-print/cups/cups-1.5.3.ebuild | 5 +-
21 files changed, 37 insertions(+), 4238 deletions(-)
diff --git a/dev-perl/IO-Socket-IP/Manifest b/dev-perl/IO-Socket-IP/Manifest
index 40c2f0c..02eae35 100644
--- a/dev-perl/IO-Socket-IP/Manifest
+++ b/dev-perl/IO-Socket-IP/Manifest
@@ -1,6 +1,8 @@
DIST IO-Socket-IP-0.12.tar.gz 35335 RMD160 826aa76e32c3535a4880ee93df1169fb1337ef37 SHA1 85e917296730cd6473dd7f82de830c8a0a3690e1 SHA256 c6a6c67b4be464278aab2464ac54d021543d1916926fe37c6b49bab79f52f445
DIST IO-Socket-IP-0.15.tar.gz 35667 RMD160 d9ad4cf14021749e4a49f706317b312fa6c0db00 SHA1 0ab59364ba02b3e5d5c95a19f900b98470757be1 SHA256 afdfd6cfb826cd0ec5243fa1977f00c4c0982d545a72f3df839f51069ea14eb8
+DIST IO-Socket-IP-0.16.tar.gz 35716 RMD160 3e6c455641979db59ff5cdd7cdd2074321a594c2 SHA1 028aa3b6b0fd19203ddb3f512fa1adac61b78675 SHA256 0611f43d03173c2d391fb942ad55882606a1f9dff64a6de5b1cf0ce603846370
EBUILD IO-Socket-IP-0.120.0.ebuild 666 RMD160 5a0b71f8b166a1ab6bf64110c8b34a86ef662a8a SHA1 57f26de8e4b540a5c3fac32607acafc014525ba3 SHA256 c65fabdad82b58dc78cd93bbb14fcc023f7069a799159de2cb71cc354e17039f
EBUILD IO-Socket-IP-0.150.0.ebuild 666 RMD160 f681a05f21b9480fa781d355c9d2f0d9e7859e81 SHA1 f26c72f493a44bf364647042d3c68eba8f0c4adc SHA256 7e5326221066b5823907eb85ec2e80ab8bc9d1dbd1ac64fa8a1243c01b1878df
-MISC ChangeLog 1566 RMD160 f423d328af3bbb393bdfa299f0fa57492e727318 SHA1 4516eb8d31862142fb61508dce84665122556162 SHA256 0c7847990e5ae1d739f68f4d74d442247706f019f3f761a76a8dfe3723e65cef
+EBUILD IO-Socket-IP-0.160.0.ebuild 666 RMD160 96783e84fe9e25d75f9c93b890ae16482d8617d8 SHA1 b83ff3c5ced718eb505266b437c8981b9023392b SHA256 0070d19fca1c11a7437738e1f5cf9a0d9747c49bb15ca1b16dbd74b5edf484d0
+MISC ChangeLog 1697 RMD160 ba70f7bae433fc7b30a3c380fcd777a1af753e9e SHA1 e8d082640d166128242306479956dfb3d6034d45 SHA256 3bb105acf7546501bf9a78c13d859e16055810f472153478222de3b04e835677
MISC metadata.xml 313 RMD160 879dfc379cd323231be28d484d872b42d70c1f92 SHA1 1fabd436ceea488f205b634fb0efa833844093f2 SHA256 151866bb93dc82a5883f69bcc65b472eff0ab7528e110b4824fcfc5488d6716e
diff --git a/dev-perl/Moo/Manifest b/dev-perl/Moo/Manifest
index 694798d..2f316c4 100644
--- a/dev-perl/Moo/Manifest
+++ b/dev-perl/Moo/Manifest
@@ -3,10 +3,12 @@ DIST Moo-0.091001.tar.gz 39820 RMD160 d89267a75e49074f08236370b6ee6acdabad9f9c S
DIST Moo-0.091002.tar.gz 41594 RMD160 f0b2020a6adcf432ea79b75f1b7d3441de705996 SHA1 7de613e7cc4fe0b9f8452a3179bb8963bf061891 SHA256 b2df6468c2144e82af021b6500cda9979185c1515a85e2fe1d2e1e9275d7049a
DIST Moo-0.091004.tar.gz 45718 RMD160 cdc43c87848d3f77661af7c75e65c7372db5bcc0 SHA1 db185250c70a1bd40608bb31433c2bb00d7a9f88 SHA256 cc6df65ab07117cda3c2b7386982890396560f28843e94d11e48bb65b83dfb0d
DIST Moo-0.091007.tar.gz 46594 RMD160 b87a3d05c55a79e24884c14e5c4d40e392b34427 SHA1 1a2eb3b2b6f6c365aa0aa092d21defee2685c47f SHA256 5ef77c68c64bb669185fec282f1b09cb7e28fb86e33e41fc9f112660314d9a91
+DIST Moo-0.091009.tar.gz 47212 RMD160 44fd2bba990762d9f77d7da120100fe8179a2b9c SHA1 68b840c5610ba59c3beff91d93cca258c9fa2dc2 SHA256 1c26abd2ee761cbd9757a6cbad31a567496567c98091aa869f682caf3f50ded2
EBUILD Moo-0.9.14.ebuild 692 RMD160 030940f8a8cc8b23a7d44d8df5c46efc58160547 SHA1 ba74b0f1bb31468bffdc1353c6cb4aada03241e1 SHA256 097d718fe9110c4931b0ea5bc2865fc01effc80608b70ba70e4936da39727ecc
EBUILD Moo-0.91.1.ebuild 735 RMD160 19790a0f45b6e0ff8ed2573b037cd6514af99adb SHA1 99e006421975056009e9464d3b4f45cd38af6a22 SHA256 ec9d1d76441cd5b700facd2a9d159cabbba5e3a41418a5a218dcd7120e03f1ee
EBUILD Moo-0.91.2.ebuild 735 RMD160 b466d427357b54680ad2e96c6329fb3515487582 SHA1 2ba51c09f506b69d05b8dbdbb07480fff3876124 SHA256 d2359e7ad0a551f9001e917a11967520717d66f32460f3099e35c88ddfc30adb
EBUILD Moo-0.91.4.ebuild 735 RMD160 c3b1c571a130d7e77977798dda1acac607f85243 SHA1 a7e93ff9f7744167b6f6f8dd956f92abe7dc1db5 SHA256 fa74187522aed529f65a6abe76dcd0bf081cbd42af8a8670dc3c86d74ea69c47
EBUILD Moo-0.91.7.ebuild 692 RMD160 b77644ec0fdc6cb7345026859323cd40b8221793 SHA1 a310a21c340d37bbf4c61cab8f8ae6135baef14d SHA256 87d80eaf4a793c018e79b0629b76eae7a3a6208cd038e0dd20d3ffc41009b583
-MISC ChangeLog 1950 RMD160 d6eded67326794d42c5f54606d48f87b2b7e2dbb SHA1 eb7ca39d43408f182def7fefa1314216eba4c404 SHA256 3e8c8687b1fa88de1d44031e8ff63f67e632f247bb1023c55cc9a8d8288f9e60
+EBUILD Moo-0.91.9.ebuild 692 RMD160 0b270fc59276a60e2075b3d158c809f338d1a3a0 SHA1 8d370cb7ab1cf3bbd6fd975aea2678bc4db7018b SHA256 0f506e9d2cc1548c92d3a04c0675c15f275b59744552f357d4e126aec92e1803
+MISC ChangeLog 2061 RMD160 0b3d244b4758da1251cc2f3354c27a7ef67dc89a SHA1 89b331e52c0dd18b8112f41d9d7b2c879a741717 SHA256 8c342fd3d77e987a3973ea843a8d294fc51f6fa60574ed6259aad5c1872ff118
MISC metadata.xml 1274 RMD160 d98fc5cb34126944341758855d0cfa8501ae0de1 SHA1 00011b88cbc515dcd96b3dbc8306063952e39ba9 SHA256 1403654786bf84105df5dee71a26159a00b78cf3112452c2b4b0bdbacb942b31
diff --git a/dev-perl/PadWalker/Manifest b/dev-perl/PadWalker/Manifest
index 4f53485..9c10846 100644
--- a/dev-perl/PadWalker/Manifest
+++ b/dev-perl/PadWalker/Manifest
@@ -1,6 +1,8 @@
DIST PadWalker-1.92.tar.gz 14573 RMD160 e32303118d6bebe2a7485d16ca470cac5cebb9e4 SHA1 5f1250a7e619c232463f506d36a27a66a9bb6497 SHA256 27a65d8a5f5eac3563a28cb727eff8b72d8ae29be8f5ef6dff0a9839c6576156
DIST PadWalker-1.93.tar.gz 14694 RMD160 88a305130617bdb2ded80adf222c18531e0a19a5 SHA1 95ace67b9599b39d8313e7396815b78108da4f85 SHA256 f40d241a4bf2a981fde63a89ff2647fd6ca253c7fa56948dc300aa74c74720f7
+DIST PadWalker-1.94.tar.gz 15226 RMD160 fdcd9b815eaf16501e596cc30ab950327cccd6f7 SHA1 0f575e6717ec71a4856a89a73a3ebfdaba68fc2a SHA256 eeefa287f13cb43ba968934d8b7bbaf2ab408ea92ab99a30ca2ab16881e2cb34
EBUILD PadWalker-1.920.0.ebuild 468 RMD160 f1fd3e19773523feb55c7267f54132c169c5a0fd SHA1 aeb55498a78a4ac998cc9df72ec1b5ebe4c33c18 SHA256 f27cae71319526f043d85e829a2e000f5dfd57c82502527fb1209befa9d173b1
EBUILD PadWalker-1.930.0.ebuild 471 RMD160 e628bb333ee636bf406d762f12318d952954bfbb SHA1 559a101db47598b660634e44ff1d963d47cb643c SHA256 cbcec6e48eda9058de79c760e1f726599cebe0a8696c351148fe6c0a2ae5aa4b
-MISC ChangeLog 4084 RMD160 294811e483a7950854a7150429b901695d87d716 SHA1 2e1f2d0e060b47e4b8bd4c088da9db8075ad2c66 SHA256 b5606c0e0d027c97c5353039d2743d02384020b4bbff16f05851094a6735f867
+EBUILD PadWalker-1.940.0.ebuild 468 RMD160 6e03a0b5ccac76ce4448af7f26623437b01dd207 SHA1 653c8b021f046cb42abbffb3b69c75ba6cec6e62 SHA256 1a7e16651f831382d8af5af458a0634d41f688d1e34e46368b05209b06a7eee8
+MISC ChangeLog 4209 RMD160 c19ee4643bc418379cf98619977bbe26d1d39a86 SHA1 d6c706e223954cf9d133121ed29cf19c694d540b SHA256 7235a1eb11b69a713239c89f9fdf5152e394270befbad1568a174cad40a8db0f
MISC metadata.xml 291 RMD160 54d8a7cedc446fa6bd0a74ba8b7818e756aace9c SHA1 7e040bc0f5ff0b1ea05e0e064e3610a9934fb4d3 SHA256 46682756ef8c9bb22b3eac4bb7dc15c901ae59d885e562ee06685a1b36ec86dc
diff --git a/dev-perl/Role-Tiny/Manifest b/dev-perl/Role-Tiny/Manifest
index b716e59..a85aaeb 100644
--- a/dev-perl/Role-Tiny/Manifest
+++ b/dev-perl/Role-Tiny/Manifest
@@ -1,8 +1,10 @@
DIST Role-Tiny-1.000001.tar.gz 9455 RMD160 8b142bee36d6c0cf461282bac4f78043cad2acf0 SHA1 f55619aa0124cf86278336b0a79c15ad62dd9dfe SHA256 28c2a565058eb81ea15963e4ef3a31f1d8468f585086d06920dd235aff946777
DIST Role-Tiny-1.001001.tar.gz 18510 RMD160 60f686e73d05713afd4605393a3f93eeb3d42ee6 SHA1 aa1ea673eb5635bfeac08ddf2669f010f4a205ae SHA256 4ea7097183d24fefd665ff4bcc29ba6118b9d0d97fb3b5555d27954471a9e444
DIST Role-Tiny-1.001002.tar.gz 18548 RMD160 73a9c31b9dae0fc91f63e3e9127da4b5d390e49a SHA1 995ccb01a753cb2d946c8384ad65e0e0c83eaae0 SHA256 8e9d8b6b173c3737ca0c6389e4caff59e171cd448d5d56a588291bf432c14909
+DIST Role-Tiny-1.001003.tar.gz 19201 RMD160 9cb500edeb5bfe771c7e6dd4448aabc583358f2c SHA1 f36835ea1d4736ca3c196d90d96943c0a0cdb3c0 SHA256 06a93662e2b4acc44fa50fbcdafeac17087b9862e44b9bddf38fb4830ea4994e
EBUILD Role-Tiny-1.0.1.ebuild 622 RMD160 c488b655af34fc69230a8aa39f95b87764bf1a9f SHA1 4914326b7a3076a5a16757131cbfd0a593c43bd8 SHA256 47b726cefb26c874b74cef2d57b50be9ec5da3b9bcf0bbad27d42d36add36397
EBUILD Role-Tiny-1.1.1.ebuild 622 RMD160 5d1975c5646d9de963a5a748ca610cf736cfa8f9 SHA1 b3beb821e918113603220af295c8c37203214032 SHA256 ba75f4560ea62652a9205ff81930842429aadfd5fa979c2feaf0f22a46cc9c04
EBUILD Role-Tiny-1.1.2.ebuild 622 RMD160 cfbec3e27211a51184bf0949a54b9f5509b497bd SHA1 0e381a27a765695be8b6e0cc007ff9a52675098d SHA256 305ddce7cdab50fbedc5dccf859ea8ec6c4b1e834b57bd980a212554321756c0
-MISC ChangeLog 1010 RMD160 5970636242a39013b1470363b4578f64c78bf4a7 SHA1 c72f2dbfe1e7d9a525cad92144e6690cfcbf6280 SHA256 418e2a0d3aec955244763e3879fc6f7cf02171300ac9cdc774779f13bb496f7e
+EBUILD Role-Tiny-1.1.3.ebuild 644 RMD160 62c8501838525b9b1f5ff6d453f6b84011ff77a6 SHA1 44a9a6afbdcbd56aa6b49d5bbf0f946fa1e3f673 SHA256 7c01ad41c17ad76a173a22c6bdddb0ff8b24526f595a4e0e767cc3bac15fee67
+MISC ChangeLog 1131 RMD160 0faa60a6bbd0d97f03ad3aa686bddbc50b516184 SHA1 c574e68d4f97a9ee6d8d0a943e4a0c87785c3351 SHA256 2aec701f3727fc01b3ee8f0d1841969587ccae0a257cf7afd7da6ddfa76b4fa2
MISC metadata.xml 355 RMD160 b915f6bfdb1ea0f1666727ebcf98620596c8e9ba SHA1 61adc48a10ae871c1187a9b7b917b66eef838992 SHA256 2c3b78b04fdaa3bbe43ce8e4c6c0e6860d67c090d288d0d1b7acbdd37c140b1e
diff --git a/dev-perl/Test-Class/Manifest b/dev-perl/Test-Class/Manifest
index a4be152..311b1c6 100644
--- a/dev-perl/Test-Class/Manifest
+++ b/dev-perl/Test-Class/Manifest
@@ -1,4 +1,6 @@
DIST Test-Class-0.36.tar.gz 74252 RMD160 47586a31bc1314cb6d614dc65b82ee5ef9caafe7 SHA1 48a65fef87e7cd8f34b8ec2805080cb0074adbb2 SHA256 ff50d95cec2b1a89cde7c064c376700b6246ade58733cebbd547afe777021b4a
+DIST Test-Class-0.37.tar.gz 77317 RMD160 b0aa87ed32f4d0c52fff449e50c76fb08b82718b SHA1 8292d6abf008f4c649112fa14b42c02c262f66bf SHA256 a7f76cfdd851c893333497c2d8e5a8be4f72473dc3c46c2033e7812eee3d6b0b
EBUILD Test-Class-0.360.0.ebuild 652 RMD160 5fd2b6a9044d9d54b8b5fd36202aff20d409384b SHA1 9f76d109fae671bdfc38be273d9109e051dbbc1c SHA256 dffb7523ff4c9cef83a1531f1178fc704aa7471c53a4f050e60ef0c960c0dfe8
-MISC ChangeLog 7638 RMD160 5957351acb422b0ddb78e6b6d7e4af9299f083cf SHA1 88886dc14bb2265208a601c492249ce1cf8e490b SHA256 c942e3c2f16c5d49ad02501848c145d6da98981412f7c232160503ae854d267e
+EBUILD Test-Class-0.370.0.ebuild 661 RMD160 9abd7a86576f13cceb6e4d54e53a4d8e40de704f SHA1 6dc13f14c39de90a5da27ae27e92ae3cdae5c0f6 SHA256 91e00338c374ca1a20dc1dbee5a4c89cfdea6ef856ee8c0aa24ec72cb99435aa
+MISC ChangeLog 7765 RMD160 cef45ef0616892e31182a97509415284834baec1 SHA1 cb1f865d98a9d63b0939ba5c77d747536b292096 SHA256 739981863a9cc92b7d5aada9027b1ccc8cf3d50b297cc56cc0e6a969d2d3c8d3
MISC metadata.xml 428 RMD160 927ef822edb9f291da7b0897a137a1c7d81ebfc8 SHA1 49b1a2f5a39980194041984c49f9a431e11833c4 SHA256 e85de39d8b1b57d69158209dde5fb95a955d16e554d736135fd3b9db0ff8c81e
diff --git a/dev-perl/Variable-Magic/Manifest b/dev-perl/Variable-Magic/Manifest
index 451b752..08df577 100644
--- a/dev-perl/Variable-Magic/Manifest
+++ b/dev-perl/Variable-Magic/Manifest
@@ -1,8 +1,10 @@
DIST Variable-Magic-0.46.tar.gz 51774 RMD160 1bf99f443cf36d32e8180ce990d448017548e45c SHA1 27e35d10633dbfbb09db9d98ca5c10291f76bfa8 SHA256 780cf9b6326fa25d156255dff0efa1bf0d2bfde172e1203785c0426b945d0e7d
DIST Variable-Magic-0.47.tar.gz 51261 RMD160 2a476c63b7269e0af69d959735c0e31e655b9248 SHA1 a1f048a02f7aa5f5a7c01ab966cf642221576654 SHA256 7a91d4263f61b8f8e5649887757e0eb6d925563611fc73834bbd0778668f2a01
DIST Variable-Magic-0.48.tar.gz 52720 RMD160 e5cec0783725e59787329eb48a5f070b023dce95 SHA1 847b0d91737fdf7df3915ac67ff8b771a24e344b SHA256 7cfdca9d11d45a105a0fd11a4dc80e531a519923b811303cc84b14eef5d49188
+DIST Variable-Magic-0.50.tar.gz 53974 RMD160 3532b288c1dd4d9ea17affc667510e1d0c3b8142 SHA1 8d3a84d82380b7404f3c45839b3614f646e074b0 SHA256 94b437f32c9096ce5d7d7423ff00bdc0661d1c93040305ff4045124fe47867fc
EBUILD Variable-Magic-0.460.0.ebuild 543 RMD160 892263c5bfa1ebc996be9df60b41aae2f6c059f1 SHA1 d6f633b6fd4a7b8bc1c03a7106d127c41c58076d SHA256 cd4413ba205a70546d2014bb05fbc8e31f6190fd3e33f8ddfb8d07f29898f1f7
EBUILD Variable-Magic-0.470.0.ebuild 542 RMD160 7fc932e185eda16d7b099232ad9613078588ce82 SHA1 49a1cf98e562beb627842854e6abffc1c81f4471 SHA256 53d64bd637dcde9ab3f793bb62a523ce6c9dd367b503b8e344854c54b2efae02
EBUILD Variable-Magic-0.480.0.ebuild 543 RMD160 1f76ecad7d0b7524ad303737a3434fca61905c4b SHA1 1c0475f806a5c555118855848593dafbcf99bd44 SHA256 d74649d04eb145cad4797cf5ad1bcc2524421b0ad4bd58a4ef59a62e02be6003
-MISC ChangeLog 5820 RMD160 7a51b063a6dc62bd16d98ff72e7245cc90795deb SHA1 c95f63f8ca5ba8bf75cdc666a76aee31d770ce7b SHA256 7d285287a595ff907b510171f06a8f91492bcddef5a0e585a0558715a3cd2c23
+EBUILD Variable-Magic-0.500.0.ebuild 543 RMD160 73a61c9a31c2d165839a98e3995ea18a38f586cf SHA1 91531b0ddd4721a177e7791142a1f592c787ec82 SHA256 4ddc484f083d76ccd920388d64932c03e85816ae801aa3864f4e7b70c0052c6c
+MISC ChangeLog 5955 RMD160 6527689d8ed4e8969ecfab7c94a80191d3457094 SHA1 d641d42ac725ea9ccf26e493cfcfd4e1b4040145 SHA256 03c18960826fb308bc172997d63f1343ab7114f71f1a8f21ddac9d8894ae6f47
MISC metadata.xml 302 RMD160 0686d178aa663ad8cf229c06b24e08631bf0c351 SHA1 c213ed294c279982ab92a246478c482093064826 SHA256 3c2a0f562d9add32cd6c44f25ed792ce57aec69af36275cd7f6b8a6108568cb1
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index f8d7c73..e1afbc0 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -19,19 +19,7 @@ DIST git-1.7.10.2.tar.gz 3809702 RMD160 347010cf7c2ea956ff8d8bb04e23035fe1965d68
DIST git-1.7.10.tar.gz 3753777 RMD160 03bd54cf6158aa1a2f4bdf77a31b7dc5d87544ec SHA1 501ee8685c148d377950e42c111e01d83fd1d41a SHA256 d2a88d1564ebe468bb6a58a4edb57f5e06bda9846300cdbedbef8f7bccaf4ea6
DIST git-1.7.2.5.tar.bz2 2561345 RMD160 d69abab041064265e41780447d804717f229fc85 SHA1 912c812e98f2985c7152ffb3311572d5f12f2855 SHA256 d84e6d76fe9d30af5515ea8177b0d8bfe774ee0836d21ed450cb4d52f5aa6311
DIST git-1.7.3.4.tar.bz2 2635522 RMD160 37cdb8b50c802655643a243ef26fe3d50145d29c SHA1 8bda6668531fc41a72a680978798deb9ee048846 SHA256 3e5e2b6547ee4aae82b4c5f589ff084996e9e6e0e2b52c92365e6baa1e4a0171
-DIST git-1.7.3.5.tar.bz2 2635455 RMD160 3ad6eb187b7a901addb3ee5a2ade70ba550007f6 SHA1 cf9587ecf7cae04463d05b9f9ce8990913bd925a SHA256 41682e4c13b43591b61a96b6f7a549b24863f62dfc4a917b6147c8e708e288a6
-DIST git-1.7.4.5.tar.bz2 2711452 RMD160 5e9a0ccbaa913bf42507c2ebdbcf35fb9f7476f9 SHA1 96dcb8a7b6122f8ea5017b598e570e062d2511e1 SHA256 a6c084752cf5645864b466ea10c0afb2dd74854dc9e4189aa87bf1446668a901
-DIST git-1.7.5.3.tar.bz2 2766856 RMD160 99a8f69690dc75c37b5141c6984dc5b499fcd8d4 SHA1 762d0985af37c9dda4e22c84e09c6e4efb46a22a SHA256 8017b0c624fea88bf5488d35f3839778fac3c0e089a02fe0017aea6913af3292
-DIST git-1.7.6.4.tar.gz 3399093 RMD160 80d226e77b8b9ad6d0bba86773e26257e5b3d734 SHA1 df91e2c32d6097ab1c9d0edc56dd8cecb4e9b686 SHA256 c95bb6fdfa8276a6cbc1c3150e56ce3dc2fc29a4bcecd9c246ab9df5d9638ec6
-DIST git-1.7.7.6.tar.gz 3485668 RMD160 6453d81893f2a32d7d9e93ff1b683b8464d6e6a8 SHA1 483dc95de0e26f0154fb23444589266b59848cfe SHA256 086eaca9d629bd9997f73763131dd194b62ae269a56ad71011263870b9263a56
-DIST git-1.7.7.7.tar.gz 3485439 RMD160 99ae1b7595b171a8027a69dddf589d0be799775c SHA1 6fbb215ab20afaf4cca6b1e5a7e4ff4b3b62303c SHA256 328b7b59be167c14305176f81435c77033f8cffd7dc25d08adaccaf2f0bede0b
-DIST git-1.7.8.1.tar.gz 3539908 RMD160 b9b6c52fa38712679867e140c6b5d1bfcbc05831 SHA1 198e23e6e50245331590a6159ccdbdbe1792422c SHA256 e393aad2286f85f23e859ad64ddcc20b74bfa7788c85c56645757cb201c9006a
-DIST git-1.7.8.2.tar.gz 3543890 RMD160 9d2cd1f2c1009122a2c8d41f7d4696fa83d3f198 SHA1 7187c1af96db0c181b801957d6e152ec7cd60ab6 SHA256 2247f214fce3be72da3020947ce3fbfb7f6f9950a145897554e043cd63f9a3e3
-DIST git-1.7.8.3.tar.gz 3543164 RMD160 2c88b4cf4f915363dfdc1bddda925f4a62b4e454 SHA1 e5eb8c289b69d69fd08c81b587a06eb5dd2b5c1c SHA256 77f52b7104a107e0fbe1ce85b3f35c97f029fab92cd35a3909015ca169af505d
-DIST git-1.7.8.4.tar.gz 3544195 RMD160 ee203b3d6252c2df150ef7904c6b95672dea4aff SHA1 add7b05f26216181d1b148dde298432132552b0f SHA256 71a5a98d386061fe606b5be1ac390dc725d418d12edfa20796ff7671247c67e3
-DIST git-1.7.8.5.tar.gz 3544390 RMD160 900f57e121f0aa0a312128983c030d21400aec7a SHA1 bb3d715437a4751f7de0c89156bf97dae7c6049a SHA256 b235fd332525c22eeb6f4f5e0b44b21f1ff1c35a7c76e6729a7a560b2fbed622
DIST git-1.7.8.6.tar.gz 3546112 RMD160 00bf5c301a86486ee67fe93fdcf3ac07d17c0985 SHA1 b204ae56e511c541425c5db757132fcd35f64117 SHA256 45be602d0ca64eb44282cec7a5a7286487f7e9ed0c8112735456a22fdf1f6db9
-DIST git-1.7.8.tar.gz 3538330 RMD160 efde5f593ea804a998c4aeebc27ccbc0674596e4 SHA1 7453e737e008f7319a5eca24a9ef3c5fb1f13398 SHA256 ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713
DIST git-1.7.9.1.tar.gz 3608449 RMD160 acff1b02a507220e51a86b63d38a5ae4ec01f70f SHA1 bd85327627f96c4e98071a4d1d32c30f210aa54a SHA256 b689a0ddbc99f9a69aef7c81c569289a28ba0787cd27e5e188112e1c3f0e8152
DIST git-1.7.9.2.tar.gz 3611846 RMD160 af5a35d1630c2ea2472665f461953baaf3a42dfc SHA1 7aff1048480a8637de94e8d82744d312c0b5e060 SHA256 bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75
DIST git-1.7.9.3.tar.gz 3615900 RMD160 3f45d8262526dfbc576004b8f50a92a6c33cf4d6 SHA1 6216153da1139c25cb96cfb4441eff327013ec4f SHA256 fe1d27649d9e8a31bdb768e9f9cdfeca3b383bb10354c6dcf0629bd669d8d76f
@@ -44,19 +32,7 @@ DIST git-htmldocs-1.7.10.2.tar.gz 1764063 RMD160 3910b023a636ef3b9d0065a29327802
DIST git-htmldocs-1.7.10.tar.gz 1759866 RMD160 378595ffa936e45cb5755456d0e4d7c038a943f8 SHA1 d624d67dd4988dad8164f4395d74b73c21434a29 SHA256 049fb01aaaeb9b3dd7bb93e5d601fce33164ad4127519d797e950e0e02f54137
DIST git-htmldocs-1.7.2.5.tar.bz2 919247 RMD160 8ff6503efdb3cfaa639d2acbfaf76dad274aeb8f SHA1 b99f4e9eb620918b68fd98a4a0f0686832799477 SHA256 6b6291ffad4eae80d2739acdffffdd6293b9e50366cfa53ffb0c3a1427700337
DIST git-htmldocs-1.7.3.4.tar.bz2 929858 RMD160 4183ff0e61885323371b11dfb119bcc718e46a34 SHA1 17cbfcb9b85352777ace4b787e8ff48b6aeee6ab SHA256 24f03bcd6b5c3745c2395cf49260cdbf7fe80292883b0b4da3e1ac636aee6fba
-DIST git-htmldocs-1.7.3.5.tar.bz2 930432 RMD160 8ee1e22158d1d9585346e0bba965a60e2d04ac99 SHA1 232a5d9c7ff53d1149f790bea8dd2c6dc5f50dc9 SHA256 630ee4546aa0ee3e92ad0eed2ef60b90fe9e16754db38a479a5a59870846030d
-DIST git-htmldocs-1.7.4.5.tar.bz2 945737 RMD160 d0e45908b397fd46e2eca46beeac292896ef7d4c SHA1 86ffa2c180112232c6acdedee5827d9973e0708f SHA256 52a2007146acdc4ab9ca4a4b70d4f55b72ef8c4b1a29395d06ed93561c84dcfb
-DIST git-htmldocs-1.7.5.3.tar.bz2 956542 RMD160 777b354e18522bebd4ebfed070179e632998b5da SHA1 f0a66b8b21fab39acf466cea5c14416c718334c4 SHA256 a08cc349b53271cf1b1c23d68033105bee25b1cb1884c8ecaa12271737baff52
-DIST git-htmldocs-1.7.6.4.tar.gz 1606389 RMD160 931da8cc615cd1f52024a07f53ebc14e3fcc03ff SHA1 6abd985e24b6585284cef7fae2e3046ba9201356 SHA256 b73ded7089bb253efe45ef3a444022500df012a4bd596249ac999135ca76e240
-DIST git-htmldocs-1.7.7.6.tar.gz 1635617 RMD160 f151c86c48add564d75caa348bc8ccd48714f38c SHA1 8bcbd0a53fd3b937a9991aa096220a1a0eb2f771 SHA256 7046fab9bc9dc237bc25c700840bbfec2c79171fc61957889583444ea5d8783c
-DIST git-htmldocs-1.7.7.7.tar.gz 1627651 RMD160 9db00c5492b53f604a6785d96e21d06ef253ad8d SHA1 bb4552ccde7d8b7fdb98c113ce4373dbfb9672b6 SHA256 6edd544c6e8f0a2bf718adf8463e25b0c2cf067bcc620eb7154f3258b9656759
-DIST git-htmldocs-1.7.8.1.tar.gz 1695296 RMD160 9f0a4d43e327da14592ecca6816301f143b9ed4b SHA1 8f674dba39d9ae78928abfe9d924b0855e283e98 SHA256 6f68f05b76cb07fb9a671a2e59c79aac26deffd2ae3a46027520ef6f2fab404d
-DIST git-htmldocs-1.7.8.2.tar.gz 1697858 RMD160 d9f5c0b4c01e682f241ebc59d1abf7cd79fe6dd0 SHA1 9047175e5c46aa3260c42e6b4459cf4ee5a7bb8a SHA256 c402b231b8d8b8ecae267a6e3b0224c473c0f0c3fd0e22915d07854276d8c800
-DIST git-htmldocs-1.7.8.3.tar.gz 1698145 RMD160 3c77c0ae24b3bd035c1057648736d6ba008c57ab SHA1 8a65d2425c1b6f646d130cf5846e92e9e0e93736 SHA256 d6dad326af1aaae36d349f6a722a6c53e6a936f4e6a470d96320857319db6af9
-DIST git-htmldocs-1.7.8.4.tar.gz 1699142 RMD160 beccc1e17f6d930c79f2f35aeac4e8dc0c318e1e SHA1 ac2b89d8d4418c7633ee2344e89eb7dfcb81522a SHA256 a86d8d939cb031d8ebbbaa17399c32474a13e0e4a6705406ad5771620b351acd
-DIST git-htmldocs-1.7.8.5.tar.gz 1699204 RMD160 6313e769957f94a5b120656ed1b6419709a8aa8a SHA1 71cf25158ae3499e33327fa9469279771429f9f7 SHA256 64eb6ebac332cd23eb9f0ae1aec26c7f03da9e73b32dbb32bb84ec8c6efd19a7
DIST git-htmldocs-1.7.8.6.tar.gz 1688622 RMD160 3997a1a54e5e446547ab43fb45b817a2a8720415 SHA1 0618da00f11a6bb91da7d639f348bb806b153650 SHA256 7c7447fe136349b1807caba1c00fe6a46866c9b54cba068f322967c0f8b2c0bf
-DIST git-htmldocs-1.7.8.tar.gz 1694941 RMD160 07344d8dd95f2d72667cf16a4f340aa5cc4c8950 SHA1 2734079e22a0a6e3e78779582be9138ffc7de6f7 SHA256 45b3e3016bd5dbd933bafd5e8091acb0431ff3a63b7fd829e9d9832dde096862
DIST git-htmldocs-1.7.9.1.tar.gz 1743893 RMD160 ba3b1b5eeeeb00ca0050c670ad3bddea5c19ffcb SHA1 de5ad73499cfdb08e261bc481c84a75f11b7ff0f SHA256 df21e008501ca0825d153d1746cf0f7742a87b15a98c6881d4fb9611897226df
DIST git-htmldocs-1.7.9.2.tar.gz 1745003 RMD160 296cd29ff0a3f464760c8c30efa1123f17174222 SHA1 3cf13b03b2f64d0458212232cc18983231f8251e SHA256 da9c90e9e175448cf7940acbd287bc927294b3fd8ddf8d9a1e10266eff872b3b
DIST git-htmldocs-1.7.9.3.tar.gz 1746314 RMD160 7d826cdd1bf3fc797ff077db8598a6b798462b96 SHA1 2d488c3975da1c2ea90965b82233a986c498a8c2 SHA256 855db3ff9fedec21e37e8e9679eca14c15c4cacc05e0175be1761dfa61e593e0
@@ -69,19 +45,7 @@ DIST git-manpages-1.7.10.2.tar.gz 511363 RMD160 2f2cccfd9b18d0820a875def26a8e3b9
DIST git-manpages-1.7.10.tar.gz 510752 RMD160 7c722812e75a870dc9638d41bcd993ad5cb30216 SHA1 5852d1dead0190edeba1803a70fac5d76523a616 SHA256 19f2b47b436166a6d5958142d8517f057a9532d58249344c482462dbf204d703
DIST git-manpages-1.7.2.5.tar.bz2 289543 RMD160 b921fa2b5ec47e091987d1122b1c189b4bd87f3b SHA1 735ee1f23428404bdb99d9b0bd1cbb79c9e7afce SHA256 a42a977a1ecfd3cea62e1f02fc89f57029a94f163ff7205f6a56ab4b67d6bd6e
DIST git-manpages-1.7.3.4.tar.bz2 294381 RMD160 dfd4a4757077290a666ad974585677888f909890 SHA1 c4f93ed1d9892af1174d63743dc578835a6183f1 SHA256 2ff98641bc655b29a7fb72bced46da09c99b6fad3b651722b7b8057df4a9ce75
-DIST git-manpages-1.7.3.5.tar.bz2 294754 RMD160 2d360b820a7390d50954778f56e9eaf4c9bbfa31 SHA1 fe00694f9db7b8a29b5c44dd8610ef24bd73ec3f SHA256 7b14eff2e06f3de2b6f6b5fbab730fd204324b394b7bf7cc7b776f7edb220769
-DIST git-manpages-1.7.4.5.tar.bz2 301080 RMD160 f363285195421dea67d70d978d235d8b687ad461 SHA1 88ff272c517043b662010747d6b60f6a32a20b2d SHA256 04e06a14db8c4258cdec1b9bf8cc33b2407bea368ecf22a5e06012af3c01cd2c
-DIST git-manpages-1.7.5.3.tar.bz2 304065 RMD160 02919cf1db61717f6f3ad298c31d6eae3c01b48a SHA1 2b6f770b0314d12d7abd4fe2274a46c29ac64f50 SHA256 018f5c16b9a3c4e4942ae318d1faea0b6092287228069a718efd267b9f98b8c8
-DIST git-manpages-1.7.6.4.tar.gz 468334 RMD160 91d0df4b4182bead27149dbf03481d3e139cc730 SHA1 c6f6d92f4005a7eccaf89e851c45768c18f7e65a SHA256 c1ae86f0bfd80ec819535a64825a141aeef950dfebf9a3f82bef6752b586f63f
-DIST git-manpages-1.7.7.6.tar.gz 474628 RMD160 2cb26c04de36d84dd6fd9fc51d83b2660211d4dc SHA1 0fd7452c88d0b3ccb08d9b2b91b552680b0209e0 SHA256 3e94c718530ce7343ca5cc13a5583c01d8806d465e657f970c28b43420906dd3
-DIST git-manpages-1.7.7.7.tar.gz 478713 RMD160 46c19855b25af66f1706db7b52baf899ae2e017e SHA1 a8341f8887abef23aacb3c56d75b8f87d73b22ff SHA256 e00e9be4b1017038875c6402a3a59b53c7f261a7ff752122edac5ec3fc339843
-DIST git-manpages-1.7.8.1.tar.gz 496876 RMD160 d3e601038e8fc85b32798148ecc8c82390eb3b56 SHA1 b49ce0b4da4f85671693c9b2c6f6a8b8ee65c809 SHA256 1575acc41beb05ee4939508325a65ea01746982f2eeb77ed55bf1ffc673f54ef
-DIST git-manpages-1.7.8.2.tar.gz 497249 RMD160 94477d2e301c684ca271334ee66699071421c896 SHA1 cc394a0a9689297fddad40c1ccbded0ba9d708da SHA256 87b95eb0e6d93c71dcf850100a1ebdb2e06b86a03603a695f7ffb947f4da94a9
-DIST git-manpages-1.7.8.3.tar.gz 497446 RMD160 87aad1c9975a006683ab6b1128df39ae19b30d2c SHA1 a6e2b7cff8181ee52a1cc00ebba7b349850d6680 SHA256 5c0c402d41c577b9cd9a31e30abd029d3e79d6c3164d4a527d3103ee2a0dfb5a
-DIST git-manpages-1.7.8.4.tar.gz 497621 RMD160 0ab22cbe1820b29d991a63cfb087aacb42b8223e SHA1 4372c423a0d2f7df33b5b39727a81f0a7b40669d SHA256 b4930a17de7b18d40d81c3830913e5c4c2a91134e3a331ad49757d496ee53b76
-DIST git-manpages-1.7.8.5.tar.gz 497426 RMD160 b4d902d69d0b983fa9ed6c014eb3a7a02ac263df SHA1 ce327331973b6e100b6a69ab8f9c526690260e92 SHA256 1a890f2cd2a875d2716ebc83413c08750ce15194297f3aabd66014f4f8f511d2
DIST git-manpages-1.7.8.6.tar.gz 501678 RMD160 edf8c6b698751a18a23c8a3eec3c33c03157020b SHA1 2d2da141cebb2d7cce03abb556ee52c3dbad3831 SHA256 559b7a6ba8eaad655d725765b75aff9c6a5aaed2cc77abcdd2f88c773a0b3a6d
-DIST git-manpages-1.7.8.tar.gz 496974 RMD160 ee09c9a1c80fe46ca3a6787ea30eadeddee2a9a0 SHA1 93315f7f51d7f27d3e421c9b0d64afa27f3d16df SHA256 f67d593f5aecd01ec42683cff515172c67f79109161629621e9df58e39ef5354
DIST git-manpages-1.7.9.1.tar.gz 508057 RMD160 2ed606396ece433ff3206bb4013867882e2cf51f SHA1 8c6ee031b39da5c5e53f927952838796e0959ce9 SHA256 f31d91061e96b5f882ceed2160d44937b2679931e7e217a66bfe3a23df46adae
DIST git-manpages-1.7.9.2.tar.gz 508005 RMD160 229aee67eb986f81d8e2d511df18dfd8adc0ae41 SHA1 d6992d899fb70e40983f94a2f96ad24b8ee93557 SHA256 c653a3678bb5668c280a0d5ba584fdfb0e4272acbbd00901dc2363ea3f58eede
DIST git-manpages-1.7.9.3.tar.gz 508293 RMD160 9b51c410ec9618cd30e89b4746722680ce51fbe8 SHA1 223daa871a64facc60bdf643c50c78eac21c88f4 SHA256 6cea090e0c19bd1fc52a67576c4239ea3892a895b380dd3580b48353e423f462
@@ -94,19 +58,7 @@ EBUILD git-1.7.10.2.ebuild 16493 RMD160 2e5897f28b1b1ea2efeb049a8cdc1c3adf35f9e5
EBUILD git-1.7.10.ebuild 16490 RMD160 7ee17cfced89b9717d92bfa00725e9ebf69499af SHA1 c2d65ac77974bb50baa5bde5fc32fc772b77861b SHA256 cebc158cce887d68d462ffb172c4304051986e099afc929a6d442a211e9f4e8f
EBUILD git-1.7.2.5.ebuild 13520 RMD160 9411dac852204b7446bcbaddf3c96ac25f3b6028 SHA1 7fcbba3389a5f8dd1fbf2ed228285d4351b4d000 SHA256 666e01293c6884d6ac11578b45f1fdcdf298cdb6d194c249f8e993d6c1b27343
EBUILD git-1.7.3.4-r1.ebuild 14029 RMD160 217641ce0f1d00817a1c8bd70d5e7dc422f886fc SHA1 45c8c571e45e46c01f851ef7e1b4281665ccb54a SHA256 9d0c67c61774f8f1f644b182c551d53bdf305dffaad390d0f0aa3cc048c4f662
-EBUILD git-1.7.3.5-r2.ebuild 14564 RMD160 d56ee76ca2232cb851308b4d65382fc4ef146b71 SHA1 0ab0291ab495e6a0d48c940b341c2dfbad44f012 SHA256 3b00f97a76975c43798128e12c3ec1242fc106116d132fe229bf01a2c8b10269
-EBUILD git-1.7.4.5.ebuild 14599 RMD160 b690444f7dfb126cf8595302e5e6a7aa1aed9a54 SHA1 bd455dcc232f3d2545b7fee66a5afc9eca1834f5 SHA256 1d05602fcb28052520cd2719a3e91640eccbfd3ddcda076f6db2c026837df06f
-EBUILD git-1.7.5.3.ebuild 14734 RMD160 30ee5d07c329cd1dc518e7f41eba2fec33fdf8eb SHA1 bdc52b50209d86f9f673aaad8957c109c23275b4 SHA256 fd9935d807b1ed4d1a9601beba880a2c201e45e8f885197785a3b2941b3b1ace
-EBUILD git-1.7.6.4.ebuild 15368 RMD160 3275287346025a271d12c3886a08a50b64d0aaa0 SHA1 8b13544f371bb0f3fb080e1c127642853f550e5a SHA256 318ba9980b336deaa402de36ebb50b627cc3b5f194a1354931457329d1ddcc51
-EBUILD git-1.7.7.6.ebuild 15123 RMD160 8313e0afdfa6c6b6cc9f9ff7b4aa8b120c579144 SHA1 77b88b98bc1cfa8b184d0fa5911eff9a06de05fa SHA256 a8a03594b7557708a8a88c9b920c90b27edef340a902978ac3e229a976b6f4ab
-EBUILD git-1.7.7.7.ebuild 15123 RMD160 8aa8bf31dcb91202ff3f086e21ea079eb24907ae SHA1 0fdaeecdb163c0c96c1ae79b9ddf9df0ad4b2626 SHA256 e2818644beb61955899fc46bc1d2d3fc559e3030cada3139d072635c94f27750
-EBUILD git-1.7.8.1.ebuild 14782 RMD160 686659177e123697b22aac2da1e8e5cd7eb0312e SHA1 b99120fb8a56f179b65cd73b7abc2538e455070e SHA256 2976d64c10719e75da8d8d154f181291141af6da0b4230288a8668670a826ff6
-EBUILD git-1.7.8.2.ebuild 14782 RMD160 e618d9181049cba7819ef1460394e8c90925ee5c SHA1 ac8b1199f5ad9eed8cab0d8d47c9c082ac47290e SHA256 b04de2fb8c240ef2bcb185f52f3400cc269f243868a76ba9d76260aaf69c8a76
-EBUILD git-1.7.8.3.ebuild 14782 RMD160 489c03780651758cb44c8060c30402041c57dfca SHA1 da29bd0adeba5eff9bfcaa848490db3f592291c1 SHA256 8d3d0d3554ae3c5095e0c055f9fefe79c2428eba272085626cb157aa17c359e1
-EBUILD git-1.7.8.4.ebuild 14782 RMD160 be168b88b76d13d4ee308dd0de34964b3d0a6bca SHA1 c9aef3d4797ec048d4625fed7eca672bc9b9a710 SHA256 d91e36e1aa48bf932c6673081df31ca2e7bb189985d430ddfd3724a35ec97c0e
-EBUILD git-1.7.8.5.ebuild 14782 RMD160 52fce51d4b869426b112dbec50768df5f68b012c SHA1 c48af3b283bc92030e8016b604f00cb1da21f250 SHA256 558bfed7563b20740f08cc85c1530a0de7eb0863996a2cdb3b4740766bb1191e
-EBUILD git-1.7.8.6.ebuild 14794 RMD160 c3ad9339362b94a7b48ed82f552a32bb6815579a SHA1 21e871d6c5bf78f1e26f0314c4a55115f58883ea SHA256 37b55610f4136dcd7dd6769fd9e3bd4d16b5168d1e5d4676a73e36f3da8c4198
-EBUILD git-1.7.8.ebuild 14780 RMD160 ef789ad758c841ba7cae6814cf0d82a01b968679 SHA1 c242b6e21632a5253c8b4affd4d7f6665fd293ac SHA256 1d9a5fedc183639f8ff8c1cacfeff488c6df1e988eadcf781739787bb9e56042
+EBUILD git-1.7.8.6.ebuild 14790 RMD160 63f20d944910f9091191a2084ccbaf9b4390d530 SHA1 8686a48c33af53cb95f24dcc97f97cf35c185fc4 SHA256 c4201af6cc25c3e58d594d141438f2c84b65367e4b4a5fddf9464ff72981db06
EBUILD git-1.7.9.1.ebuild 16491 RMD160 514ed5251a4f9a1a64640e9dc9fb3829813d791e SHA1 05555a84231d8bcc24e0e009fb4e4bf860135b55 SHA256 b58ed3b4dd9b698c637db209241f0b050ab441053b1b4329a97dcc645da3f940
EBUILD git-1.7.9.2.ebuild 16491 RMD160 0ba19c6653ca04abb40663fe5756aca3f9c133d7 SHA1 4b792ab9ed58ce3014389a3cc6cc762efe59d2b4 SHA256 f8c1cbe9dca6f5f5d1d83229dcb9d41b87da2ba23d1a7af6e9dca59b977eb06d
EBUILD git-1.7.9.3.ebuild 16491 RMD160 7d1205c3e132fd1ca47bd43d0976ab6a6f81f96c SHA1 2b7a84ede8c7a0b98fdde39b962ca09d00d2db0b SHA256 3192b9806aad116c0eaebab9bb4a569f028cddf60b13bfcc9ede2ed4722df6f0
@@ -115,5 +67,5 @@ EBUILD git-1.7.9.7.ebuild 16491 RMD160 75a5212a8ede60f4f7eaa13661a5de8c98e7d75b
EBUILD git-1.7.9.ebuild 16489 RMD160 00ad272a1cae25f9ac74f0f5ee7dbf762bcd4d43 SHA1 cd18b9e4d8703b659bed4ed4ff095ab82010bf69 SHA256 a7972d468b50c6f961aa3ee480141c6a41bb4a15ac29fed1be395c502c65dd67
EBUILD git-1.7.9_rc2.ebuild 16049 RMD160 070b297c65abc81cc2f83c23d81e02ee367cb140 SHA1 89a27aec1caffcd7f132209c9767bda9ea709353 SHA256 3ee576d91626b75bd4a600822723d831b06c84899f0259ffd5f2c98e4f365fe7
EBUILD git-9999.ebuild 16046 RMD160 cd327830bec3697a8c9c0869e272db2cc9a9c475 SHA1 5f130cd425e6ba4457a607a2ebe95c439f82bff6 SHA256 f1b77d0a618129d5acd55eedb5c530cf7a43a8da203a1a23b0044eb4f48ba9fd
-MISC ChangeLog 88874 RMD160 6207e20e12e2fb2212af9a48a1c4a7eff4ce5119 SHA1 7c578a21977d72779173837f816ca7c2248e4834 SHA256 12054316d63c0a2ebc8c4712cbbdfb0f0e8304629cb6dfa5f06e772d6b7d0438
+MISC ChangeLog 89321 RMD160 93ec2b9dae86af7b16e9f4bbff9a29231ab7049f SHA1 566f4d323f6a0af737675ebde64bbb75b28d39cc SHA256 8ad952759d43c8fde6c4765d46a7b22f14f15c1aff537bf3bd358e7d46d56340
MISC metadata.xml 1633 RMD160 1c480edd9e41f778d00b2327e2e1f1b3bf2e16dc SHA1 c48806013bd80c4da499f64caa3660b665270b5d SHA256 d755feb6f78130bdad7592120067448f46e760430599a39c734a5340ef0d7ae8
diff --git a/dev-vcs/git/git-1.7.7.6.ebuild b/dev-vcs/git/git-1.7.7.6.ebuild
deleted file mode 100644
index 5e972f5..0000000
--- a/dev-vcs/git/git-1.7.7.6.ebuild
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.7.6.ebuild,v 1.1 2012/01/20 08:32:39 robbat2 Exp $
-
-EAPI="4-slot-abi"
-
-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 ~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 gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !blksha1? ( dev-libs/openssl )
- sys-libs/zlib
- perl? ( dev-lang/perl:=[-build] dev-libs/libpcre )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- 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
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc
- app-text/xmlto"
-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 \
- || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
- # || myopts="${myopts} NO_ICONV=YesPlease"
- # because, above, we need to do this unconditionally (no "&& use iconv")
- use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
- || 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
-
- 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() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- # Merged in 1.7.5.x
- #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
-
- # USE=-iconv causes segfaults, fixed post 1.7.1
- # Gentoo bug #321895
- #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage
- # user.
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
- # bug #350075: t9001: fix missing prereq on some tests
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.3.5-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"
-
- # bug #318289
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.5-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.6-interix.patch
-}
-
-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() {
- 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
-
- 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
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- # 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}
-
- 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
- dodoc contrib/fast-import/git-p4.txt
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # 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 remotes2config.sh rerere-train.sh \
- stats svn-fe 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"
-
- # 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
-
- # 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
- cd "${S}/t"
- git_emake clean
-
- # Now run the tests
- cd "${S}"
- einfo "Start test run"
- git_emake test
- rc=$?
-
- # Display nice results
- cd "${S}/t"
- git_emake aggregate-results
-
- # And exit
- [ $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 completion"
- 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
-}
diff --git a/dev-vcs/git/git-1.7.7.7.ebuild b/dev-vcs/git/git-1.7.7.7.ebuild
deleted file mode 100644
index 4fa805c..0000000
--- a/dev-vcs/git/git-1.7.7.7.ebuild
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.7.7.ebuild,v 1.1 2012/04/26 21:47:30 robbat2 Exp $
-
-EAPI="4-slot-abi"
-
-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 ~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 gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !blksha1? ( dev-libs/openssl )
- sys-libs/zlib
- perl? ( dev-lang/perl:=[-build] dev-libs/libpcre )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- 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
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc
- app-text/xmlto"
-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 \
- || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205."
- # || myopts="${myopts} NO_ICONV=YesPlease"
- # because, above, we need to do this unconditionally (no "&& use iconv")
- use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease"
-
- use tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
- || 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
-
- 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() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- # Merged in 1.7.5.x
- #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
-
- # USE=-iconv causes segfaults, fixed post 1.7.1
- # Gentoo bug #321895
- #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch
-
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage
- # user.
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
- # bug #350075: t9001: fix missing prereq on some tests
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.3.5-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"
-
- # bug #318289
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.5-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.6-interix.patch
-}
-
-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() {
- 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
-
- 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
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- # 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}
-
- 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
- dodoc contrib/fast-import/git-p4.txt
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # 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 remotes2config.sh rerere-train.sh \
- stats svn-fe 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"
-
- # 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
-
- # 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
- cd "${S}/t"
- git_emake clean
-
- # Now run the tests
- cd "${S}"
- einfo "Start test run"
- git_emake test
- rc=$?
-
- # Display nice results
- cd "${S}/t"
- git_emake aggregate-results
-
- # And exit
- [ $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 completion"
- 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
-}
diff --git a/dev-vcs/git/git-1.7.8.1.ebuild b/dev-vcs/git/git-1.7.8.1.ebuild
deleted file mode 100644
index fd0c9fd..0000000
--- a/dev-vcs/git/git-1.7.8.1.ebuild
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.1.ebuild,v 1.2 2012/06/14 04:48:01 vapier Exp $
-
-EAPI="4-slot-abi"
-
-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 ~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 gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !blksha1? ( dev-libs/openssl )
- sys-libs/zlib
- perl? ( dev-lang/perl:=[-build] dev-libs/libpcre )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- 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
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc
- app-text/xmlto"
-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 tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
- || 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
-
- 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() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- # Merged in 1.7.5.x
- #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
-
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage
- # user.
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
- # bug #350075: t9001: fix missing prereq on some tests
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.3.5-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"
-
- # bug #318289
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.5-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.6-interix.patch
-}
-
-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() {
- 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
-
- 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
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- # 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}
-
- 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
- dodoc contrib/fast-import/git-p4.txt
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # 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 remotes2config.sh rerere-train.sh \
- stats svn-fe 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"
-
- # 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
-
- # 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
- cd "${S}/t"
- git_emake clean
-
- # Now run the tests
- cd "${S}"
- einfo "Start test run"
- git_emake test
- rc=$?
-
- # Display nice results
- cd "${S}/t"
- git_emake aggregate-results
-
- # And exit
- [ $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 completion"
- 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
-}
diff --git a/dev-vcs/git/git-1.7.8.2.ebuild b/dev-vcs/git/git-1.7.8.2.ebuild
deleted file mode 100644
index 680f505..0000000
--- a/dev-vcs/git/git-1.7.8.2.ebuild
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.2.ebuild,v 1.2 2012/06/14 04:48:01 vapier Exp $
-
-EAPI="4-slot-abi"
-
-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 ~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 gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !blksha1? ( dev-libs/openssl )
- sys-libs/zlib
- perl? ( dev-lang/perl:=[-build] dev-libs/libpcre )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- 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
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc
- app-text/xmlto"
-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 tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
- || 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
-
- 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() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- # Merged in 1.7.5.x
- #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
-
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage
- # user.
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
- # bug #350075: t9001: fix missing prereq on some tests
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.3.5-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"
-
- # bug #318289
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.5-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.6-interix.patch
-}
-
-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() {
- 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
-
- 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
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- # 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}
-
- 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
- dodoc contrib/fast-import/git-p4.txt
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # 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 remotes2config.sh rerere-train.sh \
- stats svn-fe 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"
-
- # 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
-
- # 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
- cd "${S}/t"
- git_emake clean
-
- # Now run the tests
- cd "${S}"
- einfo "Start test run"
- git_emake test
- rc=$?
-
- # Display nice results
- cd "${S}/t"
- git_emake aggregate-results
-
- # And exit
- [ $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 completion"
- 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
-}
diff --git a/dev-vcs/git/git-1.7.8.3.ebuild b/dev-vcs/git/git-1.7.8.3.ebuild
deleted file mode 100644
index 4a56f2b..0000000
--- a/dev-vcs/git/git-1.7.8.3.ebuild
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.3.ebuild,v 1.2 2012/06/14 04:48:02 vapier Exp $
-
-EAPI="4-slot-abi"
-
-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 ~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 gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !blksha1? ( dev-libs/openssl )
- sys-libs/zlib
- perl? ( dev-lang/perl:=[-build] dev-libs/libpcre )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- 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
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc
- app-text/xmlto"
-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 tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
- || 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
-
- 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() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- # Merged in 1.7.5.x
- #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
-
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage
- # user.
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
- # bug #350075: t9001: fix missing prereq on some tests
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.3.5-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"
-
- # bug #318289
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.5-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.6-interix.patch
-}
-
-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() {
- 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
-
- 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
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- # 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}
-
- 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
- dodoc contrib/fast-import/git-p4.txt
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # 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 remotes2config.sh rerere-train.sh \
- stats svn-fe 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"
-
- # 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
-
- # 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
- cd "${S}/t"
- git_emake clean
-
- # Now run the tests
- cd "${S}"
- einfo "Start test run"
- git_emake test
- rc=$?
-
- # Display nice results
- cd "${S}/t"
- git_emake aggregate-results
-
- # And exit
- [ $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 completion"
- 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
-}
diff --git a/dev-vcs/git/git-1.7.8.4.ebuild b/dev-vcs/git/git-1.7.8.4.ebuild
deleted file mode 100644
index 2aa2d4c..0000000
--- a/dev-vcs/git/git-1.7.8.4.ebuild
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.4.ebuild,v 1.2 2012/06/14 04:48:01 vapier Exp $
-
-EAPI="4-slot-abi"
-
-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 ~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 gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !blksha1? ( dev-libs/openssl )
- sys-libs/zlib
- perl? ( dev-lang/perl:=[-build] dev-libs/libpcre )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- 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
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc
- app-text/xmlto"
-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 tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
- || 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
-
- 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() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- # Merged in 1.7.5.x
- #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
-
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage
- # user.
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
- # bug #350075: t9001: fix missing prereq on some tests
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.3.5-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"
-
- # bug #318289
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.5-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.6-interix.patch
-}
-
-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() {
- 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
-
- 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
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- # 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}
-
- 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
- dodoc contrib/fast-import/git-p4.txt
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # 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 remotes2config.sh rerere-train.sh \
- stats svn-fe 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"
-
- # 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
-
- # 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
- cd "${S}/t"
- git_emake clean
-
- # Now run the tests
- cd "${S}"
- einfo "Start test run"
- git_emake test
- rc=$?
-
- # Display nice results
- cd "${S}/t"
- git_emake aggregate-results
-
- # And exit
- [ $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 completion"
- 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
-}
diff --git a/dev-vcs/git/git-1.7.8.5.ebuild b/dev-vcs/git/git-1.7.8.5.ebuild
deleted file mode 100644
index f6a22b1..0000000
--- a/dev-vcs/git/git-1.7.8.5.ebuild
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.5.ebuild,v 1.2 2012/06/14 04:48:01 vapier Exp $
-
-EAPI="4-slot-abi"
-
-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 ~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 gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !blksha1? ( dev-libs/openssl )
- sys-libs/zlib
- perl? ( dev-lang/perl:=[-build] dev-libs/libpcre )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- 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
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc
- app-text/xmlto"
-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 tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
- || 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
-
- 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() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- # Merged in 1.7.5.x
- #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
-
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage
- # user.
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
- # bug #350075: t9001: fix missing prereq on some tests
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.3.5-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"
-
- # bug #318289
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.5-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.6-interix.patch
-}
-
-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() {
- 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
-
- 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
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- # 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}
-
- 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
- dodoc contrib/fast-import/git-p4.txt
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # 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 remotes2config.sh rerere-train.sh \
- stats svn-fe 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"
-
- # 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
-
- # 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
- cd "${S}/t"
- git_emake clean
-
- # Now run the tests
- cd "${S}"
- einfo "Start test run"
- git_emake test
- rc=$?
-
- # Display nice results
- cd "${S}/t"
- git_emake aggregate-results
-
- # And exit
- [ $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 completion"
- 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
-}
diff --git a/dev-vcs/git/git-1.7.8.6.ebuild b/dev-vcs/git/git-1.7.8.6.ebuild
index 6ec16d0..fe49cbf 100644
--- a/dev-vcs/git/git-1.7.8.6.ebuild
+++ b/dev-vcs/git/git-1.7.8.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.3 2012/06/14 04:48:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.4 2012/06/27 11:57:38 ago Exp $
EAPI="4-slot-abi"
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then
${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"
+ 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=""
diff --git a/dev-vcs/git/git-1.7.8.ebuild b/dev-vcs/git/git-1.7.8.ebuild
deleted file mode 100644
index 71762e9..0000000
--- a/dev-vcs/git/git-1.7.8.ebuild
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.ebuild,v 1.2 2012/06/14 04:48:02 vapier Exp $
-
-EAPI="4-slot-abi"
-
-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 ~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 gtk +iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !blksha1? ( dev-libs/openssl )
- sys-libs/zlib
- perl? ( dev-lang/perl:=[-build] dev-libs/libpcre )
- tk? ( dev-lang/tk )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )"
-
-RDEPEND="${CDEPEND}
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( virtual/perl-CGI )
- 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
- )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc
- app-text/xmlto"
-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 tk \
- || myopts="${myopts} NO_TCLTK=YesPlease"
- use perl \
- && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \
- || 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
-
- 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() {
- # Noperl is being merged to upstream as of 2009/04/05
- #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
- # GetOpt-Long v2.38 is strict
- # Merged in 1.6.3 final 2009/05/07
- #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
- # JS install fixup
- # Merged in 1.7.5.x
- #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
-
- # Fix false positives with t3404 due to SHELL=/bin/false for the portage
- # user.
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
- # bug #350075: t9001: fix missing prereq on some tests
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
-
- # bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.7.3.5-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"
-
- # bug #318289
- # Merged upstream
- #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.5-interix.patch
-
- # merged upstream
- #epatch "${FILESDIR}"/git-1.7.6-interix.patch
-}
-
-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() {
- 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
-
- 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
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- # 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}
-
- 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
- dodoc contrib/fast-import/git-p4.txt
- newbin contrib/fast-import/import-tars.perl import-tars
- newbin contrib/git-resurrect.sh git-resurrect
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # 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 remotes2config.sh rerere-train.sh \
- stats svn-fe 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"
-
- # 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
-
- # 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
- cd "${S}/t"
- git_emake clean
-
- # Now run the tests
- cd "${S}"
- einfo "Start test run"
- git_emake test
- rc=$?
-
- # Display nice results
- cd "${S}/t"
- git_emake aggregate-results
-
- # And exit
- [ $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 completion"
- 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
-}
diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index 855aa26..426d432 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.7 2012/06/10 14:59:55 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.8 2012/06/27 18:54:58 hd_brummy Exp $
# @ECLASS: vdr-plugin-2.eclass
# @MAINTAINER:
@@ -45,9 +45,10 @@
inherit base eutils flag-o-matic multilib toolchain-funcs
-if ! has "${EAPI:-4}" 4 4-slot-abi; then
- die "API of vdr-plugin-2.eclass in EAPI=\"${EAPI}\" not established"
-fi
+case ${EAPI:-0} in
+ 4|4-slot-abi) ;;
+ *) die "EAPI ${EAPI} unsupported."
+esac
EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index abb6187..64f4de8 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -6,5 +6,5 @@ DIST graphite2-1.1.2.tgz 3677920 RMD160 389819c589a448d68626356566768dee39a451fe
DIST graphite2-1.1.3.tgz 3680838 RMD160 f6858b233753020b83624fe5c8b3e98c3ea1802b SHA1 f5612a5009e52e388eb1f31c692f3ce6bae78209 SHA256 0eb19282a1941bdd5e6d7165718c5d4692d62bac6c1eea56d9e522715cb144f7
EBUILD graphite2-1.1.2.ebuild 1927 RMD160 e0bb08b81c5244f6f22557f3f6215a6b1a26e68d SHA1 b41ee0ea08447b859300fd3463ba209a4f8f2826 SHA256 12c080bcfe60a79ab9d5141eb6d6e147022f39e6ae4d1a6e8315acad735770e6
EBUILD graphite2-1.1.3.ebuild 1930 RMD160 87890e5008e6ccd62e9b7671a6e4661126a0b2a1 SHA1 870e02e3f1eefae8f16fd4c1b471c8ddc8d3249b SHA256 b1ff1d92c0923d2d3cc5b8493a732545123d36815c34a8c99eede3931d35e84a
-MISC ChangeLog 5542 RMD160 0eb077189962789a2bae004d1f48b9f9b5de65ed SHA1 68fe14ff8be248bf2da3335ae8806fe3257ffdd2 SHA256 b068d5eec9875fdb4de8dbb539a86d82638d8e0f5f33ca35d74de12a72d70aa8
+MISC ChangeLog 5703 RMD160 0cb018a398615d177e752a367c9f0d675caf1a55 SHA1 348f9af312829604d8d5d8f5254c8535e73829ca SHA256 8cb17ac7d80444f706416148b758bf008b99626c3ad56f83be6dc2885f2414b7
MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 4213028..ce7a2a3 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -28,9 +28,9 @@ DIST cups-1.5.3-source.tar.bz2 9580485 RMD160 3516c1a0909921c9ae6f33eed9e06c9d9c
DIST cups-1.6b1-source.tar.bz2 8144645 RMD160 2cd340359661776361cc8d91d3514b0cd0d1f96c SHA1 ef3d67a49cb4c61207f66c9d5f792f04ef65fdf4 SHA256 ab2bd150635bfd84b710c92a942cdbff98fd74702d4aba04dd720064ccaa1fa1
EBUILD cups-1.4.8-r1.ebuild 7244 RMD160 a1c15926b837ec497fe496a7f0f9051a0de8d923 SHA1 4068757755bb1b9d7e5a7057e041238232d458c7 SHA256 36ab04f13134fdc205b2ca137473e9489fd4dfd1cd0046362d94fbeecffa920a
EBUILD cups-1.4.8-r23.ebuild 8854 RMD160 b84a4dbe91f91f012f457d2436e44a69c1f78727 SHA1 7bf8931ed2731b5600aeb70f78dd06dbdace0dbc SHA256 901288e3a86de7a3f2d797c63e20086da01c01141f63ac4b531281c3273ee587
-EBUILD cups-1.5.2-r4.ebuild 8344 RMD160 60814d5fb3858901eceac9c442d311359c449ea2 SHA1 fb85ec0754b89658f66b237adbfd667962e9a76e SHA256 ddd4bcec8c23335b3a7564a6ec9f7f5c362158442e1eb93478245b393136b478
-EBUILD cups-1.5.3.ebuild 8596 RMD160 98939b415944072f86562069f3ecc5d9acb9470c SHA1 8a12ceeb06610de6a6e459bf32340feba869c44d SHA256 50408ec87aaef12811fc5ee1a35cf50cb84a02359c8241d73e68506e876e4729
+EBUILD cups-1.5.2-r4.ebuild 8369 RMD160 94548adca32b3ccd7a04caf311c7ca77e3568f6f SHA1 f95bc936a2d3b2cbfb5013ec93d887412f34fdc5 SHA256 0af78b81278ce634e2a047daed79d24927ae2ad734c3531ac8ecbec21a942146
+EBUILD cups-1.5.3.ebuild 8623 RMD160 26d339488b721b19942b28af8e06b6222080fcbb SHA1 87e034b0a0b393f0d3f922d4eae3e81a1eefab7d SHA256 19530ffd65623a37c76a692c4d517c6dab164707f6d560ab9adad038ab9de234
EBUILD cups-1.6_beta1-r1.ebuild 7855 RMD160 e3661bb285af26a51a2264975d17d10616aa80c0 SHA1 ec466c64a2a10cf0625a486c18229a0315f6dd61 SHA256 350688fdd7007a0e2b223fbc5e981fe370ef2596eeff6805d948a8656e8d7cdb
EBUILD cups-9999.ebuild 7930 RMD160 d435e9842ebafafda7877b3ef26b12f8504601b0 SHA1 d488a8a57bc7b27e88ef562b7028c6c600df3f29 SHA256 ef88b5053148b4c18ba5c3b67d0aa742f43301fd932a55e8430d4d521eeda5fd
-MISC ChangeLog 74972 RMD160 4df3609d797d43806858bda787ca4561e811f3df SHA1 726ce7cd05c255b9c6d5ae77b1607b8e7dc885f4 SHA256 0078288a935e8b752cfc36702778ffaf2d4215521793a6a4f1d2053854cc425f
+MISC ChangeLog 75113 RMD160 ca92f89d1f7dc4d24fc9f6cd1a1187a1c2522e77 SHA1 a7f55f5504280ce0bd56f7b74bcddb8f379688a0 SHA256 aa951fed1d5870e6a0466e2f74ba67b8bac9cc2d6de42a820fbf961b8d0d3714
MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
diff --git a/net-print/cups/cups-1.5.2-r4.ebuild b/net-print/cups/cups-1.5.2-r4.ebuild
index 917aa42..020bcee 100644
--- a/net-print/cups/cups-1.5.2-r4.ebuild
+++ b/net-print/cups/cups-1.5.2-r4.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.14 2012/06/26 20:17:34 dilfridge Exp $
EAPI="4-slot-abi"
PYTHON_DEPEND="python? 2:2.5"
+GENTOO_DEPEND_ON_PERL=no
inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
@@ -44,7 +45,7 @@ RDEPEND="
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap[ssl?,gnutls?] )
pam? ( virtual/pam )
- perl? ( dev-lang/perl:= )
+ perl? ( dev-lang/perl )
png? ( >=media-libs/libpng-1.4.3:0 )
slp? ( >=net-libs/openslp-1.0.4 )
ssl? (
diff --git a/net-print/cups/cups-1.5.3.ebuild b/net-print/cups/cups-1.5.3.ebuild
index b174331..e1182db 100644
--- a/net-print/cups/cups-1.5.3.ebuild
+++ b/net-print/cups/cups-1.5.3.ebuild
@@ -1,10 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.3.ebuild,v 1.4 2012/06/14 12:03:45 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.3.ebuild,v 1.5 2012/06/26 20:17:34 dilfridge Exp $
EAPI="4-slot-abi"
PYTHON_DEPEND="python? 2:2.5"
+GENTOO_DEPEND_ON_PERL=no
inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 systemd
@@ -50,7 +51,7 @@ RDEPEND="
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap[ssl?,gnutls?] )
pam? ( virtual/pam )
- perl? ( dev-lang/perl:= )
+ perl? ( dev-lang/perl )
png? ( >=media-libs/libpng-1.4.3:0 )
slp? ( >=net-libs/openslp-1.0.4 )
ssl? (
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-27 22:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-27 22:19 [gentoo-commits] dev/axs:master commit in: dev-perl/PadWalker/, net-print/cups/, dev-vcs/git/, dev-perl/Moo/, Ian Stakenvicius
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox