repo: upgrade to 2.21

BUG=None
TEST=CQ passes

Change-Id: I98c3e91809c2950944a649dd51076d44b2201631
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3452663
Tested-by: Mike Frysinger <vapier@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 18d3615..75e949d 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,2 +1,3 @@
-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
diff --git a/dev-vcs/repo/repo-2.17.ebuild b/dev-vcs/repo/repo-2.21.ebuild
similarity index 60%
rename from dev-vcs/repo/repo-2.17.ebuild
rename to dev-vcs/repo/repo-2.21.ebuild
index 635fce2..6b8bc20 100644
--- a/dev-vcs/repo/repo-2.17.ebuild
+++ b/dev-vcs/repo/repo-2.21.ebuild
@@ -11,14 +11,9 @@
 
 inherit bash-completion-r1 python-r1
 
-# This file rarely changes, so track it independently.
-COMP_VER="v2.17"
-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"
@@ -30,13 +25,10 @@
 	!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]
 }