gentoo resync : 20.03.2022

3 files changed, 10 insertions, 18 deletions

diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 02711d267f3e..a7304eb33cfa 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,9 +1,9 @@
-DIST repo-2.14 44203 BLAKE2B 72094daad380b3a03c9dca488e0bfc2a64bcaed5b025490c07fdc627eaae825bd71d0a8aafca5307dd4a0fecf59d530e7a692b030699a2cdc34cbec569076383 SHA512 37bc4e5b63e2cb1567633708f9680817c346b8105ca495538036aad87fe278f3ab5143f0f57fd40d4051de8016cc785648e9f0b65ebf2430677f037030f71343
 DIST repo-2.15 44704 BLAKE2B 6d90cecb4d748f7fb3febec95e16ed1638112a945aa36f7d7cc12232cdf4bcd66d286aa1054fd23de5ae7e896ac52c05465778aaec759e5d0251227deb220d18 SHA512 e6aad90f6058f4e5750ce44f8951ac4df39dd39c1615d7f68670a0b8ac5007f52e3bb6219d6ca0842908ef6c87843c6fd655b3b2a47fcf410e2a74d47a334d34
 DIST repo-2.17 44944 BLAKE2B 8f5db36d6acedd9c79fca1c9fe5a29e4da9b483d4f356d8ad88d6510f13ec7ff8200723c836ff7ac17419e571c2c4970182385a248b8005aaae1cbd4d93d3423 SHA512 b8d459c619f537d8afce00c78594027ef983e31f1bf47341d3388e39da4505270fa07f8c93b1ab5110795c1b6b952f01f48f0e18ce15e8126a484c98fd73e8c8
+DIST repo-2.21.tar.gz 232514 BLAKE2B e77555164e754f9d2c2392965512127593ae8073d3f317e483187f06f67df784127511e36c4c32bef05db98ddb333e9fa72804ec89761cafa86529174e902677 SHA512 08b49b450eef087ac00e603bf0f394442998a076034418b7af60b9a5b293df4f1fc340844dfd2dfff1fcc61eb99885ec02f331d4fb2b0ba1e347af0674fa063a
 DIST repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64 4280 BLAKE2B 6c369d36176d5bd4d3f4ed4df39bbd6542022dd186375bd05a978889c574819e3328d19c7dac2982233614786078f73bfd1f0c80aa7c0c6c79bdfab776ed6e39 SHA512 f484bee79c3724a6daf8a69b3df80feef3c6aaad3bfb49443caabc52735dd7f3b0fcb3ad4b7480bc020c9b4cac2f3b044693ef761df6fc9d34e854289baf1f3d
 DIST repo-v2.17-bash-completion.sh.base64 5736 BLAKE2B 59c357d76feb176b7c64791ffb838ab522179c7e05d1a1cca6e121c9c908cdbccc49f177951986470806302b881b39ab44710b66b0a6a8c9643d4a647841eddf SHA512 9bc4f57d58222297f53e6dcbed1b895e8d0a90558be58a423243c886cb5cfad11c32e7c599b2e237e3f53b2857f8441ddb476484189135b71f52ca7250dfaf62
-EBUILD repo-2.14.ebuild 1253 BLAKE2B f9a3b7eb2a335376a68519eb2d7cad7ea7765c28132b23b31ba6fde4c2a1cf81304f2d1d84d4293346f8a99e9c02934824d9db40d62f57ca4537ebfeb9a21bd4 SHA512 7706d0558c7c5d2c5975dbde52cce0710deea1b3204ff499e83f20e49bf66275481f122f7a76919abd58b23a7d565a0be89b0cedc72cd60e8301207e2063e3e2
 EBUILD repo-2.15.ebuild 1253 BLAKE2B f9a3b7eb2a335376a68519eb2d7cad7ea7765c28132b23b31ba6fde4c2a1cf81304f2d1d84d4293346f8a99e9c02934824d9db40d62f57ca4537ebfeb9a21bd4 SHA512 7706d0558c7c5d2c5975dbde52cce0710deea1b3204ff499e83f20e49bf66275481f122f7a76919abd58b23a7d565a0be89b0cedc72cd60e8301207e2063e3e2
