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 790a79d64d..42428c58a7 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,152 @@ # ChangeLog for dev-vcs/git -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.297 2014/12/02 07:32:57 polynomial-c Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.328 2015/05/11 17:55:03 zlogene Exp $ + + 11 May 2015; Mikle Kolyada git-2.3.6.ebuild: + x86 stable wrt bug #548350 + + 02 May 2015; Jeroen Roovers git-2.3.6.ebuild: + Stable for PPC64 (bug #548350). + + 02 May 2015; Jeroen Roovers git-2.3.6.ebuild: + Stable for HPPA (bug #548350). + + 01 May 2015; Mikle Kolyada git-2.3.6.ebuild: + amd64 stable wrt bug #548350 + +*git-2.4.0 (01 May 2015) + + 01 May 2015; Robin H. Johnson +git-2.4.0.ebuild: + Bump. + +*git-2.3.7 (01 May 2015) + + 01 May 2015; Robin H. Johnson +git-2.3.7.ebuild: + Bump. + +*git-2.3.6 (23 Apr 2015) + + 23 Apr 2015; Lars Wendler -git-2.3.4.ebuild, + +git-2.3.6.ebuild: + Version bump. Removed old. + + 08 Apr 2015; Michał Górny git-1.8.5.6.ebuild, + git-1.9.5.ebuild, git-2.0.5.ebuild, git-2.1.4.ebuild, git-2.2.2.ebuild, + git-2.3.4.ebuild, git-2.3.5.ebuild, git-9999-r1.ebuild, git-9999-r2.ebuild, + git-9999-r3.ebuild, git-9999.ebuild: + Drop old Python implementations + + 05 Apr 2015; Lars Wendler git-2.3.4.ebuild, + git-2.3.5.ebuild: + Removed no longer needed dependency (bug #545342). + +*git-2.3.5 (01 Apr 2015) + + 01 Apr 2015; Lars Wendler -git-2.3.3.ebuild, + +git-2.3.5.ebuild: + Version bump. Removed old. + +*git-2.3.4 (26 Mar 2015) + + 26 Mar 2015; Lars Wendler -git-2.3.2.ebuild, + +git-2.3.4.ebuild: + Version bump. Removed old. + +*git-2.3.3 (16 Mar 2015) + + 16 Mar 2015; Lars Wendler -git-2.3.1.ebuild, + +git-2.3.3.ebuild: + Version bump. Removed old. + +*git-2.3.2 (13 Mar 2015) + + 13 Mar 2015; Lars Wendler -git-2.3.0.ebuild, + +git-2.3.2.ebuild: + Version bump. Removed old. + +*git-2.3.1 (26 Feb 2015) + + 26 Feb 2015; Lars Wendler +git-2.3.1.ebuild: + Version bump. + +*git-2.3.0 (06 Feb 2015) + + 06 Feb 2015; Lars Wendler -git-2.2.1.ebuild, + +git-2.3.0.ebuild, git-9999.ebuild, git-9999-r1.ebuild, git-9999-r2.ebuild, + git-9999-r3.ebuild: + Version bump. Removed old. Fixed live ebuilds. + +*git-2.2.2 (21 Jan 2015) + + 21 Jan 2015; Lars Wendler +git-2.2.2.ebuild, + +files/git-2.2.2-optional-cvs.patch: + Version bump. + + 31 Dec 2014; Mike Frysinger git-2.0.5.ebuild: + Mark arm64/s390/sh stable. + + 31 Dec 2014; Mike Frysinger git-1.8.5.6.ebuild, + git-1.9.5.ebuild, git-2.0.5.ebuild, git-2.1.4.ebuild, git-2.2.1.ebuild, + git-9999-r1.ebuild, git-9999-r2.ebuild, git-9999-r3.ebuild, git-9999.ebuild: + Drop unused empty vars that confuse helper tools like ekeyword. + + 26 Dec 2014; Lars Wendler -git-1.8.3.2-r1.ebuild, + -git-1.8.5.5.ebuild, -git-2.0.4.ebuild, -files/git-1.8.2-optional-cvs.patch, + -files/git-daemon.initd: + Removed vulnerable versions. + + 26 Dec 2014; Agostino Sarubbo git-1.8.5.6.ebuild, + git-1.9.5.ebuild, git-2.0.5.ebuild: + Stable for sparc, wrt bug #532984 + + 25 Dec 2014; Agostino Sarubbo git-1.8.5.6.ebuild, + git-1.9.5.ebuild, git-2.0.5.ebuild: + Stable for ia64, wrt bug #532984 + + 24 Dec 2014; Agostino Sarubbo git-1.8.5.6.ebuild, + git-1.9.5.ebuild, git-2.0.5.ebuild: + Stable for ppc64, wrt bug #532984 + + 24 Dec 2014; Agostino Sarubbo git-1.8.5.6.ebuild, + git-1.9.5.ebuild, git-2.0.5.ebuild: + Stable for ppc, wrt bug #532984 + + 23 Dec 2014; Markus Meier git-1.8.5.6.ebuild, + git-1.9.5.ebuild, git-2.0.5.ebuild: + arm stable, bug #532984 + + 23 Dec 2014; Agostino Sarubbo git-1.8.5.6.ebuild, + git-1.9.5.ebuild, git-2.0.5.ebuild: + Stable for alpha, wrt bug #532984 + + 21 Dec 2014; Jeroen Roovers git-1.9.5.ebuild: + Stable for HPPA (bug #532984). + + 21 Dec 2014; Jeroen Roovers git-1.8.5.6.ebuild: + Stable for HPPA (bug #532984). + + 21 Dec 2014; Agostino Sarubbo git-1.8.5.6.ebuild, + git-1.9.5.ebuild, git-2.0.5.ebuild: + Stable for x86, wrt bug #532984 + + 21 Dec 2014; Agostino Sarubbo git-1.8.5.6.ebuild, + git-1.9.5.ebuild, git-2.0.5.ebuild: + Stable for amd64, wrt bug #532984 + + 21 Dec 2014; Jeroen Roovers git-2.0.5.ebuild: + Stable for HPPA (bug #532984). + +*git-2.2.1 (18 Dec 2014) +*git-2.1.4 (18 Dec 2014) +*git-2.0.5 (18 Dec 2014) +*git-1.9.5 (18 Dec 2014) +*git-1.8.5.6 (18 Dec 2014) + + 18 Dec 2014; Lars Wendler +git-1.8.5.6.ebuild, + -git-1.9.3.ebuild, +git-1.9.5.ebuild, +git-2.0.5.ebuild, -git-2.1.3.ebuild, + +git-2.1.4.ebuild, -git-2.2.0.ebuild, +git-2.2.1.ebuild, + -files/git-1.8.4-optional-cvs.patch: + Security bump (bug #532984). Removed old. *git-2.2.0 (02 Dec 2014) 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 4d7ae42291..b7788fee68 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 @@ -2,65 +2,67 @@ Hash: SHA256 AUX 50git-gentoo.el 472 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 WHIRLPOOL 887682f79182f6728af3c0fd2ee0e81319d49761a987559684be5e4acae4af579a5b8d1197ddba31452cec179de3c8f5784cc85ad61f78b400e42c204c93f642 -AUX git-1.8.2-optional-cvs.patch 11737 SHA256 37e092ca2dfa3ec216df568c1439acb3bdcc7366b75feb092f39642fc5894ce4 SHA512 7f914f16efee2f81a6f42a0e7ff1d72094bf032e98fa1a22f4b1e848eebf3a056ccdea1c84b24310cff4f19737b336d79a4f9c098a0ac4b0556e1a74708ef870 WHIRLPOOL d5e66fbfe0a6ae6c956ffb886d66c7a7906a3d60eac43b87d1e40206197f58d9aed54ee57cf5bb592147b7b9ac50fe50996f3b7e94161e5e308567c3a108cf43 -AUX git-1.8.4-optional-cvs.patch 11737 SHA256 7f8f1bd8f2953044433d90edea2bae7334e0d14ee7dc5e6e327e4caec8b0100b SHA512 2966582ccd5640c34aba156a955b458176ec2d450471279ec77200cbd1fb19f84dabc2a913fea17ae7503609074f8c80c05bb93f7244acfe296c078cf4a030ac WHIRLPOOL 07d5ab8ab60f6338ff1c9c7b8817938917ec12a5c360e595d7a40ffbbff18b439fea576c70dd4ddc7547edab23f4e86110f201c88be68e5a874d295f6051e592 AUX git-1.8.5-mw-destdir.patch 1138 SHA256 4f9684b14b93ceae0426cf0ba9a3970c15f63fef8bb0f7179bbee81e7a41aa52 SHA512 dd782f6b408111fc10342973dc6afeb305a27cf7cdce85694bd6e73da55a6164076c7d08679cb148d9850769456f23e9f166c4c1686152ec276f9125a59f829a WHIRLPOOL aa84f8834c6867a33b1406b96ccdd8b4749af14ea7b615b7010dfc28d2b2e50e3846c249ec0675c3c829cd1117dd2e99659fa5d06a823519375ea07e5efddda1 AUX git-1.8.5-mw-vendor.patch 1160 SHA256 e613f8874beec8d11644ad8d12c43cccb6585f96e99485d7d8ead6618321e8c0 SHA512 6513104f28eff36c18840f90e56fb21e8e04055e4e9a304ef15e5d7e1c13c8b45c4be0380b7781e776ce3b8ee9f7371ed2200e01174cc257125a613aef43ac9b WHIRLPOOL 6a5dcb28dc40590cf4e4b1369b0d770b40f1060bf933366f252edafbb9781f39d7f46dc218c16d429f507c7d5a9479bafce2df7309178071bcb782095809ed69 AUX git-1.8.5-optional-cvs.patch 10088 SHA256 a35732c6d3bfbe62b298a730652a85f7deac6bdd59bd842b4dddedaa6ad0f1fb SHA512 f78f82af4e51002553157e61a16fb9855743acaa9cd9b9914e047eb3ff7f7fc4aa2d89e9c7f86fb6bf9d3f5854e44519c72669c6436132c728b28a4599d184f1 WHIRLPOOL f8080b56bff0c1add20d9c3c3e2b842e351029cae02e147307260a6504de4300d01262176c03203259037e6f98ffb043e1e1b4a914b1110d666b30383ead2e24 AUX git-1.9.0_rc3-optional-cvs.patch 11798 SHA256 3ebd298202ef9877114abbfdfccba20b28a8ab01958828079e0b2adf77525aa3 SHA512 308fd4d00803b30e2307d8665f5a5d0a6f2e2022ba462876afea35eb2ebb246ef8d82671467e2ad1744c981d523a156d5825deceaca28f17e43604695edecc60 WHIRLPOOL c4413f0233fcf41463a2ee73567a0743c436c17d14186f1c04fd78eafb38eaba95f685db2824867b6c0e900b4657cf847de5f46fa8136b40f0a0fcdad23122af AUX git-2.0.0-r2-optional-cvs.patch 12127 SHA256 23a50f98a01b233576da6cadbc2add7481a5b3668de15f4942fe9366e30735b9 SHA512 1594482e14634083ae571223194697986d7fd08f79eca6215692b6d10f7fa3f8947cf7a1699ad2a9e24de1bc6f9aaaf86d78a953cf05f4a9954a52ea0cc406b3 WHIRLPOOL ab73c201a29b47e4a2ca2acbf80ec2fbb1e21e6d988f2e1faf1cf9aa5972ff7af86681499e0b9c8d0567a60efed198a2a87ab4c6704ceda71a200db98718f1a9 AUX git-2.2.0-svn-fe-linking.patch 418 SHA256 45b89e10bec13fd7b29f7b530bf5ef57d3263581930ff338bf2105b3a96e6df0 SHA512 ac312e7da4c548073d4dfa5d9bb6823ed48ea70a30d7993da190cfc4cc4b17124e15326748d79e59ca0772675619b29221a57c5af45b7b6c7196dae218772ecd WHIRLPOOL d31618b8012b2b9eca5ae5c4317c893a21697b182aa877e236a34eefc17869b0c659c35617d70e7cd316d430de5d093fe18bce947996f8c6aade7cd8c60a4c38 +AUX git-2.2.2-optional-cvs.patch 14282 SHA256 94b2bcbb2438f15c95521b758ac189429515dbb2631c496c1c5f121a5e6d622e SHA512 1d897a6e097b9c8cf92b499286f9ba77ac6cf507dbd734e1e1f7da719ecf294045dda531ab5bc35cfbe653ac6747dd4a4e3f2d22d68fd6a0f73e940256c6b474 WHIRLPOOL 63ea264a398aeb1f38d15f9b3da9d931c3ea122536e36224a46d6fd0adbb7b7355d3b2dfa3801f548de5995bd875c13e3c6080e77480a6afba770d7fab45f5b1 AUX git-daemon-r1.initd 485 SHA256 421e68201619bfbf7535d8b1a0030390b7ffab998e025f7cbd7e879c677c2819 SHA512 cd1635bf8bbd39e93d5fd44a7c3f46ad01a57894525da4d8cf05c1d2099bd0dd80440e67eb73848fe26d0442361bef9e551f5180139f46f3c65ca6c9bb739072 WHIRLPOOL c8a14e7c49d03f4c4b189a234fbd991deedf1b8f378f6bdaded8b95060f6f6a8b78f3d5bbe19fa49c1b263ed25ee0a3a9afc8ccec38af801ace207a08d8e6e35 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.8.3.2.tar.gz 4474347 SHA256 2f798db86859c85608fe4120f52a1b1cb13ca9c4daa4f59eb1dc090280f46473 SHA512 6e19948821dfbf78c5b9ea95614d3c10f4625583e3c17b6c55110b74f28679e525c449179cf49c2587a86c3b7fd7b6a27589824fcea0ec6fb69ca752a6942931 WHIRLPOOL 26892e039b67b35ae9df0a124d0812b36a22f481f146561b733a758b89a00770c05902c2820f2a783bc0fac07ecb335accbc939d21481da821177e0548d6a077 -DIST git-1.8.5.5.tar.gz 4761469 SHA256 c59268c33d2412af329cb09b10e5348e4001a47e1b948b74ecd9937e0897dbb1 SHA512 8921c76b8826fa706450b64198f377ce7c650f06899c4d8e43f499f2e5ee93940a42f4c3483390e034d4babebbeadb400221ae7614e40731674c309da407bf3c WHIRLPOOL 62e8b3cc7c96ea9c22b88c0e5abebfb8ac7d8b84fcfcc4ca0a19a6ce1e9dbfbb6b8cd1180faedd67440cc88c39b3ca9c992d2251670a335e716f11b574475d30 -DIST git-1.9.3.tar.gz 4846233 SHA256 71bca677efa3b87a060cba1de9e3512e7ab0f09197ef95d648e5280d9a6d1357 SHA512 42a774f0d2b9d0ace9e555b3d12b7a27fabdad407d5d1f342792d56cc1b7d1c9d1f921432238ec1bc61e9fd7f9dba7c5d8bcadea8b05bf73bab8c3b428f17b89 WHIRLPOOL b0cd2a18404af0856972d3ab1bad776b5c3cb5088369e5556aa2293feb6a164ef1af7a79cd4a1d7e20c37795921c05d811f9faebe57e31ea5621cc9990b8e5f3 -DIST git-2.0.4.tar.xz 3435872 SHA256 5c0c60e69e3ad4bc8ece7d82d8a68c4ecca9780a57613bde41b4050831f9c996 SHA512 ee10ad7e44d10a8cd45f3220da5d8ca309cc91ac180917a8e2719e3667bf215e30ad3793f27216e921a3cc5edf10b8a911d008098e2446aaa94ba1acdb49c86b WHIRLPOOL afbac473e85ccd7c4b190df3b6921a223e829f3694ab6a2f134855f5da7d52b69c095e1abf4dc9f282f32f52eb8ac46aa671fb85988c7b09d7075a18f73691f0 -DIST git-2.1.3.tar.xz 3542704 SHA256 fe1b06aefa73e8d86cbd352523fc0950b8904ae2ec47085b22b7880f45de6f57 SHA512 8a8e4c0a580fb7647f8689ce126c3d97dc7b2c2f8c72087b7fef2b876590f0cfb8298ba756298ab1dfbb2350d17328c2adef11bd72049f757593f05f18d9fac3 WHIRLPOOL 9314a3820598e3ae949d1a0d61ffb2b46f3e6b86bf8483f90a0bdd472e532f5e612d68cd9822ead51a49a8d99fb3e5b9981a7d4130e07f279e5a32db4fc0d673 -DIST git-2.2.0.tar.xz 3588600 SHA256 3b87774672bbf35b4d33991dc5119d4eff47c3679e27185312a2b8b36fdad314 SHA512 2c9bdf17e65543034efe4c97593fafa1a9515e5698d6be14a8b9c3c881b0fa8e824b20e73733b67b4f4fcf6513389d736f47e4f1231659a9a8d3ce7039bc30fa WHIRLPOOL 57485df185d547c17da812fb999d6f80a7d8a8eb8503c92d34a54b2fffb423e078510a7cc5d509a2e48eca5bd4a684f3ee70228725beb85c6b000d5d94d32ab5 -DIST git-htmldocs-1.8.3.2.tar.gz 2115320 SHA256 805b7fc4399daf9258e8cc28ecc3dd043fdd7f339447f4d84674826916109246 SHA512 0890b60bfa110ca7eaf7aaddbf0aca9574f608addc384cece3c91c8c04ef6397064a0669f3d61d0a65eb120b626ccd85df26f04438ca301f349136cd55e5080a WHIRLPOOL 377c39ac7988a3c1bb6e80333c43878d38fe5eecbb75dcbcbef3c2186842fcc170a552d72be891f1479c336fdd6c5ac1ce1ca2c0adf9a8238bd057f093c3f912 -DIST git-htmldocs-1.8.5.5.tar.gz 2228410 SHA256 14088e41803a9127946a9f31146d5ac4806d2c6075668bb2833c3af72b32c8ab SHA512 8424f241e32e89e2b7eb0dcfcbf37a74b7f9883b9fcde815be9081a16ab0a3eb150f09d41ab08e01a7980f8151b56313912eed79341c8c31df10ff94ca0efca3 WHIRLPOOL c7e3e769307a23a0f05d764cb957b0854a4f0df8825703aa1b32fb3a0697d30871c4d3a4d41388a1e92b27f46535551117a843bd47a70ee22332612cd2ce8ad8 -DIST git-htmldocs-1.9.3.tar.gz 2243608 SHA256 d23f3f3ccd421706f8805c40ee199fb1d3dda7e6720eb8b260f3dbed20f2536f SHA512 c381f560d5f67f723920ba679665725d377b40e0074ca49826436310f7c64d9c9814ff8a3e98a9d00c0d47e9d9f613ec4ed035d15420b87221fdb17de4ebaf3d WHIRLPOOL 9437271b91b5667fa7a6e979aa86822c1824bcf786a2fad07c0a3cdb1c576bccfe2a098f0e43ebfc66f0dc54cf32443988018ce15f191747b412d200599d0af7 -DIST git-htmldocs-2.0.4.tar.xz 943324 SHA256 0ed51a78743ff1accb9165bf2983fe8ab3bcae62d40692d881f895c7e4672ca0 SHA512 c302b12e124597610a10f1d7e3d22c2f0c4dc5bb122c6846dab210e5ce47bb1079ed0e507d44b4260cc76c633abb550729560bddcd9d7b3c2b6f958536cb5716 WHIRLPOOL 3e0408f690aa8f76225b3b91c9c1d9a8a73312abcb32b52efe448d37318818917366354a5cf41fd1a066555f5d5eb71c1ee98561f31dc1122ff123ba8c899875 -DIST git-htmldocs-2.1.3.tar.xz 958212 SHA256 1bb7e90de93b5b986a5a9a12eef85b92ba4961af65fb0bbde6632fca2a68b404 SHA512 da8a706446ef3ac2c297c1f6cd648d217ccce8505c9ef9f8532cb4e183808e6b3606a54805500297e6ab69f07e9e2afd2b7fa951e54949ca0d353ea7a108a469 WHIRLPOOL de695870cda98e54a7b5b109c3034bba4c6485781f3ac898807b36be6dcbbeafd0d2f21cccd77dd3e4c0126653ce321704e6509874df02fec5dc3ad1d3b89b3b -DIST git-htmldocs-2.2.0.tar.xz 974584 SHA256 df56fa2f7e13427bd752bd92efa04d40f439bc7f3dfbdd51872aa429f3f81ebd SHA512 7b27631a37b4f1b31f7ce56c5bfbd7db61cad355261431f48ff6f34d89952a27f4ccfb384aff01e2d226c36ea90aaacdf266ff7247877f0a3183972f3efe964d WHIRLPOOL 971649e8d9737fe95c0e00e95e7b88543673815e4a0d9ba5c73be83169a851917e5204755271d61cb90c63341a48bb9555d010a5660a3109fb5c8168ff9727ee -DIST git-manpages-1.8.3.2.tar.gz 542769 SHA256 599bc8f6c56986a994a237cfebb53b4fab9051576775e32d0353e0455ab84115 SHA512 42fd781b924355c969ce381aae828f877059472741d7b53b0d1aad53f04c8a27b6b161b5dfc353098370ead73ccb9cdc86ac5374cf02829134f8c4d70bcbb7cf WHIRLPOOL 90226006a35b7b6e644f887981f2725238ff428f572425942701614e14fab5c8c5c602746de93a113d83d9b9c76ea1805a9c7cfa353305b0f817c33976048d77 -DIST git-manpages-1.8.5.5.tar.gz 568976 SHA256 375870364a67e663ee85de30d64a12388c6147ac4a263aed1a447e0e2dffd0b8 SHA512 c07a5ddbe158868a7c94575408c2f8d0cc6fd9d1da95e3ff1b93b140708830a50175f38217eb75456d508f05c9720df93b22bd9f336a2b8edb6812bee5cd4a0b WHIRLPOOL 275b352e40ba3891d1ddcda7ef002528f2ec498af41d3f3ea1638f9baa4f9065973c434b7cb7d731b0a951f7bf5c0bbf582677aab727533cd065c64bfa20d1a0 -DIST git-manpages-1.9.3.tar.gz 571550 SHA256 43bfb09c072ccfe0ed4b0ad30d04c8f34b6af4d2f52cd8dfdb48787cc9c8509d SHA512 3f985a4446e3ce1b8bff356585eb5f33565179517e7ba9ae53fc59399c2e4f3ee8498567ce5282e3ddafe0709e79b80877ee53166986facc1ce348495cbb254a WHIRLPOOL 21e96604e4d6581c34ccf0c1367b706e383c47e45ffe9bfb05e9998c7de45507aa72c3fe95f8fd1d81eced81cea149e6bb393a097fe95d8debbeebfbecde6efd -DIST git-manpages-2.0.4.tar.xz 358936 SHA256 f9b15d115746b7d0bdc5ff2a46ef5cf02ec1cf9f0d61393285fae68349c6b62b SHA512 78a360c6307338e463a0401a1664694feb0bf5cb6aaaaa4d0f0b812bfca568616fb77268ba395be8cbab8612eb9a7d2f2a9e863fe76667b70f9c0d7e5c75b2cc WHIRLPOOL ce68e29d53d6ae3149cae9880914ef64e5087c980b0c14af67a5fbbc9a9cd58fe605dcfe6686cea891d51d9ee2b3eb53ac22acfcf59cc3593aafe29078b843c6 -DIST git-manpages-2.1.3.tar.xz 361240 SHA256 416c0e7634d4513d069f6a02c493d2407d3776f6676c88ff45d063c52fcd5791 SHA512 9a8eb40603f0eff2ea5671a96c7679900e7a45f1cd8449f33126c8716ebdfe50e071888fbd9a6e478784c54a8b9e6ad3ec6ac2b8aee0f33890c92d5bc46f586a WHIRLPOOL ceec5a545b7a41143596b38f3292143dffd0287db9ea5339036bdec0a79a39ec847b5f67b4143482ccc61507759a64b7f493dc066c7824dcb07df7d944486184 -DIST git-manpages-2.2.0.tar.xz 369716 SHA256 4b53648e3550adaf745323649af82c9c11634d909b7ddfa5c3661ab9991204ec SHA512 fd9fc7582315efba85434c66094841484f006de9c61dd25f94192f09ba3f041b1f5658298ecf4415e92d279857e305b49b81b07ea98856326a55302c947f69f4 WHIRLPOOL 72318657d188c55a602796ee605a02574580fe67dad8858c969d3df6bec1d414199123bb66b45c3001c740a4adaa589a3ec618cf9a40e34fa9732fa47d18000e -EBUILD git-1.8.3.2-r1.ebuild 17652 SHA256 d8503d67d98f0bf33c9acb09c59476dbeb2505bf55f6088f14a1b9ff7792cfc1 SHA512 ce021f323e26a0953915c75f438b2b4e5650d8b2fe1e3be02e7f6fa98f9ba3e7e4c521be8a60df741fc7e5c102d1cc150ddcf50bf460306e1a8331dd3096812e WHIRLPOOL 3a52c117ae888bccfd61ab842bfb0c51a1c06bf42a0993b492bb102a7ae0a3847db7b3c41e6414132f7ae26c5c7aee465239352566f9a90035ab693ecc224428 -EBUILD git-1.8.5.5.ebuild 18457 SHA256 d64d1b0c0d527c01deb6a0568219bc43e3fa146b84a792de183b22c006eb5139 SHA512 7de2e7d34d384e5dcbfb10971a6f587e98c10f9b439ca181cac1deda679224dab60b55fa42bc11f74645f76bb141481178a08e97b6e59fbb00824117481a9dc4 WHIRLPOOL f0e1728038093bb8bf5a73f35e150926cfc93b041d9d7b86ed96b5d330c085f17e92d4250b8cfc274ef38a7613c5398306d0fec0796226962855841036da51b3 -EBUILD git-1.9.3.ebuild 18412 SHA256 6c6cfdcdf779ade52acbfa012deadee4c6e2d0b7e25665dc5f381bfed7386f24 SHA512 88cc0fa8b541980e3becb7374459bc15cc9773f5163781a4a3cd4db7b5f3dd47073ead0b1fdaa188da0502c1daa5a35ae4c4cd2630c9b50f7213ca94657b6e69 WHIRLPOOL 92ca613a610f9aa594b9cd8c64fe3d4c0fa5837cca3c6a3bec730c935ff1d5c35eb8e909dce3bcc46d52a457537685e63dc62182188f77ea393930d2cb206b2a -EBUILD git-2.0.4.ebuild 18527 SHA256 d6e4831db644cf6e85171c4a64cc835e8b51ee1e336fa83a4c2759d3674c54e1 SHA512 9966e2b04418321b70512ae075c983c49e866186806f0c9e85fdb28de17fccd755a00f462bd07a1591ae5ce060718c5423dd140bdaae68197ec7abc4124ae632 WHIRLPOOL 731b065bea3e740b110bd363ab54834db9f0c83e4d699eb8613ca455c5afe008dae6cebfacb230b11ed10f758dacfddfaac53e9498d4c4ba0d1458a4e601458b -EBUILD git-2.1.3.ebuild 18409 SHA256 2ce33d1b26338746c13d5ef7432ab30cad39511c00bd33f77aba8fb4224ee52b SHA512 34c6b72b83ae137a2c47dd5d9e4f3a79a0981fbbb7d5ccab7262631d5f959af3193cff9b7f066d50f63436b85ce66abc9bb37a7f7d138eff7f1a5979f85293b6 WHIRLPOOL 4a6083c6f76e1301a1f09b6180ccf101609ce4435b8a5038c292d6242c048409ceed45c259df62ea82d1f561e2d30225376e50249be1eb6474a5a16ef5e551cc -EBUILD git-2.2.0.ebuild 18469 SHA256 000152e5a6075ee38cd505bd442042bc1c364e7d42324d543a6dc4dc6a6dc0c2 SHA512 f4cf0b72e49fa5f6cd9206e15e33f11571969dbc731e2dec72d28de029c01568f3d54fa3d0deb6644ccd618ff12ddc58303004014f544db30ad9f0006f2f5cb9 WHIRLPOOL 411dd2079b1c4fb33fc5054e10b6664b0e3be62ba3de8bcde1e84905888b4f1d13f58d4d9248158b361ca4ddaa41b3b4a1c3718e93c49e48fb205d27fcf8c94f -EBUILD git-9999-r1.ebuild 18394 SHA256 fa3cc6986143973187c0a6e32baceec05c807ab8349ea840a808047329f38baa SHA512 d6d467106d8d7f5101eea8b1cf4a544c2af8e204228f78815a72ca361bc913d0b8bd68fcc63dd31182bdd4378fe6e32440eee4df601c7db1e4b5f660ea5b1a70 WHIRLPOOL d688d1999c87827254b8702e19f6d37f0e41753a33c60a46ac8d5d57adfb1536b2989890a04b56ef9afbf5a3396ffdd13c45e2bef977bed265ab8edc0c8f0c3e -EBUILD git-9999-r2.ebuild 18452 SHA256 e1eccbba4391fe4fb57bbece98c0e0490e99028ddc9ca5751103696af4de7f06 SHA512 7512500e292dd0bbef6f51f40a69c3042f527fa197587e9f71fd964c2a34e5b21160333150d23186a86f91005bc33a3be15e4a7c395bd1029e7de4b63c842b7b WHIRLPOOL a635105c58bdc87a58fbb6bebf1d2e28be2ebd4209e4edb2291b83a75d91ae7e698c48ed0c239587a2cf1cc6ff4c68ab4c534bb5c2febaff0928b52058abf90d -EBUILD git-9999-r3.ebuild 18391 SHA256 0e8dd3be5fa623456221cb0b955b67ec63939cff264e79d3a5e7e341779216dc SHA512 830222693b433e08de7029ddb8e3d1e69114091c9d20016ba4b017d1410fdad1e4a6d7810043e3a927bf0cceaed329ec94fd0ca7391ff3d92386bee3b568e396 WHIRLPOOL 9af35a865974e7e267b536bb5e3868d74ea6977d214afa5e4276c53fa7cd20d5c5f5e5bc4e5c4bd073e3f73863913e62825d8e18a8634bbcdc4aa21e41d85a3d -EBUILD git-9999.ebuild 18452 SHA256 f9b103d8ce62c735a5ea0bdfb3aceee70ab6d445f60ddc3be687fe5adecd8fab SHA512 70a4d8b19b94378a11ab47813b279414af1089fd996b1cd46ba9063a3794324d800f0bb890dcd9f0cdf60db282298a49a3c16259c90edb66545346a36554be05 WHIRLPOOL fd21a7a4aa316fe544f6acacca6b9f978c904b627898b8e1c02e94c9f76b7580625f763b4eeebfbf1519731e4d03437b10fb71d605b929c0d7237c0d6e1bc8b3 -MISC ChangeLog 21451 SHA256 0b698fde8474e33b8e5bfb2b7ce1bf84e09bc5b60711143e2f771f050bea99f0 SHA512 aa1587f5172e8fb9a086b9e63e2378de8100eb48567013c6c92cf44c4d638fdc011aae3cd50b058f7cfba2ad8f6f92e99123f1f3207f19db1af5041a947497e9 WHIRLPOOL f6dd29c90adc2614c7261ed674fa5407599b00af5e497f28298e4d00172d768696d1474a09404a9689e962992e39988182ff67d2148e53012fd75fe2b1a9a283 +DIST git-1.8.5.6.tar.gz 4765390 SHA256 6a68455cc0cb96aa9cae44ac7afcb5b63a47e9da7c0ff6012bb78d184be41af5 SHA512 fd004a5a99e8ff80556e669ef6e297a4eea9c9f9c58ef9162eef1c66580c4156165c81371ff5832e56ad729d6ed3fb1459a14d682cfd2b8c37c9ceb298be2ef3 WHIRLPOOL 665c9380314abc85cb1e3a114fd60a4f535d7a8aa25437c8c3ff8bc0a3ebedaeef4aa7a6259108ab2f79c3344810b5c2f86f85546fc9015d031c89762bfc4f33 +DIST git-1.9.5.tar.gz 4851532 SHA256 44efbc76edb50103e0d1b549dac006ee6f275fbd62491d7473e21127601f55c1 SHA512 0fa0a1fd636ed29ef54885ecbacc239c2b6edd4820a633fd88a8f62dd7e50ead1676aa0c3cf0df88a49dd5e1364f6b8da3ec9c115d1bc55bba4bf413539bedb0 WHIRLPOOL a860d6b194e27d9a5ba086d665c0b31870d4fc71380a44ec55f0b7f19c6bf973ab0d628e531c175138fce54dfa7d799ed9ab276dffaf9bec66c45cd885e324f2 +DIST git-2.0.5.tar.xz 3437996 SHA256 f5a63f5073c7f10d0676d0dabb46df48f2af77624fe24e1c6047b0e047af8ca1 SHA512 a2de101462cb7cf79ae596a5c7a77746fca430d6ae819731eb025a784b38b48b98964aca3db251e1a598ff17ff26b3711b044bd9c579d01346a8e1e77f7aa6de WHIRLPOOL b317f7b57a8a568b8a63ddbb44d6734dce01034c1b50491e3aedbb8a4ad2dc0f781b9edfad07e73ff050684f05734ee5f8b5483646967cbcd0a3cf7c600394eb +DIST git-2.1.4.tar.xz 3544804 SHA256 a04968b9b10cbcb31a7054aa3a0d11ac47c83556ecd270ddef1987df5d3d053e SHA512 17333eda9600287be1f366271f314619354f6bc9b7f867d59a9493441e71a963340cedf728b5954ac6311f5426a928a2beacfa7775e1a4d439b58e0dcf310a0b WHIRLPOOL fc20c64e0d494a13834c71ffa5c727018fc3940f4dc65ae4eda6ba14af2faf2864d779e706b503c69a16858ca051878e27bcfe1883c3c206dda6129a1bc5aceb +DIST git-2.2.2.tar.xz 3592264 SHA256 aa6d2efcc0c7bb9b9edc6d56d90921706b833972f1d2abe70f71be7838f22d05 SHA512 e3ca6f40de04ed940f521fff4c7e92446e40ad1627acc5b4c090ebf114dcf279d4b1f3efe1189ffa43192fce412165621fc12ea90e2f7d02a6a9ccda655dc69b WHIRLPOOL 9e20def83bbb9b11cb5982fc5f19b09767657ff80f02a237dff6ddaddd3209b4cfb9288bec1b6dc80c6a6db1869cfcaa90e2374279012fc8215771c1a58a1fc2 +DIST git-2.3.5.tar.xz 3620472 SHA256 d7711324a58d41b4c46d1e4d560ce17fec5f79fa0311107c15aac866f2c1645a SHA512 28d7906aa3e315c541823b30b877855abb68b69b40068f1ab00470f55685955664b1e7045ec1476c47df14c95acc29742f1aa5ff8ceaef0b622c99300b4e9c10 WHIRLPOOL 947f99853394fefdcf016424802476820685135b124d16d9d829538cc623266093c4716190957519bcb17064548df4a1865041f96879393913fa495df0544a33 +DIST git-2.3.6.tar.xz 3621716 SHA256 3ce01c54e92b47366756f57742280e052412efde65344e31f51ad8a48a7c60fc SHA512 53ad21db0fa6bb48ee24302c35ee929b1bd1fae3b646845523e7105b8539700cef23e2425170dec0311c7e746c41b743cfd78f192613b586291e44b49c3c284d WHIRLPOOL 12cf33fc19efea4f885a9b5c6d7099893b92742ffaad8e407016abfc5232ddd4763db95fc657a185830e2f904cdb2b04e8ad1c4305f09d77ff8f7db07c139799 +DIST git-2.3.7.tar.xz 3621804 SHA256 eb4696943f82ab55be71048d6e640942b78cd179ec501989aff8706b57f6515b SHA512 87502626d228c8c231794cc8fde29175578c1a5d4bc69aa2fd722f5a2ca3860cdb8c54aaa679fc56bdd498810e75af60e568bf4ff3375f5ff54fdc98a46e2fce WHIRLPOOL 982797f9fe540fe980a3c566d1b77b9342a420e21df97203a4e7990988b8eef7f7a37aba4f7158ca72db01a16c8f1f90a9b94b5c492a184ead8c1be98896928f +DIST git-2.4.0.tar.xz 3681516 SHA256 b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24 SHA512 0114c5d0dbfeed46e0ba1c8c0da463c52cae6954238547502f44d9050af0d921906beea96ff2c5f56a7c822200d9daa0f1d040f883c701b88a23ec81ac777138 WHIRLPOOL 1f4667b295e541d4f035de9e415636f317f590e104119a1b212cb321f25120df31e45ba88470ee883d1ea9a0033f2b307981c9d9e5807919475dbc5f81b6b22e +DIST git-htmldocs-1.8.5.6.tar.gz 2242475 SHA256 7c8e955d0798686fa030ba7b7b384a2eab2b74d5bd695d82faecac2e247bd211 SHA512 c9b2752bcdd7f8f817b14e99ab2743d153e3e7549bffb2aa98999e46d1e965d045850ec6a3e9f6bc83e6e4820ce20f281c33f946ebd2be16d275b85a5ddaee36 WHIRLPOOL 7db3fb74e6b51618890acfef8fb89ab09adf653d3196e82624671194bdb2b564b903429ffecf68b28faf96ce3ebb83b534459738d48ace048d873c158621d31c +DIST git-htmldocs-1.9.5.tar.gz 2262251 SHA256 4fa289e259d6b922a51d11a687203612aa1aad5696eb83b4e67c0de8a785700f SHA512 2df975c33d3411a97ab5a684b03998b7cd188d05bae6813c753fe2092b0acf463dec49a7a546d315f520fd9c71281da41998d0f36f64f48d4f95507a034a083b WHIRLPOOL edc252ce58b31f001c0d225f0b40b3689028bd34b1cbbdd889d645d37a2931e9039f76f12e5a0f918579a0b9c5dd1f3171af2bb58ee42972411ca33ec0ebe8f2 +DIST git-htmldocs-2.0.5.tar.xz 944792 SHA256 90eaf745d6ee197718fdde9c98919918ad1e4e3576608e4522b84c612cd9ef2a SHA512 e9b3d92d466762c9c7e164e9c30ff0046b262bf4707ea057e3a682f7b15a4f8149a9aaf2630f117dc3b508744cd688c6c0087cc94ff3477e7f3b85513160d7f3 WHIRLPOOL 35970d099304a5ab174fc93f8496a0c651a259dcaa3d23a2dd0233f8db214ae94a26e28044a87460d4654e61440427d331ceeac290335d6ae3fcf0423175bba9 +DIST git-htmldocs-2.1.4.tar.xz 959144 SHA256 7665daecd77c2f9be8b316eb69a1fda3f383f759e71d346a137c8cf39501d886 SHA512 7734d671ab6ca8374f54546b0987821d0c66d136d50f9cbb1ff7c06da25330e46a10ede41d10a60c80847afa68999298c2f90dfe99d51bd862590f02344e1cbd WHIRLPOOL 97326a00a1f613cf95dbeaf8938842855299d21e6963e2040b3bf9ee02a745c8156ea552e2b87248a98d5f0ecd6560a546a4a49b6635ca034ff2e92504bbb00a +DIST git-htmldocs-2.2.2.tar.xz 976312 SHA256 41179ff0816189d583f290a227a73788002a319c7ff8c5cada970878c50b901d SHA512 b51b7d619e82d83b4f0b90d31bfccc30291a5beb48b2f5e5e59e75e91e5d772e89b560534a683648cd5480f4bf241f733efc87b30062ef5bb003bf0b5dbeed7f WHIRLPOOL c9dc7ac1a40559e4306d7d97a1619a272faf83d8b05c5a11f5f7b010566cd02fe853fee7eb550c6ccf744db446966a9696f9eb6feeee7ce4f976c6aa88b097d2 +DIST git-htmldocs-2.3.5.tar.xz 984588 SHA256 0e5588248735a209aaf0b7606e647fc9c4f90e0d5184ee28da9a41eccb85eaa1 SHA512 fb0ba7beb4e1e19db666e7c5e3066860797f847d0b780b00ad36a283c78d6fe39cf7c880265a6d54accc9b424c4b5c1ddb68e44ef4ea5f57275497427c119973 WHIRLPOOL b34015ac33f7b4c20cfb051315ed64f818b5464fbddbc4789aa1e7751915e429fc6e0a5a0845b1fe14e1a56ee7522d2c8cc05c5c7a8e153914d94b941a62a41b +DIST git-htmldocs-2.3.6.tar.xz 987292 SHA256 b37439087ae465534588a65380e3acb66d3e6949904ede720febeed1dc5d8b49 SHA512 ccb836c3df4bfb96174500295c630aa1ac3bea475460434e4d097c3e178bec5a0b5037ff17281fe6a6bc7bb3ae6bcac03ee4009611bb222eccaebc3ae6aac81f WHIRLPOOL 8c58f108d1ea95bf552604b956e727dcf7a8f0eed8979239b0b6ab931aceffc76434137b5f76054563a09985bcaad0a03359da8791469adae71a3a8821084d58 +DIST git-htmldocs-2.3.7.tar.xz 987448 SHA256 8e797f1d50ef4f5681fab9bd2e45ac6c1d75b4a87f67d7a55ac37e1befaefc7f SHA512 7ec6ca9c43fdae5469eb2d81cd2c4325e3baf28028c0170077b0fef4f5c2620ee5c4ae15f021eb84e5b11d19dd13b39d38e27e14b162b690f4368a44c5b8a175 WHIRLPOOL 72eb57e299ff6dfff31a041e7ba0b85b5e65f1c163b2bf89de2e34308f2e6849333caa7d433d3352e55dc112ab60f48b777056618ee3c99ba67ceb643a8f99ef +DIST git-htmldocs-2.4.0.tar.xz 990744 SHA256 70ee1fdb70507c74832ac021e8940c8249d9b69f2b86aeaf0888ae41772e93a7 SHA512 03837e671a08f08ab7bd70676e234995b44a53ce27c648c50a6dd5ff97ba4400beb3d4b7874d6c8bde3a00624a7c2dc15d15299eb7ad9874d7dfd722f2c2256a WHIRLPOOL 4877dd0c5fb94f032d11d5d22a3e90e8352f68afb50400eca8c2f42e72adf40c7b9878c7998cacf16ed2011b85f965bcc5c44ecb3fd931783bd07b75b84b800b +DIST git-manpages-1.8.5.6.tar.gz 569061 SHA256 58ef7cb3121639b8d78e2e4c4f7f886bab57af9e9e137b10f372dfad573872c1 SHA512 a524a1c7e8bdc73ffe04bebb5c7050a18c8649b98714bf255c8e3c32a2443d8d5abf33e3ca2eb108d601f01e0bda50fed1e134ffdae87bcf6f551cbbd250c4ba WHIRLPOOL 2db62b96e972dbcbec1ac59d7244bf2c2ff7140c941d1d3c6b9062bd79b80541d7fa3982c5a3bc55a18fc9112ab3fa648966be5c3e1135ab7b5c89080bee82b6 +DIST git-manpages-1.9.5.tar.gz 571625 SHA256 37cc735c4ced6574e8e93349d52d30372fc6f9fe3de3d6b9934a14857d6aade8 SHA512 e3df3e933fed6ff2845989a0146b28789452e9583bc19dd4a9ad335f64b15feffbdc4dd7cdb9d6b5216f7f85837318cf9b10df033f8022777f91c2b0894fb231 WHIRLPOOL e25d77fd8d9cacb92d45fd50640bc65189d02d7e23b276ccaf3b35ba1fe64ab0c49045d1fb8983b7b2b5bd996e767508446ac76506b074ded10feef1f9256918 +DIST git-manpages-2.0.5.tar.xz 359000 SHA256 3cf1581da2a19c0651df445ee5f801e108619befe8965e01d61faa46ca57b642 SHA512 b3981565a34a203283801b86717386971ef53c2f5c47bdde290aa0df4d62045ecbcab1ff1b4d1d8ddf7d489e74d65b0208d87ace7ca8c8be9525be548e445425 WHIRLPOOL e8c78eb38cb3192455ccb991a4ce5cd3988d06f1f06cdf0722e4ce6fb1d4e57f618058cf07d312bcab4f5821a1b1dfc016c03626d4f3429d3e5ef089607a2801 +DIST git-manpages-2.1.4.tar.xz 361252 SHA256 01070bc96e88231f6f279b031fed2919efea8b442fe724f37349ad951d010b04 SHA512 35fe0dd9e0fe9547362abc0e9c5b066abc13a4137b4ea62569fa5b1ae93831da0686e8783be946a9b87274fbc2322ef93425b9d3fc1257023176c772b21b79b2 WHIRLPOOL 9f199eb94657149b51cb20fb55878cb1cf83fa3741906ce37a66b0157df9ca4dae66754fe264019e6bd8e7d286040fec718b89ca4b40b803c059c46521a5cc61 +DIST git-manpages-2.2.2.tar.xz 369876 SHA256 d30688bb62763bf1b87f5eaf4c0a66c68999e479ccd2963108a5f6f82138147c SHA512 5c2220bb09f199ad4fe5c1bc20a813a6c62daab5e6e7fa87bf24861d25b7f7e0fdde215c4f59d8895badd7c361ed202e7837de48d2d54a155d24759db39dd4e1 WHIRLPOOL 45acc45663f13faf5b8197516bb934723bf84cd6db929443e2bd9fc3a915baf258ee93e782741e088a5f799115ea4ee6043225fc9ea9ec954feed21ba54c9be4 +DIST git-manpages-2.3.5.tar.xz 371644 SHA256 8a1d580a45f9ca3220a59f96ebab9194c1ae6e1f3b30c8a934807040ce6d1940 SHA512 c23f826c7cc1446545429e50877f1d17e8f4d1f9b28f0b043254fa481c2a49be2020c9af44fe6c3d9633c56ae2d2f583b6a40ef9aafe774f4a316a9252d51c4f WHIRLPOOL d82ae6a6f82a917db8d5edb62188f6a574fc34bd0bfcc7d07b8c1efa0b6e6c0dc30f40ef03035e685c833ff078d477cd4dfd309e9d63830a9a653826903bde7d +DIST git-manpages-2.3.6.tar.xz 371620 SHA256 b1356f5cb3e7bf53445b08f24ea6950ef1f80031aedd6cd90e3ec60ff1f06b02 SHA512 c7ff2e6aea8c0c12009f29724c899e606b6620e7d408ee3c536fb5239ebcaa0b790a6ee1287dccd88df8776fbc2e72e799124426dbacd82e12f05e3f9f3c909a WHIRLPOOL 7117ba84d888ea448807f3bf51f958b86de011afed1bbad78abf4390c1a77f799f77781f4d9bf1e9287ab903b912b7ca270433c1f4a1f112a4cb4840dde3d400 +DIST git-manpages-2.3.7.tar.xz 371556 SHA256 77e783b0ff15f6c0048bb6c4b79b141dd045516a45fe72c2a4b6fe1434e476ae SHA512 fb8a79c5b058faee528f70df93f9743b2bc2399e0b0737cccf26691f9d5a2697430587a95706dc70d2130cf56139ecf5c0b172a5ea475f0c2d333d481bbcbb9c WHIRLPOOL b475367033b3444c098cf225abe1d127d30b3adc9313b07f15145f67ef5ee49bd89e8ddabc253e7d3378c360fc30ec69a110365b3c3f5333f7d1bd66e225a248 +DIST git-manpages-2.4.0.tar.xz 372716 SHA256 b616dc6aa02dcac312e6aeae7af148913f76e1f851ba03ba340b4d2db316ecc7 SHA512 158bff66b9f73fc72d3ac6ac3246bebf831551c0ff1e9571913b952f5b891407ab4408ca2daa247869e50d43bb2e951eed6fdb3c39708c769630bbfc618f0efb WHIRLPOOL afed2ad93d6cf3deb571839d268a9aea66d4c2c8571b85a377a6ecd866df8ec8d07d22b65ddb9bc49ec7f16f8c9ecc54e936cd35325f2270264ae8d42e708b01 +EBUILD git-1.8.5.6.ebuild 18421 SHA256 7ac69a54ac5a149a7b3233ad11ef452c938d2432cdfa50d27e2b1dd885120162 SHA512 2c3380c00f921996f96c3193cdd26ae2e88781ed4e44415d2eb2771b6a108108845534178f06c8c457dacc844e69c70b141a8ab144e0b1a93145261e8254e60c WHIRLPOOL 85812dfece3e19482a02d50752aff1e17d430e5fe4c3383766e1aa6913a62d9eb265d302badc3c3ed2c5d162ef6bdce5ceaecf6f77fcb421b9cbe6025af6bbaf +EBUILD git-1.9.5.ebuild 18367 SHA256 b621ac63a7c58a540765704c008d000e208a8ae4fe247daa75061c64cb475870 SHA512 7147fa41bcc3425a1b7889cdf3e6b8d4cef9b266506a3f172600684a1bcba35c4d2677fdaaea9ae7dff17391ddbb7bf5c4b651c68ff88c762cad6201446fe7e0 WHIRLPOOL 3778413159737431291eb617d982474cf5c9a84dd8a806371bcfaaba6787b3c4e6024fc96655128861ae0508e2e3eade30497f55016f6be212c37d47a4e6c270 +EBUILD git-2.0.5.ebuild 18442 SHA256 823dc63150bbdaf727774692482af2536d26a45aa0c630b6255d4596dadfbbae SHA512 e06b9feaba9f5efcf3d7ad57e2966d7656ba33424945043b4e00c8e73d4b9d70cd7bc6c76c01099d42a7e6eadfa6b02862653e8756b7d799526a8e585e580b15 WHIRLPOOL b9c474d9095e92b9048ac9bfdde848c5d77544d0901dc46d5f9adc65109d5423be37a7dd2b3de2a738bd99ccccb3046c12823984392f7d134909030f730e5f02 +EBUILD git-2.1.4.ebuild 18372 SHA256 76bad170060e158c02ad9102b502e9a008fb9252e120c91bb70b5dd5c931114f SHA512 37ad79535d598cc2cefa2b45928599aac3fb7535bd92d8d9bbf3a5eeea44e107c49dfc1fa53d3de448a768e2bae29b737250590e6cad008fc0418f2dae02d17a WHIRLPOOL 4f0795b72a4456dffeec72460b1ee58a3ef8a88f5a0ee93f73d5bb640ea1fbdb64b8794b273413bb35da12c7d45ee724491eabfffdb6a0a24fde8436b65493f5 +EBUILD git-2.2.2.ebuild 18153 SHA256 9725ba5c4744916e98d7e4d9cb1dcfb11878c8d57842c1e6d4479b81c4a49ea4 SHA512 7628362467c798a4410f2becf0ec347058834286efdab9443a38a40d115eb24715bf5fd8ece87d28db51abeb55b97be3e752d5ec3a7e7e934d70634bc5e7c2de WHIRLPOOL 82effaa9b2da375e8a72c872a853f57c507d8c15e465cc94135b145fe4f615e954e62c75fa6ebc35669dd76973a4638fe31543b8d5c4d80418806e1a48584dff +EBUILD git-2.3.5.ebuild 18143 SHA256 c8e88f34669bb7410903311a717fcf64ebf5cf52fa2533ef90bac870424c8654 SHA512 48fac3ea17f767114a733decd1caffe12438020872cc0dcfe7784dd8fcaf39e00624bda5415c61a0aa077138ac8ee667ebad686b089f16f3c352d0536b7bff3e WHIRLPOOL 5079f24e09955176ad26dbfdc3bc9a85207ad91f8cbe25e58a31f35e74286831655069988d8f8be76e0b068cb50a8af7ae3e002fc2ac49a54810a4386f7ae56e +EBUILD git-2.3.6.ebuild 18140 SHA256 1afc8d723b899bbb4e8061bd084053d028afbf9ff7d63b6a592326e347232c54 SHA512 efd63728d85d68e1ccea62fed2479a872a8575ad647ea976911fb02a12961d593271273c504a467021838fb963c21767f640c043d98ac6d4bead0b591dd86004 WHIRLPOOL 3a749c2dc187ae99ff29c3d6ce521a1f201dcd1544c0aaa8426596da893c5e5fbeb9ca296ce83aebd0b53f8be7270ee7e333f7250df5b9d1cfd845e204a20fa2 +EBUILD git-2.3.7.ebuild 18144 SHA256 e730d6b73e37bc099aa96d7f7e46e97480af8a2d2df7ad7b3f5999bff48c9981 SHA512 29a024cdf9298e3d5bd624e5f0c36b6e5af1c58132a8c05b5ad92f2bf7377bd99db62c2a8f94275571c8698715e46e3820bc50cd3ba743e7efc0bff60ddd084b WHIRLPOOL 9567e7ef97613423413665aeeef3ec3d2afe1d55ce2e041e9690f55fb1613134acd364066c5787ec887af1894ac02ffd13424f64b1a656ec6105135921add347 +EBUILD git-2.4.0.ebuild 18144 SHA256 e4e6af9575d5553cab0c0cd3afb7eddb42ce8864dabff9abc8104293a195ed86 SHA512 0236f97a26859d790fad965ddddba52c133c05e63aaca571613c8d0d057f0896b7a6ab74deab5b9fa7049a2c18934b53d4aab627109ee647eea6bf8f5aebf60e WHIRLPOOL 0484aa4078c199b2473830bd914b5675c603a56d81cc7b9c3387e111da31e9d647f9fdab97f4e80f9609b18a85a2f653a4aa5aa9124461e6958c8fd7e00936fa +EBUILD git-9999-r1.ebuild 18409 SHA256 501aaa84711a431f26caa24ac7236a545f3bf9682d840ab1d8695adbc84a609a SHA512 52d1ea1fabbb203b92cbe9d57b234f4d3292bc804da5bc87b88280818f8a86b6821c5b9eb6ad7faa48694a728fc051f2f644315723a7e8e63fe0d2e1485eb554 WHIRLPOOL 722c07c0129dc9918f64f2cdc02d019544ec1ac41b5a933cd91c582a11481d135fb8d1e863784a4ecff8f1b5474febe6bb30a27ddadbd0f5a9d9e74c234bbd5e +EBUILD git-9999-r2.ebuild 18410 SHA256 8456250ca25be9f6afee0bd8a3097d129f4cd3a9b036aff70f98fffbf43dd5bd SHA512 a11cebb22a85c6aeeeb9d242910bb60a4fde8d63a724b7adc60095ce1dc6231b0edec88d8624e19d8c62106723ef3ba8b1459fc539c448cffe0ab89b2c063977 WHIRLPOOL 6caaebb53772012dc652f86c72d5c3dcdaf37d6c37656c3a91c80b8e3692ff167ab70ec06e2ea8c800484631a062fa8e7beed9769a5007f9a64fa9bda7e98366 +EBUILD git-9999-r3.ebuild 18406 SHA256 a2588600eb6f8f1b595464238ae859bcd289c00675aed77166ac76c035595890 SHA512 9f4d2dc64d0a4bc683c634fa759446846c353fa638dd7ccb0f5273f061f611a04b3747ecd2248c3278a06483612bb84403b4b1856a1ec9778d3d8ecaea2961fc WHIRLPOOL e7a343624a08ac7ed068557d3abdeed9fd28b7eafa5f80e57e914b91674b0114f6108a613d0a06fddf4264d99258b9d004d905d70bb8bc85665caf666769e4b1 +EBUILD git-9999.ebuild 18409 SHA256 82e5b50c046c6fcc34f1843de49c13ea8644dd210b428026e05665c6551ba4e1 SHA512 f672fdcd5f42dfe1873b3c823beeb61af523ca22f472b8128bdef338af4160c66d4badf2740a914abe22bde51869ceb71c5ceef439a46668e5b1a9266f0c0973 WHIRLPOOL 23efa18886ba40b95fa4de2542d5e07a8c774a03e61913a6d94324ad0cc64b5ee3bc7fabcddae8622a0c202b27003d09eb0121b6b950d8e4dde8f9aeeb91c124 +MISC ChangeLog 26232 SHA256 d037f074b389edbd9f35c8d213a945b80f9b1098287cd33a2eec4f2c2d829aa7 SHA512 36abeefcf1029ed9687d73bce61fe3405ec5749810659a0d85093f0e5e972840d48ba7c749435da054fd595bf32eff34b7b6a266cc1f5860b2a4af66f368ed28 WHIRLPOOL deb7a208496e35a3ec619bf25f42ca88828bb1ecdc0d9d0c6a8181c027c9bd96d701aa29ca55198744f4abf45b6ff8b5a80c8bd9db62f158b5cfaaa80e47c7a5 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4 MISC metadata.xml 1877 SHA256 74e93a953d9484c1f5806efc9c80bfa729b4d53415a00168e5ffec255750f7bd SHA512 3ef0d74206f67c27b82cefa40602cd33e432cc0f06ce900766d32f1ebd0a71d6cfa750ae77660531fc61a1117f7959d7df6ec10f439cfa2ee372d54d7ac87c5c WHIRLPOOL b9d97eb6b92a1894d965a5e9fbfbfd0d64625b31318fab2eb11b4dcb331133dbf678f62a7216c12b53a2546fa5d6a07c6240bddfa7784a925eafed602a7ffa75 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUfWsqAAoJEPiazRVxLXTFmgMP/Rpgxj+nwjtu8ATEOBB4z4Oc -VTxYTnanmOOcuWv8lUyL+R3RE7PUu09iBfLIcCfPwbkO3LCIyFkY7Ka76KWO3t3L -CEZ0dSXTk/RMKhQXl3LKWqojg5JFd6X6u80LANsvJIjC+t4VG54KPTzE8fJRdb4A -w9rWZ9+24tEiTV7YN4acqtKbAY8Lrlg4caA7FXWLLAMP1WUcP1hOHHtwqaNtN3Ye -AHnWwLdexntT5RSM/0+ux4gcwmplQcBQa2ga3S6xccpdVoTEmoR2XG+EIGLNoO4N -hBF8tod017dt6lkutVnt1Ld1hSzS7OS67DXgfXf2iC+9cQuG+VhW65V7GJjbCgtB -3YjZg0FvUmOww9wNOI04m1quZykQb1rc1Y8Su1v0sV/clXSXtk1E+rDZwR4G8x4b -KlXeKfbcEnUptOnWAtspkIO/N/GeNhkC6fN4m0NF9RLmm5qBLX2WoPDYcd9wQJnK -tuPrALh5As0EbBE47Gd2AgBQ3ueFu9uxG/Ob/D4/sy5h94gfqVHzL5alUB2b7rJn -t+SUIUSxeNSqRjwUrAwVJ7ZXCdlnIGyAuAqnlLe2r3OQvybh5h9xBVFWIPAG7+ru -3j5uqFyFUQ6jVt5O8Bwbl7ye+Q1uNg7ZzzH7PR5USSkCJkyLDTAO1yeRdng52g7S -9jXl3G/FjWCENOIxTnOQ -=L0Oz +iJwEAQEIAAYFAlVQ7IEACgkQG9wOWsQutdYCfgP+NW5swzAR/SeJiJFkvL45vBl8 +w5Ty7/4zupJD9y7Fhr4YZW1nz8dmFikCLJFWuUjQTUiAtvLe3MoU+x1ZOhDSyoo2 +K2EXIMV2F6PZPpuEv1hgXkFM60OdNdekz2QrKbfdbcp7y7U8PxCxrJcE3xn/ZvnA +plY24WGOxoCzkxc1lL0= +=iimj -----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 deleted file mode 100644 index 4fa0b3e1ab..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.2-optional-cvs.patch +++ /dev/null @@ -1,369 +0,0 @@ -From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001 -From: Robin Johnson -Date: Wed, 22 Aug 2012 04:25:06 +0000 -Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface - utilities - -Forward-ported from 1.7.12 to current git.git v1.8.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.4-optional-cvs.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.2.2-optional-cvs.patch similarity index 52% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.4-optional-cvs.patch rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.2.2-optional-cvs.patch index e9ea9d6caa..af815e2394 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-1.8.4-optional-cvs.patch +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.2.2-optional-cvs.patch @@ -1,15 +1,34 @@ -From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001 +From 12b82e03b971da618f19d0194dcf19a77b273766 Mon Sep 17 00:00:00 2001 From: Robin Johnson -Date: Wed, 22 Aug 2012 04:25:06 +0000 +Date: Wed, 21 Jan 2015 20:48:03 +0100 Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface utilities Forward-ported from 1.7.12 to current git.git v1.8.4 +Forward-ported from v1.8.4 to v1.8.5.1 +Forward-ported from v1.8.5.3 to v1.9.0_rc3 +Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0 +Forward-ported from v2.0.0_rc0 to v2.0.0 +Forward-ported from v2.0.0 to v2.2.2 -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/Makefile git-1.8.4/Makefile ---- git-1.8.4.orig/Makefile 2013-03-13 12:15:22.000000000 -0700 -+++ git-1.8.4/Makefile 2013-03-19 16:58:52.922806111 -0700 -@@ -266,6 +266,8 @@ +Signed-off-by: Lars Wendler +--- + Makefile | 51 ++++++++++++++++++++++++++++---------- + t/t9200-git-cvsexportcommit.sh | 5 ++++ + t/t9400-git-cvsserver-server.sh | 8 +++++- + t/t9401-git-cvsserver-crlf.sh | 15 +++++++---- + t/t9600-cvsimport.sh | 41 +++++++++++++++++++----------- + t/t9601-cvsimport-vendor-branch.sh | 11 ++++++++ + t/t9602-cvsimport-branches-tags.sh | 11 ++++++++ + t/t9603-cvsimport-patchsets.sh | 11 ++++++++ + t/test-lib.sh | 1 + + 9 files changed, 120 insertions(+), 34 deletions(-) + +diff --git a/Makefile b/Makefile +index 7482a4d..a644c8d 100644 +--- a/Makefile ++++ b/Makefile +@@ -254,6 +254,8 @@ all:: # # Define NO_TCLTK if you do not want Tcl/Tk GUI. # @@ -18,7 +37,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/Makefile git-1.8. # 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'. -@@ -440,6 +442,7 @@ +@@ -433,6 +435,7 @@ LIB_OBJS = PROGRAM_OBJS = PROGRAMS = SCRIPT_PERL = @@ -26,7 +45,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/Makefile git-1.8. SCRIPT_PYTHON = SCRIPT_SH = SCRIPT_LIB = -@@ -481,13 +484,14 @@ +@@ -472,13 +475,14 @@ SCRIPT_LIB += git-sh-i18n SCRIPT_PERL += git-add--interactive.perl SCRIPT_PERL += git-difftool.perl SCRIPT_PERL += git-archimport.perl @@ -41,70 +60,125 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/Makefile git-1.8. +SCRIPT_PERL_CVS += git-cvsimport.perl +SCRIPT_PERL_CVS += git-cvsserver.perl + - SCRIPT_PYTHON += git-remote-testpy.py SCRIPT_PYTHON += git-p4.py -@@ -496,7 +500,7 @@ - + NO_INSTALL += git-remote-testgit +@@ -486,24 +490,26 @@ NO_INSTALL += git-remote-testgit # Generated files for scripts SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) --SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) -+SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) + SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) ++SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS)) SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN)) -@@ -1786,8 +1790,18 @@ - $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ + SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN)) ++SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN)) + SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN)) + + # Individual rules to allow e.g. + # "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script" + # from subdirectories like contrib/*/ + .PHONY: build-perl-script build-sh-script build-python-script +-build-perl-script: $(SCRIPT_PERL_GEN) ++build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) + build-sh-script: $(SCRIPT_SH_GEN) + build-python-script: $(SCRIPT_PYTHON_GEN) + + .PHONY: install-perl-script install-sh-script install-python-script + install-sh-script: $(SCRIPT_SH_INS) + $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' +-install-perl-script: $(SCRIPT_PERL_INS) ++install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS) + $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' + install-python-script: $(SCRIPT_PYTHON_INS) + $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' +@@ -512,12 +518,13 @@ install-python-script: $(SCRIPT_PYTHON_INS) + clean-sh-script: + $(RM) $(SCRIPT_SH_GEN) + clean-perl-script: +- $(RM) $(SCRIPT_PERL_GEN) ++ $(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) + clean-python-script: + $(RM) $(SCRIPT_PYTHON_GEN) + + SCRIPTS = $(SCRIPT_SH_INS) \ + $(SCRIPT_PERL_INS) \ ++ $(SCRIPT_PERL_CVS_INS) \ + $(SCRIPT_PYTHON_INS) \ + git-instaweb + +@@ -1677,10 +1684,24 @@ git.res: git.rc GIT-VERSION-FILE -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@ -+_SCRIPT_PERL_BUILD = -+_SCRIPT_PERL_NOBUILD = + # This makes sure we depend on the NO_PERL setting itself. +-$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS ++$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS + ++_SCRIPT_PERL_GEN = ++_SCRIPT_PERL_NOGEN = + ifndef NO_PERL --$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak +-$(SCRIPT_PERL_GEN): perl/perl.mak + -+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL) ++_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN) + +ifndef NO_CVS -+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS) -+else # NO_CVS -+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS) ++_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN) ++else ++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN) ++_REASON = NO_CVS ++_REASON_CONTENT = $(NO_CVS) +endif # NO_CVS ++ ++$(_SCRIPT_PERL_GEN): perl/perl.mak perl/perl.mak: perl/PM.stamp -@@ -1799,7 +1813,7 @@ - perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL +@@ -1693,7 +1714,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 + PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ) +-$(SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE ++$(_SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE $(QUIET_GEN)$(RM) $@ $@+ && \ INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \ - sed -e '1{' \ -@@ -1824,14 +1838,17 @@ + INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \ +@@ -1727,14 +1748,18 @@ git-instaweb: git-instaweb.sh gitweb GIT-SCRIPT-DEFINES chmod +x $@+ && \ mv $@+ $@ else # NO_PERL --$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh -+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb +-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh ++_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb ++_REASON = NO_PERL ++_REASON_CONTENT = $(NO_PERL) +endif # NO_PERL + -+# This is any perl scripts that were disabled it might be empty... -+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh ++$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh $(QUIET_GEN)$(RM) $@ $@+ && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ - -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ +- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ ++ -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \ unimplemented.sh >$@+ && \ chmod +x $@+ && \ mv $@+ $@ -endif # NO_PERL - ifndef NO_PYTHON - $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS ---- git-1.8.4.orig/t/t9200-git-cvsexportcommit.sh 2013-03-13 12:15:22.000000000 -0700 -+++ git-1.8.4/t/t9200-git-cvsexportcommit.sh 2013-03-19 16:56:29.124993905 -0700 -@@ -12,6 +12,11 @@ + # This makes sure we depend on the NO_PYTHON setting itself. + $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS +@@ -1964,7 +1989,7 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \ + XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl + LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H) + LOCALIZED_SH = $(SCRIPT_SH) +-LOCALIZED_PERL = $(SCRIPT_PERL) ++LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) + + ifdef XGETTEXT_INCLUDE_TESTS + LOCALIZED_C += t/t0200/test.c +diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh +index 812c9cd..906532a 100755 +--- a/t/t9200-git-cvsexportcommit.sh ++++ b/t/t9200-git-cvsexportcommit.sh +@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then test_done fi @@ -116,10 +190,11 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/Makefile git-1.8. cvs >/dev/null 2>&1 if test $? -ne 1 then -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9400-git-cvsserver-server.sh git-1.8.4/t/t9400-git-cvsserver-server.sh ---- git-1.8.4.orig/t/t9400-git-cvsserver-server.sh 2013-03-13 12:15:22.000000000 -0700 -+++ git-1.8.4/t/t9400-git-cvsserver-server.sh 2013-03-19 16:56:29.124993905 -0700 -@@ -11,9 +11,15 @@ +diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh +index 6146c3f..2a675e3 100755 +--- a/t/t9400-git-cvsserver-server.sh ++++ b/t/t9400-git-cvsserver-server.sh +@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server' . ./test-lib.sh if ! test_have_prereq PERL; then @@ -136,10 +211,11 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9400-git-cvsse cvs >/dev/null 2>&1 if test $? -ne 1 then -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9401-git-cvsserver-crlf.sh git-1.8.4/t/t9401-git-cvsserver-crlf.sh ---- git-1.8.4.orig/t/t9401-git-cvsserver-crlf.sh 2013-03-13 12:15:22.000000000 -0700 -+++ git-1.8.4/t/t9401-git-cvsserver-crlf.sh 2013-03-19 16:56:29.125993925 -0700 -@@ -57,15 +57,20 @@ +diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh +index 5a4ed28..04814cb 100755 +--- a/t/t9401-git-cvsserver-crlf.sh ++++ b/t/t9401-git-cvsserver-crlf.sh +@@ -57,15 +57,20 @@ check_status_options() { return $stat } @@ -164,10 +240,11 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9401-git-cvsse + 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.4.orig/t/t9600-cvsimport.sh git-1.8.4/t/t9600-cvsimport.sh ---- git-1.8.4.orig/t/t9600-cvsimport.sh 2013-03-13 12:15:22.000000000 -0700 -+++ git-1.8.4/t/t9600-cvsimport.sh 2013-03-19 16:56:29.125993925 -0700 + perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { +diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh +index 4c384ff..d601f32 100755 +--- a/t/t9600-cvsimport.sh ++++ b/t/t9600-cvsimport.sh @@ -3,14 +3,25 @@ test_description='git cvsimport basic tests' . ./lib-cvs.sh @@ -197,7 +274,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9600-cvsimport mkdir "$CVSROOT/module" && $CVS co -d module-cvs module && -@@ -42,23 +53,23 @@ +@@ -42,23 +53,23 @@ EOF ) ' @@ -225,7 +302,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9600-cvsimport (cd module-cvs && cat <o_fortuna && O Fortune, -@@ -86,7 +97,7 @@ +@@ -86,7 +97,7 @@ EOF ) ' @@ -234,7 +311,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9600-cvsimport (cd module-git && git config cvsimport.trackRevisions true && -@@ -97,7 +108,7 @@ +@@ -97,7 +108,7 @@ test_expect_success PERL 'update git module' ' ' @@ -243,7 +320,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9600-cvsimport (cd module-git && git log --format="o_fortuna 1.1 %H" -1 HEAD^ && -@@ -105,7 +116,7 @@ +@@ -105,7 +116,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' ' test_cmp expected module-git/.git/cvs-revisions ' @@ -252,7 +329,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9600-cvsimport (cd module-cvs && echo 1 >tick && -@@ -114,7 +125,7 @@ +@@ -114,7 +125,7 @@ test_expect_success PERL 'update cvs module' ' ) ' @@ -261,7 +338,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9600-cvsimport (cd module-git && git config cvsimport.module module && -@@ -126,7 +137,7 @@ +@@ -126,7 +137,7 @@ test_expect_success PERL 'cvsimport.module config works' ' ' @@ -270,7 +347,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9600-cvsimport (cd module-git && git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && -@@ -135,7 +146,7 @@ +@@ -135,7 +146,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' ' test_cmp expected module-git/.git/cvs-revisions ' @@ -279,7 +356,7 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9600-cvsimport $CVS co -d import-from-wt module && (cd import-from-wt && -@@ -148,12 +159,12 @@ +@@ -148,12 +159,12 @@ test_expect_success PERL 'import from a CVS working tree' ' ' @@ -294,9 +371,10 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9600-cvsimport +test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' test_done -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9601-cvsimport-vendor-branch.sh git-1.8.4/t/t9601-cvsimport-vendor-branch.sh ---- git-1.8.4.orig/t/t9601-cvsimport-vendor-branch.sh 2013-03-13 12:15:22.000000000 -0700 -+++ git-1.8.4/t/t9601-cvsimport-vendor-branch.sh 2013-03-19 16:56:29.125993925 -0700 +diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh +index 827d39f..d730a41 100755 +--- a/t/t9601-cvsimport-vendor-branch.sh ++++ b/t/t9601-cvsimport-vendor-branch.sh @@ -34,6 +34,17 @@ test_description='git cvsimport handling of vendor branches' . ./lib-cvs.sh @@ -315,9 +393,10 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9601-cvsimport 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.4.orig/t/t9602-cvsimport-branches-tags.sh git-1.8.4/t/t9602-cvsimport-branches-tags.sh ---- git-1.8.4.orig/t/t9602-cvsimport-branches-tags.sh 2013-03-13 12:15:22.000000000 -0700 -+++ git-1.8.4/t/t9602-cvsimport-branches-tags.sh 2013-03-19 16:56:29.126993944 -0700 +diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh +index e1db323..68f0974 100755 +--- a/t/t9602-cvsimport-branches-tags.sh ++++ b/t/t9602-cvsimport-branches-tags.sh @@ -6,6 +6,17 @@ test_description='git cvsimport handling of branches and tags' . ./lib-cvs.sh @@ -336,9 +415,10 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9602-cvsimport setup_cvs_test_repository t9602 test_expect_success PERL 'import module' ' -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9603-cvsimport-patchsets.sh git-1.8.4/t/t9603-cvsimport-patchsets.sh ---- git-1.8.4.orig/t/t9603-cvsimport-patchsets.sh 2013-03-13 12:15:22.000000000 -0700 -+++ git-1.8.4/t/t9603-cvsimport-patchsets.sh 2013-03-19 16:56:29.126993944 -0700 +diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh +index c4c3c49..9b2957d 100755 +--- a/t/t9603-cvsimport-patchsets.sh ++++ b/t/t9603-cvsimport-patchsets.sh @@ -14,6 +14,17 @@ test_description='git cvsimport testing for correct patchset estimation' . ./lib-cvs.sh @@ -356,11 +436,12 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/t9603-cvsimport + setup_cvs_test_repository t9603 - test_expect_failure 'import with criss cross times on revisions' ' -diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/test-lib.sh git-1.8.4/t/test-lib.sh ---- git-1.8.4.orig/t/test-lib.sh 2013-03-13 12:15:22.000000000 -0700 -+++ git-1.8.4/t/test-lib.sh 2013-03-19 16:56:29.126993944 -0700 -@@ -686,6 +686,7 @@ + test_expect_failure PERL 'import with criss cross times on revisions' ' +diff --git a/t/test-lib.sh b/t/test-lib.sh +index 79e8a33..c7c4b48 100644 +--- a/t/test-lib.sh ++++ b/t/test-lib.sh +@@ -929,6 +929,7 @@ case $(uname -s) in esac ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1 @@ -368,3 +449,6 @@ diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.8.4.orig/t/test-lib.sh git test -z "$NO_PERL" && test_set_prereq PERL test -z "$NO_PYTHON" && test_set_prereq PYTHON test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE +-- +2.2.1 + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.initd b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.initd deleted file mode 100644 index c6ee19f5c0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-daemon.initd +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon.initd,v 1.1 2010/03/17 15:13:27 sping Exp $ - -PIDFILE=/var/run/git-daemon.pid - -depend() { - need net - use logger -} - -start() { - [ -e /lib/librc.so ] || BL1_COMPAT="--name git-daemon" - ebegin "Starting git-daemon" - start-stop-daemon --start --quiet --background \ - --pidfile ${PIDFILE} ${BL1_COMPAT} \ - --exec /usr/bin/git -- daemon \ - --pid-file=${PIDFILE} \ - --user=${GIT_USER} --group=${GIT_GROUP} \ - ${GITDAEMON_OPTS} - eend $? -} - -stop() { - ebegin "Stopping git-daemon" - start-stop-daemon --stop --quiet \ - --pidfile ${PIDFILE} - eend $? -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.3.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.3.2-r1.ebuild deleted file mode 100644 index f2566ee88d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.3.2-r1.ebuild +++ /dev/null @@ -1,613 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.3.2-r1.ebuild,v 1.15 2014/11/16 22:54:52 dilfridge Exp $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -# bug #329479: git-remote-testgit is not multiple-version aware -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-single-r1 systemd ${SCM} - -MY_PV="${PV/_rc/.rc}" -MY_P="${PN}-${MY_PV}" - -DOC_VER=${MY_PV} - -DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" -HOMEPAGE="http://www.git-scm.com/" -if [[ ${PV} != *9999 ]]; then - SRC_URI_SUFFIX="gz" - SRC_URI_GOOG="http://git-core.googlecode.com/files" - SRC_URI_KORG="mirror://kernel/software/scm/git" - SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - doc? ( - ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - )" - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" - -# Common to both DEPEND and RDEPEND -CDEPEND=" - dev-libs/openssl - sys-libs/zlib - pcre? ( dev-libs/libpcre ) - perl? ( dev-lang/perl[-build(-)] ) - tk? ( dev-lang/tk ) - curl? ( - net-misc/curl - webdav? ( dev-libs/expat ) - ) - emacs? ( virtual/emacs ) - gnome-keyring? ( gnome-base/libgnome-keyring )" - -RDEPEND="${CDEPEND} - gpg? ( app-crypt/gnupg ) - perl? ( dev-perl/Error - dev-perl/Net-SMTP-SSL - dev-perl/Authen-SASL - cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) - cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) - subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) - ) - python? ( gtk? - ( - >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] - >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] - ) - ${PYTHON_DEPS} )" - -# This is how info docs are created with Git: -# .txt/asciidoc --(asciidoc)---------> .xml/docbook -# .xml/docbook --(docbook2texi.pl)--> .texi -# .texi --(makeinfo)---------> .info -DEPEND="${CDEPEND} - app-arch/cpio - doc? ( - app-text/asciidoc - app-text/docbook2X - sys-apps/texinfo - app-text/xmlto - ) - nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" - -# Live ebuild builds man pages and HTML docs, additionally -if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} - app-text/asciidoc" -fi - -SITEFILE=50${PN}-gentoo.el -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - cgi? ( perl ) - cvs? ( perl ) - subversion? ( perl ) - webdav? ( curl ) - gtk? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -pkg_setup() { - if use subversion && has_version "dev-vcs/subversion[dso]"; then - ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" - ewarn "with USE=dso, there may be weird crashes in git-svn. You" - ewarn "have been warned." - fi - if use python ; then - python-single-r1_pkg_setup - fi -} - -# This is needed because for some obscure reasons future calls to make don't -# pick up these exports if we export them in src_unpack() -exportmakeopts() { - local myopts - - if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" - elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" - fi - - if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" - else - myopts="${myopts} NO_CURL=YesPlease" - fi - - # broken assumptions, because of broken build system ... - myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" - myopts="${myopts} INSTALL=install TAR=tar" - myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh" - myopts="${myopts} SANE_TOOL_PATH=" - myopts="${myopts} OLD_ICONV=" - myopts="${myopts} NO_EXTERNAL_GREP=" - - # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" - - # can't define this to null, since the entire makefile depends on it - sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile - - use iconv \ - || myopts="${myopts} NO_ICONV=YesPlease" - use nls \ - || myopts="${myopts} NO_GETTEXT=YesPlease" - use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" - use pcre \ - && myopts="${myopts} USE_LIBPCRE=yes" \ - && extlibs="${extlibs} -lpcre" - use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" - use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" - use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" - use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ - || myopts="${myopts} NO_PTHREADS=YesPlease" - use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" -# Disabled until ~m68k-mint can be keyworded again -# if [[ ${CHOST} == *-mint* ]] ; then -# myopts="${myopts} NO_MMAP=YesPlease" -# myopts="${myopts} NO_IPV6=YesPlease" -# myopts="${myopts} NO_STRLCPY=YesPlease" -# myopts="${myopts} NO_MEMMEM=YesPlease" -# myopts="${myopts} NO_MKDTEMP=YesPlease" -# myopts="${myopts} NO_MKSTEMPS=YesPlease" -# fi - if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" - fi - if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" - fi - if [[ ${CHOST} == *-solaris* ]]; then - myopts="${myopts} NEEDS_LIBICONV=YesPlease" - fi - - has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" - - # Bug 290465: - # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" - - export MY_MAKEOPTS="${myopts}" - export EXTLIBS="${extlibs}" -} - -src_unpack() { - if [[ ${PV} != *9999 ]]; then - unpack ${MY_P}.tar.${SRC_URI_SUFFIX} - cd "${S}" - unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} - use doc && \ - cd "${S}"/Documentation && \ - unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} - cd "${S}" - else - git-2_src_unpack - cd "${S}" - #cp "${FILESDIR}"/GIT-VERSION-GEN . - fi - -} - -src_prepare() { - # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-1.8.2-optional-cvs.patch - - sed -i \ - -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ - -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ - -e 's:^\(CC = \).*$:\1$(OPTCC):' \ - -e 's:^\(AR = \).*$:\1$(OPTAR):' \ - -e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - -e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \ - Makefile contrib/svn-fe/Makefile || die "sed failed" - - # Never install the private copy of Error.pm (bug #296310) - sed -i \ - -e '/private-Error.pm/s,^,#,' \ - perl/Makefile.PL - - # Fix docbook2texi command - sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \ - Documentation/Makefile || die "sed failed" - - # Fix git-subtree missing DESTDIR - sed -i \ - -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ - -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ - contrib/subtree/Makefile -} - -git_emake() { - # bug #326625: PERL_PATH, PERL_MM_OPT - # bug #320647: PYTHON_PATH - PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" - emake ${MY_MAKEOPTS} \ - DESTDIR="${D}" \ - OPTCFLAGS="${CFLAGS}" \ - OPTLDFLAGS="${LDFLAGS}" \ - OPTCC="$(tc-getCC)" \ - OPTAR="$(tc-getAR)" \ - prefix="${EPREFIX}"/usr \ - htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - sysconfdir="${EPREFIX}"/etc \ - PYTHON_PATH="${PYTHON_PATH}" \ - PERL_MM_OPT="" \ - GIT_TEST_OPTS="--no-color" \ - V=1 \ - "$@" - # This is the fix for bug #326625, but it also causes breakage, see bug - # #352693. - # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ -} - -src_configure() { - exportmakeopts -} - -src_compile() { - if use perl ; then - git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" - git_emake perl/perl.mak || die "emake perl/perl.mak failed" - fi - git_emake || die "emake failed" - - if use emacs ; then - elisp-compile contrib/emacs/git{,-blame}.el - fi - - if use perl && use cgi ; then - git_emake \ - gitweb/gitweb.cgi \ - || die "emake gitweb/gitweb.cgi failed" - fi - - if [[ ${CHOST} == *-darwin* ]]; then - cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" - git_emake || die "emake credential-osxkeychain" - fi - - cd "${S}"/Documentation - if [[ ${PV} == *9999 ]] ; then - git_emake man \ - || die "emake man failed" - if use doc ; then - git_emake info html \ - || die "emake info html failed" - fi - else - if use doc ; then - git_emake info \ - || die "emake info html failed" - fi - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - git_emake EXTLIBS="${EXTLIBS}" || die "emake svn-fe failed" - if use doc ; then - git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" - fi - cd "${S}" - fi - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - git_emake || die "emake git-credential-gnome-keyring failed" - fi - - cd "${S}"/contrib/subtree - git_emake - use doc && git_emake doc -} - -src_install() { - git_emake \ - install || \ - die "make install failed" - - if [[ ${CHOST} == *-darwin* ]]; then - dobin contrib/credential/osxkeychain/git-credential-osxkeychain - fi - - # Depending on the tarball and manual rebuild of the documentation, the - # manpages may exist in either OR both of these directories. - find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] - find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] - - dodoc README Documentation/{SubmittingPatches,CodingGuidelines} - use doc && dodir /usr/share/doc/${PF}/html - for d in / /howto/ /technical/ ; do - docinto ${d} - dodoc Documentation${d}*.txt - use doc && dohtml -p ${d} Documentation${d}*.html - done - docinto / - # Upstream does not ship this pre-built :-( - use doc && doinfo Documentation/{git,gitman}.info - - newbashcomp contrib/completion/git-completion.bash ${PN} - newbashcomp contrib/completion/git-prompt.sh ${PN}-prompt - - if use emacs ; then - elisp-install ${PN} contrib/emacs/git.{el,elc} - elisp-install ${PN} contrib/emacs/git-blame.{el,elc} - #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} - # don't add automatically to the load-path, so the sitefile - # can do a conditional loading - touch "${ED}${SITELISP}/${PN}/compat/.nosearch" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi - - if use python && use gtk ; then - python_doscript "${S}"/contrib/gitview/gitview - dodoc "${S}"/contrib/gitview/gitview.txt - fi - - #dobin contrib/fast-import/git-p4 # Moved upstream - #dodoc contrib/fast-import/git-p4.txt # Moved upstream - newbin contrib/fast-import/import-tars.perl import-tars - exeinto /usr/libexec/git-core/ - newexe contrib/git-resurrect.sh git-resurrect - - # git-subtree - cd "${S}"/contrib/subtree - git_emake install || die "Failed to emake install git-subtree" - if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" - fi - newdoc README README.git-subtree - dodoc git-subtree.txt - cd "${S}" - - # git-diffall - dobin contrib/diffall/git-diffall - newdoc contrib/diffall/README git-diffall.txt - - # diff-highlight - dobin contrib/diff-highlight/diff-highlight - newdoc contrib/diff-highlight/README README.diff-highlight - - # git-jump - exeinto /usr/libexec/git-core/ - doexe contrib/git-jump/git-jump - newdoc contrib/git-jump/README git-jump.txt - - if use gnome-keyring ; then - cd "${S}"/contrib/credential/gnome-keyring - dobin git-credential-gnome-keyring - fi - - if use subversion ; then - cd "${S}"/contrib/svn-fe - dobin svn-fe - dodoc svn-fe.txt - use doc && doman svn-fe.1 && dohtml svn-fe.html - cd "${S}" - fi - - # remote-helpers - if use python ; then - python_scriptinto /usr/libexec/git-core/ - python_doscript "${S}"/contrib/remote-helpers/git-remote-{bzr,hg} - python_optimize - fi - - dodir /usr/share/${PN}/contrib - # The following are excluded: - # completion - installed above - # credential/gnome-keyring TODO - # diff-highlight - done above - # diffall - done above - # emacs - installed above - # examples - these are stuff that is not used in Git anymore actually - # git-jump - done above - # gitview - installed above - # p4import - excluded because fast-import has a better one - # patches - stuff the Git guys made to go upstream to other places - # persistent-https - TODO - # mw-to-git - TODO - # subtree - build seperately - # svnimport - use git-svn - # thunderbird-patch-inline - fixes thunderbird - for i in \ - blameview buildsystems ciabot continuous convert-objects fast-import \ - hg-to-git hooks remotes2config.sh rerere-train.sh \ - stats vim workdir \ - ; do - cp -rf \ - "${S}"/contrib/${i} \ - "${ED}"/usr/share/${PN}/contrib \ - || die "Failed contrib ${i}" - done - - if use perl && use cgi ; then - # We used to install in /usr/share/${PN}/gitweb - # but upstream installs in /usr/share/gitweb - # so we will install a symlink and use their location for compat with other - # distros - dosym /usr/share/gitweb /usr/share/${PN}/gitweb - - # INSTALL discusses configuration issues, not just installation - docinto / - newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb - newdoc "${S}"/gitweb/README README.gitweb - - find "${ED}"/usr/lib64/perl5/ \ - -name .packlist \ - -exec rm \{\} \; - else - rm -rf "${ED}"/usr/share/gitweb - fi - - if ! use subversion ; then - rm -f "${ED}"/usr/libexec/git-core/git-svn \ - "${ED}"/usr/share/man/man1/git-svn.1* - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}"/git-daemon.xinetd git-daemon - fi - - if use !prefix ; then - newinitd "${FILESDIR}"/git-daemon.initd git-daemon - newconfd "${FILESDIR}"/git-daemon.confd git-daemon - systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" - systemd_dounit "${FILESDIR}/git-daemon.socket" - fi - - perl_delete_localpod -} - -src_test() { - local disabled="" - local tests_cvs="t9200-git-cvsexportcommit.sh \ - t9400-git-cvsserver-server.sh \ - t9401-git-cvsserver-crlf.sh \ - t9402-git-cvsserver-refs.sh \ - t9600-cvsimport.sh \ - t9601-cvsimport-vendor-branch.sh \ - t9602-cvsimport-branches-tags.sh \ - t9603-cvsimport-patchsets.sh \ - t9604-cvsimport-timestamps.sh" - local tests_perl="t3701-add-interactive.sh \ - t5502-quickfetch.sh \ - t5512-ls-remote.sh \ - t5520-pull.sh \ - t7106-reset-unborn-branch.sh \ - t7501-commit.sh" - # Bug #225601 - t0004 is not suitable for root perm - # Bug #219839 - t1004 is not suitable for root perm - # t0001-init.sh - check for init notices EPERM* fails - local tests_nonroot="t0001-init.sh \ - t0004-unwritable.sh \ - t0070-fundamental.sh \ - t1004-read-tree-m-u-wf.sh \ - t3700-add.sh \ - t7300-clean.sh" - # t9100 still fails with symlinks in SVN 1.7 - local test_svn="t9100-git-svn-basic.sh" - - # Unzip is used only for the testcase code, not by any normal parts of Git. - if ! has_version app-arch/unzip ; then - einfo "Disabling tar-tree tests" - disabled="${disabled} t5000-tar-tree.sh" - fi - - cvs=0 - use cvs && let cvs=$cvs+1 - if [[ ${EUID} -eq 0 ]]; then - if [[ $cvs -eq 1 ]]; then - ewarn "Skipping CVS tests because CVS does not work as root!" - ewarn "You should retest with FEATURES=userpriv!" - disabled="${disabled} ${tests_cvs}" - fi - einfo "Skipping other tests that require being non-root" - disabled="${disabled} ${tests_nonroot}" - else - [[ $cvs -gt 0 ]] && \ - has_version dev-vcs/cvs && \ - let cvs=$cvs+1 - [[ $cvs -gt 1 ]] && \ - has_version "dev-vcs/cvs[server]" && \ - let cvs=$cvs+1 - if [[ $cvs -lt 3 ]]; then - einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" - disabled="${disabled} ${tests_cvs}" - fi - fi - - if ! use perl ; then - einfo "Disabling tests that need Perl" - disabled="${disabled} ${tests_perl}" - fi - - einfo "Disabling tests that fail with SVN 1.7" - disabled="${disabled} ${test_svn}" - - # Reset all previously disabled tests - cd "${S}/t" - for i in *.sh.DISABLED ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" - done - einfo "Disabled tests:" - for i in ${disabled} ; do - [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" - done - - # Avoid the test system removing the results because we want them ourselves - sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ - -i "${S}"/t/Makefile - - # Clean old results first, must always run - cd "${S}/t" - nonfatal git_emake clean - - # Now run the tests, keep going if we hit an error, and don't terminate on - # failure - cd "${S}" - einfo "Start test run" - #MAKEOPTS=-j1 - nonfatal git_emake --keep-going test - rc=$? - - # Display nice results, now print the results - cd "${S}/t" - nonfatal git_emake aggregate-results - - # And bail if there was a problem - [ $rc -eq 0 ] || die "tests failed. Please file a bug." -} - -showpkgdeps() { - local pkg=$1 - shift - elog " $(printf "%-17s:" ${pkg}) ${@}" -} - -pkg_postinst() { - use emacs && elisp-site-regen - einfo "Please read /usr/share/bash-completion/git for Git bash command completion" - einfo "Please read /usr/share/bash-completion/git-prompt for Git bash prompt" - einfo "Note that the prompt bash code is now in the seperate script" - elog "These additional scripts need some dependencies:" - echo - showpkgdeps git-quiltimport "dev-util/quilt" - showpkgdeps git-instaweb \ - "|| ( www-servers/lighttpd www-servers/apache )" - echo -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.5.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.5.6.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.5.5.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.5.6.ebuild index a0c286fd22..d17c705ac2 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.5.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.8.5.6.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.5.ebuild,v 1.13 2014/11/16 22:54:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.6.ebuild,v 1.12 2015/04/08 17:53:03 mgorny Exp $ EAPI=5 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_COMPAT=( python2_7 ) [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" @@ -32,10 +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 arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.9.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.9.5.ebuild similarity index 97% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.9.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.9.5.ebuild index cd611b8b9a..6b05fdcdff 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.9.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-1.9.5.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.3.ebuild,v 1.5 2014/11/16 22:54:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.5.ebuild,v 1.12 2015/04/08 17:53:03 mgorny Exp $ EAPI=5 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_COMPAT=( python2_7 ) [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" @@ -32,10 +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 ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" + KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.0.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.0.5.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.0.4.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.0.5.ebuild index ab8883a3e5..b195fbd6c4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.0.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.0.5.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild,v 1.13 2014/11/16 22:54:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.5.ebuild,v 1.13 2015/04/08 17:53:03 mgorny Exp $ EAPI=5 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_COMPAT=( python2_7 ) [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu @@ -33,10 +33,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 ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.1.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.1.4.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.1.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.1.4.ebuild index f45cc16e70..f58b553e0c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.1.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.1.4.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.3.ebuild,v 1.2 2014/11/16 22:54:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.4.ebuild,v 1.3 2015/04/08 17:53:03 mgorny Exp $ EAPI=5 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_COMPAT=( python2_7 ) [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu @@ -34,9 +34,6 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" fi LICENSE="GPL-2" diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.2.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.2.2.ebuild similarity index 90% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.2.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.2.2.ebuild index 1172b6c2dd..12810d2327 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.2.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.2.2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.2.0.ebuild,v 1.1 2014/12/02 07:32:57 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.2.2.ebuild,v 1.2 2015/04/08 17:53:03 mgorny Exp $ EAPI=5 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_COMPAT=( python2_7 ) [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu @@ -34,9 +34,6 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" fi LICENSE="GPL-2" @@ -128,24 +125,24 @@ exportmakeopts() { local myopts if use blksha1 ; then - myopts="${myopts} BLK_SHA1=YesPlease" + myopts+=" BLK_SHA1=YesPlease" elif use ppcsha1 ; then - myopts="${myopts} PPC_SHA1=YesPlease" + myopts+=" PPC_SHA1=YesPlease" fi if use curl ; then - use webdav || myopts="${myopts} NO_EXPAT=YesPlease" + use webdav || myopts+=" NO_EXPAT=YesPlease" else - myopts="${myopts} NO_CURL=YesPlease" + 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=" + myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts+=" INSTALL=install TAR=tar" + myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" + myopts+=" SANE_TOOL_PATH=" + myopts+=" OLD_ICONV=" + myopts+=" NO_EXTERNAL_GREP=" # For svn-fe extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" @@ -154,53 +151,53 @@ exportmakeopts() { sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile use iconv \ - || myopts="${myopts} NO_ICONV=YesPlease" + || myopts+=" NO_ICONV=YesPlease" use nls \ - || myopts="${myopts} NO_GETTEXT=YesPlease" + || myopts+=" NO_GETTEXT=YesPlease" use tk \ - || myopts="${myopts} NO_TCLTK=YesPlease" + || myopts+=" NO_TCLTK=YesPlease" use pcre \ - && myopts="${myopts} USE_LIBPCRE=yes" \ - && extlibs="${extlibs} -lpcre" + && myopts+=" USE_LIBPCRE=yes" \ + && extlibs+=" -lpcre" use perl \ - && myopts="${myopts} INSTALLDIRS=vendor" \ - || myopts="${myopts} NO_PERL=YesPlease" + && myopts+=" INSTALLDIRS=vendor" \ + || myopts+=" NO_PERL=YesPlease" use python \ - || myopts="${myopts} NO_PYTHON=YesPlease" + || myopts+=" NO_PYTHON=YesPlease" use subversion \ - || myopts="${myopts} NO_SVN_TESTS=YesPlease" + || myopts+=" NO_SVN_TESTS=YesPlease" use threads \ - && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" \ - || myopts="${myopts} NO_PTHREADS=YesPlease" + && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ + || myopts+=" NO_PTHREADS=YesPlease" use cvs \ - || myopts="${myopts} NO_CVS=YesPlease" + || 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" +# myopts+=" NO_MMAP=YesPlease" +# myopts+=" NO_IPV6=YesPlease" +# myopts+=" NO_STRLCPY=YesPlease" +# myopts+=" NO_MEMMEM=YesPlease" +# myopts+=" NO_MKDTEMP=YesPlease" +# myopts+=" NO_MKSTEMPS=YesPlease" # fi if [[ ${CHOST} == ia64-*-hpux* ]]; then - myopts="${myopts} NO_NSEC=YesPlease" + myopts+=" NO_NSEC=YesPlease" fi if [[ ${CHOST} == *-*-aix* ]]; then - myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease" + myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" fi if [[ ${CHOST} == *-solaris* ]]; then - myopts="${myopts} NEEDS_LIBICONV=YesPlease" + myopts+=" NEEDS_LIBICONV=YesPlease" fi has_version '>=app-text/asciidoc-8.0' \ - && myopts="${myopts} ASCIIDOC8=YesPlease" - myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease" + && myopts+=" ASCIIDOC8=YesPlease" + myopts+=" ASCIIDOC_NO_ROFF=YesPlease" # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' [[ "${CHOST}" == *-uclibc* ]] && \ - myopts="${myopts} NO_NSEC=YesPlease" + myopts+=" NO_NSEC=YesPlease" export MY_MAKEOPTS="${myopts}" export EXTLIBS="${extlibs}" @@ -225,7 +222,7 @@ src_unpack() { src_prepare() { # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch + epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch # install mediawiki perl modules also in vendor_dir # hack, needs better upstream solution diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.3.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.3.5.ebuild new file mode 100644 index 0000000000..2b63e9b84c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.3.5.ebuild @@ -0,0 +1,636 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.3.5.ebuild,v 1.3 2015/04/08 17:53:03 mgorny Exp $ + +EAPI=5 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_COMPAT=( python2_7 ) +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" +EGIT_MASTER=pu + +inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" +HOMEPAGE="http://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="xz" + SRC_URI_GOOG="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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + dev-libs/openssl:0= + sys-libs/zlib + pcre? ( dev-libs/libpcre ) + perl? ( dev-lang/perl:=[-build(-)] ) + tk? ( dev-lang/tk:= ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs ) + gnome-keyring? ( gnome-base/libgnome-keyring )" + +RDEPEND="${CDEPEND} + gpg? ( app-crypt/gnupg ) + mediawiki? ( + dev-perl/HTML-Tree + dev-perl/MediaWiki-API + ) + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) + cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) + subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + python? ( gtk? + ( + >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] + >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] + ) + ${PYTHON_DEPS} )" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + app-text/xmlto + ) + nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg )" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + DEPEND="${DEPEND} + app-text/asciidoc" +fi + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + mediawiki? ( perl ) + subversion? ( perl ) + webdav? ( curl ) + gtk? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]"; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use python ; then + python-single-r1_pkg_setup + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local myopts + + if use blksha1 ; then + myopts+=" BLK_SHA1=YesPlease" + elif use ppcsha1 ; then + myopts+=" PPC_SHA1=YesPlease" + fi + + if use curl ; then + use webdav || myopts+=" NO_EXPAT=YesPlease" + else + myopts+=" NO_CURL=YesPlease" + fi + + # broken assumptions, because of broken build system ... + myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts+=" INSTALL=install TAR=tar" + myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" + myopts+=" SANE_TOOL_PATH=" + myopts+=" OLD_ICONV=" + myopts+=" NO_EXTERNAL_GREP=" + + # For svn-fe + extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + use iconv \ + || myopts+=" NO_ICONV=YesPlease" + use nls \ + || myopts+=" NO_GETTEXT=YesPlease" + use tk \ + || myopts+=" NO_TCLTK=YesPlease" + use pcre \ + && myopts+=" USE_LIBPCRE=yes" \ + && extlibs+=" -lpcre" + use perl \ + && myopts+=" INSTALLDIRS=vendor" \ + || myopts+=" NO_PERL=YesPlease" + use python \ + || myopts+=" NO_PYTHON=YesPlease" + use subversion \ + || myopts+=" NO_SVN_TESTS=YesPlease" + use threads \ + && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ + || myopts+=" NO_PTHREADS=YesPlease" + use cvs \ + || myopts+=" NO_CVS=YesPlease" +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts+=" NO_MMAP=YesPlease" +# myopts+=" NO_IPV6=YesPlease" +# myopts+=" NO_STRLCPY=YesPlease" +# myopts+=" NO_MEMMEM=YesPlease" +# myopts+=" NO_MKDTEMP=YesPlease" +# myopts+=" NO_MKSTEMPS=YesPlease" +# fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts+=" NO_NSEC=YesPlease" + fi + if [[ ${CHOST} == *-*-aix* ]]; then + myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" + fi + if [[ ${CHOST} == *-solaris* ]]; then + myopts+=" NEEDS_LIBICONV=YesPlease" + fi + + has_version '>=app-text/asciidoc-8.0' \ + && myopts+=" ASCIIDOC8=YesPlease" + myopts+=" ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts+=" NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" + export EXTLIBS="${extlibs}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" + unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + use doc && \ + cd "${S}"/Documentation && \ + unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + cd "${S}" + else + git-2_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + # bug #350330 - automagic CVS when we don't want it is bad. + epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch + + # install mediawiki perl modules also in vendor_dir + # hack, needs better upstream solution + epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch + + epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + + epatch_user + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile contrib/svn-fe/Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL + + # Fix docbook2texi command + sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # Fix git-subtree missing DESTDIR + sed -i \ + -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ + -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ + contrib/subtree/Makefile +} + +git_emake() { + # bug #326625: PERL_PATH, PERL_MM_OPT + # bug #320647: PYTHON_PATH + PYTHON_PATH="" + use python && PYTHON_PATH="${PYTHON}" + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + OPTCC="$(tc-getCC)" \ + OPTAR="$(tc-getAR)" \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + sysconfdir="${EPREFIX}"/etc \ + PYTHON_PATH="${PYTHON_PATH}" \ + PERL_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + V=1 \ + "$@" + # This is the fix for bug #326625, but it also causes breakage, see bug + # #352693. + # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ +} + +src_configure() { + exportmakeopts +} + +src_compile() { + if use perl ; then + git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" + git_emake perl/perl.mak || die "emake perl/perl.mak failed" + fi + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el + fi + + if use perl && use cgi ; then + git_emake \ + gitweb/gitweb.cgi \ + || die "emake gitweb/gitweb.cgi failed" + fi + + if [[ ${CHOST} == *-darwin* ]]; then + cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" + git_emake || die "emake credential-osxkeychain" + fi + + cd "${S}"/Documentation + if [[ ${PV} == *9999 ]] ; then + git_emake man \ + || die "emake man failed" + if use doc ; then + git_emake info html \ + || die "emake info html failed" + fi + else + if use doc ; then + git_emake info \ + || die "emake info html failed" + fi + fi + + if use subversion ; then + cd "${S}"/contrib/svn-fe + # by defining EXTLIBS we override the detection for libintl and + # libiconv, bug #516168 + local nlsiconv= + use nls && use !elibc_glibc && nlsiconv+=" -lintl" + use iconv && use !elibc_glibc && nlsiconv+=" -liconv" + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + if use doc ; then + git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + fi + cd "${S}" + fi + + if use gnome-keyring ; then + cd "${S}"/contrib/credential/gnome-keyring + git_emake || die "emake git-credential-gnome-keyring failed" + fi + + cd "${S}"/contrib/subtree + git_emake + use doc && git_emake doc + + if use mediawiki ; then + cd "${S}"/contrib/mw-to-git + git_emake + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + if [[ ${CHOST} == *-darwin* ]]; then + dobin contrib/credential/osxkeychain/git-credential-osxkeychain + fi + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + + dodoc README Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + use doc && dohtml -p ${d} Documentation${d}*.html + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + newbashcomp contrib/completion/git-completion.bash ${PN} + bashcomp_alias git gitk + # Not really a bash-completion file (bug #477920) + # but still needed uncompressed (bug #507480) + insinto /usr/share/${PN} + doins contrib/completion/git-prompt.sh + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} + # don't add automatically to the load-path, so the sitefile + # can do a conditional loading + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + fi + + if use python && use gtk ; then + python_doscript "${S}"/contrib/gitview/gitview + dodoc "${S}"/contrib/gitview/gitview.txt + fi + + #dobin contrib/fast-import/git-p4 # Moved upstream + #dodoc contrib/fast-import/git-p4.txt # Moved upstream + newbin contrib/fast-import/import-tars.perl import-tars + exeinto /usr/libexec/git-core/ + newexe contrib/git-resurrect.sh git-resurrect + + # git-subtree + cd "${S}"/contrib/subtree + git_emake install || die "Failed to emake install git-subtree" + if use doc ; then + git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + fi + newdoc README README.git-subtree + dodoc git-subtree.txt + cd "${S}" + + if use mediawiki ; then + cd "${S}"/contrib/mw-to-git + git_emake install + cd "${S}" + fi + + # diff-highlight + dobin contrib/diff-highlight/diff-highlight + newdoc contrib/diff-highlight/README README.diff-highlight + + # git-jump + exeinto /usr/libexec/git-core/ + doexe contrib/git-jump/git-jump + newdoc contrib/git-jump/README git-jump.txt + + # git-contacts + exeinto /usr/libexec/git-core/ + doexe contrib/contacts/git-contacts + dodoc contrib/contacts/git-contacts.txt + + if use gnome-keyring ; then + cd "${S}"/contrib/credential/gnome-keyring + dobin git-credential-gnome-keyring + fi + + if use subversion ; then + cd "${S}"/contrib/svn-fe + dobin svn-fe + dodoc svn-fe.txt + use doc && doman svn-fe.1 && dohtml svn-fe.html + cd "${S}" + fi + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # credential/gnome-keyring TODO + # diff-highlight - done above + # emacs - installed above + # examples - these are stuff that is not used in Git anymore actually + # git-jump - done above + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # persistent-https - TODO + # mw-to-git - TODO + # subtree - build seperately + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + for i in \ + buildsystems convert-objects fast-import \ + hg-to-git hooks remotes2config.sh rerere-train.sh \ + stats workdir \ + ; do + cp -rf \ + "${S}"/contrib/${i} \ + "${ED}"/usr/share/${PN}/contrib \ + || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym /usr/share/gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + find "${ED}"/usr/lib64/perl5/ \ + -name .packlist \ + -exec rm \{\} \; + else + rm -rf "${ED}"/usr/share/gitweb + fi + + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + if use !prefix ; then + newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" + systemd_dounit "${FILESDIR}/git-daemon.socket" + fi + + perl_delete_localpod +} + +src_test() { + local disabled="" #t7004-tag.sh" #520270 + local tests_cvs="t9200-git-cvsexportcommit.sh \ + t9400-git-cvsserver-server.sh \ + t9401-git-cvsserver-crlf.sh \ + t9402-git-cvsserver-refs.sh \ + t9600-cvsimport.sh \ + t9601-cvsimport-vendor-branch.sh \ + t9602-cvsimport-branches-tags.sh \ + t9603-cvsimport-patchsets.sh \ + t9604-cvsimport-timestamps.sh" + local tests_perl="t3701-add-interactive.sh \ + t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh \ + t7106-reset-unborn-branch.sh \ + t7501-commit.sh" + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot="t0001-init.sh \ + t0004-unwritable.sh \ + t0070-fundamental.sh \ + t1004-read-tree-m-u-wf.sh \ + t3700-add.sh \ + t7300-clean.sh" + # t9100 still fails with symlinks in SVN 1.7 + local test_svn="t9100-git-svn-basic.sh" + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled="${disabled} t5000-tar-tree.sh" + fi + + cvs=0 + use cvs && let cvs=$cvs+1 + if [[ ${EUID} -eq 0 ]]; then + if [[ $cvs -eq 1 ]]; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled="${disabled} ${tests_cvs}" + fi + einfo "Skipping other tests that require being non-root" + disabled="${disabled} ${tests_nonroot}" + else + [[ $cvs -gt 0 ]] && \ + has_version dev-vcs/cvs && \ + let cvs=$cvs+1 + [[ $cvs -gt 1 ]] && \ + has_version "dev-vcs/cvs[server]" && \ + let cvs=$cvs+1 + if [[ $cvs -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled="${disabled} ${tests_cvs}" + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled="${disabled} ${tests_perl}" + fi + + einfo "Disabling tests that fail with SVN 1.7" + disabled="${disabled} ${test_svn}" + + # Reset all previously disabled tests + cd "${S}/t" + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled} ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ + -i "${S}"/t/Makefile + + # Clean old results first, must always run + cd "${S}/t" + nonfatal git_emake clean + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + cd "${S}" + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + cd "${S}/t" + nonfatal git_emake aggregate-results + + # And bail if there was a problem + [ $rc -eq 0 ] || die "tests failed. Please file a bug." +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + einfo "Please read /usr/share/bash-completion/git for Git bash command completion" + einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" + einfo "Note that the prompt bash code is now in that separate script" + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" + echo +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.3.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.3.6.ebuild new file mode 100644 index 0000000000..e02a3ab616 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.3.6.ebuild @@ -0,0 +1,636 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.3.6.ebuild,v 1.5 2015/05/11 17:55:03 zlogene Exp $ + +EAPI=5 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_COMPAT=( python2_7 ) +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" +EGIT_MASTER=pu + +inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" +HOMEPAGE="http://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="xz" + SRC_URI_GOOG="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 ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + dev-libs/openssl:0= + sys-libs/zlib + pcre? ( dev-libs/libpcre ) + perl? ( dev-lang/perl:=[-build(-)] ) + tk? ( dev-lang/tk:= ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs ) + gnome-keyring? ( gnome-base/libgnome-keyring )" + +RDEPEND="${CDEPEND} + gpg? ( app-crypt/gnupg ) + mediawiki? ( + dev-perl/HTML-Tree + dev-perl/MediaWiki-API + ) + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) + cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) + subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + python? ( gtk? + ( + >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] + >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] + ) + ${PYTHON_DEPS} )" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + app-text/xmlto + ) + nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg )" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + DEPEND="${DEPEND} + app-text/asciidoc" +fi + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + mediawiki? ( perl ) + subversion? ( perl ) + webdav? ( curl ) + gtk? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]"; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use python ; then + python-single-r1_pkg_setup + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local myopts + + if use blksha1 ; then + myopts+=" BLK_SHA1=YesPlease" + elif use ppcsha1 ; then + myopts+=" PPC_SHA1=YesPlease" + fi + + if use curl ; then + use webdav || myopts+=" NO_EXPAT=YesPlease" + else + myopts+=" NO_CURL=YesPlease" + fi + + # broken assumptions, because of broken build system ... + myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts+=" INSTALL=install TAR=tar" + myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" + myopts+=" SANE_TOOL_PATH=" + myopts+=" OLD_ICONV=" + myopts+=" NO_EXTERNAL_GREP=" + + # For svn-fe + extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + use iconv \ + || myopts+=" NO_ICONV=YesPlease" + use nls \ + || myopts+=" NO_GETTEXT=YesPlease" + use tk \ + || myopts+=" NO_TCLTK=YesPlease" + use pcre \ + && myopts+=" USE_LIBPCRE=yes" \ + && extlibs+=" -lpcre" + use perl \ + && myopts+=" INSTALLDIRS=vendor" \ + || myopts+=" NO_PERL=YesPlease" + use python \ + || myopts+=" NO_PYTHON=YesPlease" + use subversion \ + || myopts+=" NO_SVN_TESTS=YesPlease" + use threads \ + && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ + || myopts+=" NO_PTHREADS=YesPlease" + use cvs \ + || myopts+=" NO_CVS=YesPlease" +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts+=" NO_MMAP=YesPlease" +# myopts+=" NO_IPV6=YesPlease" +# myopts+=" NO_STRLCPY=YesPlease" +# myopts+=" NO_MEMMEM=YesPlease" +# myopts+=" NO_MKDTEMP=YesPlease" +# myopts+=" NO_MKSTEMPS=YesPlease" +# fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts+=" NO_NSEC=YesPlease" + fi + if [[ ${CHOST} == *-*-aix* ]]; then + myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" + fi + if [[ ${CHOST} == *-solaris* ]]; then + myopts+=" NEEDS_LIBICONV=YesPlease" + fi + + has_version '>=app-text/asciidoc-8.0' \ + && myopts+=" ASCIIDOC8=YesPlease" + myopts+=" ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts+=" NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" + export EXTLIBS="${extlibs}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" + unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + use doc && \ + cd "${S}"/Documentation && \ + unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + cd "${S}" + else + git-2_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + # bug #350330 - automagic CVS when we don't want it is bad. + epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch + + # install mediawiki perl modules also in vendor_dir + # hack, needs better upstream solution + epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch + + epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + + epatch_user + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile contrib/svn-fe/Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL + + # Fix docbook2texi command + sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # Fix git-subtree missing DESTDIR + sed -i \ + -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ + -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ + contrib/subtree/Makefile +} + +git_emake() { + # bug #326625: PERL_PATH, PERL_MM_OPT + # bug #320647: PYTHON_PATH + PYTHON_PATH="" + use python && PYTHON_PATH="${PYTHON}" + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + OPTCC="$(tc-getCC)" \ + OPTAR="$(tc-getAR)" \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + sysconfdir="${EPREFIX}"/etc \ + PYTHON_PATH="${PYTHON_PATH}" \ + PERL_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + V=1 \ + "$@" + # This is the fix for bug #326625, but it also causes breakage, see bug + # #352693. + # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ +} + +src_configure() { + exportmakeopts +} + +src_compile() { + if use perl ; then + git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" + git_emake perl/perl.mak || die "emake perl/perl.mak failed" + fi + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el + fi + + if use perl && use cgi ; then + git_emake \ + gitweb/gitweb.cgi \ + || die "emake gitweb/gitweb.cgi failed" + fi + + if [[ ${CHOST} == *-darwin* ]]; then + cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" + git_emake || die "emake credential-osxkeychain" + fi + + cd "${S}"/Documentation + if [[ ${PV} == *9999 ]] ; then + git_emake man \ + || die "emake man failed" + if use doc ; then + git_emake info html \ + || die "emake info html failed" + fi + else + if use doc ; then + git_emake info \ + || die "emake info html failed" + fi + fi + + if use subversion ; then + cd "${S}"/contrib/svn-fe + # by defining EXTLIBS we override the detection for libintl and + # libiconv, bug #516168 + local nlsiconv= + use nls && use !elibc_glibc && nlsiconv+=" -lintl" + use iconv && use !elibc_glibc && nlsiconv+=" -liconv" + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + if use doc ; then + git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + fi + cd "${S}" + fi + + if use gnome-keyring ; then + cd "${S}"/contrib/credential/gnome-keyring + git_emake || die "emake git-credential-gnome-keyring failed" + fi + + cd "${S}"/contrib/subtree + git_emake + use doc && git_emake doc + + if use mediawiki ; then + cd "${S}"/contrib/mw-to-git + git_emake + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + if [[ ${CHOST} == *-darwin* ]]; then + dobin contrib/credential/osxkeychain/git-credential-osxkeychain + fi + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + + dodoc README Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + use doc && dohtml -p ${d} Documentation${d}*.html + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + newbashcomp contrib/completion/git-completion.bash ${PN} + bashcomp_alias git gitk + # Not really a bash-completion file (bug #477920) + # but still needed uncompressed (bug #507480) + insinto /usr/share/${PN} + doins contrib/completion/git-prompt.sh + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} + # don't add automatically to the load-path, so the sitefile + # can do a conditional loading + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + fi + + if use python && use gtk ; then + python_doscript "${S}"/contrib/gitview/gitview + dodoc "${S}"/contrib/gitview/gitview.txt + fi + + #dobin contrib/fast-import/git-p4 # Moved upstream + #dodoc contrib/fast-import/git-p4.txt # Moved upstream + newbin contrib/fast-import/import-tars.perl import-tars + exeinto /usr/libexec/git-core/ + newexe contrib/git-resurrect.sh git-resurrect + + # git-subtree + cd "${S}"/contrib/subtree + git_emake install || die "Failed to emake install git-subtree" + if use doc ; then + git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + fi + newdoc README README.git-subtree + dodoc git-subtree.txt + cd "${S}" + + if use mediawiki ; then + cd "${S}"/contrib/mw-to-git + git_emake install + cd "${S}" + fi + + # diff-highlight + dobin contrib/diff-highlight/diff-highlight + newdoc contrib/diff-highlight/README README.diff-highlight + + # git-jump + exeinto /usr/libexec/git-core/ + doexe contrib/git-jump/git-jump + newdoc contrib/git-jump/README git-jump.txt + + # git-contacts + exeinto /usr/libexec/git-core/ + doexe contrib/contacts/git-contacts + dodoc contrib/contacts/git-contacts.txt + + if use gnome-keyring ; then + cd "${S}"/contrib/credential/gnome-keyring + dobin git-credential-gnome-keyring + fi + + if use subversion ; then + cd "${S}"/contrib/svn-fe + dobin svn-fe + dodoc svn-fe.txt + use doc && doman svn-fe.1 && dohtml svn-fe.html + cd "${S}" + fi + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # credential/gnome-keyring TODO + # diff-highlight - done above + # emacs - installed above + # examples - these are stuff that is not used in Git anymore actually + # git-jump - done above + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # persistent-https - TODO + # mw-to-git - TODO + # subtree - build seperately + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + for i in \ + buildsystems convert-objects fast-import \ + hg-to-git hooks remotes2config.sh rerere-train.sh \ + stats workdir \ + ; do + cp -rf \ + "${S}"/contrib/${i} \ + "${ED}"/usr/share/${PN}/contrib \ + || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym /usr/share/gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + find "${ED}"/usr/lib64/perl5/ \ + -name .packlist \ + -exec rm \{\} \; + else + rm -rf "${ED}"/usr/share/gitweb + fi + + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + if use !prefix ; then + newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" + systemd_dounit "${FILESDIR}/git-daemon.socket" + fi + + perl_delete_localpod +} + +src_test() { + local disabled="" #t7004-tag.sh" #520270 + local tests_cvs="t9200-git-cvsexportcommit.sh \ + t9400-git-cvsserver-server.sh \ + t9401-git-cvsserver-crlf.sh \ + t9402-git-cvsserver-refs.sh \ + t9600-cvsimport.sh \ + t9601-cvsimport-vendor-branch.sh \ + t9602-cvsimport-branches-tags.sh \ + t9603-cvsimport-patchsets.sh \ + t9604-cvsimport-timestamps.sh" + local tests_perl="t3701-add-interactive.sh \ + t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh \ + t7106-reset-unborn-branch.sh \ + t7501-commit.sh" + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot="t0001-init.sh \ + t0004-unwritable.sh \ + t0070-fundamental.sh \ + t1004-read-tree-m-u-wf.sh \ + t3700-add.sh \ + t7300-clean.sh" + # t9100 still fails with symlinks in SVN 1.7 + local test_svn="t9100-git-svn-basic.sh" + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled="${disabled} t5000-tar-tree.sh" + fi + + cvs=0 + use cvs && let cvs=$cvs+1 + if [[ ${EUID} -eq 0 ]]; then + if [[ $cvs -eq 1 ]]; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled="${disabled} ${tests_cvs}" + fi + einfo "Skipping other tests that require being non-root" + disabled="${disabled} ${tests_nonroot}" + else + [[ $cvs -gt 0 ]] && \ + has_version dev-vcs/cvs && \ + let cvs=$cvs+1 + [[ $cvs -gt 1 ]] && \ + has_version "dev-vcs/cvs[server]" && \ + let cvs=$cvs+1 + if [[ $cvs -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled="${disabled} ${tests_cvs}" + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled="${disabled} ${tests_perl}" + fi + + einfo "Disabling tests that fail with SVN 1.7" + disabled="${disabled} ${test_svn}" + + # Reset all previously disabled tests + cd "${S}/t" + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled} ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ + -i "${S}"/t/Makefile + + # Clean old results first, must always run + cd "${S}/t" + nonfatal git_emake clean + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + cd "${S}" + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + cd "${S}/t" + nonfatal git_emake aggregate-results + + # And bail if there was a problem + [ $rc -eq 0 ] || die "tests failed. Please file a bug." +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + einfo "Please read /usr/share/bash-completion/git for Git bash command completion" + einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" + einfo "Note that the prompt bash code is now in that separate script" + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" + echo +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.3.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.3.7.ebuild new file mode 100644 index 0000000000..bc5fe5f76c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.3.7.ebuild @@ -0,0 +1,636 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.3.7.ebuild,v 1.1 2015/05/01 16:32:30 robbat2 Exp $ + +EAPI=5 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_COMPAT=( python2_7 ) +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" +EGIT_MASTER=pu + +inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" +HOMEPAGE="http://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="xz" + SRC_URI_GOOG="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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + dev-libs/openssl:0= + sys-libs/zlib + pcre? ( dev-libs/libpcre ) + perl? ( dev-lang/perl:=[-build(-)] ) + tk? ( dev-lang/tk:= ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs ) + gnome-keyring? ( gnome-base/libgnome-keyring )" + +RDEPEND="${CDEPEND} + gpg? ( app-crypt/gnupg ) + mediawiki? ( + dev-perl/HTML-Tree + dev-perl/MediaWiki-API + ) + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) + cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) + subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + python? ( gtk? + ( + >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] + >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] + ) + ${PYTHON_DEPS} )" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + app-text/xmlto + ) + nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg )" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + DEPEND="${DEPEND} + app-text/asciidoc" +fi + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + mediawiki? ( perl ) + subversion? ( perl ) + webdav? ( curl ) + gtk? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]"; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use python ; then + python-single-r1_pkg_setup + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local myopts + + if use blksha1 ; then + myopts+=" BLK_SHA1=YesPlease" + elif use ppcsha1 ; then + myopts+=" PPC_SHA1=YesPlease" + fi + + if use curl ; then + use webdav || myopts+=" NO_EXPAT=YesPlease" + else + myopts+=" NO_CURL=YesPlease" + fi + + # broken assumptions, because of broken build system ... + myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts+=" INSTALL=install TAR=tar" + myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" + myopts+=" SANE_TOOL_PATH=" + myopts+=" OLD_ICONV=" + myopts+=" NO_EXTERNAL_GREP=" + + # For svn-fe + extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + use iconv \ + || myopts+=" NO_ICONV=YesPlease" + use nls \ + || myopts+=" NO_GETTEXT=YesPlease" + use tk \ + || myopts+=" NO_TCLTK=YesPlease" + use pcre \ + && myopts+=" USE_LIBPCRE=yes" \ + && extlibs+=" -lpcre" + use perl \ + && myopts+=" INSTALLDIRS=vendor" \ + || myopts+=" NO_PERL=YesPlease" + use python \ + || myopts+=" NO_PYTHON=YesPlease" + use subversion \ + || myopts+=" NO_SVN_TESTS=YesPlease" + use threads \ + && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ + || myopts+=" NO_PTHREADS=YesPlease" + use cvs \ + || myopts+=" NO_CVS=YesPlease" +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts+=" NO_MMAP=YesPlease" +# myopts+=" NO_IPV6=YesPlease" +# myopts+=" NO_STRLCPY=YesPlease" +# myopts+=" NO_MEMMEM=YesPlease" +# myopts+=" NO_MKDTEMP=YesPlease" +# myopts+=" NO_MKSTEMPS=YesPlease" +# fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts+=" NO_NSEC=YesPlease" + fi + if [[ ${CHOST} == *-*-aix* ]]; then + myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" + fi + if [[ ${CHOST} == *-solaris* ]]; then + myopts+=" NEEDS_LIBICONV=YesPlease" + fi + + has_version '>=app-text/asciidoc-8.0' \ + && myopts+=" ASCIIDOC8=YesPlease" + myopts+=" ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts+=" NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" + export EXTLIBS="${extlibs}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" + unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + use doc && \ + cd "${S}"/Documentation && \ + unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + cd "${S}" + else + git-2_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + # bug #350330 - automagic CVS when we don't want it is bad. + epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch + + # install mediawiki perl modules also in vendor_dir + # hack, needs better upstream solution + epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch + + epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + + epatch_user + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile contrib/svn-fe/Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL + + # Fix docbook2texi command + sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # Fix git-subtree missing DESTDIR + sed -i \ + -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ + -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ + contrib/subtree/Makefile +} + +git_emake() { + # bug #326625: PERL_PATH, PERL_MM_OPT + # bug #320647: PYTHON_PATH + PYTHON_PATH="" + use python && PYTHON_PATH="${PYTHON}" + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + OPTCC="$(tc-getCC)" \ + OPTAR="$(tc-getAR)" \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + sysconfdir="${EPREFIX}"/etc \ + PYTHON_PATH="${PYTHON_PATH}" \ + PERL_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + V=1 \ + "$@" + # This is the fix for bug #326625, but it also causes breakage, see bug + # #352693. + # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ +} + +src_configure() { + exportmakeopts +} + +src_compile() { + if use perl ; then + git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" + git_emake perl/perl.mak || die "emake perl/perl.mak failed" + fi + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el + fi + + if use perl && use cgi ; then + git_emake \ + gitweb/gitweb.cgi \ + || die "emake gitweb/gitweb.cgi failed" + fi + + if [[ ${CHOST} == *-darwin* ]]; then + cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" + git_emake || die "emake credential-osxkeychain" + fi + + cd "${S}"/Documentation + if [[ ${PV} == *9999 ]] ; then + git_emake man \ + || die "emake man failed" + if use doc ; then + git_emake info html \ + || die "emake info html failed" + fi + else + if use doc ; then + git_emake info \ + || die "emake info html failed" + fi + fi + + if use subversion ; then + cd "${S}"/contrib/svn-fe + # by defining EXTLIBS we override the detection for libintl and + # libiconv, bug #516168 + local nlsiconv= + use nls && use !elibc_glibc && nlsiconv+=" -lintl" + use iconv && use !elibc_glibc && nlsiconv+=" -liconv" + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + if use doc ; then + git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + fi + cd "${S}" + fi + + if use gnome-keyring ; then + cd "${S}"/contrib/credential/gnome-keyring + git_emake || die "emake git-credential-gnome-keyring failed" + fi + + cd "${S}"/contrib/subtree + git_emake + use doc && git_emake doc + + if use mediawiki ; then + cd "${S}"/contrib/mw-to-git + git_emake + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + if [[ ${CHOST} == *-darwin* ]]; then + dobin contrib/credential/osxkeychain/git-credential-osxkeychain + fi + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + + dodoc README Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + use doc && dohtml -p ${d} Documentation${d}*.html + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + newbashcomp contrib/completion/git-completion.bash ${PN} + bashcomp_alias git gitk + # Not really a bash-completion file (bug #477920) + # but still needed uncompressed (bug #507480) + insinto /usr/share/${PN} + doins contrib/completion/git-prompt.sh + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} + # don't add automatically to the load-path, so the sitefile + # can do a conditional loading + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + fi + + if use python && use gtk ; then + python_doscript "${S}"/contrib/gitview/gitview + dodoc "${S}"/contrib/gitview/gitview.txt + fi + + #dobin contrib/fast-import/git-p4 # Moved upstream + #dodoc contrib/fast-import/git-p4.txt # Moved upstream + newbin contrib/fast-import/import-tars.perl import-tars + exeinto /usr/libexec/git-core/ + newexe contrib/git-resurrect.sh git-resurrect + + # git-subtree + cd "${S}"/contrib/subtree + git_emake install || die "Failed to emake install git-subtree" + if use doc ; then + git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + fi + newdoc README README.git-subtree + dodoc git-subtree.txt + cd "${S}" + + if use mediawiki ; then + cd "${S}"/contrib/mw-to-git + git_emake install + cd "${S}" + fi + + # diff-highlight + dobin contrib/diff-highlight/diff-highlight + newdoc contrib/diff-highlight/README README.diff-highlight + + # git-jump + exeinto /usr/libexec/git-core/ + doexe contrib/git-jump/git-jump + newdoc contrib/git-jump/README git-jump.txt + + # git-contacts + exeinto /usr/libexec/git-core/ + doexe contrib/contacts/git-contacts + dodoc contrib/contacts/git-contacts.txt + + if use gnome-keyring ; then + cd "${S}"/contrib/credential/gnome-keyring + dobin git-credential-gnome-keyring + fi + + if use subversion ; then + cd "${S}"/contrib/svn-fe + dobin svn-fe + dodoc svn-fe.txt + use doc && doman svn-fe.1 && dohtml svn-fe.html + cd "${S}" + fi + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # credential/gnome-keyring TODO + # diff-highlight - done above + # emacs - installed above + # examples - these are stuff that is not used in Git anymore actually + # git-jump - done above + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # persistent-https - TODO + # mw-to-git - TODO + # subtree - build seperately + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + for i in \ + buildsystems convert-objects fast-import \ + hg-to-git hooks remotes2config.sh rerere-train.sh \ + stats workdir \ + ; do + cp -rf \ + "${S}"/contrib/${i} \ + "${ED}"/usr/share/${PN}/contrib \ + || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym /usr/share/gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + find "${ED}"/usr/lib64/perl5/ \ + -name .packlist \ + -exec rm \{\} \; + else + rm -rf "${ED}"/usr/share/gitweb + fi + + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + if use !prefix ; then + newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" + systemd_dounit "${FILESDIR}/git-daemon.socket" + fi + + perl_delete_localpod +} + +src_test() { + local disabled="" #t7004-tag.sh" #520270 + local tests_cvs="t9200-git-cvsexportcommit.sh \ + t9400-git-cvsserver-server.sh \ + t9401-git-cvsserver-crlf.sh \ + t9402-git-cvsserver-refs.sh \ + t9600-cvsimport.sh \ + t9601-cvsimport-vendor-branch.sh \ + t9602-cvsimport-branches-tags.sh \ + t9603-cvsimport-patchsets.sh \ + t9604-cvsimport-timestamps.sh" + local tests_perl="t3701-add-interactive.sh \ + t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh \ + t7106-reset-unborn-branch.sh \ + t7501-commit.sh" + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot="t0001-init.sh \ + t0004-unwritable.sh \ + t0070-fundamental.sh \ + t1004-read-tree-m-u-wf.sh \ + t3700-add.sh \ + t7300-clean.sh" + # t9100 still fails with symlinks in SVN 1.7 + local test_svn="t9100-git-svn-basic.sh" + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled="${disabled} t5000-tar-tree.sh" + fi + + cvs=0 + use cvs && let cvs=$cvs+1 + if [[ ${EUID} -eq 0 ]]; then + if [[ $cvs -eq 1 ]]; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled="${disabled} ${tests_cvs}" + fi + einfo "Skipping other tests that require being non-root" + disabled="${disabled} ${tests_nonroot}" + else + [[ $cvs -gt 0 ]] && \ + has_version dev-vcs/cvs && \ + let cvs=$cvs+1 + [[ $cvs -gt 1 ]] && \ + has_version "dev-vcs/cvs[server]" && \ + let cvs=$cvs+1 + if [[ $cvs -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled="${disabled} ${tests_cvs}" + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled="${disabled} ${tests_perl}" + fi + + einfo "Disabling tests that fail with SVN 1.7" + disabled="${disabled} ${test_svn}" + + # Reset all previously disabled tests + cd "${S}/t" + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled} ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ + -i "${S}"/t/Makefile + + # Clean old results first, must always run + cd "${S}/t" + nonfatal git_emake clean + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + cd "${S}" + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + cd "${S}/t" + nonfatal git_emake aggregate-results + + # And bail if there was a problem + [ $rc -eq 0 ] || die "tests failed. Please file a bug." +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + einfo "Please read /usr/share/bash-completion/git for Git bash command completion" + einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" + einfo "Note that the prompt bash code is now in that separate script" + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" + echo +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.4.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.4.0.ebuild new file mode 100644 index 0000000000..b29312b20c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.4.0.ebuild @@ -0,0 +1,636 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.4.0.ebuild,v 1.1 2015/05/01 16:54:51 robbat2 Exp $ + +EAPI=5 + +GENTOO_DEPEND_ON_PERL=no + +# bug #329479: git-remote-testgit is not multiple-version aware +PYTHON_COMPAT=( python2_7 ) +[[ ${PV} == *9999 ]] && SCM="git-2" +EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" +EGIT_MASTER=pu + +inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM} + +MY_PV="${PV/_rc/.rc}" +MY_P="${PN}-${MY_PV}" + +DOC_VER=${MY_PV} + +DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team" +HOMEPAGE="http://www.git-scm.com/" +if [[ ${PV} != *9999 ]]; then + SRC_URI_SUFFIX="xz" + SRC_URI_GOOG="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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" + +# Common to both DEPEND and RDEPEND +CDEPEND=" + dev-libs/openssl:0= + sys-libs/zlib + pcre? ( dev-libs/libpcre ) + perl? ( dev-lang/perl:=[-build(-)] ) + tk? ( dev-lang/tk:= ) + curl? ( + net-misc/curl + webdav? ( dev-libs/expat ) + ) + emacs? ( virtual/emacs ) + gnome-keyring? ( gnome-base/libgnome-keyring )" + +RDEPEND="${CDEPEND} + gpg? ( app-crypt/gnupg ) + mediawiki? ( + dev-perl/HTML-Tree + dev-perl/MediaWiki-API + ) + perl? ( dev-perl/Error + dev-perl/Net-SMTP-SSL + dev-perl/Authen-SASL + cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) + cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) + subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) + ) + python? ( gtk? + ( + >=dev-python/pygtk-2.8[${PYTHON_USEDEP}] + >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}] + ) + ${PYTHON_DEPS} )" + +# This is how info docs are created with Git: +# .txt/asciidoc --(asciidoc)---------> .xml/docbook +# .xml/docbook --(docbook2texi.pl)--> .texi +# .texi --(makeinfo)---------> .info +DEPEND="${CDEPEND} + doc? ( + app-text/asciidoc + app-text/docbook2X + sys-apps/texinfo + app-text/xmlto + ) + nls? ( sys-devel/gettext ) + test? ( app-crypt/gnupg )" + +# Live ebuild builds man pages and HTML docs, additionally +if [[ ${PV} == *9999 ]]; then + DEPEND="${DEPEND} + app-text/asciidoc" +fi + +SITEFILE=50${PN}-gentoo.el +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE=" + cgi? ( perl ) + cvs? ( perl ) + mediawiki? ( perl ) + subversion? ( perl ) + webdav? ( curl ) + gtk? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +pkg_setup() { + if use subversion && has_version "dev-vcs/subversion[dso]"; then + ewarn "Per Gentoo bugs #223747, #238586, when subversion is built" + ewarn "with USE=dso, there may be weird crashes in git-svn. You" + ewarn "have been warned." + fi + if use python ; then + python-single-r1_pkg_setup + fi +} + +# This is needed because for some obscure reasons future calls to make don't +# pick up these exports if we export them in src_unpack() +exportmakeopts() { + local myopts + + if use blksha1 ; then + myopts+=" BLK_SHA1=YesPlease" + elif use ppcsha1 ; then + myopts+=" PPC_SHA1=YesPlease" + fi + + if use curl ; then + use webdav || myopts+=" NO_EXPAT=YesPlease" + else + myopts+=" NO_CURL=YesPlease" + fi + + # broken assumptions, because of broken build system ... + myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease" + myopts+=" INSTALL=install TAR=tar" + myopts+=" SHELL_PATH=${EPREFIX}/bin/sh" + myopts+=" SANE_TOOL_PATH=" + myopts+=" OLD_ICONV=" + myopts+=" NO_EXTERNAL_GREP=" + + # For svn-fe + extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + + # can't define this to null, since the entire makefile depends on it + sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile + + use iconv \ + || myopts+=" NO_ICONV=YesPlease" + use nls \ + || myopts+=" NO_GETTEXT=YesPlease" + use tk \ + || myopts+=" NO_TCLTK=YesPlease" + use pcre \ + && myopts+=" USE_LIBPCRE=yes" \ + && extlibs+=" -lpcre" + use perl \ + && myopts+=" INSTALLDIRS=vendor" \ + || myopts+=" NO_PERL=YesPlease" + use python \ + || myopts+=" NO_PYTHON=YesPlease" + use subversion \ + || myopts+=" NO_SVN_TESTS=YesPlease" + use threads \ + && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \ + || myopts+=" NO_PTHREADS=YesPlease" + use cvs \ + || myopts+=" NO_CVS=YesPlease" +# Disabled until ~m68k-mint can be keyworded again +# if [[ ${CHOST} == *-mint* ]] ; then +# myopts+=" NO_MMAP=YesPlease" +# myopts+=" NO_IPV6=YesPlease" +# myopts+=" NO_STRLCPY=YesPlease" +# myopts+=" NO_MEMMEM=YesPlease" +# myopts+=" NO_MKDTEMP=YesPlease" +# myopts+=" NO_MKSTEMPS=YesPlease" +# fi + if [[ ${CHOST} == ia64-*-hpux* ]]; then + myopts+=" NO_NSEC=YesPlease" + fi + if [[ ${CHOST} == *-*-aix* ]]; then + myopts+=" NO_FNMATCH_CASEFOLD=YesPlease" + fi + if [[ ${CHOST} == *-solaris* ]]; then + myopts+=" NEEDS_LIBICONV=YesPlease" + fi + + has_version '>=app-text/asciidoc-8.0' \ + && myopts+=" ASCIIDOC8=YesPlease" + myopts+=" ASCIIDOC_NO_ROFF=YesPlease" + + # Bug 290465: + # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' + [[ "${CHOST}" == *-uclibc* ]] && \ + myopts+=" NO_NSEC=YesPlease" + + export MY_MAKEOPTS="${myopts}" + export EXTLIBS="${extlibs}" +} + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + unpack ${MY_P}.tar.${SRC_URI_SUFFIX} + cd "${S}" + unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} + use doc && \ + cd "${S}"/Documentation && \ + unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} + cd "${S}" + else + git-2_src_unpack + cd "${S}" + #cp "${FILESDIR}"/GIT-VERSION-GEN . + fi + +} + +src_prepare() { + # bug #350330 - automagic CVS when we don't want it is bad. + epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch + + # install mediawiki perl modules also in vendor_dir + # hack, needs better upstream solution + epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch + + epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + + epatch_user + + sed -i \ + -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \ + -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \ + -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \ + -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \ + -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \ + Makefile contrib/svn-fe/Makefile || die "sed failed" + + # Never install the private copy of Error.pm (bug #296310) + sed -i \ + -e '/private-Error.pm/s,^,#,' \ + perl/Makefile.PL + + # Fix docbook2texi command + sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \ + Documentation/Makefile || die "sed failed" + + # Fix git-subtree missing DESTDIR + sed -i \ + -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \ + -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \ + contrib/subtree/Makefile +} + +git_emake() { + # bug #326625: PERL_PATH, PERL_MM_OPT + # bug #320647: PYTHON_PATH + PYTHON_PATH="" + use python && PYTHON_PATH="${PYTHON}" + emake ${MY_MAKEOPTS} \ + DESTDIR="${D}" \ + OPTCFLAGS="${CFLAGS}" \ + OPTLDFLAGS="${LDFLAGS}" \ + OPTCC="$(tc-getCC)" \ + OPTAR="$(tc-getAR)" \ + prefix="${EPREFIX}"/usr \ + htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ + sysconfdir="${EPREFIX}"/etc \ + PYTHON_PATH="${PYTHON_PATH}" \ + PERL_MM_OPT="" \ + GIT_TEST_OPTS="--no-color" \ + V=1 \ + "$@" + # This is the fix for bug #326625, but it also causes breakage, see bug + # #352693. + # PERL_PATH="${EPREFIX}/usr/bin/env perl" \ +} + +src_configure() { + exportmakeopts +} + +src_compile() { + if use perl ; then + git_emake perl/PM.stamp || die "emake perl/PM.stamp failed" + git_emake perl/perl.mak || die "emake perl/perl.mak failed" + fi + git_emake || die "emake failed" + + if use emacs ; then + elisp-compile contrib/emacs/git{,-blame}.el + fi + + if use perl && use cgi ; then + git_emake \ + gitweb/gitweb.cgi \ + || die "emake gitweb/gitweb.cgi failed" + fi + + if [[ ${CHOST} == *-darwin* ]]; then + cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain" + git_emake || die "emake credential-osxkeychain" + fi + + cd "${S}"/Documentation + if [[ ${PV} == *9999 ]] ; then + git_emake man \ + || die "emake man failed" + if use doc ; then + git_emake info html \ + || die "emake info html failed" + fi + else + if use doc ; then + git_emake info \ + || die "emake info html failed" + fi + fi + + if use subversion ; then + cd "${S}"/contrib/svn-fe + # by defining EXTLIBS we override the detection for libintl and + # libiconv, bug #516168 + local nlsiconv= + use nls && use !elibc_glibc && nlsiconv+=" -lintl" + use iconv && use !elibc_glibc && nlsiconv+=" -liconv" + git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed" + if use doc ; then + git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed" + fi + cd "${S}" + fi + + if use gnome-keyring ; then + cd "${S}"/contrib/credential/gnome-keyring + git_emake || die "emake git-credential-gnome-keyring failed" + fi + + cd "${S}"/contrib/subtree + git_emake + use doc && git_emake doc + + if use mediawiki ; then + cd "${S}"/contrib/mw-to-git + git_emake + fi +} + +src_install() { + git_emake \ + install || \ + die "make install failed" + + if [[ ${CHOST} == *-darwin* ]]; then + dobin contrib/credential/osxkeychain/git-credential-osxkeychain + fi + + # Depending on the tarball and manual rebuild of the documentation, the + # manpages may exist in either OR both of these directories. + find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] + find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] + + dodoc README Documentation/{SubmittingPatches,CodingGuidelines} + use doc && dodir /usr/share/doc/${PF}/html + for d in / /howto/ /technical/ ; do + docinto ${d} + dodoc Documentation${d}*.txt + use doc && dohtml -p ${d} Documentation${d}*.html + done + docinto / + # Upstream does not ship this pre-built :-( + use doc && doinfo Documentation/{git,gitman}.info + + newbashcomp contrib/completion/git-completion.bash ${PN} + bashcomp_alias git gitk + # Not really a bash-completion file (bug #477920) + # but still needed uncompressed (bug #507480) + insinto /usr/share/${PN} + doins contrib/completion/git-prompt.sh + + if use emacs ; then + elisp-install ${PN} contrib/emacs/git.{el,elc} + elisp-install ${PN} contrib/emacs/git-blame.{el,elc} + #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} + # don't add automatically to the load-path, so the sitefile + # can do a conditional loading + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + fi + + if use python && use gtk ; then + python_doscript "${S}"/contrib/gitview/gitview + dodoc "${S}"/contrib/gitview/gitview.txt + fi + + #dobin contrib/fast-import/git-p4 # Moved upstream + #dodoc contrib/fast-import/git-p4.txt # Moved upstream + newbin contrib/fast-import/import-tars.perl import-tars + exeinto /usr/libexec/git-core/ + newexe contrib/git-resurrect.sh git-resurrect + + # git-subtree + cd "${S}"/contrib/subtree + git_emake install || die "Failed to emake install git-subtree" + if use doc ; then + git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + fi + newdoc README README.git-subtree + dodoc git-subtree.txt + cd "${S}" + + if use mediawiki ; then + cd "${S}"/contrib/mw-to-git + git_emake install + cd "${S}" + fi + + # diff-highlight + dobin contrib/diff-highlight/diff-highlight + newdoc contrib/diff-highlight/README README.diff-highlight + + # git-jump + exeinto /usr/libexec/git-core/ + doexe contrib/git-jump/git-jump + newdoc contrib/git-jump/README git-jump.txt + + # git-contacts + exeinto /usr/libexec/git-core/ + doexe contrib/contacts/git-contacts + dodoc contrib/contacts/git-contacts.txt + + if use gnome-keyring ; then + cd "${S}"/contrib/credential/gnome-keyring + dobin git-credential-gnome-keyring + fi + + if use subversion ; then + cd "${S}"/contrib/svn-fe + dobin svn-fe + dodoc svn-fe.txt + use doc && doman svn-fe.1 && dohtml svn-fe.html + cd "${S}" + fi + + dodir /usr/share/${PN}/contrib + # The following are excluded: + # completion - installed above + # credential/gnome-keyring TODO + # diff-highlight - done above + # emacs - installed above + # examples - these are stuff that is not used in Git anymore actually + # git-jump - done above + # gitview - installed above + # p4import - excluded because fast-import has a better one + # patches - stuff the Git guys made to go upstream to other places + # persistent-https - TODO + # mw-to-git - TODO + # subtree - build seperately + # svnimport - use git-svn + # thunderbird-patch-inline - fixes thunderbird + for i in \ + buildsystems convert-objects fast-import \ + hg-to-git hooks remotes2config.sh rerere-train.sh \ + stats workdir \ + ; do + cp -rf \ + "${S}"/contrib/${i} \ + "${ED}"/usr/share/${PN}/contrib \ + || die "Failed contrib ${i}" + done + + if use perl && use cgi ; then + # We used to install in /usr/share/${PN}/gitweb + # but upstream installs in /usr/share/gitweb + # so we will install a symlink and use their location for compat with other + # distros + dosym /usr/share/gitweb /usr/share/${PN}/gitweb + + # INSTALL discusses configuration issues, not just installation + docinto / + newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb + newdoc "${S}"/gitweb/README README.gitweb + + find "${ED}"/usr/lib64/perl5/ \ + -name .packlist \ + -exec rm \{\} \; + else + rm -rf "${ED}"/usr/share/gitweb + fi + + if ! use subversion ; then + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/git-daemon.xinetd git-daemon + fi + + if use !prefix ; then + newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon + newconfd "${FILESDIR}"/git-daemon.confd git-daemon + systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service" + systemd_dounit "${FILESDIR}/git-daemon.socket" + fi + + perl_delete_localpod +} + +src_test() { + local disabled="" #t7004-tag.sh" #520270 + local tests_cvs="t9200-git-cvsexportcommit.sh \ + t9400-git-cvsserver-server.sh \ + t9401-git-cvsserver-crlf.sh \ + t9402-git-cvsserver-refs.sh \ + t9600-cvsimport.sh \ + t9601-cvsimport-vendor-branch.sh \ + t9602-cvsimport-branches-tags.sh \ + t9603-cvsimport-patchsets.sh \ + t9604-cvsimport-timestamps.sh" + local tests_perl="t3701-add-interactive.sh \ + t5502-quickfetch.sh \ + t5512-ls-remote.sh \ + t5520-pull.sh \ + t7106-reset-unborn-branch.sh \ + t7501-commit.sh" + # Bug #225601 - t0004 is not suitable for root perm + # Bug #219839 - t1004 is not suitable for root perm + # t0001-init.sh - check for init notices EPERM* fails + local tests_nonroot="t0001-init.sh \ + t0004-unwritable.sh \ + t0070-fundamental.sh \ + t1004-read-tree-m-u-wf.sh \ + t3700-add.sh \ + t7300-clean.sh" + # t9100 still fails with symlinks in SVN 1.7 + local test_svn="t9100-git-svn-basic.sh" + + # Unzip is used only for the testcase code, not by any normal parts of Git. + if ! has_version app-arch/unzip ; then + einfo "Disabling tar-tree tests" + disabled="${disabled} t5000-tar-tree.sh" + fi + + cvs=0 + use cvs && let cvs=$cvs+1 + if [[ ${EUID} -eq 0 ]]; then + if [[ $cvs -eq 1 ]]; then + ewarn "Skipping CVS tests because CVS does not work as root!" + ewarn "You should retest with FEATURES=userpriv!" + disabled="${disabled} ${tests_cvs}" + fi + einfo "Skipping other tests that require being non-root" + disabled="${disabled} ${tests_nonroot}" + else + [[ $cvs -gt 0 ]] && \ + has_version dev-vcs/cvs && \ + let cvs=$cvs+1 + [[ $cvs -gt 1 ]] && \ + has_version "dev-vcs/cvs[server]" && \ + let cvs=$cvs+1 + if [[ $cvs -lt 3 ]]; then + einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])" + disabled="${disabled} ${tests_cvs}" + fi + fi + + if ! use perl ; then + einfo "Disabling tests that need Perl" + disabled="${disabled} ${tests_perl}" + fi + + einfo "Disabling tests that fail with SVN 1.7" + disabled="${disabled} ${test_svn}" + + # Reset all previously disabled tests + cd "${S}/t" + for i in *.sh.DISABLED ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}" + done + einfo "Disabled tests:" + for i in ${disabled} ; do + [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i" + done + + # Avoid the test system removing the results because we want them ourselves + sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \ + -i "${S}"/t/Makefile + + # Clean old results first, must always run + cd "${S}/t" + nonfatal git_emake clean + + # Now run the tests, keep going if we hit an error, and don't terminate on + # failure + cd "${S}" + einfo "Start test run" + #MAKEOPTS=-j1 + nonfatal git_emake --keep-going test + rc=$? + + # Display nice results, now print the results + cd "${S}/t" + nonfatal git_emake aggregate-results + + # And bail if there was a problem + [ $rc -eq 0 ] || die "tests failed. Please file a bug." +} + +showpkgdeps() { + local pkg=$1 + shift + elog " $(printf "%-17s:" ${pkg}) ${@}" +} + +pkg_postinst() { + use emacs && elisp-site-regen + einfo "Please read /usr/share/bash-completion/git for Git bash command completion" + einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt" + einfo "Note that the prompt bash code is now in that separate script" + elog "These additional scripts need some dependencies:" + echo + showpkgdeps git-quiltimport "dev-util/quilt" + showpkgdeps git-instaweb \ + "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )" + echo +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild index 27a921d476..1eda38daae 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.8 2014/11/16 22:54:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.11 2015/04/08 17:53:03 mgorny Exp $ EAPI=5 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_COMPAT=( python2_7 ) [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=maint @@ -34,9 +34,6 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" fi LICENSE="GPL-2" @@ -225,12 +222,14 @@ src_unpack() { src_prepare() { # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch + epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch # install mediawiki perl modules also in vendor_dir # hack, needs better upstream solution epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch + epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + epatch_user sed -i \ diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild index 38e41f4367..e0b752ba23 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.9 2014/12/02 07:32:57 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.12 2015/04/08 17:53:03 mgorny Exp $ EAPI=5 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_COMPAT=( python2_7 ) [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=next @@ -34,9 +34,6 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" fi LICENSE="GPL-2" @@ -225,7 +222,7 @@ src_unpack() { src_prepare() { # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch + epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch # install mediawiki perl modules also in vendor_dir # hack, needs better upstream solution diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild index ebc58fb9be..df03d238c4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-9999-r3.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.9 2014/11/16 22:54:52 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.12 2015/04/08 17:53:03 mgorny Exp $ EAPI=5 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_COMPAT=( python2_7 ) [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=pu @@ -34,9 +34,6 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" fi LICENSE="GPL-2" @@ -225,12 +222,14 @@ src_unpack() { src_prepare() { # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch + epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch # install mediawiki perl modules also in vendor_dir # hack, needs better upstream solution epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch + epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + epatch_user sed -i \ 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 f5b19bd15f..a8a4c72564 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,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.64 2014/12/02 07:32:57 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.67 2015/04/08 17:53:03 mgorny Exp $ EAPI=5 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_{6,7} ) +PYTHON_COMPAT=( python2_7 ) [[ ${PV} == *9999 ]] && SCM="git-2" EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" EGIT_MASTER=master @@ -34,9 +34,6 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -else - SRC_URI="" - KEYWORDS="" fi LICENSE="GPL-2" @@ -225,7 +222,7 @@ src_unpack() { src_prepare() { # bug #350330 - automagic CVS when we don't want it is bad. - epatch "${FILESDIR}"/git-2.0.0-r2-optional-cvs.patch + epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch # install mediawiki perl modules also in vendor_dir # hack, needs better upstream solution diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.8.5.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.8.5.5 deleted file mode 100644 index 886745c349..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.8.5.5 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig -DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team -EAPI=5 -HOMEPAGE=http://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 -KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=http://git-core.googlecode.com/files/git-1.8.5.5.tar.gz mirror://kernel/software/scm/git/git-1.8.5.5.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.5.5.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.5.5.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.5.5.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.5.5.tar.gz ) -_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=060ae2e307b644e9acf6a0b34a433a94 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.0.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.8.5.6 similarity index 89% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.0.4 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.8.5.6 index 10419a2032..ed47c6989f 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.0.4 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.8.5.6 @@ -9,6 +9,6 @@ LICENSE=GPL-2 RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) SLOT=0 -SRC_URI=http://git-core.googlecode.com/files/git-2.0.4.tar.xz mirror://kernel/software/scm/git/git-2.0.4.tar.xz http://git-core.googlecode.com/files/git-manpages-2.0.4.tar.xz mirror://kernel/software/scm/git/git-manpages-2.0.4.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.0.4.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.0.4.tar.xz ) +SRC_URI=http://git-core.googlecode.com/files/git-1.8.5.6.tar.gz mirror://kernel/software/scm/git/git-1.8.5.6.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.5.6.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.5.6.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.5.6.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.5.6.tar.gz ) _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=a0e10d03d24fb379e81e05cd39654dd4 +_md5_=756436cb231f1cc7274ca72a4f1db4ad diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.9.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.9.5 similarity index 81% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.9.3 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.9.5 index 58cfdc2d15..1019fc3377 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.9.3 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.9.5 @@ -4,11 +4,11 @@ DESCRIPTION=GIT - the stupid content tracker, the revision control system heavil EAPI=5 HOMEPAGE=http://www.git-scm.com/ IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 -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 +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 LICENSE=GPL-2 RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) SLOT=0 -SRC_URI=http://git-core.googlecode.com/files/git-1.9.3.tar.gz mirror://kernel/software/scm/git/git-1.9.3.tar.gz http://git-core.googlecode.com/files/git-manpages-1.9.3.tar.gz mirror://kernel/software/scm/git/git-manpages-1.9.3.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.9.3.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.9.3.tar.gz ) +SRC_URI=http://git-core.googlecode.com/files/git-1.9.5.tar.gz mirror://kernel/software/scm/git/git-1.9.5.tar.gz http://git-core.googlecode.com/files/git-manpages-1.9.5.tar.gz mirror://kernel/software/scm/git/git-manpages-1.9.5.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.9.5.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.9.5.tar.gz ) _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=f4532b509b733a37172c13eae3b08c3b +_md5_=eac1f74c08e94f324a24f140be0bf290 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.0.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.0.5 new file mode 100644 index 0000000000..2cce7b7182 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.0.5 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig +DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team +EAPI=5 +HOMEPAGE=http://www.git-scm.com/ +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) +SLOT=0 +SRC_URI=http://git-core.googlecode.com/files/git-2.0.5.tar.xz mirror://kernel/software/scm/git/git-2.0.5.tar.xz http://git-core.googlecode.com/files/git-manpages-2.0.5.tar.xz mirror://kernel/software/scm/git/git-manpages-2.0.5.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.0.5.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.0.5.tar.xz ) +_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 +_md5_=643bd57a94c49d1e483f14db05fc9e5a diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.1.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.1.4 similarity index 89% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.1.3 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.1.4 index 8f83532aa8..5747ebfca4 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.1.3 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.1.4 @@ -9,6 +9,6 @@ LICENSE=GPL-2 RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) SLOT=0 -SRC_URI=http://git-core.googlecode.com/files/git-2.1.3.tar.xz mirror://kernel/software/scm/git/git-2.1.3.tar.xz http://git-core.googlecode.com/files/git-manpages-2.1.3.tar.xz mirror://kernel/software/scm/git/git-manpages-2.1.3.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.1.3.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.1.3.tar.xz ) +SRC_URI=http://git-core.googlecode.com/files/git-2.1.4.tar.xz mirror://kernel/software/scm/git/git-2.1.4.tar.xz http://git-core.googlecode.com/files/git-manpages-2.1.4.tar.xz mirror://kernel/software/scm/git/git-manpages-2.1.4.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.1.4.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.1.4.tar.xz ) _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=6634244c63e3c1d548f5f2f68471eb53 +_md5_=4b5de6bc31e6ae53fa3f861796d04a03 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.2.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.2.2 similarity index 89% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.2.0 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.2.2 index 7e62f7a2e0..595ffc6d35 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.2.0 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.2.2 @@ -9,6 +9,6 @@ LICENSE=GPL-2 RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) SLOT=0 -SRC_URI=http://git-core.googlecode.com/files/git-2.2.0.tar.xz mirror://kernel/software/scm/git/git-2.2.0.tar.xz http://git-core.googlecode.com/files/git-manpages-2.2.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.2.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.2.0.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.2.0.tar.xz ) +SRC_URI=http://git-core.googlecode.com/files/git-2.2.2.tar.xz mirror://kernel/software/scm/git/git-2.2.2.tar.xz http://git-core.googlecode.com/files/git-manpages-2.2.2.tar.xz mirror://kernel/software/scm/git/git-manpages-2.2.2.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.2.2.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.2.2.tar.xz ) _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=ada3db93d28bac3c1cc7f2fbb95e3e1f +_md5_=f52ef0552a31920df9259a534275c8a1 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.3.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.3.5 new file mode 100644 index 0000000000..b1acd92c4e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.3.5 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig +DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team +EAPI=5 +HOMEPAGE=http://www.git-scm.com/ +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) +SLOT=0 +SRC_URI=http://git-core.googlecode.com/files/git-2.3.5.tar.xz mirror://kernel/software/scm/git/git-2.3.5.tar.xz http://git-core.googlecode.com/files/git-manpages-2.3.5.tar.xz mirror://kernel/software/scm/git/git-manpages-2.3.5.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.3.5.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.3.5.tar.xz ) +_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 +_md5_=bbdb334e905968ccbce2108ef3a8790f diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.8.3.2-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.3.6 similarity index 52% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.8.3.2-r1 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.3.6 index 2e2dc812a7..97457d0b22 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-1.8.3.2-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.3.6 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig +DEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team EAPI=5 HOMEPAGE=http://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 -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 +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 +KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=GPL-2 -RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) 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:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) +RDEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) SLOT=0 -SRC_URI=http://git-core.googlecode.com/files/git-1.8.3.2.tar.gz mirror://kernel/software/scm/git/git-1.8.3.2.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.3.2.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.3.2.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.3.2.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.3.2.tar.gz ) +SRC_URI=http://git-core.googlecode.com/files/git-2.3.6.tar.xz mirror://kernel/software/scm/git/git-2.3.6.tar.xz http://git-core.googlecode.com/files/git-manpages-2.3.6.tar.xz mirror://kernel/software/scm/git/git-manpages-2.3.6.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.3.6.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.3.6.tar.xz ) _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=471bed812c3f39fefee5605aad9a8af8 +_md5_=72b9ecd6d3a5f63ac6df2a5a6a0cfea1 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.3.7 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.3.7 new file mode 100644 index 0000000000..0af469cfee --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.3.7 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig +DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team +EAPI=5 +HOMEPAGE=http://www.git-scm.com/ +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) +SLOT=0 +SRC_URI=http://git-core.googlecode.com/files/git-2.3.7.tar.xz mirror://kernel/software/scm/git/git-2.3.7.tar.xz http://git-core.googlecode.com/files/git-manpages-2.3.7.tar.xz mirror://kernel/software/scm/git/git-manpages-2.3.7.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.3.7.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.3.7.tar.xz ) +_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 +_md5_=672bdeec787488785172850f9a3f5e93 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.4.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.4.0 new file mode 100644 index 0000000000..8994358b88 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.4.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig +DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team +EAPI=5 +HOMEPAGE=http://www.git-scm.com/ +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) +SLOT=0 +SRC_URI=http://git-core.googlecode.com/files/git-2.4.0.tar.xz mirror://kernel/software/scm/git/git-2.4.0.tar.xz http://git-core.googlecode.com/files/git-manpages-2.4.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.4.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.4.0.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.4.0.tar.xz ) +_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 +_md5_=a6287f4c745c557a2538f5fd0445fabf diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999 index 69d95648d6..acc456fcc9 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999 @@ -9,4 +9,4 @@ RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-la REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) SLOT=0 _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de git-2 e28f0d8a9b321431b1e699782851b827 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=ccfb19773bb45d1bfc700f42a6374723 +_md5_=c4b6ebd340b73815ec2ce71f2586e397 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r1 index 8de3000661..9f225a94e7 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r1 @@ -9,4 +9,4 @@ RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-la REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) SLOT=0 _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de git-2 e28f0d8a9b321431b1e699782851b827 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=d18245ea98390af0547c17df0ab755f1 +_md5_=4db640fdc6b5595fac775ccb94e125f2 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r2 index 8c02d2af09..f5353082fc 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r2 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r2 @@ -9,4 +9,4 @@ RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-la REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) SLOT=0 _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de git-2 e28f0d8a9b321431b1e699782851b827 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=8292394c3dc29dbf53ef4639ad229d5f +_md5_=ec8b78542c6d24dc9cc9254680eef8eb diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r3 index ade0e4b512..557dca7772 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r3 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-9999-r3 @@ -9,4 +9,4 @@ RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-la REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 ) SLOT=0 _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 elisp-common 1aa23b3de5dae55456fa2071428eb5bf eutils 9fb270e417e0e83d64ca52586c4a79de git-2 e28f0d8a9b321431b1e699782851b827 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 7a1c6bac46bba968758a2f7666af645b python-single-r1 7a178335dbd6ea7f50ed4e3e1c13c1e4 python-utils-r1 096f8247eae93026af13ab88cf4305cd systemd 090342761f573a8280dd5aa6b0345f3b toolchain-funcs c961250d50160cd37d6b7fd9e8429c92 unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=550b2b04407ad9b0cfb8a62971810fb9 +_md5_=777c2bffdb39cc5d13228fe991d634aa