diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2013-07-09 08:40:17 +0000 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2013-07-09 08:40:17 +0000 |
commit | f215fa369175f58b5f152cb6c25f865ec1d78afb (patch) | |
tree | 886d25e80a45dbd29b13b6d6d90298ea65362cc2 /dev-vcs | |
parent | sci-chemistry/dssp: Add subslot for boost (diff) | |
download | historical-f215fa369175f58b5f152cb6c25f865ec1d78afb.tar.gz historical-f215fa369175f58b5f152cb6c25f865ec1d78afb.tar.bz2 historical-f215fa369175f58b5f152cb6c25f865ec1d78afb.zip |
Version bump (bug #467856). Fixed bug #451374, bug #470592 and bug #465808
Package-Manager: portage-2.2.0_alpha187/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC
Diffstat (limited to 'dev-vcs')
-rw-r--r-- | dev-vcs/git/ChangeLog | 10 | ||||
-rw-r--r-- | dev-vcs/git/Manifest | 26 | ||||
-rw-r--r-- | dev-vcs/git/git-1.8.3.2.ebuild | 607 |
3 files changed, 641 insertions, 2 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index ebd0eb4767c6..fad4b5c7d1aa 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.200 2013/05/18 13:48:37 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.201 2013/07/09 08:40:13 polynomial-c Exp $ + +*git-1.8.3.2 (09 Jul 2013) + + 09 Jul 2013; Lars Wendler <polynomial-c@gentoo.org> +git-1.8.3.2.ebuild: + Non-maintainer commit: Version bump (bug #467856). Converted ebuild to EAPI-5 + and python-single-r1 eclass. Added gtk -> python REQUIRED_USE (bug #451374). + Hopefully fixed test failure with USE=-perl (bug #470592). Added installation + if git-remote-hg (bug #465808) and git-remote-bzr with USE=python. 18 May 2013; Fabio Erculiani <lxnay@gentoo.org> git-1.8.2.1.ebuild, git-9999.ebuild, +files/git-daemon.socket, +files/git-daemon_at.service: diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 703296507439..c24f5e74a5fe 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 50git-gentoo.el 472 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 WHIRLPOOL 887682f79182f6728af3c0fd2ee0e81319d49761a987559684be5e4acae4af579a5b8d1197ddba31452cec179de3c8f5784cc85ad61f78b400e42c204c93f642 AUX git-1.6.6.1-interix6.patch 457 SHA256 a8b788b8ef41ce7fd1018f13795694a908fbb1884de195c89a58fe87f3968849 SHA512 58e63d78d665f9122214ec1b7a8d730f7c9d8938283db98580334e293f46a984b86c8d72fbe48f891eda6d48fc76982857539761c6dcf881b1bb5817c275d263 WHIRLPOOL 803ec2121a7abe018c591c249c2b835aadd114a65b0cf6be4fd6440c77f9282d13b4225e1d63a5b22bb46f058bcd073dc97e801476278a91ff9f82634104f3d8 AUX git-1.7.1-interix.patch 2192 SHA256 b560fcc41ea93df429290ec645f3e37368ceec1101f7124574fa6d9bab00a495 SHA512 bd02d6c2b83827eb3d286ef37b358c2eb25d453655bebf1d2d074b47e7aab1c3b3f07da21eca33f01ac457d2878b674b2c857f9915ac71438a02bca112c89c41 WHIRLPOOL 7a314149acaa54199a258c1ebd9ee34356fa0393d3d49c994b25a66a593d4214391495d5dd67db01e6b1e396cb6c96b0ddcb7c3d78316bec7fb10af0e7e38af4 @@ -24,6 +27,7 @@ DIST git-1.7.8.6.tar.gz 3546112 SHA256 45be602d0ca64eb44282cec7a5a7286487f7e9ed0 DIST git-1.8.0.2.tar.gz 4231410 SHA256 c06d5d29389e90583d16ec41d5be931593196f6842f9b14e910a0b5781c10e07 SHA512 b278eed9571f2d6449aef18f94fe0937c2f54d1ad9bc2a6b54d3082b550e1377b896aeb412438991219c454179b2590241b37e8ddfcf7096fe49bca564956779 WHIRLPOOL f61474fd1a7a76cb64c1202ff4270e0e84dfd82165eeeefda454127a69e778763c124da899ae0d95d9e737872f1bbbd46f66d9aa0d6d6cad1aa065001c6cc711 DIST git-1.8.1.5.tar.gz 4306780 SHA256 f8b0be6e53e866f83cde64fa947011ebac56077bd1273c2e894038878986b955 SHA512 19ee4c76c66595f24d5093648202840f39356c111124017beeb32a4d79e8ce362d901ff4a09ad67c1392c5d1e48068a3a4634ad2865d8231e70b197a1cf0fdd3 WHIRLPOOL 559a89140b95bc413b6be5f4d09abc75a038d50381ae0fa61a5fa1c190edf92a5cf9ec2a938ba5d1ccd5563bb19883254773599749bb12488761c125b510b5e2 DIST git-1.8.2.1.tar.gz 4400440 SHA256 ed6dbf91b56c1540627563b5e8683fe726dac881ae028f3f17650b88fcb641d7 SHA512 d75a36a91b0522ca3a5c792473e16fc98dd9de082b4c0e9a75ebc525fa334edfdcb6dbf138e1bdede711f2158f24e8a8ba8499b89f9a82be1b5e60eb4ba5d33e WHIRLPOOL 587afbadca06674b751385b6f5fcda3d74db159a03bdbb1d477d4d9d4eb792d020a6f97906d2bf7d69f2f14432aaf6634d4274aa14e377ca6c865676853fd060 +DIST git-1.8.3.2.tar.gz 4474347 SHA256 2f798db86859c85608fe4120f52a1b1cb13ca9c4daa4f59eb1dc090280f46473 SHA512 6e19948821dfbf78c5b9ea95614d3c10f4625583e3c17b6c55110b74f28679e525c449179cf49c2587a86c3b7fd7b6a27589824fcea0ec6fb69ca752a6942931 WHIRLPOOL 26892e039b67b35ae9df0a124d0812b36a22f481f146561b733a758b89a00770c05902c2820f2a783bc0fac07ecb335accbc939d21481da821177e0548d6a077 DIST git-htmldocs-1.6.4.5.tar.bz2 772113 SHA256 12c13ead869918d8470d68c7331675c56a192eae819c283a398aaf9f0f7555d2 SHA512 155dfe08b752a268a680dfb3df3d7bf1453976824aa33eb6f98598db9ba52b56e770a31f9770013076dd518f212ec3e7cfd13408d77a0ba1c2ad6bc4921ddc22 WHIRLPOOL 59e25e92e4c1ca61af8b967c3e310886f520d93de230886c6ec9b86e370c1d8f8ce56edb1fa29365348f987c746a58e3954e8d891138a4459eb2149005e4bb29 DIST git-htmldocs-1.7.12.4.tar.gz 1798333 SHA256 580de99c9fd8bed49132cf137af643d64e1450a7917b77c1343a784048a95930 SHA512 fddd27cc98ef1d263aa663655f778dd708223bbddc792098548f0ae68981eccd0427007c82c011e9eb5c860272bd65a4f4032e46f77ec8cf16f051814092585c WHIRLPOOL 1d1feaccf6006e9b880964cddce0565a7fc6bf8f8c96198fd0dd4e48de165718a7a63f5c44b61cd1b40e7f080b8c495fcd9cba5749684f5e255b7fb8eb252552 DIST git-htmldocs-1.7.2.5.tar.bz2 919247 SHA256 6b6291ffad4eae80d2739acdffffdd6293b9e50366cfa53ffb0c3a1427700337 SHA512 e8b2bc14b1a687f76256dfcfae893252b091c6d60dcd0fc53da50ceaee1434d5c976f1d09d45f8cc5a2991a9051ee8d0482a281fe7559225b6c750fe241b713c WHIRLPOOL d1ea7a272ba728e01523439ac897e1ecbc22917aceaa8871ade522d18db37df0d305fd3dd1782ef20dc1c935ec3965ebbe86d4cc29419a9e82aee831002eabed @@ -32,6 +36,7 @@ DIST git-htmldocs-1.7.8.6.tar.gz 1688622 SHA256 7c7447fe136349b1807caba1c00fe6a4 DIST git-htmldocs-1.8.0.2.tar.gz 1809932 SHA256 edba4dcc9dc131b32ba05d5cb9334a9ba7af3ca6c91795068b56d7e0d3b0f43a SHA512 f63f8b1e9efd96a5450ef5b31be992fe49fb5c8de8f79d9835ff5884dc4a4ba9e87c8c7f8e59e67250df880ee7221d2e4de754bd0af5d86a117bd4ee5d306dae WHIRLPOOL bc5508ae94024157ef1fb2fe19269eaa5189bb41a603390ec5d61ce9547ae9f68cad49a7b4b3da47f09a9a9a8258c8e76fab1fd03a222454fe48e4288524641c DIST git-htmldocs-1.8.1.5.tar.gz 2060977 SHA256 108e34217b2668945ca78b36b08ceeb9fe283617fe68b8f181219076bb225de0 SHA512 0b46a95a47df4326633d10295eeb09d41cee78d9c30775f7784690715e3b5d607ff26027f4cd6036f31dfc458ba2757ceb5ed6ea675a863a5dc69d8e5a7b34f5 WHIRLPOOL d273fbee9fb0a68ef3f0d19ba2249481bd15ff69b289e046e975fccda7639102519aa79bff94f6317e6b73cc414128b8b8619fcda1a910b74770b0aba1694d26 DIST git-htmldocs-1.8.2.1.tar.gz 2093688 SHA256 3f2482089eb345ec7d2ad61ad731c17ea87733b763585b580cf99b17194e0286 SHA512 8e7f25a0b230473f9e9290f61e9ea80a675459eea163ef76e281aa95747f5bc4df2ddb7f9bba9c2b0fb75819cd206f2415ba665bc986a628a07e8da4e5aa6efc WHIRLPOOL 574a01d1e403b25444ac88f66a939fcad1c96025a62f91550f328d400246955e61255dd403f3cf8302b961032f536e394b77228a8434c7b2065b564163f49114 +DIST git-htmldocs-1.8.3.2.tar.gz 2115320 SHA256 805b7fc4399daf9258e8cc28ecc3dd043fdd7f339447f4d84674826916109246 SHA512 0890b60bfa110ca7eaf7aaddbf0aca9574f608addc384cece3c91c8c04ef6397064a0669f3d61d0a65eb120b626ccd85df26f04438ca301f349136cd55e5080a WHIRLPOOL 377c39ac7988a3c1bb6e80333c43878d38fe5eecbb75dcbcbef3c2186842fcc170a552d72be891f1479c336fdd6c5ac1ce1ca2c0adf9a8238bd057f093c3f912 DIST git-manpages-1.6.4.5.tar.bz2 254368 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0bdae702b1fe58ad8ebab32a0bb7ba447 SHA512 9874bd63e138a2973f5912385e7972d17cd7bfebac7c67bca96ab041912ade4f2485d6536312c452d2b2fd6e89c1fec40b40cbd0ea91486db1d1b7e7e68c867e WHIRLPOOL 72ec9606acd277d90c5c6a46206c63991be7c256f43a1b866fe6da721434131646043fb5b03d448f1c75a3ffea92f4cf1b05e8a846919800e146e15a160dab04 DIST git-manpages-1.7.12.4.tar.gz 521602 SHA256 4075b60250f9bc5b5323266764c889f028521dbe1f5c10f470a167cc75105005 SHA512 0cabb41e7e599111c64f3382d4688891d1c76c5550ad27a08b6ca2e62fe826b971fa757a6a815731b8b88d1302ea886f199944497a0a10fbbfea41eafae50512 WHIRLPOOL c33b93023feab4a5f6f63cab5cb1e82e42f2fc14bd590ced246ebfc45311e3ff93855864f521af12916bde58ac4fe2ccb055e667936e85883192dd0904873735 DIST git-manpages-1.7.2.5.tar.bz2 289543 SHA256 a42a977a1ecfd3cea62e1f02fc89f57029a94f163ff7205f6a56ab4b67d6bd6e SHA512 b4065ef9ed7beb84d56fdfeadf9608c0b6bd36a06460b68ba575583062612f469e7db1d08c232f3a9253ca0b957bacc508fd4ec702070eb4c84d174af1828ab9 WHIRLPOOL d22249c22ad9da862cb842e37463cff3a7967de70441a851640641d78d185da916db9f3d3fec328bc10e48bc318b2b4fa085fae81c2576a758dededf153cc78b @@ -40,6 +45,7 @@ DIST git-manpages-1.7.8.6.tar.gz 501678 SHA256 559b7a6ba8eaad655d725765b75aff9c6 DIST git-manpages-1.8.0.2.tar.gz 523757 SHA256 b04f0e7277927e8fb91c1c1f7b951b6d2770cfa6a7b69145462214954751be98 SHA512 0d443a1fd6f8b234012e33b5b5cd2bb83a6d0d9ae72b623a2fbc96163fc5b6c727c34094e87166559669afdf2d26af3681ebbb68ecfec33a949968a07a47c9d0 WHIRLPOOL 80f80a4e60dcf7ad15a09ccfc9e17b66b00dae0da41ca7a46891483572e3f720c574f5a7626670f6eabe3ee6d08283f072d6b794de06233382968977a9248a25 DIST git-manpages-1.8.1.5.tar.gz 528540 SHA256 b171761f13deb738a2464c9d3967c12539067a34d6f2bfa5739a1006786fd24a SHA512 c0106da12ae3beeba3c23e68b37113082d829fe80160c53df51aac207557a2045c662b4d01b5a1cb211e75f9f7629290b7ecf3907b3bdc828820382793414e8e WHIRLPOOL 3da3b254707c06cb069fa462561634a4f5869fadab6ab8a07301eeb0b2244f159415d409d71c5ebceb4a74ef51f645f2f4c9ca19080a84ee370b5787740d08c2 DIST git-manpages-1.8.2.1.tar.gz 536718 SHA256 1d3bc31d10564d29d0c3a45f98f98a7d936dfcdb1692528bf2fdb2140fe89824 SHA512 a6463c8bc8a23301d89e985b88fa0073c154e126c51a1f7699cd09e79723ed463f46a9cf5dd63f9e2e46ee4111e6154ae86553bd446f5cf76db9fd4e3bff5a1f WHIRLPOOL 8aa3c57475d8cfd7c47019c4eb05c091c76fb0ec5d213942b5a16ee9f6c540111aecb6b754eb98578e9e129d4e8ba941a3bee326a2845b2a098cc30e1109d35d +DIST git-manpages-1.8.3.2.tar.gz 542769 SHA256 599bc8f6c56986a994a237cfebb53b4fab9051576775e32d0353e0455ab84115 SHA512 42fd781b924355c969ce381aae828f877059472741d7b53b0d1aad53f04c8a27b6b161b5dfc353098370ead73ccb9cdc86ac5374cf02829134f8c4d70bcbb7cf WHIRLPOOL 90226006a35b7b6e644f887981f2725238ff428f572425942701614e14fab5c8c5c602746de93a113d83d9b9c76ea1805a9c7cfa353305b0f817c33976048d77 EBUILD git-1.6.4.5.ebuild 10408 SHA256 0107590ab8f9fb6dd5160ae3fff7f52c9e3348686bf03df450b7551c9464dcd5 SHA512 513fcaab682cdc8e32012afcca0c13877fd6452df32e37504519002c00de318875e3c0179bd98d81925acee171801b7bf82e1d9a1a7e0c63889b280f01b44663 WHIRLPOOL 1de545062584bfa0ff1f8db92610533085fb636e14ad57bf621d94a7167dbdfc1a30aec601567550fa3b194b96d6daa1f1cb71e8833e2af3d3d3d2de848b2e2e EBUILD git-1.7.12.4.ebuild 15320 SHA256 d1f39b24cd4a1e8d8e255555b26024873fd7d63959302592480aaf6cfd68c9f3 SHA512 5034c4d71bd93287a0fdf0862646cf7801560015805d80b835631d29f646002aec074515772b3e445fac523aa629d66969839902df254f18eb1f25e1ee928b1b WHIRLPOOL 4956965813ed4482f1dcb2a037996ffb1d7a06a0b15643168147e24166f09b643bea08a5a0fff6ba086bd1f982aa915a059d520b3597faa63fe244b32e0f4a6b EBUILD git-1.7.2.5.ebuild 13519 SHA256 481145683960e2d32d104d626898f2d71ebaa925a0df6488aa34bd13f19db842 SHA512 0a2b345963f7979662dc4a4c2cb759a214e0571cf565e77e7f36686eb50bb01d1a41f6218ef9c32b66e1e1299e260a6dbff3765c99f7eba071424e7a55fed8fa WHIRLPOOL 9d6f5a8fb02439b94be08e8db4f1fd8be7a165e5573bd7b94a27b4735b84fd17a9bd45f0c1b792a00cfb300b1ce73b7cdee0f54a03462f82a6d78d1326c5da9a @@ -48,7 +54,25 @@ EBUILD git-1.7.8.6.ebuild 14683 SHA256 38f21df5f6abefb90ce93129adacf4b307decd484 EBUILD git-1.8.0.2.ebuild 17163 SHA256 931df741e5eeccee8c67048dd07074777228a6cb4321518a8150a13fd5ec00f0 SHA512 077d8dace76b90c7486d6e3cdb6d8691a4d6634107c69e672a6c7eb105921265b5b545fa727ca8426f069ecac4decc1b9873da689ef0f15623064a5df497053f WHIRLPOOL 0c46e4baae87498094750fb75dd500e4af8d9c7e2c1c3c4394b45bc78bd91a0cfa73ae20384297799bd2763fd7527be6609c60a92a5e4ce3fa997fea61703e86 EBUILD git-1.8.1.5.ebuild 17189 SHA256 bec81381b6dc3763d99fa20f6828c844a6b801aa5df41b6b99e07c87ff7c4a3d SHA512 22ee72cb4efff7ab5ff7ae53db9292b4a7e72ea75566e2664b001a8c8a761e7bfa3a4e28d4a7fa4ec777db497a0b56964ca2efdedd11fc2f34c9d9ab37ea335e WHIRLPOOL a5c025332de62d0a1e3832ec8ed1b873e5a44c16b4be41c05292553a4375b41ed996263e4c5ad1dedb800601790084d6ed6e0e010f35cd0ace41fc04b8360439 EBUILD git-1.8.2.1.ebuild 17612 SHA256 4d80e7d5e92b44281d640770dcc104021494633a6fa945550b5cd8963dd2d733 SHA512 d7de530d0a4cc714c7c11d02af8941912eaefe2e80cc054193e880943ded85a6391e92f38437aadbbaba2623ca789078a776e99ca26e5c98c28a1928e9d1bdc8 WHIRLPOOL 63373a2b5515a02b924c0c811d5dfe67db84b0fc93982d9f5ec4dca81f9d80d15ec4f13fb35d66389cf6234427d736e26b9df85fa8160995cab61c675482e8f8 +EBUILD git-1.8.3.2.ebuild 17390 SHA256 68d0cf5e653eca92fe8303d30bd3a89d99aa4b5153bf76563da28ebc1f0d88de SHA512 972f699fbdb3d688173a859cfd253fc657a5e0a1b944de6920110c89db0c5b6beb19f2695965eb2edc8a75f25cff9de16fa5d13a327cefc48a742ae5d4b77a18 WHIRLPOOL 26873c548b16ad8c034790d56b20e604e5bc53d86782eabe8f5607bf48a76e8094b3cb8032d70c1c1b0cfb1f8c06eeaf0910dd2fd96055a3d96772ba711d59c9 EBUILD git-9999.ebuild 17301 SHA256 38772b0f96d81aaf7b6e31092b677f3c50234b4f7b2cb6eaced06900e32ce350 SHA512 50e9fe76af6195f52dbcd6c787c2943e1ced23f6036f405e17648361ba7da0fbf2026a75f999ba10831ec250c668778b7ee863ca8284e3470d2856548f44e383 WHIRLPOOL 24e52c2af1d6a62f281b253ef88db7b84216ac8a7ee3e79171081f36b18f2ba13c339bca191fed890156766be7cbf575ac203599d9e381c8c1dd85fe15cb8846 -MISC ChangeLog 4544 SHA256 e1d88b8067320772f4c7aac33c06706445ac2107c76da6467336683864d5c353 SHA512 aa1b83db95651dc48783d36af2c27f46ebe6e7f2691230bccda676674cb43bfb003b111eb3f8a1226e17b1739537f77739b6f20a09940ef477cde94d3730228a WHIRLPOOL 3ff02c011b91edc9b02bfc2dccead89b89cb035d3117423cd4f468a5f730b213d36bfacf441339b78c85128616132e0605ed192bfd6679c8ba5950591f720d86 +MISC ChangeLog 4963 SHA256 884181bd1227e09dd64a7ced3e46ecfc0842e9bf1383fe361b493edd2c41c898 SHA512 b124582da32e4856dbc4aea28db0508c06d849e85476ff54b43eb2252557d2d56d69c061557d8159a062df2108c4cc486bb930ead580e7dc5486cf4022e74172 WHIRLPOOL 58f79246caf2187e22df92fe5f4590eb75a0dd57075796b98485556fc25780c3a11b3a0ab3cdcbff44cda59df7b8d85ddf643b45367d12f94c448e3fbeb53a9a MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4 MISC metadata.xml 1821 SHA256 3f0864988fd1d6ca97db612f9157275bf00336143969acb9d82ca6e6523127f5 SHA512 9f2d7adaf973837028f0c7cb305ac9917a88f07490ee172e570fc70860385de5c2b00edd6c22a37c9448d9260f51554e87b32b24e3bbbcc521f9ce5bbcb1fce0 WHIRLPOOL 7c135c44361168708252533d60a05f2c7d4b202c96c212e75d3057fa5ad80928c7d7452359b7e068c7a1f41dd4276c5917ac47ae010ec93821b2a9a3518f7aa9 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.20 (GNU/Linux) + +iQIcBAEBCAAGBQJR28xuAAoJEPiazRVxLXTFK3IQAIA7IS5Kap0312VcVVvVUtIp +5ZMKbefSxgUzSySBw/dHN3IfSUos1xRkZ05MFhd+gwdPw3PWf0y7ksqPfu3E9dol +FhCJHaf3bJORe1vuDAV0MkeOIAO+hliXc0GNxlBoNxn3rZgQ+4kswyi6h2Wp8mMj ++Z1cFzJliRGpSeb33U/dJdtn/cSxMEJeVTggXpGIIPLDsQPSnbMWMlas4zTHb2zX +a906hQvnnNjzu6BYPUafkCgYJ/geUhE6uBsHnnHFzsrLAiu9i0HKR/gtwSdGs8GT +RUoP4I76O8Q/p9mvCb30ibaV+6BkCHIkWrXSgJmW3RFMzAeLZc5Wts84gdP2P41y +OScNR5UxV5iZN73IG9bts1U3s9WWMwsoMzE0auH+tox3y2hDqqzuti56fZxi5L5B +wp4wKRe/MF8drSCoDaZYUc1z9ODuz159Uej+QTswp/DZnxsicdDzNYETxTe9J7xx +SQxPTlTuS0pH9lBZ8knuIl+La+fNd/Ehkter8scDoGVgUrFSeVF06MB3zA5ubGOT +KIgUtZsBfziz5nNqOgabAO3iASDujqHqhC8rM9uht+X7Uloa9nLyGqdNYGVjjBsv +j+zmSus3jSyGnEZj9VNc+bwpBeqWdXH88/yg0JkWrsECdXw0AZh6jSOG54kJlg3R +t7jI5GWQHslTXXvVwcFN +=v587 +-----END PGP SIGNATURE----- diff --git a/dev-vcs/git/git-1.8.3.2.ebuild b/dev-vcs/git/git-1.8.3.2.ebuild new file mode 100644 index 000000000000..e961aaf43377 --- /dev/null +++ b/dev-vcs/git/git-1.8.3.2.ebuild @@ -0,0 +1,607 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.3.2.ebuild,v 1.1 2013/07/09 08:40:13 polynomial-c Exp $ + +EAPI=5 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_COMPAT=( python2_{5,6,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="http://git-core.googlecode.com/files" + SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + doc? ( + ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + )" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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" +else + SRC_URI="" + KEYWORDS="" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + dev-libs/openssl + sys-libs/zlib + pcre? ( dev-libs/libpcre ) + perl? ( dev-lang/perl[-build] ) + tk? ( dev-lang/tk ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs ) + gnome-keyring? ( gnome-base/gnome-keyring )" + +RDEPEND="${CDEPEND} + gpg? ( app-crypt/gnupg ) + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) + cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) + subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + python? ( gtk? + ( + >=dev-python/pygtk-2.8 + dev-python/pygtksourceview:2 + ) + ${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 + ) + 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 ) + subversion? ( perl ) + webdav? ( curl ) + gtk? ( python ) + ${PYTHON_REQUIRED_USE} +" + +pkg_setup() { + if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use python ; then + python-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" + 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.2-optional-cvs.patch + + sed -i \ + -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC = \).*$:\1$(OPTCC):' \ + -e 's:^\(AR = \).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile 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 -i 's/DOCBOOK2X_TEXI=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_get_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 +} + +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} + newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt + + 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 + newbin 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}" + + # 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 + dobin contrib/git-jump/git-jump + newdoc contrib/git-jump/README git-jump.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_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} + 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 \ + blameview buildsystems ciabot continuous 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.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 + + 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="t3701-add-interactive.sh \ + t7501-commit.sh \ + t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh" + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot="t0001-init.sh \ + t0004-unwritable.sh \ + t0070-fundamental.sh \ + t1004-read-tree-m-u-wf.sh \ + t3700-add.sh \ + t7300-clean.sh" + # t9100 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 ]] && \ + built_with_use dev-vcs/cvs server && \ + let cvs=$cvs+1 + if [[ $cvs -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled="${disabled} ${tests_cvs}" + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled="${disabled} ${tests_perl}" + fi + + einfo "Disabling tests that fail with SVN 1.7" + disabled="${disabled} ${test_svn}" + + # Reset all previously disabled tests + cd "${S}/t" + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled} ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ + -i "${S}"/t/Makefile + + # Clean old results first, must always run + cd "${S}/t" + nonfatal git_emake clean + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + cd "${S}" + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + cd "${S}/t" + nonfatal git_emake aggregate-results + + # And bail if there was a problem + [ $rc -eq 0 ] || die "tests failed. Please file a bug." +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + use python && python_optimize git_remote_helpers + 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 )" + echo +} + +pkg_postrm() { + use emacs && elisp-site-regen +} |