diff options
Diffstat (limited to 'dev-vcs/git')
| -rw-r--r-- | dev-vcs/git/ChangeLog | 12 | ||||
| -rw-r--r-- | dev-vcs/git/Manifest | 34 | ||||
| -rw-r--r-- | dev-vcs/git/files/git-1.6.4.5-gitweb-cve-2010-3906.patch | 156 | ||||
| -rw-r--r-- | dev-vcs/git/files/git-1.7.0-always-install-js.patch | 36 | ||||
| -rw-r--r-- | dev-vcs/git/files/git-1.7.1-always-install-js.patch | 38 | ||||
| -rw-r--r-- | dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch | 43 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.6.4.4-r1.ebuild | 380 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.6.4.4.ebuild | 377 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.2.2.ebuild | 466 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.2.3.ebuild | 466 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.2.4-r1.ebuild | 469 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.2.4.ebuild | 466 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.3.2-r1.ebuild | 464 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.3.2.ebuild | 458 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.3.3.ebuild | 464 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.3.4.ebuild | 464 |
16 files changed, 12 insertions, 4781 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index e67e908f6143..a4107ef699a5 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.86 2011/02/12 22:52:49 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.87 2011/02/12 23:26:10 robbat2 Exp $ + + 12 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> -git-1.6.4.4.ebuild, + -git-1.6.4.4-r1.ebuild, -files/git-1.6.4.5-gitweb-cve-2010-3906.patch, + -files/git-1.7.0-always-install-js.patch, + -files/git-1.7.1-always-install-js.patch, + -files/git-1.7.1-noiconv-segfault-fix.patch, -git-1.7.2.2.ebuild, + -git-1.7.2.3.ebuild, -git-1.7.2.4.ebuild, -git-1.7.2.4-r1.ebuild, + -git-1.7.3.2.ebuild, -git-1.7.3.2-r1.ebuild, -git-1.7.3.3.ebuild, + -git-1.7.3.4.ebuild: + Cleanup old files. *git-1.7.4.1 (12 Feb 2011) diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 2295018f3018..8c01982a2a63 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,10 +1,6 @@ AUX 50git-gentoo.el 472 RMD160 3d9c7dcb70d781dd7f12e4a19e838996681ec0d4 SHA1 fc47553c2422af82bbd2588e9853cc0c9cb437c7 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2 -AUX git-1.6.4.5-gitweb-cve-2010-3906.patch 6121 RMD160 c0f349228f0c1a2efa5684b9d8463c7d1e4ca03e SHA1 3e306dc154e16cd42619e9f06e4335c38a2bf630 SHA256 7d1f7894393cf22686fd0582b22dcfe91c4d4d7f8c4fc7ee8b439f49751c41e4 AUX git-1.6.6.1-interix6.patch 457 RMD160 27bdfe9ab248791f628420cc45751fae2643b3d5 SHA1 6c80a5cb63cbcf89b61b8f5e2c16736cb0be09bc SHA256 a8b788b8ef41ce7fd1018f13795694a908fbb1884de195c89a58fe87f3968849 -AUX git-1.7.0-always-install-js.patch 1304 RMD160 e4d110d7bd86a50f928cdf5fa1e3513aebbb0dab SHA1 9324fe19cb85709b2a198ba853866a99d6088f64 SHA256 5cb12dd43e114d07ea4ab6cd04f386cdc0c6e9a998529943be2da3308e1d1509 -AUX git-1.7.1-always-install-js.patch 1255 RMD160 524f32437f042a7faecc58b48c19b18e40d6d66f SHA1 0705dc05aa5595950c51f5cb3ef575023c2eacd0 SHA256 698edf9471d877ffc5441b26bf77f75f672fbcaa89a75258c48cd8a8fd8b1ac9 AUX git-1.7.1-interix.patch 2192 RMD160 725c43e056bbaa82e4af1f2aef9dd152214f9d65 SHA1 de6062aaa8bd177c77c124696d4253c299bba1fb SHA256 b560fcc41ea93df429290ec645f3e37368ceec1101f7124574fa6d9bab00a495 -AUX git-1.7.1-noiconv-segfault-fix.patch 1786 RMD160 592f84005bccdfbc020ad79d66c8b17d401e1c51 SHA1 17108275dff771dc919a273540774749f3623875 SHA256 6f50165264078da499329be3b74176aacae85fc48934576ecd37f0fc2de4c2b4 AUX git-1.7.2-always-install-js.patch 1167 RMD160 36cae52a1dbcb2450a521b60ce66dbd48e58b3a9 SHA1 45f652281e36627f80b2d559a6861e784b8afa75 SHA256 2988513c5a81f446818b850414b4bf7dc8a3177eb1dc32f29e530a80479baa9e AUX git-1.7.3.2-interix.patch 2283 RMD160 2c448d5a8bfb9696cbc55a52328e04617de9fcf1 SHA1 b35a35d6b6729c3868482c689a7c629b35c7e414 SHA256 13dc741c481fcba6db060bbc8b54d0e19350c9c2270e113afe5ac3962d78e8b6 AUX git-1.7.3.4-avoid-shell-issues.patch 1165 RMD160 674c080efe0e9b99fecf4bf19106c15fc0d3510a SHA1 bc4bfab9c0520139a107d0a634c48ce7fa28adf9 SHA256 7dd0eef0b93ed52e1c744d2d1888387c0aafecbdaf2d889c8ad48f45ed68d5d5 @@ -13,14 +9,8 @@ AUX git-1.7.3.5-optional-cvs.patch 11606 RMD160 d84780628a71a44eac6150e9c7acafc9 AUX git-daemon.confd 700 RMD160 2dea5af0c6b3aa5304aa5417bb40099bd4cdb45b SHA1 0b7c3078c4d284eb2572a5fb7c1efff5a4837f6e SHA256 9ca387e81ca875d4e543fa64398620451ff74273fa06b122a6af47db1fee1630 AUX git-daemon.initd 738 RMD160 23de3f02cd33251ce0f66c1b6e1d6a20ee45ee5b SHA1 b6f8e80130ddddf8cbd70a553b31706d570f7d5a SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 88d6fc44644c88ed6f2ce54a936f41dc15d2268e SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 -DIST git-1.6.4.4.tar.bz2 2174826 RMD160 8bad28bf8aedc6d5a9dcae39736c1ceeabbbe992 SHA1 da66a6323cc0842b19e3dbc5bb8ee5a59975037f SHA256 fc7e4d6c4172c62c93d5e974019f7193b03c8bc0a1c6f3a9fcc1d0928b808d7a DIST git-1.6.4.5.tar.bz2 2176867 RMD160 def8d5219e579741551ba8678f726bb9e24c2bc2 SHA1 f385b7e1669032edcd9e635c71aefd7b15f6fd4f SHA256 5e570a62d443a32ef013561817b87b4e8968407e95905716efdff8866a1ba445 -DIST git-1.7.2.2.tar.bz2 2564964 RMD160 efee981b6fe75b8073489537e0cf71aad7586f91 SHA1 0cc1caba421a2af5f8e3b9648a6230ea07c60bee SHA256 9ea4936f04f56426e8b643d22caeb9e1d1e5a5b28111fcd3839b6735b3610a66 -DIST git-1.7.2.3.tar.bz2 2567979 RMD160 5c1bd58a62d3a29bb8e9a2733c8c2b98a950a225 SHA1 d9fe7bab2f40731d94002c614304b1c3fea23bb9 SHA256 6139ec31d0a79cae04f469e73cc1f912162bb8f84ef7621ecc8630989fc81ba1 -DIST git-1.7.2.4.tar.bz2 2561291 RMD160 9b81fd68fdeec287d44151f88e831f8f1ece22e6 SHA1 96fd790dc7fd83efc85fae6edd6ab4f25d10da13 SHA256 8e145fb4999e849c7a26b141f554b776afbdd77f0a9d777e3fda9d227e291f13 DIST git-1.7.2.5.tar.bz2 2561345 RMD160 d69abab041064265e41780447d804717f229fc85 SHA1 912c812e98f2985c7152ffb3311572d5f12f2855 SHA256 d84e6d76fe9d30af5515ea8177b0d8bfe774ee0836d21ed450cb4d52f5aa6311 -DIST git-1.7.3.2.tar.bz2 2630629 RMD160 b645fc9e82eff3e186398280bc0a4ad72089b457 SHA1 cd8d806752aa6f5716cf193585024a002e098bf4 SHA256 bc4cf6bc7c116056050ef43b051691828d7101327b23311d424b02eaee553e71 -DIST git-1.7.3.3.tar.bz2 2633840 RMD160 ca39f8988c0eff1b63f81ef405ae75cbc0be6540 SHA1 8d8f6bbfa176ff9dc9c646a5341e58b35c09ae02 SHA256 c707c14ed5d2fc9dd9166fead73ca213d88f3264086a5892ca2139e7d9d437a0 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.1.tar.bz2 2703860 RMD160 13ef7b6d1e8b596f97a1920e012a00f6cc8cdf6c SHA1 fff10cb498b17decc146c8f18b0b02136d5e9b88 SHA256 85c5afc1c8f96abcd8d1adfde6f813023bef5cec1dc0990fc3b159945b60cd1b @@ -28,14 +18,8 @@ DIST git-1.7.4.rc1.tar.bz2 2709984 RMD160 3e96a650d63c27bae10b14911de7035fe72f44 DIST git-1.7.4.rc2.tar.bz2 2712364 RMD160 1107e4ea6bf4758b65341f9421cb3afd652b65c7 SHA1 4b0f6e7c78b3b486fc4532a937a5e08cbc3f7a72 SHA256 d4c875b4c5d6a2ab51fbd5af87e3fc0bfb743607434282d40664f566b3be6352 DIST git-1.7.4.rc3.tar.bz2 2703193 RMD160 b199537aea83324f11e9ccfcb34eaaf82b29c0d9 SHA1 f6236da4b4e47cad68ec8f731a070f1ee3b15533 SHA256 fbc9c6ce117253be64144edcb20caf31fe5f13307e0fefeadf9e224e0b2a5512 DIST git-1.7.4.tar.bz2 2703735 RMD160 a064d7a5b2d3fae6171ca91a03082eb46d7bb9b7 SHA1 57b783627d9a9515ce3ef8f79128074de6197b2e SHA256 8e260b9e5dfb46a35f26e3db450c2dabb4d1df254bfb2820779945a1ecbcef51 -DIST git-htmldocs-1.6.4.4.tar.bz2 756995 RMD160 a6d376213cfd442c046e8cce22c496e18c267ce9 SHA1 63a4e5d23f58bb76bba4630d176eca827f5273c0 SHA256 9adedf1d90fd2d9485a00d75c8c63bd6174c54faf1b99cedc5d8230a8f73d8c2 DIST git-htmldocs-1.6.4.5.tar.bz2 772113 RMD160 64b3f689385334d9b101b4bb8647f0fed14bd1fc SHA1 4ac2ede0a3ed82dea9107ff5e4a4948b60282f49 SHA256 12c13ead869918d8470d68c7331675c56a192eae819c283a398aaf9f0f7555d2 -DIST git-htmldocs-1.7.2.2.tar.bz2 897657 RMD160 5318d7276a71c173fb16a1e7f503bf868e529654 SHA1 4b720a1b4614c2be5b969f728e5f3d5127a58e92 SHA256 564218c2b5b9dfd61ef974f2386c13555f01c9cab567f8d164327a5fdba54e3d -DIST git-htmldocs-1.7.2.3.tar.bz2 899056 RMD160 64ac98bf670efa13ee007d5d15ec7a6c1754b567 SHA1 bd99507c2a3286b409df3ef5987472732fe8283b SHA256 ee460ef1e58d103fe3af3812adab628d7fc8fa91c1a3128bc8bf0b334126832f -DIST git-htmldocs-1.7.2.4.tar.bz2 919909 RMD160 3053f778557a61d144ef3d9813752dbcc863f7df SHA1 1ffecbd3d04d39f8a00f81724cdb548c1b18d445 SHA256 110d3b841de2c92516dda0f0ea75b957dd4d45b451949bd8239490471cc462b2 DIST git-htmldocs-1.7.2.5.tar.bz2 919247 RMD160 8ff6503efdb3cfaa639d2acbfaf76dad274aeb8f SHA1 b99f4e9eb620918b68fd98a4a0f0686832799477 SHA256 6b6291ffad4eae80d2739acdffffdd6293b9e50366cfa53ffb0c3a1427700337 -DIST git-htmldocs-1.7.3.2.tar.bz2 910291 RMD160 3a30ca0bdda0a2db9d99ad23857e55b376ee1ec5 SHA1 4be705c67a4c7954591c642437c2733b902b080d SHA256 7de0674b93c6f2159b9adbec31b48747328cb2c7508a66bd7ba0ff037b407187 -DIST git-htmldocs-1.7.3.3.tar.bz2 929146 RMD160 fc39efc86b35bda0f6034cafe19a8ff58b464cc3 SHA1 50ef88b8f0d502abb87a1b8c24a4ac7dbeb460c9 SHA256 fce0a93922f87f9890f5dad19d49616d18bc119c9aae22067ce3c2a3be0be787 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.1.tar.bz2 940833 RMD160 ccaf6812b959b0456c8a0d2f0977150acb37881f SHA1 84f439108670c15a8fa508a9e26682fe2f5586d1 SHA256 bcb9b4b06d4f5bd6e23689bb4ea82aca555f187804b9005e753ba0969874b4e8 @@ -43,14 +27,8 @@ DIST git-htmldocs-1.7.4.rc1.tar.bz2 939784 RMD160 53fd0f236bd2dc36d76b517dc16f32 DIST git-htmldocs-1.7.4.rc2.tar.bz2 940967 RMD160 730acc3fc31c90b8998a5b96a2f869a20d1da638 SHA1 f0a97081313f9565ba1422ef56dcda63af91fb62 SHA256 e7f1d6cc06dd69f0968dcd27188d9c72532763b3aff86da9c7b229fa7d7359bd DIST git-htmldocs-1.7.4.rc3.tar.bz2 940770 RMD160 ef1adcf8e1f80aa8d19c12b57d757ea9a3f11736 SHA1 69df3e8b1197e4ad9cddfb9bd91c4f4e55a2d6ea SHA256 2e5c334c823278d460ed46fac1c6b361ecaf15011512fb30d4cb9b438107a124 DIST git-htmldocs-1.7.4.tar.bz2 940665 RMD160 19a20260259fca5d7898e7661ae2ce9af726e7a1 SHA1 e6d2b4f0cb2d43d9290793365f95def7038730b3 SHA256 8f2d9dea509b41149a888b2e524089008cc59d21dbef2d53e8016aa432db2b99 -DIST git-manpages-1.6.4.4.tar.bz2 248348 RMD160 fd1a267973373bc625336abe2b50545e12cc6fa4 SHA1 39b76f19751995ba3f093cac0b47900e22a5dbd2 SHA256 a2b2fb1aabdbb3e1e8ae9472523b9fef23c3e8a992bb8f68f17ad832a6e59c98 DIST git-manpages-1.6.4.5.tar.bz2 254368 RMD160 7731d81631ec2c8c33ddc028667eaad79926754b SHA1 905d5e66db1b22b48c1b001d1f5dec830a75dde1 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0bdae702b1fe58ad8ebab32a0bb7ba447 -DIST git-manpages-1.7.2.2.tar.bz2 287738 RMD160 bd2feb1f74530d44cba834a52adde10b773d8744 SHA1 0b63f30cfb6073746b298aa5584eb8321bcd66a9 SHA256 98fbdfcb884b3c0ea0e444417724cdd2baf49b70a400a3037dc87120d76ae8d9 -DIST git-manpages-1.7.2.3.tar.bz2 288264 RMD160 aea1a16ffa9fc2b91c7f6806cf848573f89825c2 SHA1 bed8aa072dabc51f6fa9dfbc363c023235a63200 SHA256 87e00245e10472ee5acdd75bb5a6e2e89c12638b498e0df9edca6201439d47d7 -DIST git-manpages-1.7.2.4.tar.bz2 289297 RMD160 1d968ec0db064c519ea80f77f8a2efb8ae57f387 SHA1 8321e6caa16cf2f500a837fc041656372f8b69d5 SHA256 952e65cb8abb36ceaf7c9a49d8117e4db76158e2022bd0bf5e84c37dde404e19 DIST git-manpages-1.7.2.5.tar.bz2 289543 RMD160 b921fa2b5ec47e091987d1122b1c189b4bd87f3b SHA1 735ee1f23428404bdb99d9b0bd1cbb79c9e7afce SHA256 a42a977a1ecfd3cea62e1f02fc89f57029a94f163ff7205f6a56ab4b67d6bd6e -DIST git-manpages-1.7.3.2.tar.bz2 291349 RMD160 2a3e82a28bc955ffadfa91c5459f992ed17fa9f2 SHA1 0be6fabbca523085e185711f2b80c99330f1e4ac SHA256 ce6ca1cb1c62b7dd8d258cf9a94cda7de90a9476b7bb315968f3ed1976dc621e -DIST git-manpages-1.7.3.3.tar.bz2 294384 RMD160 402ce22ba5c3b13e1562feb5f94f4dd0cca7753f SHA1 52dbc6093bce00e659c92c0a52a4770fc3fd5ee8 SHA256 c01796a53d0f4c03cd77fb1a39517e664fca2ca7f77512963fd8c9cc95dd2b41 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.1.tar.bz2 300082 RMD160 40260f59c319af521d9a215d053f7e65ce80afec SHA1 c8bf13d5bcdc3908e2e3edfa8edffd42a314e3a0 SHA256 84252b3d26fd4e3d1a5b5159fdc1bfe9d41a48856596d3b375e428a7508e228b @@ -58,19 +36,9 @@ DIST git-manpages-1.7.4.rc1.tar.bz2 299662 RMD160 0396ae70c45d4e21dcdbaf5dbbe53c DIST git-manpages-1.7.4.rc2.tar.bz2 299804 RMD160 9a31ae5c15865e02ff4bd39be4644abed0fdd30a SHA1 0b8f97f9a5872880a66977044be5ec6de324663b SHA256 247a7cd2eb407001cd4450eb221fee4b52a6bca321cd8979c48a80fdb4092f95 DIST git-manpages-1.7.4.rc3.tar.bz2 300028 RMD160 cc25480fe46db1db521620e1bd0453602662f4ed SHA1 f8da22f2777ac78c7f79596a841f63fa9b07f3f3 SHA256 6ea0204db0117a0aba4e8d4d918430c918004ddec141fa3076fc2cb6baffd4d0 DIST git-manpages-1.7.4.tar.bz2 300025 RMD160 ea82117f6150cead06373667054acabbfa9f4c0d SHA1 1bad24d225d39266b2b697bc68a4f02ff6677d41 SHA256 883781c0513dde0af30e32d319b34035fbf8e766eb39fbe9f715794c1049865a -EBUILD git-1.6.4.4-r1.ebuild 10440 RMD160 e0208a0a7c177da950e31cfd8f219c677fe9d458 SHA1 c26fb4ecb219758cdfbf6f99e64cae96befe1f3e SHA256 864267fc81641adf198c21ea54a82ce745dee6047ceafe39d66714d00e800521 -EBUILD git-1.6.4.4.ebuild 10332 RMD160 e8872b64fb9852a20c54a84819875f20a4380099 SHA1 1166b73f011b63e7bbdff0b1866955b5fc0fe87a SHA256 33c1df7a6054c96e91bb08506a25e5e71401694e58e62d580c59ae58ffbeacb6 EBUILD git-1.6.4.5.ebuild 10448 RMD160 2a8386e68ef7b9ef5b55387507a8f061d099d382 SHA1 05bcdbfaf23c21c11055e239e63006a1c8808439 SHA256 1746c657f152e67f97a42f1461a13274df75a4cc75ec783083e833f9055721b4 -EBUILD git-1.7.2.2.ebuild 13574 RMD160 67051f98abf800d02f853aeb98db61c3cbf44114 SHA1 2f9e5d7d55b46c67e20480185a121ca45b204401 SHA256 2e3d9a0497dc1dd2540fd744fb5d0e8244ba5a76a1eea642b884e15417577d00 -EBUILD git-1.7.2.3.ebuild 13584 RMD160 61ad28fef1eaea0185f92b35bf87d80fa2cfc9e3 SHA1 52388fea6b8b63713faf366957ae3c7755a537f1 SHA256 44a091629a33ce38c486fd459aa551fecaab49526e64ea225fdf18503b131016 -EBUILD git-1.7.2.4-r1.ebuild 13681 RMD160 fd98454c9b8a44322691d320c006c52e7a224778 SHA1 e3ea03bd24b78b65f74a36c00a7771b5db820fc3 SHA256 7242e4289d83792d08276449c838332248d31eb9d85023d21a7fcf762505a95e -EBUILD git-1.7.2.4.ebuild 13584 RMD160 6ee33b2f5f7a347a32ac6f6b1e9fca887f5b83ca SHA1 62086ffb6d0ee6b4c74b054f8a738dd60e2ee674 SHA256 a1bdca30d9d93835d9085937d7148b202523f599951e88a5416f0671dad39589 EBUILD git-1.7.2.5.ebuild 13794 RMD160 891221d4bf0bb71888f8b44806811e5231f21635 SHA1 25f5e5c009ba374eff4b5a29b5044c8fd97fc848 SHA256 fc4caa6e4879f3111de8ca9bd187866d7f02769201aefe894b0b477d4c2aefd3 -EBUILD git-1.7.3.2-r1.ebuild 13535 RMD160 a583cd8ebf1336ec4d5b21537af76f0a700fced4 SHA1 9b7889f4e1d29064e3216f6ccfc0c7526a9e67f0 SHA256 41768438269f77dc7eccf9d57dbcd50f92ef2abe1f0be51caeeb4e408cc718a9 -EBUILD git-1.7.3.2.ebuild 13259 RMD160 d9dfaf93219b9d01fba25aac9d954b846f21e0ed SHA1 696421578fd5cdaeb51902556fc16db4395da14b SHA256 0c9c1cf290fabfcd65a9528aba50f38a0789c97977aaae8b5cfa7b6caf809123 -EBUILD git-1.7.3.3.ebuild 13532 RMD160 6a01b8f3f230121e511aaf3acd3530de855a48bb SHA1 cda24e434870be8d4d3bb2fee884cfd2159b5469 SHA256 1dcf2d0df9ddf7bd0e5cf45b4cc6e7d898014e47ef49a8e06d7caaab090cab7e EBUILD git-1.7.3.4-r1.ebuild 14302 RMD160 32d2ff42168a1eb1a9a752dcfa48131abdc4f71d SHA1 e6059435d7908faa113a170b69a535c8f279d0bb SHA256 2a766355f14939b9af9fd651bd3cb692009c6211e0872f330c2364a53f3bc4a6 -EBUILD git-1.7.3.4.ebuild 13532 RMD160 b379ddde309f7100100918e35ba2c3d01ca6ee91 SHA1 07e6b99f28385aba1af0fed2fc8b9f520431995a SHA256 db389597432ac36a5b7040df99cc3db11e1c3d267e4c2e7e8da0c9658105fdd6 EBUILD git-1.7.3.5-r1.ebuild 14534 RMD160 830e9397783317f88a6d53a8f178e8bebf9ead31 SHA1 a78dd360518b95a43a9d43a12ccf1b068f66851f SHA256 09bd4d06eca685dfa2378e25f84264bf19f655e6c7881b7260bb8dff42fc3074 EBUILD git-1.7.3.5-r2.ebuild 14838 RMD160 aa479228d40704cb6ceceea34214afbaeb1c03f9 SHA1 dd491e7175deefe880faf72304f3ae80ba35494d SHA256 83c92827534191a45dbbbe638ae89dffda191e0e6835e51063504ef83f233306 EBUILD git-1.7.3.5.ebuild 14182 RMD160 8dcb114ed8fb7c69cab8fb6263017f1ee46beedd SHA1 9fc7f6836d795377040addf54d2a00135d9d1417 SHA256 fd834346ba9cd9def74cc77376143601610915bb82c686621bbba28b9e5867b7 @@ -82,5 +50,5 @@ EBUILD git-1.7.4_rc1.ebuild 14204 RMD160 90440a8dcb3c67814a58a150c05bfe28dc0aa2e EBUILD git-1.7.4_rc2.ebuild 14948 RMD160 276d22f35aa33ad56f932b6e757d44d2d208acd7 SHA1 90289b8924de95f7ff2b2c59685b58f22f7faaea SHA256 3c98576973b1efd1e607b8e2d9feba7eab5301cd82c95b1598c48f97e23a2302 EBUILD git-1.7.4_rc3.ebuild 14948 RMD160 e42bbf1d936490cd23f6b893b5de91cff1fa43e0 SHA1 e802bdb7d7cb00cbfeb35ab93f07f6ba692ffe56 SHA256 61c0e38cc7bc981a394d9aa7303e28863a6605720a9eb1e2e67896ed9dc81493 EBUILD git-9999.ebuild 14944 RMD160 854023542ad8c4726316db36b88a4409fb70b967 SHA1 84520807e5e20f75e4c0170c3de9d8ef063701e8 SHA256 22f0ccf1b2f5869a7ba9c94379ebfb713d2f00b05a97216fb74344f6b45b2df2 -MISC ChangeLog 79010 RMD160 e4a8862f72edd7de2164e8233eb82cc1e46554f8 SHA1 9b7befc21a78e496a760a84308fb853500720861 SHA256 9fc2b4d3430a94166ce41a79ab7ee54da827733586e7ee093369c124dc98f0fd +MISC ChangeLog 79494 RMD160 7513536c1407961cc25fe77937da88a78dde85b4 SHA1 c7dabab3f085352320538eb6a9de26532f930efc SHA256 68b23675e40afa80725e5adc7f9ecb4606223a6543bff04eab66be979c4a615c MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b diff --git a/dev-vcs/git/files/git-1.6.4.5-gitweb-cve-2010-3906.patch b/dev-vcs/git/files/git-1.6.4.5-gitweb-cve-2010-3906.patch deleted file mode 100644 index faf7558c5e63..000000000000 --- a/dev-vcs/git/files/git-1.6.4.5-gitweb-cve-2010-3906.patch +++ /dev/null @@ -1,156 +0,0 @@ -From: Jakub Narebski <jnareb@gmail.com> -Date: Tue, 14 Dec 2010 23:34:01 +0000 (+0100) -Subject: gitweb: Introduce esc_attr to escape attributes of HTML elements -X-Git-Tag: v1.6.4.5~1 -X-Git-Url: http://git.kernel.org/?p=git%2Fgit.git;a=commitdiff_plain;h=3017ed62f47ce14a959e2d315c434d4980cf4243 - -gitweb: Introduce esc_attr to escape attributes of HTML elements - -It is needed only to escape attributes of handcrafted HTML elements, -and not those generated using CGI.pm subroutines / methods for HTML -generation. - -While at it, add esc_url and esc_html where needed, and prefer to use -CGI.pm HTML generating methods than handcrafted HTML code. Most of -those are probably unnecessary (could be exploited only by person with -write access to gitweb config, or at least access to the repository). - -This fixes CVE-2010-3906 - -Reported-by: Emanuele Gentili <e.gentili@tigersecurity.it> -Helped-by: John 'Warthog9' Hawley <warthog9@kernel.org> -Helped-by: Jonathan Nieder <jrnieder@gmail.com> -Signed-off-by: Jakub Narebski <jnareb@gmail.com> -Signed-off-by: Junio C Hamano <gitster@pobox.com> ---- - -diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl -index 2cb8327..c3a04b1 100755 ---- a/gitweb/gitweb.perl -+++ b/gitweb/gitweb.perl -@@ -1084,6 +1084,13 @@ sub esc_url { - return $str; - } - -+# quote unsafe characters in HTML attributes -+sub esc_attr { -+ -+ # for XHTML conformance escaping '"' to '"' is not enough -+ return esc_html(@_); -+} -+ - # replace invalid utf8 character with SUBSTITUTION sequence - sub esc_html { - my $str = shift; -@@ -1489,7 +1496,7 @@ sub format_ref_marker { - hash=>$dest - )}, $name); - -- $markers .= " <span class=\"$class\" title=\"$ref\">" . -+ $markers .= " <span class=\"".esc_attr($class)."\" title=\"".esc_attr($ref)."\">" . - $link . "</span>"; - } - } -@@ -1573,7 +1580,7 @@ sub git_get_avatar { - return $pre_white . - "<img width=\"$size\" " . - "class=\"avatar\" " . -- "src=\"$url\" " . -+ "src=\"".esc_url($url)."\" " . - "alt=\"\" " . - "/>" . $post_white; - } else { -@@ -2245,7 +2252,7 @@ sub git_show_project_tagcloud { - } else { - my @tags = sort { $cloud->{$a}->{count} <=> $cloud->{$b}->{count} } keys %$cloud; - return '<p align="center">' . join (', ', map { -- "<a href=\"$home_link?by_tag=$_\">$cloud->{$_}->{topname}</a>" -+ $cgi->a({-href=>"$home_link?by_tag=$_"}, $cloud->{$_}->{topname}) - } splice(@tags, 0, $count)) . '</p>'; - } - } -@@ -3061,11 +3068,11 @@ EOF - # print out each stylesheet that exist, providing backwards capability - # for those people who defined $stylesheet in a config file - if (defined $stylesheet) { -- print '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'"/>'."\n"; -+ print '<link rel="stylesheet" type="text/css" href="'.esc_url($stylesheet).'"/>'."\n"; - } else { - foreach my $stylesheet (@stylesheets) { - next unless $stylesheet; -- print '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'"/>'."\n"; -+ print '<link rel="stylesheet" type="text/css" href="'.esc_url($stylesheet).'"/>'."\n"; - } - } - if (defined $project) { -@@ -3078,7 +3085,7 @@ EOF - my $type = lc($format); - my %link_attr = ( - '-rel' => 'alternate', -- '-title' => "$project - $href_params{'-title'} - $format feed", -+ '-title' => esc_attr("$project - $href_params{'-title'} - $format feed"), - '-type' => "application/$type+xml" - ); - -@@ -3105,13 +3112,13 @@ EOF - } else { - printf('<link rel="alternate" title="%s projects list" '. - 'href="%s" type="text/plain; charset=utf-8" />'."\n", -- $site_name, href(project=>undef, action=>"project_index")); -+ esc_attr($site_name), href(project=>undef, action=>"project_index")); - printf('<link rel="alternate" title="%s projects feeds" '. - 'href="%s" type="text/x-opml" />'."\n", -- $site_name, href(project=>undef, action=>"opml")); -+ esc_attr($site_name), href(project=>undef, action=>"opml")); - } - if (defined $favicon) { -- print qq(<link rel="shortcut icon" href="$favicon" type="image/png" />\n); -+ print qq(<link rel="shortcut icon" href=").esc_url($favicon).qq(" type="image/png" />\n); - } - - print "</head>\n" . -@@ -3124,7 +3131,7 @@ EOF - print "<div class=\"page_header\">\n" . - $cgi->a({-href => esc_url($logo_url), - -title => $logo_label}, -- qq(<img src="$logo" width="72" height="27" alt="git" class="logo"/>)); -+ qq(<img src=").esc_url($logo).qq(" width="72" height="27" alt="git" class="logo"/>)); - print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / "; - if (defined $project) { - print $cgi->a({-href => href(action=>"summary")}, esc_html($project)); -@@ -5016,14 +5023,14 @@ sub git_blob { - } else { - print "<div class=\"page_nav\">\n" . - "<br/><br/></div>\n" . -- "<div class=\"title\">$hash</div>\n"; -+ "<div class=\"title\">".esc_html($hash)."</div>\n"; - } - git_print_page_path($file_name, "blob", $hash_base); - print "<div class=\"page_body\">\n"; - if ($mimetype =~ m!^image/!) { -- print qq!<img type="$mimetype"!; -+ print qq!<img type="!.esc_attr($mimetype).qq!"!; - if ($file_name) { -- print qq! alt="$file_name" title="$file_name"!; -+ print qq! alt="!.esc_attr($file_name).qq!" title="!.esc_attr($file_name).qq!"!; - } - print qq! src="! . - href(action=>"blob_plain", hash=>$hash, -@@ -5094,7 +5101,7 @@ sub git_tree { - undef $hash_base; - print "<div class=\"page_nav\">\n"; - print "<br/><br/></div>\n"; -- print "<div class=\"title\">$hash</div>\n"; -+ print "<div class=\"title\">".esc_html($hash)."</div>\n"; - } - if (defined $file_name) { - $basedir = $file_name; -@@ -5511,7 +5518,7 @@ sub git_blobdiff { - git_print_header_div('commit', esc_html($co{'title'}), $hash_base); - } else { - print "<div class=\"page_nav\"><br/>$formats_nav<br/></div>\n"; -- print "<div class=\"title\">$hash vs $hash_parent</div>\n"; -+ print "<div class=\"title\">".esc_html("$hash vs $hash_parent")."</div>\n"; - } - if (defined $file_name) { - git_print_page_path($file_name, "blob", $hash_base); diff --git a/dev-vcs/git/files/git-1.7.0-always-install-js.patch b/dev-vcs/git/files/git-1.7.0-always-install-js.patch deleted file mode 100644 index 56f455e47601..000000000000 --- a/dev-vcs/git/files/git-1.7.0-always-install-js.patch +++ /dev/null @@ -1,36 +0,0 @@ -JS install cleanup fixes - -- Always install the JS for GitWeb, even if it is not being minified. -- Also ensure the minified JS is built before instaweb as it is referenced in - the sed expression. - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> - -diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.0.orig/Makefile git-1.7.0/Makefile ---- git-1.7.0.orig/Makefile 2010-02-13 00:44:43.000000000 +0000 -+++ git-1.7.0/Makefile 2010-02-13 18:11:52.923807675 +0000 -@@ -1500,13 +1500,8 @@ - gitweb: - $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all - --ifdef JSMIN --OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/gitweb.min.js --gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/gitweb.min.js --else --OTHER_PROGRAMS += gitweb/gitweb.cgi --gitweb/gitweb.cgi: gitweb/gitweb.perl --endif -+OTHER_PROGRAMS += gitweb/gitweb.cgi gitweb/$(GITWEB_JS) -+gitweb/gitweb.cgi: gitweb/gitweb.perl gitweb/$(GITWEB_JS) - $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@) - - ifdef JSMIN -@@ -1515,7 +1510,7 @@ - endif # JSMIN - - --git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js -+git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/$(GITWEB_JS) - $(QUIET_GEN)$(RM) $@ $@+ && \ - sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ - -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ diff --git a/dev-vcs/git/files/git-1.7.1-always-install-js.patch b/dev-vcs/git/files/git-1.7.1-always-install-js.patch deleted file mode 100644 index 6205f93571a3..000000000000 --- a/dev-vcs/git/files/git-1.7.1-always-install-js.patch +++ /dev/null @@ -1,38 +0,0 @@ -JS install cleanup fixes - -- Also ensure the minified JS is built before instaweb as it is referenced in - the sed expression. - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> - -diff -Nuar git-1.7.1.orig/Makefile git-1.7.1/Makefile ---- git-1.7.1.orig/Makefile 2010-04-24 02:38:35.000000000 +0000 -+++ git-1.7.1/Makefile 2010-05-01 08:47:04.491916479 +0000 -@@ -1561,17 +1561,16 @@ - $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all - - ifdef JSMIN --GITWEB_PROGRAMS += gitweb/gitweb.min.js - GITWEB_JS = gitweb/gitweb.min.js - else - GITWEB_JS = gitweb/gitweb.js - endif - ifdef CSSMIN --GITWEB_PROGRAMS += gitweb/gitweb.min.css - GITWEB_CSS = gitweb/gitweb.min.css - else - GITWEB_CSS = gitweb/gitweb.css - endif -+GITWEB_PROGRAMS += $(GITWEB_JS) $(GITWEB_CSS) - OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS) - gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS) - $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@) -@@ -1586,7 +1585,7 @@ - endif # CSSMIN - - --git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js -+git-instaweb: git-instaweb.sh gitweb/gitweb.cgi $(GITWEB_CSS) $(GITWEB_JS) - $(QUIET_GEN)$(RM) $@ $@+ && \ - sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ - -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ diff --git a/dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch b/dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch deleted file mode 100644 index b338ee480903..000000000000 --- a/dev-vcs/git/files/git-1.7.1-noiconv-segfault-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 43acff34b902c38808ac0f326090f2516250e1f0 -Author: Jonathan Nieder <jrnieder@gmail.com> -Date: Sat May 8 18:17:29 2010 -0500 - - cherry-pick: do not dump core when iconv fails - - When cherry-picking, usually the new and old commit encodings are both - UTF-8. Most old iconv implementations do not support this trivial - conversion, so on old platforms, out->message remains NULL, and later - attempts to read it segfault. - - Fix this by noticing the input and output encodings match and skipping - the iconv step, like the other reencode_string() call sites already do. - Also stop segfaulting on other iconv failures: if iconv fails for some - other reason, the best we can do is to pass the old message through. - - This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert: - clarify label on conflict hunks, 2010-03-20). - - Reported-by: Andreas Krey <a.krey@gmx.de> - Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> - Signed-off-by: Junio C Hamano <gitster@pobox.com> - -diff --git a/builtin/revert.c b/builtin/revert.c -index 778a56e..7d68ef7 100644 ---- a/builtin/revert.c -+++ b/builtin/revert.c -@@ -109,8 +109,13 @@ static int get_message(const char *raw_message, struct commit_message *out) - encoding = "UTF-8"; - if (!git_commit_encoding) - git_commit_encoding = "UTF-8"; -- if ((out->reencoded_message = reencode_string(raw_message, -- git_commit_encoding, encoding))) -+ -+ out->reencoded_message = NULL; -+ out->message = raw_message; -+ if (strcmp(encoding, git_commit_encoding)) -+ out->reencoded_message = reencode_string(raw_message, -+ git_commit_encoding, encoding); -+ if (out->reencoded_message) - out->message = out->reencoded_message; - - abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV); diff --git a/dev-vcs/git/git-1.6.4.4-r1.ebuild b/dev-vcs/git/git-1.6.4.4-r1.ebuild deleted file mode 100644 index 65b0928a933f..000000000000 --- a/dev-vcs/git/git-1.6.4.4-r1.ebuild +++ /dev/null @@ -1,380 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.4-r1.ebuild,v 1.2 2010/12/20 07:49:24 robbat2 Exp $ - -EAPI=2 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl[-build] ) - 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] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -DEPEND="${CDEPEND}" - -# These are needed to build the docs -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/asciidoc - app-text/xmlto - app-text/docbook2X - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - 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 -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use mozsha1 ; then - myopts="${myopts} MOZILLA_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - use iconv \ - || myopts="${myopts} NO_ICONV=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_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 - - # CVE-2010-3906: XSS in gitweb - epatch "${FILESDIR}"/git-1.6.4.5-gitweb-cve-2010-3906.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - Makefile || die "sed failed" - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" -} - -git_emake() { - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - "$@" -} - -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 - - if [[ "$PV" == "9999" ]] && use doc; then - cd Documentation - git_emake man info html \ - || die "emake man html info failed" - 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 / - - dobashcompletion 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 "${D}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - dodir /usr/share/${PN}/gitweb - insinto /usr/share/${PN}/gitweb - doins "${S}"/gitweb/gitweb.cgi - doins "${S}"/gitweb/gitweb.css - doins "${S}"/gitweb/git-{favicon,logo}.png - - # Make sure it can run - fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${D}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - fi - if ! use subversion ; then - rm -f "${D}"/usr/libexec/git-core/git-svn \ - "${D}"/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" - - # 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 - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # Bug #288575 - t3700 is not suitable for root perm - # Bug #288575 - t7300 is not suitable for root perm - disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh - t3700-add.sh t7300-clean.sh" - 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 - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - 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 -} diff --git a/dev-vcs/git/git-1.6.4.4.ebuild b/dev-vcs/git/git-1.6.4.4.ebuild deleted file mode 100644 index 32720760af55..000000000000 --- a/dev-vcs/git/git-1.6.4.4.ebuild +++ /dev/null @@ -1,377 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.6.4.4.ebuild,v 1.6 2010/12/20 07:49:24 robbat2 Exp $ - -EAPI=2 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl[-build] ) - 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] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -DEPEND="${CDEPEND}" - -# These are needed to build the docs -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/asciidoc - app-text/xmlto - app-text/docbook2X - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - 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 -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use mozsha1 ; then - myopts="${myopts} MOZILLA_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - use iconv \ - || myopts="${myopts} NO_ICONV=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_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 - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - Makefile || die "sed failed" - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" -} - -git_emake() { - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - "$@" -} - -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 - - if [[ "$PV" == "9999" ]] && use doc; then - cd Documentation - git_emake man info html \ - || die "emake man html info failed" - 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 / - - dobashcompletion 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 "${D}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - dodir /usr/share/${PN}/gitweb - insinto /usr/share/${PN}/gitweb - doins "${S}"/gitweb/gitweb.cgi - doins "${S}"/gitweb/gitweb.css - doins "${S}"/gitweb/git-{favicon,logo}.png - - # Make sure it can run - fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${D}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - fi - if ! use subversion ; then - rm -f "${D}"/usr/libexec/git-core/git-svn \ - "${D}"/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" - - # 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 - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # Bug #288575 - t3700 is not suitable for root perm - # Bug #288575 - t7300 is not suitable for root perm - disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh - t3700-add.sh t7300-clean.sh" - 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 - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - 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 -} diff --git a/dev-vcs/git/git-1.7.2.2.ebuild b/dev-vcs/git/git-1.7.2.2.ebuild deleted file mode 100644 index 3339e4a093f3..000000000000 --- a/dev-vcs/git/git-1.7.2.2.ebuild +++ /dev/null @@ -1,466 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.2.ebuild,v 1.11 2010/12/20 07:49:24 robbat2 Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~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="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl 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] ) - 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 ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# 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 HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/xmlto - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - 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 -} - -# 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" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=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} == *-interix* ]] ; then - myopts="${myopts} NO_IPV6=YesPlease" - myopts="${myopts} NO_MEMMEM=YesPlease" - myopts="${myopts} NO_MKDTEMP=YesPlease" - myopts="${myopts} NO_STRTOUMAX=YesPlease" - myopts="${myopts} NO_STRTOULL=YesPlease" - myopts="${myopts} NO_INET_NTOP=YesPlease" - myopts="${myopts} NO_INET_PTON=YesPlease" - myopts="${myopts} NO_NSEC=YesPlease" - myopts="${myopts} NO_MKSTEMPS=YesPlease" - fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=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.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_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 - 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 - - 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 - epatch "${FILESDIR}"/git-1.7.1-interix.patch - epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch -} - -git_emake() { - 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 \ - "$@" -} - -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 - - dobashcompletion 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 gtk ; then - dobin "${S}"/contrib/gitview/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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - exeinto /usr/share/${PN}/gitweb - doexe "${S}"/gitweb/gitweb.cgi - insinto /usr/share/${PN}/gitweb/static - doins "${S}"/gitweb/static/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/static/${js} - doins "${S}"/gitweb/static/git-{favicon,logo}.png - - # 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 \{\} \; - 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 \ - 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 - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - 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 -} diff --git a/dev-vcs/git/git-1.7.2.3.ebuild b/dev-vcs/git/git-1.7.2.3.ebuild deleted file mode 100644 index 1a0707c9934a..000000000000 --- a/dev-vcs/git/git-1.7.2.3.ebuild +++ /dev/null @@ -1,466 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.3.ebuild,v 1.3 2010/12/20 07:49:24 robbat2 Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~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="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl 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] ) - 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 ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# 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 HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/xmlto - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - 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 -} - -# 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" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=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} == *-interix* ]] ; then - myopts="${myopts} NO_IPV6=YesPlease" - myopts="${myopts} NO_MEMMEM=YesPlease" - myopts="${myopts} NO_MKDTEMP=YesPlease" - myopts="${myopts} NO_STRTOUMAX=YesPlease" - myopts="${myopts} NO_STRTOULL=YesPlease" - myopts="${myopts} NO_INET_NTOP=YesPlease" - myopts="${myopts} NO_INET_PTON=YesPlease" - myopts="${myopts} NO_NSEC=YesPlease" - myopts="${myopts} NO_MKSTEMPS=YesPlease" - fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=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.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_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 - 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 - - 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 - epatch "${FILESDIR}"/git-1.7.1-interix.patch - epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch -} - -git_emake() { - 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 \ - "$@" -} - -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 - - dobashcompletion 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 gtk ; then - dobin "${S}"/contrib/gitview/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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - exeinto /usr/share/${PN}/gitweb - doexe "${S}"/gitweb/gitweb.cgi - insinto /usr/share/${PN}/gitweb/static - doins "${S}"/gitweb/static/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/static/${js} - doins "${S}"/gitweb/static/git-{favicon,logo}.png - - # 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 \{\} \; - 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 \ - 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 - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - 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 -} diff --git a/dev-vcs/git/git-1.7.2.4-r1.ebuild b/dev-vcs/git/git-1.7.2.4-r1.ebuild deleted file mode 100644 index 96b5bd67480b..000000000000 --- a/dev-vcs/git/git-1.7.2.4-r1.ebuild +++ /dev/null @@ -1,469 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.4-r1.ebuild,v 1.2 2010/12/20 07:49:25 robbat2 Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~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="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl 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] ) - 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 ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# 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 HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/xmlto - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - 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 -} - -# 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" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=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} == *-interix* ]] ; then - myopts="${myopts} NO_IPV6=YesPlease" - myopts="${myopts} NO_MEMMEM=YesPlease" - myopts="${myopts} NO_MKDTEMP=YesPlease" - myopts="${myopts} NO_STRTOUMAX=YesPlease" - myopts="${myopts} NO_STRTOULL=YesPlease" - myopts="${myopts} NO_INET_NTOP=YesPlease" - myopts="${myopts} NO_INET_PTON=YesPlease" - myopts="${myopts} NO_NSEC=YesPlease" - myopts="${myopts} NO_MKSTEMPS=YesPlease" - fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=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.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_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 - 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 - - # CVE-2010-3906: XSS in gitweb - epatch "${FILESDIR}"/git-1.6.4.5-gitweb-cve-2010-3906.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 - epatch "${FILESDIR}"/git-1.7.1-interix.patch - epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch -} - -git_emake() { - 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 \ - "$@" -} - -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 - - dobashcompletion 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 gtk ; then - dobin "${S}"/contrib/gitview/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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - exeinto /usr/share/${PN}/gitweb - doexe "${S}"/gitweb/gitweb.cgi - insinto /usr/share/${PN}/gitweb/static - doins "${S}"/gitweb/static/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/static/${js} - doins "${S}"/gitweb/static/git-{favicon,logo}.png - - # 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 \{\} \; - 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 \ - 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 - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - 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 -} diff --git a/dev-vcs/git/git-1.7.2.4.ebuild b/dev-vcs/git/git-1.7.2.4.ebuild deleted file mode 100644 index 8e9b05e535e7..000000000000 --- a/dev-vcs/git/git-1.7.2.4.ebuild +++ /dev/null @@ -1,466 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.4.ebuild,v 1.2 2010/12/20 07:49:25 robbat2 Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~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="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl 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] ) - 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 ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# 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 HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/xmlto - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - 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 -} - -# 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" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=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} == *-interix* ]] ; then - myopts="${myopts} NO_IPV6=YesPlease" - myopts="${myopts} NO_MEMMEM=YesPlease" - myopts="${myopts} NO_MKDTEMP=YesPlease" - myopts="${myopts} NO_STRTOUMAX=YesPlease" - myopts="${myopts} NO_STRTOULL=YesPlease" - myopts="${myopts} NO_INET_NTOP=YesPlease" - myopts="${myopts} NO_INET_PTON=YesPlease" - myopts="${myopts} NO_NSEC=YesPlease" - myopts="${myopts} NO_MKSTEMPS=YesPlease" - fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=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.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_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 - 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 - - 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 - epatch "${FILESDIR}"/git-1.7.1-interix.patch - epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch -} - -git_emake() { - 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 \ - "$@" -} - -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 - - dobashcompletion 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 gtk ; then - dobin "${S}"/contrib/gitview/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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - exeinto /usr/share/${PN}/gitweb - doexe "${S}"/gitweb/gitweb.cgi - insinto /usr/share/${PN}/gitweb/static - doins "${S}"/gitweb/static/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/static/${js} - doins "${S}"/gitweb/static/git-{favicon,logo}.png - - # 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 \{\} \; - 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 \ - 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 - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - 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 -} diff --git a/dev-vcs/git/git-1.7.3.2-r1.ebuild b/dev-vcs/git/git-1.7.3.2-r1.ebuild deleted file mode 100644 index 7086e3d0cabc..000000000000 --- a/dev-vcs/git/git-1.7.3.2-r1.ebuild +++ /dev/null @@ -1,464 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.2-r1.ebuild,v 1.6 2010/12/28 17:35:53 mr_bones_ Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~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="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl 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] ) - 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 ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# 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}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - 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 -} - -# 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" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=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 - - 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.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_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 - 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. - epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.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 - epatch "${FILESDIR}"/git-1.7.3.2-interix.patch -} - -git_emake() { - 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 \ - "$@" -} - -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 - - dobashcompletion 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 gtk ; then - dobin "${S}"/contrib/gitview/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 - exeinto /usr/share/${PN}/gitweb - doexe "${S}"/gitweb/gitweb.cgi - insinto /usr/share/${PN}/gitweb/static - doins "${S}"/gitweb/static/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/static/${js} - doins "${S}"/gitweb/static/git-{favicon,logo}.png - - # 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 \{\} \; - 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 \ - 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 - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - 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 -} diff --git a/dev-vcs/git/git-1.7.3.2.ebuild b/dev-vcs/git/git-1.7.3.2.ebuild deleted file mode 100644 index 8e8d7c7c326f..000000000000 --- a/dev-vcs/git/git-1.7.3.2.ebuild +++ /dev/null @@ -1,458 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.2.ebuild,v 1.6 2010/12/28 17:35:53 mr_bones_ Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~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="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl 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] ) - 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 ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# 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 HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/xmlto - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - 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 -} - -# 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" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=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 - - 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.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_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 - 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. - epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.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 - epatch "${FILESDIR}"/git-1.7.3.2-interix.patch -} - -git_emake() { - 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 \ - "$@" -} - -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 - - dobashcompletion 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 gtk ; then - dobin "${S}"/contrib/gitview/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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - exeinto /usr/share/${PN}/gitweb - doexe "${S}"/gitweb/gitweb.cgi - insinto /usr/share/${PN}/gitweb/static - doins "${S}"/gitweb/static/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/static/${js} - doins "${S}"/gitweb/static/git-{favicon,logo}.png - - # 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 \{\} \; - 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 \ - 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 - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - 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 -} diff --git a/dev-vcs/git/git-1.7.3.3.ebuild b/dev-vcs/git/git-1.7.3.3.ebuild deleted file mode 100644 index ddbf8cd65c3f..000000000000 --- a/dev-vcs/git/git-1.7.3.3.ebuild +++ /dev/null @@ -1,464 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.3.ebuild,v 1.3 2010/12/28 17:35:53 mr_bones_ Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~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="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl 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] ) - 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 ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# 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}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - 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 -} - -# 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" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=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 - - 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.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_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 - 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. - epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.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 - epatch "${FILESDIR}"/git-1.7.3.2-interix.patch -} - -git_emake() { - 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 \ - "$@" -} - -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 - - dobashcompletion 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 gtk ; then - dobin "${S}"/contrib/gitview/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 - exeinto /usr/share/${PN}/gitweb - doexe "${S}"/gitweb/gitweb.cgi - insinto /usr/share/${PN}/gitweb/static - doins "${S}"/gitweb/static/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/static/${js} - doins "${S}"/gitweb/static/git-{favicon,logo}.png - - # 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 \{\} \; - 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 \ - 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 - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - 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 -} diff --git a/dev-vcs/git/git-1.7.3.4.ebuild b/dev-vcs/git/git-1.7.3.4.ebuild deleted file mode 100644 index 3245966cc79a..000000000000 --- a/dev-vcs/git/git-1.7.3.4.ebuild +++ /dev/null @@ -1,464 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4.ebuild,v 1.3 2010/12/28 17:35:53 mr_bones_ Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -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="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~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="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl 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] ) - 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 ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# 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}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - 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 -} - -# 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" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=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 - - 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.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_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 - 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. - epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.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 - epatch "${FILESDIR}"/git-1.7.3.2-interix.patch -} - -git_emake() { - 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 \ - "$@" -} - -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 - - dobashcompletion 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 gtk ; then - dobin "${S}"/contrib/gitview/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 - exeinto /usr/share/${PN}/gitweb - doexe "${S}"/gitweb/gitweb.cgi - insinto /usr/share/${PN}/gitweb/static - doins "${S}"/gitweb/static/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/static/${js} - doins "${S}"/gitweb/static/git-{favicon,logo}.png - - # 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 \{\} \; - 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 \ - 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 - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - 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 -} |