diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2010-12-07 07:29:48 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-12-07 07:29:48 +0000 |
commit | 488167fbf30f653e55fc13ee6eba54ba13bbae40 (patch) | |
tree | f22a3fb6416bbda238ea9cb73c9dd825b3592dae /dev-vcs | |
parent | Respect ldflags, bug #331085 thank Olivier Huber for report and fix. Bug buil... (diff) | |
download | historical-488167fbf30f653e55fc13ee6eba54ba13bbae40.tar.gz historical-488167fbf30f653e55fc13ee6eba54ba13bbae40.tar.bz2 historical-488167fbf30f653e55fc13ee6eba54ba13bbae40.zip |
Version bump and cleanup.
Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64
Diffstat (limited to 'dev-vcs')
-rw-r--r-- | dev-vcs/git/ChangeLog | 11 | ||||
-rw-r--r-- | dev-vcs/git/Manifest | 35 | ||||
-rw-r--r-- | dev-vcs/git/git-1.7.0.ebuild | 418 | ||||
-rw-r--r-- | dev-vcs/git/git-1.7.1-r1.ebuild | 423 | ||||
-rw-r--r-- | dev-vcs/git/git-1.7.1.1.ebuild | 423 | ||||
-rw-r--r-- | dev-vcs/git/git-1.7.2-r2.ebuild | 463 | ||||
-rw-r--r-- | dev-vcs/git/git-1.7.2.4.ebuild (renamed from dev-vcs/git/git-1.7.3.1.ebuild) | 2 | ||||
-rw-r--r-- | dev-vcs/git/git-1.7.2.ebuild | 420 | ||||
-rw-r--r-- | dev-vcs/git/git-1.7.3.3.ebuild (renamed from dev-vcs/git/git-1.7.3.ebuild) | 45 |
9 files changed, 41 insertions, 2199 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index 38812bb2c4fc..a74a588d6a4a 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.47 2010/11/11 03:26:16 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.48 2010/12/07 07:29:48 robbat2 Exp $ + +*git-1.7.3.3 (07 Dec 2010) +*git-1.7.2.4 (07 Dec 2010) + + 07 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.0.ebuild, + -git-1.7.1-r1.ebuild, -git-1.7.1.1.ebuild, -git-1.7.2.ebuild, + -git-1.7.2-r2.ebuild, +git-1.7.2.4.ebuild, -git-1.7.3.ebuild, + -git-1.7.3.1.ebuild, +git-1.7.3.3.ebuild: + Version bump and cleanup. 11 Nov 2010; Sebastian Pipping <sping@gentoo.org> git-1.7.3.2-r1.ebuild: Merge changes to 9999 back into latest release ebuild. diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 46e60d79e027..2abb3a8cdbbc 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -10,47 +10,30 @@ AUX git-daemon.confd 700 RMD160 2dea5af0c6b3aa5304aa5417bb40099bd4cdb45b SHA1 0b AUX git-daemon.initd 738 RMD160 23de3f02cd33251ce0f66c1b6e1d6a20ee45ee5b SHA1 b6f8e80130ddddf8cbd70a553b31706d570f7d5a SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 88d6fc44644c88ed6f2ce54a936f41dc15d2268e SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 DIST git-1.6.4.4.tar.bz2 2174826 RMD160 8bad28bf8aedc6d5a9dcae39736c1ceeabbbe992 SHA1 da66a6323cc0842b19e3dbc5bb8ee5a59975037f SHA256 fc7e4d6c4172c62c93d5e974019f7193b03c8bc0a1c6f3a9fcc1d0928b808d7a -DIST git-1.7.0.tar.bz2 2430104 RMD160 5f37b556845dba23cc3e604e9b503b4ef0a9d3f7 SHA1 c0b536735a7f593877d61f5a8af72bdad0193d97 SHA256 a61e863944381c4f8231841f678f41f56b634bebca486a61005b35e5bcbb7c79 -DIST git-1.7.1.1.tar.bz2 2491729 RMD160 665433a2afe82be15edcb61a09b8912708db4885 SHA1 466b802272804cfcbe86a08879c6edb10b7a5a30 SHA256 f70c0fbb4445d3b638febbf33393adfc43d547926349c1df0a69f290a6b9c14a -DIST git-1.7.1.tar.bz2 2475655 RMD160 b29995bac655e64d3c5d6911fe1235ba85ff58e6 SHA1 0b031d1ab63506f945ad3c6fb5f814c6a4fc3095 SHA256 bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2 DIST git-1.7.2.2.tar.bz2 2564964 RMD160 efee981b6fe75b8073489537e0cf71aad7586f91 SHA1 0cc1caba421a2af5f8e3b9648a6230ea07c60bee SHA256 9ea4936f04f56426e8b643d22caeb9e1d1e5a5b28111fcd3839b6735b3610a66 DIST git-1.7.2.3.tar.bz2 2567979 RMD160 5c1bd58a62d3a29bb8e9a2733c8c2b98a950a225 SHA1 d9fe7bab2f40731d94002c614304b1c3fea23bb9 SHA256 6139ec31d0a79cae04f469e73cc1f912162bb8f84ef7621ecc8630989fc81ba1 -DIST git-1.7.2.tar.bz2 2559741 RMD160 cf3df2af634aa487c571f560d44ca4ab99668a85 SHA1 4dc232d018d769dd16774d3a12c237ac11b9d227 SHA256 d06ac99eff6228b5a8d0daee0b9f3e71194e4cc365a48441ff027e18e3dba1ba -DIST git-1.7.3.1.tar.bz2 2629723 RMD160 678826c88fe3c99d318e37bf7180c5b07423007d SHA1 372db7c9bb93bb133a92c16e0f4cd5b553c05ed7 SHA256 d0ac26b1bf3ec5af0853730a10edf9dc5f51a99d7590ab85676928bc3a44dae9 +DIST git-1.7.2.4.tar.bz2 2561291 RMD160 9b81fd68fdeec287d44151f88e831f8f1ece22e6 SHA1 96fd790dc7fd83efc85fae6edd6ab4f25d10da13 SHA256 8e145fb4999e849c7a26b141f554b776afbdd77f0a9d777e3fda9d227e291f13 DIST git-1.7.3.2.tar.bz2 2630629 RMD160 b645fc9e82eff3e186398280bc0a4ad72089b457 SHA1 cd8d806752aa6f5716cf193585024a002e098bf4 SHA256 bc4cf6bc7c116056050ef43b051691828d7101327b23311d424b02eaee553e71 -DIST git-1.7.3.tar.bz2 2629734 RMD160 4b0f95b4d114f5b7a4eb61c0f73b2f9a533637a0 SHA1 32e231fd10b85265487f0c2cc50d6d889b71de78 SHA256 0035a4a7906f65812072457b65c609f24c66f31593d0ad372b7c18894a26b07d +DIST git-1.7.3.3.tar.bz2 2633840 RMD160 ca39f8988c0eff1b63f81ef405ae75cbc0be6540 SHA1 8d8f6bbfa176ff9dc9c646a5341e58b35c09ae02 SHA256 c707c14ed5d2fc9dd9166fead73ca213d88f3264086a5892ca2139e7d9d437a0 DIST git-htmldocs-1.6.4.4.tar.bz2 756995 RMD160 a6d376213cfd442c046e8cce22c496e18c267ce9 SHA1 63a4e5d23f58bb76bba4630d176eca827f5273c0 SHA256 9adedf1d90fd2d9485a00d75c8c63bd6174c54faf1b99cedc5d8230a8f73d8c2 -DIST git-htmldocs-1.7.0.tar.bz2 861086 RMD160 06be1a51168f4b4e522d06ed0edc3437658bd519 SHA1 efc0f2b5d663e72c8e543f3ea7fd47b98e58b029 SHA256 8338f71c9ee019ee591805a2804e7ed59de0b03538bffeb6a504088a63779241 -DIST git-htmldocs-1.7.1.1.tar.bz2 881196 RMD160 ba62ba98a19b99f7daaf52243ddcd762560334b5 SHA1 d45775c03246da814cce80bd7dee346779bff94e SHA256 075b99aa5af90f220961cc6adaeac4ee1270ce4212d4d5fe790129ab09e184a3 -DIST git-htmldocs-1.7.1.tar.bz2 873917 RMD160 7d14a9767884180451359b899ec8741b42f6da5f SHA1 94d18dea549c52ae0c38b1568ace46bbbdb29b44 SHA256 fc4efd0ea040ea7684a0101f6614f9ee6398e77fdbed9338f61426b962a2270a DIST git-htmldocs-1.7.2.2.tar.bz2 897657 RMD160 5318d7276a71c173fb16a1e7f503bf868e529654 SHA1 4b720a1b4614c2be5b969f728e5f3d5127a58e92 SHA256 564218c2b5b9dfd61ef974f2386c13555f01c9cab567f8d164327a5fdba54e3d DIST git-htmldocs-1.7.2.3.tar.bz2 899056 RMD160 64ac98bf670efa13ee007d5d15ec7a6c1754b567 SHA1 bd99507c2a3286b409df3ef5987472732fe8283b SHA256 ee460ef1e58d103fe3af3812adab628d7fc8fa91c1a3128bc8bf0b334126832f -DIST git-htmldocs-1.7.2.tar.bz2 895714 RMD160 4e8e1ef0056bc83916015a5519c3bd4bbfd6ca1f SHA1 bcf16805bdbe072ff54163c5589aef049a997f85 SHA256 605b3684531b015d7c6723a82a29c864421d9e197cfea7037ead191e3b5e9463 -DIST git-htmldocs-1.7.3.1.tar.bz2 908991 RMD160 f1c79685c943823a4200e91bbb5eafebab8e10d2 SHA1 5d929edc8ebef8564c9879dfae3289ea0ecb97fb SHA256 b78e64eb8d40e9c117bf506e111b6c34125988e6a1e0cb0fd6eca56ba7e84c40 +DIST git-htmldocs-1.7.2.4.tar.bz2 919909 RMD160 3053f778557a61d144ef3d9813752dbcc863f7df SHA1 1ffecbd3d04d39f8a00f81724cdb548c1b18d445 SHA256 110d3b841de2c92516dda0f0ea75b957dd4d45b451949bd8239490471cc462b2 DIST git-htmldocs-1.7.3.2.tar.bz2 910291 RMD160 3a30ca0bdda0a2db9d99ad23857e55b376ee1ec5 SHA1 4be705c67a4c7954591c642437c2733b902b080d SHA256 7de0674b93c6f2159b9adbec31b48747328cb2c7508a66bd7ba0ff037b407187 -DIST git-htmldocs-1.7.3.tar.bz2 908959 RMD160 cf391a7a6afcf249e7254d2f2aad8ea1be722bab SHA1 3dcfe85ad9f711404c3989bb3280f92635c75946 SHA256 3837b1b11ca95968ca286ff8819ebdcb0cb6b59240712cfaa0b9c8b9489ca8ed +DIST git-htmldocs-1.7.3.3.tar.bz2 929146 RMD160 fc39efc86b35bda0f6034cafe19a8ff58b464cc3 SHA1 50ef88b8f0d502abb87a1b8c24a4ac7dbeb460c9 SHA256 fce0a93922f87f9890f5dad19d49616d18bc119c9aae22067ce3c2a3be0be787 DIST git-manpages-1.6.4.4.tar.bz2 248348 RMD160 fd1a267973373bc625336abe2b50545e12cc6fa4 SHA1 39b76f19751995ba3f093cac0b47900e22a5dbd2 SHA256 a2b2fb1aabdbb3e1e8ae9472523b9fef23c3e8a992bb8f68f17ad832a6e59c98 -DIST git-manpages-1.7.0.tar.bz2 272259 RMD160 520953c815c821f5350e6bb96f605c2830678ce0 SHA1 8d8b149df1a3146c76a41f50c14302e0424a29af SHA256 62f629db43b2b2f5b871977a300cba43c25f67c7a03decad4d364c021b7573b6 -DIST git-manpages-1.7.1.1.tar.bz2 279139 RMD160 57111ebe479d9ce49dc16284a0009035038e458f SHA1 765e46fc076635f99eb326f9eeced5a04e3af45b SHA256 ebb0732f5058dd365683b40ca6aa937a4bc31d971a6c73cde0176ae14e923af0 -DIST git-manpages-1.7.1.tar.bz2 276911 RMD160 8f32c0f06e9ff76751dff6849e6c3df7db4b77c7 SHA1 6b1e6738d30334f6e9071f983959644b4b3e9378 SHA256 f4898ba376cfb407ccf266e6fcee95c4cfc36387823629923f9e742cfdffda0c DIST git-manpages-1.7.2.2.tar.bz2 287738 RMD160 bd2feb1f74530d44cba834a52adde10b773d8744 SHA1 0b63f30cfb6073746b298aa5584eb8321bcd66a9 SHA256 98fbdfcb884b3c0ea0e444417724cdd2baf49b70a400a3037dc87120d76ae8d9 DIST git-manpages-1.7.2.3.tar.bz2 288264 RMD160 aea1a16ffa9fc2b91c7f6806cf848573f89825c2 SHA1 bed8aa072dabc51f6fa9dfbc363c023235a63200 SHA256 87e00245e10472ee5acdd75bb5a6e2e89c12638b498e0df9edca6201439d47d7 -DIST git-manpages-1.7.2.tar.bz2 286826 RMD160 35fec892ac39fd5da64ef5cecc0556efaf6d48e8 SHA1 601d712aedac1d8caa145d1867b4c0217982043c SHA256 5b6c6b401913fa018cae8a9578178ab233577fa6db118ba59e8563ab16ed9886 -DIST git-manpages-1.7.3.1.tar.bz2 290555 RMD160 e720e8a59cd824114dc8a23e613985dd93fdad52 SHA1 2cf45f492ab38aad2010d789b649862eb11faf0e SHA256 3b9c653f0d4770997fa460a25aae522238743295f6372d6bc7deccea1846c0f2 +DIST git-manpages-1.7.2.4.tar.bz2 289297 RMD160 1d968ec0db064c519ea80f77f8a2efb8ae57f387 SHA1 8321e6caa16cf2f500a837fc041656372f8b69d5 SHA256 952e65cb8abb36ceaf7c9a49d8117e4db76158e2022bd0bf5e84c37dde404e19 DIST git-manpages-1.7.3.2.tar.bz2 291349 RMD160 2a3e82a28bc955ffadfa91c5459f992ed17fa9f2 SHA1 0be6fabbca523085e185711f2b80c99330f1e4ac SHA256 ce6ca1cb1c62b7dd8d258cf9a94cda7de90a9476b7bb315968f3ed1976dc621e -DIST git-manpages-1.7.3.tar.bz2 290494 RMD160 97a8ae1ef8297e12ece2a3307547d0e73237920c SHA1 725ff48e7de80fe56556af3f5162be4e0648db61 SHA256 e661a5f27599e59c91fd5e4049cc0145871cc47802686172d03c3b732f6fded2 +DIST git-manpages-1.7.3.3.tar.bz2 294384 RMD160 402ce22ba5c3b13e1562feb5f94f4dd0cca7753f SHA1 52dbc6093bce00e659c92c0a52a4770fc3fd5ee8 SHA256 c01796a53d0f4c03cd77fb1a39517e664fca2ca7f77512963fd8c9cc95dd2b41 EBUILD git-1.6.4.4.ebuild 10107 RMD160 6c578f841de8ae887a23b29584f554b5394f1eb1 SHA1 24aad897fee56f185c3fe013203a9933fa9eccef SHA256 f4c3acab00255e27b18064a73081dae994bf5d2e7e56c59fb768e29b34336914 -EBUILD git-1.7.0.ebuild 11306 RMD160 a7ef58dd15c8d92e3d83e4cbe58b354cf13a6e5d SHA1 834c8f0202d643422f191192963b0c9d88f059af SHA256 5dd18d47daf59386d54fa7eb06e23baf6a5260124e347c3eabf13e35b5b35b4e -EBUILD git-1.7.1-r1.ebuild 11503 RMD160 ce25fdc24d33165bee62fbe59b69ab843c76e837 SHA1 116eb4b1c3d6479316eb89aa07b05eb5bd672469 SHA256 8b60472e049b67f542df4c3d233ed35b35c2ad6f49f5251313fc95ebb52979ce -EBUILD git-1.7.1.1.ebuild 11512 RMD160 2e626668640440cfc0a895a25ca6fd9ad5478841 SHA1 e2abbff7fd28a9f0d3d4fbc612956e1ddcafbca7 SHA256 e3e032e224a71926e4af32f2af20713be4e69b20ae20c25aa97de98ffe2269db -EBUILD git-1.7.2-r2.ebuild 13348 RMD160 615c2952c2dafed8c7bae58dd0ee63439ff07e74 SHA1 15e902b0cd14da3ad275a775c7dcdbec29e1eb4a SHA256 7d23371f9cd13c2a138acc4b8af7d5340c5434131f6412f748443a0931b5d4e4 EBUILD git-1.7.2.2.ebuild 13349 RMD160 8fe7b57a926639b7ac6363fd07c0ccf13c585bbb SHA1 65bb015883d6c1cbee35a01d0deaea40eab3f9c7 SHA256 3e74eae85577a607a8d5806bfd0bfaeacd2e6287f6651e3137e9acbfc2562c57 EBUILD git-1.7.2.3.ebuild 13359 RMD160 c0eed8e75bfaa77181bdd86689bc6c4d2b19e31e SHA1 b149e471636a473c9a323583c675759fc22949bb SHA256 29c5c7359a24ebab8002a87c9ff6aa8726766f2a7653f902d5dbc2383f2a180a -EBUILD git-1.7.2.ebuild 11473 RMD160 4a1bdd7d0ffbc8f677fe41216fb7b5e87f70ea3b SHA1 f5c98b2bb8e2240d9dbb43d6f6c4592916dcf5bd SHA256 7748e46b9b8cc17dd4028a4414f9fc578c4e479d85b07a957fff3ddf508bbb0f -EBUILD git-1.7.3.1.ebuild 13359 RMD160 4e9fb86202a8561e1542278a089e0a1b878d9d28 SHA1 15ae7b9ed146f2d3be1bf83334f1ff76dd2ceb76 SHA256 62c08e3ce6c744c1127fc9e2a8a41fffc56044fe58fbad7691d0b62da3f578a9 +EBUILD git-1.7.2.4.ebuild 13359 RMD160 3e35b9a3f7ba37c0a6b263c5558639b98dce34e5 SHA1 87dd056174463dcde57d2c14eb7b122fc98b0b86 SHA256 02b451ed2cdc4f82085395d7275445d0f1156c5d23726d2532e4d557a9b53aba EBUILD git-1.7.3.2-r1.ebuild 13388 RMD160 7ba00d0898139766f67eb9c9bbd731afebd8cd18 SHA1 c5ed44b7fca3ebcddb9b0fdd774c94b29bd32955 SHA256 e2d4dffd01c2c5a43a6e6fd056c05150d29a47c00aa392507a981d8fcb59b0a0 EBUILD git-1.7.3.2.ebuild 12889 RMD160 a8893e8bee2ad28e7f2cd7d0d5d3ff0af30dc431 SHA1 1ebfb0c9baec3944b59c0c2af52d1d209d48fe71 SHA256 fb9324d08d98dc39dd48dd5be4b889c4d8aaade5dedb96767ad393818bcc85a7 -EBUILD git-1.7.3.ebuild 13357 RMD160 a2462a4ca78fcdc9f1a9e2d1936126efa635d0f8 SHA1 4f62d8278bbb6789a72dee4a9e5de228c2d0216b SHA256 00a8e520e7f1af28eaf5b62d6618e5a5a08dad2b3406fe3e63aee1f282412d89 +EBUILD git-1.7.3.3.ebuild 13387 RMD160 a04cf9fc1bd372fd662970e1c260d73606b07761 SHA1 2e629cd3a44e7e709a2bfc935aaa701374e805a7 SHA256 8f6c73233804b6738522204236e8bfa7940b4aea9de2324cb104f1ab51f8fe8b EBUILD git-9999.ebuild 13382 RMD160 a5bfe144fc88e4c1808c8ec93ee7f44563b9a6d9 SHA1 699c1320d25dbcafc2aeafc2a1c52eaf9ed39fec SHA256 c1e9a3b0d920729f0740e5a6eef770c892544e752a91255f42d04b71be3a5893 -MISC ChangeLog 72077 RMD160 a6092bbc5fec2abd117f6d94c3a065125512feb4 SHA1 feb37c542559dbda7666b8a7608d1103771b3f6c SHA256 c6ea65ff680c1c96f2e050b68abe207e45708865b7baf5fbfd2fb075dc28ff3d +MISC ChangeLog 72407 RMD160 af119196b3c7ee4fcc97a0d2dacf4e4cd5e54e2d SHA1 9c33d2c3c5ff8cbec61fee0c35565364e9aa0157 SHA256 a703d6492236bc9446eb9b51d186d5d70728dfaf9449de6f25287a80aa3f5960 MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b diff --git a/dev-vcs/git/git-1.7.0.ebuild b/dev-vcs/git/git-1.7.0.ebuild deleted file mode 100644 index 75ef8d7479d1..000000000000 --- a/dev-vcs/git/git-1.7.0.ebuild +++ /dev/null @@ -1,418 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.0.ebuild,v 1.7 2010/08/16 05:47:29 robbat2 Exp $ - -EAPI=2 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [ "$PV" != "9999" ]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/xmlto - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - use iconv \ - || myopts="${myopts} NO_ICONV=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.0-always-install-js.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - -} - -git_emake() { - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ "$PV" == "9999" ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - doman man?/*.[157] Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - dodir /usr/share/${PN}/gitweb - insinto /usr/share/${PN}/gitweb - doins "${S}"/gitweb/gitweb.cgi - doins "${S}"/gitweb/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/${js} - doins "${S}"/gitweb/git-{favicon,logo}.png - - # Make sure it can run - fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${D}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - fi - if ! use subversion ; then - rm -f "${D}"/usr/libexec/git-core/git-svn \ - "${D}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-1.7.1-r1.ebuild b/dev-vcs/git/git-1.7.1-r1.ebuild deleted file mode 100644 index 09afcf5eec3a..000000000000 --- a/dev-vcs/git/git-1.7.1-r1.ebuild +++ /dev/null @@ -1,423 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1-r1.ebuild,v 1.9 2010/08/16 05:47:29 robbat2 Exp $ - -EAPI=2 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [ "$PV" != "9999" ]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/xmlto - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - use iconv \ - || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.1-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - -} - -git_emake() { - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ "$PV" == "9999" ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - doman man?/*.[157] Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - dodir /usr/share/${PN}/gitweb - insinto /usr/share/${PN}/gitweb - doins "${S}"/gitweb/gitweb.cgi - doins "${S}"/gitweb/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/${js} - doins "${S}"/gitweb/git-{favicon,logo}.png - - # Make sure it can run - fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${D}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - fi - if ! use subversion ; then - rm -f "${D}"/usr/libexec/git-core/git-svn \ - "${D}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-1.7.1.1.ebuild b/dev-vcs/git/git-1.7.1.1.ebuild deleted file mode 100644 index 9c62d1a32ddc..000000000000 --- a/dev-vcs/git/git-1.7.1.1.ebuild +++ /dev/null @@ -1,423 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1.1.ebuild,v 1.2 2010/08/16 05:47:29 robbat2 Exp $ - -EAPI=2 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [ "$PV" != "9999" ]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/xmlto - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - use iconv \ - || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.1-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - -} - -git_emake() { - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ "$PV" == "9999" ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - doman man?/*.[157] Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - dodir /usr/share/${PN}/gitweb - insinto /usr/share/${PN}/gitweb - doins "${S}"/gitweb/gitweb.cgi - doins "${S}"/gitweb/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/${js} - doins "${S}"/gitweb/git-{favicon,logo}.png - - # Make sure it can run - fperms 0755 /usr/share/${PN}/gitweb/gitweb.cgi - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${D}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - fi - if ! use subversion ; then - rm -f "${D}"/usr/libexec/git-core/git-svn \ - "${D}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-1.7.2-r2.ebuild b/dev-vcs/git/git-1.7.2-r2.ebuild deleted file mode 100644 index ce428c12e599..000000000000 --- a/dev-vcs/git/git-1.7.2-r2.ebuild +++ /dev/null @@ -1,463 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2-r2.ebuild,v 1.3 2010/08/29 11:19:53 swegener Exp $ - -EAPI=3 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [ "$PV" != "9999" ]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/xmlto - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || einfo "Forcing iconv for ${PVR} due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - # because, above, we need to do this unconditionally (no "&& use iconv") - use !elibc_glibc && myopts="${myopts} NEEDS_LIBICONV=YesPlease" - - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == *-interix* ]] ; then - myopts="${myopts} NO_IPV6=YesPlease" - myopts="${myopts} NO_MEMMEM=YesPlease" - myopts="${myopts} NO_MKDTEMP=YesPlease" - myopts="${myopts} NO_STRTOUMAX=YesPlease" - myopts="${myopts} NO_STRTOULL=YesPlease" - myopts="${myopts} NO_INET_NTOP=YesPlease" - myopts="${myopts} NO_INET_PTON=YesPlease" - myopts="${myopts} NO_NSEC=YesPlease" - myopts="${myopts} NO_MKSTEMPS=YesPlease" - fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # bug #318289 - epatch "${FILESDIR}"/git-1.7.1-interix.patch - epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch -} - -git_emake() { - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ "$PV" == "9999" ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - doman man?/*.[157] Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - exeinto /usr/share/${PN}/gitweb - doexe "${S}"/gitweb/gitweb.cgi - insinto /usr/share/${PN}/gitweb/static - doins "${S}"/gitweb/static/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/static/${js} - doins "${S}"/gitweb/static/git-{favicon,logo}.png - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - fi - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-1.7.3.1.ebuild b/dev-vcs/git/git-1.7.2.4.ebuild index c1cf2f3bab66..5f95da34bdd7 100644 --- a/dev-vcs/git/git-1.7.3.1.ebuild +++ b/dev-vcs/git/git-1.7.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.1.ebuild,v 1.2 2010/11/09 20:49:06 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.4.ebuild,v 1.1 2010/12/07 07:29:48 robbat2 Exp $ EAPI=3 diff --git a/dev-vcs/git/git-1.7.2.ebuild b/dev-vcs/git/git-1.7.2.ebuild deleted file mode 100644 index 599e908b4cbc..000000000000 --- a/dev-vcs/git/git-1.7.2.ebuild +++ /dev/null @@ -1,420 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.2.ebuild,v 1.3 2010/08/29 11:19:53 swegener Exp $ - -EAPI=2 - -GENTOO_DEPEND_ON_PERL=no -inherit toolchain-funcs eutils elisp-common perl-module bash-completion -[ "$PV" == "9999" ] && inherit git - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [ "$PV" != "9999" ]; then - SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2 - mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2 - doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -else - SRC_URI="" - EGIT_BRANCH="master" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - # EGIT_REPO_URI="http://www.kernel.org/pub/scm/git/git.git" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gtk iconv +perl ppcsha1 tk +threads +webdav xinetd cvs subversion" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI ) - cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - gtk? - ( - >=dev-python/pygtk-2.8 - || ( dev-python/pygtksourceview:2 dev-python/gtksourceview-python ) - )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - )" - -# Live ebuild builds HTML docs, additionally -if [ "$PV" == "9999" ]; then - DEPEND="${DEPEND} - doc? ( - app-text/xmlto - )" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if ! use perl ; then - use cgi && ewarn "gitweb needs USE=perl, ignoring USE=cgi" - use cvs && ewarn "CVS integration needs USE=perl, ignoring USE=cvs" - use subversion && ewarn "git-svn needs USE=perl, it won't work" - fi - if use webdav && ! use curl ; then - ewarn "USE=webdav needs USE=curl. Ignoring" - fi - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - use iconv \ - || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205." - # || myopts="${myopts} NO_ICONV=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [ "${PV}" != "9999" ]; then - unpack ${MY_P}.tar.bz2 - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.bz2 - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.bz2 - cd "${S}" - else - git_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # Noperl is being merged to upstream as of 2009/04/05 - #epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch - - # GetOpt-Long v2.38 is strict - # Merged in 1.6.3 final 2009/05/07 - #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch - - # JS install fixup - epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch - - # USE=-iconv causes segfaults, fixed post 1.7.1 - # Gentoo bug #321895 - #epatch "${FILESDIR}"/git-1.7.1-noiconv-segfault-fix.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - -} - -git_emake() { - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix=/usr \ - htmldir=/usr/share/doc/${PF}/html \ - "$@" -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ "$PV" == "9999" ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - doman man?/*.[157] Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - dobashcompletion contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${D}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use gtk ; then - dobin "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - dobin contrib/fast-import/git-p4 - dodoc contrib/fast-import/git-p4.txt - newbin contrib/fast-import/import-tars.perl import-tars - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one - # examples - these are stuff that is not used in Git anymore actually - # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${D}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - exeinto /usr/share/${PN}/gitweb - doexe "${S}"/gitweb/gitweb.cgi - insinto /usr/share/${PN}/gitweb/static - doins "${S}"/gitweb/static/gitweb.css - js=gitweb.js - [ -f "${S}"/gitweb/static/gitweb.min.js ] && js=gitweb.min.js - doins "${S}"/gitweb/static/${js} - doins "${S}"/gitweb/static/git-{favicon,logo}.png - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${D}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - fi - if ! use subversion ; then - rm -f "${D}"/usr/libexec/git-core/git-svn \ - "${D}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - cd "${S}" - # Now run the tests - einfo "Start test run" - git_emake \ - test || die "tests failed" -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use subversion && has_version dev-vcs/subversion && ! built_with_use --missing false dev-vcs/subversion perl ; then - ewarn "You must build dev-vcs/subversion with USE=perl" - ewarn "to get the full functionality of git-svn!" - fi - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/git/git-1.7.3.ebuild b/dev-vcs/git/git-1.7.3.3.ebuild index 2f3360e48d94..c585aaf166ff 100644 --- a/dev-vcs/git/git-1.7.3.ebuild +++ b/dev-vcs/git/git-1.7.3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.ebuild,v 1.2 2010/11/09 20:49:06 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.3.ebuild,v 1.1 2010/12/07 07:29:48 robbat2 Exp $ EAPI=3 @@ -70,12 +70,11 @@ DEPEND="${CDEPEND} sys-apps/texinfo )" -# Live ebuild builds HTML docs, additionally +# Live ebuild builds man pages and HTML docs, additionally if [ "$PV" == "9999" ]; then DEPEND="${DEPEND} - doc? ( - app-text/xmlto - )" + app-text/asciidoc + app-text/xmlto" fi SITEFILE=50${PN}-gentoo.el @@ -149,17 +148,6 @@ exportmakeopts() { # myopts="${myopts} NO_MKDTEMP=YesPlease" # myopts="${myopts} NO_MKSTEMPS=YesPlease" # fi - if [[ ${CHOST} == *-interix* ]] ; then - myopts="${myopts} NO_IPV6=YesPlease" - myopts="${myopts} NO_MEMMEM=YesPlease" - myopts="${myopts} NO_MKDTEMP=YesPlease" - myopts="${myopts} NO_STRTOUMAX=YesPlease" - myopts="${myopts} NO_STRTOULL=YesPlease" - myopts="${myopts} NO_INET_NTOP=YesPlease" - myopts="${myopts} NO_INET_PTON=YesPlease" - myopts="${myopts} NO_NSEC=YesPlease" - myopts="${myopts} NO_MKSTEMPS=YesPlease" - fi if [[ ${CHOST} == ia64-*-hpux* ]]; then myopts="${myopts} NO_NSEC=YesPlease" fi @@ -227,8 +215,7 @@ src_prepare() { Documentation/Makefile || die "sed failed" # bug #318289 - epatch "${FILESDIR}"/git-1.7.1-interix.patch - epatch "${FILESDIR}"/git-1.6.6.1-interix6.patch + epatch "${FILESDIR}"/git-1.7.3.2-interix.patch } git_emake() { @@ -283,7 +270,10 @@ src_install() { install || \ die "make install failed" - doman man?/*.[157] Documentation/*.[157] + # 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 @@ -316,16 +306,23 @@ src_install() { dobin contrib/fast-import/git-p4 dodoc contrib/fast-import/git-p4.txt newbin contrib/fast-import/import-tars.perl import-tars + newbin contrib/git-resurrect.sh git-resurrect dodir /usr/share/${PN}/contrib # The following are excluded: - # svnimport - use git-svn - # p4import - excluded because fast-import has a better one + # completion - installed above + # emacs - installed above # examples - these are stuff that is not used in Git anymore actually + # gitview - installed above + # p4import - excluded because fast-import has a better one # patches - stuff the Git guys made to go upstream to other places - for i in continuous fast-import hg-to-git \ - hooks remotes2config.sh stats \ - workdir convert-objects blameview ; do + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + for i in \ + blameview buildsystems ciabot continuous convert-objects fast-import \ + hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ + stats svn-fe vim workdir \ + ; do cp -rf \ "${S}"/contrib/${i} \ "${ED}"/usr/share/${PN}/contrib \ |