-EBUILD repo-2.17.ebuild 1224 BLAKE2B 12d7deacb99707ddbd5dbb4958678c55e55c1b0989370ae37571472de6d59738ab444c46324362c959c1ddc3a8f32be6cf63d19395b4427f30d67c39da8abc36 SHA512 91d6b66587fcf04856255bb3e7ec5fbb9bf55256528f685276c9d0a9023e11cf38fcfd0137a60953857bc3b948dec830afa24bb6dde79e45bf111c29e8a20c63
+EBUILD repo-2.17.ebuild 1218 BLAKE2B f4876b7f1d9f953615bf4305cbfc3d98ec84976d0a694bd0f74a39995f48d42d7477d161c336301b8590f0480caa844433172228aebf38b0e0a32aff260fb997 SHA512 0b35bdcb0769f19e3abadd778e6f50de3ee59b6ebc1f6d9b4491cf025f469d3fcfc1f1ff25958905225b46ba0dd20ba83b996d42a3c0196803cc01e94c274290
+EBUILD repo-2.21.ebuild 964 BLAKE2B 4fb9d6382d8240d54102907a0abf7eb7c806700e3a78cfdccdcf4740efc710820b2141f2001b4aca025be72840d8e06e6d37dc0f77d7fd99620f4032f6a0ba0d SHA512 3c6d3c5939be9be51429d4451dac183de902d1bd00967bde131d985cfdd91989d7b3077ca69e1564b6d30061111c400993f1c8044a5565710a94c331d8517e00
 MISC metadata.xml 215 BLAKE2B 344b2d45a66df1c90f44ffca3343c1dec6f3fa2510ff1460d7652259f31f50bf80a8fef7a89ddd4fc86273290e98d04a1949ff881a9ca9464eaf81a422acfdb2 SHA512 059a722b5adb3ac6d86ab064c11bf5d472f7ad6156538798e7f61ee3b8c42d07ff7e2b951deac22472761526208214c3b7dd4950c09b894f419d0bbd00121f7d
diff --git a/dev-vcs/repo/repo-2.17.ebuild b/dev-vcs/repo/repo-2.17.ebuild
index 69044e1775d0..413247ecffe0 100644
--- a/dev-vcs/repo/repo-2.17.ebuild
+++ b/dev-vcs/repo/repo-2.17.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-vcs/repo/repo-2.14.ebuild b/dev-vcs/repo/repo-2.21.ebuild
index 583e55b6f0eb..9490022de874 100644
--- a/dev-vcs/repo/repo-2.14.ebuild
+++ b/dev-vcs/repo/repo-2.21.ebuild
@@ -7,22 +7,17 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit bash-completion-r1 python-r1
 
-# This file rarely changes, so track it independently.
-COMP_VER="511a0e54f5801a3f36c00fac478a596d83867d10"
-COMP_NAME="${PN}-${COMP_VER}-bash-completion.sh.base64"
-
 DESCRIPTION="Google tool for managing git, particularly multiple repos"
 HOMEPAGE="https://gerrit.googlesource.com/git-repo"
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
-	https://gerrit.googlesource.com/git-repo/+/${COMP_VER}/completion.bash?format=TEXT -> ${COMP_NAME}"
+SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -30,13 +25,10 @@ RDEPEND="${PYTHON_DEPS}
 	!app-admin/radmind
 	!dev-util/repo"
 
-S=${WORKDIR}
-
-src_unpack() {
-	base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die
-}
+S="${WORKDIR}/git-${P}"
 
 src_install() {
-	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
+	python_foreach_impl python_doscript ${PN}
 	newbashcomp completion.bash ${PN}
+	doman man/*.[0-9]
 }