diff options
author | 2012-04-26 21:47:30 +0000 | |
---|---|---|
committer | 2012-04-26 21:47:30 +0000 | |
commit | 22f49ac8bba2e4aa02fbf8457595bdab5fdd4184 (patch) | |
tree | 82c9b6703eab6a198050deca50d236a43e31282c /dev-vcs | |
parent | dev-java/netbeans-groovy: version bump in 7.1 slot (diff) | |
download | historical-22f49ac8bba2e4aa02fbf8457595bdab5fdd4184.tar.gz historical-22f49ac8bba2e4aa02fbf8457595bdab5fdd4184.tar.bz2 historical-22f49ac8bba2e4aa02fbf8457595bdab5fdd4184.zip |
Version bump.
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'dev-vcs')
-rw-r--r-- | dev-vcs/git/ChangeLog | 10 | ||||
-rw-r--r-- | dev-vcs/git/Manifest | 34 | ||||
-rw-r--r-- | dev-vcs/git/git-1.7.7.7.ebuild | 527 | ||||
-rw-r--r-- | dev-vcs/git/git-1.7.8.6.ebuild | 527 | ||||
-rw-r--r-- | dev-vcs/git/git-1.7.9.7.ebuild | 565 |
5 files changed, 1641 insertions, 22 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index 59346897b484..93d72eeb6895 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.128 2012/04/23 17:21:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.129 2012/04/26 21:47:30 robbat2 Exp $ + +*git-1.7.9.7 (26 Apr 2012) +*git-1.7.7.7 (26 Apr 2012) +*git-1.7.8.6 (26 Apr 2012) + + 26 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> +git-1.7.7.7.ebuild, + +git-1.7.8.6.ebuild, +git-1.7.9.7.ebuild: + Version bump. 23 Apr 2012; Mike Frysinger <vapier@gentoo.org> git-1.7.10.ebuild, git-1.7.9.1.ebuild, git-1.7.9.2.ebuild, git-1.7.9.3.ebuild, diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index fd7d50350086..2e3ef9e14fd6 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 50git-gentoo.el 472 RMD160 3d9c7dcb70d781dd7f12e4a19e838996681ec0d4 SHA1 fc47553c2422af82bbd2588e9853cc0c9cb437c7 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2 AUX git-1.6.6.1-interix6.patch 457 RMD160 27bdfe9ab248791f628420cc45751fae2643b3d5 SHA1 6c80a5cb63cbcf89b61b8f5e2c16736cb0be09bc SHA256 a8b788b8ef41ce7fd1018f13795694a908fbb1884de195c89a58fe87f3968849 AUX git-1.7.1-interix.patch 2192 RMD160 725c43e056bbaa82e4af1f2aef9dd152214f9d65 SHA1 de6062aaa8bd177c77c124696d4253c299bba1fb SHA256 b560fcc41ea93df429290ec645f3e37368ceec1101f7124574fa6d9bab00a495 @@ -24,16 +21,19 @@ DIST git-1.7.4.5.tar.bz2 2711452 RMD160 5e9a0ccbaa913bf42507c2ebdbcf35fb9f7476f9 DIST git-1.7.5.3.tar.bz2 2766856 RMD160 99a8f69690dc75c37b5141c6984dc5b499fcd8d4 SHA1 762d0985af37c9dda4e22c84e09c6e4efb46a22a SHA256 8017b0c624fea88bf5488d35f3839778fac3c0e089a02fe0017aea6913af3292 DIST git-1.7.6.4.tar.gz 3399093 RMD160 80d226e77b8b9ad6d0bba86773e26257e5b3d734 SHA1 df91e2c32d6097ab1c9d0edc56dd8cecb4e9b686 SHA256 c95bb6fdfa8276a6cbc1c3150e56ce3dc2fc29a4bcecd9c246ab9df5d9638ec6 DIST git-1.7.7.6.tar.gz 3485668 RMD160 6453d81893f2a32d7d9e93ff1b683b8464d6e6a8 SHA1 483dc95de0e26f0154fb23444589266b59848cfe SHA256 086eaca9d629bd9997f73763131dd194b62ae269a56ad71011263870b9263a56 +DIST git-1.7.7.7.tar.gz 3485439 RMD160 99ae1b7595b171a8027a69dddf589d0be799775c SHA1 6fbb215ab20afaf4cca6b1e5a7e4ff4b3b62303c SHA256 328b7b59be167c14305176f81435c77033f8cffd7dc25d08adaccaf2f0bede0b DIST git-1.7.8.1.tar.gz 3539908 RMD160 b9b6c52fa38712679867e140c6b5d1bfcbc05831 SHA1 198e23e6e50245331590a6159ccdbdbe1792422c SHA256 e393aad2286f85f23e859ad64ddcc20b74bfa7788c85c56645757cb201c9006a DIST git-1.7.8.2.tar.gz 3543890 RMD160 9d2cd1f2c1009122a2c8d41f7d4696fa83d3f198 SHA1 7187c1af96db0c181b801957d6e152ec7cd60ab6 SHA256 2247f214fce3be72da3020947ce3fbfb7f6f9950a145897554e043cd63f9a3e3 DIST git-1.7.8.3.tar.gz 3543164 RMD160 2c88b4cf4f915363dfdc1bddda925f4a62b4e454 SHA1 e5eb8c289b69d69fd08c81b587a06eb5dd2b5c1c SHA256 77f52b7104a107e0fbe1ce85b3f35c97f029fab92cd35a3909015ca169af505d DIST git-1.7.8.4.tar.gz 3544195 RMD160 ee203b3d6252c2df150ef7904c6b95672dea4aff SHA1 add7b05f26216181d1b148dde298432132552b0f SHA256 71a5a98d386061fe606b5be1ac390dc725d418d12edfa20796ff7671247c67e3 DIST git-1.7.8.5.tar.gz 3544390 RMD160 900f57e121f0aa0a312128983c030d21400aec7a SHA1 bb3d715437a4751f7de0c89156bf97dae7c6049a SHA256 b235fd332525c22eeb6f4f5e0b44b21f1ff1c35a7c76e6729a7a560b2fbed622 +DIST git-1.7.8.6.tar.gz 3546112 RMD160 00bf5c301a86486ee67fe93fdcf3ac07d17c0985 SHA1 b204ae56e511c541425c5db757132fcd35f64117 SHA256 45be602d0ca64eb44282cec7a5a7286487f7e9ed0c8112735456a22fdf1f6db9 DIST git-1.7.8.tar.gz 3538330 RMD160 efde5f593ea804a998c4aeebc27ccbc0674596e4 SHA1 7453e737e008f7319a5eca24a9ef3c5fb1f13398 SHA256 ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713 DIST git-1.7.9.1.tar.gz 3608449 RMD160 acff1b02a507220e51a86b63d38a5ae4ec01f70f SHA1 bd85327627f96c4e98071a4d1d32c30f210aa54a SHA256 b689a0ddbc99f9a69aef7c81c569289a28ba0787cd27e5e188112e1c3f0e8152 DIST git-1.7.9.2.tar.gz 3611846 RMD160 af5a35d1630c2ea2472665f461953baaf3a42dfc SHA1 7aff1048480a8637de94e8d82744d312c0b5e060 SHA256 bd7725fb80f305bf27666e3d26a9b7b79596e2248f2ae2d27e06bc15a501ac75 DIST git-1.7.9.3.tar.gz 3615900 RMD160 3f45d8262526dfbc576004b8f50a92a6c33cf4d6 SHA1 6216153da1139c25cb96cfb4441eff327013ec4f SHA256 fe1d27649d9e8a31bdb768e9f9cdfeca3b383bb10354c6dcf0629bd669d8d76f DIST git-1.7.9.4.tar.gz 3616756 RMD160 2932d258de1fcebc8e83151f016fe963672b7d42 SHA1 05d2ff75ffd3356516d096f992b4fb3b8b6c0079 SHA256 c59f4c1e37a99f00022b491a6674f633a00164513efdc269e74ed20537f71c39 +DIST git-1.7.9.7.tar.gz 3618222 RMD160 60d8fc7257ecf4e3c0b76dd118d6a919247eb920 SHA1 97f6006daccf916078896f8b24aadd882d941cf7 SHA256 c3bfc9379a98ba28bd70feef8b386738619a49d659bbe2a90422480a8b20b1fb DIST git-1.7.9.rc2.tar.gz 3606493 RMD160 9e5104dba8babc594a9da8fcdad8d47e7722a93b SHA1 4eeaaf8a73006f797e6c23455097684664bf256e SHA256 1d417ceaead73b4a2baaef3e26e204abcf476896046674291527e2a372636c62 DIST git-1.7.9.tar.gz 3606326 RMD160 60aa60c076d0e398f7bc07d6cfab3c5ed28fdadc SHA1 ed51ef5ef250daaa6e98515cf2641820cd268d4c SHA256 dd9dfcf1da59f09c4b66b53836b56fcb2208d0be9edf1f8b9079c7e980435086 DIST git-htmldocs-1.6.4.5.tar.bz2 772113 RMD160 64b3f689385334d9b101b4bb8647f0fed14bd1fc SHA1 4ac2ede0a3ed82dea9107ff5e4a4948b60282f49 SHA256 12c13ead869918d8470d68c7331675c56a192eae819c283a398aaf9f0f7555d2 @@ -45,16 +45,19 @@ DIST git-htmldocs-1.7.4.5.tar.bz2 945737 RMD160 d0e45908b397fd46e2eca46beeac2928 DIST git-htmldocs-1.7.5.3.tar.bz2 956542 RMD160 777b354e18522bebd4ebfed070179e632998b5da SHA1 f0a66b8b21fab39acf466cea5c14416c718334c4 SHA256 a08cc349b53271cf1b1c23d68033105bee25b1cb1884c8ecaa12271737baff52 DIST git-htmldocs-1.7.6.4.tar.gz 1606389 RMD160 931da8cc615cd1f52024a07f53ebc14e3fcc03ff SHA1 6abd985e24b6585284cef7fae2e3046ba9201356 SHA256 b73ded7089bb253efe45ef3a444022500df012a4bd596249ac999135ca76e240 DIST git-htmldocs-1.7.7.6.tar.gz 1635617 RMD160 f151c86c48add564d75caa348bc8ccd48714f38c SHA1 8bcbd0a53fd3b937a9991aa096220a1a0eb2f771 SHA256 7046fab9bc9dc237bc25c700840bbfec2c79171fc61957889583444ea5d8783c +DIST git-htmldocs-1.7.7.7.tar.gz 1627651 RMD160 9db00c5492b53f604a6785d96e21d06ef253ad8d SHA1 bb4552ccde7d8b7fdb98c113ce4373dbfb9672b6 SHA256 6edd544c6e8f0a2bf718adf8463e25b0c2cf067bcc620eb7154f3258b9656759 DIST git-htmldocs-1.7.8.1.tar.gz 1695296 RMD160 9f0a4d43e327da14592ecca6816301f143b9ed4b SHA1 8f674dba39d9ae78928abfe9d924b0855e283e98 SHA256 6f68f05b76cb07fb9a671a2e59c79aac26deffd2ae3a46027520ef6f2fab404d DIST git-htmldocs-1.7.8.2.tar.gz 1697858 RMD160 d9f5c0b4c01e682f241ebc59d1abf7cd79fe6dd0 SHA1 9047175e5c46aa3260c42e6b4459cf4ee5a7bb8a SHA256 c402b231b8d8b8ecae267a6e3b0224c473c0f0c3fd0e22915d07854276d8c800 DIST git-htmldocs-1.7.8.3.tar.gz 1698145 RMD160 3c77c0ae24b3bd035c1057648736d6ba008c57ab SHA1 8a65d2425c1b6f646d130cf5846e92e9e0e93736 SHA256 d6dad326af1aaae36d349f6a722a6c53e6a936f4e6a470d96320857319db6af9 DIST git-htmldocs-1.7.8.4.tar.gz 1699142 RMD160 beccc1e17f6d930c79f2f35aeac4e8dc0c318e1e SHA1 ac2b89d8d4418c7633ee2344e89eb7dfcb81522a SHA256 a86d8d939cb031d8ebbbaa17399c32474a13e0e4a6705406ad5771620b351acd DIST git-htmldocs-1.7.8.5.tar.gz 1699204 RMD160 6313e769957f94a5b120656ed1b6419709a8aa8a SHA1 71cf25158ae3499e33327fa9469279771429f9f7 SHA256 64eb6ebac332cd23eb9f0ae1aec26c7f03da9e73b32dbb32bb84ec8c6efd19a7 +DIST git-htmldocs-1.7.8.6.tar.gz 1688622 RMD160 3997a1a54e5e446547ab43fb45b817a2a8720415 SHA1 0618da00f11a6bb91da7d639f348bb806b153650 SHA256 7c7447fe136349b1807caba1c00fe6a46866c9b54cba068f322967c0f8b2c0bf DIST git-htmldocs-1.7.8.tar.gz 1694941 RMD160 07344d8dd95f2d72667cf16a4f340aa5cc4c8950 SHA1 2734079e22a0a6e3e78779582be9138ffc7de6f7 SHA256 45b3e3016bd5dbd933bafd5e8091acb0431ff3a63b7fd829e9d9832dde096862 DIST git-htmldocs-1.7.9.1.tar.gz 1743893 RMD160 ba3b1b5eeeeb00ca0050c670ad3bddea5c19ffcb SHA1 de5ad73499cfdb08e261bc481c84a75f11b7ff0f SHA256 df21e008501ca0825d153d1746cf0f7742a87b15a98c6881d4fb9611897226df DIST git-htmldocs-1.7.9.2.tar.gz 1745003 RMD160 296cd29ff0a3f464760c8c30efa1123f17174222 SHA1 3cf13b03b2f64d0458212232cc18983231f8251e SHA256 da9c90e9e175448cf7940acbd287bc927294b3fd8ddf8d9a1e10266eff872b3b DIST git-htmldocs-1.7.9.3.tar.gz 1746314 RMD160 7d826cdd1bf3fc797ff077db8598a6b798462b96 SHA1 2d488c3975da1c2ea90965b82233a986c498a8c2 SHA256 855db3ff9fedec21e37e8e9679eca14c15c4cacc05e0175be1761dfa61e593e0 DIST git-htmldocs-1.7.9.4.tar.gz 1746828 RMD160 c1f43162c41d481cb8c62cb6fe183bd70a0a8b90 SHA1 4d8b27a244969a707e83f6699fd00c322ff0ad5e SHA256 018e6222dd5d9c480009d0b1a8c5d63d9a97c90c623ca912745a19f8b2923461 +DIST git-htmldocs-1.7.9.7.tar.gz 1744067 RMD160 cb6dd0a52e6f314531e5c0b354c51a391dfae18a SHA1 9a1575a4de8074b4034ae5baaf87b5ae615d635c SHA256 0f84453df2c0f4b61caa524ac482940f819c637f6f63f3a60e076e8718413f1b DIST git-htmldocs-1.7.9.rc2.tar.gz 1742598 RMD160 e0413e2d89de34c631e5ea0a2f312f2f47b832d2 SHA1 22aad76c146abe04e8f9bd89b2fbf4b575f434ce SHA256 1aa639e9447afbcfb90eeade0d1791cc76e939fc9d88f1a33301348ca3185781 DIST git-htmldocs-1.7.9.tar.gz 1742462 RMD160 dcaaa218bc63208b96fc7100add518bac94e8255 SHA1 c7b1fa20dc501beb2cb5091dd24dbfd2a0013a0c SHA256 a43234a0288e34ba826c3e77b7a9e9b2b3f30fbd63c847806ee5437e883f1699 DIST git-manpages-1.6.4.5.tar.bz2 254368 RMD160 7731d81631ec2c8c33ddc028667eaad79926754b SHA1 905d5e66db1b22b48c1b001d1f5dec830a75dde1 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0bdae702b1fe58ad8ebab32a0bb7ba447 @@ -66,16 +69,19 @@ DIST git-manpages-1.7.4.5.tar.bz2 301080 RMD160 f363285195421dea67d70d978d235d8b DIST git-manpages-1.7.5.3.tar.bz2 304065 RMD160 02919cf1db61717f6f3ad298c31d6eae3c01b48a SHA1 2b6f770b0314d12d7abd4fe2274a46c29ac64f50 SHA256 018f5c16b9a3c4e4942ae318d1faea0b6092287228069a718efd267b9f98b8c8 DIST git-manpages-1.7.6.4.tar.gz 468334 RMD160 91d0df4b4182bead27149dbf03481d3e139cc730 SHA1 c6f6d92f4005a7eccaf89e851c45768c18f7e65a SHA256 c1ae86f0bfd80ec819535a64825a141aeef950dfebf9a3f82bef6752b586f63f DIST git-manpages-1.7.7.6.tar.gz 474628 RMD160 2cb26c04de36d84dd6fd9fc51d83b2660211d4dc SHA1 0fd7452c88d0b3ccb08d9b2b91b552680b0209e0 SHA256 3e94c718530ce7343ca5cc13a5583c01d8806d465e657f970c28b43420906dd3 +DIST git-manpages-1.7.7.7.tar.gz 478713 RMD160 46c19855b25af66f1706db7b52baf899ae2e017e SHA1 a8341f8887abef23aacb3c56d75b8f87d73b22ff SHA256 e00e9be4b1017038875c6402a3a59b53c7f261a7ff752122edac5ec3fc339843 DIST git-manpages-1.7.8.1.tar.gz 496876 RMD160 d3e601038e8fc85b32798148ecc8c82390eb3b56 SHA1 b49ce0b4da4f85671693c9b2c6f6a8b8ee65c809 SHA256 1575acc41beb05ee4939508325a65ea01746982f2eeb77ed55bf1ffc673f54ef DIST git-manpages-1.7.8.2.tar.gz 497249 RMD160 94477d2e301c684ca271334ee66699071421c896 SHA1 cc394a0a9689297fddad40c1ccbded0ba9d708da SHA256 87b95eb0e6d93c71dcf850100a1ebdb2e06b86a03603a695f7ffb947f4da94a9 DIST git-manpages-1.7.8.3.tar.gz 497446 RMD160 87aad1c9975a006683ab6b1128df39ae19b30d2c SHA1 a6e2b7cff8181ee52a1cc00ebba7b349850d6680 SHA256 5c0c402d41c577b9cd9a31e30abd029d3e79d6c3164d4a527d3103ee2a0dfb5a DIST git-manpages-1.7.8.4.tar.gz 497621 RMD160 0ab22cbe1820b29d991a63cfb087aacb42b8223e SHA1 4372c423a0d2f7df33b5b39727a81f0a7b40669d SHA256 b4930a17de7b18d40d81c3830913e5c4c2a91134e3a331ad49757d496ee53b76 DIST git-manpages-1.7.8.5.tar.gz 497426 RMD160 b4d902d69d0b983fa9ed6c014eb3a7a02ac263df SHA1 ce327331973b6e100b6a69ab8f9c526690260e92 SHA256 1a890f2cd2a875d2716ebc83413c08750ce15194297f3aabd66014f4f8f511d2 +DIST git-manpages-1.7.8.6.tar.gz 501678 RMD160 edf8c6b698751a18a23c8a3eec3c33c03157020b SHA1 2d2da141cebb2d7cce03abb556ee52c3dbad3831 SHA256 559b7a6ba8eaad655d725765b75aff9c6a5aaed2cc77abcdd2f88c773a0b3a6d DIST git-manpages-1.7.8.tar.gz 496974 RMD160 ee09c9a1c80fe46ca3a6787ea30eadeddee2a9a0 SHA1 93315f7f51d7f27d3e421c9b0d64afa27f3d16df SHA256 f67d593f5aecd01ec42683cff515172c67f79109161629621e9df58e39ef5354 DIST git-manpages-1.7.9.1.tar.gz 508057 RMD160 2ed606396ece433ff3206bb4013867882e2cf51f SHA1 8c6ee031b39da5c5e53f927952838796e0959ce9 SHA256 f31d91061e96b5f882ceed2160d44937b2679931e7e217a66bfe3a23df46adae DIST git-manpages-1.7.9.2.tar.gz 508005 RMD160 229aee67eb986f81d8e2d511df18dfd8adc0ae41 SHA1 d6992d899fb70e40983f94a2f96ad24b8ee93557 SHA256 c653a3678bb5668c280a0d5ba584fdfb0e4272acbbd00901dc2363ea3f58eede DIST git-manpages-1.7.9.3.tar.gz 508293 RMD160 9b51c410ec9618cd30e89b4746722680ce51fbe8 SHA1 223daa871a64facc60bdf643c50c78eac21c88f4 SHA256 6cea090e0c19bd1fc52a67576c4239ea3892a895b380dd3580b48353e423f462 DIST git-manpages-1.7.9.4.tar.gz 508376 RMD160 a3c8d42d2be8356a27f0e74160acf169fc29d542 SHA1 833dc143d2d296754d681c57b41a008ff433b225 SHA256 570586dff6cacf56c3a43cdd2103640819d40f05a71df5ec49dfa463974c6fbb +DIST git-manpages-1.7.9.7.tar.gz 512914 RMD160 d42444c20a793c07885579f7cc2c1ae17ef3efe2 SHA1 6cae2f1ea878de96b24644c23abc0086ac9283cc SHA256 317c7037ec517187f10e5bfa99a3568aee9a70b370bfab671273af794bb68ac9 DIST git-manpages-1.7.9.rc2.tar.gz 508558 RMD160 ff92b1eb6cf41a760ff814fbe25b6ead77919edc SHA1 8565f64f6227fcfba3f768dabdcd9d6037f08842 SHA256 4f84e77e90abada3ac89082c7cef49af791bf63b76427edf4c9d25c732ba4a5c DIST git-manpages-1.7.9.tar.gz 508027 RMD160 d8b3502c1049933bf9d756f7131a42e0bff50e70 SHA1 1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a SHA256 b85c4533c0bbe0a5920399b3dc856577feaec2bbcde60c577338d29fac2f2cb1 EBUILD git-1.6.4.5.ebuild 10406 RMD160 974979cc54ba06659818d908b6a4fc37a2e463a1 SHA1 f5b78964fcc68509bd32baffef8016c9ad710bcc SHA256 186e72aa90b3c98448a64b7ae718772675a601c80091509b1ccce44c824830e1 @@ -87,35 +93,21 @@ EBUILD git-1.7.4.5.ebuild 14599 RMD160 b690444f7dfb126cf8595302e5e6a7aa1aed9a54 EBUILD git-1.7.5.3.ebuild 14734 RMD160 30ee5d07c329cd1dc518e7f41eba2fec33fdf8eb SHA1 bdc52b50209d86f9f673aaad8957c109c23275b4 SHA256 fd9935d807b1ed4d1a9601beba880a2c201e45e8f885197785a3b2941b3b1ace EBUILD git-1.7.6.4.ebuild 15368 RMD160 3275287346025a271d12c3886a08a50b64d0aaa0 SHA1 8b13544f371bb0f3fb080e1c127642853f550e5a SHA256 318ba9980b336deaa402de36ebb50b627cc3b5f194a1354931457329d1ddcc51 EBUILD git-1.7.7.6.ebuild 15110 RMD160 660bfb676175c9138ce0f44f7a1e69d4b9da1df7 SHA1 176c6608dfb863b4acfb3e67f1824bd78fd0ca76 SHA256 38e35dbcb12e479c289111dde48cf41eef957c341cde5a841879888b3939abf7 +EBUILD git-1.7.7.7.ebuild 15110 RMD160 62eada188f1dd39052eec6c33bd7149ce33fef87 SHA1 6ba5a4f46cea4b76106e9f9ad235f434502de5ad SHA256 9356bafe2f1adb7d8b80753555fa190d425fb89d725b1881a572a47bf4c707e8 EBUILD git-1.7.8.1.ebuild 15110 RMD160 4e8aef92de685c2636f45ed19b169a10da0d2085 SHA1 5366c3347f4fb5e38dfb487c77dc46dc82ff45bf SHA256 8ee569cd111d4af850e61bf40b0bad33af823519802cf595629f832638372226 EBUILD git-1.7.8.2.ebuild 15110 RMD160 1b0ea4da22c120a9d696c62dbf19c97e4215dad6 SHA1 631e62ad317a44841363f19a167d9ba83f6d90ec SHA256 c4021030525ea958d054077bcf9658e24a3222bf105dbe68f04cfb6c95e28ce8 EBUILD git-1.7.8.3.ebuild 15110 RMD160 e6c7afb193b21fed5df83773d245cb906c742713 SHA1 93e44695e199d483f076c62adc7de723f5782283 SHA256 cd68b51ae7d404e05f7e84f13d8e3d4ad54d434ea46d611232c516174dcfc739 EBUILD git-1.7.8.4.ebuild 15110 RMD160 08984137854bd39d7d1f81773e81d7a615ed2a73 SHA1 6aaecd308c32d0f8a5f2467edb7061fc4b9079de SHA256 8b999e3208749bff054c2d3d35569d4d945a645793f702045501a84a46bdede8 EBUILD git-1.7.8.5.ebuild 15110 RMD160 08e1944f00196f50b7daa312f1462acfcffdc10d SHA1 00b7b765eecc87ea44ea3c3c3e04d54d837d2cb7 SHA256 0915823368f53351c4ff8ed306e1c1b3ee204394c9bac154b03af5e57b20fb9a +EBUILD git-1.7.8.6.ebuild 15110 RMD160 1a720af756f325c9fe52813f2eb9274243d05dc9 SHA1 4602aed10cd12750da6685c84f9623fe4463489f SHA256 51f08d83c7ed8afe784e7e8b1df7e8f6325d5d168aace2004c8a1d9d14c643ab EBUILD git-1.7.8.ebuild 15108 RMD160 bbf80a4cdc89f02f98a0fab0c514b84adae71f7b SHA1 59459055b38ac4560ca487fcf2c4551739957725 SHA256 ada91dcf9536675492ac599fda7072b47a135356180c36b04ed8210dc0070760 EBUILD git-1.7.9.1.ebuild 16743 RMD160 85ee4b40d277aba9caa2867d06011e7f0a363815 SHA1 960020ea4b0aa4e020390d8701e134feae936e5b SHA256 c19df4794e3ae902cbba2443439057d7c7c3cedb397113dcb3ae382cd73574ee EBUILD git-1.7.9.2.ebuild 16743 RMD160 b125b6d2ee311fc527e50a18d4fd01a022279ad2 SHA1 00098de392368c49f38b43cf78bf5cc621c58471 SHA256 7dfdade22ee6bd35836a2bad076c82566ff68edf63df69b15619bc05ec9f0d3d EBUILD git-1.7.9.3.ebuild 16743 RMD160 17fc278eea467f011f62b91f72cdcd897aabed50 SHA1 5836961fa8e6668b8df3ae3a349535a4a749ea72 SHA256 f14bfb0f60070b53b39e3770ca5e9c946843a1c691cc97bde4a35cf317fb9dfe EBUILD git-1.7.9.4.ebuild 16743 RMD160 761eff296464ba601e650bde3f91465999a1f725 SHA1 453afc83785e13118e19acd4747292c0b6986e15 SHA256 bf1cd39f02774751af40da67fe33b4f9209742fa6f9dd4f6878e390bd7ca8be4 +EBUILD git-1.7.9.7.ebuild 16744 RMD160 f2ccbf2d1cc83f06f3bfa4bd8f5a403c351c3861 SHA1 e4ad7887e13d972a56171beb2054f5d70ef3f33f SHA256 10826af3f38c64ba6a49ed2be33d0786f63d6fbd00bd432d0119f2c9a828bf6b EBUILD git-1.7.9.ebuild 16741 RMD160 0b854ca762709d878815e54577a81a63d502c6f6 SHA1 df903c594080adbd15559bc0201ddded904599d7 SHA256 e00ecb88dc7e8b8505a9e26df71da6b668071a1a44479793f4b024e6e23b8313 EBUILD git-1.7.9_rc2.ebuild 16377 RMD160 8de8a1978772346f6aee19e07fa7409a4a6d9a76 SHA1 d884a5714ac92b4b423ec651f6d29a1ad100f8ad SHA256 c843afeb9b1139d5b883d25c4398aa7b1663c5faa223d4dba96b59119c5bba71 EBUILD git-9999.ebuild 16335 RMD160 ef3dd86600eb42a6aa274fc1507bef7fc06a9275 SHA1 a874f8d6b567a1af52c6cff760678e0ff0e71e8a SHA256 39cdd6da1b229e68421950abc264407f8d5251037bd7db1a535c999bf458118d -MISC ChangeLog 86957 RMD160 7a94204fa4b06686bae3423d33aecd1d9bafc502 SHA1 88268fbcb7fbfcc26604d4d5a770b865e6f480d3 SHA256 44d41b212c8ecbd71e968e224036a5cfef53cc1c048879fb9c8c65f2647048f5 +MISC ChangeLog 87175 RMD160 35615827ffba5bfa11599f5e73d6e5ee0f85faff SHA1 f5e11f18a43a354ff10bd8fb19be4bd092c1fd55 SHA256 a675e029243ba78c2efa37f84952b371a637b1333effe1312c573c4e5b9f623a MISC metadata.xml 1519 RMD160 4ba9e2c4e8239f644b1f4a82bc47d1b587e195a6 SHA1 813d8c8015a1cb757e54fa8681f8a7686cfc40e7 SHA256 58313781f3108991fee93cb0119e6720fe895487e43d44dbf96c4733f81854ca ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQIcBAEBAgAGBQJPlY/gAAoJELEHsLL7fEFWSMwP/jnZNNiPw6945rAsoBCYoAej -Vx8mIb6AWfYohdzLdOW5DgEAxH3tx9dqAGI4jAOGRuJTX76/coIrwKHiaA0K/4Q0 -Y3ChbD/SOiDPHkPv+OBu+SVsBR8vgf+px/wlo1yYvW9q8B+kBmDeSJz16WtL2Bdt -ALHR/7LW1fJujUT9s7x5geR6zu6G0uKJAQIB0qwzk1biD+5N/6JyxDwGYlu0TygB -1rwzow2tDjV35SuQsNMAOL4JK2MF7jEJLMnCdwLo/nii4+6MdaSFR1ct8oJJuvFq -NbZMTCZLcpU85x+W7KGBRxLlhz3YqJxbWfc6hXK2FCh7PR4Xs7z4b44Jn4XoGgXl -PTCLU2oEwmO1eyeETrdcY1bU1flUB+qefdfoGhteF7iFZnhntot2wnYmScu4n58r -4aqXLRElPQqIGmQaKGF+TjW1gKkxusTGA054cWlHlcedmT0GGMbLKySM40HAG4H+ -+52le3Pt0GBcAP7ilWVitWMQL8euTz1ZoqO9FC1g+9WVjgFSUBFJtlUY0GSIhcL2 -SZv6YyE+UxWrP7x5P4jqNkBMZqoHCN0U9YxOJq8IEFR6r8NLgVRRCNAamNTdcMqJ -NzXw4/bbFkg5VEnxMTyoQwBxEtI0wniKZMIxStrV1ubmx5WhP8nnDVpA+NmHUdOV -obB2WGyrq89pYLdpLFR5 -=HjDd ------END PGP SIGNATURE----- diff --git a/dev-vcs/git/git-1.7.7.7.ebuild b/dev-vcs/git/git-1.7.7.7.ebuild new file mode 100644 index 000000000000..17703580297b --- /dev/null +++ b/dev-vcs/git/git-1.7.7.7.ebuild @@ -0,0 +1,527 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.7.7.ebuild,v 1.1 2012/04/26 21:47:30 robbat2 Exp $ + +EAPI=4 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_DEPEND="python? 2" +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + +inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" +HOMEPAGE="http://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="gz" + SRC_URI_GOOG="http://git-core.googlecode.com/files" + SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + doc? ( + ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + )" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +else + SRC_URI="" + KEYWORDS="" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + !blksha1? ( dev-libs/openssl ) + sys-libs/zlib + perl? ( dev-lang/perl[-build] dev-libs/libpcre ) + tk? ( dev-lang/tk ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs )" + +RDEPEND="${CDEPEND} + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( virtual/perl-CGI ) + cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) + subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + python? ( gtk? + ( + >=dev-python/pygtk-2.8 + dev-python/pygtksourceview:2 + ) )" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + app-arch/cpio + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + )" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + DEPEND="${DEPEND} + app-text/asciidoc + app-text/xmlto" +fi + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + subversion? ( perl ) + webdav? ( curl ) +" + +pkg_setup() { + if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use python ; then + python_set_active_version 2 + python_pkg_setup + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local myopts + + if use blksha1 ; then + myopts="${myopts} BLK_SHA1=YesPlease" + elif use ppcsha1 ; then + myopts="${myopts} PPC_SHA1=YesPlease" + fi + + if use curl ; then + use webdav || myopts="${myopts} NO_EXPAT=YesPlease" + else + myopts="${myopts} NO_CURL=YesPlease" + fi + + # broken assumptions, because of broken build system ... + myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts="${myopts} INSTALL=install TAR=tar" + myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" + myopts="${myopts} SANE_TOOL_PATH=" + myopts="${myopts} OLD_ICONV=" + myopts="${myopts} NO_EXTERNAL_GREP=" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + use iconv \ + || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." + # || myopts="${myopts} NO_ICONV=YesPlease" + # because, above, we need to do this unconditionally (no "&& use iconv") + use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" + + use tk \ + || myopts="${myopts} NO_TCLTK=YesPlease" + use perl \ + && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \ + || myopts="${myopts} NO_PERL=YesPlease" + use python \ + || myopts="${myopts} NO_PYTHON=YesPlease" + use subversion \ + || myopts="${myopts} NO_SVN_TESTS=YesPlease" + use threads \ + && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" + use cvs \ + || myopts="${myopts} NO_CVS=YesPlease" +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts="${myopts} NO_MMAP=YesPlease" +# myopts="${myopts} NO_IPV6=YesPlease" +# myopts="${myopts} NO_STRLCPY=YesPlease" +# myopts="${myopts} NO_MEMMEM=YesPlease" +# myopts="${myopts} NO_MKDTEMP=YesPlease" +# myopts="${myopts} NO_MKSTEMPS=YesPlease" +# fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts="${myopts} NO_NSEC=YesPlease" + fi + if [[ ${CHOST} == *-*-aix* ]]; then + myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" + fi + + has_version '>=app-text/asciidoc-8.0' \ + && myopts="${myopts} ASCIIDOC8=YesPlease" + myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts="${myopts} NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" + unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + use doc && \ + cd "${S}"/Documentation && \ + unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + cd "${S}" + else + git-2_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + # Noperl is being merged to upstream as of 2009/04/05 + #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch + + # GetOpt-Long v2.38 is strict + # Merged in 1.6.3 final 2009/05/07 + #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch + + # JS install fixup + # Merged in 1.7.5.x + #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch + + # USE=-iconv causes segfaults, fixed post 1.7.1 + # Gentoo bug #321895 + #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch + + # Fix false positives with t3404 due to SHELL=/bin/false for the portage + # user. + # Merged upstream + #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch + + # bug #350075: t9001: fix missing prereq on some tests + # Merged upstream + #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch + + # bug #350330 - automagic CVS when we don't want it is bad. + epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch + + sed -i \ + -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC = \).*$:\1$(OPTCC):' \ + -e 's:^\(AR = \).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL + + # Fix docbook2texi command + sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # bug #318289 + # Merged upstream + #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch + + # merged upstream + #epatch "${FILESDIR}"/git-1.7.5-interix.patch + + # merged upstream + #epatch "${FILESDIR}"/git-1.7.6-interix.patch +} + +git_emake() { + # bug #326625: PERL_PATH, PERL_MM_OPT + # bug #320647: PYTHON_PATH + PYTHON_PATH="" + use python && PYTHON_PATH="$(PYTHON -a)" + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + OPTCC="$(tc-getCC)" \ + OPTAR="$(tc-getAR)" \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + sysconfdir="${EPREFIX}"/etc \ + PYTHON_PATH="${PYTHON_PATH}" \ + PERL_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + "$@" + # This is the fix for bug #326625, but it also causes breakage, see bug + # #352693. + # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ +} + +src_configure() { + exportmakeopts +} + +src_compile() { + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el \ + || die "emacs modules failed" + fi + + if use perl && use cgi ; then + git_emake \ + gitweb/gitweb.cgi \ + || die "emake gitweb/gitweb.cgi failed" + fi + + cd "${S}"/Documentation + if [[ ${PV} == *9999 ]] ; then + git_emake man \ + || die "emake man failed" + if use doc ; then + git_emake info html \ + || die "emake info html failed" + fi + else + if use doc ; then + git_emake info \ + || die "emake info html failed" + fi + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + + dodoc README Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + use doc && dohtml -p ${d} Documentation${d}*.html + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + newbashcomp contrib/completion/git-completion.bash ${PN} + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} || die + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die + # don't add automatically to the load-path, so the sitefile + # can do a conditional loading + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die + fi + + if use python && use gtk ; then + dobin "${S}"/contrib/gitview/gitview + python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview + dodoc "${S}"/contrib/gitview/gitview.txt + fi + + dobin contrib/fast-import/git-p4 + dodoc contrib/fast-import/git-p4.txt + newbin contrib/fast-import/import-tars.perl import-tars + newbin contrib/git-resurrect.sh git-resurrect + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # emacs - installed above + # examples - these are stuff that is not used in Git anymore actually + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + for i in \ + blameview buildsystems ciabot continuous convert-objects fast-import \ + hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ + stats svn-fe vim workdir \ + ; do + cp -rf \ + "${S}"/contrib/${i} \ + "${ED}"/usr/share/${PN}/contrib \ + || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym /usr/share/gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + find "${ED}"/usr/lib64/perl5/ \ + -name .packlist \ + -exec rm \{\} \; + else + rm -rf "${ED}"/usr/share/gitweb + fi + + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + newinitd "${FILESDIR}"/git-daemon.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + + fixlocalpod +} + +src_test() { + local disabled="" + local tests_cvs="t9200-git-cvsexportcommit.sh \ + t9400-git-cvsserver-server.sh \ + t9401-git-cvsserver-crlf.sh \ + t9600-cvsimport.sh \ + t9601-cvsimport-vendor-branch.sh \ + t9602-cvsimport-branches-tags.sh \ + t9603-cvsimport-patchsets.sh" + local tests_perl="t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh" + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot="t0001-init.sh \ + t0004-unwritable.sh \ + t0070-fundamental.sh \ + t1004-read-tree-m-u-wf.sh \ + t3700-add.sh \ + t7300-clean.sh" + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled="${disabled} t5000-tar-tree.sh" + fi + + cvs=0 + use cvs && let cvs=$cvs+1 + if [[ ${EUID} -eq 0 ]]; then + if [[ $cvs -eq 1 ]]; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled="${disabled} ${tests_cvs}" + fi + einfo "Skipping other tests that require being non-root" + disabled="${disabled} ${tests_nonroot}" + else + [[ $cvs -gt 0 ]] && \ + has_version dev-vcs/cvs && \ + let cvs=$cvs+1 + [[ $cvs -gt 1 ]] && \ + built_with_use dev-vcs/cvs server && \ + let cvs=$cvs+1 + if [[ $cvs -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled="${disabled} ${tests_cvs}" + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled="${disabled} ${tests_perl}" + fi + + # Reset all previously disabled tests + cd "${S}/t" + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled} ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ + -i "${S}"/t/Makefile + + # Clean old results first + cd "${S}/t" + git_emake clean + + # Now run the tests + cd "${S}" + einfo "Start test run" + git_emake test + rc=$? + + # Display nice results + cd "${S}/t" + git_emake aggregate-results + + # And exit + [ $rc -eq 0 ] || die "tests failed. Please file a bug." +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + use python && python_mod_optimize git_remote_helpers + einfo "Please read /usr/share/bash-completion/git for Git bash completion" + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache )" + echo +} + +pkg_postrm() { + use emacs && elisp-site-regen + use python && python_mod_cleanup git_remote_helpers +} diff --git a/dev-vcs/git/git-1.7.8.6.ebuild b/dev-vcs/git/git-1.7.8.6.ebuild new file mode 100644 index 000000000000..679a765e5200 --- /dev/null +++ b/dev-vcs/git/git-1.7.8.6.ebuild @@ -0,0 +1,527 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.8.6.ebuild,v 1.1 2012/04/26 21:47:30 robbat2 Exp $ + +EAPI=4 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_DEPEND="python? 2" +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + +inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" +HOMEPAGE="http://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="gz" + SRC_URI_GOOG="http://git-core.googlecode.com/files" + SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + doc? ( + ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + )" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +else + SRC_URI="" + KEYWORDS="" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + !blksha1? ( dev-libs/openssl ) + sys-libs/zlib + perl? ( dev-lang/perl[-build] dev-libs/libpcre ) + tk? ( dev-lang/tk ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs )" + +RDEPEND="${CDEPEND} + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( virtual/perl-CGI ) + cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) + subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + python? ( gtk? + ( + >=dev-python/pygtk-2.8 + dev-python/pygtksourceview:2 + ) )" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + app-arch/cpio + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + )" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + DEPEND="${DEPEND} + app-text/asciidoc + app-text/xmlto" +fi + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + subversion? ( perl ) + webdav? ( curl ) +" + +pkg_setup() { + if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use python ; then + python_set_active_version 2 + python_pkg_setup + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local myopts + + if use blksha1 ; then + myopts="${myopts} BLK_SHA1=YesPlease" + elif use ppcsha1 ; then + myopts="${myopts} PPC_SHA1=YesPlease" + fi + + if use curl ; then + use webdav || myopts="${myopts} NO_EXPAT=YesPlease" + else + myopts="${myopts} NO_CURL=YesPlease" + fi + + # broken assumptions, because of broken build system ... + myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts="${myopts} INSTALL=install TAR=tar" + myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" + myopts="${myopts} SANE_TOOL_PATH=" + myopts="${myopts} OLD_ICONV=" + myopts="${myopts} NO_EXTERNAL_GREP=" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + use iconv \ + || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." + # || myopts="${myopts} NO_ICONV=YesPlease" + # because, above, we need to do this unconditionally (no "&& use iconv") + use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" + + use tk \ + || myopts="${myopts} NO_TCLTK=YesPlease" + use perl \ + && myopts="${myopts} INSTALLDIRS=vendor USE_LIBPCRE=yes" \ + || myopts="${myopts} NO_PERL=YesPlease" + use python \ + || myopts="${myopts} NO_PYTHON=YesPlease" + use subversion \ + || myopts="${myopts} NO_SVN_TESTS=YesPlease" + use threads \ + && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" + use cvs \ + || myopts="${myopts} NO_CVS=YesPlease" +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts="${myopts} NO_MMAP=YesPlease" +# myopts="${myopts} NO_IPV6=YesPlease" +# myopts="${myopts} NO_STRLCPY=YesPlease" +# myopts="${myopts} NO_MEMMEM=YesPlease" +# myopts="${myopts} NO_MKDTEMP=YesPlease" +# myopts="${myopts} NO_MKSTEMPS=YesPlease" +# fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts="${myopts} NO_NSEC=YesPlease" + fi + if [[ ${CHOST} == *-*-aix* ]]; then + myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" + fi + + has_version '>=app-text/asciidoc-8.0' \ + && myopts="${myopts} ASCIIDOC8=YesPlease" + myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts="${myopts} NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" + unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + use doc && \ + cd "${S}"/Documentation && \ + unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + cd "${S}" + else + git-2_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + # Noperl is being merged to upstream as of 2009/04/05 + #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch + + # GetOpt-Long v2.38 is strict + # Merged in 1.6.3 final 2009/05/07 + #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch + + # JS install fixup + # Merged in 1.7.5.x + #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch + + # USE=-iconv causes segfaults, fixed post 1.7.1 + # Gentoo bug #321895 + #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch + + # Fix false positives with t3404 due to SHELL=/bin/false for the portage + # user. + # Merged upstream + #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch + + # bug #350075: t9001: fix missing prereq on some tests + # Merged upstream + #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch + + # bug #350330 - automagic CVS when we don't want it is bad. + epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch + + sed -i \ + -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC = \).*$:\1$(OPTCC):' \ + -e 's:^\(AR = \).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL + + # Fix docbook2texi command + sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # bug #318289 + # Merged upstream + #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch + + # merged upstream + #epatch "${FILESDIR}"/git-1.7.5-interix.patch + + # merged upstream + #epatch "${FILESDIR}"/git-1.7.6-interix.patch +} + +git_emake() { + # bug #326625: PERL_PATH, PERL_MM_OPT + # bug #320647: PYTHON_PATH + PYTHON_PATH="" + use python && PYTHON_PATH="$(PYTHON -a)" + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + OPTCC="$(tc-getCC)" \ + OPTAR="$(tc-getAR)" \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + sysconfdir="${EPREFIX}"/etc \ + PYTHON_PATH="${PYTHON_PATH}" \ + PERL_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + "$@" + # This is the fix for bug #326625, but it also causes breakage, see bug + # #352693. + # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ +} + +src_configure() { + exportmakeopts +} + +src_compile() { + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el \ + || die "emacs modules failed" + fi + + if use perl && use cgi ; then + git_emake \ + gitweb/gitweb.cgi \ + || die "emake gitweb/gitweb.cgi failed" + fi + + cd "${S}"/Documentation + if [[ ${PV} == *9999 ]] ; then + git_emake man \ + || die "emake man failed" + if use doc ; then + git_emake info html \ + || die "emake info html failed" + fi + else + if use doc ; then + git_emake info \ + || die "emake info html failed" + fi + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + + dodoc README Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + use doc && dohtml -p ${d} Documentation${d}*.html + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + newbashcomp contrib/completion/git-completion.bash ${PN} + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} || die + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die + # don't add automatically to the load-path, so the sitefile + # can do a conditional loading + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die + fi + + if use python && use gtk ; then + dobin "${S}"/contrib/gitview/gitview + python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview + dodoc "${S}"/contrib/gitview/gitview.txt + fi + + dobin contrib/fast-import/git-p4 + dodoc contrib/fast-import/git-p4.txt + newbin contrib/fast-import/import-tars.perl import-tars + newbin contrib/git-resurrect.sh git-resurrect + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # emacs - installed above + # examples - these are stuff that is not used in Git anymore actually + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + for i in \ + blameview buildsystems ciabot continuous convert-objects fast-import \ + hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ + stats svn-fe vim workdir \ + ; do + cp -rf \ + "${S}"/contrib/${i} \ + "${ED}"/usr/share/${PN}/contrib \ + || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym /usr/share/gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + find "${ED}"/usr/lib64/perl5/ \ + -name .packlist \ + -exec rm \{\} \; + else + rm -rf "${ED}"/usr/share/gitweb + fi + + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + newinitd "${FILESDIR}"/git-daemon.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + + fixlocalpod +} + +src_test() { + local disabled="" + local tests_cvs="t9200-git-cvsexportcommit.sh \ + t9400-git-cvsserver-server.sh \ + t9401-git-cvsserver-crlf.sh \ + t9600-cvsimport.sh \ + t9601-cvsimport-vendor-branch.sh \ + t9602-cvsimport-branches-tags.sh \ + t9603-cvsimport-patchsets.sh" + local tests_perl="t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh" + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot="t0001-init.sh \ + t0004-unwritable.sh \ + t0070-fundamental.sh \ + t1004-read-tree-m-u-wf.sh \ + t3700-add.sh \ + t7300-clean.sh" + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled="${disabled} t5000-tar-tree.sh" + fi + + cvs=0 + use cvs && let cvs=$cvs+1 + if [[ ${EUID} -eq 0 ]]; then + if [[ $cvs -eq 1 ]]; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled="${disabled} ${tests_cvs}" + fi + einfo "Skipping other tests that require being non-root" + disabled="${disabled} ${tests_nonroot}" + else + [[ $cvs -gt 0 ]] && \ + has_version dev-vcs/cvs && \ + let cvs=$cvs+1 + [[ $cvs -gt 1 ]] && \ + built_with_use dev-vcs/cvs server && \ + let cvs=$cvs+1 + if [[ $cvs -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled="${disabled} ${tests_cvs}" + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled="${disabled} ${tests_perl}" + fi + + # Reset all previously disabled tests + cd "${S}/t" + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled} ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ + -i "${S}"/t/Makefile + + # Clean old results first + cd "${S}/t" + git_emake clean + + # Now run the tests + cd "${S}" + einfo "Start test run" + git_emake test + rc=$? + + # Display nice results + cd "${S}/t" + git_emake aggregate-results + + # And exit + [ $rc -eq 0 ] || die "tests failed. Please file a bug." +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + use python && python_mod_optimize git_remote_helpers + einfo "Please read /usr/share/bash-completion/git for Git bash completion" + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache )" + echo +} + +pkg_postrm() { + use emacs && elisp-site-regen + use python && python_mod_cleanup git_remote_helpers +} diff --git a/dev-vcs/git/git-1.7.9.7.ebuild b/dev-vcs/git/git-1.7.9.7.ebuild new file mode 100644 index 000000000000..b03c14ac2660 --- /dev/null +++ b/dev-vcs/git/git-1.7.9.7.ebuild @@ -0,0 +1,565 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.9.7.ebuild,v 1.1 2012/04/26 21:47:30 robbat2 Exp $ + +EAPI=4 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_DEPEND="python? 2" +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" + +inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" +HOMEPAGE="http://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="gz" + SRC_URI_GOOG="http://git-core.googlecode.com/files" + SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + doc? ( + ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + )" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="" # Pending git-svn fixes +else + SRC_URI="" + KEYWORDS="" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gtk iconv +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + !blksha1? ( dev-libs/openssl ) + sys-libs/zlib + pcre? ( dev-libs/libpcre ) + perl? ( dev-lang/perl[-build] ) + tk? ( dev-lang/tk ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs )" + +RDEPEND="${CDEPEND} + app-crypt/gnupg + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( virtual/perl-CGI app-text/highlight ) + cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) + subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + python? ( gtk? + ( + >=dev-python/pygtk-2.8 + dev-python/pygtksourceview:2 + ) )" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + app-arch/cpio + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + ) + test? ( + app-crypt/gnupg + )" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + DEPEND="${DEPEND} + app-text/asciidoc + app-text/xmlto" +fi + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + subversion? ( perl ) + webdav? ( curl ) +" + +pkg_setup() { + if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use python ; then + python_set_active_version 2 + python_pkg_setup + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local myopts + + if use blksha1 ; then + myopts="${myopts} BLK_SHA1=YesPlease" + elif use ppcsha1 ; then + myopts="${myopts} PPC_SHA1=YesPlease" + fi + + if use curl ; then + use webdav || myopts="${myopts} NO_EXPAT=YesPlease" + else + myopts="${myopts} NO_CURL=YesPlease" + fi + + # broken assumptions, because of broken build system ... + myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts="${myopts} INSTALL=install TAR=tar" + myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" + myopts="${myopts} SANE_TOOL_PATH=" + myopts="${myopts} OLD_ICONV=" + myopts="${myopts} NO_EXTERNAL_GREP=" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + use iconv \ + || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." + # || myopts="${myopts} NO_ICONV=YesPlease" + # because, above, we need to do this unconditionally (no "&& use iconv") + use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" + + use tk \ + || myopts="${myopts} NO_TCLTK=YesPlease" + use pcre \ + && myopts="${myopts} USE_LIBPCRE=yes" + use perl \ + && myopts="${myopts} INSTALLDIRS=vendor" \ + || myopts="${myopts} NO_PERL=YesPlease" + use python \ + || myopts="${myopts} NO_PYTHON=YesPlease" + use subversion \ + || myopts="${myopts} NO_SVN_TESTS=YesPlease" + use threads \ + && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" + use cvs \ + || myopts="${myopts} NO_CVS=YesPlease" +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts="${myopts} NO_MMAP=YesPlease" +# myopts="${myopts} NO_IPV6=YesPlease" +# myopts="${myopts} NO_STRLCPY=YesPlease" +# myopts="${myopts} NO_MEMMEM=YesPlease" +# myopts="${myopts} NO_MKDTEMP=YesPlease" +# myopts="${myopts} NO_MKSTEMPS=YesPlease" +# fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts="${myopts} NO_NSEC=YesPlease" + fi + if [[ ${CHOST} == *-*-aix* ]]; then + myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" + fi + + has_version '>=app-text/asciidoc-8.0' \ + && myopts="${myopts} ASCIIDOC8=YesPlease" + myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts="${myopts} NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" + unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + use doc && \ + cd "${S}"/Documentation && \ + unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + cd "${S}" + else + git-2_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + # Noperl is being merged to upstream as of 2009/04/05 + #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch + + # GetOpt-Long v2.38 is strict + # Merged in 1.6.3 final 2009/05/07 + #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch + + # JS install fixup + # Merged in 1.7.5.x + #epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch + + # USE=-iconv causes segfaults, fixed post 1.7.1 + # Gentoo bug #321895 + #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch + + # Fix false positives with t3404 due to SHELL=/bin/false for the portage + # user. + # Merged upstream + #epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch + + # bug #350075: t9001: fix missing prereq on some tests + # Merged upstream + #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch + + # bug #350330 - automagic CVS when we don't want it is bad. + epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch + + sed -i \ + -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC = \).*$:\1$(OPTCC):' \ + -e 's:^\(AR = \).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL + + # Fix docbook2texi command + sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # bug #318289 + # Merged upstream + #epatch "${FILESDIR}"/git-1.7.3.2-interix.patch + + # merged upstream + #epatch "${FILESDIR}"/git-1.7.5-interix.patch + + # merged upstream + #epatch "${FILESDIR}"/git-1.7.6-interix.patch + + # Newer versions of SVN hate a whitespace in the file URL. + # So we avoid that by replaced the space with an underscore. + #Initialized empty Git repository in /dev/shm/portage/dev-vcs/git-9999/work/git-9999/t/t d.t9155/git_project/.git/ + #svn: E235000: In file 'subversion/libsvn_subr/dirent_uri.c' line 2291: assertion failed (svn_uri_is_canonical(url, pool)) + # + # With this change the following tests still fail: t9100 t9118 t9120 + # Without it, MOST of t91* fails, due to the space tripping up the + # svn_uri_is_canonical. + # + # git-svn actually needs to be fixed here, but this chagne is useful for + # testing it. + # + # This patch is my work to date on fixing git-svn, but it causes more + # breakage than it fixes (it's manually-edited now to do nothing). + #epatch "${FILESDIR}"/git-1.7.8-git-svn-1.7-canonical-path.patch + cd "${S}"/t + sed -i \ + -e 's/trash directory/trash_directory/g' \ + test-lib.sh t0000-basic.sh Makefile || die "sed failed" +} + +git_emake() { + # bug #326625: PERL_PATH, PERL_MM_OPT + # bug #320647: PYTHON_PATH + PYTHON_PATH="" + use python && PYTHON_PATH="$(PYTHON -a)" + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + OPTCC="$(tc-getCC)" \ + OPTAR="$(tc-getAR)" \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + sysconfdir="${EPREFIX}"/etc \ + PYTHON_PATH="${PYTHON_PATH}" \ + PERL_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + "$@" + # This is the fix for bug #326625, but it also causes breakage, see bug + # #352693. + # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ +} + +src_configure() { + exportmakeopts +} + +src_compile() { + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el \ + || die "emacs modules failed" + fi + + if use perl && use cgi ; then + git_emake \ + gitweb/gitweb.cgi \ + || die "emake gitweb/gitweb.cgi failed" + fi + + cd "${S}"/Documentation + if [[ ${PV} == *9999 ]] ; then + git_emake man \ + || die "emake man failed" + if use doc ; then + git_emake info html \ + || die "emake info html failed" + fi + else + if use doc ; then + git_emake info \ + || die "emake info html failed" + fi + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + + dodoc README Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + use doc && dohtml -p ${d} Documentation${d}*.html + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + newbashcomp contrib/completion/git-completion.bash ${PN} + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} || die + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die + # don't add automatically to the load-path, so the sitefile + # can do a conditional loading + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die + fi + + if use python && use gtk ; then + dobin "${S}"/contrib/gitview/gitview + python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview + dodoc "${S}"/contrib/gitview/gitview.txt + fi + + dobin contrib/fast-import/git-p4 + #dodoc contrib/fast-import/git-p4.txt # Moved upstream + newbin contrib/fast-import/import-tars.perl import-tars + newbin contrib/git-resurrect.sh git-resurrect + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # emacs - installed above + # examples - these are stuff that is not used in Git anymore actually + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + for i in \ + blameview buildsystems ciabot continuous convert-objects fast-import \ + hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ + stats svn-fe vim workdir \ + ; do + cp -rf \ + "${S}"/contrib/${i} \ + "${ED}"/usr/share/${PN}/contrib \ + || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym /usr/share/gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + find "${ED}"/usr/lib64/perl5/ \ + -name .packlist \ + -exec rm \{\} \; + else + rm -rf "${ED}"/usr/share/gitweb + fi + + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + newinitd "${FILESDIR}"/git-daemon.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + + fixlocalpod +} + +src_test() { + local disabled="" + local tests_cvs="t9200-git-cvsexportcommit.sh \ + t9400-git-cvsserver-server.sh \ + t9401-git-cvsserver-crlf.sh \ + t9600-cvsimport.sh \ + t9601-cvsimport-vendor-branch.sh \ + t9602-cvsimport-branches-tags.sh \ + t9603-cvsimport-patchsets.sh" + local tests_perl="t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh" + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot="t0001-init.sh \ + t0004-unwritable.sh \ + t0070-fundamental.sh \ + t1004-read-tree-m-u-wf.sh \ + t3700-add.sh \ + t7300-clean.sh" + # t9100 t9118 t9120 all fail with SVN 1.7, despite the workaround for spaces + # in the test directory. + local test_svn="t9100-git-svn-basic.sh \ + t9118-git-svn-funky-branch-names.sh \ + t9120-git-svn-clone-with-percent-escapes.sh" + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled="${disabled} t5000-tar-tree.sh" + fi + + cvs=0 + use cvs && let cvs=$cvs+1 + if [[ ${EUID} -eq 0 ]]; then + if [[ $cvs -eq 1 ]]; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled="${disabled} ${tests_cvs}" + fi + einfo "Skipping other tests that require being non-root" + disabled="${disabled} ${tests_nonroot}" + else + [[ $cvs -gt 0 ]] && \ + has_version dev-vcs/cvs && \ + let cvs=$cvs+1 + [[ $cvs -gt 1 ]] && \ + built_with_use dev-vcs/cvs server && \ + let cvs=$cvs+1 + if [[ $cvs -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled="${disabled} ${tests_cvs}" + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled="${disabled} ${tests_perl}" + fi + + einfo "Disabling tests that fail with SVN 1.7" + disabled="${disabled} ${test_svn}" + + # Reset all previously disabled tests + cd "${S}/t" + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled} ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ + -i "${S}"/t/Makefile + + # Clean old results first, must always run + cd "${S}/t" + nonfatal git_emake clean + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + cd "${S}" + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + cd "${S}/t" + nonfatal git_emake aggregate-results + + # And bail if there was a problem + [ $rc -eq 0 ] || die "tests failed. Please file a bug." +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + use python && python_mod_optimize git_remote_helpers + einfo "Please read /usr/share/bash-completion/git for Git bash completion" + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache )" + echo +} + +pkg_postrm() { + use emacs && elisp-site-regen + use python && python_mod_cleanup git_remote_helpers +} |