From e8b5b8a3ce83401d78e8d022343d0b6b3c6f4514 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 20 Jan 2020 16:39:53 +0100 Subject: [PATCH] 2387.0.0 --- .../portage-stable/dev-vcs/git/Manifest | 21 +- ...git-2.21.0-quiet-submodules-testcase.patch | 38 ++ .../files/git-2.22.0_rc0-optional-cvs.patch | 454 ++++++++++++++++++ .../git-2.23.0-avoid_empty_remote_line.patch | 145 ++++++ .../{git-2.21.0.ebuild => git-2.21.1.ebuild} | 22 +- ...-2.21.0-r1.ebuild => git-2.23.1-r1.ebuild} | 74 +-- .../{git-2.20.1.ebuild => git-2.24.1.ebuild} | 135 +++--- .../{git-2.19.2.ebuild => git-2.25.0.ebuild} | 137 +++--- .../dev-vcs/git/git-9999-r1.ebuild | 117 +++-- .../dev-vcs/git/git-9999-r2.ebuild | 117 +++-- .../dev-vcs/git/git-9999-r3.ebuild | 117 +++-- .../dev-vcs/git/git-9999.ebuild | 117 +++-- .../portage-stable/dev-vcs/git/metadata.xml | 1 + .../eclass/perl-functions.eclass | 10 +- .../portage-stable/eclass/perl-module.eclass | 72 ++- .../metadata/md5-cache/dev-vcs/git-2.19.2 | 14 - .../metadata/md5-cache/dev-vcs/git-2.20.1 | 14 - .../metadata/md5-cache/dev-vcs/git-2.21.0 | 14 - .../metadata/md5-cache/dev-vcs/git-2.21.0-r1 | 14 - .../metadata/md5-cache/dev-vcs/git-2.21.1 | 15 + .../metadata/md5-cache/dev-vcs/git-2.23.1-r1 | 15 + .../metadata/md5-cache/dev-vcs/git-2.24.1 | 16 + .../metadata/md5-cache/dev-vcs/git-2.25.0 | 16 + .../metadata/md5-cache/dev-vcs/git-9999 | 17 +- .../metadata/md5-cache/dev-vcs/git-9999-r1 | 17 +- .../metadata/md5-cache/dev-vcs/git-9999-r2 | 17 +- .../metadata/md5-cache/dev-vcs/git-9999-r3 | 17 +- 27 files changed, 1291 insertions(+), 472 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.21.0-quiet-submodules-testcase.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.22.0_rc0-optional-cvs.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.23.0-avoid_empty_remote_line.patch rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.21.0.ebuild => git-2.21.1.ebuild} (96%) rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.21.0-r1.ebuild => git-2.23.1-r1.ebuild} (90%) rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.20.1.ebuild => git-2.24.1.ebuild} (85%) rename sdk_container/src/third_party/portage-stable/dev-vcs/git/{git-2.19.2.ebuild => git-2.25.0.ebuild} (84%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.20.1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0-r1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.23.1-r1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.24.1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.25.0 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 d07847a65b..622975af3b 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 @@ -1,9 +1,12 @@ -DIST git-2.19.2.tar.xz 5235608 BLAKE2B ece292b8cf41deafc63c00e6176b0de39936f7d840d776192f32c1e293abc06c39119d13ed947d3de6a212fa6973bedb288c06f8bfcfc8144e563d5af40e45da SHA512 1d707c1a7a16fe9399592b0354e9023f701b019f36fe775997c46354d40617a80fa04aacc5330825c4f9301c2910ead8b26274a7f3b92e9d790b4705c0d7aa96 -DIST git-2.20.1.tar.xz 5359872 BLAKE2B f7eb640f179837687b2b343d8a3a03d7d0fa60ca17e28dc5637a75800752d0e02be4c535dc4c3be6f25020aa419f22aa6855c641b06c61ebf45e0c51de069262 SHA512 3f05ea3a645d4d74c7380b03e2de39f893ff77a05d8b595ce30300d1d4e032f11d84952366096f8effd5fba18dfa5ebb946bc07a984eb7cbbda113cb88202f6c -DIST git-2.21.0.tar.xz 5491296 BLAKE2B c5e66f4d4045f99bb4306e8f096ae9299908383df78bdf2a954cd415f4778eb59ea0ee7d501689313617de7dc1d2ee4ae15ab70dee564add5de877109073ddff SHA512 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973 -DIST git-htmldocs-2.19.2.tar.xz 1223848 BLAKE2B 6f30192cb101988fdfcce3bb79c684c6d1ac08cdc929caa049102fba10277fa8cc908904fe7472e40d60707c1b23145d95c441c1401c8697c37a81456d79aab8 SHA512 830e780beea10bde750d09a335fd9986c5ffbf47a724cbbeed5a1a2c94bc81d9c9223e415c5888faf81ab6404e460565434988f6635312039b88282a46014634 -DIST git-htmldocs-2.20.1.tar.xz 1227884 BLAKE2B 2e3b5e888d187cc7563a36d9b0c43118fbc50ddf9ca65a98319f563ff226e1f9829d578f578619e04d9576eae95631188973484aa758a9706a7a08261e0a16ad SHA512 aae04a8a42865a855d699d445d2fbed657aecce8d090a36e171c6cf260175102fe2314142f3b59d200460560b413698fb263e77cadae49171bff50b96edb6d63 -DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380dbf3ca72526067b3a86ed0865e37351c4fac1f0c7e845e7b0c27a1d955c64622f10c999389446b53191acdc05a44647847 SHA512 4537b3f67d03050e5daefaa6f274d3acdf6e116dc8c7f76566b33100e76a445c3e3894b5ff63b5ddb024e1c691a3bf08acea42dbec681da1b0f1de2e5736c9c4 -DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1 -DIST git-manpages-2.20.1.tar.xz 439172 BLAKE2B c1c7a3031d600e53451ff2c35b00a541dfc09554b47567c4bfa8410d891dbd98c2ff28cbff5deff21e74c1c92eaa70777013e23bae6a484ba1690bbefc1740fa SHA512 43ab28063b896062727ced8aa64119daebef261c5b393cec112fe9872955a165abc3d91f75f6e273d60b15f3c49eba44dfc7591ede452cfee8362f7d5f39c5f7 -DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30 +DIST git-2.21.1.tar.xz 5496840 BLAKE2B 8b61c5ca8940422238e48931b502f2a876e20181e66232fbd8a7311969c27c862524b384792d4a35a61c33ba3297c90e6df5febf3a820281eaab00233f48b02c SHA512 c4f1930effe4b7cddbdc3a5ea0f1503683089d5dfdae491dd7f752f35b655b31fbef569a993ef412962cf9c74a225eafe095f792d493f37b20789e5c643261a1 +DIST git-2.23.1.tar.xz 5713672 BLAKE2B 50db7bafbadcefbc5a56db478ea0464d289c45190a0454e0b8f3d99d48e6251071482df0240ee1ee8a1f733c91e9e46d34794bca8ca70d3c4ecc3b5da6d5d529 SHA512 708f8b9a7c65c1c9d3117b1b7ee9383044b66fe8a5c168a52ba561985670f659d514aa34988ea8ba85c127da6a23c39c511919a6d661bffc9cf782e30fd62373 +DIST git-2.24.1.tar.xz 5772304 BLAKE2B 45e49325221cd0407968b4e2ff7bcab7ea021863119ae29fec5c7a9ff10461b5af0ea05f587647c7d4965c38e25f1140f194be72ff5f1bea8851c0485effbfa2 SHA512 010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7 +DIST git-2.25.0.tar.xz 5873532 BLAKE2B 7e9e54677ac3c4d3295e9f92ba7e3f7f5b33620d6d0fb8105d5e57d609fe3ee499d1c1bc4a6d8832927a28f4948f4466a6ca4edf996b8a324279f91d25627660 SHA512 8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 +DIST git-htmldocs-2.21.1.tar.xz 1236408 BLAKE2B 173892327d27d918cc0a15e982145d5f0f638deeda56be1cbf16c953b7b3454555ecf3e708c6117b1d4e781ca332199457d9c5b619c91735e0c6e85449be528f SHA512 41819a75656afab0fd56407e7141c8176b708099546cdc7cdc5e765a35401e1148a7165c41bc12a68e124335532450748b27cc3f8c0e372d596f27a992e23e95 +DIST git-htmldocs-2.23.1.tar.xz 1296144 BLAKE2B 5be4a8afdd79234d220c119b8a4239e640486dc52236d980d08e6b3cad1be61b683c0e3dff6bdd67035a1e23f1d07858d3344f9f2ae90b44188395f34c22fea4 SHA512 c005be3baf129c9320893270d1d3b69e01546a29d482d29e5bc7baefbaab33e45d877c5c09e47312bbdb8b3dfcff27735c2427dcae9eb21fd3500ec30e214ae1 +DIST git-htmldocs-2.24.1.tar.xz 1307992 BLAKE2B 80b39d2fcf47d20a584109572414ff8d275245afb80c3946e2fa62346fdaee3b1c873a0dccfb44af52290756d26d5e53021a1bf1ace7ada34e50e03244f05e92 SHA512 4da610ba1ee307e4f53414e324ef63ab25cf3945a74bf813aeacd4cf714710eab31776c2402c9567f1a3805e3d8576a158c78a72722c0178fb7c2dec2dcebf5a +DIST git-htmldocs-2.25.0.tar.xz 1293644 BLAKE2B 8966e7d57701543770a589aef4a4bb8e673c22987330095431da6cc6cff023f8e288ba13a43d388d9b6e4fb92bed5baaa983c72124f440ef9e6c966b03d920a4 SHA512 67e8c2cc458d81870c901b720800a49cf605b3815c63af91328419a1e543e296b348bd8f7126a4a3cefcb8e2e2c7b713bcfc38ee945c224bd34bbd1c3e4f45b2 +DIST git-manpages-2.21.1.tar.xz 440316 BLAKE2B 658232d29bbca3b55a6797d5008f2f6f82d0c04d22ae5af8c689d8cb00e35bfbbccf658d269b96dd868cf3e1cf8f3304eb97cfee428ff8c762f914d1cde4e4f4 SHA512 1a687e4cb2dc90854067b164d6142b88205ba40dbc283432296afafde4370afc900096c5aedc9a7a959b8aa910196d42c399c5c4eed7e2f1ce0f98d8005f3581 +DIST git-manpages-2.23.1.tar.xz 448432 BLAKE2B 0de4b2c0dcc3a70188a66d8aa6e16aeaad84a9f16b764934b06f61773db2d5141cc0b1091780d126f29a1f50c767a54fbb7d01a36f86d387d8ccb4060f48156e SHA512 16145c0c2215ce6a3aa9045f35f670258f6823a765ed2feec680ed980420d1bb008fc39d8f379c81cd0b259fc582d15e42395d4f954171b20bcf214ab25e41d7 +DIST git-manpages-2.24.1.tar.xz 453752 BLAKE2B 51a549099205341bfec5a7998e5f66e9fc78ffd05fd04e745401a8bcc5bffcb64f26a64c7e24c9822bc2d62d000ea2b13779ffe19f065124a8e42b306fb5a2d3 SHA512 ee1e70fdbfc6eae97dc3b3180fa119b0d1189db7cae3e45b8baa9311d0c1162a5b46824a785e91288522a9fd00b8e4ff07590f4e4722a08955d6a9d048cc3a90 +DIST git-manpages-2.25.0.tar.xz 456636 BLAKE2B 672557d167b7d2ff48089bc5be1fa446f25eed4412d6e48549d5907f7addab9f721a03a8bcb7ca3fb1804220021566ebac549d9878df9f1030f283ed5e44ddf3 SHA512 3ad1756b1f12898823a8981e3b650f588c6c1fb2d51371739c754108e67c2cd13e4d2bcb8291534523eac60e7a05253d4ddf2f3528e28d4e1b50eafa42168847 diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.21.0-quiet-submodules-testcase.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.21.0-quiet-submodules-testcase.patch new file mode 100644 index 0000000000..0874ea9352 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.21.0-quiet-submodules-testcase.patch @@ -0,0 +1,38 @@ +From a57994f2d78134936521375ba9798a1b7418e230 Mon Sep 17 00:00:00 2001 +From: "Robin H. Johnson" +Date: Fri, 12 Apr 2019 00:00:07 -0700 +Subject: [PATCH] submodule foreach: test foreach option swallowing + +Add a testcase for submodule foreach option parsing not knowing where to +stop taking options, and accidently removing options intended for +foreach target commands. + +CC: Duy Nguyen +CC: Prathamesh Chavan +Signed-off-by: Robin H. Johnson +--- + t/t7407-submodule-foreach.sh | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh +index 77729ac4aa..706ae762e0 100755 +--- a/t/t7407-submodule-foreach.sh ++++ b/t/t7407-submodule-foreach.sh +@@ -411,4 +411,14 @@ test_expect_success 'multi-argument command passed to foreach is not shell-evalu + test_cmp expected actual + ' + ++test_expect_success 'option-like arguments passed to foreach commands are not lost' ' ++ ( ++ cd super && ++ git submodule foreach "echo be --quiet" > ../expected && ++ git submodule foreach echo be --quiet > ../actual ++ ) && ++ grep -sq -e "--quiet" expected && ++ test_cmp expected actual ++' ++ + test_done +-- +2.21.0 + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.22.0_rc0-optional-cvs.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.22.0_rc0-optional-cvs.patch new file mode 100644 index 0000000000..a7d7a7848f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.22.0_rc0-optional-cvs.patch @@ -0,0 +1,454 @@ +From 1d3a35734efa1a1778612bb60cbbb495f65d3fc0 Mon Sep 17 00:00:00 2001 +From: Robin Johnson +Date: Tue, 14 May 2019 08:53:06 +0200 +Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface + utilities + +Forward-ported from 1.7.12 to current git.git v1.8.4 +Forward-ported from v1.8.4 to v1.8.5.1 +Forward-ported from v1.8.5.3 to v1.9.0_rc3 +Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0 +Forward-ported from v2.0.0_rc0 to v2.0.0 +Forward-ported from v2.0.0 to v2.2.2 +Forward-ported from v2.2.2 to v2.8.4 +Forward-ported from v2.8.4 to v2.10.0 +Forward-ported from v2.10.0 to v2.12.0 +Forward-ported from v2.12.0 to v2.17.0-rc1 +Forward-ported from v2.17.0-rc1 to v2.18.0-rc1 +Forward-ported from v2.18.0-rc1 to v2.22.0-rc0 + +Signed-off-by: Lars Wendler +--- + Makefile | 48 ++++++++++++++++++++++-------- + 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, 118 insertions(+), 33 deletions(-) + +diff --git a/Makefile b/Makefile +index f965509b3c..ab8b22faf1 100644 +--- a/Makefile ++++ b/Makefile +@@ -327,6 +327,8 @@ all:: + # Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep + # and egrep that are pickier when their input contains non-ASCII data. + # ++# 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'. +@@ -597,6 +599,7 @@ PROGRAM_OBJS = + PROGRAMS = + EXCLUDED_PROGRAMS = + SCRIPT_PERL = ++SCRIPT_PERL_CVS = + SCRIPT_PYTHON = + SCRIPT_SH = + SCRIPT_LIB = +@@ -632,31 +635,33 @@ SCRIPT_LIB += git-sh-i18n + + SCRIPT_PERL += git-add--interactive.perl + SCRIPT_PERL += git-archimport.perl +-SCRIPT_PERL += git-cvsexportcommit.perl +-SCRIPT_PERL += git-cvsimport.perl +-SCRIPT_PERL += git-cvsserver.perl + SCRIPT_PERL += git-send-email.perl + SCRIPT_PERL += git-svn.perl + ++SCRIPT_PERL_CVS += git-cvsexportcommit.perl ++SCRIPT_PERL_CVS += git-cvsimport.perl ++SCRIPT_PERL_CVS += git-cvsserver.perl ++ + SCRIPT_PYTHON += git-p4.py + + # Generated files for scripts + SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) + SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) ++SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS)) + SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) + + # 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_GEN) + $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' +-install-perl-script: $(SCRIPT_PERL_GEN) ++install-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) + $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' + install-python-script: $(SCRIPT_PYTHON_GEN) + $(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' +@@ -665,12 +670,13 @@ install-python-script: $(SCRIPT_PYTHON_GEN) + 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_GEN) \ + $(SCRIPT_PERL_GEN) \ ++ $(SCRIPT_PERL_CVS_GEN) \ + $(SCRIPT_PYTHON_GEN) \ + git-instaweb + +@@ -2189,13 +2195,27 @@ git.res: git.rc GIT-VERSION-FILE GIT-PREFIX + -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@ + + # 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 = + + # Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX + # since the locale directory is injected. + perl_localedir_SQ = $(localedir_SQ) + + ifndef NO_PERL ++_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN) ++ ++ifndef NO_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_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl + PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ) + +@@ -2216,7 +2236,7 @@ endif + + PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir) + +-$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE ++$(_SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE + $(QUIET_GEN)$(RM) $@ $@+ && \ + sed -e '1{' \ + -e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \ +@@ -2262,14 +2282,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES + chmod +x $@+ && \ + mv $@+ $@ + else # NO_PERL +-$(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 ++ ++$(_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@@|$(_REASON)=$(_REASON_CONTENT)|g' \ + unimplemented.sh >$@+ && \ + chmod +x $@+ && \ + mv $@+ $@ +-endif # NO_PERL + + # This makes sure we depend on the NO_PYTHON setting itself. + $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS +@@ -2518,7 +2542,7 @@ LOCALIZED_SH = $(SCRIPT_SH) + LOCALIZED_SH += git-parse-remote.sh + LOCALIZED_SH += git-rebase--preserve-merges.sh + LOCALIZED_SH += git-sh-setup.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 c5946cb0b8..223fd5409b 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 + ++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 --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh +index a5e5dca753..ef6d9c911c 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 +- 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 --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh +index 84787eee9a..eecba88527 100755 +--- a/t/t9401-git-cvsserver-crlf.sh ++++ b/t/t9401-git-cvsserver-crlf.sh +@@ -57,15 +57,20 @@ check_status_options() { + return $stat + } + +-cvs >/dev/null 2>&1 +-if test $? -ne 1 ++if ! test_have_prereq PERL + then +- skip_all='skipping git-cvsserver tests, cvs not found' ++ skip_all='skipping git-cvsserver tests, perl not available' + test_done + fi +-if ! test_have_prereq PERL ++if ! test_have_prereq CVS + then +- skip_all='skipping git-cvsserver tests, perl not available' ++ skip_all='skipping git-cvsserver tests, cvs not available' ++ test_done ++fi ++cvs >/dev/null 2>&1 ++if test $? -ne 1 ++then ++ skip_all='skipping git-cvsserver tests, cvs not found' + test_done + fi + perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { +diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh +index 251fdd66c4..596cd9d35d 100755 +--- a/t/t9600-cvsimport.sh ++++ b/t/t9600-cvsimport.sh +@@ -8,14 +8,25 @@ if ! test_have_prereq NOT_ROOT; then + test_done + fi + +-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 && +@@ -47,23 +58,23 @@ EOF + ) + ' + +-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, +@@ -91,7 +102,7 @@ EOF + ) + ' + +-test_expect_success PERL 'update git module' ' ++test_expect_success 'update git module' ' + + (cd module-git && + git config cvsimport.trackRevisions true && +@@ -102,7 +113,7 @@ test_expect_success PERL 'update git module' ' + + ' + +-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^ && +@@ -110,7 +121,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' ' + 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 && +@@ -119,7 +130,7 @@ test_expect_success PERL 'update cvs module' ' + ) + ' + +-test_expect_success PERL 'cvsimport.module config works' ' ++test_expect_success 'cvsimport.module config works' ' + + (cd module-git && + git config cvsimport.module module && +@@ -131,7 +142,7 @@ test_expect_success PERL 'cvsimport.module config works' ' + + ' + +-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^^ && +@@ -140,7 +151,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' ' + 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 && +@@ -153,12 +164,12 @@ test_expect_success PERL 'import from a CVS working tree' ' + + ' + +-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 --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh +index 827d39f5bf..d730a41f67 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 + ++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 --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh +index e1db323f54..68f097401f 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 + ++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 --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh +index 3e64b11eac..606980b05c 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 + ++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 PERL 'import with criss cross times on revisions' ' +diff --git a/t/test-lib.sh b/t/test-lib.sh +index 908ddb9c46..9a06440599 100644 +--- a/t/test-lib.sh ++++ b/t/test-lib.sh +@@ -1428,6 +1428,7 @@ case $uname_s in + 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_PTHREADS" && test_set_prereq PTHREADS + test -z "$NO_PYTHON" && test_set_prereq PYTHON +-- +2.21.0 + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.23.0-avoid_empty_remote_line.patch b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.23.0-avoid_empty_remote_line.patch new file mode 100644 index 0000000000..f2bc3fd634 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/files/git-2.23.0-avoid_empty_remote_line.patch @@ -0,0 +1,145 @@ +From bbf47568ad7e91ab0962b314c054a2da03232c72 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= +Date: Mon, 16 Sep 2019 22:54:11 +0200 +Subject: [PATCH] Revert "progress: use term_clear_line()" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 5b12e3123b (progress: use term_clear_line(), +2019-06-24), because covering up the entire last line while refreshing +the progress line caused unexpected problems during 'git +clone/fetch/push': + + $ git clone ssh://localhost/home/szeder/src/tmp/linux.git/ + Cloning into 'linux'... + remote: + remote: + remote: + remote: Enumerating objects: 999295 + +The length of the progress bar line can shorten when it includes +throughput and the unit changes, or when its length exceeds the width +of the terminal and is broken into two lines. In these cases the +previously displayed longer progress line should be covered up, +because otherwise the leftover characters from the previous progress +line make the output look weird [1]. term_clear_line() makes this +quite simple, as it covers up the entire last line either by using an +ANSI control sequence or by printing a terminal width worth of space +characters, depending on whether the terminal is smart or dumb. + +Unfortunately, when accessing a remote repository via any non-local +protocol the remote 'git receive-pack/upload-pack' processes can't +possibly have any idea about the local terminal (smart of dumb? how +wide?) their progress will end up on. Consequently, they assume the +worst, i.e. standard-width dumb terminal, and print 80 spaces to cover +up the previously displayed progress line. The local 'git +clone/fetch/push' processes then display the remote's progress, +including these coverup spaces, with the 'remote: ' prefix, resulting +in a total line length of 88 characters. If the local terminal is +narrower than that, then the coverup gets line-wrapped, and after that +the CR at the end doesn't return to the beginning of the progress +line, but to the first column of its last line, resulting in those +repeated 'remote: ' lines. + +By reverting 5b12e3123b (progress: use term_clear_line(), +2019-06-24) we won't cover up the entire last line, but go back to +comparing the length of the current progress bar line with the +previous one, and cover up as many characters as needed. + +[1] See commits 545dc345eb (progress: break too long progress bar + lines, 2019-04-12) and 9f1fd84e15 (progress: clear previous + progress update dynamically, 2019-04-12). + +Signed-off-by: SZEDER Gábor +Signed-off-by: Junio C Hamano +--- + progress.c | 29 ++++++++++++++++++----------- + t/t5541-http-push-smart.sh | 6 +++--- + 2 files changed, 21 insertions(+), 14 deletions(-) + +diff --git a/progress.c b/progress.c +index 277db8afa2..0eddf1804d 100644 +--- a/progress.c ++++ b/progress.c +@@ -88,6 +88,7 @@ static void display(struct progress *progress, uint64_t n, const char *done) + const char *tp; + struct strbuf *counters_sb = &progress->counters_sb; + int show_update = 0; ++ int last_count_len = counters_sb->len; + + if (progress->delay && (!progress_update || --progress->delay)) + return; +@@ -115,21 +116,27 @@ static void display(struct progress *progress, uint64_t n, const char *done) + if (show_update) { + if (is_foreground_fd(fileno(stderr)) || done) { + const char *eol = done ? done : "\r"; ++ size_t clear_len = counters_sb->len < last_count_len ? ++ last_count_len - counters_sb->len + 1 : ++ 0; ++ /* The "+ 2" accounts for the ": ". */ ++ size_t progress_line_len = progress->title_len + ++ counters_sb->len + 2; ++ int cols = term_columns(); + +- term_clear_line(); + if (progress->split) { +- fprintf(stderr, " %s%s", counters_sb->buf, +- eol); +- } else if (!done && +- /* The "+ 2" accounts for the ": ". */ +- term_columns() < progress->title_len + +- counters_sb->len + 2) { +- fprintf(stderr, "%s:\n %s%s", +- progress->title, counters_sb->buf, eol); ++ fprintf(stderr, " %s%*s", counters_sb->buf, ++ (int) clear_len, eol); ++ } else if (!done && cols < progress_line_len) { ++ clear_len = progress->title_len + 1 < cols ? ++ cols - progress->title_len - 1 : 0; ++ fprintf(stderr, "%s:%*s\n %s%s", ++ progress->title, (int) clear_len, "", ++ counters_sb->buf, eol); + progress->split = 1; + } else { +- fprintf(stderr, "%s: %s%s", progress->title, +- counters_sb->buf, eol); ++ fprintf(stderr, "%s: %s%*s", progress->title, ++ counters_sb->buf, (int) clear_len, eol); + } + fflush(stderr); + } +diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh +index b86ddb60f2..92bac43257 100755 +--- a/t/t5541-http-push-smart.sh ++++ b/t/t5541-http-push-smart.sh +@@ -262,7 +262,7 @@ test_expect_success TTY 'push shows progress when stderr is a tty' ' + cd "$ROOT_PATH"/test_repo_clone && + test_commit noisy && + test_terminal git push >output 2>&1 && +- test_i18ngrep "Writing objects" output ++ test_i18ngrep "^Writing objects" output + ' + + test_expect_success TTY 'push --quiet silences status and progress' ' +@@ -277,7 +277,7 @@ test_expect_success TTY 'push --no-progress silences progress but not status' ' + test_commit no-progress && + test_terminal git push --no-progress >output 2>&1 && + test_i18ngrep "^To http" output && +- test_i18ngrep ! "Writing objects" output ++ test_i18ngrep ! "^Writing objects" output + ' + + test_expect_success 'push --progress shows progress to non-tty' ' +@@ -285,7 +285,7 @@ test_expect_success 'push --progress shows progress to non-tty' ' + test_commit progress && + git push --progress >output 2>&1 && + test_i18ngrep "^To http" output && +- test_i18ngrep "Writing objects" output ++ test_i18ngrep "^Writing objects" output + ' + + test_expect_success 'http push gives sane defaults to reflog' ' +-- +2.24.0.rc1 + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.1.ebuild similarity index 96% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.1.ebuild index 2adcea3de8..732aadbe89 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -37,7 +37,7 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi HOMEPAGE="https://www.git-scm.com/" if [[ ${PV} != *9999 ]]; then SRC_URI_SUFFIX="xz" - SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX} ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX} @@ -45,12 +45,12 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python +ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -68,7 +68,8 @@ CDEPEND=" net-misc/curl webdav? ( dev-libs/expat ) ) - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) + iconv? ( virtual/libiconv ) " RDEPEND="${CDEPEND} @@ -76,7 +77,6 @@ RDEPEND="${CDEPEND} perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI @@ -135,6 +135,8 @@ REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch @@ -165,7 +167,7 @@ exportmakeopts() { $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) $(usex python '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -242,8 +244,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" @@ -531,7 +535,7 @@ src_install() { # 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 + dosym ../gitweb /usr/share/${PN}/gitweb # INSTALL discusses configuration issues, not just installation docinto / diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.23.1-r1.ebuild similarity index 90% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.23.1-r1.ebuild index dfeadcd411..f37cc8e36d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.21.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.23.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,10 +6,13 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,8 +29,6 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" @@ -37,20 +38,20 @@ DESCRIPTION="stupid content tracker: distributed VCS designed for speed and effi HOMEPAGE="https://www.git-scm.com/" if [[ ${PV} != *9999 ]]; then SRC_URI_SUFFIX="xz" - SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' SRC_URI="${SRC_URI_KORG}/${MY_P}.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} )" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND CDEPEND=" @@ -68,7 +69,8 @@ CDEPEND=" net-misc/curl webdav? ( dev-libs/expat ) ) - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) + iconv? ( virtual/libiconv ) " RDEPEND="${CDEPEND} @@ -76,7 +78,6 @@ RDEPEND="${CDEPEND} perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI @@ -98,7 +99,7 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${PYTHON_DEPS} ) " # This is how info docs are created with Git: @@ -109,8 +110,8 @@ DEPEND="${CDEPEND} doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg )" @@ -132,14 +133,21 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch + "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + + # Make submodule output quiet + "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch + + "${FILESDIR}"/git-2.23.0-avoid_empty_remote_line.patch #698384 ) pkg_setup() { @@ -148,7 +156,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -163,9 +171,9 @@ exportmakeopts() { $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -242,8 +250,10 @@ exportmakeopts() { # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" @@ -296,7 +306,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ @@ -365,8 +375,11 @@ src_compile() { 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" + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" + git_emake svn-fe.html \ + || die "svn-fe.html failed" fi popd &>/dev/null || die fi @@ -378,8 +391,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -395,9 +409,7 @@ src_compile() { } src_install() { - git_emake \ - install || \ - die "make install failed" + git_emake install || die "make install failed" if [[ ${CHOST} == *-darwin* ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain @@ -447,9 +459,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt @@ -486,6 +499,7 @@ src_install() { dobin svn-fe dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! doman svn-fe.1 docinto html dodoc svn-fe.html @@ -531,7 +545,7 @@ src_install() { # 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 + dosym ../gitweb /usr/share/${PN}/gitweb # INSTALL discusses configuration issues, not just installation docinto / diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.20.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.24.1.ebuild similarity index 85% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.20.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.24.1.ebuild index fef3452352..a1583d7647 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.20.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.24.1.ebuild @@ -1,15 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_{6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,34 +29,32 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" -DOC_VER=${MY_PV} +DOC_VER="${MY_PV}" DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" HOMEPAGE="https://www.git-scm.com/" if [[ ${PV} != *9999 ]]; then SRC_URI_SUFFIX="xz" - SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' SRC_URI="${SRC_URI_KORG}/${MY_P}.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} )" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -68,15 +69,15 @@ CDEPEND=" net-misc/curl webdav? ( dev-libs/expat ) ) - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) + iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI @@ -98,26 +99,27 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${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} +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" + test? ( app-crypt/gnupg ) +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} app-text/asciidoc" fi @@ -132,14 +134,19 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch + "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + + # Make submodule output quiet + "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch ) pkg_setup() { @@ -148,7 +155,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -156,16 +163,18 @@ pkg_setup() { # 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=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease $(usex cvs '' NO_CVS=YesPlease) $(usex elibc_musl NO_REGEX=YesPlease '') $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -194,7 +203,7 @@ exportmakeopts() { ) # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + 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 || die @@ -202,13 +211,13 @@ exportmakeopts() { if use pcre; then if use pcre-jit; then myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=" -lpcre2-8" + extlibs+=( -lpcre2-8 ) else myopts+=( USE_LIBPCRE1=YesPlease NO_LIBPCRE1_JIT=YesPlease ) - extlibs+=" -lpcre" + extlibs+=( -lpcre ) fi fi # Disabled until ~m68k-mint can be keyworded again @@ -233,20 +242,24 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) + if has_version '>=app-text/asciidoc-8.0' ; then + myopts+=( ASCIIDOC8=YesPlease ) + fi # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs}" + export EXTLIBS="${extlibs[@]}" } src_unpack() { @@ -296,7 +309,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ @@ -359,12 +372,17 @@ src_compile() { pushd contrib/svn-fe &>/dev/null || die # 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" + 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" + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" + git_emake svn-fe.html \ + || die "svn-fe.html failed" fi popd &>/dev/null || die fi @@ -376,8 +394,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -393,9 +412,7 @@ src_compile() { } src_install() { - git_emake \ - install || \ - die "make install failed" + git_emake install || die "make install failed" if [[ ${CHOST} == *-darwin* ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain @@ -407,6 +424,7 @@ src_install() { find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html + local d for d in / /howto/ /technical/ ; do docinto ${d} dodoc Documentation${d}*.txt @@ -444,9 +462,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt @@ -483,6 +502,7 @@ src_install() { dobin svn-fe dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! doman svn-fe.1 docinto html dodoc svn-fe.html @@ -515,10 +535,11 @@ src_install() { stats workdir ) + local i for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -527,26 +548,26 @@ src_install() { # 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 + dosym ../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 - for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do - if test -d "$d" ; then find "$d" \ + for d in "${ED}"/usr/lib{,64}/perl5/ ; do + if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi done else - rm -rf "${ED%/}"/usr/share/gitweb + 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* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -567,8 +588,8 @@ src_install() { # we could remove sources in src_prepare, but install does not # handle missing locale dir well rm_loc() { - if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then - rm -r "${ED%/}/usr/share/locale/${1}" || die + if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } l10n_for_each_disabled_locale_do rm_loc @@ -678,7 +699,7 @@ src_test() { nonfatal git_emake aggregate-results # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." + [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." } showpkgdeps() { diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.25.0.ebuild similarity index 84% rename from sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.25.0.ebuild index 1041b17df4..d256228c48 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.19.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/git-2.25.0.ebuild @@ -1,15 +1,18 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_{6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,34 +29,32 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" -DOC_VER=${MY_PV} +DOC_VER="${MY_PV}" DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" HOMEPAGE="https://www.git-scm.com/" if [[ ${PV} != *9999 ]]; then SRC_URI_SUFFIX="xz" - SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' SRC_URI="${SRC_URI_KORG}/${MY_P}.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} )" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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 highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -68,15 +69,15 @@ CDEPEND=" net-misc/curl webdav? ( dev-libs/expat ) ) - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) + iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI @@ -98,26 +99,27 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${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} +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" + test? ( app-crypt/gnupg ) +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} app-text/asciidoc" fi @@ -132,14 +134,19 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch + "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + + # Make submodule output quiet + "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch ) pkg_setup() { @@ -148,7 +155,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -156,16 +163,18 @@ pkg_setup() { # 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=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease $(usex cvs '' NO_CVS=YesPlease) $(usex elibc_musl NO_REGEX=YesPlease '') $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -194,7 +203,7 @@ exportmakeopts() { ) # For svn-fe - extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')" + 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 || die @@ -202,13 +211,13 @@ exportmakeopts() { if use pcre; then if use pcre-jit; then myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=" -lpcre2-8" + extlibs+=( -lpcre2-8 ) else myopts+=( USE_LIBPCRE1=YesPlease NO_LIBPCRE1_JIT=YesPlease ) - extlibs+=" -lpcre" + extlibs+=( -lpcre ) fi fi # Disabled until ~m68k-mint can be keyworded again @@ -233,20 +242,24 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT}"/usr/include/stdio.h && \ + if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) + if has_version '>=app-text/asciidoc-8.0' ; then + myopts+=( ASCIIDOC8=YesPlease ) + fi # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" - export EXTLIBS="${extlibs}" + export EXTLIBS="${extlibs[@]}" } src_unpack() { @@ -296,11 +309,11 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ - perllibdir="$(perl_get_raw_vendorlib)" \ + perllibdir="$(use perl && perl_get_raw_vendorlib)" \ sysconfdir="${EPREFIX}"/etc \ DESTDIR="${D}" \ GIT_TEST_OPTS="--no-color" \ @@ -359,12 +372,17 @@ src_compile() { pushd contrib/svn-fe &>/dev/null || die # 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" + 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" + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" + git_emake svn-fe.html \ + || die "svn-fe.html failed" fi popd &>/dev/null || die fi @@ -376,8 +394,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -393,9 +412,7 @@ src_compile() { } src_install() { - git_emake \ - install || \ - die "make install failed" + git_emake install || die "make install failed" if [[ ${CHOST} == *-darwin* ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain @@ -407,6 +424,7 @@ src_install() { find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157] dodoc README* Documentation/{SubmittingPatches,CodingGuidelines} use doc && dodir /usr/share/doc/${PF}/html + local d for d in / /howto/ /technical/ ; do docinto ${d} dodoc Documentation${d}*.txt @@ -444,9 +462,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt @@ -483,6 +502,7 @@ src_install() { dobin svn-fe dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! doman svn-fe.1 docinto html dodoc svn-fe.html @@ -515,10 +535,11 @@ src_install() { stats workdir ) + local i for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -527,26 +548,26 @@ src_install() { # 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 + dosym ../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 - for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do - if test -d "$d" ; then find "$d" \ + for d in "${ED}"/usr/lib{,64}/perl5/ ; do + if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi done else - rm -rf "${ED%/}"/usr/share/gitweb + 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* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -567,8 +588,8 @@ src_install() { # we could remove sources in src_prepare, but install does not # handle missing locale dir well rm_loc() { - if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then - rm -r "${ED%/}/usr/share/locale/${1}" || die + if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } l10n_for_each_disabled_locale_do rm_loc @@ -678,7 +699,7 @@ src_test() { nonfatal git_emake aggregate-results # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." + [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." } showpkgdeps() { 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 882ac65dea..d256228c48 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,15 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,34 +29,32 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" -DOC_VER=${MY_PV} +DOC_VER="${MY_PV}" DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" HOMEPAGE="https://www.git-scm.com/" if [[ ${PV} != *9999 ]]; then SRC_URI_SUFFIX="xz" - SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' SRC_URI="${SRC_URI_KORG}/${MY_P}.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} )" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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 highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -68,15 +69,15 @@ CDEPEND=" net-misc/curl webdav? ( dev-libs/expat ) ) - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) + iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI @@ -98,26 +99,27 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${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} +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" + test? ( app-crypt/gnupg ) +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} app-text/asciidoc" fi @@ -132,14 +134,19 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch + "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + + # Make submodule output quiet + "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch ) pkg_setup() { @@ -148,7 +155,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -156,16 +163,18 @@ pkg_setup() { # 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=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease $(usex cvs '' NO_CVS=YesPlease) $(usex elibc_musl NO_REGEX=YesPlease '') $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -233,17 +242,21 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ + if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) + if has_version '>=app-text/asciidoc-8.0' ; then + myopts+=( ASCIIDOC8=YesPlease ) + fi # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" @@ -296,7 +309,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ @@ -365,8 +378,11 @@ src_compile() { 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" + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" + git_emake svn-fe.html \ + || die "svn-fe.html failed" fi popd &>/dev/null || die fi @@ -378,8 +394,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -395,9 +412,7 @@ src_compile() { } src_install() { - git_emake \ - install || \ - die "make install failed" + git_emake install || die "make install failed" if [[ ${CHOST} == *-darwin* ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain @@ -435,7 +450,7 @@ src_install() { #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" + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -447,9 +462,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt @@ -486,6 +502,7 @@ src_install() { dobin svn-fe dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! doman svn-fe.1 docinto html dodoc svn-fe.html @@ -522,7 +539,7 @@ src_install() { for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -531,26 +548,26 @@ src_install() { # 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 + dosym ../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 - for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + for d in "${ED}"/usr/lib{,64}/perl5/ ; do if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi done else - rm -rf "${ED%/}"/usr/share/gitweb + 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* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -571,8 +588,8 @@ src_install() { # we could remove sources in src_prepare, but install does not # handle missing locale dir well rm_loc() { - if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then - rm -r "${ED%/}/usr/share/locale/${1}" || die + if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } l10n_for_each_disabled_locale_do rm_loc @@ -682,7 +699,7 @@ src_test() { nonfatal git_emake aggregate-results # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." + [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." } showpkgdeps() { 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 882ac65dea..d256228c48 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,15 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,34 +29,32 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" -DOC_VER=${MY_PV} +DOC_VER="${MY_PV}" DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" HOMEPAGE="https://www.git-scm.com/" if [[ ${PV} != *9999 ]]; then SRC_URI_SUFFIX="xz" - SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' SRC_URI="${SRC_URI_KORG}/${MY_P}.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} )" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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 highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -68,15 +69,15 @@ CDEPEND=" net-misc/curl webdav? ( dev-libs/expat ) ) - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) + iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI @@ -98,26 +99,27 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${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} +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" + test? ( app-crypt/gnupg ) +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} app-text/asciidoc" fi @@ -132,14 +134,19 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch + "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + + # Make submodule output quiet + "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch ) pkg_setup() { @@ -148,7 +155,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -156,16 +163,18 @@ pkg_setup() { # 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=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease $(usex cvs '' NO_CVS=YesPlease) $(usex elibc_musl NO_REGEX=YesPlease '') $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -233,17 +242,21 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ + if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) + if has_version '>=app-text/asciidoc-8.0' ; then + myopts+=( ASCIIDOC8=YesPlease ) + fi # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" @@ -296,7 +309,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ @@ -365,8 +378,11 @@ src_compile() { 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" + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" + git_emake svn-fe.html \ + || die "svn-fe.html failed" fi popd &>/dev/null || die fi @@ -378,8 +394,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -395,9 +412,7 @@ src_compile() { } src_install() { - git_emake \ - install || \ - die "make install failed" + git_emake install || die "make install failed" if [[ ${CHOST} == *-darwin* ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain @@ -435,7 +450,7 @@ src_install() { #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" + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -447,9 +462,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt @@ -486,6 +502,7 @@ src_install() { dobin svn-fe dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! doman svn-fe.1 docinto html dodoc svn-fe.html @@ -522,7 +539,7 @@ src_install() { for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -531,26 +548,26 @@ src_install() { # 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 + dosym ../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 - for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + for d in "${ED}"/usr/lib{,64}/perl5/ ; do if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi done else - rm -rf "${ED%/}"/usr/share/gitweb + 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* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -571,8 +588,8 @@ src_install() { # we could remove sources in src_prepare, but install does not # handle missing locale dir well rm_loc() { - if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then - rm -r "${ED%/}/usr/share/locale/${1}" || die + if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } l10n_for_each_disabled_locale_do rm_loc @@ -682,7 +699,7 @@ src_test() { nonfatal git_emake aggregate-results # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." + [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." } showpkgdeps() { 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 882ac65dea..d256228c48 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,15 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,34 +29,32 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" -DOC_VER=${MY_PV} +DOC_VER="${MY_PV}" DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" HOMEPAGE="https://www.git-scm.com/" if [[ ${PV} != *9999 ]]; then SRC_URI_SUFFIX="xz" - SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' SRC_URI="${SRC_URI_KORG}/${MY_P}.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} )" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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 highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -68,15 +69,15 @@ CDEPEND=" net-misc/curl webdav? ( dev-libs/expat ) ) - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) + iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI @@ -98,26 +99,27 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${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} +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" + test? ( app-crypt/gnupg ) +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} app-text/asciidoc" fi @@ -132,14 +134,19 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch + "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + + # Make submodule output quiet + "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch ) pkg_setup() { @@ -148,7 +155,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -156,16 +163,18 @@ pkg_setup() { # 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=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease $(usex cvs '' NO_CVS=YesPlease) $(usex elibc_musl NO_REGEX=YesPlease '') $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -233,17 +242,21 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ + if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) + if has_version '>=app-text/asciidoc-8.0' ; then + myopts+=( ASCIIDOC8=YesPlease ) + fi # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" @@ -296,7 +309,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ @@ -365,8 +378,11 @@ src_compile() { 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" + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" + git_emake svn-fe.html \ + || die "svn-fe.html failed" fi popd &>/dev/null || die fi @@ -378,8 +394,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -395,9 +412,7 @@ src_compile() { } src_install() { - git_emake \ - install || \ - die "make install failed" + git_emake install || die "make install failed" if [[ ${CHOST} == *-darwin* ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain @@ -435,7 +450,7 @@ src_install() { #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" + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -447,9 +462,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt @@ -486,6 +502,7 @@ src_install() { dobin svn-fe dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! doman svn-fe.1 docinto html dodoc svn-fe.html @@ -522,7 +539,7 @@ src_install() { for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -531,26 +548,26 @@ src_install() { # 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 + dosym ../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 - for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + for d in "${ED}"/usr/lib{,64}/perl5/ ; do if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi done else - rm -rf "${ED%/}"/usr/share/gitweb + 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* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -571,8 +588,8 @@ src_install() { # we could remove sources in src_prepare, but install does not # handle missing locale dir well rm_loc() { - if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then - rm -r "${ED%/}/usr/share/locale/${1}" || die + if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } l10n_for_each_disabled_locale_do rm_loc @@ -682,7 +699,7 @@ src_test() { nonfatal git_emake aggregate-results # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." + [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." } showpkgdeps() { 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 882ac65dea..d256228c48 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,15 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{6,7}} ) + +inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd + PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" if [[ ${PV} == *9999 ]]; then - SCM="git-r3" + inherit git-r3 EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git" # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches. # See https://git-scm.com/docs/gitworkflows#_graduation @@ -26,34 +29,32 @@ if [[ ${PV} == *9999 ]]; then esac fi -inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM} - MY_PV="${PV/_rc/.rc}" MY_P="${PN}-${MY_PV}" -DOC_VER=${MY_PV} +DOC_VER="${MY_PV}" DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency" HOMEPAGE="https://www.git-scm.com/" if [[ ${PV} != *9999 ]]; then SRC_URI_SUFFIX="xz" - SRC_URI_KORG="mirror://kernel/software/scm/git" + SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git" [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing' SRC_URI="${SRC_URI_KORG}/${MY_P}.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} )" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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 highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test" # Common to both DEPEND and RDEPEND -CDEPEND=" +DEPEND=" gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -68,15 +69,15 @@ CDEPEND=" net-misc/curl webdav? ( dev-libs/expat ) ) - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) + iconv? ( virtual/libiconv ) " -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools - dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI @@ -98,26 +99,27 @@ RDEPEND="${CDEPEND} dev-perl/TermReadKey ) ) - python? ( ${PYTHON_DEPS} ) + perforce? ( ${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} +BDEPEND=" doc? ( app-text/asciidoc app-text/docbook2X - sys-apps/texinfo app-text/xmlto + sys-apps/texinfo ) nls? ( sys-devel/gettext ) - test? ( app-crypt/gnupg )" + test? ( app-crypt/gnupg ) +" # Live ebuild builds man pages and HTML docs, additionally if [[ ${PV} == *9999 ]]; then - DEPEND="${DEPEND} + BDEPEND="${BDEPEND} app-text/asciidoc" fi @@ -132,14 +134,19 @@ REQUIRED_USE=" subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) - python? ( ${PYTHON_REQUIRED_USE} ) + perforce? ( ${PYTHON_REQUIRED_USE} ) " +RESTRICT="!test? ( test )" + PATCHES=( # bug #350330 - automagic CVS when we don't want it is bad. - "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch + "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch + + # Make submodule output quiet + "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch ) pkg_setup() { @@ -148,7 +155,7 @@ pkg_setup() { ewarn "with USE=dso, there may be weird crashes in git-svn. You" ewarn "have been warned." fi - if use python ; then + if use perforce ; then python-single-r1_pkg_setup fi } @@ -156,16 +163,18 @@ pkg_setup() { # 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=( + local extlibs myopts + + myopts=( ASCIIDOC_NO_ROFF=YesPlease $(usex cvs '' NO_CVS=YesPlease) $(usex elibc_musl NO_REGEX=YesPlease '') $(usex iconv '' NO_ICONV=YesPlease) $(usex nls '' NO_GETTEXT=YesPlease) $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease) - $(usex python '' NO_PYTHON=YesPlease) + $(usex perforce '' NO_PYTHON=YesPlease) $(usex subversion '' NO_SVN_TESTS=YesPlease) - $(usex threads THREADED_DELTA_SEARCH=YesPlease NO_PTHREAD=YesPlease) + $(usex threads '' NO_PTHREAD=YesPlease) $(usex tk '' NO_TCLTK=YesPlease) ) @@ -233,17 +242,21 @@ exportmakeopts() { NEEDS_LIBICONV=YesPlease HAVE_CLOCK_MONOTONIC=1 ) - grep -q getdelim "${ROOT%/}"/usr/include/stdio.h && \ + if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then myopts+=( HAVE_GETDELIM=1 ) + fi fi - has_version '>=app-text/asciidoc-8.0' \ - && myopts+=( ASCIIDOC8=YesPlease ) + if has_version '>=app-text/asciidoc-8.0' ; then + myopts+=( ASCIIDOC8=YesPlease ) + fi # Bug 290465: # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim' - [[ "${CHOST}" == *-uclibc* ]] && \ + if [[ "${CHOST}" == *-uclibc* ]] ; then myopts+=( NO_NSEC=YesPlease ) + use iconv && myopts+=( NEEDS_LIBICONV=YesPlease ) + fi export MY_MAKEOPTS="${myopts[@]}" export EXTLIBS="${extlibs[@]}" @@ -296,7 +309,7 @@ src_prepare() { git_emake() { # bug #320647: PYTHON_PATH local PYTHON_PATH="" - use python && PYTHON_PATH="${PYTHON}" + use perforce && PYTHON_PATH="${PYTHON}" emake ${MY_MAKEOPTS} \ prefix="${EPREFIX}"/usr \ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \ @@ -365,8 +378,11 @@ src_compile() { 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" + # svn-fe.1 requires the full USE=doc dependency stack + git_emake svn-fe.1 \ + || die "emake svn-fe.1 failed" + git_emake svn-fe.html \ + || die "svn-fe.html failed" fi popd &>/dev/null || die fi @@ -378,8 +394,9 @@ src_compile() { fi pushd contrib/subtree &>/dev/null || die - git_emake - use doc && git_emake doc + git_emake git-subtree + # git-subtree.1 requires the full USE=doc dependency stack + use doc && git_emake git-subtree.html git-subtree.1 popd &>/dev/null || die pushd contrib/diff-highlight &>/dev/null || die @@ -395,9 +412,7 @@ src_compile() { } src_install() { - git_emake \ - install || \ - die "make install failed" + git_emake install || die "make install failed" if [[ ${CHOST} == *-darwin* ]]; then dobin contrib/credential/osxkeychain/git-credential-osxkeychain @@ -435,7 +450,7 @@ src_install() { #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" + touch "${ED}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}"/${SITEFILE} fi @@ -447,9 +462,10 @@ src_install() { # git-subtree pushd contrib/subtree &>/dev/null || die - git_emake install || die "Failed to emake install git-subtree" + git_emake install || die "Failed to emake install for git-subtree" if use doc ; then - git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree" + # Do not move git subtree install-man outside USE=doc! + git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree" fi newdoc README README.git-subtree dodoc git-subtree.txt @@ -486,6 +502,7 @@ src_install() { dobin svn-fe dodoc svn-fe.txt if use doc ; then + # Do not move svn-fe.1 outside USE=doc! doman svn-fe.1 docinto html dodoc svn-fe.html @@ -522,7 +539,7 @@ src_install() { for i in "${contrib_objects[@]}" ; do cp -rf \ "${S}"/contrib/${i} \ - "${ED%/}"/usr/share/${PN}/contrib \ + "${ED}"/usr/share/${PN}/contrib \ || die "Failed contrib ${i}" done @@ -531,26 +548,26 @@ src_install() { # 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 + dosym ../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 - for d in "${ED%/}"/usr/lib{,64}/perl5/ ; do + for d in "${ED}"/usr/lib{,64}/perl5/ ; do if test -d "${d}" ; then find "${d}" \ -name .packlist \ -delete || die fi done else - rm -rf "${ED%/}"/usr/share/gitweb + 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* + rm -f "${ED}"/usr/libexec/git-core/git-svn \ + "${ED}"/usr/share/man/man1/git-svn.1* fi if use xinetd ; then @@ -571,8 +588,8 @@ src_install() { # we could remove sources in src_prepare, but install does not # handle missing locale dir well rm_loc() { - if [[ -e "${ED%/}/usr/share/locale/${1}" ]]; then - rm -r "${ED%/}/usr/share/locale/${1}" || die + if [[ -e "${ED}/usr/share/locale/${1}" ]]; then + rm -r "${ED}/usr/share/locale/${1}" || die fi } l10n_for_each_disabled_locale_do rm_loc @@ -682,7 +699,7 @@ src_test() { nonfatal git_emake aggregate-results # And bail if there was a problem - [ ${rc} -eq 0 ] || die "tests failed. Please file a bug." + [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug." } showpkgdeps() { diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/git/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-vcs/git/metadata.xml index f769088355..53353adb38 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/git/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/git/metadata.xml @@ -32,6 +32,7 @@ Support pulling and pushing from MediaWiki Add experimental patches for improved MediaWiki support Enable JIT for pcre + Add support for Perforce version control system (requires manual installation of Perforce client) Make use of a bundled routine that is optimized for the PPC arch Include git-svn for dev-vcs/subversion support Include the 'gitk' and 'git gui' tools diff --git a/sdk_container/src/third_party/portage-stable/eclass/perl-functions.eclass b/sdk_container/src/third_party/portage-stable/eclass/perl-functions.eclass index e7775f31b8..e6168a0753 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/perl-functions.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/perl-functions.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: perl-functions.eclass @@ -8,7 +8,7 @@ # Seemant Kulleen # Andreas K. Huettel # Kent Fredric -# @SUPPORTED_EAPIS: 5 6 +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: helper functions eclass for perl modules # @DESCRIPTION: # The perl-functions eclass is designed to allow easier installation of perl @@ -19,7 +19,7 @@ [[ ${CATEGORY} == "perl-core" ]] && inherit alternatives case "${EAPI:-0}" in - 5|6) + 5|6|7) ;; *) die "EAPI=${EAPI} is not supported by perl-functions.eclass" @@ -142,7 +142,7 @@ perl_fix_packlist() { einfo "Fixing packlist file /${f#${D}}" # remove the temporary build dir path - sed -i -e "s:${D}:/:g" "${f}" + sed -i -e "s:${D%/}/:/:g" "${f}" # remove duplicate entries sort -u "${f}" > "${packlist_temp}" @@ -170,7 +170,7 @@ perl_remove_temppath() { find "${D}" -type f -not -name '*.so' -print0 | while read -rd '' f ; do if file "${f}" | grep -q -i " text" ; then grep -q "${D}" "${f}" && ewarn "QA: File contains a temporary path ${f}" - sed -i -e "s:${D}:/:g" "${f}" + sed -i -e "s:${D%/}/:/:g" "${f}" fi done } diff --git a/sdk_container/src/third_party/portage-stable/eclass/perl-module.eclass b/sdk_container/src/third_party/portage-stable/eclass/perl-module.eclass index 20b9947cac..7a839bc728 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/perl-module.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/perl-module.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: perl-module.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Seemant Kulleen # Andreas K. Hüttel -# @SUPPORTED_EAPIS: 5 6 +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: eclass for installing Perl module distributions # @DESCRIPTION: # The perl-module eclass is designed to allow easier installation of Perl @@ -23,7 +23,7 @@ case ${EAPI:-0} in inherit eutils multiprocessing unpacker perl-functions PERL_EXPF="src_unpack src_prepare src_configure src_compile src_test src_install" ;; - 6) + 6|7) inherit multiprocessing perl-functions PERL_EXPF="src_prepare src_configure src_compile src_test src_install" ;; @@ -78,7 +78,7 @@ case ${EAPI:-0} in case "${GENTOO_DEPEND_ON_PERL:-yes}" in yes) - DEPEND="dev-lang/perl:=" + DEPEND="dev-lang/perl" RDEPEND="dev-lang/perl:=" ;; noslotop) @@ -88,15 +88,42 @@ case ${EAPI:-0} in esac if [[ "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" != "yes" ]]; then - eerror "GENTOO_DEPEND_ON_PERL_SUBSLOT=no is banned in EAPI=6. If you don't want a slot operator" + eerror "GENTOO_DEPEND_ON_PERL_SUBSLOT=no is banned in EAPI=6 and later. If you don't want a slot operator" die "set GENTOO_DEPEND_ON_PERL=noslotop instead." fi if [[ "${PERL_EXPORT_PHASE_FUNCTIONS}" ]]; then - eerror "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6. Use perl-module.eclass if you need" + eerror "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6 and later. Use perl-module.eclass if you need" die "phase functions, perl-functions.eclass if not." fi + EXPORT_FUNCTIONS ${PERL_EXPF} + ;; + 7) + [[ ${CATEGORY} == perl-core ]] && \ + PERL_EXPF+=" pkg_postinst pkg_postrm" + + case "${GENTOO_DEPEND_ON_PERL:-yes}" in + yes) + DEPEND="dev-lang/perl" + BDEPEND="dev-lang/perl" + RDEPEND="dev-lang/perl:=" + ;; + noslotop) + DEPEND="dev-lang/perl" + BDEPEND="dev-lang/perl" + RDEPEND="dev-lang/perl" + ;; + esac + + if [[ "${GENTOO_DEPEND_ON_PERL_SUBSLOT:-yes}" != "yes" ]]; then + die "GENTOO_DEPEND_ON_PERL_SUBSLOT=no is banned in EAPI=6 and later." + fi + + if [[ "${PERL_EXPORT_PHASE_FUNCTIONS}" ]]; then + die "PERL_EXPORT_PHASE_FUNCTIONS is banned in EAPI=6 and later." + fi + EXPORT_FUNCTIONS ${PERL_EXPF} ;; *) @@ -107,43 +134,47 @@ esac LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}" # @ECLASS-VARIABLE: DIST_NAME +# @DEFAULT_UNSET # @DESCRIPTION: -# (EAPI=6) This variable provides a way to override PN for the calculation of S, -# SRC_URI, and HOMEPAGE. Defaults to PN. +# (EAPI=6 and later) This variable provides a way to override PN for the calculation of S, +# SRC_URI, and HOMEPAGE. If unset, defaults to PN. # @ECLASS-VARIABLE: DIST_VERSION +# @DEFAULT_UNSET # @DESCRIPTION: -# (EAPI=6) This variable provides a way to override PV for the calculation of S and SRC_URI. -# Use it to provide the non-normalized, upstream version number. Defaults to PV. +# (EAPI=6 and later) This variable provides a way to override PV for the calculation of S and SRC_URI. +# Use it to provide the non-normalized, upstream version number. If unset, defaults to PV. # Named MODULE_VERSION in EAPI=5. # @ECLASS-VARIABLE: DIST_A_EXT +# @DEFAULT_UNSET # @DESCRIPTION: -# (EAPI=6) This variable provides a way to override the distfile extension for the calculation of -# SRC_URI. Defaults to tar.gz. Named MODULE_A_EXT in EAPI=5. +# (EAPI=6 and later) This variable provides a way to override the distfile extension for the calculation of +# SRC_URI. If unset, defaults to tar.gz. Named MODULE_A_EXT in EAPI=5. # @ECLASS-VARIABLE: DIST_A +# @DEFAULT_UNSET # @DESCRIPTION: -# (EAPI=6) This variable provides a way to override the distfile name for the calculation of -# SRC_URI. Defaults to ${DIST_NAME}-${DIST_VERSION}.${DIST_A_EXT} Named MODULE_A in EAPI=5. +# (EAPI=6 and later) This variable provides a way to override the distfile name for the calculation of +# SRC_URI. If unset, defaults to ${DIST_NAME}-${DIST_VERSION}.${DIST_A_EXT} Named MODULE_A in EAPI=5. # @ECLASS-VARIABLE: DIST_AUTHOR # @DEFAULT_UNSET # @DESCRIPTION: -# (EAPI=6) This variable sets the module author name for the calculation of +# (EAPI=6 and later) This variable sets the module author name for the calculation of # SRC_URI. Named MODULE_AUTHOR in EAPI=5. # @ECLASS-VARIABLE: DIST_SECTION # @DEFAULT_UNSET # @DESCRIPTION: -# (EAPI=6) This variable sets the module section for the calculation of +# (EAPI=6 and later) This variable sets the module section for the calculation of # SRC_URI. Only required in rare cases for very special snowflakes. # Named MODULE_SECTION in EAPI=5. # @ECLASS-VARIABLE: DIST_EXAMPLES # @DEFAULT_UNSET # @DESCRIPTION: -# (EAPI=6) This Bash array allows passing a list of example files to be installed +# (EAPI=6 and later) This Bash array allows passing a list of example files to be installed # in /usr/share/doc/${PF}/examples. If set before inherit, automatically adds # a use-flag examples, if not you'll have to add the useflag in your ebuild. # Examples are installed only if the useflag examples exists and is activated. @@ -313,9 +344,10 @@ perl-module_src_compile() { } # @ECLASS-VARIABLE: DIST_TEST +# @DEFAULT_UNSET # @DESCRIPTION: -# (EAPI=6) Variable that controls if tests are run in the test phase -# at all, and if yes under which conditions. Defaults to "do parallel" +# (EAPI=6 and later) Variable that controls if tests are run in the test phase +# at all, and if yes under which conditions. If unset, defaults to "do parallel" # If neither "do" nor "parallel" is recognized, tests are skipped. # (In EAPI=5 the variable is called SRC_TEST, defaults to "skip", and # recognizes fewer options.) @@ -328,7 +360,7 @@ perl-module_src_compile() { # @ECLASS-VARIABLE: DIST_TEST_OVERRIDE # @DEFAULT_UNSET # @DESCRIPTION: -# (EAPI=6) Variable that controls if tests are run in the test phase +# (EAPI=6 and later) Variable that controls if tests are run in the test phase # at all, and if yes under which conditions. It is intended for use in # make.conf or the environment by ebuild authors during testing, and # accepts the same values as DIST_TEST. If set, it overrides DIST_TEST diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.2 deleted file mode 100644 index 0341f0086a..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.19.2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig -DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=6 -HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=mirror://kernel/software/scm/git/git-2.19.2.tar.xz mirror://kernel/software/scm/git/git-manpages-2.19.2.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.19.2.tar.xz ) -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=52b22d2c10f2ef4fdb7d9f54081c7c51 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.20.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.20.1 deleted file mode 100644 index cdfc1974bb..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.20.1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig -DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=6 -HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=mirror://kernel/software/scm/git/git-2.20.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.20.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.20.1.tar.xz ) -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=9de57ea87209bbfe8818f30efb8fd084 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0 deleted file mode 100644 index fa9cd8b18c..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig -DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=6 -HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 ) -SLOT=0 -SRC_URI=mirror://kernel/software/scm/git/git-2.21.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.21.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.21.0.tar.xz ) -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 -_md5_=b8cd834327e9f3fb2d421632f956ab4a diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0-r1 deleted file mode 100644 index 0fccb612ae..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.0-r1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig -DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=6 -HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) -SLOT=0 -SRC_URI=mirror://kernel/software/scm/git/git-2.21.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.21.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.21.0.tar.xz ) -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 -_md5_=abdabcb326751232efe4d24cc67c7466 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.1 new file mode 100644 index 0000000000..596250632a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.21.1 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig +DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency +EAPI=6 +HOMEPAGE=https://www.git-scm.com/ +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python +ppcsha1 tk +threads +webdav xinetd cvs subversion test +python_targets_python2_7 +python_single_target_python2_7 +KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.21.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.21.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.21.1.tar.xz ) +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 elisp-common a1054cff648e1c6a806e17001d052176 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c +_md5_=545fd510d61a87224db4e554b703c446 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.23.1-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.23.1-r1 new file mode 100644 index 0000000000..ce5c596d68 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.23.1-r1 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig +DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency +EAPI=6 +HOMEPAGE=https://www.git-scm.com/ +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.23.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.23.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.23.1.tar.xz ) +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 elisp-common a1054cff648e1c6a806e17001d052176 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c +_md5_=9a3f09db2de3a5f742b179578a34246a diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.24.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.24.1 new file mode 100644 index 0000000000..5e8c911599 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.24.1 @@ -0,0 +1,16 @@ +BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) +DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency +EAPI=7 +HOMEPAGE=https://www.git-scm.com/ +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 +KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.24.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.24.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.24.1.tar.xz ) +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common a1054cff648e1c6a806e17001d052176 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c +_md5_=8f10a0527b5e0634249f1fe2936b16fa diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.25.0 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.25.0 new file mode 100644 index 0000000000..bfc7cb23fa --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-vcs/git-2.25.0 @@ -0,0 +1,16 @@ +BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig +DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack +DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) +DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency +EAPI=7 +HOMEPAGE=https://www.git-scm.com/ +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.25.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.25.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.25.0.tar.xz ) +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common a1054cff648e1c6a806e17001d052176 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c +_md5_=d0a6bf1b27bd420d751ecb40e37e6d52 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 14a6428978..3513a47f49 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 @@ -1,12 +1,15 @@ +BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] +DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=6 +EAPI=7 HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) +PROPERTIES=live +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) +RESTRICT=!test? ( test ) SLOT=0 -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 -_md5_=52d5304f2bb6135f280712cf20b2c204 +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common a1054cff648e1c6a806e17001d052176 git-r3 809e27702c573cbba31c08ed00bbad33 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c +_md5_=d0a6bf1b27bd420d751ecb40e37e6d52 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 14a6428978..3513a47f49 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 @@ -1,12 +1,15 @@ +BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] +DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=6 +EAPI=7 HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) +PROPERTIES=live +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) +RESTRICT=!test? ( test ) SLOT=0 -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 -_md5_=52d5304f2bb6135f280712cf20b2c204 +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common a1054cff648e1c6a806e17001d052176 git-r3 809e27702c573cbba31c08ed00bbad33 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c +_md5_=d0a6bf1b27bd420d751ecb40e37e6d52 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 14a6428978..3513a47f49 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 @@ -1,12 +1,15 @@ +BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] +DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=6 +EAPI=7 HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) +PROPERTIES=live +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) +RESTRICT=!test? ( test ) SLOT=0 -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 -_md5_=52d5304f2bb6135f280712cf20b2c204 +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common a1054cff648e1c6a806e17001d052176 git-r3 809e27702c573cbba31c08ed00bbad33 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c +_md5_=d0a6bf1b27bd420d751ecb40e37e6d52 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 14a6428978..3513a47f49 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 @@ -1,12 +1,15 @@ +BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] +DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency -EAPI=6 +EAPI=7 HOMEPAGE=https://www.git-scm.com/ -IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 +IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 LICENSE=GPL-2 -RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) -REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) +PROPERTIES=live +RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) +REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) +RESTRICT=!test? ( test ) SLOT=0 -_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common 23f47b2e1de7abf387105eddd1318738 git-r3 0d4635eeb5a96cd5315597a47eba25c9 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 -_md5_=52d5304f2bb6135f280712cf20b2c204 +_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb elisp-common a1054cff648e1c6a806e17001d052176 git-r3 809e27702c573cbba31c08ed00bbad33 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 python-single-r1 36ac48e647d2627de28c87aaffb94753 python-utils-r1 611c493a4cfef5254350fabc04b606f5 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 512eb3367f507ebaa1d1d43ab7d66e6c +_md5_=d0a6bf1b27bd420d751ecb40e37e6d52