From 41b4941b56d34fd129c18e21abe052c49545ef6d Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sun, 29 Sep 2013 14:49:55 -0700 Subject: [PATCH] bump(dev-vcs/git): sync with upstream --- .../portage-stable/dev-vcs/git/ChangeLog | 115 +++- .../portage-stable/dev-vcs/git/Manifest | 59 +- .../git/files/git-1.8.2-optional-cvs.patch | 369 ++++++++++++ .../dev-vcs/git/files/git-1.8.2-texinfo.patch | 19 + .../dev-vcs/git/files/git-daemon.socket | 9 + .../dev-vcs/git/files/git-daemon_at.service | 13 + .../dev-vcs/git/git-1.7.12-r1.ebuild | 513 ----------------- .../dev-vcs/git/git-1.7.12-r2.ebuild | 525 ------------------ .../dev-vcs/git/git-1.7.12.3-r1.ebuild | 525 ------------------ .../dev-vcs/git/git-1.7.12.3.ebuild | 513 ----------------- .../dev-vcs/git/git-1.7.12.4.ebuild | 4 +- .../dev-vcs/git/git-1.7.12.ebuild | 511 ----------------- .../dev-vcs/git/git-1.8.0.ebuild | 525 ------------------ ...git-1.8.1.ebuild => git-1.8.1.5-r1.ebuild} | 14 +- ...{git-1.8.1.2.ebuild => git-1.8.1.5.ebuild} | 4 +- ...{git-1.8.1.1.ebuild => git-1.8.2.1.ebuild} | 31 +- ...git-1.8.0-r1.ebuild => git-1.8.3.2.ebuild} | 87 +-- .../dev-vcs/git/git-9999.ebuild | 87 +-- 18 files changed, 683 insertions(+), 3240 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.2-optional-cvs.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.2-texinfo.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.socket create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon_at.service delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.3-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.0.ebuild rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-1.8.1.ebuild => git-1.8.1.5-r1.ebuild} (96%) rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-1.8.1.2.ebuild => git-1.8.1.5.ebuild} (98%) rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-1.8.1.1.ebuild => git-1.8.2.1.ebuild} (94%) rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-1.8.0-r1.ebuild => git-1.8.3.2.ebuild} (88%) diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-vcs/git/ChangeLog index 46f1c58c76..55e64e36c2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/ChangeLog @@ -1,6 +1,119 @@ # 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.179 2013/01/29 19:52:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.208 2013/09/28 10:08:18 pacho Exp $ + +*git-1.8.1.5-r1 (28 Sep 2013) + + 28 Sep 2013; Pacho Ramos +git-1.8.1.5-r1.ebuild: + Backport unit files to allow faster stabilization + + 16 Sep 2013; Michał Górny git-1.8.3.2.ebuild, + git-9999.ebuild: + Use ${PYTHON} rather than $(python_get_PYTHON). It is exported anyway. + + 31 Jul 2013; Matt Turner git-1.8.3.2.ebuild, + git-9999.ebuild: + Allow building against >=dev-lang/perl-5.16 without 'build' in IUSE. + + 26 Jul 2013; William Hubbs git-9999.ebuild: + non-maintainer commit: sync live ebuild with git-1.8.3.2. + + 15 Jul 2013; Jonathan Callen git-1.8.3.2.ebuild: + Non-maintainer update: make ${PYTHON_REQUIRED_USE} conditional on USE=python; + fix pygtk and pygtksourceview deps to require that they be built with the same + version of python as this package; replace built_with_use calls with + has_version; remove python 2.5 support as none of the dependencies support it. + + 11 Jul 2013; Lars Wendler git-1.8.3.2.ebuild: + Non-maintainer commit: Fixed test failure when built with USE="-perl" (bug + #476472). Also fixed wrong located python_optimize call. Thanks to Arfrever + for pointing this out in IRC and mgorny for giving advice how to fix this. + +*git-1.8.3.2 (09 Jul 2013) + + 09 Jul 2013; Lars Wendler +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 + of git-remote-hg (bug #465808) and git-remote-bzr with USE=python. + + 18 May 2013; Fabio Erculiani git-1.8.2.1.ebuild, + git-9999.ebuild, +files/git-daemon.socket, +files/git-daemon_at.service: + add systemd unit supporting socket activation to 1.8.21 and 9999, fix bug + #468846 + + 19 Apr 2013; Mike Frysinger git-1.8.2.1.ebuild: + Add missing pthreads linkage for svn-fe #466178 by Mike Gilbert. + + 17 Apr 2013; Robin H. Johnson git-1.8.2.1.ebuild: + Bug #466178: better use of variables to make svn-fe always compile right. + +*git-1.8.2.1 (16 Apr 2013) + + 16 Apr 2013; Robin H. Johnson + +files/git-1.8.2-optional-cvs.patch, +files/git-1.8.2-texinfo.patch, + +git-1.8.2.1.ebuild: + Verbump. Bug #464210: fix texinfo 5.1 @anchor handling. + + 19 Mar 2013; Agostino Sarubbo -git-1.7.12-r1.ebuild, + -git-1.7.12-r2.ebuild, -git-1.7.12.3-r1.ebuild, -git-1.7.12.3.ebuild, + -git-1.7.12.ebuild, -git-1.8.0-r1.ebuild, -git-1.8.0.ebuild, + -git-1.8.1.1.ebuild, -git-1.8.1.2.ebuild, -git-1.8.1.4.ebuild, + -git-1.8.1.ebuild: + Remove old + + 10 Mar 2013; Agostino Sarubbo git-1.8.1.5.ebuild: + Stable for s390, wrt bug #459158 + + 09 Mar 2013; Agostino Sarubbo git-1.8.1.5.ebuild: + Stable for sparc, wrt bug #459158 + + 09 Mar 2013; Agostino Sarubbo git-1.8.1.5.ebuild: + Stable for ia64, wrt bug #459158 + + 09 Mar 2013; Agostino Sarubbo git-1.8.1.5.ebuild: + Stable for alpha, wrt bug #459158 + + 09 Mar 2013; Agostino Sarubbo git-1.8.1.5.ebuild: + Stable for ppc64, wrt bug #459158 + + 08 Mar 2013; Agostino Sarubbo git-1.8.1.5.ebuild: + Stable for arm, wrt bug #459158 + + 06 Mar 2013; Agostino Sarubbo git-1.8.1.5.ebuild: + Stable for sh, wrt bug #459158 + + 05 Mar 2013; Jeroen Roovers git-1.8.1.5.ebuild: + Stable for HPPA (bug #459158). + + 04 Mar 2013; Brent Baude git-1.8.1.5.ebuild: + Marking git-1.8.1.5 ppc for bug 459158 + + 04 Mar 2013; Agostino Sarubbo git-1.8.1.5.ebuild: + Stable for x86, wrt bug #459158 + + 04 Mar 2013; Agostino Sarubbo git-1.8.1.5.ebuild: + Stable for amd64, wrt bug #459158 + +*git-1.8.1.5 (01 Mar 2013) + + 01 Mar 2013; Robin H. Johnson +git-1.8.1.5.ebuild: + Bump. + + 24 Feb 2013; Agostino Sarubbo git-1.7.12.4.ebuild: + Stable for sh, wrt bug #436704 + + 22 Feb 2013; Zac Medico git-1.8.1.2.ebuild, + git-1.8.1.4.ebuild, git-9999.ebuild: + Add ~arm-linux keywords. + +*git-1.8.1.4 (20 Feb 2013) + + 20 Feb 2013; Robin H. Johnson +git-1.8.1.4.ebuild: + Bump. + + 20 Feb 2013; Agostino Sarubbo git-1.7.12.4.ebuild: + Stable for s390, wrt bug #436704 29 Jan 2013; Fabian Groffen git-1.8.0.2.ebuild, git-1.8.1.2.ebuild: diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest index f5f4932df6..66531e62eb 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/Manifest @@ -12,69 +12,58 @@ AUX git-1.7.3.2-interix.patch 2283 SHA256 13dc741c481fcba6db060bbc8b54d0e19350c9 AUX git-1.7.3.4-avoid-shell-issues.patch 1165 SHA256 7dd0eef0b93ed52e1c744d2d1888387c0aafecbdaf2d889c8ad48f45ed68d5d5 SHA512 4f594688c8af3b31d323e33531ddfbb171a98fa6b6b42a9b6587dff510ba0c12b46b49b6272f296850467a5ce813853bf4596719230cb9ad0828ffd32353f466 WHIRLPOOL 7d61a65c2304f7c21c90ec266c1990dccf5670f9ada26087b6ea5f8cef0f3db07b1ee897705ffd60815ab47e31a2c93fd0cc6536f522c3bfe7d5136dcb8e1c67 AUX git-1.7.3.4-fix-perl-test-prereq.patch 1396 SHA256 a339767c3d3b8eb6b06adc54a68eb978884a114947ff04c56e6dcad920c0b75a SHA512 a2a5daf83cfc9a1b8866aba60cf0eeb40a5ced11e47e4d34ce560ee9114e638aef0fa2786cecfc0e65d8677c2ed28eeb990a6f1c25efe195fef3f669d71b9b1d WHIRLPOOL 0e29d8a8976998dda5fbae52adfb33c74fb6f063775f98dae1155e6f5d04de07e301c453aeda084c813f9ef615a740c6852b7cdeaa987f3200b9a44d40ca37ca AUX git-1.7.3.5-optional-cvs.patch 11606 SHA256 e6d10a52783333839b12dd0574bd43ccca7bc4c5991d371fc464c4a352bab9f0 SHA512 b5ba920fa067005361ba7abe98f0d771d0d4847e45460e211e4b90857079f3da3efcabfef547061a3767cfe443c49da7fb0d93109d9e62a67863558c434c9c44 WHIRLPOOL 89a23a38facd01ed16ec62a072d677345eb3b363b3f4efe1ae6f7832f30f76ec2e1e3c38fb6ab57aefae09079fea73af919ba46484ea7d8adf0ea30fc318bafe +AUX git-1.8.2-optional-cvs.patch 11737 SHA256 37e092ca2dfa3ec216df568c1439acb3bdcc7366b75feb092f39642fc5894ce4 SHA512 7f914f16efee2f81a6f42a0e7ff1d72094bf032e98fa1a22f4b1e848eebf3a056ccdea1c84b24310cff4f19737b336d79a4f9c098a0ac4b0556e1a74708ef870 WHIRLPOOL d5e66fbfe0a6ae6c956ffb886d66c7a7906a3d60eac43b87d1e40206197f58d9aed54ee57cf5bb592147b7b9ac50fe50996f3b7e94161e5e308567c3a108cf43 +AUX git-1.8.2-texinfo.patch 515 SHA256 86d60eeae9a21fa64047401b80a5e082b0f306a68efab139979bc979fb31830f SHA512 9a9920f6b2d170f3ca71ae4c35cb001252e5f43e087f5b49f9aa617606fb3b7173aea5ef91c5d195b36bf1a1964e936d777797e03642a0da55a596e68c13a29c WHIRLPOOL 9e66c94c5eac4fe22f7cdd400c68893368a21550a5aadd467c53591e62bcf146d6a08db1e7a3cb8b32a45d5568c0b7a7462a0c6f8709ea35a284845a2c5e5820 AUX git-daemon.confd 712 SHA256 9bf02170dcf73e930a992adf44326ed7c27159d41a503ca4d9371861ee5030c9 SHA512 bf715ce0d3cd6a5be405d7739bc06252b95f93f9874716dadf666d33063be6ab3e37ae1ee253ed291bfb4f66df268b44d9653672851e1bb40112c0aae08fc4ea WHIRLPOOL 13643f53cd2f9675867ff194d680cd8ffe91bccbd0b15ae41b45471ec7310c09af8335619ff2a1562a835d8449eb44f9a9e9453c3ba15005763497c668d59181 AUX git-daemon.initd 738 SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b SHA512 2b1cff1e1bf85db1674bd130639a7557fd4bb1ee2e9b2e7d1e2dc28274b6fa6c6c150acf37d0e652173980c640cb0f7ac36332012182955ecc4d21c6258bfd4d WHIRLPOOL c47dd7d0f3b183e14f3ca4e499b1ceef0b88f11675c7f6dee225516f062f556bfd41aa7f87d6cdf490411101ae541ab5fe173069dbfab6b1473a2b3d951ce901 +AUX git-daemon.socket 116 SHA256 66a064b67e441306bf765d3d3115ac55bafa2098400af134f852d4aecf8608d7 SHA512 e383d358999ea0c7201c1709015a9b7c4dd9dd71287605640aca837fac1e2ee33a5a1684e1c3414c08742605f185b722f4864afd5be8b79a9f0d8f7ae0f9b701 WHIRLPOOL 1098e46b6d2be3c8d758a087408aed91e0c01625542dfc90fbff80ed8b40d2a54ea4ab45b4d003ef0b0b8ed1411e1146a58076b68096389412a61fe2d09214dd AUX git-daemon.xinetd 260 SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67 SHA512 5e0c85004e7e2b89fd191350022b9970a6ca03129b4c913e159570b99b5797ab924f667cd3dc5693a9d4916b7b5cf36814eda015dbdf46a1354eb50d1c081f9c WHIRLPOOL 155bfca2c071d5368de09412d1d937cefd3b5cd28a991b99845551738440b92791c33a67ef41be711dbf06fc4faf4a299cbaf1f410b119fe5deb5a4cd741803d +AUX git-daemon_at.service 395 SHA256 c427e37d3e859c13f9441b20c7cb6aba7bca048cb70809ee1253726e733fac7d SHA512 4931954564ae7d2e21e49c8f251bae7c6be8a420f75e68e23214c85993dceb81b719e5fee11366b82b28ef5fa27a9ae2b2faa5c79c16d367c6d50fb03bbd0cff WHIRLPOOL a18f8fe6755c85e8d332d989637105d7842e8fc107a263dd0252e34e30dca21aaff593041bca3f0a728b995f19310d3cab8c43e2a7524ee9e612cca03c7ffccf DIST git-1.6.4.5.tar.bz2 2176867 SHA256 5e570a62d443a32ef013561817b87b4e8968407e95905716efdff8866a1ba445 SHA512 636e15da90a9f87eca63fc6da2ffb7ffe8d277fc140e126a1d902580354abdf70d7f0342503b191e1357db9850e746e8bab99dd5a9ae766d711ff1bb55badab5 WHIRLPOOL 84ac791c4903a8eaf2c39191f70fb4e41bb33ad0773f65444bafae043c5878ec03bf798f866638ee74688dde92e9a2ff505e899153fe4ebf5d6d93c7f9674e52 -DIST git-1.7.12.3.tar.gz 4109011 SHA256 5d0959c316a2cdebaaf72cf27ac87d2e5616596a530dddeeb3a961c615494094 SHA512 30e44686b8f8c49f2ed741cf111915b2a1b90b9e4d9aff0f725ba224186693b610dbbb976a7c03c51fd2d1459431dc51e13f60f909a5043f63be80f6d39901e6 WHIRLPOOL e5d20348deae89f65f948dd03e205430cecc540ba8284ac22e0df9c891de8a3dffad1f7d2d1fdcc74571d30d7bc66eb0238dbcc296309dc858aceaa52e052aa1 DIST git-1.7.12.4.tar.gz 4109554 SHA256 17e545929c16b5efa8fa9545936297d41571521cd7667fb74f92bd7adc8b63da SHA512 5d0d743475410b83340cc335e6989fd5c52d583a3549f253be504d2e06dcb9dfba08c52752c5650c3fd3b8115b7ae7c073a13d06b510a983f66b5bfa8439ca6d WHIRLPOOL 892a7c75957b5d19b23246bd31e28d179d149ac78741a0d7c8f3470373e84a8dd653a85d2a4cc68ddbf31e170230fffdf46aaa5b4158b554015b4ec0dd72a0ad -DIST git-1.7.12.tar.gz 4092043 SHA256 3b8661782dc280d3d4be5193bcb8a1895c1ba272cf02efb70857bbcc4415f505 SHA512 1353eca72d664bcceb900bbe90003ceb2b8f73db8e3a402e8f2c142f3e933fc19f95c4c5118a1c57221d6513dba3e1912f40169cf36ff8abea97dbf2f8e84502 WHIRLPOOL 11ede1f8383136d0ace13c99e7345c738e911f8038e09cad0aaf8e7cbba789d753b5c337f053b3a145d6a35d29285558571b893fa9f3bc6ac76ec8e25c4fc4f8 DIST git-1.7.2.5.tar.bz2 2561345 SHA256 d84e6d76fe9d30af5515ea8177b0d8bfe774ee0836d21ed450cb4d52f5aa6311 SHA512 b78e59ea0b110c24121116abbbc191910ba8feae9ca2c89d661abc456cadfa21e42bdc72c961a94a46b47b20f64cd8bf23d0ed600ae40afb8572eb3455ea3ea4 WHIRLPOOL 36dc12f00c84f339502f9b3104a183e855e2b7eb5e11ef46c162804df0613dada52a237f1854177909ddd7d29bf9f317e3dfb6fe223f3e18db4518e7c35a6a1c DIST git-1.7.3.4.tar.bz2 2635522 SHA256 3e5e2b6547ee4aae82b4c5f589ff084996e9e6e0e2b52c92365e6baa1e4a0171 SHA512 93cb7a86020488bcb1e367442978c1f2c57be0c623f2f8d7d5cf385fcf2e43fff03354b18985e1560ef807f05d251ea1041440b09216408863cbc1ab7510a09a WHIRLPOOL bbe4f3c71d5322749203eec852aba838f591d24abcdc09949d0727155fa9ecdad9cc127de998173fc3e35459440d173317fda456822645f73c52c28fa37bcfd8 DIST git-1.7.8.6.tar.gz 3546112 SHA256 45be602d0ca64eb44282cec7a5a7286487f7e9ed0c8112735456a22fdf1f6db9 SHA512 84b0341d040a0f99a40d2d316498a964cf386818673ccf04aacb3b2a7e3c09b275f819a7cd9746dec67e1d0300e13fe5706a57c94ae2d26fd1b82e9b93f405ae WHIRLPOOL 804e70176a229123e09348b6585a461bc162edf9786d617926f42fdab6e615ffba9a9b2b6654562d9757e96bdb3603aaa2ee78ac8c0f124d413409b0fcc7cfa8 DIST git-1.8.0.2.tar.gz 4231410 SHA256 c06d5d29389e90583d16ec41d5be931593196f6842f9b14e910a0b5781c10e07 SHA512 b278eed9571f2d6449aef18f94fe0937c2f54d1ad9bc2a6b54d3082b550e1377b896aeb412438991219c454179b2590241b37e8ddfcf7096fe49bca564956779 WHIRLPOOL f61474fd1a7a76cb64c1202ff4270e0e84dfd82165eeeefda454127a69e778763c124da899ae0d95d9e737872f1bbbd46f66d9aa0d6d6cad1aa065001c6cc711 -DIST git-1.8.0.tar.gz 4225055 SHA256 ccc32f18ea12ea730a7d1d9d3d7bf51447439299a99d4d326f49f1f8bb488974 SHA512 9b251a77db39eb17a670c4b9673d20d256744edabfdd304656b083c523f9e41d063ada9002f399a81ddc8b7684af788ded59e1362affa15f7b56ccc5db15fd51 WHIRLPOOL cf771ef5633a8a4e652f4226d6eaeb75673e922d35a71e66a7bce0deb6de1bd74a0192f7cda63e0fba8c0df0c36878609efb989914ac7ecfb172f906e7d218c2 -DIST git-1.8.1.1.tar.gz 4295398 SHA256 8b5bd081dc38f3e14acc86f234231a9a46d1e9a990c8c732aed6856d2714dff6 SHA512 75a75f97206e3150f1d7a31dea9aec002494ae10831cd0022f8ae32f0273b12ea162e1e25d31946b4f7287dd6f486a2fc9947ad3a40b08346a85ff68e5a8a19a WHIRLPOOL c2adbd9d543c0058216e69134fe0b7cd73cd4136d3820ef07f755e7c6b8eaf6b23e0da4a8414c8c070a64711692ca7481ccfca590d858d59ee582a0dcf2783a0 -DIST git-1.8.1.2.tar.gz 4297221 SHA256 07d210a37deec465b4d00e4907c732dee5c5d23c7d90c1b582e7ab754bcf24c7 SHA512 de74961d14d4220393f015aed81b6fcd2da6939381ccf7b455a89e9ef41a74e8aa39d8772a8a20ae3c2067247c0d137ac56a413c6bb044f80bfadeb6174e835f WHIRLPOOL 5d3b24d2968e7f11a082be1d1bfd5d0928d16843e2caacf9bd08ace674a2a666ca0e98442dadc6e638a877891e4460ff75a116d4f9985f3e4b2b407b7945ad9a -DIST git-1.8.1.tar.gz 4298533 SHA256 285cc1a9c8751ea62fa568e2462f286fa535e0d847f06ae686c8180e53360c2e SHA512 dab54534c200413ae45726dad7aab53f2debe5642f4e613ae3d9901a08a918a66c6ba531a779ea0c73240b38158f071a7e98b9da3c4add33beb7fd37b9eeebcd WHIRLPOOL 2c9f8514c51acd815e776148e06661b542e31c19561880772c8baa5bb10c77a72bb1d787cc1606a713d7b0eb8180f5942147690903212d33d837740d66059a41 +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.3.tar.gz 1797128 SHA256 ec8e10b989e8f94d1607ecece7d4a2e91fa07e5f47e02944fdab3b7904f51a3f SHA512 cc4a4763ee3c34dbeea2df59401f9d927e10a4db9c6c1ea13ff62b9ae12b88e24b6ad19f98cdc7d287e8dd7d634d145eda369c6ec387854f902d8eb0022c2b61 WHIRLPOOL 4f40a391041e34e7c648deee31464b73cc6d58ef84f9f9ff666fc9f517e186c5df281f576536be8b14015ca49ce7011e8f29182dd06b56ef7a83897316d2b6b0 DIST git-htmldocs-1.7.12.4.tar.gz 1798333 SHA256 580de99c9fd8bed49132cf137af643d64e1450a7917b77c1343a784048a95930 SHA512 fddd27cc98ef1d263aa663655f778dd708223bbddc792098548f0ae68981eccd0427007c82c011e9eb5c860272bd65a4f4032e46f77ec8cf16f051814092585c WHIRLPOOL 1d1feaccf6006e9b880964cddce0565a7fc6bf8f8c96198fd0dd4e48de165718a7a63f5c44b61cd1b40e7f080b8c495fcd9cba5749684f5e255b7fb8eb252552 -DIST git-htmldocs-1.7.12.tar.gz 1787511 SHA256 7f58468a20ca7f7d225698d0747902c34f891c88df6beff270b739d6adf4d271 SHA512 6f76f5a2b1bccaddf2ff48a0454c8710c74a197d1ff60bd081fbd67c8c0b3baf21ee2d6c6c27b9cfdc975ce14550be3482241540da6cafa0761c291fd40cc46d WHIRLPOOL 1bd554a612afc58486fc1db4e7fc5cb8d110eb4a6d3eaffc757031248a17421796015f086fe3509b183e64bd84a656623ca8e3fa83ae72078dfdce8159121473 DIST git-htmldocs-1.7.2.5.tar.bz2 919247 SHA256 6b6291ffad4eae80d2739acdffffdd6293b9e50366cfa53ffb0c3a1427700337 SHA512 e8b2bc14b1a687f76256dfcfae893252b091c6d60dcd0fc53da50ceaee1434d5c976f1d09d45f8cc5a2991a9051ee8d0482a281fe7559225b6c750fe241b713c WHIRLPOOL d1ea7a272ba728e01523439ac897e1ecbc22917aceaa8871ade522d18db37df0d305fd3dd1782ef20dc1c935ec3965ebbe86d4cc29419a9e82aee831002eabed DIST git-htmldocs-1.7.3.4.tar.bz2 929858 SHA256 24f03bcd6b5c3745c2395cf49260cdbf7fe80292883b0b4da3e1ac636aee6fba SHA512 3cda317a0608ef1ee18752fd9f0cba8bc91c3f5d66e0e1d8ee4beb63b7e50dd562721fe53bde3244528a915ad463fc60d13896f3344a7679256c11c79fdb33e4 WHIRLPOOL b83941afd6aaafa5354711fdeefa5cbce7e2b255c0ccab411f94dee48d97838fd7224d098c085eec5e1dfd3eb0599b1a39c8cddeeb1b727a15a2398d4c4b6d11 DIST git-htmldocs-1.7.8.6.tar.gz 1688622 SHA256 7c7447fe136349b1807caba1c00fe6a46866c9b54cba068f322967c0f8b2c0bf SHA512 31a88363aad7a20a5633530a080258807ef52c1a4074dd308d00540f1dc2b6e1c68d1bb43fa55b14b0fff5e3c24034a15debc9236ad3a2eafa8440982a5462cd WHIRLPOOL a8bc612b3d3a453eb46cc7a79fd929b2ac1c9858a52b3687c59fd113c582c4330f44e1dd64f5c4b755ab49aefc03295a19c440af12001f2f42e5ab1836775f7f DIST git-htmldocs-1.8.0.2.tar.gz 1809932 SHA256 edba4dcc9dc131b32ba05d5cb9334a9ba7af3ca6c91795068b56d7e0d3b0f43a SHA512 f63f8b1e9efd96a5450ef5b31be992fe49fb5c8de8f79d9835ff5884dc4a4ba9e87c8c7f8e59e67250df880ee7221d2e4de754bd0af5d86a117bd4ee5d306dae WHIRLPOOL bc5508ae94024157ef1fb2fe19269eaa5189bb41a603390ec5d61ce9547ae9f68cad49a7b4b3da47f09a9a9a8258c8e76fab1fd03a222454fe48e4288524641c -DIST git-htmldocs-1.8.0.tar.gz 1807615 SHA256 b5837f19815c5259355fc2ac1ea320bd869680218b82b9a0802ca015c0e24363 SHA512 bb3315640595e384b206af2e40aa82b80e50327da1792e72536754892aa6037b7624681e5a1142461019f5382a60247f1c4480e0a049bdd8d5308fa5ec1588a1 WHIRLPOOL 18024bfa6343cfe2c3bbbb3a9ea7221ef587cc09bb1c82f9466f846698abf2bbc1844806db0c73a14cf9eb623e406b0d6a1e19bb2022ddcfb861bb18ddeb835d -DIST git-htmldocs-1.8.1.1.tar.gz 2051039 SHA256 6a1a9369c68a41544376677d5317f89c1720ee40cca645eeddb04c0a5b733763 SHA512 12e06ea3f1bd923994e53ca52ff394b563e8d00bd3af2ab015bddc87deaf00a81697e03586d95b67700b17feb22cee0b2ae98cf0d54addf997bdd7a3b16fffa6 WHIRLPOOL 86d43d96a5bb7526542ebe4ad7ce52889e1170ad073b2259f0adb65eb5e35255422d1affdfedfd5c987553e5db61a82a75b915f0bead97310bf71fd37dfd97ad -DIST git-htmldocs-1.8.1.2.tar.gz 2051331 SHA256 280a8a2980822ea7cf69b5b25c5d45028004f1d454998984e97feded16e6443e SHA512 e1e5611b3ca86b1514f3d6585207b2c16803e64f047c140d5a3115bf3ca4f97950b58c00f54ceda62fe7810e7243c7944540c4681d73a9ec0d22515c1c5e60a6 WHIRLPOOL 0d4fd321202cac4bdaa76ee6325e33fa7fffb7f8a8207ad76659ed1f17f95d8d7629149b07764d847a931756b3fc4176e7d2cee16c9ab4b6843d4b00c3cf3b19 -DIST git-htmldocs-1.8.1.tar.gz 2050088 SHA256 a2de50dcb0825e00ccd8a93f036adc5540b4d7062f6799f056aa543cd53747ac SHA512 d8ffbbd5c9655620ce23a2916f6227ba9435f2b5fb26f9a61d6fe1a780cddeb0a7be13559677dc8e18bb90b7cc2b5be5386743b135c119c9faa44114b2fa849b WHIRLPOOL 47dcfe212205f7171e87f36f4e6edbc9b8f37e257c4ae71d54f09d854a2f8fea7f48c8041b51c86dcea457c2dfdc334bcd0bfd25ed7036dc79949db3a7915303 +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.3.tar.gz 521149 SHA256 fa85885f813c5081071629e3dd8832cad730b8e481f33e9cbb00edfb3af4f24f SHA512 f91bf027d59046507ae98f36066bddf61bcf10121674557efe7a497c992a1efd993835c6acdbf1a4fe4aef1364556e00e66fce2dcb162b26bd3fe3109ab83001 WHIRLPOOL a2d40a46b4566157a5987c2f5af6e68528b29ea54fb842922182a1b0de7e45b8b8b10ca0221694f4e730a6e01b902869f3566155d81a4db8297c49a089a3c175 DIST git-manpages-1.7.12.4.tar.gz 521602 SHA256 4075b60250f9bc5b5323266764c889f028521dbe1f5c10f470a167cc75105005 SHA512 0cabb41e7e599111c64f3382d4688891d1c76c5550ad27a08b6ca2e62fe826b971fa757a6a815731b8b88d1302ea886f199944497a0a10fbbfea41eafae50512 WHIRLPOOL c33b93023feab4a5f6f63cab5cb1e82e42f2fc14bd590ced246ebfc45311e3ff93855864f521af12916bde58ac4fe2ccb055e667936e85883192dd0904873735 -DIST git-manpages-1.7.12.tar.gz 517802 SHA256 146a4e0899a028fd4256654e472ecfe3bef995fb029ea71c35ff9618f14dc127 SHA512 bc407311884e343a550f3280fd48efc8acf63d7682ad9b787c79f64de6268da3183ad9fb09d8354b3c1b8b76539e28d40aee595a5a49cfe9f6c1c147e52ba1be WHIRLPOOL 3fef3a1187574abcfc583a1fddd160fa0512f3466d58420442ca11afc15acc6c0343dd08a05f265fd44b51eb0c1fc5728a2b8cc7b647fcbd3fb3e8529dd47e5a DIST git-manpages-1.7.2.5.tar.bz2 289543 SHA256 a42a977a1ecfd3cea62e1f02fc89f57029a94f163ff7205f6a56ab4b67d6bd6e SHA512 b4065ef9ed7beb84d56fdfeadf9608c0b6bd36a06460b68ba575583062612f469e7db1d08c232f3a9253ca0b957bacc508fd4ec702070eb4c84d174af1828ab9 WHIRLPOOL d22249c22ad9da862cb842e37463cff3a7967de70441a851640641d78d185da916db9f3d3fec328bc10e48bc318b2b4fa085fae81c2576a758dededf153cc78b DIST git-manpages-1.7.3.4.tar.bz2 294381 SHA256 2ff98641bc655b29a7fb72bced46da09c99b6fad3b651722b7b8057df4a9ce75 SHA512 d73e3d11a0b551d35cfb3fbc214ecec34ea7cb79e11e9453be5dd7c649f7fd93b7ab286590cb6101d5f011b35ee0469443325cd9636520717dc15057f34c413d WHIRLPOOL b17d6e9fefdb02faf4a33ad7ca4707432274e0a929e274d5347fb9917250e76295f2d28da930dff16d9cee4a5fc6fdfbf5b9b700a6d8fdcc218df6ded5088c1a DIST git-manpages-1.7.8.6.tar.gz 501678 SHA256 559b7a6ba8eaad655d725765b75aff9c6a5aaed2cc77abcdd2f88c773a0b3a6d SHA512 925c1775e0d57ee832c0794a8adaa5ebe332556358dbe75cedf9298d1f2e39b31e43693d8873667fdd1795e9e7dd71be83880d78d6ff6454959f325fc518bd88 WHIRLPOOL 2ef274e721013070440f8addbc4fd5cfb886db3b78f3a961bf7add2864e9ae609340ca26de88e3edcbd7513ebab1f46ef8d25d3e06bfe760233afdb1d7ccba4a DIST git-manpages-1.8.0.2.tar.gz 523757 SHA256 b04f0e7277927e8fb91c1c1f7b951b6d2770cfa6a7b69145462214954751be98 SHA512 0d443a1fd6f8b234012e33b5b5cd2bb83a6d0d9ae72b623a2fbc96163fc5b6c727c34094e87166559669afdf2d26af3681ebbb68ecfec33a949968a07a47c9d0 WHIRLPOOL 80f80a4e60dcf7ad15a09ccfc9e17b66b00dae0da41ca7a46891483572e3f720c574f5a7626670f6eabe3ee6d08283f072d6b794de06233382968977a9248a25 -DIST git-manpages-1.8.0.tar.gz 523324 SHA256 8914907f9d22b9a6a0ade9a8addda9a84a2db35b23cbd404f2682cebc9114205 SHA512 651b876c3c9253b1b8e7e9209af448d04606b67cf1933d5509ca9c91833477e4b6f620a775fbd961d90bed371aba3ce3976d6316c0cb904df11e210f9f9f3096 WHIRLPOOL 34de3e23b74a1305ab97d41681f114802bdb492fa40152f522627a292f61b690d33658fe1770579decf3c5c8d98315962bf9156785ce44eec0a26171a96be1b4 -DIST git-manpages-1.8.1.1.tar.gz 528447 SHA256 6db801dd94d78ebd3e6d46b3b09ec8c470f7138389e45758b0fc6d3ff5a32506 SHA512 9939e5a3292d4dd30cf8dadd4d82ef6ec421ffa62c82d5b8325b54766b7da85a2f00648130156fbb136928eee763f1817cfde8d1bbce39e24664dbb17b168a1e WHIRLPOOL ac21e1f6ab4fa5dd9ca726deeecadd1db4f1b85b83e4a2a1b5a8b7b80e115fbd36088362b37bb99fc99c6a89a749434102eba9f1e25e040090acaa9971774874 -DIST git-manpages-1.8.1.2.tar.gz 528481 SHA256 2612e79bc5437c6bd77b9a131474d8ca35e19d7173f13f301b4ee0511bf3df7a SHA512 a0e3d2db91ad548e13eb30c2abd8dcbf46819228c7f6bb836d55d0a0082c10e6dece0463b88e320aabe700297dbe20e15817f991989c639b0059faf6ac4a4fe7 WHIRLPOOL d3877b4a7d2e96835024aae6e7ea05f518c7d8d2489bea187490ba048dfca94056cff46aed5df2eb40d28f570923f829b87b387cc0852662691c6228dc05ee9b -DIST git-manpages-1.8.1.tar.gz 528158 SHA256 c0be93b4bd611776a560ad37954131a8dc1f91b8ca66be9c159137c8fef44ce9 SHA512 45b2aca5953dad6786e8f42c7989131d39c97c69d483c5cded361bb0f80bf8583aa04baa576c0066225ffe28164cbf4068761c33b9c5fde991544f501e789045 WHIRLPOOL d745d99974bba1e2d3ed5095bbdc8b8381234829648ea7fb4cd9a35f9e9d4b809a8057994966e7a14ff490f53bb30b301d1464ccb793be101c649485131c15c1 +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-r1.ebuild 14856 SHA256 c51ae3be2cf004e4bf93e017536c49a362779f6816760893d5eb756eafaa56d9 SHA512 e44fe720b85578e5aaa4aba2cb764d6f56c0e0e2391432467148b6e748e821f15f503d61e91c4e0b7e78cf614f6b0c30fd0d2899110ad76890d9e55497d6d48b WHIRLPOOL 6ae32308494ed13f0234674d54f69c09726fb7ecd8f3210558466879cd7a8238102169a9ae81e55375f09b727d3088f326498663f309018fd36ab670b3cf2825 -EBUILD git-1.7.12-r2.ebuild 15335 SHA256 3bd160e0485c7458886ddd6e02f493a3fe04296596addc518c142f3eb3938443 SHA512 daad7ccfcf22f3b344e5e1c54aa1ed4eddc287f035b087e9353e6b30750e87ce4a1f190b9a36aeba77692006540020df0a4ee93ea6b314d5dcb52c05e7814a8d WHIRLPOOL 4071828a04c4d5579071bc3ac63a62522bc39a85314ab8908e96d32e18ac2df59624c56fae91766398c3950027c4f44735bcd9038a9e9b2e13cdc16f6ea429df -EBUILD git-1.7.12.3-r1.ebuild 15337 SHA256 059ec95ba4c6cb4e6ef0317d2d88744fed542e4266e55d2e379be1bde8e742ff SHA512 c35001c3284205caeec91f8b49e0b90d56fceacdb06305161781ba2cb9d8bc01640de0420ac05f974e6e611e4b91cb926d0aa926145857a561eaba6e354307ba WHIRLPOOL ef47675fd5d5042b57a37a9cef6a0b42e059eb8016f65fceac68a15aa396c8d3e3e641ce910139ae96300c090700771336466e49c9d7cbbc82dc718446ac5a15 -EBUILD git-1.7.12.3.ebuild 14855 SHA256 b44d4b0d3bb7d2a12edeeab886bb97719507e6c9fe73636a97a3ecba9c032352 SHA512 83798fa66c1dfdb1bf757b79b72ce65f14a2fd11d1f97b7de126235badcd39d32d31b86e468273ae868bb20ef7f9f95a2f4b62b0f597a6f2c8b3a161aec4f91a WHIRLPOOL 4e25cc0401212ad764bc2d7b81106e160bba33a0d679e40ca598f8042b9054e3a3cfbb8c51f2e5fb8d81e0353e899e71f6f4da5cd98b73260f94247e40b5b70f -EBUILD git-1.7.12.4.ebuild 15322 SHA256 411851e74c44ca9145a019a13ab942df170a04dec8d4f255a2a9b809ba8b4d0e SHA512 6971116ad7c9c80846450a48d95b588fc964f1405aff2f3b3e47c65e1fad03843562eb9f48596810e2f549d8c63ad1e14bd0fea40ff1586c46b6925e8a59dd7d WHIRLPOOL b50f86dfe069783b46d248e8192073a832f314d6b24b6fce076e23ccb383b90e33ccc1bdfb1c45962db0aaf7db6eb4abd004706e2a0382cd915a3728b1a9f2f4 -EBUILD git-1.7.12.ebuild 14828 SHA256 393fe7d27e3df45627618bae9b23b32cd4a08d25a8e0fd50cdedfaa340e59339 SHA512 9b40b70e9c0a5dc0e6f2f732109c0665404dc4e8fff28bcb82ba6c4a19e68860e20aaed052affab8787dccb0c36e13d285dfd72ccc48e5822b5e33207620f374 WHIRLPOOL ff90b0c37a04eb8102f7e2177cd43b3776e80c4bc57ae914fb1427a3daebfd44d1aa929e37f25c9b65c26ad10da60ebc925d98128788a874428397f540e2b201 +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 EBUILD git-1.7.3.4-r1.ebuild 14028 SHA256 61d5e1bcdf37f4d5cb93e32780642a25352ceec58ad5f418717c9e4ae40138eb SHA512 d9fd0f1e72dbee3e07aeb6d6e736af00f56a999ceb85ea318d65213f3b78879a95e1a2e0fbfcb5988103dd4fcddf34135e826f629e62f98b0a175154c5ba9a3d WHIRLPOOL d9942dd6e7b066f06d1347895f0840d610a402ca611edc044afbd786ef96bc4d87b831e6cd5f87ccf2a49e17f3e805f1559cf03304f2a3af0dbde544b3f33dd0 EBUILD git-1.7.8.6.ebuild 14683 SHA256 38f21df5f6abefb90ce93129adacf4b307decd48417d6830eced6ec0b595cbd0 SHA512 7ef0bc6125d06100636bfc15fef7d0cacef08f2c9a75beaa7331f1e5c5e06a7cd96f84b0ec975be8fd290efccaf0b9e40edb524063a2a9bfe69870bd2b2c9185 WHIRLPOOL 06ed98a81369963955aafa2186b30fa64ec544f8f1b268c7bb228d83c0e371e70223a69f7ed69da7df47ddc1a10459c40f36e3b2659d9c85c57e0dc036870d9c -EBUILD git-1.8.0-r1.ebuild 17164 SHA256 206b245eb27acd8ba62c999657f99b38e3d472d18833130518ced2c0e0febe69 SHA512 437f8cf3f79daa801fa34c28a7820acf8121bd35afd770619c1170bde6170b94fbe938e42264fc79fd427283feb3a6e6b1c07afa56709ecd3198cb6d18ef7e35 WHIRLPOOL e70384099765804b5b6a8e8803cfce9493f18623b1c96316d32b8b73d50c9d30c1a3644007727d91326903437ba6664029133845a3583eb60f0530244db297b2 EBUILD git-1.8.0.2.ebuild 17163 SHA256 931df741e5eeccee8c67048dd07074777228a6cb4321518a8150a13fd5ec00f0 SHA512 077d8dace76b90c7486d6e3cdb6d8691a4d6634107c69e672a6c7eb105921265b5b545fa727ca8426f069ecac4decc1b9873da689ef0f15623064a5df497053f WHIRLPOOL 0c46e4baae87498094750fb75dd500e4af8d9c7e2c1c3c4394b45bc78bd91a0cfa73ae20384297799bd2763fd7527be6609c60a92a5e4ce3fa997fea61703e86 -EBUILD git-1.8.0.ebuild 15358 SHA256 d14583eae36328c2c0cb910e371ef2a1041c12b42be58c778e21b6096edbd880 SHA512 258b3c503c2e605689753447f59770e5d3baaf2d781affb8723a30707b901f39c6a42bcb49253251e686d60fc2ab63cf9eb53194d6c6fdab20f23726726ebc90 WHIRLPOOL 7b1414b53c20faa05086e7af84a92dc0e622cd27d56edb80e4d02b07c23c12a69449d079762543399ae9fc2d625ffd1b0cf1ff6d2078392d4bb862fd4a3a51db -EBUILD git-1.8.1.1.ebuild 17163 SHA256 a1e43cacdcf26c1d587cd273b295509d43884b535075d62b85d1ac2651990b8f SHA512 903a113e39865ebe512cf6953b558c8d6006b774d350b1b81e1bc08be8da5cc19ce5e5b7cf1c863ac206eb51f7e8d340d89873d9dfb5a09033545448407d6c72 WHIRLPOOL 427ad662b66823b12c0d66dbe552aca76a1d44d3dc5cd969bf513d6b16d65842a788e48ee88ae3609c86e6a081acca5b9c3a7537950e65c34c91cd36b82c06b4 -EBUILD git-1.8.1.2.ebuild 17192 SHA256 9f091689a3976a53ba79348dfe87ae181e463068378802a56b9954b2a2e4c099 SHA512 73db3e4a260daad3430ee0f4f45688eab478dda0d7f8b65a7809ca43600b197a93718cc90e7964dd70f5a43ffeb18f80f08bc3807eaf421396436627324e4c06 WHIRLPOOL dacc5fe257f929c4e354cb65082a759c4cce7113afc569564fe3bc2f4d8506d24195ebf0f9f21da16a6566de13d3c47d470a8dbaa136e529b6d63ff36ceee14c -EBUILD git-1.8.1.ebuild 17161 SHA256 b2bc65db13265937f222bf10267610b8cd7eabd2eff244140255843518d878ec SHA512 a5e9d6d30f0ccc0438eca4d7f2d48e3fa2e76af1c10be18ccc5dfd6232a343bebc5a4e07373cba5c7feebc84c13ec709148dddd4d8e96ee5a7ab086a5f366066 WHIRLPOOL 7bb1d14736c3ec53a25af2059adf3c3ecdcff26415bb7ca5c0a7522072489aa602715d6e514893e0ecda3d9d2131cf66ad7d81be0e0100acb5afc15fce506e96 -EBUILD git-9999.ebuild 17161 SHA256 a9fe07171ea5f267843c0b070522e0b2c74d78811f51c9fb2beef3925b65570a SHA512 574798b98369b27f1f1bef983a6563523495eb6f33fd9f05bc692ccaaebf86f59ef3bc41cea896a9143b05193d26a46df15b75a94aa9e718f14ce4f4bb20d06c WHIRLPOOL 0b5599824093bd44c259ad56594bbbfbb2ac16d061059835816fd2010b61405021e0aff99466c8d359e92cfaf08c30e6d8d052400defea046877c51d045eddcd -MISC ChangeLog 1764 SHA256 47cc77f71ff057cf8bcb25bc6681317fef3fdc54942377cf03e9895f3002a0a6 SHA512 c491e22e1a9e2e3017b9b51c33f5cde5defab2220af229be0ea1c8b31b445595d362e48b983a137b2af8a6764dc9b7121320e0d11d8d5b346c0fc29ee2831ded WHIRLPOOL 4d5be21d3f094fd2726aca920c986b4ad170deacf5dcc6968128185f73ab05fcac013952875965ee7c841f867ad3818183604a4c35b128f257fcabc7832fbc67 +EBUILD git-1.8.1.5-r1.ebuild 17337 SHA256 5fb64ae2c0b37bb39ce56becdf45ab5eb4b9e6a35d538d8fffd42b7645f26829 SHA512 96503fd2228e510afc9ee2ffcbdbdd68fd6b3919b946295c24c6989e1bbf7f7c543b4e6d4cdb47469f8151e3133f1e9901a02bbc0504f7b131f4ed7c451946ce WHIRLPOOL 1040a3b09f8f467faa45ff8d176a3632718a48a2a8f005aa12f1f2cbc69f53d5579c74d8f24aec8e01f113e9d944e1e22974d1626285f48b51b671dff6b9f95b +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 17375 SHA256 95fc4540e7b551a1d59291584f1ff218227e6a61cc92611b054922eb3c3d066f SHA512 555307d3583ca1d3ce2d377b0c49487bbf2ac83f8bf07bf37ccab249b2fa1b5febdf59e89b98039e4e6b1c53d1f124b52af6530260ccd4c9158b48afefe3de9e WHIRLPOOL d14c1323a977536999f26420b47d57974846f3930e4f069b0fe70e3dea718953673559eee9d8502b3909da4498ee61e4c38fe50374189f8435e578af73f5bd09 +EBUILD git-9999.ebuild 17373 SHA256 6224a06953d5b94837de0ed06710a4ef15dd2530aafb44f608b004b626114a01 SHA512 cb0a303e3d32e0f493b2d43ee5941cb2e810622f9e6e02768fce390d32314c5319bb5b665ec9a2e70cb15b85f80e1119188dbb42c3ae06a3e7f85299809833a8 WHIRLPOOL a061fedd06c1f47254d21414d1556c79f35e514f2a91ef3505814eda02b0852115fa2b2ef409a045464b010ca0291d485726ed2d5a6d775b7fcb391228612f6a +MISC ChangeLog 6252 SHA256 b080c563ff0fcd69ef37fa39af04e26c5293cfe80b599d4bd86e1603c33caf39 SHA512 8886fcd6031c179cefae2c294b445c9508e599fafbcabd2084dd853d5a9685bdbef075c0576ceb1a094d25dd2ae053ad2d6acf5f0b5fb5347b7e630c43c67414 WHIRLPOOL 015d4c27b0a3de37bc92e0cd5c09ff37c84bddf883478809536151b02a3e4869af7a7b61c92977671ca354bf1b46ecf9a6f11d56a96d7927f3b2b2d09ef3ed5c 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.19 (Darwin) +Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlEIKKoACgkQX3X2B8XHTolTuACePjSsteck0PM1qA48ChTvlJfY -MZsAoJWzUjrNwrei133efITZuZ9k+rmL -=m6H2 +iEYEAREIAAYFAlJGqpMACgkQCaWpQKGI+9TjDACfeg1lp9mmerDsM8lTL3Huo1oK +/wAAn3S9CEvGFxl1HsRnk7kwfy9AHIkv +=/YLc -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.2-optional-cvs.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.2-optional-cvs.patch new file mode 100644 index 0000000000..4fa0b3e1ab --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.2-optional-cvs.patch @@ -0,0 +1,369 @@ +From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001 +From: Robin Johnson +Date: Wed, 22 Aug 2012 04:25:06 +0000 +Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface + utilities + +Forward-ported from 1.7.12 to current git.git v1.8.2 + +diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/Makefile git-1.8.2/Makefile +--- git-1.8.2.orig/Makefile 2013-03-13 12:15:22.000000000 -0700 ++++ git-1.8.2/Makefile 2013-03-19 16:58:52.922806111 -0700 +@@ -259,6 +259,8 @@ + # + # Define NO_TCLTK if you do not want Tcl/Tk GUI. + # ++# Define NO_CVS if you do not want any CVS interface utilities. ++# + # The TCL_PATH variable governs the location of the Tcl interpreter + # used to optimize git-gui for your system. Only used if NO_TCLTK + # is not set. Defaults to the bare 'tclsh'. +@@ -431,6 +433,7 @@ + PROGRAM_OBJS = + PROGRAMS = + SCRIPT_PERL = ++SCRIPT_PERL_CVS = + SCRIPT_PYTHON = + SCRIPT_SH = + SCRIPT_LIB = +@@ -471,19 +474,20 @@ + SCRIPT_PERL += git-add--interactive.perl + SCRIPT_PERL += git-difftool.perl + SCRIPT_PERL += git-archimport.perl +-SCRIPT_PERL += git-cvsexportcommit.perl +-SCRIPT_PERL += git-cvsimport.perl +-SCRIPT_PERL += git-cvsserver.perl + SCRIPT_PERL += git-relink.perl + SCRIPT_PERL += git-send-email.perl + SCRIPT_PERL += git-svn.perl + ++SCRIPT_PERL_CVS += git-cvsexportcommit.perl ++SCRIPT_PERL_CVS += git-cvsimport.perl ++SCRIPT_PERL_CVS += git-cvsserver.perl ++ + SCRIPT_PYTHON += git-remote-testpy.py + SCRIPT_PYTHON += git-p4.py + + # Generated files for scripts + SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) +-SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) ++SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) + SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) + + # Individual rules to allow e.g. +@@ -1745,8 +1749,18 @@ + $(QUIET_GEN)$(cmd_munge_script) && \ + mv $@+ $@ + ++_SCRIPT_PERL_BUILD = ++_SCRIPT_PERL_NOBUILD = ++ + ifndef NO_PERL +-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak ++ ++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL) ++ ++ifndef NO_CVS ++_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS) ++else # NO_CVS ++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS) ++endif # NO_CVS + + perl/perl.mak: perl/PM.stamp + +@@ -1758,7 +1772,7 @@ + perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL + $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F) + +-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE ++$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE + $(QUIET_GEN)$(RM) $@ $@+ && \ + INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ + sed -e '1{' \ +@@ -1783,14 +1797,17 @@ + chmod +x $@+ && \ + mv $@+ $@ + else # NO_PERL +-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh ++_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb ++endif # NO_PERL ++ ++# This is any perl scripts that were disabled it might be empty... ++$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh + $(QUIET_GEN)$(RM) $@ $@+ && \ + sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ + -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ + unimplemented.sh >$@+ && \ + chmod +x $@+ && \ + mv $@+ $@ +-endif # NO_PERL + + ifndef NO_PYTHON + $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS +diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9200-git-cvsexportcommit.sh git-1.8.2/t/t9200-git-cvsexportcommit.sh +--- git-1.8.2.orig/t/t9200-git-cvsexportcommit.sh 2013-03-13 12:15:22.000000000 -0700 ++++ git-1.8.2/t/t9200-git-cvsexportcommit.sh 2013-03-19 16:56:29.124993905 -0700 +@@ -12,6 +12,11 @@ + test_done + fi + ++if ! test_have_prereq CVS; then ++ skip_all='skipping git cvsexportcommit tests, cvs not available' ++ test_done ++fi ++ + cvs >/dev/null 2>&1 + if test $? -ne 1 + then +diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9400-git-cvsserver-server.sh git-1.8.2/t/t9400-git-cvsserver-server.sh +--- git-1.8.2.orig/t/t9400-git-cvsserver-server.sh 2013-03-13 12:15:22.000000000 -0700 ++++ git-1.8.2/t/t9400-git-cvsserver-server.sh 2013-03-19 16:56:29.124993905 -0700 +@@ -11,9 +11,15 @@ + . ./test-lib.sh + + if ! test_have_prereq PERL; then +- skip_all='skipping git cvsserver tests, perl not available' ++ skip_all='skipping git-cvsserver tests, perl not available' + test_done + fi ++ ++if ! test_have_prereq CVS; then ++ skip_all='skipping git-cvsserver tests, cvs not available' ++ test_done ++fi ++ + cvs >/dev/null 2>&1 + if test $? -ne 1 + then +diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9401-git-cvsserver-crlf.sh git-1.8.2/t/t9401-git-cvsserver-crlf.sh +--- git-1.8.2.orig/t/t9401-git-cvsserver-crlf.sh 2013-03-13 12:15:22.000000000 -0700 ++++ git-1.8.2/t/t9401-git-cvsserver-crlf.sh 2013-03-19 16:56:29.125993925 -0700 +@@ -57,15 +57,20 @@ + return $stat + } + +-cvs >/dev/null 2>&1 +-if test $? -ne 1 ++if ! test_have_prereq PERL + then +- skip_all='skipping git-cvsserver tests, cvs not found' ++ skip_all='skipping git-cvsserver tests, perl not available' + test_done + fi +-if ! test_have_prereq PERL ++if ! test_have_prereq CVS + then +- skip_all='skipping git-cvsserver tests, perl not available' ++ skip_all='skipping git-cvsserver tests, cvs not available' ++ test_done ++fi ++cvs >/dev/null 2>&1 ++if test $? -ne 1 ++then ++ skip_all='skipping git-cvsserver tests, cvs not found' + test_done + fi + "$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { +diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9600-cvsimport.sh git-1.8.2/t/t9600-cvsimport.sh +--- git-1.8.2.orig/t/t9600-cvsimport.sh 2013-03-13 12:15:22.000000000 -0700 ++++ git-1.8.2/t/t9600-cvsimport.sh 2013-03-19 16:56:29.125993925 -0700 +@@ -3,14 +3,25 @@ + test_description='git cvsimport basic tests' + . ./lib-cvs.sh + +-test_expect_success PERL 'setup cvsroot environment' ' ++if ! test_have_prereq PERL ++then ++ skip_all='skipping git cvsimport tests, perl not available' ++ test_done ++fi ++if ! test_have_prereq CVS ++then ++ skip_all='skipping git cvsimport tests, cvs not available' ++ test_done ++fi ++ ++test_expect_success 'setup cvsroot environment' ' + CVSROOT=$(pwd)/cvsroot && + export CVSROOT + ' + +-test_expect_success PERL 'setup cvsroot' '$CVS init' ++test_expect_success 'setup cvsroot' '$CVS init' + +-test_expect_success PERL 'setup a cvs module' ' ++test_expect_success 'setup a cvs module' ' + + mkdir "$CVSROOT/module" && + $CVS co -d module-cvs module && +@@ -42,23 +53,23 @@ + ) + ' + +-test_expect_success PERL 'import a trivial module' ' ++test_expect_success 'import a trivial module' ' + + git cvsimport -a -R -z 0 -C module-git module && + test_cmp module-cvs/o_fortuna module-git/o_fortuna + + ' + +-test_expect_success PERL 'pack refs' '(cd module-git && git gc)' ++test_expect_success 'pack refs' '(cd module-git && git gc)' + +-test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' ++test_expect_success 'initial import has correct .git/cvs-revisions' ' + + (cd module-git && + git log --format="o_fortuna 1.1 %H" -1) > expected && + test_cmp expected module-git/.git/cvs-revisions + ' + +-test_expect_success PERL 'update cvs module' ' ++test_expect_success 'update cvs module' ' + (cd module-cvs && + cat <o_fortuna && + O Fortune, +@@ -86,7 +97,7 @@ + ) + ' + +-test_expect_success PERL 'update git module' ' ++test_expect_success 'update git module' ' + + (cd module-git && + git config cvsimport.trackRevisions true && +@@ -97,7 +108,7 @@ + + ' + +-test_expect_success PERL 'update has correct .git/cvs-revisions' ' ++test_expect_success 'update has correct .git/cvs-revisions' ' + + (cd module-git && + git log --format="o_fortuna 1.1 %H" -1 HEAD^ && +@@ -105,7 +116,7 @@ + test_cmp expected module-git/.git/cvs-revisions + ' + +-test_expect_success PERL 'update cvs module' ' ++test_expect_success 'update cvs module' ' + + (cd module-cvs && + echo 1 >tick && +@@ -114,7 +125,7 @@ + ) + ' + +-test_expect_success PERL 'cvsimport.module config works' ' ++test_expect_success 'cvsimport.module config works' ' + + (cd module-git && + git config cvsimport.module module && +@@ -126,7 +137,7 @@ + + ' + +-test_expect_success PERL 'second update has correct .git/cvs-revisions' ' ++test_expect_success 'second update has correct .git/cvs-revisions' ' + + (cd module-git && + git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && +@@ -135,7 +146,7 @@ + test_cmp expected module-git/.git/cvs-revisions + ' + +-test_expect_success PERL 'import from a CVS working tree' ' ++test_expect_success 'import from a CVS working tree' ' + + $CVS co -d import-from-wt module && + (cd import-from-wt && +@@ -148,12 +159,12 @@ + + ' + +-test_expect_success PERL 'no .git/cvs-revisions created by default' ' ++test_expect_success 'no .git/cvs-revisions created by default' ' + + ! test -e import-from-wt/.git/cvs-revisions + + ' + +-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' ++test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' + + test_done +diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9601-cvsimport-vendor-branch.sh git-1.8.2/t/t9601-cvsimport-vendor-branch.sh +--- git-1.8.2.orig/t/t9601-cvsimport-vendor-branch.sh 2013-03-13 12:15:22.000000000 -0700 ++++ git-1.8.2/t/t9601-cvsimport-vendor-branch.sh 2013-03-19 16:56:29.125993925 -0700 +@@ -34,6 +34,17 @@ + test_description='git cvsimport handling of vendor branches' + . ./lib-cvs.sh + ++if ! test_have_prereq PERL ++then ++ skip_all='skipping git cvsimport tests, perl not available' ++ test_done ++fi ++if ! test_have_prereq CVS ++then ++ skip_all='skipping git cvsimport tests, cvs not available' ++ test_done ++fi ++ + setup_cvs_test_repository t9601 + + test_expect_success PERL 'import a module with a vendor branch' ' +diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9602-cvsimport-branches-tags.sh git-1.8.2/t/t9602-cvsimport-branches-tags.sh +--- git-1.8.2.orig/t/t9602-cvsimport-branches-tags.sh 2013-03-13 12:15:22.000000000 -0700 ++++ git-1.8.2/t/t9602-cvsimport-branches-tags.sh 2013-03-19 16:56:29.126993944 -0700 +@@ -6,6 +6,17 @@ + test_description='git cvsimport handling of branches and tags' + . ./lib-cvs.sh + ++if ! test_have_prereq PERL ++then ++ skip_all='skipping git cvsimport tests, perl not available' ++ test_done ++fi ++if ! test_have_prereq CVS ++then ++ skip_all='skipping git cvsimport tests, cvs not available' ++ test_done ++fi ++ + setup_cvs_test_repository t9602 + + test_expect_success PERL 'import module' ' +diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/t9603-cvsimport-patchsets.sh git-1.8.2/t/t9603-cvsimport-patchsets.sh +--- git-1.8.2.orig/t/t9603-cvsimport-patchsets.sh 2013-03-13 12:15:22.000000000 -0700 ++++ git-1.8.2/t/t9603-cvsimport-patchsets.sh 2013-03-19 16:56:29.126993944 -0700 +@@ -14,6 +14,17 @@ + test_description='git cvsimport testing for correct patchset estimation' + . ./lib-cvs.sh + ++if ! test_have_prereq PERL ++then ++ skip_all='skipping git cvsimport tests, perl not available' ++ test_done ++fi ++if ! test_have_prereq CVS ++then ++ skip_all='skipping git cvsimport tests, cvs not available' ++ test_done ++fi ++ + setup_cvs_test_repository t9603 + + test_expect_failure 'import with criss cross times on revisions' ' +diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.2.orig/t/test-lib.sh git-1.8.2/t/test-lib.sh +--- git-1.8.2.orig/t/test-lib.sh 2013-03-13 12:15:22.000000000 -0700 ++++ git-1.8.2/t/test-lib.sh 2013-03-19 16:56:29.126993944 -0700 +@@ -686,6 +686,7 @@ + esac + + ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 ++test -z "$NO_CVS" && test_set_prereq CVS + test -z "$NO_PERL" && test_set_prereq PERL + test -z "$NO_PYTHON" && test_set_prereq PYTHON + test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.2-texinfo.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.2-texinfo.patch new file mode 100644 index 0000000000..b8881d4432 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.2-texinfo.patch @@ -0,0 +1,19 @@ +Strip anchors to avoid duplicate anchor names. This keeps texinfo 5-x happy. + +2013-04-02 Martin von Gagern + +References: +* https://bugs.gentoo.org/464210 + +Index: git-1.8.1.5/Documentation/cat-texi.perl +=================================================================== +--- git-1.8.1.5.orig/Documentation/cat-texi.perl ++++ git-1.8.1.5/Documentation/cat-texi.perl +@@ -12,6 +12,7 @@ while () { + push @menu, $1; + } + s/\(\@pxref{\[(URLS|REMOTES)\]}\)//; ++ s/\@anchor\{[^{}]*\}//g; + print TMP; + } + close TMP; diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.socket b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.socket new file mode 100644 index 0000000000..3dec01d216 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.socket @@ -0,0 +1,9 @@ +[Unit] +Description=Git Activation Socket + +[Socket] +ListenStream=9418 +Accept=true + +[Install] +WantedBy=sockets.target diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon_at.service b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon_at.service new file mode 100644 index 0000000000..2a080d4e7d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon_at.service @@ -0,0 +1,13 @@ +[Unit] +Description=Git Repositories Server Daemon +Documentation=man:git-daemon(1) + +[Service] +User=nobody +Group=nobody +EnvironmentFile=/etc/conf.d/git-daemon +# Ignore non-zero exit status, access error makes git-daemon return them +ExecStart=-/usr/libexec/git-core/git-daemon --inetd --base-path=/var/git --verbose $GITDAEMON_OPTS +StandardInput=socket +StandardOutput=inherit +StandardError=journal diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12-r1.ebuild deleted file mode 100644 index 97b8f74f65..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12-r1.ebuild +++ /dev/null @@ -1,513 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.5 2012/08/24 03:51:48 zmedico Exp $ - -EAPI=4 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - 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 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - ) - test? ( - app-crypt/gnupg - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - subversion? ( perl ) - webdav? ( curl ) -" - -pkg_setup() { - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || 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" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern, - # funded as a bounty by the Gentoo Foundation. - epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - 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 \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # 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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 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_mod_optimize git_remote_helpers - einfo "Please read /usr/share/bash-completion/git for Git bash completion" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12-r2.ebuild deleted file mode 100644 index 94bf96e9cc..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12-r2.ebuild +++ /dev/null @@ -1,525 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r2.ebuild,v 1.4 2012/08/24 16:55:29 robbat2 Exp $ - -EAPI=4 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +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 )" - -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 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - ) - test? ( - app-crypt/gnupg - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - subversion? ( perl ) - webdav? ( curl ) -" - -pkg_setup() { - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || 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" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern, - # funded as a bounty by the Gentoo Foundation. - epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - 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 \ - || die "emacs modules failed" - 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 "email 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 -} - -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} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # 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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 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_mod_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 - use python && python_mod_cleanup git_remote_helpers -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.3-r1.ebuild deleted file mode 100644 index 8ca5f6923c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.3-r1.ebuild +++ /dev/null @@ -1,525 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.3-r1.ebuild,v 1.1 2012/10/11 18:17:09 robbat2 Exp $ - -EAPI=4 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +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 )" - -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 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - ) - test? ( - app-crypt/gnupg - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - subversion? ( perl ) - webdav? ( curl ) -" - -pkg_setup() { - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || 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" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern, - # funded as a bounty by the Gentoo Foundation. - epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - 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 \ - || die "emacs modules failed" - 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 "email 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 -} - -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} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # 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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 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_mod_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 - use python && python_mod_cleanup git_remote_helpers -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.3.ebuild deleted file mode 100644 index be0f9ad41a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.3.ebuild +++ /dev/null @@ -1,513 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.3.ebuild,v 1.1 2012/10/10 17:47:37 robbat2 Exp $ - -EAPI=4 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - 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 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - ) - test? ( - app-crypt/gnupg - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - subversion? ( perl ) - webdav? ( curl ) -" - -pkg_setup() { - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || 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" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern, - # funded as a bounty by the Gentoo Foundation. - epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - 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 \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # 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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 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_mod_optimize git_remote_helpers - einfo "Please read /usr/share/bash-completion/git for Git bash completion" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.4.ebuild index 6b75a13846..096fd80b6b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.4.ebuild @@ -1,6 +1,6 @@ # 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.7.12.4.ebuild,v 1.10 2013/01/21 16:16:28 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.4.ebuild,v 1.12 2013/02/24 18:07:47 ago Exp $ EAPI=4 @@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then ${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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" else SRC_URI="" KEYWORDS="" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.ebuild deleted file mode 100644 index d9fb18509f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.7.12.ebuild +++ /dev/null @@ -1,511 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild,v 1.4 2012/08/24 03:51:48 zmedico Exp $ - -EAPI=4 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - !blksha1? ( dev-libs/openssl ) - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl[-build] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs )" - -RDEPEND="${CDEPEND} - 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 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - ) - test? ( - app-crypt/gnupg - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - subversion? ( perl ) - webdav? ( curl ) -" - -pkg_setup() { - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || 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" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern, - # funded as a bounty by the Gentoo Foundation. - #epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # 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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 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_mod_optimize git_remote_helpers - einfo "Please read /usr/share/bash-completion/git for Git bash completion" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.0.ebuild deleted file mode 100644 index da6b1bb7b8..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.0.ebuild +++ /dev/null @@ -1,525 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.0.ebuild,v 1.1 2012/11/02 15:59:14 robbat2 Exp $ - -EAPI=4 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" -[[ ${PV} == *9999 ]] && SCM="git-2" -EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" - -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs +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 )" - -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 - ) )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - ) - test? ( - app-crypt/gnupg - )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc - app-text/xmlto" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - subversion? ( perl ) - webdav? ( curl ) -" - -pkg_setup() { - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python_set_active_version 2 - python_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || 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" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern, - # funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0. - #epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch - - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - 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 \ - || die "emacs modules failed" - 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 "email 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 -} - -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} || die - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi - - if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # 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 - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \ - stats svn-fe vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - - fixlocalpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 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_mod_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 - use python && python_mod_cleanup git_remote_helpers -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.5-r1.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.5-r1.ebuild index 1bfa55af01..424fd1581b 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.5-r1.ebuild @@ -1,6 +1,6 @@ # 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.1.ebuild,v 1.1 2013/01/03 02:20:08 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5-r1.ebuild,v 1.1 2013/09/28 10:08:18 pacho Exp $ EAPI=4 @@ -11,7 +11,7 @@ PYTHON_DEPEND="python? 2" [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} +inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then ${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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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="" @@ -468,8 +468,12 @@ src_install() { newins "${FILESDIR}"/git-daemon.xinetd git-daemon fi - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon + 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 } diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.5.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.5.ebuild index 2a4419f866..0e7c986146 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.5.ebuild @@ -1,6 +1,6 @@ # 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.1.2.ebuild,v 1.2 2013/01/29 19:52:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5.ebuild,v 1.12 2013/03/10 16:23:21 ago Exp $ EAPI=4 @@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then ${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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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="" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.2.1.ebuild similarity index 94% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.2.1.ebuild index a744e54c81..f0aa42e350 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.1.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.2.1.ebuild @@ -1,6 +1,6 @@ # 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.1.1.ebuild,v 1.1 2013/01/15 19:16:30 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.2.1.ebuild,v 1.4 2013/05/18 13:48:37 lxnay Exp $ EAPI=4 @@ -11,7 +11,7 @@ PYTHON_DEPEND="python? 2" [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" -inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM} +inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python systemd ${SCM} MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then ${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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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="" @@ -140,6 +140,9 @@ exportmakeopts() { 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 @@ -150,7 +153,8 @@ exportmakeopts() { use tk \ || myopts="${myopts} NO_TCLTK=YesPlease" use pcre \ - && myopts="${myopts} USE_LIBPCRE=yes" + && myopts="${myopts} USE_LIBPCRE=yes" \ + && extlibs="${extlibs} -lpcre" use perl \ && myopts="${myopts} INSTALLDIRS=vendor" \ || myopts="${myopts} NO_PERL=YesPlease" @@ -191,6 +195,7 @@ exportmakeopts() { myopts="${myopts} NO_NSEC=YesPlease" export MY_MAKEOPTS="${myopts}" + export EXTLIBS="${extlibs}" } src_unpack() { @@ -216,7 +221,10 @@ src_prepare() { #epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch + epatch "${FILESDIR}"/git-1.8.2-optional-cvs.patch + + # bug #464210 - texinfo anchors + epatch "${FILESDIR}"/git-1.8.2-texinfo.patch sed -i \ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ @@ -225,7 +233,7 @@ src_prepare() { -e 's:^\(AR = \).*$:\1$(OPTAR):' \ -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" + Makefile contrib/svn-fe/Makefile || die "sed failed" # Never install the private copy of Error.pm (bug #296310) sed -i \ @@ -260,6 +268,7 @@ git_emake() { 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. @@ -310,7 +319,7 @@ src_compile() { if use subversion ; then cd "${S}"/contrib/svn-fe - git_emake || die "emake svn-fe failed" + 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 @@ -468,8 +477,12 @@ src_install() { newins "${FILESDIR}"/git-daemon.xinetd git-daemon fi - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon + 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 } diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.3.2.ebuild similarity index 88% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.3.2.ebuild index f7793badb1..ae17a538e6 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.3.2.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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.0-r1.ebuild,v 1.3 2012/12/06 18:59:29 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.3.2.ebuild,v 1.5 2013/09/16 17:53:28 mgorny Exp $ -EAPI=4 +EAPI=5 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" +PYTHON_COMPAT=( python2_{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 ${SCM} +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}" @@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then ${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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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="" @@ -47,7 +47,7 @@ CDEPEND=" dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl[-build] ) + perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl @@ -67,9 +67,10 @@ RDEPEND="${CDEPEND} ) python? ( gtk? ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" + >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] + dev-python/pygtksourceview:2[${PYTHON_USEDEP}] + ) + ${PYTHON_DEPS} )" # This is how info docs are created with Git: # .txt/asciidoc --(asciidoc)---------> .xml/docbook @@ -101,17 +102,18 @@ REQUIRED_USE=" cvs? ( perl ) subversion? ( perl ) webdav? ( curl ) + gtk? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) " pkg_setup() { - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then + if use subversion && has_version "dev-vcs/subversion[dso]"; then ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi if use python ; then - python_set_active_version 2 - python_pkg_setup + python-single-r1_pkg_setup fi } @@ -140,6 +142,9 @@ exportmakeopts() { 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 @@ -150,7 +155,8 @@ exportmakeopts() { use tk \ || myopts="${myopts} NO_TCLTK=YesPlease" use pcre \ - && myopts="${myopts} USE_LIBPCRE=yes" + && myopts="${myopts} USE_LIBPCRE=yes" \ + && extlibs="${extlibs} -lpcre" use perl \ && myopts="${myopts} INSTALLDIRS=vendor" \ || myopts="${myopts} NO_PERL=YesPlease" @@ -191,6 +197,7 @@ exportmakeopts() { myopts="${myopts} NO_NSEC=YesPlease" export MY_MAKEOPTS="${myopts}" + export EXTLIBS="${extlibs}" } src_unpack() { @@ -211,12 +218,8 @@ src_unpack() { } src_prepare() { - # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern, - # funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0. - #epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch + epatch "${FILESDIR}"/git-1.8.2-optional-cvs.patch sed -i \ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ @@ -225,7 +228,7 @@ src_prepare() { -e 's:^\(AR = \).*$:\1$(OPTAR):' \ -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" + Makefile contrib/svn-fe/Makefile || die "sed failed" # Never install the private copy of Error.pm (bug #296310) sed -i \ @@ -247,7 +250,7 @@ git_emake() { # bug #326625: PERL_PATH, PERL_MM_OPT # bug #320647: PYTHON_PATH PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" + use python && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ DESTDIR="${D}" \ OPTCFLAGS="${CFLAGS}" \ @@ -260,6 +263,7 @@ git_emake() { 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. @@ -278,8 +282,7 @@ src_compile() { git_emake || die "emake failed" if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" + elisp-compile contrib/emacs/git{,-blame}.el fi if use perl && use cgi ; then @@ -310,7 +313,7 @@ src_compile() { if use subversion ; then cd "${S}"/contrib/svn-fe - git_emake || die "emake svn-fe failed" + 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 @@ -356,18 +359,17 @@ src_install() { newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt 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 + 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} || die + elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview + python_doscript "${S}"/contrib/gitview/gitview dodoc "${S}"/contrib/gitview/gitview.txt fi @@ -411,6 +413,12 @@ src_install() { cd "${S}" fi + # remote-helpers + if use python ; then + python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} + python_optimize + fi + dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -468,8 +476,12 @@ src_install() { newins "${FILESDIR}"/git-daemon.xinetd git-daemon fi - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon + 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 } @@ -483,9 +495,12 @@ src_test() { t9601-cvsimport-vendor-branch.sh \ t9602-cvsimport-branches-tags.sh \ t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ + local tests_perl="t3701-add-interactive.sh \ + t5502-quickfetch.sh \ t5512-ls-remote.sh \ - t5520-pull.sh" + t5520-pull.sh \ + t7106-reset-unborn-branch.sh \ + t7501-commit.sh" # Bug #225601 - t0004 is not suitable for root perm # Bug #219839 - t1004 is not suitable for root perm # t0001-init.sh - check for init notices EPERM* fails @@ -519,7 +534,7 @@ src_test() { has_version dev-vcs/cvs && \ let cvs=$cvs+1 [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ + has_version "dev-vcs/cvs[server]" && \ let cvs=$cvs+1 if [[ $cvs -lt 3 ]]; then einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" @@ -577,7 +592,6 @@ showpkgdeps() { pkg_postinst() { use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers einfo "Please read /usr/share/bash-completion/git for Git bash 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" @@ -591,5 +605,4 @@ pkg_postinst() { pkg_postrm() { use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers } diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild index 6ba20836d6..8b996b9477 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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-9999.ebuild,v 1.40 2012/12/06 18:59:29 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.45 2013/09/16 17:53:28 mgorny Exp $ -EAPI=4 +EAPI=5 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_DEPEND="python? 2" +PYTHON_COMPAT=( python2_{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 ${SCM} +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}" @@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then ${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 ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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="" @@ -47,7 +47,7 @@ CDEPEND=" dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl[-build] ) + perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl @@ -67,9 +67,10 @@ RDEPEND="${CDEPEND} ) python? ( gtk? ( - >=dev-python/pygtk-2.8 - dev-python/pygtksourceview:2 - ) )" + >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] + dev-python/pygtksourceview:2[${PYTHON_USEDEP}] + ) + ${PYTHON_DEPS} )" # This is how info docs are created with Git: # .txt/asciidoc --(asciidoc)---------> .xml/docbook @@ -101,17 +102,18 @@ REQUIRED_USE=" cvs? ( perl ) subversion? ( perl ) webdav? ( curl ) + gtk? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) " pkg_setup() { - if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then + if use subversion && has_version "dev-vcs/subversion[dso]"; then ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi if use python ; then - python_set_active_version 2 - python_pkg_setup + python-single-r1_pkg_setup fi } @@ -140,6 +142,9 @@ exportmakeopts() { 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 @@ -150,7 +155,8 @@ exportmakeopts() { use tk \ || myopts="${myopts} NO_TCLTK=YesPlease" use pcre \ - && myopts="${myopts} USE_LIBPCRE=yes" + && myopts="${myopts} USE_LIBPCRE=yes" \ + && extlibs="${extlibs} -lpcre" use perl \ && myopts="${myopts} INSTALLDIRS=vendor" \ || myopts="${myopts} NO_PERL=YesPlease" @@ -191,6 +197,7 @@ exportmakeopts() { myopts="${myopts} NO_NSEC=YesPlease" export MY_MAKEOPTS="${myopts}" + export EXTLIBS="${extlibs}" } src_unpack() { @@ -211,12 +218,8 @@ src_unpack() { } src_prepare() { - # bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern, - # funded as a bounty by the Gentoo Foundation. Merged upstream in 1.8.0. - #epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch + epatch "${FILESDIR}"/git-1.8.2-optional-cvs.patch sed -i \ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ @@ -225,7 +228,7 @@ src_prepare() { -e 's:^\(AR = \).*$:\1$(OPTAR):' \ -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile || die "sed failed" + Makefile contrib/svn-fe/Makefile || die "sed failed" # Never install the private copy of Error.pm (bug #296310) sed -i \ @@ -247,7 +250,7 @@ git_emake() { # bug #326625: PERL_PATH, PERL_MM_OPT # bug #320647: PYTHON_PATH PYTHON_PATH="" - use python && PYTHON_PATH="$(PYTHON -a)" + use python && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ DESTDIR="${D}" \ OPTCFLAGS="${CFLAGS}" \ @@ -260,6 +263,7 @@ git_emake() { 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. @@ -278,8 +282,7 @@ src_compile() { git_emake || die "emake failed" if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el \ - || die "emacs modules failed" + elisp-compile contrib/emacs/git{,-blame}.el fi if use perl && use cgi ; then @@ -310,7 +313,7 @@ src_compile() { if use subversion ; then cd "${S}"/contrib/svn-fe - git_emake || die "emake svn-fe failed" + 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 @@ -356,18 +359,17 @@ src_install() { newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt 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 + 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} || die + elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi if use python && use gtk ; then - dobin "${S}"/contrib/gitview/gitview - python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview + python_doscript "${S}"/contrib/gitview/gitview dodoc "${S}"/contrib/gitview/gitview.txt fi @@ -411,6 +413,12 @@ src_install() { cd "${S}" fi + # remote-helpers + if use python ; then + python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} + python_optimize + fi + dodir /usr/share/${PN}/contrib # The following are excluded: # completion - installed above @@ -468,8 +476,12 @@ src_install() { newins "${FILESDIR}"/git-daemon.xinetd git-daemon fi - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon + 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 } @@ -483,9 +495,12 @@ src_test() { t9601-cvsimport-vendor-branch.sh \ t9602-cvsimport-branches-tags.sh \ t9603-cvsimport-patchsets.sh" - local tests_perl="t5502-quickfetch.sh \ + local tests_perl="t3701-add-interactive.sh \ + t5502-quickfetch.sh \ t5512-ls-remote.sh \ - t5520-pull.sh" + t5520-pull.sh \ + t7106-reset-unborn-branch.sh \ + t7501-commit.sh" # Bug #225601 - t0004 is not suitable for root perm # Bug #219839 - t1004 is not suitable for root perm # t0001-init.sh - check for init notices EPERM* fails @@ -519,7 +534,7 @@ src_test() { has_version dev-vcs/cvs && \ let cvs=$cvs+1 [[ $cvs -gt 1 ]] && \ - built_with_use dev-vcs/cvs server && \ + has_version "dev-vcs/cvs[server]" && \ let cvs=$cvs+1 if [[ $cvs -lt 3 ]]; then einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" @@ -577,7 +592,6 @@ showpkgdeps() { pkg_postinst() { use emacs && elisp-site-regen - use python && python_mod_optimize git_remote_helpers einfo "Please read /usr/share/bash-completion/git for Git bash 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" @@ -591,5 +605,4 @@ pkg_postinst() { pkg_postrm() { use emacs && elisp-site-regen - use python && python_mod_cleanup git_remote_helpers }