diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2009-05-08 20:20:27 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-05-08 20:20:27 +0000 |
| commit | a8a45db91cf6125352f24fe43ab676678202777d (patch) | |
| tree | 687de32047bd373198ba6427288e84295c9f5b46 /dev-util/git | |
| parent | Version bump. (diff) | |
| download | historical-a8a45db91cf6125352f24fe43ab676678202777d.tar.gz historical-a8a45db91cf6125352f24fe43ab676678202777d.tar.bz2 historical-a8a45db91cf6125352f24fe43ab676678202777d.zip | |
Cleanup old ebuilds and files.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'dev-util/git')
32 files changed, 17 insertions, 6758 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index 42aa59864820..f1ce065f67cd 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for dev-util/git # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.340 2009/05/08 20:15:16 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.341 2009/05/08 20:20:27 robbat2 Exp $ + + 08 May 2009; Robin H. Johnson <robbat2@gentoo.org> -git-1.5.1.6.ebuild, + -git-1.5.3.7-r1.ebuild, -git-1.5.3.8.ebuild, + -files/git-1.5.3.8-t9101.patch, -files/git-1.5.3.8-t9106.patch, + -files/20080322-git-1.5.4.4-noperl.patch, -git-1.5.5.4.ebuild, + -files/70git-gentoo.el, -files/git-1.5.0-symlinks.patch, + -git-1.5.4.5.ebuild, -files/20080423-git-1.5.5.1-noperl.patch, + -git-1.5.5.3.ebuild, -git-1.5.5.3-r1.ebuild, + -files/20080528-git-1.5.5.3-noperl.patch, -git-1.5.6.1.ebuild, + -files/50git-gentoo.el, -git-1.5.6.2.ebuild, -files/72git-gentoo.el, + -files/git-1.5.3-symlinks.patch, -git-1.5.6.3.ebuild, -git-1.5.6.4.ebuild, + -git-1.5.6.5.ebuild, -git-1.6.0.ebuild, -git-1.6.0.1.ebuild, + -git-1.6.0.2.ebuild, -git-1.6.0.3.ebuild, -git-1.6.0.4.ebuild, + -git-1.6.0.4-r1.ebuild, -git-1.6.0.4-r2.ebuild, -git-1.6.3_rc4.ebuild: + Cleanup old ebuilds and files. *git-1.6.3 (08 May 2009) diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest index 13d76778e73f..b9ba757e2f5d 100644 --- a/dev-util/git/Manifest +++ b/dev-util/git/Manifest @@ -1,39 +1,13 @@ -AUX 20080322-git-1.5.4.4-noperl.patch 11055 RMD160 a184a12108077bbb44ccce42da2b5f603fdc27d8 SHA1 1437ecf11405109d38fe63a4ab29fbed55eb0b60 SHA256 76c706775095987ca073bb0229c93d7a972d61ddebeed598fbba4bc15112a60f -AUX 20080423-git-1.5.5.1-noperl.patch 10399 RMD160 dbe5bcfb2e6a6b924807cc2f9458c25c2e1a5399 SHA1 7ad957a4a6ae2414a3eea0ec491cbceb362d2000 SHA256 e681fcf677a141c81ef2e7460cb03b2f0d1fe346c175a1ebdc2323818f615c35 -AUX 20080528-git-1.5.5.3-noperl.patch 10902 RMD160 9a0b7c5a11828c0e0cff3486b0318225b6a9b49c SHA1 1792d05d37d91ccb2531c84938846d4cbcab415c SHA256 d5b1eac4c06c26dbc0f751865c356eaf3a2bb5cf34558f46c1533d71c0b51307 AUX 20080626-git-1.5.6.1-noperl.patch 10962 RMD160 d5b71452273dacfff9359a404f800ec9bd5c5b62 SHA1 147782b4e013451c776be54e619ebc8755366667 SHA256 4be119db2b71423d700c1b579ff2f2feb5b132ef24a202cc2e4da4a93fadb3ba AUX 20081123-git-1.6.0.4-noperl-cvsserver.patch 880 RMD160 7e42034154ccb951c09426e64810df5be02d98b7 SHA1 9372646c8765662907b3e63b6ddb46f97797af60 SHA256 b597ae1c3efde22e52cc7a37aecab9ae041ecfbe0be29d917635c6df083d1249 AUX 20090126-git-1.6.1.1-noperl.patch 11351 RMD160 e634e0ef8a0219181cb0cd4eb9ea728f4ae887e2 SHA1 d64526128ecbe1007d115d6bd05d815a42c00155 SHA256 55304324bc02384983fcd1804b3829addd6a20d7a3c6f84165b34685a928a405 AUX 20090305-git-1.6.2-noperl.patch 11957 RMD160 2cd78ae5cb0ec9ed99afce8bf535f98c7dd22507 SHA1 c292c0461f76dfe09d84c70a1510f9e18fafb3d2 SHA256 3da4539a601490de420f031839c5e1e79a3b07fc1fe1ac4eb8f5cede3bf0f0c0 AUX 20090505-git-1.6.2.5-getopt-fixes.patch 1091 RMD160 20a7d840bc8afb54bfd0ce3a75795e4f574fbe8c SHA1 b53a581f5f822d1e27aaae9b49ccb289d196b2d6 SHA256 4e7aeeb9a456153e5d8473cac8c4bd133d2a05a7168c86f0d0dc9eebcf05c703 -AUX 50git-gentoo.el 473 RMD160 3ae4696cc90d35bf2a1dca17cfe2fda78c0025e4 SHA1 7b67b759e6c3fc27552b211a6a48f3e4e2018c24 SHA256 c32f14d036e5ccb5c4583621dc10903346ab810ee838457e2de6e53d883348c0 -AUX 70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd SHA1 332f9cbf5a1dbb176e54646fa23aa140aee917f7 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a -AUX 72git-gentoo.el 429 RMD160 43797e6aaa00415b1b2394d148a67871ef0a7dd2 SHA1 b8530bdb685f7fb80d9ebdf380fdd08c23a6dc1d SHA256 a152c82e7056c81d80dfe2a3b75effe755235fc97651eabd14aa81bc10941e73 -AUX git-1.5.0-symlinks.patch 652 RMD160 248ec978bd7aece96b0a9b27b2da00f5a6fa400b SHA1 0a19157c0c577e3560443a9a636684b0477eadf8 SHA256 52f7e1394f41b0138682b196fd12a5acd0a04e524317a815dd464e67d9e0bd09 -AUX git-1.5.3-symlinks.patch 645 RMD160 24fc6002042e67611f337cae3867bb400fd8c7d6 SHA1 f64270b9a85248057fc8034efda4d102fa9279c9 SHA256 dc8786302f5806eff376f3d1921c85d4907fda0318aa20c2c4a73ca8aea58340 -AUX git-1.5.3.8-t9101.patch 878 RMD160 8202afb8f1b8a7ac763ffa0e575aed3feb8a6847 SHA1 6d9c1ed47cec9713ec2e4c6c26f19ede673b8fce SHA256 8f16f4c811010eb4f20e643c9a0c303470bb76451dd729154a1f20d01453bc0e -AUX git-1.5.3.8-t9106.patch 897 RMD160 5651dc89e42066b91e525dcbc367f42fa4db79a4 SHA1 e306f87501e98caf587d1e6a86ceef7b9e35139e SHA256 ede8da4f5eb3b9f4824b8db1cdb4d4bd9a1d854ca0676241c2509856dbd49f98 AUX git-daemon.confd 700 RMD160 2dea5af0c6b3aa5304aa5417bb40099bd4cdb45b SHA1 0b7c3078c4d284eb2572a5fb7c1efff5a4837f6e SHA256 9ca387e81ca875d4e543fa64398620451ff74273fa06b122a6af47db1fee1630 AUX git-daemon.initd 741 RMD160 83ab8615b51c521ac0b961b42de7a7955f81147f SHA1 1dacace343cb952cab793cf46be110969473f84b SHA256 16a684cc66377e2840d09dd8cc39ed4cb13ce4807e22039f8bc176dff030ddec AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 88d6fc44644c88ed6f2ce54a936f41dc15d2268e SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 AUX vim-ftdetect-gitcommit.vim 261 RMD160 9abf9cb8443082820b978d4890caa021f6da6342 SHA1 6f179228555a6316281db247653ec930877741e4 SHA256 ada04f0d5a61ca71ca50b01cd92f010e906f1ae19ecb263ac38e714b087515fe -DIST git-1.5.1.6.tar.bz2 1130713 RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1 SHA1 c1e34ce6a6a9a81bb16f158ef84b4576e6be1b0c SHA256 4429ca98c0789b0f564cdbf76e8e8ad4db928b7c7ac94f116e4a0729e4253a21 -DIST git-1.5.3.7.tar.bz2 1361540 RMD160 74bfccd50c895e22d10b9e25f481f00a20617077 SHA1 95c3b64d34f28db8122e30f28dc5758ebbc8469b SHA256 f4f03dd1a5255019c2d771a04b8a647509b4c6cf51728acc50e8f26d99e62fec -DIST git-1.5.3.8.tar.bz2 1363259 RMD160 8e35e67cc94152c681849e14cb4aec86f1b316cf SHA1 acca91988e674c5976e15a290be65f2775296162 SHA256 f98c6b900c9f3b87a1fbbe0c5f466e9d981cb9f1d193066b6d371df4b8066b77 -DIST git-1.5.4.5.tar.bz2 1597118 RMD160 7aef5f5284bf04efb5f03a8525f39b2498a0a1ef SHA1 69c4b904f13b72f57405393d54f33831c9cfad8f SHA256 fb6c8745eb5f379ed36bcd7f216bb5294996a93801d30ec69521f2bdd51ead38 -DIST git-1.5.5.3.tar.bz2 1677113 RMD160 943239f63ed024a1819fbe1f6d774b1c58081a6c SHA1 a679d56457b54d15c7ef0ed34396c11ff5d4758c SHA256 c0a5220e7c80dc791e2077ec238298c2ec30af4d8d0ed6d2fbd7ca808266dfc0 -DIST git-1.5.5.4.tar.bz2 1677894 RMD160 8341ad42ce92e8fc196266779c13db013a9dfa6d SHA1 7c4391fb4bc98a6c98e4cf891bf327bc5366e83b SHA256 0c052b8bbf5bbb787f17ac334dc839b2e6dce3a3158f0a5893d4b86e80de61a3 -DIST git-1.5.6.1.tar.bz2 1735514 RMD160 95f70e8025ac2cc978370d34bd1809f066bf82e7 SHA1 c7ddeeb3f78461815653bbaf59ed1156a9b0fa5f SHA256 076a61e899d5494251cfe4b29a231a7ff9175ed86d724fc5aa94256f506a6586 -DIST git-1.5.6.2.tar.bz2 1739162 RMD160 8471104775895b7a24a76f4d08b5b5a61f94b91c SHA1 c725c44d0cf198c74a239953891b60fbd9593611 SHA256 12305f224c17eb0a67bc4ba491e39830f82ff1c6617dad5af8c5ba9914cf042f -DIST git-1.5.6.3.tar.bz2 1739562 RMD160 1803475a99a2802ea3701b65b0f4f1ab28b7fee8 SHA1 d1eddee4d4e78231f8eae96199e7f0b2e8f98096 SHA256 abe6d19c8a3bca97802e655ebb4c11c5f8c98d33ca87aa1b68df74f8a02815d1 -DIST git-1.5.6.4.tar.bz2 1740619 RMD160 40aff0b5b8213b04f7a2eb6de806cac0d66cbe57 SHA1 fa27ec07966ba52ed639aa8dcbf52fee58e98b1a SHA256 25ae4f93c14efd84c8dbce1598f182bc4bbfafdccb22bc7965b54473600aafd9 -DIST git-1.5.6.5.tar.bz2 1743402 RMD160 9f8762d3f9d3df18f49616561bf9404c878bcde2 SHA1 5961912d301ecd9945667642c6c2ff9c299242e7 SHA256 692901194603cc4fb4072d8f907487d867caef6b62161f50f0f44dbeb001066e -DIST git-1.6.0.1.tar.bz2 1861853 RMD160 2820a1ec30b1572aa7db6f254ee672b916aaf3e6 SHA1 fdab99fe9ffe0625812dd1e019df3c37f0a52e2c SHA256 0bd0f4eb5da015913c6415d5f8ffecd4f6233daef7f275b99f6120935fc1f6ee -DIST git-1.6.0.2.tar.bz2 1865485 RMD160 eb91ca256d0fbcc956f91ad02da659d9b322261d SHA1 4a1d78604d1fb6c0deb43a498feb454970fb6704 SHA256 a332fbcb1c9cf8b1dc224135d5b14e99da4720fc8b082e595b4f20eaf640dad8 -DIST git-1.6.0.3.tar.bz2 1874309 RMD160 0109ac07d0a6ea911526be8e40edb797c032a1bf SHA1 9144717196a0c8c18f0b412b137697a70b255f2a SHA256 4a15393da4059587a633686174b46aef3d1f1e4e0280c6352dbde517c01c300b -DIST git-1.6.0.4.tar.bz2 1876842 RMD160 c4ca52d92993955b551ed26e6ef01529b716aa6d SHA1 6e9471519d482894ffd7ecc10cf2c09506971e3d SHA256 f8ccac357f2c721e735ae16bbb02a420d2aaaed483f5d46043c5fe627ab4b260 DIST git-1.6.0.6.tar.bz2 1882225 RMD160 897a02479c527dad0ba821e599a5cff94d933ce9 SHA1 80ad0c2a450e182322c6e006f9345b784dfc66e3 SHA256 e1d65bece5e8da1b72db22d3f6f2cbcefd28360c7f5bba141af436f43f887d0c -DIST git-1.6.0.tar.bz2 1860591 RMD160 ae3a0d3a39592f7ca2c9908917eb433860b71c38 SHA1 873fbe7141042ed96e5aa3178cb159b5636f60ed SHA256 b8d71cd080c059f4e5d949b1fd6a5c42ca648562326b7dcc04d9f06a777142f0 DIST git-1.6.1.1.tar.bz2 1972491 RMD160 ac7b553339ae2f2ca52de1cc351da64e1bebca4c SHA1 ec0c6f941945cb356db3f5c61fb2e2d046e2f08a SHA256 ebc170c0e932ff74d8f99d705f88babe0e2691bb262a2f7ad3d91f116b9eb3e2 DIST git-1.6.1.2.tar.bz2 1973153 RMD160 9a914c456f04a912755a1ccb886d4b179434f91a SHA1 27b9c73e5f04cfe949ae1dfa785c6ebb1cfa98fa SHA256 5b943fdfd8d347e59dda6c7547342ccdbc7c40aa1a24344e09bdce18dde8b4dd DIST git-1.6.1.3.tar.bz2 1973574 RMD160 a8ac0590084e27cc3ab9471cd6ebba18b3876c75 SHA1 552805bf9070d886be20782b3ddb5a4a824a41bc SHA256 aef4814634ac9ce8119fabc4bd1c363bb946f73ed34475a4baaad09a3fb23682 @@ -42,25 +16,8 @@ DIST git-1.6.2.2.tar.bz2 2016513 RMD160 c48641c3b995222d2b70f85482e66d9f66bc1734 DIST git-1.6.2.3.tar.bz2 2017249 RMD160 6df25ea7e1b51cf2aeeac02e8df6ec55257a46d2 SHA1 902452eff5f35b4a915f6e4d90a83391b765ed4d SHA256 c61eaf1c775b56b1421d1f53e4cd4f1eb9a0fd874d653f4810db126cf14651ba DIST git-1.6.2.5.tar.bz2 2019842 RMD160 3b8d0e2e49a3dffff6a2b1f775d97d0a75163330 SHA1 8986395a863b1d1428d578a8451c3c258226d53a SHA256 aca52a50e45a8fc3a6dd6705466afdc7d6d78d5d4ed7c44e9d60a0f29ba3219e DIST git-1.6.2.tar.bz2 2016213 RMD160 7e28be59954173666e26940ca66dd95f99cf029b SHA1 685b9e203786dd4bcd7672088bcac42e22930ee0 SHA256 ab7dc40240092aa2e72a8db7e0045893ca5fa07a936e9fa83b242248e3c9f635 -DIST git-1.6.3.rc4.tar.bz2 2055437 RMD160 cf07f48a145a8ed38b122761b4f6e3034ec3f1b4 SHA1 df53c134e3d5ea0b8fcd77db4719f288f6c38692 SHA256 1fbaae9feca168a8b4b9bff25d75b1ac7912d6dfb0883ef8267e7c69bd1429b9 DIST git-1.6.3.tar.bz2 2057039 RMD160 b496878b113ae8d13d2eaa1b65e4dd2d8e72834d SHA1 1dab1068d1886828bdb512e9b809bc779de35609 SHA256 1c28afd152d3f254be884c288a0d8de9a72de9af5d7fac3f2df43b096b103cdc -DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685 -DIST git-htmldocs-1.5.3.7.tar.bz2 549391 RMD160 18d01c803fd529ac897ae249ce4e05193ee9850a SHA1 926fb29604d69ce45ecf7b57d1b8feeb6c356f9b SHA256 e28c7e149e0f5adb66093af287dffe0caef83926ae08c6cdb6a2d35bc9148d04 -DIST git-htmldocs-1.5.3.8.tar.bz2 549444 RMD160 f4df777094158beea16bd2f0783ef846198e2c36 SHA1 d822887c45437daebf08c7cfe6e93a4ce5136fd3 SHA256 200a7231d6a594aeb5cb0c0e1cf25513c086f53b84170c7c5376199b2659b874 -DIST git-htmldocs-1.5.4.5.tar.bz2 613736 RMD160 fe901c0a8da70e9066a944d36118b1ff21416284 SHA1 7087b54af84b8d91fec8d9a48c8f746047d3cd6a SHA256 13b1fd78a7b7205668acf0dd81f1b5df37bd19172a0cbb41efe9320f87985a22 -DIST git-htmldocs-1.5.5.3.tar.bz2 643807 RMD160 32864d36243242d1ddbd346e177d0bcdf528d222 SHA1 6642972d4e600c1937e4ffc17f99ea11d22825c2 SHA256 b6fe9102239a64bf98ce754e74decf9e668a80cc962008c0c3eb6640d36e8ce6 -DIST git-htmldocs-1.5.5.4.tar.bz2 643840 RMD160 5c1e79aee962b584f377defdac4b703fee3a3ee6 SHA1 26d4bd19033583e8ba0a3ee6a33439154db81a4a SHA256 7cd63bee042afeb6508c4c66b3e8160cc09586d605fda948977259294d7a4c8c -DIST git-htmldocs-1.5.6.1.tar.bz2 678559 RMD160 70a432e590306678235ff93c20097f8fb4f3bc61 SHA1 3af8649dd6d5b4c86b590229c891782ecf869eb4 SHA256 5ae41e1236f2e622c0cf807ea433989cbe79e38cd4f4e30e44f34a56887bb249 -DIST git-htmldocs-1.5.6.2.tar.bz2 688654 RMD160 015b45c3bc234cd82b5594289be71144432a5b42 SHA1 d7117b02788153e92a5d632403cc460cd90c0f95 SHA256 ab067c2e3dd5e13c306e82c5ce8f206405791f0bb83d7f103afce43a1ce96e5d -DIST git-htmldocs-1.5.6.3.tar.bz2 689311 RMD160 b2e7df2f34e1dd4f5561c162e0394ce53d2d0c99 SHA1 b7027541edf509656dff69723eaaa0940db56033 SHA256 68c1a41d3ecca0b233cd77adcde7c7cd8e9123fbff4e9e49a3ef9eb3b94a1404 -DIST git-htmldocs-1.5.6.4.tar.bz2 690297 RMD160 966b4b14d09496f8b50449fe4cb73ab509279a3c SHA1 118171fd0e52cbc8cc135364cf1836c9f923f931 SHA256 ca6d33bea9d204425a238315b5f6d42ad17db9be06f9cbc9cf1a05d2c555528e -DIST git-htmldocs-1.5.6.5.tar.bz2 690327 RMD160 a04542bb10b642e34bb5c32c5e4dbb2f1efbe2ec SHA1 f193cdf1c5a53a379a4b58b1992650c1fb80f727 SHA256 c3c1dc28cb89efc0f63a0ece2be16f3b14abe515d31afbf00f6f8d08a17a2959 -DIST git-htmldocs-1.6.0.1.tar.bz2 705872 RMD160 dda5c1d99148319f3847ad9fe200e68804eb3340 SHA1 d9d2ac9f3e46f82d1610b9e51f5b66a5b0f45cf4 SHA256 18cdbb4439cae49745c504b1c2259de8c892fc69a8c6fa807048f9ca5390bf74 -DIST git-htmldocs-1.6.0.2.tar.bz2 708053 RMD160 694a3ae65337336674a0e5bf38c7382f86f3381d SHA1 ba96fbe8b938df9084e962c70a3a5076b2230371 SHA256 8e3e86f0d2175c1c2e9fc8016352f8524e546253a0b301653b05f132b1b1691d -DIST git-htmldocs-1.6.0.3.tar.bz2 710365 RMD160 69b59fa8dc81d6faeffc93ce8fb02e2cc3076551 SHA1 b385580adc81a07b671f2c4af7a3aa6d281c5455 SHA256 5aad1de2c00912a26eee1f3cbbdac4ee0d3f804f7aac0862d0f141199aaffe2b -DIST git-htmldocs-1.6.0.4.tar.bz2 685868 RMD160 3a3bb7d52623efb46c71b751b32cb39b0785f87c SHA1 2ce03c496bc6d332cfaed4bd58ddb0a0bce3adea SHA256 207b91956a9451a42c5e2488fe4310c3455756d10180bc1aae2003976f45a4f0 DIST git-htmldocs-1.6.0.6.tar.bz2 691282 RMD160 9b268ac521da2bf03995533d53dc3f7d43897ef1 SHA1 9eecc27e26e88c8f7ed0eea658c2c2d71ec9b9a6 SHA256 1738845dfe336dee5bd736a37823876e32cf633dc2a9bf7047bd35a0c3b64e58 -DIST git-htmldocs-1.6.0.tar.bz2 704837 RMD160 7acb9b23946221a4d86e4f66fa3bf09b100ec603 SHA1 779f5145a66275444a67968c208cccb2296f739d SHA256 31fdd420327d39b6fe0ef8298b72b3b6cbdb4f35a3657abbe279f3c042dcc988 DIST git-htmldocs-1.6.1.1.tar.bz2 714757 RMD160 1931b5df8ff338f9d343a8bc23d7093e1a258829 SHA1 7a95c18b3a30d23ce9c191a1c6fd92d009e28410 SHA256 c2e06539987c7dcccc078a5226c1b3276a6cbed03e33e891b8fd764331358a63 DIST git-htmldocs-1.6.1.2.tar.bz2 714986 RMD160 385abceae209a2bd5a06f67ba0080386db97114d SHA1 2532607649094fe3d242b8ddd14ed80c6f244276 SHA256 cb136674805e400fa4276836371a40722f5d36427c30a3d26010f7cd7a68e941 DIST git-htmldocs-1.6.1.3.tar.bz2 715371 RMD160 208f26df5f9f25659898cdae9d88ace2a81a0bf2 SHA1 c728dc2928f40e63fb7d53a07bc59ebb568abf44 SHA256 de2c32e1e499963f267a6b8344aa98e1e679a67cd6d98aa6f1568dacc0e23e8d @@ -69,25 +26,8 @@ DIST git-htmldocs-1.6.2.2.tar.bz2 730394 RMD160 71e189cc6b0ce212ad468664a6fba87f DIST git-htmldocs-1.6.2.3.tar.bz2 730139 RMD160 adfc3807858333533998a3e6fcb87023c94a87a5 SHA1 89b0b5ad1c1524088250b887a3b7cde03b309e64 SHA256 5eecea976d555f264f73572ee3f97ddf6a721b33ad2b8744049c0df6b5c02329 DIST git-htmldocs-1.6.2.5.tar.bz2 730033 RMD160 12af33f7e0de610cc792979bd1f74ec88600ee97 SHA1 f5c874be7c8db12bcc9ff91291f7db0908b956ad SHA256 727a7f9dd3dffdc55958dd690297c9d5f39d53ca1d3f7add29761fc36303d406 DIST git-htmldocs-1.6.2.tar.bz2 727053 RMD160 a915884c94ac1cf2311389b32c410d12203b43e5 SHA1 4943d51bf49a574e1cefe3833ef6820964b40455 SHA256 e8847d1d2051db1ac1c8a9cf838584d52aad3ea999fb038fd76751ab14bf6a55 -DIST git-htmldocs-1.6.3.rc4.tar.bz2 741137 RMD160 227b83c87931a62dce6324742e69edc06977ff9a SHA1 8153a15bab07c7e027e9f9d4f4c3fc6a2b324f63 SHA256 4004f4690918f74d69924f9c5f43b2723384a337d430f2ad6e46b2784b094c88 DIST git-htmldocs-1.6.3.tar.bz2 741684 RMD160 5875aa7485184592c9cd95697983dd63e427db3b SHA1 9526c6cece4ad11a27241638d875a71c0a75f61b SHA256 6146e31c11bd81aeb34c5992d3ac6819b9298ce9d64bdac11f8416896347053d -DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d -DIST git-manpages-1.5.3.7.tar.bz2 147932 RMD160 fd4b45c221cbc63f580a32595c59eb52da1baa2f SHA1 7cc45f156298d0fbd4ead4a9b2096ed2143287b8 SHA256 870e68ef57f4175152b9b8decc721d8cbc9850ed8eda73919fc9e060f3968ffa -DIST git-manpages-1.5.3.8.tar.bz2 147875 RMD160 c2a15b7a0742f14a70d0bf06d4d14fe9cf2b329b SHA1 15b9ece73c28897affb5da187835d19ff20e9962 SHA256 73a7cc2c0473694d454a6b7cb311ccdeb82f350bc8e652229d361592ea0a482f -DIST git-manpages-1.5.4.5.tar.bz2 157308 RMD160 75db043cca546bf73a1930816c6a13b08a44d713 SHA1 659b5217b342b757a01603f61bd90a4d60f7e681 SHA256 b694d8ccfc25c0da5ee2578491b17340539dd4ba273928e1aa65faefd5f339ce -DIST git-manpages-1.5.5.3.tar.bz2 163895 RMD160 9572efd19a4b47338cee2ae4b2077c358fa5b004 SHA1 a1627c77b3b7df10c328f2a17816cdbb0571811e SHA256 770543b0ca871f72829f810d51f9e4d8b27659cbf4e73534fd09dfb5833f99de -DIST git-manpages-1.5.5.4.tar.bz2 163922 RMD160 8aaae112ee6da27e3ed604c263ff6c33736ced92 SHA1 021064a30120b5041d82c2f2a2e96ce2e745ea33 SHA256 ab58825c06347534cfe2fe624834543503b6465392ec3786948d92d9b0e21207 -DIST git-manpages-1.5.6.1.tar.bz2 210612 RMD160 4205fe8ed7fba1ecfb7bf136d71e347f89fb43f6 SHA1 d9e4d24ee18fe4fa7079967d11aa1e8949b890b8 SHA256 b683fa111324fb04e4c187268bd66dcb5dbbe8ec88da34c52f515c5a12625008 -DIST git-manpages-1.5.6.2.tar.bz2 214791 RMD160 dd1255985450047d204b4bedb7544019634330b3 SHA1 50ca799b19bbd93071efe2bb7791793ad2681f47 SHA256 4a63bc8e10fb6e6bc2a7bed330444c19a7a7b172320560dec00e69f973408065 -DIST git-manpages-1.5.6.3.tar.bz2 214954 RMD160 ce954a2fda5702e6c7933bb4a31303d5ba6b5ab0 SHA1 87229c8e722bb95040503ccbe546db281d3f5538 SHA256 c0de81a69353a6e96e6bd4aff0be127287f212a8cda62dbfd5c48c0b6ffc85bd -DIST git-manpages-1.5.6.4.tar.bz2 214972 RMD160 c5ea3d3d5a3c63ea3f04dea332c685b2f3f8a3c9 SHA1 bf208517c6fff54dbcab1a221d24be85a38e2e24 SHA256 ecac874e85d88f7b8ddb976157ca5569931cb71e07a02b83a7f68c2e3a066555 -DIST git-manpages-1.5.6.5.tar.bz2 214901 RMD160 f4170769841471267090057f00650d69cd2fa908 SHA1 0707ca806c79f1a9573e867fe84e1d18a71a50e2 SHA256 3d6d0b39ffa854bb066acce796a9bd313e1d5ae5887fab117b9509c0b0e1734a -DIST git-manpages-1.6.0.1.tar.bz2 221756 RMD160 dbc78ba3b002fa41659023cac1313556a122656b SHA1 abff62b8c838b80583fd4e1d3c056de25684bb80 SHA256 7e0708f61157beee32dbf8c6630bcbc6e83168ce28cea7242e61b7211db94da5 -DIST git-manpages-1.6.0.2.tar.bz2 222534 RMD160 60384440283ef0e6b86d324850e3072e1ab4dd67 SHA1 aab4cfc70a03ca447bbb86422226c892d9be1e4e SHA256 198472533f9c8abe124ce93fda5639e07b6ee73e67d02d393648b20dd79476c7 -DIST git-manpages-1.6.0.3.tar.bz2 224091 RMD160 abd6cfa847122e5096413b255231b5fa930812ad SHA1 9ff7497f16dd359d979fa778cfc49a667648d0dc SHA256 dac8386c601cd519824e89c159d26c6a80e6c4e9f8a4510e92b4323ed0593e6c -DIST git-manpages-1.6.0.4.tar.bz2 216926 RMD160 567e901113de12c91e8b698981da585496c82573 SHA1 26e713ef11449187f9762fb603cca43b2b5b80b8 SHA256 9f1a9f70918e06c475b6d5b3fac8f2c631b254087166cd1655a5be3d9da682d4 DIST git-manpages-1.6.0.6.tar.bz2 217074 RMD160 81bdf5ac9662a7790682cb110640b32ca0f00756 SHA1 6a27a20f05cf0ac980915d5577d241a4836134de SHA256 80dc6a8a05bccdb49de261c32c9c22ab8c2e957edd618c0315fdf49e46f89bc8 -DIST git-manpages-1.6.0.tar.bz2 221399 RMD160 9e8cbb5d6ebda82407df325ed19f1ced12860f65 SHA1 c7b4204cdf941681a09084641c8aea3c6ef34dec SHA256 d8092a55dfaf31e78aecd802129af4b51b86dedf4ad12a397f487d89b822ef81 DIST git-manpages-1.6.1.1.tar.bz2 231331 RMD160 3a641502738104bb3c5322643ab4c293384e1d03 SHA1 8aba1fd66c6832880db6ecf961c1733bb3889e43 SHA256 004fda1ac720d6f0a5c93370f5b5a69f91c26929cf95fe9d760c79be5e369cfc DIST git-manpages-1.6.1.2.tar.bz2 231154 RMD160 d363cc4ad41a307d29b317efcdc95f5d03575839 SHA1 5f4d2b60984c4054629a17a01b10df552ee9478d SHA256 5262b8831283a19ea30e80446ca63ae103800c261276211f1deaeb15475a2244 DIST git-manpages-1.6.1.3.tar.bz2 231623 RMD160 3db015f6bb0573730f7e0cf546d868e9cd961bab SHA1 581bd9917dd587c33a8c54c3cc678175f0489122 SHA256 ac3daa67b5f0a5bdf9c45dbf148c7f3c51e673f3a5460e00c55594a3cd51f1a4 @@ -96,28 +36,8 @@ DIST git-manpages-1.6.2.2.tar.bz2 236466 RMD160 5719e66084aab0a9bb040b8859845091 DIST git-manpages-1.6.2.3.tar.bz2 236557 RMD160 69bba5db8eccc66d55964182cc8bb59788c8b812 SHA1 3bac1d069ddc842ad6d999961d67c975dbdfed5a SHA256 ac069d89745a35f0fcdfe29512524273fa8c41cfe6888c9e6fb0c7e04b2956ac DIST git-manpages-1.6.2.5.tar.bz2 236794 RMD160 a24ba361b57976db7d0fc2a24c2617ad22b859c8 SHA1 c61b94fa0de850aa2db26a6525e88a6adba5c4e3 SHA256 a6659d9e50a2f610b7c0a6c676537268032ab8bf7637ce944d9872c6dc3d8af2 DIST git-manpages-1.6.2.tar.bz2 236341 RMD160 b770b9e5bcc259735ae72412eda9b1ec9b587f08 SHA1 e621826b090cac60d28758eb9ec2c7ab4c0d63ba SHA256 13e7d352f9cac1f34d64b5deb006d0961941e43975a33f7d8507df58df1fe68e -DIST git-manpages-1.6.3.rc4.tar.bz2 243392 RMD160 b3afca4c032471a304e30521ad1397066dcb0410 SHA1 19ca42a2e56808fdbc9a8a91fab6b263f69f55e7 SHA256 f25c836163a814abb702ce1b236eb4b0e283978860c60782aaf373d767939b59 DIST git-manpages-1.6.3.tar.bz2 243465 RMD160 f185e27354358d4a60bc14bdd2a990438fc6ac0d SHA1 7b91d101d22ec72c84c3b71838f4613dc7e80e1e SHA256 35310ce8fe3b6274a915495f41eeae8fcc7386fe8bcdc9218e324c4131bdaeb5 -EBUILD git-1.5.1.6.ebuild 4400 RMD160 c81b28b5efca8244c87cc5f0ac1923c03c9e5b1f SHA1 bb71d825a1c1eef4a5ba26958a7e4dd35b02d938 SHA256 8cbd6c76e3cc3a9e00a3accdb69dec8e134b99acf7cad1e39b243c6289559734 -EBUILD git-1.5.3.7-r1.ebuild 6371 RMD160 847ed38b63b34256ce17991dc6c4dbd34c207955 SHA1 d6edbbd1bcd150992f69eb2655e1ab5b4a925420 SHA256 7d881d0f76b68244aa0021e71beb8537197f2147aa464b5707c39217ec6be87c -EBUILD git-1.5.3.8.ebuild 6388 RMD160 a76f9cc851a04c6b898f7f34d85b5433e28cfe2a SHA1 d10fbe86d2825b563025c0014db93cbbfd57d47c SHA256 13dc2bf683b369d4b61016587072db9c6b6af54ff0aa32ff2a542ec968a42b84 -EBUILD git-1.5.4.5.ebuild 7890 RMD160 d9b03da67050705be1b13716805095bede740613 SHA1 4c99cd61c9557751bd7840a870470f4910291d50 SHA256 06c04cb8f6cc066b5aaabef21811b275bd756124827816e4ef264b54274b27d2 -EBUILD git-1.5.5.3-r1.ebuild 8000 RMD160 1bfa4d100531984b05f6b4806fcf2244354846b4 SHA1 f69ddc4b3d4d53365fe12a1846be42e9d20a6793 SHA256 c1600616b3d48fc2181168379d6b0b13ab7416cd9d11d0956ac83cc2e5a7a888 -EBUILD git-1.5.5.3.ebuild 8232 RMD160 eb31080ca06a76e11d36d389f997d3702da96dd2 SHA1 015082b4c2ced79da40bd68517d39b554fcfe1b2 SHA256 9df15afa6790c8b50a5cc2b3f8fd3c5d3edf08095d8c4e3400ae543a77f2528c -EBUILD git-1.5.5.4.ebuild 8003 RMD160 80b9960715ffbaed45d924aa9ef7e924100b5e2c SHA1 a8c0d42418e6f781e1e41f12b1c949b4aa84d3ee SHA256 68bc4f3c3c6a186b6060098ac01f264dd83c26d5801b5fb728854d56ab46e52f -EBUILD git-1.5.6.1.ebuild 8001 RMD160 ac80960b3ded1707715d75ab63d7ceb2e14ba123 SHA1 cb41bc933d48d8caf712a3588a7eacc12339fa0d SHA256 964220d6b313b4acd03d3aaabfe887662b5d70ed94c9c46b2223977ab3f25822 -EBUILD git-1.5.6.2.ebuild 8001 RMD160 33213125e8d23690977e8f8d143f3ddbae65d937 SHA1 e6f9206cb8b3f36bcabca04500890dbb85b63b0f SHA256 9fa68654e29453235caf6e72da4af0bcf0bc4b57a1dbd0f810e099229cfbee7c -EBUILD git-1.5.6.3.ebuild 8001 RMD160 b651378a14d58ecca2b3d76806433466304a9d0b SHA1 f9aab4481bec86e1564130b8c12ad9ae24e48e66 SHA256 cc09d26e30a63c4a9d76bb75063b5accb0675c1139fa9146b3e5f70230acc553 -EBUILD git-1.5.6.4.ebuild 7948 RMD160 1a147d0b2136bab51bb11146f85aec75a40bba6c SHA1 66b67aac8858b879569a3af363b30ec260ba6a55 SHA256 c2a19a6ba20cecdfd0c1695bdfb50e4cd76c9f2fe233cf81be7e53c9fc2330d6 -EBUILD git-1.5.6.5.ebuild 7958 RMD160 b631e788c0a0abb032fe036e96b2271a4f75282e SHA1 a89d108b4c69312bc9633419a808390d71c3d262 SHA256 d3b0d90a90b96a3cf0a4b77d16ec6da46e0bd747bd900363f761e7dac79d5d04 -EBUILD git-1.6.0.1.ebuild 8416 RMD160 f66272869bf69e0a324e3bb340bb93fdfd57cb34 SHA1 27e7ba25a1161fbf0eca5c6181f798a793a99997 SHA256 8c8f4d6e22d28edcb28a633bee301b10d879995a53aefdaf05327e4a0a208ad4 -EBUILD git-1.6.0.2.ebuild 8416 RMD160 df5f708da54bfd6a030c5b2dc759e1a30059aaa8 SHA1 ddb81cee72eb8628ad5f85af9354d0e943e57e18 SHA256 8c0d04907936430e533cf020923009b45ef64b7123c71e69100146f47651b40f -EBUILD git-1.6.0.3.ebuild 8416 RMD160 f2c4ed1b4e0806e468a7f3dbf5ac27381ecdad9b SHA1 f63af1f522626f3fa25363baae3d72f6e5b1cde9 SHA256 bae9e11f08fecaf9ef2cc65b889c7ad15ce2496168b90366fdaa86c80613fe8f -EBUILD git-1.6.0.4-r1.ebuild 8948 RMD160 8931b3756e1c0302d46bea731c15715b5549b0cf SHA1 4c41d4512cd01983a81b91e6da0aa872f9cdefa4 SHA256 fdb03c4d902d6169300595a231b965349844c03f0f5f5ff291daa1c0435a82bb -EBUILD git-1.6.0.4-r2.ebuild 8948 RMD160 6da6d8ad23d1f4666044098149409130b33b1cc9 SHA1 e72e51557d1831763059164c83348fd4e3e63eaa SHA256 4ef3dc1039dbeff20f1dadb08e24071e97124fe2f4bb93f5eddc8fc7ab975063 -EBUILD git-1.6.0.4.ebuild 8416 RMD160 d4d959465b22fa6747e187547d9e7c5c86dad177 SHA1 ca3eec4154653011f6b68d4d4cae5fa1c0ad31d6 SHA256 78bbe545b099da0c431f0b19da417c8c125f267005791721683961e9093c5b7b EBUILD git-1.6.0.6.ebuild 8659 RMD160 cbe8dad707605a31994ea493790f6afcdb4f0227 SHA1 7e01b2ff590a30fb9f4df406045f79270c9fbe87 SHA256 5dbf47cfe75164020e72497a19078fdaabbb63fb13685965c1e7c6ab3c319e3d -EBUILD git-1.6.0.ebuild 8414 RMD160 3c1d79572a1231ccc82de22d16a5be15eab5ea66 SHA1 02cfa595340ca2d11bfe17b59b392c884f1b94cb SHA256 650f93ca84a368bc3ed617a9c023ee67a810b1d41f1691807c46c31a22d26b2c EBUILD git-1.6.1.1.ebuild 8605 RMD160 5ba0aacd6084de03f87f5bcb49e53bfd1e3b522c SHA1 53427f6845e34d9b1738eb746263a880bcea1596 SHA256 3ab687c1f71ece1a743c4cf141a7300359d9b78e400e80bcd610ea98f898bfe2 EBUILD git-1.6.1.2.ebuild 8604 RMD160 d250ff4edad7746b3e06e6a2816e166a373ab1dd SHA1 4a7d76beb579e01ddec9cddf221a1e6a28ce2972 SHA256 730852698897267850b197548ef4c97d588d14f25e5c57cd6db8b726f9c2bd67 EBUILD git-1.6.1.3.ebuild 8605 RMD160 a6478e8eb4afb5dfa6b4b8d99a7c4e97f5704e99 SHA1 8b0e0f5a4c7453cfd5bb5e9a1c78eb930d2c3b54 SHA256 7de1be388d359f7cb81a91f54cd343e04ae6f2ee188de7e142a07c5f64d85407 @@ -129,7 +49,6 @@ EBUILD git-1.6.2.5-r1.ebuild 9689 RMD160 8aff5d3edeee0ef4ae5f5397501e20d29f91759 EBUILD git-1.6.2.5.ebuild 9687 RMD160 b998ff1c5fa9967e5521678a8428baad717d51dd SHA1 c992fe4e6f0c573451dfdc968be0b989eba3f51c SHA256 8c893fa2025a9511916d7032e742413f9e659246f1c14721ab427ef5397f24e2 EBUILD git-1.6.2.ebuild 8443 RMD160 0138c4f89eed7055664bb2a84d6e41bc1be60e2d SHA1 7bc2abe4a18f4150792724e6550817f2802ef48a SHA256 a2c7e4858f2bd21973d818d059023cfd2c98177a0bae2aa1c31fff1e7309ec13 EBUILD git-1.6.3.ebuild 9722 RMD160 98ff70c6dc59efcd6425340e27b22b327cb20990 SHA1 ea9aeb7c5ad84013e760320fdc46d0a3c27061f5 SHA256 3c0f295db6aaff5263a2c56b4c6e45095ef3f5a13e267b80bab78a19eac42d4e -EBUILD git-1.6.3_rc4.ebuild 9689 RMD160 ac3be486ea56e674466227784e5fec3cbb13ead1 SHA1 36f135c98bc579c312320458a9a055588d09cb21 SHA256 d4edc8df3e88bc6f4c52b289f9e29b7bf1a1b125146bb6b1e3d0aadc4de68ddf EBUILD git-9999.ebuild 9592 RMD160 f588c350846a9d9b796b9e17808e1d701508c0c2 SHA1 1630c32ff1ab4d077fd7a42eaf6246d3ab44e7ba SHA256 7840a65f1868759fbfe14e1edd47074bd5b2646e0cb7d59e20e6b1d1b39d679a -MISC ChangeLog 51304 RMD160 b437f8bd97e1a51b8f734a96330a0bde1037d740 SHA1 66be17f8e4ff6bde7a634b64495c9ee78f0110eb SHA256 21f5d891a47963a19a9154e17cda45d3c904bdea15db299d2a897fbf15665863 +MISC ChangeLog 52175 RMD160 865731025febf883f95695b02ba0b66aee6399aa SHA1 4c3590babf6c92c55ed921e34a9e189e6d2fbc22 SHA256 417d25c7b05ed18d75423da0c51e73c28b1c23c0f9c7e347e99b801397615c7e MISC metadata.xml 1535 RMD160 1117b90f1e7550ce3a47f844ac17db78ed803cc3 SHA1 223d8e6b2faf20bf290d90d0d6322473daa49b0c SHA256 58d9f467528fee5c7062d0a2344a3b61ff0b8b7a0a84dffc9f56557f7eadd70b diff --git a/dev-util/git/files/20080322-git-1.5.4.4-noperl.patch b/dev-util/git/files/20080322-git-1.5.4.4-noperl.patch deleted file mode 100644 index bf5e8306fe5c..000000000000 --- a/dev-util/git/files/20080322-git-1.5.4.4-noperl.patch +++ /dev/null @@ -1,335 +0,0 @@ -Implement 95% of the NO_PERL functionality, to build Git without any Perl -support, because some Gentoo users want a Git without any Perl whatesoever -(Gentoo bug #214168). - -Remaining bits are doing configure.ac as well as git-remote usage in: -t5502-quickfetch.sh -t5512-ls-remote.sh -t5520-pull.sh - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> -Bugzilla-URL: http://bugs.gentoo.org/show_bug.cgi?id=214168 - -diff -Nuar --exclude gitweb.cgi --exclude config.mak.in --exclude configure.ac git-1.5.4.4.orig/Makefile git-1.5.4.4/Makefile ---- git-1.5.4.4.orig/Makefile 2008-03-22 15:25:24.986081000 -0700 -+++ git-1.5.4.4/Makefile 2008-03-22 16:46:04.612806869 -0700 -@@ -123,6 +123,8 @@ - # - # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's - # MakeMaker (e.g. using ActiveState under Cygwin). -+ -+# Define NO_PERL if you do not want Perl scripts at all. - # - # Define NO_TCLTK if you do not want Tcl/Tk GUI. - # -@@ -233,15 +235,18 @@ - git-stash.sh \ - git-help--browse.sh - -+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) -+ifndef NO_PERL - SCRIPT_PERL = \ - git-add--interactive.perl \ - git-archimport.perl git-cvsimport.perl git-relink.perl \ - git-cvsserver.perl git-remote.perl git-cvsexportcommit.perl \ - git-send-email.perl git-svn.perl -- --SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ -- $(patsubst %.perl,%,$(SCRIPT_PERL)) \ -- git-instaweb -+SCRIPTS += $(patsubst %.perl,%,$(SCRIPT_PERL)) \ -+ git-instaweb -+else -+SCRIPT_PERL = -+endif - - # ... and all the rest that could be moved out of bindir to gitexecdir - PROGRAMS = \ -@@ -276,7 +281,10 @@ - ALL_PROGRAMS += git-merge-subtree$X - - # what 'all' will build but not install in gitexecdir --OTHER_PROGRAMS = git$X gitweb/gitweb.cgi -+OTHER_PROGRAMS = git$X -+ifndef NO_PERL -+OTHER_PROGRAMS += gitweb/gitweb.cgi -+endif - - # Set paths to tools early so that they can be used for version tests. - ifndef SHELL_PATH -@@ -570,6 +578,10 @@ - endif - endif - -+ifdef NO_PERL -+ BASIC_CFLAGS += -DNO_PERL -+endif -+ - ifdef ZLIB_PATH - BASIC_CFLAGS += -I$(ZLIB_PATH)/include - EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib) -@@ -731,6 +743,11 @@ - ifeq ($(TCLTK_PATH),) - NO_TCLTK=NoThanks - endif -+ifeq ($(PERL_PATH),) -+NO_PERL=NoThanks -+export NO_PERL -+export NO_PERL_MAKEMAKER -+endif - - QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir - QUIET_SUBDIR1 = -@@ -803,7 +820,9 @@ - $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all - $(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all - endif -+ifndef NO_PERL - $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all -+endif - $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) - - strip: $(PROGRAMS) git$X -@@ -844,6 +863,7 @@ - chmod +x $@+ && \ - mv $@+ $@ - -+ifndef NO_PERL - $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak - - perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL -@@ -902,6 +922,7 @@ - $@.sh > $@+ && \ - chmod +x $@+ && \ - mv $@+ $@ -+endif # NO_PERL - - configure: configure.ac - $(QUIET_GEN)$(RM) $@ $<+ && \ -@@ -1052,7 +1073,9 @@ - $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' - $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)' - $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install -+ifndef NO_PERL - $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install -+endif - ifndef NO_TCLTK - $(MAKE) -C gitk-git install - $(MAKE) -C git-gui install -@@ -1141,9 +1164,11 @@ - $(RM) -r $(GIT_TARNAME) .doc-tmp-dir - $(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz - $(RM) $(htmldocs).tar.gz $(manpages).tar.gz -- $(RM) gitweb/gitweb.cgi - $(MAKE) -C Documentation/ clean -+ifndef NO_PERL -+ $(RM) gitweb/gitweb.cgi - $(MAKE) -C perl clean -+endif - $(MAKE) -C templates/ clean - $(MAKE) -C t/ clean - ifndef NO_TCLTK -diff -Nuar --exclude gitweb.cgi --exclude config.mak.in --exclude configure.ac git-1.5.4.4.orig/builtin-add.c git-1.5.4.4/builtin-add.c ---- git-1.5.4.4.orig/builtin-add.c 2008-03-09 03:18:13.000000000 -0700 -+++ git-1.5.4.4/builtin-add.c 2008-03-22 15:57:31.759925335 -0700 -@@ -135,6 +135,7 @@ - free(seen); - } - -+#ifndef NO_PERL - static const char **validate_pathspec(int argc, const char **argv, const char *prefix) - { - const char **pathspec = get_pathspec(prefix, argv); -@@ -170,6 +171,7 @@ - free(args); - return status; - } -+#endif - - static struct lock_file lock_file; - -@@ -182,8 +184,10 @@ - OPT__DRY_RUN(&show_only), - OPT__VERBOSE(&verbose), - OPT_GROUP(""), -+#ifndef NO_PERL - OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"), - OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"), -+#endif - OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"), - OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"), - OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"), -@@ -198,10 +202,12 @@ - - argc = parse_options(argc, argv, builtin_add_options, - builtin_add_usage, 0); -+#ifndef NO_PERL - if (patch_interactive) - add_interactive = 1; - if (add_interactive) - exit(interactive_add(argc, argv, prefix)); -+#endif - - git_config(git_default_config); - -diff -Nuar --exclude gitweb.cgi --exclude config.mak.in --exclude configure.ac git-1.5.4.4.orig/builtin-commit.c git-1.5.4.4/builtin-commit.c ---- git-1.5.4.4.orig/builtin-commit.c 2008-03-09 03:18:13.000000000 -0700 -+++ git-1.5.4.4/builtin-commit.c 2008-03-22 15:58:41.139317545 -0700 -@@ -96,7 +96,9 @@ - OPT_GROUP("Commit contents options"), - OPT_BOOLEAN('a', "all", &all, "commit all changed files"), - OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"), -+#ifndef NO_PERL - OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"), -+#endif - OPT_BOOLEAN('o', "only", &only, ""), - OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"), - OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"), -@@ -213,11 +215,13 @@ - struct path_list partial; - const char **pathspec = NULL; - -+#ifndef NO_PERL - if (interactive) { - interactive_add(argc, argv, prefix); - commit_style = COMMIT_AS_IS; - return get_index_file(); - } -+#endif - - if (read_cache() < 0) - die("index file corrupt"); -diff -Nuar --exclude gitweb.cgi --exclude config.mak.in --exclude configure.ac git-1.5.4.4.orig/t/lib-git-svn.sh git-1.5.4.4/t/lib-git-svn.sh ---- git-1.5.4.4.orig/t/lib-git-svn.sh 2008-03-09 03:18:13.000000000 -0700 -+++ git-1.5.4.4/t/lib-git-svn.sh 2008-03-22 16:02:12.797409374 -0700 -@@ -6,6 +6,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-svn tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - GIT_DIR=$PWD/.git - GIT_SVN_DIR=$GIT_DIR/svn/git-svn -diff -Nuar --exclude gitweb.cgi --exclude config.mak.in --exclude configure.ac git-1.5.4.4.orig/t/t5505-remote.sh git-1.5.4.4/t/t5505-remote.sh ---- git-1.5.4.4.orig/t/t5505-remote.sh 2008-03-09 03:18:13.000000000 -0700 -+++ git-1.5.4.4/t/t5505-remote.sh 2008-03-22 16:22:58.012694493 -0700 -@@ -3,6 +3,12 @@ - test_description='git remote porcelain-ish' - - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - setup_repository () { - mkdir "$1" && ( -diff -Nuar --exclude gitweb.cgi --exclude config.mak.in --exclude configure.ac git-1.5.4.4.orig/t/t7501-commit.sh git-1.5.4.4/t/t7501-commit.sh ---- git-1.5.4.4.orig/t/t7501-commit.sh 2008-03-09 03:18:13.000000000 -0700 -+++ git-1.5.4.4/t/t7501-commit.sh 2008-03-22 16:14:25.513913653 -0700 -@@ -38,7 +38,7 @@ - "echo King of the bongo >file && - git-commit -m foo -a file" - --test_expect_failure \ -+[ -z "$NO_PERL" ] && test_expect_failure \ - "using paths with --interactive" \ - "echo bong-o-bong >file && - echo 7 | git-commit -m foo --interactive file" -@@ -119,7 +119,7 @@ - "echo 'gak' >file && \ - git-commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a" - --test_expect_success \ -+[ -z "$NO_PERL" ] && test_expect_success \ - "interactive add" \ - "echo 7 | git-commit --interactive | grep 'What now'" - -diff -Nuar --exclude gitweb.cgi --exclude config.mak.in --exclude configure.ac git-1.5.4.4.orig/t/t9001-send-email.sh git-1.5.4.4/t/t9001-send-email.sh ---- git-1.5.4.4.orig/t/t9001-send-email.sh 2008-03-09 03:18:13.000000000 -0700 -+++ git-1.5.4.4/t/t9001-send-email.sh 2008-03-22 16:03:58.490510442 -0700 -@@ -2,6 +2,12 @@ - - test_description='git-send-email' - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-send-email tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - PROG='git send-email' - test_expect_success \ -diff -Nuar --exclude gitweb.cgi --exclude config.mak.in --exclude configure.ac git-1.5.4.4.orig/t/t9200-git-cvsexportcommit.sh git-1.5.4.4/t/t9200-git-cvsexportcommit.sh ---- git-1.5.4.4.orig/t/t9200-git-cvsexportcommit.sh 2008-03-09 03:18:13.000000000 -0700 -+++ git-1.5.4.4/t/t9200-git-cvsexportcommit.sh 2008-03-22 16:04:12.535965488 -0700 -@@ -13,6 +13,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsexportcommit tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - CVSROOT=$(pwd)/cvsroot - CVSWORK=$(pwd)/cvswork -diff -Nuar --exclude gitweb.cgi --exclude config.mak.in --exclude configure.ac git-1.5.4.4.orig/t/t9400-git-cvsserver-server.sh git-1.5.4.4/t/t9400-git-cvsserver-server.sh ---- git-1.5.4.4.orig/t/t9400-git-cvsserver-server.sh 2008-03-09 03:18:13.000000000 -0700 -+++ git-1.5.4.4/t/t9400-git-cvsserver-server.sh 2008-03-22 16:04:20.038686248 -0700 -@@ -17,6 +17,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsserver tests, NO_PERL defined' : -+ test_done -+ exit -+fi - perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { - test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' : - test_done -diff -Nuar --exclude gitweb.cgi --exclude config.mak.in --exclude configure.ac git-1.5.4.4.orig/t/t9500-gitweb-standalone-no-errors.sh git-1.5.4.4/t/t9500-gitweb-standalone-no-errors.sh ---- git-1.5.4.4.orig/t/t9500-gitweb-standalone-no-errors.sh 2008-03-09 03:18:13.000000000 -0700 -+++ git-1.5.4.4/t/t9500-gitweb-standalone-no-errors.sh 2008-03-22 16:17:00.350148743 -0700 -@@ -67,6 +67,13 @@ - } - - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping gitweb-standalone-no-errors tests, NO_PERL defined' : -+ test_done -+ exit -+fi -+ - - perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || { - test_expect_success 'skipping gitweb tests, perl version is too old' : -diff -Nuar --exclude gitweb.cgi --exclude config.mak.in --exclude configure.ac git-1.5.4.4.orig/t/t9600-cvsimport.sh git-1.5.4.4/t/t9600-cvsimport.sh ---- git-1.5.4.4.orig/t/t9600-cvsimport.sh 2008-03-09 03:18:13.000000000 -0700 -+++ git-1.5.4.4/t/t9600-cvsimport.sh 2008-03-22 16:04:28.501086452 -0700 -@@ -9,6 +9,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'` - case "$cvsps_version" in diff --git a/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch b/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch deleted file mode 100644 index 4f70c9122413..000000000000 --- a/dev-util/git/files/20080423-git-1.5.5.1-noperl.patch +++ /dev/null @@ -1,338 +0,0 @@ -Implement 95% of the NO_PERL functionality, to build Git without any Perl -support, because some Gentoo users want a Git without any Perl whatesoever -(Gentoo bug #214168). - -Remaining bits are doing configure.ac as well as git-remote usage in: -t5502-quickfetch.sh -t5512-ls-remote.sh -t5520-pull.sh - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> -Bugzilla-URL: http://bugs.gentoo.org/show_bug.cgi?id=214168 -Notes: Ported from 20080322-git-1.5.4.5-noperl.patch - -diff -Nuar git-1.5.5.1.orig/builtin-add.c git-1.5.5.1/builtin-add.c ---- git-1.5.5.1.orig/builtin-add.c 2008-04-20 15:17:13.000000000 -0700 -+++ git-1.5.5.1/builtin-add.c 2008-04-23 16:58:51.708575899 -0700 -@@ -135,6 +135,7 @@ - free(seen); - } - -+#ifndef NO_PERL - static const char **validate_pathspec(int argc, const char **argv, const char *prefix) - { - const char **pathspec = get_pathspec(prefix, argv); -@@ -170,6 +171,7 @@ - free(args); - return status; - } -+#endif - - static struct lock_file lock_file; - -@@ -182,8 +184,10 @@ - OPT__DRY_RUN(&show_only), - OPT__VERBOSE(&verbose), - OPT_GROUP(""), -+#ifndef NO_PERL - OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"), - OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"), -+#endif - OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"), - OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"), - OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"), -@@ -198,10 +202,12 @@ - - argc = parse_options(argc, argv, builtin_add_options, - builtin_add_usage, 0); -+#ifndef NO_PERL - if (patch_interactive) - add_interactive = 1; - if (add_interactive) - exit(interactive_add(argc, argv, prefix)); -+#endif - - git_config(git_default_config); - -diff -Nuar git-1.5.5.1.orig/builtin-commit.c git-1.5.5.1/builtin-commit.c ---- git-1.5.5.1.orig/builtin-commit.c 2008-04-20 15:17:13.000000000 -0700 -+++ git-1.5.5.1/builtin-commit.c 2008-04-23 17:00:04.672207334 -0700 -@@ -97,7 +97,9 @@ - OPT_GROUP("Commit contents options"), - OPT_BOOLEAN('a', "all", &all, "commit all changed files"), - OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"), -+#ifndef NO_PERL - OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"), -+#endif - OPT_BOOLEAN('o', "only", &only, "commit only specified files"), - OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"), - OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"), -@@ -217,11 +219,13 @@ - struct path_list partial; - const char **pathspec = NULL; - -+#ifndef NO_PERL - if (interactive) { - interactive_add(argc, argv, prefix); - commit_style = COMMIT_AS_IS; - return get_index_file(); - } -+#endif - - if (read_cache() < 0) - die("index file corrupt"); -diff -Nuar git-1.5.5.1.orig/Makefile git-1.5.5.1/Makefile ---- git-1.5.5.1.orig/Makefile 2008-04-23 16:58:19.622327000 -0700 -+++ git-1.5.5.1/Makefile 2008-04-23 16:58:51.712091375 -0700 -@@ -130,6 +130,8 @@ - # - # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's - # MakeMaker (e.g. using ActiveState under Cygwin). -+ -+# Define NO_PERL if you do not want Perl scripts at all. - # - # Define NO_TCLTK if you do not want Tcl/Tk GUI. - # -@@ -255,6 +257,8 @@ - SCRIPT_SH += git-submodule.sh - SCRIPT_SH += git-web--browse.sh - -+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) -+ifndef NO_PERL - SCRIPT_PERL += git-add--interactive.perl - SCRIPT_PERL += git-archimport.perl - SCRIPT_PERL += git-cvsexportcommit.perl -@@ -263,10 +267,11 @@ - SCRIPT_PERL += git-relink.perl - SCRIPT_PERL += git-send-email.perl - SCRIPT_PERL += git-svn.perl -- --SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ -- $(patsubst %.perl,%,$(SCRIPT_PERL)) \ -- git-instaweb -+SCRIPTS += $(patsubst %.perl,%,$(SCRIPT_PERL)) \ -+ git-instaweb -+else -+SCRIPT_PERL = -+endif - - # Empty... - EXTRA_PROGRAMS = -@@ -315,7 +320,10 @@ - ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) - - # what 'all' will build but not install in gitexecdir --OTHER_PROGRAMS = git$X gitweb/gitweb.cgi -+OTHER_PROGRAMS = git$X -+ifndef NO_PERL -+OTHER_PROGRAMS += gitweb/gitweb.cgi -+endif - - # Set paths to tools early so that they can be used for version tests. - ifndef SHELL_PATH -@@ -716,6 +724,10 @@ - endif - endif - -+ifdef NO_PERL -+ BASIC_CFLAGS += -DNO_PERL -+endif -+ - ifdef ZLIB_PATH - BASIC_CFLAGS += -I$(ZLIB_PATH)/include - EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib) -@@ -896,6 +908,11 @@ - ifeq ($(TCLTK_PATH),) - NO_TCLTK=NoThanks - endif -+ifeq ($(PERL_PATH),) -+NO_PERL=NoThanks -+export NO_PERL -+export NO_PERL_MAKEMAKER -+endif - - QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir - QUIET_SUBDIR1 = -@@ -968,7 +985,9 @@ - $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all - $(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all - endif -+ifndef NO_PERL - $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all -+endif - $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) - - strip: $(PROGRAMS) git$X -@@ -1007,6 +1026,7 @@ - chmod +x $@+ && \ - mv $@+ $@ - -+ifndef NO_PERL - $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak - - perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL -@@ -1065,6 +1085,7 @@ - $@.sh > $@+ && \ - chmod +x $@+ && \ - mv $@+ $@ -+endif # NO_PERL - - configure: configure.ac - $(QUIET_GEN)$(RM) $@ $<+ && \ -@@ -1218,7 +1239,9 @@ - $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' - $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)' - $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install -+ifndef NO_PERL - $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install -+endif - ifndef NO_TCLTK - $(MAKE) -C gitk-git install - $(MAKE) -C git-gui install -@@ -1307,9 +1330,11 @@ - $(RM) -r $(GIT_TARNAME) .doc-tmp-dir - $(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz - $(RM) $(htmldocs).tar.gz $(manpages).tar.gz -- $(RM) gitweb/gitweb.cgi - $(MAKE) -C Documentation/ clean -+ifndef NO_PERL -+ $(RM) gitweb/gitweb.cgi - $(MAKE) -C perl clean -+endif - $(MAKE) -C templates/ clean - $(MAKE) -C t/ clean - ifndef NO_TCLTK -diff -Nuar git-1.5.5.1.orig/t/lib-git-svn.sh git-1.5.5.1/t/lib-git-svn.sh ---- git-1.5.5.1.orig/t/lib-git-svn.sh 2008-04-20 15:17:13.000000000 -0700 -+++ git-1.5.5.1/t/lib-git-svn.sh 2008-04-23 16:58:51.712091375 -0700 -@@ -6,6 +6,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-svn tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - GIT_DIR=$PWD/.git - GIT_SVN_DIR=$GIT_DIR/svn/git-svn -diff -Nuar git-1.5.5.1.orig/t/t5505-remote.sh git-1.5.5.1/t/t5505-remote.sh ---- git-1.5.5.1.orig/t/t5505-remote.sh 2008-04-20 15:17:13.000000000 -0700 -+++ git-1.5.5.1/t/t5505-remote.sh 2008-04-23 16:58:51.712091375 -0700 -@@ -3,6 +3,12 @@ - test_description='git remote porcelain-ish' - - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - setup_repository () { - mkdir "$1" && ( -diff -Nuar git-1.5.5.1.orig/t/t7501-commit.sh git-1.5.5.1/t/t7501-commit.sh ---- git-1.5.5.1.orig/t/t7501-commit.sh 2008-04-20 15:17:13.000000000 -0700 -+++ git-1.5.5.1/t/t7501-commit.sh 2008-04-23 16:58:51.712091375 -0700 -@@ -38,7 +38,7 @@ - "echo King of the bongo >file && - ! git-commit -m foo -a file" - --test_expect_success \ -+[ -z "$NO_PERL" ] && test_expect_success \ - "using paths with --interactive" \ - "echo bong-o-bong >file && - ! echo 7 | git-commit -m foo --interactive file" -@@ -119,7 +119,7 @@ - "echo 'gak' >file && \ - git-commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a" - --test_expect_success \ -+[ -z "$NO_PERL" ] && test_expect_success \ - "interactive add" \ - "echo 7 | git-commit --interactive | grep 'What now'" - -diff -Nuar git-1.5.5.1.orig/t/t9001-send-email.sh git-1.5.5.1/t/t9001-send-email.sh ---- git-1.5.5.1.orig/t/t9001-send-email.sh 2008-04-20 15:17:13.000000000 -0700 -+++ git-1.5.5.1/t/t9001-send-email.sh 2008-04-23 16:58:51.712091375 -0700 -@@ -2,6 +2,12 @@ - - test_description='git-send-email' - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-send-email tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - PROG='git send-email' - test_expect_success \ -diff -Nuar git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh git-1.5.5.1/t/t9200-git-cvsexportcommit.sh ---- git-1.5.5.1.orig/t/t9200-git-cvsexportcommit.sh 2008-04-20 15:17:13.000000000 -0700 -+++ git-1.5.5.1/t/t9200-git-cvsexportcommit.sh 2008-04-23 16:58:51.715484206 -0700 -@@ -13,6 +13,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsexportcommit tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - CVSROOT=$(pwd)/cvsroot - CVSWORK=$(pwd)/cvswork -diff -Nuar git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh git-1.5.5.1/t/t9400-git-cvsserver-server.sh ---- git-1.5.5.1.orig/t/t9400-git-cvsserver-server.sh 2008-04-20 15:17:13.000000000 -0700 -+++ git-1.5.5.1/t/t9400-git-cvsserver-server.sh 2008-04-23 16:58:51.715484206 -0700 -@@ -17,6 +17,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsserver tests, NO_PERL defined' : -+ test_done -+ exit -+fi - perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { - test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' : - test_done -diff -Nuar git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh ---- git-1.5.5.1.orig/t/t9500-gitweb-standalone-no-errors.sh 2008-04-20 15:17:13.000000000 -0700 -+++ git-1.5.5.1/t/t9500-gitweb-standalone-no-errors.sh 2008-04-23 16:58:51.715484206 -0700 -@@ -67,6 +67,13 @@ - } - - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping gitweb-standalone-no-errors tests, NO_PERL defined' : -+ test_done -+ exit -+fi -+ - - perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || { - test_expect_success 'skipping gitweb tests, perl version is too old' : -diff -Nuar git-1.5.5.1.orig/t/t9600-cvsimport.sh git-1.5.5.1/t/t9600-cvsimport.sh ---- git-1.5.5.1.orig/t/t9600-cvsimport.sh 2008-04-20 15:17:13.000000000 -0700 -+++ git-1.5.5.1/t/t9600-cvsimport.sh 2008-04-23 16:58:51.715484206 -0700 -@@ -15,6 +15,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'` - case "$cvsps_version" in diff --git a/dev-util/git/files/20080528-git-1.5.5.3-noperl.patch b/dev-util/git/files/20080528-git-1.5.5.3-noperl.patch deleted file mode 100644 index d16b6a56f50d..000000000000 --- a/dev-util/git/files/20080528-git-1.5.5.3-noperl.patch +++ /dev/null @@ -1,341 +0,0 @@ -Implement 95% of the NO_PERL functionality, to build Git without any Perl -support, because some Gentoo users want a Git without any Perl whatesoever -(Gentoo bug #214168). - -Remaining bits are doing configure.ac as well as git-remote usage in: -t5502-quickfetch.sh -t5512-ls-remote.sh -t5520-pull.sh - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> -Bugzilla-URL: http://bugs.gentoo.org/show_bug.cgi?id=214168 -Notes: Ported from 20080423-git-1.5.5.1-noperl.patch -Notes: Ported from 20080322-git-1.5.4.5-noperl.patch - -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/builtin-add.c git-1.5.5.3/builtin-add.c ---- git-1.5.5.3.orig/builtin-add.c 2008-05-28 00:56:46.000000000 -0700 -+++ git-1.5.5.3/builtin-add.c 2008-05-28 10:38:12.566970120 -0700 -@@ -135,6 +135,7 @@ - free(seen); - } - -+#ifndef NO_PERL - static const char **validate_pathspec(int argc, const char **argv, const char *prefix) - { - const char **pathspec = get_pathspec(prefix, argv); -@@ -170,6 +171,7 @@ - free(args); - return status; - } -+#endif - - static struct lock_file lock_file; - -@@ -182,8 +184,10 @@ - OPT__DRY_RUN(&show_only), - OPT__VERBOSE(&verbose), - OPT_GROUP(""), -+#ifndef NO_PERL - OPT_BOOLEAN('i', "interactive", &add_interactive, "interactive picking"), - OPT_BOOLEAN('p', "patch", &patch_interactive, "interactive patching"), -+#endif - OPT_BOOLEAN('f', NULL, &ignored_too, "allow adding otherwise ignored files"), - OPT_BOOLEAN('u', NULL, &take_worktree_changes, "update tracked files"), - OPT_BOOLEAN( 0 , "refresh", &refresh_only, "don't add, only refresh the index"), -@@ -198,10 +202,12 @@ - - argc = parse_options(argc, argv, builtin_add_options, - builtin_add_usage, 0); -+#ifndef NO_PERL - if (patch_interactive) - add_interactive = 1; - if (add_interactive) - exit(interactive_add(argc, argv, prefix)); -+#endif - - git_config(git_default_config); - -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/builtin-commit.c git-1.5.5.3/builtin-commit.c ---- git-1.5.5.3.orig/builtin-commit.c 2008-05-28 00:56:46.000000000 -0700 -+++ git-1.5.5.3/builtin-commit.c 2008-05-28 10:38:25.556703720 -0700 -@@ -97,7 +97,9 @@ - OPT_GROUP("Commit contents options"), - OPT_BOOLEAN('a', "all", &all, "commit all changed files"), - OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"), -+#ifndef NO_PERL - OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"), -+#endif - OPT_BOOLEAN('o', "only", &only, "commit only specified files"), - OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"), - OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"), -@@ -217,6 +219,7 @@ - struct path_list partial; - const char **pathspec = NULL; - -+#ifndef NO_PERL - if (interactive) { - interactive_add(argc, argv, prefix); - if (read_cache() < 0) -@@ -224,6 +227,7 @@ - commit_style = COMMIT_AS_IS; - return get_index_file(); - } -+#endif - - if (read_cache() < 0) - die("index file corrupt"); -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/Makefile git-1.5.5.3/Makefile ---- git-1.5.5.3.orig/Makefile 2008-05-28 10:38:03.608016000 -0700 -+++ git-1.5.5.3/Makefile 2008-05-28 10:38:12.571288044 -0700 -@@ -130,6 +130,8 @@ - # - # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's - # MakeMaker (e.g. using ActiveState under Cygwin). -+ -+# Define NO_PERL if you do not want Perl scripts at all. - # - # Define NO_TCLTK if you do not want Tcl/Tk GUI. - # -@@ -255,6 +257,8 @@ - SCRIPT_SH += git-submodule.sh - SCRIPT_SH += git-web--browse.sh - -+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) -+ifndef NO_PERL - SCRIPT_PERL += git-add--interactive.perl - SCRIPT_PERL += git-archimport.perl - SCRIPT_PERL += git-cvsexportcommit.perl -@@ -263,10 +267,11 @@ - SCRIPT_PERL += git-relink.perl - SCRIPT_PERL += git-send-email.perl - SCRIPT_PERL += git-svn.perl -- --SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ -- $(patsubst %.perl,%,$(SCRIPT_PERL)) \ -- git-instaweb -+SCRIPTS += $(patsubst %.perl,%,$(SCRIPT_PERL)) \ -+ git-instaweb -+else -+SCRIPT_PERL = -+endif - - # Empty... - EXTRA_PROGRAMS = -@@ -315,7 +320,10 @@ - ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) - - # what 'all' will build but not install in gitexecdir --OTHER_PROGRAMS = git$X gitweb/gitweb.cgi -+OTHER_PROGRAMS = git$X -+ifndef NO_PERL -+OTHER_PROGRAMS += gitweb/gitweb.cgi -+endif - - # Set paths to tools early so that they can be used for version tests. - ifndef SHELL_PATH -@@ -716,6 +724,10 @@ - endif - endif - -+ifdef NO_PERL -+ BASIC_CFLAGS += -DNO_PERL -+endif -+ - ifdef ZLIB_PATH - BASIC_CFLAGS += -I$(ZLIB_PATH)/include - EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib) -@@ -896,6 +908,11 @@ - ifeq ($(TCLTK_PATH),) - NO_TCLTK=NoThanks - endif -+ifeq ($(PERL_PATH),) -+NO_PERL=NoThanks -+export NO_PERL -+export NO_PERL_MAKEMAKER -+endif - - QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir - QUIET_SUBDIR1 = -@@ -968,7 +985,9 @@ - $(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all - $(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all - endif -+ifndef NO_PERL - $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all -+endif - $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) - - strip: $(PROGRAMS) git$X -@@ -1007,6 +1026,7 @@ - chmod +x $@+ && \ - mv $@+ $@ - -+ifndef NO_PERL - $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak - - perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL -@@ -1065,6 +1085,7 @@ - $@.sh > $@+ && \ - chmod +x $@+ && \ - mv $@+ $@ -+endif # NO_PERL - - configure: configure.ac - $(QUIET_GEN)$(RM) $@ $<+ && \ -@@ -1218,7 +1239,9 @@ - $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexecdir_SQ)' - $(INSTALL) git$X '$(DESTDIR_SQ)$(bindir_SQ)' - $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install -+ifndef NO_PERL - $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install -+endif - ifndef NO_TCLTK - $(MAKE) -C gitk-git install - $(MAKE) -C git-gui install -@@ -1307,9 +1330,11 @@ - $(RM) -r $(GIT_TARNAME) .doc-tmp-dir - $(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz - $(RM) $(htmldocs).tar.gz $(manpages).tar.gz -- $(RM) gitweb/gitweb.cgi - $(MAKE) -C Documentation/ clean -+ifndef NO_PERL -+ $(RM) gitweb/gitweb.cgi - $(MAKE) -C perl clean -+endif - $(MAKE) -C templates/ clean - $(MAKE) -C t/ clean - ifndef NO_TCLTK -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/lib-git-svn.sh git-1.5.5.3/t/lib-git-svn.sh ---- git-1.5.5.3.orig/t/lib-git-svn.sh 2008-05-28 00:56:46.000000000 -0700 -+++ git-1.5.5.3/t/lib-git-svn.sh 2008-05-28 10:38:12.571288044 -0700 -@@ -6,6 +6,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-svn tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - GIT_DIR=$PWD/.git - GIT_SVN_DIR=$GIT_DIR/svn/git-svn -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t5505-remote.sh git-1.5.5.3/t/t5505-remote.sh ---- git-1.5.5.3.orig/t/t5505-remote.sh 2008-05-28 00:56:46.000000000 -0700 -+++ git-1.5.5.3/t/t5505-remote.sh 2008-05-28 10:38:12.571288044 -0700 -@@ -3,6 +3,12 @@ - test_description='git remote porcelain-ish' - - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - setup_repository () { - mkdir "$1" && ( -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t7501-commit.sh git-1.5.5.3/t/t7501-commit.sh ---- git-1.5.5.3.orig/t/t7501-commit.sh 2008-05-28 00:56:46.000000000 -0700 -+++ git-1.5.5.3/t/t7501-commit.sh 2008-05-28 10:38:12.571288044 -0700 -@@ -38,7 +38,7 @@ - "echo King of the bongo >file && - ! git-commit -m foo -a file" - --test_expect_success \ -+[ -z "$NO_PERL" ] && test_expect_success \ - "using paths with --interactive" \ - "echo bong-o-bong >file && - ! echo 7 | git-commit -m foo --interactive file" -@@ -119,7 +119,7 @@ - "echo 'gak' >file && \ - git-commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a" - --test_expect_success \ -+[ -z "$NO_PERL" ] && test_expect_success \ - "interactive add" \ - "echo 7 | git-commit --interactive | grep 'What now'" - -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t9001-send-email.sh git-1.5.5.3/t/t9001-send-email.sh ---- git-1.5.5.3.orig/t/t9001-send-email.sh 2008-05-28 00:56:46.000000000 -0700 -+++ git-1.5.5.3/t/t9001-send-email.sh 2008-05-28 10:38:12.571288044 -0700 -@@ -2,6 +2,12 @@ - - test_description='git-send-email' - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-send-email tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - PROG='git send-email' - test_expect_success \ -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t9200-git-cvsexportcommit.sh git-1.5.5.3/t/t9200-git-cvsexportcommit.sh ---- git-1.5.5.3.orig/t/t9200-git-cvsexportcommit.sh 2008-05-28 00:56:46.000000000 -0700 -+++ git-1.5.5.3/t/t9200-git-cvsexportcommit.sh 2008-05-28 10:38:12.571288044 -0700 -@@ -13,6 +13,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsexportcommit tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - CVSROOT=$(pwd)/cvsroot - CVSWORK=$(pwd)/cvswork -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t9400-git-cvsserver-server.sh git-1.5.5.3/t/t9400-git-cvsserver-server.sh ---- git-1.5.5.3.orig/t/t9400-git-cvsserver-server.sh 2008-05-28 00:56:46.000000000 -0700 -+++ git-1.5.5.3/t/t9400-git-cvsserver-server.sh 2008-05-28 10:38:12.573745493 -0700 -@@ -17,6 +17,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsserver tests, NO_PERL defined' : -+ test_done -+ exit -+fi - perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { - test_expect_success 'skipping git-cvsserver tests, Perl SQLite interface unavailable' : - test_done -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t9500-gitweb-standalone-no-errors.sh git-1.5.5.3/t/t9500-gitweb-standalone-no-errors.sh ---- git-1.5.5.3.orig/t/t9500-gitweb-standalone-no-errors.sh 2008-05-28 00:56:46.000000000 -0700 -+++ git-1.5.5.3/t/t9500-gitweb-standalone-no-errors.sh 2008-05-28 10:38:12.573745493 -0700 -@@ -67,6 +67,13 @@ - } - - . ./test-lib.sh -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping gitweb-standalone-no-errors tests, NO_PERL defined' : -+ test_done -+ exit -+fi -+ - - perl -MEncode -e 'decode_utf8("", Encode::FB_CROAK)' >/dev/null 2>&1 || { - test_expect_success 'skipping gitweb tests, perl version is too old' : -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.5.5.3.orig/t/t9600-cvsimport.sh git-1.5.5.3/t/t9600-cvsimport.sh ---- git-1.5.5.3.orig/t/t9600-cvsimport.sh 2008-05-28 00:56:46.000000000 -0700 -+++ git-1.5.5.3/t/t9600-cvsimport.sh 2008-05-28 10:38:12.573745493 -0700 -@@ -15,6 +15,12 @@ - test_done - exit - fi -+if test -n "$NO_PERL" -+then -+ test_expect_success 'skipping git-cvsimport tests, NO_PERL defined' : -+ test_done -+ exit -+fi - - cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'` - case "$cvsps_version" in diff --git a/dev-util/git/files/50git-gentoo.el b/dev-util/git/files/50git-gentoo.el deleted file mode 100644 index 42edd7714f07..000000000000 --- a/dev-util/git/files/50git-gentoo.el +++ /dev/null @@ -1,13 +0,0 @@ - -;;; dev-util/git site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(autoload 'git-status "git" "Entry point into git-status mode." t) -;;(autoload 'git-blame-mode "git-blame" -;; "Minor mode for incremental blame for Git." t) - -;; GNU Emacs >=22.2 already includes vc-git.el. -;; Enable the following only if Emacs has no GIT support. -(unless (fboundp 'vc-git-registered) - (add-to-list 'load-path "@SITELISP@/compat") - (add-to-list 'vc-handled-backends 'GIT)) diff --git a/dev-util/git/files/70git-gentoo.el b/dev-util/git/files/70git-gentoo.el deleted file mode 100644 index ed65bb489881..000000000000 --- a/dev-util/git/files/70git-gentoo.el +++ /dev/null @@ -1,4 +0,0 @@ -;;; git site-lisp configuration - -(add-to-list 'vc-handled-backends 'GIT) -(require 'git) diff --git a/dev-util/git/files/72git-gentoo.el b/dev-util/git/files/72git-gentoo.el deleted file mode 100644 index 5d58165fa598..000000000000 --- a/dev-util/git/files/72git-gentoo.el +++ /dev/null @@ -1,11 +0,0 @@ - -;;; dev-util/git site-lisp configuration - -;; GNU Emacs >=22.2 already includes vc-git.el. -;; Enable the following only if Emacs has no GIT support. -(unless (fboundp 'vc-git-registered) - (add-to-list 'load-path "@SITELISP@") - (add-to-list 'vc-handled-backends 'GIT) - (autoload 'git-status "git" "Entry point into git-status mode." t) - (autoload 'git-blame-mode "git-blame" - "Minor mode for incremental blame for Git." t)) diff --git a/dev-util/git/files/git-1.5.0-symlinks.patch b/dev-util/git/files/git-1.5.0-symlinks.patch deleted file mode 100644 index 282dee8d58b8..000000000000 --- a/dev-util/git/files/git-1.5.0-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 084b7fe..ea297a4 100644 ---- a/Makefile -+++ b/Makefile -@@ -901,7 +901,7 @@ install: all - cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \ - '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \ - fi -- $(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) -+ $(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) - ifneq (,$X) - $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';) - endif diff --git a/dev-util/git/files/git-1.5.3-symlinks.patch b/dev-util/git/files/git-1.5.3-symlinks.patch deleted file mode 100644 index 3a4d834a2d5f..000000000000 --- a/dev-util/git/files/git-1.5.3-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 2f3b9b2..5c595ac 100644 ---- a/Makefile -+++ b/Makefile -@@ -997,7 +997,7 @@ endif - cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \ - '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \ - fi -- $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) -+ $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) - ifneq (,$X) - $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';) - endif diff --git a/dev-util/git/files/git-1.5.3.8-t9101.patch b/dev-util/git/files/git-1.5.3.8-t9101.patch deleted file mode 100644 index 84db3adaff04..000000000000 --- a/dev-util/git/files/git-1.5.3.8-t9101.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit d99c74e2913ab098953bd5b422b95f39e2dcfb55 -Author: Sam Vilain <sam.vilain@catalyst.net.nz> -Date: Fri Sep 21 14:02:34 2007 +1200 - - git-svn: fix test for trunk svn (transaction out of date) - - Older svn clients did not raise a 'transaction out of date' error here, but - trunk does - so 'svn up'. - - Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> - Acked-by: Eric Wong <normalperson@yhbt.net> - Signed-off-by: Junio C Hamano <gitster@pobox.com> - -diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh -index 622ea1c..5aac644 100755 ---- a/t/t9101-git-svn-props.sh -+++ b/t/t9101-git-svn-props.sh -@@ -140,6 +140,7 @@ test_expect_success 'test show-ignore' " - cd test_wc && - mkdir -p deeply/nested/directory && - svn add deeply && -+ svn up && - svn propset -R svn:ignore 'no-such-file*' . - svn commit -m 'propset svn:ignore' - cd .. && diff --git a/dev-util/git/files/git-1.5.3.8-t9106.patch b/dev-util/git/files/git-1.5.3.8-t9106.patch deleted file mode 100644 index b5df85f3994d..000000000000 --- a/dev-util/git/files/git-1.5.3.8-t9106.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 8d92f24852420c425f3ee499d3c3be01be4dc15c -Author: Eric Wong <normalperson@yhbt.net> -Date: Wed Nov 21 00:57:33 2007 -0800 - - t9106: fix a race condition that caused svn to miss modifications - - carbonated beverage noticed this test was occasionally failing. - - Signed-off-by: Eric Wong <normalperson@yhbt.net> - -diff --git a/t/t9106-git-svn-dcommit-clobber-series.sh b/t/t9106-git-svn-dcommit-clobber-series.sh -index d59acc8..7452546 100755 ---- a/t/t9106-git-svn-dcommit-clobber-series.sh -+++ b/t/t9106-git-svn-dcommit-clobber-series.sh -@@ -22,6 +22,7 @@ test_expect_success '(supposedly) non-conflicting change from SVN' " - cd tmp && - perl -i -p -e 's/^58\$/5588/' file && - perl -i -p -e 's/^61\$/6611/' file && -+ poke file && - test x\"\`sed -n -e 58p < file\`\" = x5588 && - test x\"\`sed -n -e 61p < file\`\" = x6611 && - svn commit -m '58 => 5588, 61 => 6611' && diff --git a/dev-util/git/git-1.5.1.6.ebuild b/dev-util/git/git-1.5.1.6.ebuild deleted file mode 100644 index 7d8eabe949e6..000000000000 --- a/dev-util/git/git-1.5.1.6.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.1.6.ebuild,v 1.16 2008/02/27 02:19:03 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl ppcsha1 tk webdav" - -DEPEND="dev-libs/openssl - sys-libs/zlib - !app-misc/git - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - dev-lang/perl - perl? ( dev-perl/Error ) - tk? ( dev-lang/tk ) - gtk? ( >=dev-python/pygtk-2.8 )" - -S="${WORKDIR}/${MY_P}" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use mozsha1 ; then - myopts="${myopts} MOZILLA_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring." - fi - - myopts="${myopts} WITH_SEND_EMAIL=YesPlease" - - use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease" - - export MY_MAKEOPTS=${myopts} -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-1.5.0-symlinks.patch - - sed -i \ - -e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - -e 's:ln :ln -s :g' \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || die "make install failed" - - use tk || rm "${D}"/usr/bin/gitk - - doman "${WORKDIR}"/man?/* - - dodoc README Documentation/SubmittingPatches - if use doc ; then - dodoc Documentation/technical/* - dodir /usr/share/doc/${PF}/html - cp -r "${WORKDIR}"/{*.html,howto} "${D}"/usr/share/doc/${PF}/html - fi - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - insinto "${SITELISP}" - doins contrib/emacs/{,vc-}git.el* - elisp-site-file-install "${FILESDIR}"/70git-gentoo.el - fi - - if use gtk ; then - dobin contrib/gitview/gitview - use doc && dodoc contrib/gitview/gitview.txt - fi - - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - has_version dev-util/subversion || \ - MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease" - has_version app-arch/unzip || \ - rm "${S}"/t/t5000-tar-tree.sh - # Stupid CVS won't let some people commit as root - rm "${S}"/t/t9200-git-cvsexportcommit.sh - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -pkg_postinst() { - use emacs && elisp-site-regen - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-archimport "dev-util/tla" - showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1" - showpkgdeps git-svnimport "dev-util/subversion(USE=perl)" - showpkgdeps git-svn "dev-util/subversion(USE=perl)" "dev-perl/libwww-perl" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - # regenerate site-gentoo if we are merged USE=emacs and unmerged - # USE=-emacs - has_version virtual/emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.3.7-r1.ebuild b/dev-util/git/git-1.5.3.7-r1.ebuild deleted file mode 100644 index 0df5c52284d1..000000000000 --- a/dev-util/git/git-1.5.3.7-r1.ebuild +++ /dev/null @@ -1,224 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.7-r1.ebuild,v 1.12 2008/02/01 10:46:40 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - dev-lang/perl - app-arch/cpio - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - cgi? ( virtual/perl-CGI ) - perl? ( dev-perl/Error ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use mozsha1 ; then - myopts="${myopts} MOZILLA_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring." - fi - - myopts="${myopts} WITH_SEND_EMAIL=YesPlease" - - use iconv || myopts="${myopts} NO_ICONV=YesPlease" - use tk || myopts="${myopts} NO_TCLTK=YesPlease" - - export MY_MAKEOPTS=${myopts} -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -src_unpack() { - 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}" - - epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch - - sed -i \ - -e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - -e 's:ln :ln -s :g' \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - einfo "Doing Documentation${d}" - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - newbin "${S}"/contrib/blameview/blameview.perl blameview - newdoc "${S}"/contrib/blameview/README README.blameview - 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 - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh vim stats \ - workdir ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use cgi ; then - dodir /usr/share/${PN}/gitweb - insinto /usr/share/${PN}/gitweb - doins "${S}"/gitweb/gitweb.{cgi,css} - doins "${S}"/gitweb/git-{favicon,logo}.png - docinto / - # INSTALL discusses configuration issues, not just installation - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - fi - - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - has_version dev-util/subversion || \ - MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease" - has_version app-arch/unzip || \ - rm "${S}"/t/t5000-tar-tree.sh - # Stupid CVS won't let some people commit as root - if has userpriv "${FEATURES}"; then - einfo "Enabling CVS tests as we have FEATURES=userpriv" - else - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do - rm "${S}"/t/${i} || die "Failed to remove ${i}" - done - fi - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - elog "These additional scripts need some dependencies:" - elog "(These are also needed for FEATURES=test)" - echo - showpkgdeps git-archimport "dev-util/tla" - showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1" - showpkgdeps git-svnimport \ - "USE=perl" \ - "dev-util/subversion(USE=perl)" \ - "dev-perl/libwww-perl" - showpkgdeps git-svn \ - "dev-util/subversion(USE=perl)" \ - "dev-perl/libwww-perl" \ - "dev-perl/TermReadKey" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache(SLOT=2) )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.3.8.ebuild b/dev-util/git/git-1.5.3.8.ebuild deleted file mode 100644 index 87ec993e795d..000000000000 --- a/dev-util/git/git-1.5.3.8.ebuild +++ /dev/null @@ -1,224 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.8.ebuild,v 1.3 2008/02/01 10:46:40 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - dev-lang/perl - app-arch/cpio - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND} - cgi? ( virtual/perl-CGI ) - perl? ( dev-perl/Error ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use mozsha1 ; then - myopts="${myopts} MOZILLA_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring." - fi - - myopts="${myopts} WITH_SEND_EMAIL=YesPlease" - - use iconv || myopts="${myopts} NO_ICONV=YesPlease" - use tk || myopts="${myopts} NO_TCLTK=YesPlease" - - export MY_MAKEOPTS=${myopts} -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -src_unpack() { - 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}" - - epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch - epatch "${FILESDIR}"/${P}-t9106.patch - epatch "${FILESDIR}"/${P}-t9101.patch - - sed -i \ - -e "s:^\(CFLAGS = \).*$:\1${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS = \).*$:\1${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - -e 's:ln :ln -s :g' \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - newbin "${S}"/contrib/blameview/blameview.perl blameview - newdoc "${S}"/contrib/blameview/README README.blameview - 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 - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh vim stats \ - workdir ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use cgi ; then - dodir /usr/share/${PN}/gitweb - insinto /usr/share/${PN}/gitweb - doins "${S}"/gitweb/gitweb.{cgi,css} - doins "${S}"/gitweb/git-{favicon,logo}.png - docinto / - # INSTALL discusses configuration issues, not just installation - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - fi - - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - has_version dev-util/subversion || \ - MY_MAKEOPTS="${MY_MAKEOPTS} NO_SVN_TESTS=YesPlease" - has_version app-arch/unzip || \ - rm "${S}"/t/t5000-tar-tree.sh - if ! has userpriv "${FEATURES}"; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - for i in t9200-git-cvsexportcommit.sh t9600-cvsimport.sh ; do - rm "${S}"/t/${i} || die "Failed to remove ${i}" - done - fi - built_with_use dev-util/cvs server || rm "${S}"/t/t9600-cvsimport.sh - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - elog "These additional scripts need some dependencies:" - elog "(These are also needed for FEATURES=test)" - echo - showpkgdeps git-archimport "dev-util/tla" - showpkgdeps git-cvsimport ">=dev-util/cvsps-2.1" - showpkgdeps git-svnimport \ - "USE=perl" \ - "dev-util/subversion(USE=perl)" \ - "dev-perl/libwww-perl" - showpkgdeps git-svn \ - "USE=perl" \ - "dev-util/subversion(USE=perl)" \ - "dev-perl/libwww-perl" \ - "dev-perl/TermReadKey" - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-cvsserver "dev-perl/DBI" "dev-perl/DBD-SQLite" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - showpkgdeps git-send-email "USE=perl" - showpkgdeps git-remote "USE=perl" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/git/git-1.5.4.5.ebuild b/dev-util/git/git-1.5.4.5.ebuild deleted file mode 100644 index c69c9f5121a7..000000000000 --- a/dev-util/git/git-1.5.4.5.ebuild +++ /dev/null @@ -1,270 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.4.5.ebuild,v 1.9 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -# dev-perl/{Authen-SASL,Net-SMTP-SSL} are used by git-send-email - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - if use cgi || use cvs || use subversion ; then - eerror "You must built dev-util/git with USE=perl and the" - eerror "applicable USE flag to use any of the following:" - eerror "gitweb, git-cvs*, git-svn, git-archimport, git-quiltimport" - die "You need USE=perl to satisfy your other USE= requests!" - fi - 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" - use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring." - fi - - use iconv || myopts="${myopts} NO_ICONV=YesPlease" - use tk || myopts="${myopts} NO_TCLTK=YesPlease" - use perl || 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() { - 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}" - - epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch - epatch "${FILESDIR}"/20080322-${PN}-1.5.4.4-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - -e 's:ln :ln -s :g' \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 vim 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,css} - doins "${S}"/gitweb/git-{favicon,logo}.png - docinto / - # INSTALL discusses configuration issues, not just installation - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - 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 \ - t9600-cvsimport.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. - has_version app-arch/unzip || \ - einfo "Disabling tar-tree tests" && \ - disabled="${disabled} \ - t5000-tar-tree.sh" - - if ! has userpriv "${FEATURES}"; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} \ - ${tests_cvs}" - fi - - use cvs && \ - has_version dev-util/cvs && \ - built_with_use dev-util/cvs server || \ - einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ - disabled="${disabled} \ - ${tests_cvs}" - - use perl || \ - einfo "Disabling tests that need Perl" && \ - disabled="${disabled} \ - ${tests_perl}" - - # 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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-archimport "dev-util/tla" - 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-util/git/git-1.5.5.3-r1.ebuild b/dev-util/git/git-1.5.5.3-r1.ebuild deleted file mode 100644 index 9e1c4bd260e8..000000000000 --- a/dev-util/git/git-1.5.5.3-r1.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.5.3-r1.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 && "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080528-${PN}-1.5.5.3-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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. - has_version app-arch/unzip || \ - einfo "Disabling tar-tree tests" && \ - disabled="${disabled} \ - t5000-tar-tree.sh" - - if ! has userpriv "${FEATURES}"; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} \ - ${tests_cvs}" - fi - - use cvs && \ - has_version dev-util/cvs && \ - built_with_use dev-util/cvs server || \ - einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ - disabled="${disabled} \ - ${tests_cvs}" - - use perl || \ - einfo "Disabling tests that need Perl" && \ - disabled="${disabled} \ - ${tests_perl}" - - # 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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-archimport "dev-util/tla" - 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-util/git/git-1.5.5.3.ebuild b/dev-util/git/git-1.5.5.3.ebuild deleted file mode 100644 index b56390a80d03..000000000000 --- a/dev-util/git/git-1.5.5.3.ebuild +++ /dev/null @@ -1,282 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.5.3.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( net-misc/curl ) - webdav? ( dev-libs/expat ) - emacs? ( virtual/emacs )" -# dev-perl/{Authen-SASL,Net-SMTP-SSL} are used by git-send-email - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - if use cgi || use cvs || use subversion ; then - eerror "You must built dev-util/git with USE=perl and the" - eerror "applicable USE flag to use any of the following:" - eerror "gitweb, git-cvs*, git-svn, git-archimport, git-quiltimport" - die "You need USE=perl to satisfy your other USE= requests!" - fi - 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" - use webdav && ewarn "USE=webdav only matters with USE=curl. Ignoring." - fi - - use iconv || myopts="${myopts} NO_ICONV=YesPlease" - use tk || myopts="${myopts} NO_TCLTK=YesPlease" - use perl || 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() { - 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}" - - epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch - epatch "${FILESDIR}"/20080528-${PN}-1.5.5.3-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - -e 's:ln :ln -s :g' \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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. - has_version app-arch/unzip || \ - einfo "Disabling tar-tree tests" && \ - disabled="${disabled} \ - t5000-tar-tree.sh" - - if ! has userpriv "${FEATURES}"; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} \ - ${tests_cvs}" - fi - - use cvs && \ - has_version dev-util/cvs && \ - built_with_use dev-util/cvs server || \ - einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ - disabled="${disabled} \ - ${tests_cvs}" - - use perl || \ - einfo "Disabling tests that need Perl" && \ - disabled="${disabled} \ - ${tests_perl}" - - # 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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-archimport "dev-util/tla" - 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-util/git/git-1.5.5.4.ebuild b/dev-util/git/git-1.5.5.4.ebuild deleted file mode 100644 index 130df120a538..000000000000 --- a/dev-util/git/git-1.5.5.4.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.5.4.ebuild,v 1.4 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 -} - -# 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080528-${PN}-1.5.5.3-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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. - has_version app-arch/unzip || \ - einfo "Disabling tar-tree tests" && \ - disabled="${disabled} \ - t5000-tar-tree.sh" - - if ! has userpriv "${FEATURES}"; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} \ - ${tests_cvs}" - fi - - use cvs && \ - has_version dev-util/cvs && \ - built_with_use dev-util/cvs server || \ - einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ - disabled="${disabled} \ - ${tests_cvs}" - - use perl || \ - einfo "Disabling tests that need Perl" && \ - disabled="${disabled} \ - ${tests_perl}" - - # 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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-archimport "dev-util/tla" - 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-util/git/git-1.5.6.1.ebuild b/dev-util/git/git-1.5.6.1.ebuild deleted file mode 100644 index 6c6a3b27baf8..000000000000 --- a/dev-util/git/git-1.5.6.1.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.1.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 -} - -# 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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. - has_version app-arch/unzip || \ - einfo "Disabling tar-tree tests" && \ - disabled="${disabled} \ - t5000-tar-tree.sh" - - if ! has userpriv "${FEATURES}"; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} \ - ${tests_cvs}" - fi - - use cvs && \ - has_version dev-util/cvs && \ - built_with_use dev-util/cvs server || \ - einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ - disabled="${disabled} \ - ${tests_cvs}" - - use perl || \ - einfo "Disabling tests that need Perl" && \ - disabled="${disabled} \ - ${tests_perl}" - - # 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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-archimport "dev-util/tla" - 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-util/git/git-1.5.6.2.ebuild b/dev-util/git/git-1.5.6.2.ebuild deleted file mode 100644 index 69722b01bc0d..000000000000 --- a/dev-util/git/git-1.5.6.2.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.2.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 -} - -# 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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. - has_version app-arch/unzip || \ - einfo "Disabling tar-tree tests" && \ - disabled="${disabled} \ - t5000-tar-tree.sh" - - if ! has userpriv "${FEATURES}"; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} \ - ${tests_cvs}" - fi - - use cvs && \ - has_version dev-util/cvs && \ - built_with_use dev-util/cvs server || \ - einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ - disabled="${disabled} \ - ${tests_cvs}" - - use perl || \ - einfo "Disabling tests that need Perl" && \ - disabled="${disabled} \ - ${tests_perl}" - - # 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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-archimport "dev-util/tla" - 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-util/git/git-1.5.6.3.ebuild b/dev-util/git/git-1.5.6.3.ebuild deleted file mode 100644 index 42610678939a..000000000000 --- a/dev-util/git/git-1.5.6.3.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.3.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 -} - -# 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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. - has_version app-arch/unzip || \ - einfo "Disabling tar-tree tests" && \ - disabled="${disabled} \ - t5000-tar-tree.sh" - - if ! has userpriv "${FEATURES}"; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} \ - ${tests_cvs}" - fi - - use cvs && \ - has_version dev-util/cvs && \ - built_with_use dev-util/cvs server || \ - einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ - disabled="${disabled} \ - ${tests_cvs}" - - use perl || \ - einfo "Disabling tests that need Perl" && \ - disabled="${disabled} \ - ${tests_perl}" - - # 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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-archimport "dev-util/tla" - 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-util/git/git-1.5.6.4.ebuild b/dev-util/git/git-1.5.6.4.ebuild deleted file mode 100644 index 834fb35d064c..000000000000 --- a/dev-util/git/git-1.5.6.4.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.4.ebuild,v 1.12 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 -} - -# 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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. - has_version app-arch/unzip || \ - einfo "Disabling tar-tree tests" && \ - disabled="${disabled} \ - t5000-tar-tree.sh" - - if ! has userpriv "${FEATURES}"; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} \ - ${tests_cvs}" - fi - - use cvs && \ - has_version dev-util/cvs && \ - built_with_use dev-util/cvs server || \ - einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ - disabled="${disabled} \ - ${tests_cvs}" - - use perl || \ - einfo "Disabling tests that need Perl" && \ - disabled="${disabled} \ - ${tests_perl}" - - # 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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/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-util/git/git-1.5.6.5.ebuild b/dev-util/git/git-1.5.6.5.ebuild deleted file mode 100644 index 3c47d93973c9..000000000000 --- a/dev-util/git/git-1.5.6.5.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.6.5.ebuild,v 1.4 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 -} - -# 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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. - has_version app-arch/unzip || \ - einfo "Disabling tar-tree tests" && \ - disabled="${disabled} \ - t5000-tar-tree.sh" - - if ! has userpriv "${FEATURES}"; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} \ - ${tests_cvs}" - fi - - use cvs && \ - has_version dev-util/cvs && \ - built_with_use dev-util/cvs server || \ - einfo "Disabling CVS tests (needs dev-util/cvs[USE=server])" && \ - disabled="${disabled} \ - ${tests_cvs}" - - use perl || \ - einfo "Disabling tests that need Perl" && \ - disabled="${disabled} \ - ${tests_perl}" - - # 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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/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-util/git/git-1.6.0.1.ebuild b/dev-util/git/git-1.6.0.1.ebuild deleted file mode 100644 index 3166e4ef5891..000000000000 --- a/dev-util/git/git-1.6.0.1.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.1.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 -} - -# 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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 ! has userpriv "${FEATURES}"; 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 - disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-util/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 0 ]] && \ - built_with_use dev-util/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-util/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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/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-util/git/git-1.6.0.2.ebuild b/dev-util/git/git-1.6.0.2.ebuild deleted file mode 100644 index fc88e2737c6d..000000000000 --- a/dev-util/git/git-1.6.0.2.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.2.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 -} - -# 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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 ! has userpriv "${FEATURES}"; 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 - disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-util/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 0 ]] && \ - built_with_use dev-util/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-util/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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/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-util/git/git-1.6.0.3.ebuild b/dev-util/git/git-1.6.0.3.ebuild deleted file mode 100644 index 6561ff4d57ca..000000000000 --- a/dev-util/git/git-1.6.0.3.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.3.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 -} - -# 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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 ! has userpriv "${FEATURES}"; 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 - disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-util/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 0 ]] && \ - built_with_use dev-util/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-util/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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/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-util/git/git-1.6.0.4-r1.ebuild b/dev-util/git/git-1.6.0.4-r1.ebuild deleted file mode 100644 index 4fb0c84ff1cd..000000000000 --- a/dev-util/git/git-1.6.0.4-r1.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.4-r1.ebuild,v 1.5 2008/11/24 01:24:00 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -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-util/subversion && built_with_use --missing false dev-util/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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - epatch "${FILESDIR}"/20081123-git-1.6.0.4-noperl-cvsserver.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - install || \ - die "make install failed" - - doman man?/* - - 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}/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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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 ! has userpriv "${FEATURES}"; 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 - disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-util/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 0 ]] && \ - built_with_use dev-util/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-util/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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr 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-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/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-util/git/git-1.6.0.4-r2.ebuild b/dev-util/git/git-1.6.0.4-r2.ebuild deleted file mode 100644 index 331fda5ca4e7..000000000000 --- a/dev-util/git/git-1.6.0.4-r2.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.4-r2.ebuild,v 1.1 2008/11/24 09:24:44 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -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-util/subversion && built_with_use --missing false dev-util/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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - epatch "${FILESDIR}"/20081123-git-1.6.0.4-noperl-cvsserver.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - install || \ - die "make install failed" - - doman man?/* - - 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}/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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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 ! has userpriv "${FEATURES}"; 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 - disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-util/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 0 ]] && \ - built_with_use dev-util/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-util/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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr 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-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/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-util/git/git-1.6.0.4.ebuild b/dev-util/git/git-1.6.0.4.ebuild deleted file mode 100644 index 861f55594e5d..000000000000 --- a/dev-util/git/git-1.6.0.4.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.4.ebuild,v 1.3 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 -} - -# 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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 ! has userpriv "${FEATURES}"; 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 - disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-util/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 0 ]] && \ - built_with_use dev-util/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-util/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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/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-util/git/git-1.6.0.ebuild b/dev-util/git/git-1.6.0.ebuild deleted file mode 100644 index 8cc3743c117f..000000000000 --- a/dev-util/git/git-1.6.0.ebuild +++ /dev/null @@ -1,293 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.0.ebuild,v 1.4 2008/11/24 01:20:46 robbat2 Exp $ - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://git.or.cz/" -SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="curl cgi doc emacs gtk iconv mozsha1 perl ppcsha1 tk threads webdav xinetd cvs subversion vim-syntax" - -DEPEND=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${DEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 )" - -SITEFILE=72${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 -} - -# 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} 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() { - 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}" - - epatch "${FILESDIR}"/20080626-git-1.5.6.1-noperl.patch - - sed -i \ - -e "s:^\(CFLAGS =\).*$:\1 ${CFLAGS} -Wall:" \ - -e "s:^\(LDFLAGS =\).*$:\1 ${LDFLAGS}:" \ - -e "s:^\(CC = \).*$:\1$(tc-getCC):" \ - -e "s:^\(AR = \).*$:\1$(tc-getAR):" \ - Makefile || die "sed failed" - - exportmakeopts -} - -src_compile() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr || die "make failed" - - if use emacs ; then - elisp-compile contrib/emacs/{,vc-}git.el || die "emacs modules failed" - fi - if use perl && use cgi ; then - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - prefix=/usr \ - gitweb/gitweb.cgi || die "make gitweb/gitweb.cgi failed" - fi -} - -src_install() { - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr install || \ - die "make install failed" - - doman man?/* - - 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/{,vc-}git.el* || \ - die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}"/"${SITELISP}"/${PN}/.nosearch - 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 - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/syntax/ - doins contrib/vim/syntax/gitcommit.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - newins "${FILESDIR}"/vim-ftdetect-gitcommit.vim gitcommit.vim - fi - - 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 - 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 \ - t9600-cvsimport.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 ! has userpriv "${FEATURES}"; 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 - disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-util/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 0 ]] && \ - built_with_use dev-util/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-util/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" - emake ${MY_MAKEOPTS} DESTDIR="${D}" prefix=/usr test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - if use emacs ; then - elisp-site-regen - elog "GNU Emacs has built-in Git support in versions greater 22.1." - elog "You can disable the emacs USE flag for dev-util/git" - elog "if you are using such a version." - fi - if use subversion && has_version dev-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/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-util/git/git-1.6.3_rc4.ebuild b/dev-util/git/git-1.6.3_rc4.ebuild deleted file mode 100644 index 4a3556aad9da..000000000000 --- a/dev-util/git/git-1.6.3_rc4.ebuild +++ /dev/null @@ -1,356 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.6.3_rc4.ebuild,v 1.4 2009/05/05 19:15:12 robbat2 Exp $ - -EAPI=2 - -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 ~sparc-fbsd ~x86 ~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=" - !app-misc/git - dev-libs/openssl - sys-libs/zlib - app-arch/cpio - perl? ( dev-lang/perl ) - 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-util/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-util/subversion[-dso] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? ( >=dev-python/pygtk-2.8 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-util/subversion && built_with_use --missing false dev-util/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} 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 - 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" - - doman man?/*.[157] 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 \ - t9600-cvsimport.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 ! has userpriv "${FEATURES}"; 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 - disabled="${disabled} t0004-unwritable.sh t1004-read-tree-m-u-wf.sh" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-util/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 0 ]] && \ - built_with_use dev-util/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-util/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-util/subversion && ! built_with_use --missing false dev-util/subversion perl ; then - ewarn "You must build dev-util/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 -} |