From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2B7A71384B4 for ; Thu, 19 Nov 2015 23:27:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42B53E07BA; Thu, 19 Nov 2015 23:27:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A903EE07BA for ; Thu, 19 Nov 2015 23:27:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C1943409B9 for ; Thu, 19 Nov 2015 23:27:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C468B9F5 for ; Thu, 19 Nov 2015 23:26:57 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1447975611.6f2831444671a732e0d16ea6888344daecb4633f.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/, dev-vcs/git/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git/Manifest dev-vcs/git/files/git-1.8.5-mw-destdir.patch dev-vcs/git/files/git-1.8.5-optional-cvs.patch dev-vcs/git/files/git-1.9.0_rc3-optional-cvs.patch dev-vcs/git/files/git-2.0.0-r2-optional-cvs.patch dev-vcs/git/git-1.8.5.6.ebuild dev-vcs/git/git-1.9.5.ebuild dev-vcs/git/git-2.0.5.ebuild dev-vcs/git/git-2.1.4.ebuild dev-vcs/git/git-2.2.3.ebuild dev-vcs/git/git-2.3.10.ebuild X-VCS-Directories: dev-vcs/git/ dev-vcs/git/files/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 6f2831444671a732e0d16ea6888344daecb4633f X-VCS-Branch: master Date: Thu, 19 Nov 2015 23:26:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 913b18eb-af43-4536-bd45-ff9410299f7e X-Archives-Hash: fe4d72ebbc6c8961b2906fce043124c4 commit: 6f2831444671a732e0d16ea6888344daecb4633f Author: Robin H. Johnson gentoo org> AuthorDate: Thu Nov 19 23:26:51 2015 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Thu Nov 19 23:26:51 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f283144 Cleanup old versions. Package-Manager: portage-2.2.24 dev-vcs/git/Manifest | 18 - dev-vcs/git/files/git-1.8.5-mw-destdir.patch | 37 -- dev-vcs/git/files/git-1.8.5-optional-cvs.patch | 362 ------------ dev-vcs/git/files/git-1.9.0_rc3-optional-cvs.patch | 372 ------------ dev-vcs/git/files/git-2.0.0-r2-optional-cvs.patch | 375 ------------ dev-vcs/git/git-1.8.5.6.ebuild | 641 --------------------- dev-vcs/git/git-1.9.5.ebuild | 640 -------------------- dev-vcs/git/git-2.0.5.ebuild | 639 -------------------- dev-vcs/git/git-2.1.4.ebuild | 635 -------------------- dev-vcs/git/git-2.2.3.ebuild | 637 -------------------- dev-vcs/git/git-2.3.10.ebuild | 636 -------------------- 11 files changed, 4992 deletions(-) diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index f187536..a2eb808 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,29 +1,11 @@ -DIST git-1.8.5.6.tar.gz 4765390 SHA256 6a68455cc0cb96aa9cae44ac7afcb5b63a47e9da7c0ff6012bb78d184be41af5 SHA512 fd004a5a99e8ff80556e669ef6e297a4eea9c9f9c58ef9162eef1c66580c4156165c81371ff5832e56ad729d6ed3fb1459a14d682cfd2b8c37c9ceb298be2ef3 WHIRLPOOL 665c9380314abc85cb1e3a114fd60a4f535d7a8aa25437c8c3ff8bc0a3ebedaeef4aa7a6259108ab2f79c3344810b5c2f86f85546fc9015d031c89762bfc4f33 -DIST git-1.9.5.tar.gz 4851532 SHA256 44efbc76edb50103e0d1b549dac006ee6f275fbd62491d7473e21127601f55c1 SHA512 0fa0a1fd636ed29ef54885ecbacc239c2b6edd4820a633fd88a8f62dd7e50ead1676aa0c3cf0df88a49dd5e1364f6b8da3ec9c115d1bc55bba4bf413539bedb0 WHIRLPOOL a860d6b194e27d9a5ba086d665c0b31870d4fc71380a44ec55f0b7f19c6bf973ab0d628e531c175138fce54dfa7d799ed9ab276dffaf9bec66c45cd885e324f2 -DIST git-2.0.5.tar.xz 3437996 SHA256 f5a63f5073c7f10d0676d0dabb46df48f2af77624fe24e1c6047b0e047af8ca1 SHA512 a2de101462cb7cf79ae596a5c7a77746fca430d6ae819731eb025a784b38b48b98964aca3db251e1a598ff17ff26b3711b044bd9c579d01346a8e1e77f7aa6de WHIRLPOOL b317f7b57a8a568b8a63ddbb44d6734dce01034c1b50491e3aedbb8a4ad2dc0f781b9edfad07e73ff050684f05734ee5f8b5483646967cbcd0a3cf7c600394eb -DIST git-2.1.4.tar.xz 3544804 SHA256 a04968b9b10cbcb31a7054aa3a0d11ac47c83556ecd270ddef1987df5d3d053e SHA512 17333eda9600287be1f366271f314619354f6bc9b7f867d59a9493441e71a963340cedf728b5954ac6311f5426a928a2beacfa7775e1a4d439b58e0dcf310a0b WHIRLPOOL fc20c64e0d494a13834c71ffa5c727018fc3940f4dc65ae4eda6ba14af2faf2864d779e706b503c69a16858ca051878e27bcfe1883c3c206dda6129a1bc5aceb -DIST git-2.2.3.tar.xz 3592292 SHA256 d56ba6a2b9ef51ec165b98b1894a36fbb635c6abb22674fd61ffc80603b967d9 SHA512 772466ccbbe06d83a03b244dd157c30f51e0fb06995a55070b262f8dd67ced454013fdc86690210c54db914252439be0bfccabbbfffddebb6bc047db946e9b92 WHIRLPOOL 2b60036db65cbcb1c2c2db68ec1747f6c309f9368c4f879c8b91964e16708c641e5a8b7d7b79431193b8d78d1c73e8e694ffe5f407701d7d7719f2d568bff180 -DIST git-2.3.10.tar.xz 3625052 SHA256 8d1eba6e4ad4ef57f87d25535956b5752c341f222407329025f8704537219ed8 SHA512 23cd192bf19be648377767c0b45e895e5284b5fc7558be566ce5f59516d94921212f4944daad5ab650c99c10a58628626bd3d8f23d3b4c9d0d3fa4ce17a8eb9f WHIRLPOOL f6ff0675e75ac0dad5af264f9bcb18d29b6e615d73b68ad97caf1efce353ddb96c51c8e3c6bb633e00a961b757e3bbf55a7a5e130f707696f81324ee8b16ba44 DIST git-2.4.10.tar.xz 3695176 SHA256 b631b2b26f5593833a29cd833b8071b4eaf7b212fba180e587b526f51c2331df SHA512 08f7f63fd4820f155aec08373fd4f5abbe5a4c8f98a73a824897ba68901fb274b4cf47b8751cd2bea358cbb9c09934f7857aa440de69b46ee88a4bba852f5ced WHIRLPOOL 3ec53b7355f1895c95b91e1fa85f185801acdb0317384099e4d7914208c3d762d536ed83e099c96a168d696e37e3f8a491459de59c7dd59dce9c49fb75af836b DIST git-2.5.4.tar.xz 3747552 SHA256 e08d2d384e1c8c474d336c3583ed5cd396c76455155a4e65bfa97699fc38472a SHA512 25964bc59301b11994c94bab618613bc87ef788d356af55a26c77861a939f2b67cf37be98199e81d5c2a63e8d9c043b4fc6fb481316cc4d8bb6a1f382eddf33e WHIRLPOOL e62efd86c5e0d1b040816978cc28a41d00a7c095513482b0df1d4addc87bd89ce20dbb1b77e3ec3d9bd0722de3237e451b05f687fdb6419fa419708921049222 DIST git-2.6.2.tar.xz 3812636 SHA256 646e37abbc69d5c1b153e30c82ec3346d176e2b499b44281d08565ad8e00a670 SHA512 b112c792442d2d6905c6d9ac4598b7f7ae7caf12ab353b2dc6cc7e72a162dd7225cd4cfd8cb4abb29ddddc68b0473e6f872a08240ab6e0a43c92e6c4cf63289e WHIRLPOOL 167ad95aba0d56c77f972f41001853af87a84fbdc0fc8462dac455a0a20c7306a846eedea0a4f3ec0663e32ae2f683abe2fe8fa8300e3ff9d6f55e80d43af51a DIST git-2.6.3.tar.xz 3819080 SHA256 d697e4d3d76830996c05bfc2a1d88aa726415b276a884a40d137575e5d597da3 SHA512 c388235806c5cc67e6ee4ba56225b91f27c09305cbc4f988199a45897c0bf065b9e44f18bd671bb0483133598e5bfa08382742caaca8a77ca117b039bf59d024 WHIRLPOOL 8fb5f88e3fa6ae6c9ef6c0ec79d433989b89ed0557ac80c815861841942d1675535ffcb5d5f2fe8069af45554f6c66db0ef715bd844da1e028b41be561ba5b8f -DIST git-htmldocs-1.8.5.6.tar.gz 2242475 SHA256 7c8e955d0798686fa030ba7b7b384a2eab2b74d5bd695d82faecac2e247bd211 SHA512 c9b2752bcdd7f8f817b14e99ab2743d153e3e7549bffb2aa98999e46d1e965d045850ec6a3e9f6bc83e6e4820ce20f281c33f946ebd2be16d275b85a5ddaee36 WHIRLPOOL 7db3fb74e6b51618890acfef8fb89ab09adf653d3196e82624671194bdb2b564b903429ffecf68b28faf96ce3ebb83b534459738d48ace048d873c158621d31c -DIST git-htmldocs-1.9.5.tar.gz 2262251 SHA256 4fa289e259d6b922a51d11a687203612aa1aad5696eb83b4e67c0de8a785700f SHA512 2df975c33d3411a97ab5a684b03998b7cd188d05bae6813c753fe2092b0acf463dec49a7a546d315f520fd9c71281da41998d0f36f64f48d4f95507a034a083b WHIRLPOOL edc252ce58b31f001c0d225f0b40b3689028bd34b1cbbdd889d645d37a2931e9039f76f12e5a0f918579a0b9c5dd1f3171af2bb58ee42972411ca33ec0ebe8f2 -DIST git-htmldocs-2.0.5.tar.xz 944792 SHA256 90eaf745d6ee197718fdde9c98919918ad1e4e3576608e4522b84c612cd9ef2a SHA512 e9b3d92d466762c9c7e164e9c30ff0046b262bf4707ea057e3a682f7b15a4f8149a9aaf2630f117dc3b508744cd688c6c0087cc94ff3477e7f3b85513160d7f3 WHIRLPOOL 35970d099304a5ab174fc93f8496a0c651a259dcaa3d23a2dd0233f8db214ae94a26e28044a87460d4654e61440427d331ceeac290335d6ae3fcf0423175bba9 -DIST git-htmldocs-2.1.4.tar.xz 959144 SHA256 7665daecd77c2f9be8b316eb69a1fda3f383f759e71d346a137c8cf39501d886 SHA512 7734d671ab6ca8374f54546b0987821d0c66d136d50f9cbb1ff7c06da25330e46a10ede41d10a60c80847afa68999298c2f90dfe99d51bd862590f02344e1cbd WHIRLPOOL 97326a00a1f613cf95dbeaf8938842855299d21e6963e2040b3bf9ee02a745c8156ea552e2b87248a98d5f0ecd6560a546a4a49b6635ca034ff2e92504bbb00a -DIST git-htmldocs-2.2.3.tar.xz 976124 SHA256 1e979c86d5447a4a4965de6a1a532e30ae6337e886a2d8fc61749806b2bf024d SHA512 3fe7f70b1ea4bbd60d64928802de1ea4eb35a305cbd243933876d89dfe05901cea71e3811bedb28e8ac0f0f1409afbf31884a78a8be0648b3666a0c7fcee8212 WHIRLPOOL b5348b121b9e3a11fe120ed8a379b99bba42711ea185aaf956c58d92fe3cb96969e0b60cb7c483cc5e39711a965b6a7eaa0b931477229faffff8e3326d5bf0aa -DIST git-htmldocs-2.3.10.tar.xz 988072 SHA256 628ef79383039db857aab6ad4cb627573104e618461c2c6ee58fa39a3512d115 SHA512 cd8b050979cc13aab6e9b74d7a8042f33decaea639a1fc57ea4a5839563202fecfda95295e38404a825c05d393458aebf592bfd9b0c75eae44638a2bc9e33535 WHIRLPOOL a21430705753b533ba03696b80fb210fec4b8869821cbd940d3881c080f12816d161c05d8e483764d79c337ce7fe93f741b6a3b35afe2cc69bd9e4d7a1c8de51 DIST git-htmldocs-2.4.10.tar.xz 996588 SHA256 f2c523ea114caac7c5cf51a20a420a215411762fabff2da9febfc2917af835ef SHA512 60fc5a2b6665ec7fc10680608b5689a24fa211fe7393f010a8099c6fb0a9582f20cebc7cad0653b62750677d79a80fcd6e8e96fb440acb3fc7c7c0ffc00779d3 WHIRLPOOL 30585753a7b08dfa812c74832d35168d3615d8bf71c3c853efb125348538b5fb7cc4b3f1cfef725082ade144b5362394991186967f6026cee8c91dd41e30290e DIST git-htmldocs-2.5.4.tar.xz 1009820 SHA256 cb36b3b7198a3fa49f2677bba83f1e57a1a40250a181d9e86232cb8febcc8053 SHA512 af833635632ba5c65524bfef00f291a41fd37ba7bd9ca4b65b4c0eb9329b888d2e8757fe29f33bd25a75e1841d67a20dff49f43d35a502ef3b29599d073dcd6a WHIRLPOOL e5f55c3dbdf69d946295c5c19b95a79168d34645ced8e6a837ec8b5dd948008487288159f63a2f81a36fbdf3f413d3fdefd008b0157785df37431ccb9127284e DIST git-htmldocs-2.6.2.tar.xz 1017776 SHA256 7cd13ccbe397dc742920b403957a7c769728dfe3eacc7bb91aa230ca8ab1e1c8 SHA512 d6173b5425fc0e8a9cf386b769ad67fd423fa5c426a75790130baa82ba157d53b4b226ddf119cf5311014c7dce1d71b540ddf7bb2e295e7650edd67617b1cb43 WHIRLPOOL 71b66548fb47d4c543c6a36072dce795444bd4a72a1bd01080404e6284c4044f386240b077b19ed89eea921686ce8e7d1dcdc19b476f36c6d767ac4a6d7f2d23 DIST git-htmldocs-2.6.3.tar.xz 1020504 SHA256 1e08dac903f06f9739e22ae700ff811c79bd7742775060d630c1e53236bbd9a0 SHA512 82c9b09065b9b9db6a064e8507a5a386e7f6748f3c5b7302172805b30714174e0c75226089418514ae78fedbedd921556c4c27d1fa5f3d70124a1aa30c43fc65 WHIRLPOOL 31fc4c91a15fc24a160418153471eaf82e49fc2ee9e22b7a8df60e5fd3877faeb01049503fd66f59970dc89ec8f65785447dd6eba1a2de1c67df32e85302a187 -DIST git-manpages-1.8.5.6.tar.gz 569061 SHA256 58ef7cb3121639b8d78e2e4c4f7f886bab57af9e9e137b10f372dfad573872c1 SHA512 a524a1c7e8bdc73ffe04bebb5c7050a18c8649b98714bf255c8e3c32a2443d8d5abf33e3ca2eb108d601f01e0bda50fed1e134ffdae87bcf6f551cbbd250c4ba WHIRLPOOL 2db62b96e972dbcbec1ac59d7244bf2c2ff7140c941d1d3c6b9062bd79b80541d7fa3982c5a3bc55a18fc9112ab3fa648966be5c3e1135ab7b5c89080bee82b6 -DIST git-manpages-1.9.5.tar.gz 571625 SHA256 37cc735c4ced6574e8e93349d52d30372fc6f9fe3de3d6b9934a14857d6aade8 SHA512 e3df3e933fed6ff2845989a0146b28789452e9583bc19dd4a9ad335f64b15feffbdc4dd7cdb9d6b5216f7f85837318cf9b10df033f8022777f91c2b0894fb231 WHIRLPOOL e25d77fd8d9cacb92d45fd50640bc65189d02d7e23b276ccaf3b35ba1fe64ab0c49045d1fb8983b7b2b5bd996e767508446ac76506b074ded10feef1f9256918 -DIST git-manpages-2.0.5.tar.xz 359000 SHA256 3cf1581da2a19c0651df445ee5f801e108619befe8965e01d61faa46ca57b642 SHA512 b3981565a34a203283801b86717386971ef53c2f5c47bdde290aa0df4d62045ecbcab1ff1b4d1d8ddf7d489e74d65b0208d87ace7ca8c8be9525be548e445425 WHIRLPOOL e8c78eb38cb3192455ccb991a4ce5cd3988d06f1f06cdf0722e4ce6fb1d4e57f618058cf07d312bcab4f5821a1b1dfc016c03626d4f3429d3e5ef089607a2801 -DIST git-manpages-2.1.4.tar.xz 361252 SHA256 01070bc96e88231f6f279b031fed2919efea8b442fe724f37349ad951d010b04 SHA512 35fe0dd9e0fe9547362abc0e9c5b066abc13a4137b4ea62569fa5b1ae93831da0686e8783be946a9b87274fbc2322ef93425b9d3fc1257023176c772b21b79b2 WHIRLPOOL 9f199eb94657149b51cb20fb55878cb1cf83fa3741906ce37a66b0157df9ca4dae66754fe264019e6bd8e7d286040fec718b89ca4b40b803c059c46521a5cc61 -DIST git-manpages-2.2.3.tar.xz 369884 SHA256 bf6a4b5ae1267a252b93079e9b7fec2dc6f0a179ac05b9d7f351d183d354164c SHA512 499493956b2a0634e3d5b4f3904a37b6dda1985ceb388eead4701365081605df6cc0c3db79e0aa0bf32d2fa201fd94201d66d5ee487fceaaa0fa4409a17eb6ad WHIRLPOOL 0abf61527dcf71ed0e6dfbccf67d77ecc674122765adca584e38aa70ba7103b8d6ac6173c0383c4c964acbd603391e687809457320640461bc29a336c4fe7932 -DIST git-manpages-2.3.10.tar.xz 371884 SHA256 dd7f92d9f23f6293c18a0859208b7f236e71e6fe09f041c98f8b4b9ee7f913ed SHA512 324d5541d331708f9e0407becc378f955a44423e526502b04ba665596c1803e966a65d60bad21ae43320fb5b9616d8150c3b23095f1f47dfaf94e8ce0e2ad31e WHIRLPOOL 41d6427b39b7c6e3c7e2d6d9997285806059ea746b81047083d3610ba661fbb51ebd100b68cb5ff2015b245a723a3f070e52ffb4bb38e2b9a132cee80ccebd3a DIST git-manpages-2.4.10.tar.xz 373968 SHA256 da712c07d84bb3da10be9fb56c15289c77828d3011179ab71f090e77e52a03d9 SHA512 d5a978109db70f3d50d02ad17c93229206f2d5a2dd3dd7e9fb266ca7b76b85ad92f63120df885b88b5a33fe1dce0686ae92fc50749cb3b6275cb48812eb031a9 WHIRLPOOL decb0b5bf81b25e4562f639e03c2b60b0c470338be0ac298f3d62deb54538de0961a81c6a8ced17ef5877df6de5c17b49fe96e77f00dd2038d2d1189c8f48e7c DIST git-manpages-2.5.4.tar.xz 378296 SHA256 bdd8db3b8cd35d01b2631d1f3c1174e5bc1b62b3e0177ae1954d83743aa93ea9 SHA512 ccd675d8d9c117042083800fa4ae7a876a7873cf13844c92f731e46553d316a949d445c80e4b57824792a6b369623085053d25baeb4f8b79801b5849f06eb084 WHIRLPOOL a2149da3217826c1c4951aa0fa0900e388ea806511559d0e01c4e17a565470048e55e988b12e6da3d7b52b11d410d27b4da0cac4d2d88e3f6860f22664cd8ac9 DIST git-manpages-2.6.2.tar.xz 381332 SHA256 1041b6f32eed0a04255bec22ada3bad3c212bee9986a99f3782248780d32fc3a SHA512 d0ffdd721417a64f6136fd0de601096c1a07bb069630e23ba99b6a37eb94a6a12e1d17cf5af03af880dca328275720d306126a2aa235737be04b06c34ef35f50 WHIRLPOOL 61d9c17d095664ac781c479a189028fdd7a8eec043d3ca992f9c898905cea1044df8efa06ec19c543c7688f9f2e4bd176db377080e1f31b6b917278efa3e087b diff --git a/dev-vcs/git/files/git-1.8.5-mw-destdir.patch b/dev-vcs/git/files/git-1.8.5-mw-destdir.patch deleted file mode 100644 index ea4f175..0000000 --- a/dev-vcs/git/files/git-1.8.5-mw-destdir.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile -index f206f96..a4b6f7a 100644 ---- a/contrib/mw-to-git/Makefile -+++ b/contrib/mw-to-git/Makefile -@@ -18,9 +18,13 @@ SCRIPT_PERL+=git-mw.perl - GIT_ROOT_DIR=../.. - HERE=contrib/mw-to-git/ - -+INSTALL = install -+ - SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) - INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \ - -s --no-print-directory instlibdir) -+DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) -+INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR)) - - all: build - -@@ -30,7 +34,9 @@ test: all - check: perlcritic test - - install_pm: -- install $(GIT_MEDIAWIKI_PM) $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM) -+ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/Git' -+ $(INSTALL) -m 644 $(GIT_MEDIAWIKI_PM) \ -+ '$(DESTDIR_SQ)$(INSTLIBDIR_SQ)/$(GIT_MEDIAWIKI_PM)' - - build: - $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \ -@@ -43,7 +49,6 @@ install: install_pm - clean: - $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \ - clean-perl-script -- rm $(INSTLIBDIR)/$(GIT_MEDIAWIKI_PM) - - perlcritic: - perlcritic -5 $(SCRIPT_PERL) diff --git a/dev-vcs/git/files/git-1.8.5-optional-cvs.patch b/dev-vcs/git/files/git-1.8.5-optional-cvs.patch deleted file mode 100644 index aef03d8..0000000 --- a/dev-vcs/git/files/git-1.8.5-optional-cvs.patch +++ /dev/null @@ -1,362 +0,0 @@ -From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001 -From: Robin Johnson -Date: Wed, 22 Aug 2012 04:25:06 +0000 -Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface - utilities - -Forward-ported from 1.7.12 to current git.git v1.8.4 -Forward-ported from v1.8.4 to v1.8.5.1 - ---- git-1.8.5.1/Makefile -+++ git-1.8.5.1/Makefile -@@ -263,6 +263,8 @@ - # - # Define NO_TCLTK if you do not want Tcl/Tk GUI. - # -+# Define NO_CVS if you do not want any CVS interface utilities. -+# - # The TCL_PATH variable governs the location of the Tcl interpreter - # used to optimize git-gui for your system. Only used if NO_TCLTK - # is not set. Defaults to the bare 'tclsh'. -@@ -437,6 +439,7 @@ - PROGRAM_OBJS = - PROGRAMS = - SCRIPT_PERL = -+SCRIPT_PERL_CVS = - SCRIPT_PYTHON = - SCRIPT_SH = - SCRIPT_LIB = -@@ -477,20 +480,21 @@ - SCRIPT_PERL += git-add--interactive.perl - SCRIPT_PERL += git-difftool.perl - SCRIPT_PERL += git-archimport.perl --SCRIPT_PERL += git-cvsexportcommit.perl --SCRIPT_PERL += git-cvsimport.perl --SCRIPT_PERL += git-cvsserver.perl - SCRIPT_PERL += git-relink.perl - SCRIPT_PERL += git-send-email.perl - SCRIPT_PERL += git-svn.perl - -+SCRIPT_PERL_CVS += git-cvsexportcommit.perl -+SCRIPT_PERL_CVS += git-cvsimport.perl -+SCRIPT_PERL_CVS += git-cvsserver.perl -+ - SCRIPT_PYTHON += git-p4.py - - NO_INSTALL += git-remote-testgit - - # Generated files for scripts - SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) --SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) -+SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) - SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) - - SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) -@@ -1779,8 +1783,18 @@ - $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ - -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@ - -+_SCRIPT_PERL_BUILD = -+_SCRIPT_PERL_NOBUILD = -+ - ifndef NO_PERL --$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak -+ -+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL) -+ -+ifndef NO_CVS -+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS) -+else # NO_CVS -+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS) -+endif # NO_CVS - - perl/perl.mak: perl/PM.stamp - -@@ -1792,7 +1806,7 @@ - perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL - $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) - --$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE -+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE - $(QUIET_GEN)$(RM) $@ $@+ && \ - INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ - sed -e '1{' \ -@@ -1817,14 +1831,17 @@ - chmod +x $@+ && \ - mv $@+ $@ - else # NO_PERL --$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh -+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb -+endif # NO_PERL -+ -+# This is any perl scripts that were disabled it might be empty... -+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh - $(QUIET_GEN)$(RM) $@ $@+ && \ - sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ - -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ - unimplemented.sh >$@+ && \ - chmod +x $@+ && \ - mv $@+ $@ --endif # NO_PERL - - ifndef NO_PYTHON - $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS ---- git-1.8.5.1/t/t9200-git-cvsexportcommit.sh -+++ git-1.8.5.1/t/t9200-git-cvsexportcommit.sh -@@ -12,6 +12,11 @@ - test_done - fi - -+if ! test_have_prereq CVS; then -+ skip_all='skipping git cvsexportcommit tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then ---- git-1.8.5.1/t/t9400-git-cvsserver-server.sh -+++ git-1.8.5.1/t/t9400-git-cvsserver-server.sh -@@ -11,9 +11,15 @@ - . ./test-lib.sh - - if ! test_have_prereq PERL; then -- skip_all='skipping git cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi -+ -+if ! test_have_prereq CVS; then -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then ---- git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh -+++ git-1.8.5.1/t/t9401-git-cvsserver-crlf.sh -@@ -57,15 +57,20 @@ - return $stat - } - --cvs >/dev/null 2>&1 --if test $? -ne 1 -+if ! test_have_prereq PERL - then -- skip_all='skipping git-cvsserver tests, cvs not found' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi --if ! test_have_prereq PERL -+if ! test_have_prereq CVS - then -- skip_all='skipping git-cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+cvs >/dev/null 2>&1 -+if test $? -ne 1 -+then -+ skip_all='skipping git-cvsserver tests, cvs not found' - test_done - fi - perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { ---- git-1.8.5.1/t/t9600-cvsimport.sh -+++ git-1.8.5.1/t/t9600-cvsimport.sh -@@ -3,14 +3,25 @@ - test_description='git cvsimport basic tests' - . ./lib-cvs.sh - --test_expect_success PERL 'setup cvsroot environment' ' -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ -+test_expect_success 'setup cvsroot environment' ' - CVSROOT=$(pwd)/cvsroot && - export CVSROOT - ' - --test_expect_success PERL 'setup cvsroot' '$CVS init' -+test_expect_success 'setup cvsroot' '$CVS init' - --test_expect_success PERL 'setup a cvs module' ' -+test_expect_success 'setup a cvs module' ' - - mkdir "$CVSROOT/module" && - $CVS co -d module-cvs module && -@@ -42,23 +53,23 @@ - ) - ' - --test_expect_success PERL 'import a trivial module' ' -+test_expect_success 'import a trivial module' ' - - git cvsimport -a -R -z 0 -C module-git module && - test_cmp module-cvs/o_fortuna module-git/o_fortuna - - ' - --test_expect_success PERL 'pack refs' '(cd module-git && git gc)' -+test_expect_success 'pack refs' '(cd module-git && git gc)' - --test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' -+test_expect_success 'initial import has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1) > expected && - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - (cd module-cvs && - cat <o_fortuna && - O Fortune, -@@ -86,7 +97,7 @@ - ) - ' - --test_expect_success PERL 'update git module' ' -+test_expect_success 'update git module' ' - - (cd module-git && - git config cvsimport.trackRevisions true && -@@ -97,7 +108,7 @@ - - ' - --test_expect_success PERL 'update has correct .git/cvs-revisions' ' -+test_expect_success 'update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^ && -@@ -105,7 +116,7 @@ - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - - (cd module-cvs && - echo 1 >tick && -@@ -114,7 +125,7 @@ - ) - ' - --test_expect_success PERL 'cvsimport.module config works' ' -+test_expect_success 'cvsimport.module config works' ' - - (cd module-git && - git config cvsimport.module module && -@@ -126,7 +137,7 @@ - - ' - --test_expect_success PERL 'second update has correct .git/cvs-revisions' ' -+test_expect_success 'second update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && -@@ -135,7 +146,7 @@ - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'import from a CVS working tree' ' -+test_expect_success 'import from a CVS working tree' ' - - $CVS co -d import-from-wt module && - (cd import-from-wt && -@@ -148,12 +159,12 @@ - - ' - --test_expect_success PERL 'no .git/cvs-revisions created by default' ' -+test_expect_success 'no .git/cvs-revisions created by default' ' - - ! test -e import-from-wt/.git/cvs-revisions - - ' - --test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' -+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' - - test_done ---- git-1.8.5.1/t/t9601-cvsimport-vendor-branch.sh -+++ git-1.8.5.1/t/t9601-cvsimport-vendor-branch.sh -@@ -34,6 +34,17 @@ - test_description='git cvsimport handling of vendor branches' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9601 - - test_expect_success PERL 'import a module with a vendor branch' ' ---- git-1.8.5.1/t/t9602-cvsimport-branches-tags.sh -+++ git-1.8.5.1/t/t9602-cvsimport-branches-tags.sh -@@ -6,6 +6,17 @@ - test_description='git cvsimport handling of branches and tags' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9602 - - test_expect_success PERL 'import module' ' ---- git-1.8.5.1/t/t9603-cvsimport-patchsets.sh -+++ git-1.8.5.1/t/t9603-cvsimport-patchsets.sh -@@ -14,6 +14,17 @@ - test_description='git cvsimport testing for correct patchset estimation' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9603 - - test_expect_failure 'import with criss cross times on revisions' ' ---- git-1.8.5.1/t/test-lib.sh -+++ git-1.8.5.1/t/test-lib.sh -@@ -772,6 +772,7 @@ - esac - - ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 -+test -z "$NO_CVS" && test_set_prereq CVS - test -z "$NO_PERL" && test_set_prereq PERL - test -z "$NO_PYTHON" && test_set_prereq PYTHON - test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE diff --git a/dev-vcs/git/files/git-1.9.0_rc3-optional-cvs.patch b/dev-vcs/git/files/git-1.9.0_rc3-optional-cvs.patch deleted file mode 100644 index 1f07960..0000000 --- a/dev-vcs/git/files/git-1.9.0_rc3-optional-cvs.patch +++ /dev/null @@ -1,372 +0,0 @@ -From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001 -From: Robin Johnson -Date: Wed, 22 Aug 2012 04:25:06 +0000 -Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface - utilities - -Forward-ported from 1.7.12 to current git.git v1.8.4 -Forward-ported from v1.8.4 to v1.8.5.1 -Forward-ported from v1.8.5.3 to v1.9.0_rc3 - -diff -Nuar git-1.9.0.rc3.orig/Makefile git-1.9.0.rc3/Makefile ---- git-1.9.0.rc3.orig/Makefile 2014-02-07 12:45:45.000000000 -0800 -+++ git-1.9.0.rc3/Makefile 2014-02-08 11:50:21.219488765 -0800 -@@ -263,6 +263,8 @@ - # - # Define NO_TCLTK if you do not want Tcl/Tk GUI. - # -+# Define NO_CVS if you do not want any CVS interface utilities. -+# - # The TCL_PATH variable governs the location of the Tcl interpreter - # used to optimize git-gui for your system. Only used if NO_TCLTK - # is not set. Defaults to the bare 'tclsh'. -@@ -437,6 +439,7 @@ - PROGRAM_OBJS = - PROGRAMS = - SCRIPT_PERL = -+SCRIPT_PERL_CVS = - SCRIPT_PYTHON = - SCRIPT_SH = - SCRIPT_LIB = -@@ -476,20 +479,21 @@ - SCRIPT_PERL += git-add--interactive.perl - SCRIPT_PERL += git-difftool.perl - SCRIPT_PERL += git-archimport.perl --SCRIPT_PERL += git-cvsexportcommit.perl --SCRIPT_PERL += git-cvsimport.perl --SCRIPT_PERL += git-cvsserver.perl - SCRIPT_PERL += git-relink.perl - SCRIPT_PERL += git-send-email.perl - SCRIPT_PERL += git-svn.perl - -+SCRIPT_PERL_CVS += git-cvsexportcommit.perl -+SCRIPT_PERL_CVS += git-cvsimport.perl -+SCRIPT_PERL_CVS += git-cvsserver.perl -+ - SCRIPT_PYTHON += git-p4.py - - NO_INSTALL += git-remote-testgit - - # Generated files for scripts - SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) --SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) -+SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) - SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) - - SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) -@@ -1776,8 +1780,18 @@ - $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ - -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@ - -+_SCRIPT_PERL_BUILD = -+_SCRIPT_PERL_NOBUILD = -+ - ifndef NO_PERL --$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak -+ -+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL) -+ -+ifndef NO_CVS -+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS) -+else # NO_CVS -+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS) -+endif # NO_CVS - - perl/perl.mak: perl/PM.stamp - -@@ -1790,7 +1804,7 @@ - $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) - - PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ) --$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE -+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE - $(QUIET_GEN)$(RM) $@ $@+ && \ - INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ - INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \ -@@ -1824,14 +1838,17 @@ - chmod +x $@+ && \ - mv $@+ $@ - else # NO_PERL --$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh -+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb -+endif # NO_PERL -+ -+# This is any perl scripts that were disabled it might be empty... -+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh - $(QUIET_GEN)$(RM) $@ $@+ && \ - sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ - -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ - unimplemented.sh >$@+ && \ - chmod +x $@+ && \ - mv $@+ $@ --endif # NO_PERL - - ifndef NO_PYTHON - $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS -diff -Nuar git-1.9.0.rc3.orig/t/t9200-git-cvsexportcommit.sh git-1.9.0.rc3/t/t9200-git-cvsexportcommit.sh ---- git-1.9.0.rc3.orig/t/t9200-git-cvsexportcommit.sh 2014-02-07 12:45:45.000000000 -0800 -+++ git-1.9.0.rc3/t/t9200-git-cvsexportcommit.sh 2014-02-08 11:49:12.243179483 -0800 -@@ -11,6 +11,11 @@ - test_done - fi - -+if ! test_have_prereq CVS; then -+ skip_all='skipping git cvsexportcommit tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then -diff -Nuar git-1.9.0.rc3.orig/t/t9400-git-cvsserver-server.sh git-1.9.0.rc3/t/t9400-git-cvsserver-server.sh ---- git-1.9.0.rc3.orig/t/t9400-git-cvsserver-server.sh 2014-02-07 12:45:45.000000000 -0800 -+++ git-1.9.0.rc3/t/t9400-git-cvsserver-server.sh 2014-02-08 11:49:12.244179502 -0800 -@@ -11,9 +11,15 @@ - . ./test-lib.sh - - if ! test_have_prereq PERL; then -- skip_all='skipping git cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi -+ -+if ! test_have_prereq CVS; then -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then -diff -Nuar git-1.9.0.rc3.orig/t/t9401-git-cvsserver-crlf.sh git-1.9.0.rc3/t/t9401-git-cvsserver-crlf.sh ---- git-1.9.0.rc3.orig/t/t9401-git-cvsserver-crlf.sh 2014-02-07 12:45:45.000000000 -0800 -+++ git-1.9.0.rc3/t/t9401-git-cvsserver-crlf.sh 2014-02-08 11:49:12.244179502 -0800 -@@ -57,15 +57,20 @@ - return $stat - } - --cvs >/dev/null 2>&1 --if test $? -ne 1 -+if ! test_have_prereq PERL - then -- skip_all='skipping git-cvsserver tests, cvs not found' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi --if ! test_have_prereq PERL -+if ! test_have_prereq CVS - then -- skip_all='skipping git-cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+cvs >/dev/null 2>&1 -+if test $? -ne 1 -+then -+ skip_all='skipping git-cvsserver tests, cvs not found' - test_done - fi - perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { -diff -Nuar git-1.9.0.rc3.orig/t/t9600-cvsimport.sh git-1.9.0.rc3/t/t9600-cvsimport.sh ---- git-1.9.0.rc3.orig/t/t9600-cvsimport.sh 2014-02-07 12:45:45.000000000 -0800 -+++ git-1.9.0.rc3/t/t9600-cvsimport.sh 2014-02-08 11:49:12.244179502 -0800 -@@ -3,14 +3,25 @@ - test_description='git cvsimport basic tests' - . ./lib-cvs.sh - --test_expect_success PERL 'setup cvsroot environment' ' -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ -+test_expect_success 'setup cvsroot environment' ' - CVSROOT=$(pwd)/cvsroot && - export CVSROOT - ' - --test_expect_success PERL 'setup cvsroot' '$CVS init' -+test_expect_success 'setup cvsroot' '$CVS init' - --test_expect_success PERL 'setup a cvs module' ' -+test_expect_success 'setup a cvs module' ' - - mkdir "$CVSROOT/module" && - $CVS co -d module-cvs module && -@@ -42,23 +53,23 @@ - ) - ' - --test_expect_success PERL 'import a trivial module' ' -+test_expect_success 'import a trivial module' ' - - git cvsimport -a -R -z 0 -C module-git module && - test_cmp module-cvs/o_fortuna module-git/o_fortuna - - ' - --test_expect_success PERL 'pack refs' '(cd module-git && git gc)' -+test_expect_success 'pack refs' '(cd module-git && git gc)' - --test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' -+test_expect_success 'initial import has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1) > expected && - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - (cd module-cvs && - cat <o_fortuna && - O Fortune, -@@ -86,7 +97,7 @@ - ) - ' - --test_expect_success PERL 'update git module' ' -+test_expect_success 'update git module' ' - - (cd module-git && - git config cvsimport.trackRevisions true && -@@ -97,7 +108,7 @@ - - ' - --test_expect_success PERL 'update has correct .git/cvs-revisions' ' -+test_expect_success 'update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^ && -@@ -105,7 +116,7 @@ - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - - (cd module-cvs && - echo 1 >tick && -@@ -114,7 +125,7 @@ - ) - ' - --test_expect_success PERL 'cvsimport.module config works' ' -+test_expect_success 'cvsimport.module config works' ' - - (cd module-git && - git config cvsimport.module module && -@@ -126,7 +137,7 @@ - - ' - --test_expect_success PERL 'second update has correct .git/cvs-revisions' ' -+test_expect_success 'second update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && -@@ -135,7 +146,7 @@ - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'import from a CVS working tree' ' -+test_expect_success 'import from a CVS working tree' ' - - $CVS co -d import-from-wt module && - (cd import-from-wt && -@@ -148,12 +159,12 @@ - - ' - --test_expect_success PERL 'no .git/cvs-revisions created by default' ' -+test_expect_success 'no .git/cvs-revisions created by default' ' - - ! test -e import-from-wt/.git/cvs-revisions - - ' - --test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' -+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' - - test_done -diff -Nuar git-1.9.0.rc3.orig/t/t9601-cvsimport-vendor-branch.sh git-1.9.0.rc3/t/t9601-cvsimport-vendor-branch.sh ---- git-1.9.0.rc3.orig/t/t9601-cvsimport-vendor-branch.sh 2014-02-07 12:45:45.000000000 -0800 -+++ git-1.9.0.rc3/t/t9601-cvsimport-vendor-branch.sh 2014-02-08 11:49:12.244179502 -0800 -@@ -34,6 +34,17 @@ - test_description='git cvsimport handling of vendor branches' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9601 - - test_expect_success PERL 'import a module with a vendor branch' ' -diff -Nuar git-1.9.0.rc3.orig/t/t9602-cvsimport-branches-tags.sh git-1.9.0.rc3/t/t9602-cvsimport-branches-tags.sh ---- git-1.9.0.rc3.orig/t/t9602-cvsimport-branches-tags.sh 2014-02-07 12:45:45.000000000 -0800 -+++ git-1.9.0.rc3/t/t9602-cvsimport-branches-tags.sh 2014-02-08 11:49:12.244179502 -0800 -@@ -6,6 +6,17 @@ - test_description='git cvsimport handling of branches and tags' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9602 - - test_expect_success PERL 'import module' ' -diff -Nuar git-1.9.0.rc3.orig/t/t9603-cvsimport-patchsets.sh git-1.9.0.rc3/t/t9603-cvsimport-patchsets.sh ---- git-1.9.0.rc3.orig/t/t9603-cvsimport-patchsets.sh 2014-02-07 12:45:45.000000000 -0800 -+++ git-1.9.0.rc3/t/t9603-cvsimport-patchsets.sh 2014-02-08 11:49:12.244179502 -0800 -@@ -14,6 +14,17 @@ - test_description='git cvsimport testing for correct patchset estimation' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9603 - - test_expect_failure 'import with criss cross times on revisions' ' -diff -Nuar git-1.9.0.rc3.orig/t/test-lib.sh git-1.9.0.rc3/t/test-lib.sh ---- git-1.9.0.rc3.orig/t/test-lib.sh 2014-02-07 12:45:45.000000000 -0800 -+++ git-1.9.0.rc3/t/test-lib.sh 2014-02-08 11:49:12.244179502 -0800 -@@ -772,6 +772,7 @@ - esac - - ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 -+test -z "$NO_CVS" && test_set_prereq CVS - test -z "$NO_PERL" && test_set_prereq PERL - test -z "$NO_PYTHON" && test_set_prereq PYTHON - test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE diff --git a/dev-vcs/git/files/git-2.0.0-r2-optional-cvs.patch b/dev-vcs/git/files/git-2.0.0-r2-optional-cvs.patch deleted file mode 100644 index b2d8e5c..0000000 --- a/dev-vcs/git/files/git-2.0.0-r2-optional-cvs.patch +++ /dev/null @@ -1,375 +0,0 @@ -From e19ad5a8492d83db79a09b459cb17ccee78e0001 Mon Sep 17 00:00:00 2001 -From: Robin Johnson -Date: Fri, 25 Apr 2014 12:30:42 +0200 -Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface - utilities - -Forward-ported from 1.7.12 to current git.git v1.8.4 -Forward-ported from v1.8.4 to v1.8.5.1 -Forward-ported from v1.8.5.3 to v1.9.0_rc3 -Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0 -Forward-ported from v2.0.0_rc0 to v2.0.0 - -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/Makefile git-2.0.0/Makefile ---- git-2.0.0.orig/Makefile 2014-05-28 12:10:36.000000000 -0700 -+++ git-2.0.0/Makefile 2014-05-28 16:50:10.148376954 -0700 -@@ -255,6 +255,8 @@ - # - # Define NO_TCLTK if you do not want Tcl/Tk GUI. - # -+# Define NO_CVS if you do not want any CVS interface utilities. -+# - # The TCL_PATH variable governs the location of the Tcl interpreter - # used to optimize git-gui for your system. Only used if NO_TCLTK - # is not set. Defaults to the bare 'tclsh'. -@@ -436,6 +438,7 @@ - PROGRAM_OBJS = - PROGRAMS = - SCRIPT_PERL = -+SCRIPT_PERL_CVS = - SCRIPT_PYTHON = - SCRIPT_SH = - SCRIPT_LIB = -@@ -475,20 +478,21 @@ - SCRIPT_PERL += git-add--interactive.perl - SCRIPT_PERL += git-difftool.perl - SCRIPT_PERL += git-archimport.perl --SCRIPT_PERL += git-cvsexportcommit.perl --SCRIPT_PERL += git-cvsimport.perl --SCRIPT_PERL += git-cvsserver.perl - SCRIPT_PERL += git-relink.perl - SCRIPT_PERL += git-send-email.perl - SCRIPT_PERL += git-svn.perl - -+SCRIPT_PERL_CVS += git-cvsexportcommit.perl -+SCRIPT_PERL_CVS += git-cvsimport.perl -+SCRIPT_PERL_CVS += git-cvsserver.perl -+ - SCRIPT_PYTHON += git-p4.py - - NO_INSTALL += git-remote-testgit - - # Generated files for scripts - SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) --SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) -+SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) - SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) - - SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) -@@ -1779,8 +1783,18 @@ - $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ - -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@ - -+_SCRIPT_PERL_BUILD = -+_SCRIPT_PERL_NOBUILD = -+ - ifndef NO_PERL --$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak -+ -+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL) -+ -+ifndef NO_CVS -+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS) -+else # NO_CVS -+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS) -+endif # NO_CVS - - perl/perl.mak: perl/PM.stamp - -@@ -1793,7 +1807,7 @@ - $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) - - PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ) --$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE -+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE - $(QUIET_GEN)$(RM) $@ $@+ && \ - INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ - INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \ -@@ -1826,15 +1840,18 @@ - $(QUIET_GEN)$(cmd_munge_script) && \ - chmod +x $@+ && \ - mv $@+ $@ - else # NO_PERL --$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh -+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb -+endif # NO_PERL -+ -+# This is any perl scripts that were disabled it might be empty... -+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh - $(QUIET_GEN)$(RM) $@ $@+ && \ - sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ - -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ - unimplemented.sh >$@+ && \ - chmod +x $@+ && \ - mv $@+ $@ --endif # NO_PERL - - ifndef NO_PYTHON - $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9200-git-cvsexportcommit.sh git-2.0.0/t/t9200-git-cvsexportcommit.sh ---- git-2.0.0.orig/t/t9200-git-cvsexportcommit.sh 2014-05-28 12:10:36.000000000 -0700 -+++ git-2.0.0/t/t9200-git-cvsexportcommit.sh 2014-05-28 16:47:41.812727825 -0700 -@@ -11,6 +11,11 @@ - test_done - fi - -+if ! test_have_prereq CVS; then -+ skip_all='skipping git cvsexportcommit tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9400-git-cvsserver-server.sh git-2.0.0/t/t9400-git-cvsserver-server.sh ---- git-2.0.0.orig/t/t9400-git-cvsserver-server.sh 2014-05-28 12:10:36.000000000 -0700 -+++ git-2.0.0/t/t9400-git-cvsserver-server.sh 2014-05-28 16:47:41.812727825 -0700 -@@ -11,9 +11,15 @@ - . ./test-lib.sh - - if ! test_have_prereq PERL; then -- skip_all='skipping git cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi -+ -+if ! test_have_prereq CVS; then -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+ - cvs >/dev/null 2>&1 - if test $? -ne 1 - then -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9401-git-cvsserver-crlf.sh git-2.0.0/t/t9401-git-cvsserver-crlf.sh ---- git-2.0.0.orig/t/t9401-git-cvsserver-crlf.sh 2014-05-28 12:10:36.000000000 -0700 -+++ git-2.0.0/t/t9401-git-cvsserver-crlf.sh 2014-05-28 16:47:41.812727825 -0700 -@@ -57,15 +57,20 @@ - return $stat - } - --cvs >/dev/null 2>&1 --if test $? -ne 1 -+if ! test_have_prereq PERL - then -- skip_all='skipping git-cvsserver tests, cvs not found' -+ skip_all='skipping git-cvsserver tests, perl not available' - test_done - fi --if ! test_have_prereq PERL -+if ! test_have_prereq CVS - then -- skip_all='skipping git-cvsserver tests, perl not available' -+ skip_all='skipping git-cvsserver tests, cvs not available' -+ test_done -+fi -+cvs >/dev/null 2>&1 -+if test $? -ne 1 -+then -+ skip_all='skipping git-cvsserver tests, cvs not found' - test_done - fi - perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9600-cvsimport.sh git-2.0.0/t/t9600-cvsimport.sh ---- git-2.0.0.orig/t/t9600-cvsimport.sh 2014-05-28 12:10:36.000000000 -0700 -+++ git-2.0.0/t/t9600-cvsimport.sh 2014-05-28 16:47:41.813727843 -0700 -@@ -3,14 +3,25 @@ - test_description='git cvsimport basic tests' - . ./lib-cvs.sh - --test_expect_success PERL 'setup cvsroot environment' ' -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ -+test_expect_success 'setup cvsroot environment' ' - CVSROOT=$(pwd)/cvsroot && - export CVSROOT - ' - --test_expect_success PERL 'setup cvsroot' '$CVS init' -+test_expect_success 'setup cvsroot' '$CVS init' - --test_expect_success PERL 'setup a cvs module' ' -+test_expect_success 'setup a cvs module' ' - - mkdir "$CVSROOT/module" && - $CVS co -d module-cvs module && -@@ -42,23 +53,23 @@ - ) - ' - --test_expect_success PERL 'import a trivial module' ' -+test_expect_success 'import a trivial module' ' - - git cvsimport -a -R -z 0 -C module-git module && - test_cmp module-cvs/o_fortuna module-git/o_fortuna - - ' - --test_expect_success PERL 'pack refs' '(cd module-git && git gc)' -+test_expect_success 'pack refs' '(cd module-git && git gc)' - --test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' -+test_expect_success 'initial import has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1) > expected && - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - (cd module-cvs && - cat <o_fortuna && - O Fortune, -@@ -86,7 +97,7 @@ - ) - ' - --test_expect_success PERL 'update git module' ' -+test_expect_success 'update git module' ' - - (cd module-git && - git config cvsimport.trackRevisions true && -@@ -97,7 +108,7 @@ - - ' - --test_expect_success PERL 'update has correct .git/cvs-revisions' ' -+test_expect_success 'update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^ && -@@ -105,7 +116,7 @@ - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'update cvs module' ' -+test_expect_success 'update cvs module' ' - - (cd module-cvs && - echo 1 >tick && -@@ -114,7 +125,7 @@ - ) - ' - --test_expect_success PERL 'cvsimport.module config works' ' -+test_expect_success 'cvsimport.module config works' ' - - (cd module-git && - git config cvsimport.module module && -@@ -126,7 +137,7 @@ - - ' - --test_expect_success PERL 'second update has correct .git/cvs-revisions' ' -+test_expect_success 'second update has correct .git/cvs-revisions' ' - - (cd module-git && - git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && -@@ -135,7 +146,7 @@ - test_cmp expected module-git/.git/cvs-revisions - ' - --test_expect_success PERL 'import from a CVS working tree' ' -+test_expect_success 'import from a CVS working tree' ' - - $CVS co -d import-from-wt module && - (cd import-from-wt && -@@ -148,12 +159,12 @@ - - ' - --test_expect_success PERL 'no .git/cvs-revisions created by default' ' -+test_expect_success 'no .git/cvs-revisions created by default' ' - - ! test -e import-from-wt/.git/cvs-revisions - - ' - --test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' -+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' - - test_done -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9601-cvsimport-vendor-branch.sh git-2.0.0/t/t9601-cvsimport-vendor-branch.sh ---- git-2.0.0.orig/t/t9601-cvsimport-vendor-branch.sh 2014-05-28 12:10:36.000000000 -0700 -+++ git-2.0.0/t/t9601-cvsimport-vendor-branch.sh 2014-05-28 16:47:41.813727843 -0700 -@@ -34,6 +34,17 @@ - test_description='git cvsimport handling of vendor branches' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9601 - - test_expect_success PERL 'import a module with a vendor branch' ' -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9602-cvsimport-branches-tags.sh git-2.0.0/t/t9602-cvsimport-branches-tags.sh ---- git-2.0.0.orig/t/t9602-cvsimport-branches-tags.sh 2014-05-28 12:10:36.000000000 -0700 -+++ git-2.0.0/t/t9602-cvsimport-branches-tags.sh 2014-05-28 16:47:41.813727843 -0700 -@@ -6,6 +6,17 @@ - test_description='git cvsimport handling of branches and tags' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9602 - - test_expect_success PERL 'import module' ' -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/t9603-cvsimport-patchsets.sh git-2.0.0/t/t9603-cvsimport-patchsets.sh ---- git-2.0.0.orig/t/t9603-cvsimport-patchsets.sh 2014-05-28 12:10:36.000000000 -0700 -+++ git-2.0.0/t/t9603-cvsimport-patchsets.sh 2014-05-28 16:47:41.813727843 -0700 -@@ -14,6 +14,17 @@ - test_description='git cvsimport testing for correct patchset estimation' - . ./lib-cvs.sh - -+if ! test_have_prereq PERL -+then -+ skip_all='skipping git cvsimport tests, perl not available' -+ test_done -+fi -+if ! test_have_prereq CVS -+then -+ skip_all='skipping git cvsimport tests, cvs not available' -+ test_done -+fi -+ - setup_cvs_test_repository t9603 - - test_expect_failure 'import with criss cross times on revisions' ' -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-2.0.0.orig/t/test-lib.sh git-2.0.0/t/test-lib.sh ---- git-2.0.0.orig/t/test-lib.sh 2014-05-28 12:10:36.000000000 -0700 -+++ git-2.0.0/t/test-lib.sh 2014-05-28 16:47:41.813727843 -0700 -@@ -777,6 +777,7 @@ - esac - - ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 -+test -z "$NO_CVS" && test_set_prereq CVS - test -z "$NO_PERL" && test_set_prereq PERL - test -z "$NO_PYTHON" && test_set_prereq PYTHON - test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE diff --git a/dev-vcs/git/git-1.8.5.6.ebuild b/dev-vcs/git/git-1.8.5.6.ebuild deleted file mode 100644 index 551502f..0000000 --- a/dev-vcs/git/git-1.8.5.6.ebuild +++ /dev/null @@ -1,641 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="https://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl:0 - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0 ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts="${myopts} NO_ICONV=YesPlease" - use nls \ - || myopts="${myopts} NO_GETTEXT=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use pcre \ - && myopts="${myopts} USE_LIBPCRE=yes" \ - && extlibs="${extlibs} -lpcre" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ - || myopts="${myopts} NO_PTHREADS=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts="${myopts} NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch - - # honor and correctly quote DISTDIR (from upstream git master) - epatch "${FILESDIR}"/git-1.8.5-mw-destdir.patch - - # install mediawiki perl modules also in vendor_dir - # hack, needs better upstream solution - epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - # Not really a bash-completion file (bug #477920) - dodoc contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # git-diffall - dobin contrib/diffall/git-diffall - newdoc contrib/diffall/README git-diffall.txt - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - # remote-helpers - if use python ; then - python_scriptinto /usr/libexec/git-core/ - python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} - python_optimize - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # diffall - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt" - einfo "Note that the prompt bash code is now in the seperate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-1.9.5.ebuild b/dev-vcs/git/git-1.9.5.ebuild deleted file mode 100644 index c849854..0000000 --- a/dev-vcs/git/git-1.9.5.ebuild +++ /dev/null @@ -1,640 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="https://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl:0 - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0 ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts="${myopts} NO_ICONV=YesPlease" - use nls \ - || myopts="${myopts} NO_GETTEXT=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use pcre \ - && myopts="${myopts} USE_LIBPCRE=yes" \ - && extlibs="${extlibs} -lpcre" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ - || myopts="${myopts} NO_PTHREADS=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts="${myopts} NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.9.0_rc3-optional-cvs.patch - - # install mediawiki perl modules also in vendor_dir - # hack, needs better upstream solution - epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # git-diffall - dobin contrib/diffall/git-diffall - newdoc contrib/diffall/README git-diffall.txt - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - # remote-helpers - if use python ; then - python_scriptinto /usr/libexec/git-core/ - python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} - python_optimize - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # diffall - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.0.5.ebuild b/dev-vcs/git/git-2.0.5.ebuild deleted file mode 100644 index 39ded35..0000000 --- a/dev-vcs/git/git-2.0.5.ebuild +++ /dev/null @@ -1,639 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="https://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl:0 - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0 ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts="${myopts} NO_ICONV=YesPlease" - use nls \ - || myopts="${myopts} NO_GETTEXT=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use pcre \ - && myopts="${myopts} USE_LIBPCRE=yes" \ - && extlibs="${extlibs} -lpcre" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ - || myopts="${myopts} NO_PTHREADS=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts="${myopts} NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch - - # install mediawiki perl modules also in vendor_dir - # hack, needs better upstream solution - epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # git-diffall - dobin contrib/diffall/git-diffall - newdoc contrib/diffall/README git-diffall.txt - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # diffall - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.1.4.ebuild b/dev-vcs/git/git-2.1.4.ebuild deleted file mode 100644 index b285acd..0000000 --- a/dev-vcs/git/git-2.1.4.ebuild +++ /dev/null @@ -1,635 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="https://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl:0 - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0 ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts="${myopts} NO_ICONV=YesPlease" - use nls \ - || myopts="${myopts} NO_GETTEXT=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use pcre \ - && myopts="${myopts} USE_LIBPCRE=yes" \ - && extlibs="${extlibs} -lpcre" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ - || myopts="${myopts} NO_PTHREADS=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts="${myopts} NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch - - # install mediawiki perl modules also in vendor_dir - # hack, needs better upstream solution - epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod -} - -src_test() { - local disabled="t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.2.3.ebuild b/dev-vcs/git/git-2.2.3.ebuild deleted file mode 100644 index a4c740a..0000000 --- a/dev-vcs/git/git-2.2.3.ebuild +++ /dev/null @@ -1,637 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="https://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl:0 - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0 ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch - - # install mediawiki perl modules also in vendor_dir - # hack, needs better upstream solution - epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch - - epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod -} - -src_test() { - local disabled="" #t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-2.3.10.ebuild b/dev-vcs/git/git-2.3.10.ebuild deleted file mode 100644 index 739ff76..0000000 --- a/dev-vcs/git/git-2.3.10.ebuild +++ /dev/null @@ -1,636 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -EGIT_MASTER=pu - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="xz" - SRC_URI_GOOG="https://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl:0= - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl:=[-build(-)] ) - tk? ( dev-lang/tk:0= ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - mediawiki? ( - dev-perl/HTML-Tree - dev-perl/MediaWiki-API - ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - mediawiki? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts+=" BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts+=" PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts+=" NO_EXPAT=YesPlease" - else - myopts+=" NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts+=" INSTALL=install TAR=tar" - myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" - myopts+=" SANE_TOOL_PATH=" - myopts+=" OLD_ICONV=" - myopts+=" NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts+=" NO_ICONV=YesPlease" - use nls \ - || myopts+=" NO_GETTEXT=YesPlease" - use tk \ - || myopts+=" NO_TCLTK=YesPlease" - use pcre \ - && myopts+=" USE_LIBPCRE=yes" \ - && extlibs+=" -lpcre" - use perl \ - && myopts+=" INSTALLDIRS=vendor" \ - || myopts+=" NO_PERL=YesPlease" - use python \ - || myopts+=" NO_PYTHON=YesPlease" - use subversion \ - || myopts+=" NO_SVN_TESTS=YesPlease" - use threads \ - && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ - || myopts+=" NO_PTHREADS=YesPlease" - use cvs \ - || myopts+=" NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts+=" NO_MMAP=YesPlease" -# myopts+=" NO_IPV6=YesPlease" -# myopts+=" NO_STRLCPY=YesPlease" -# myopts+=" NO_MEMMEM=YesPlease" -# myopts+=" NO_MKDTEMP=YesPlease" -# myopts+=" NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts+=" NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts+=" NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=" ASCIIDOC8=YesPlease" - myopts+=" ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts+=" NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch - - # install mediawiki perl modules also in vendor_dir - # hack, needs better upstream solution - epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch - - epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch - - epatch_user - - sed -i \ - -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ - -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - # by defining EXTLIBS we override the detection for libintl and - # libiconv, bug #516168 - local nlsiconv= - use nls && use !elibc_glibc && nlsiconv+=" -lintl" - use iconv && use !elibc_glibc && nlsiconv+=" -liconv" - git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - bashcomp_alias git gitk - # Not really a bash-completion file (bug #477920) - # but still needed uncompressed (bug #507480) - insinto /usr/share/${PN} - doins contrib/completion/git-prompt.sh - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - if use mediawiki ; then - cd "${S}"/contrib/mw-to-git - git_emake install - cd "${S}" - fi - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - # git-contacts - exeinto /usr/libexec/git-core/ - doexe contrib/contacts/git-contacts - dodoc contrib/contacts/git-contacts.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - buildsystems convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod -} - -src_test() { - local disabled="" #t7004-tag.sh" #520270 - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" - einfo "Note that the prompt bash code is now in that separate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -}