commit:     849ea510361c4a4d560c50ca3973163acb509f59
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 17:56:27 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 17:56:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849ea510

dev-vcs/git: bump

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=687808
Package-Manager: Portage-2.3.67, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 dev-vcs/git/Manifest                                  | 3 +++
 dev-vcs/git/{git-9999-r1.ebuild => git-2.22.0.ebuild} | 5 ++++-
 dev-vcs/git/git-9999-r1.ebuild                        | 5 ++++-
 dev-vcs/git/git-9999-r2.ebuild                        | 5 ++++-
 dev-vcs/git/git-9999-r3.ebuild                        | 5 ++++-
 dev-vcs/git/git-9999.ebuild                           | 7 +++++--
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 9868e80d224..06c114d505a 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -2,11 +2,14 @@ DIST git-2.19.2.tar.xz 5235608 BLAKE2B 
ece292b8cf41deafc63c00e6176b0de39936f7d84
 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-2.22.0.rc3.tar.xz 5556732 BLAKE2B 
da87c0a52697c59563a208a2dccfe6aca4d954d197e5d8131dea9106a19d99b5c9661eb3558fbb7da701da371dfee49c40dae7a9a2ec91af77b22b12962b8760
 SHA512 
5b3afad675526b0a14caaa78dacae132445bf155abad00db65c5d667f04aa00394c6fa09883cd22e95dcfd7ea3ab6b5177b579c0c6999ca3cee2ad46bdaca6aa
+DIST git-2.22.0.tar.xz 5609772 BLAKE2B 
3fd84987eba4873d7eca56cc2d28e15cc22e5c382f47e831f12c06b05c1a971d5713e7096b609ec5321e5ae4c63c78ebc7747f7e0948d12bf1ac19a911405d6d
 SHA512 
75b3dcac36f80281effcd099944de34050a35f3599ce42f86ce60455b6c952039fb0f6438d296e0cc9c0651d4a17f467780dc475669227d3c98ddefe91723d42
 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-htmldocs-2.22.0.rc3.tar.xz 1261912 BLAKE2B 
99332cf31f7b53269f3a8bb42189111f7651fb7d8943321a218258f82c440f028bf11e2d3225689ad3732c9158bae062f626c99ac2672709a4b18d85b51300b3
 SHA512 
8863f5feeeb70f36ef0ccaf28154da3fd40b234f375c8169f12ed7d0b6e3ae53321b74d5ba90bf413693c03166608ab42a9562a1e61f5af2e3bdc54b006efc04
+DIST git-htmldocs-2.22.0.tar.xz 1262136 BLAKE2B 
0fea02449e73a9e1b125895f0e319704ccc5949cd68820cadb1a71fc06d182c3ce0629149c9d7f19bdab782fd8c0e1ac8661fc774253caf897fc8fd58e497d9e
 SHA512 
2feab5d3bc70914d7980c8a22f950a9604cbaace2e867119776715f1ba7bdb3c742fbd9aaa827210b234e6381d98611e02dec4e50db4cae4e20bb72116afecb1
 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-manpages-2.22.0.rc3.tar.xz 443228 BLAKE2B 
568da7c45e78196f401bb253ae4e458f94f53ac0904ad362005fd597b194cb0ed337535060a899eee27663d338e11cb527bd9c0258274de3f95a8c87eba07e31
 SHA512 
ae3469ac8918b3d85f49cf29be03a9252ff073519dc9a029a630361dd96a0872a0a4fac85b0e99f4d1bbdfebc285e1dd0aba2bad65485974b993fb30b1f45a00
+DIST git-manpages-2.22.0.tar.xz 443320 BLAKE2B 
900efc3c90ab949bea4655a82febd01a8ec9dfdd39cff3d9cffb5912925bdc60567c3f8cc3fe63a42eb4c390d795b02f30608f672481e41a2aaae8ce9edc109a
 SHA512 
ed9d2ba78fe5081c80a1ffb911ce0e0d883a76b3b4b3d1469c46932e710d1565cf223f74f1402fe94430e3eda514406829b2c422f31ced63ff5126004fdb36d9

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-2.22.0.ebuild
similarity index 99%
copy from dev-vcs/git/git-9999-r1.ebuild
copy to dev-vcs/git/git-2.22.0.ebuild
index 051c0134564..64663fba9b7 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-2.22.0.ebuild
@@ -31,7 +31,7 @@ inherit toolchain-funcs elisp-common l10n perl-module 
bash-completion-r1 python-
 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/";
@@ -140,6 +140,9 @@ PATCHES=(
        "${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() {

diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 051c0134564..64663fba9b7 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -31,7 +31,7 @@ inherit toolchain-funcs elisp-common l10n perl-module 
bash-completion-r1 python-
 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/";
@@ -140,6 +140,9 @@ PATCHES=(
        "${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() {

diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 051c0134564..64663fba9b7 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -31,7 +31,7 @@ inherit toolchain-funcs elisp-common l10n perl-module 
bash-completion-r1 python-
 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/";
@@ -140,6 +140,9 @@ PATCHES=(
        "${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() {

diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 051c0134564..64663fba9b7 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -31,7 +31,7 @@ inherit toolchain-funcs elisp-common l10n perl-module 
bash-completion-r1 python-
 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/";
@@ -140,6 +140,9 @@ PATCHES=(
        "${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() {

diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 77ad76c80da..9a03288ee8b 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -31,7 +31,7 @@ inherit toolchain-funcs elisp-common l10n perl-module 
bash-completion-r1 python-
 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/";
@@ -137,9 +137,12 @@ REQUIRED_USE="
 
 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() {

Reply via email to