gentoo resync : 22.05.2021

4 files changed, 15 insertions, 40 deletions

diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 5be53d440aea..e404f87cc01a 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,9 +1,8 @@
-DIST repo-2.11 39791 BLAKE2B 535de238d934eb2717af7bddd960c158501a56dd400ae02f3665e30c34bd68a1973de4c84e2ea76f48aa027249dfd4270153f1a7d4c4a2d5d883b580f02664e9 SHA512 1889ee9c782a6dc90b782c8ca9c5411b97c4495e0d27add62b9661a5961a782096037e081e984c965e44d33459e8fe4428528b5ebfff9fe356ce401cb610480a
 DIST repo-2.12 43035 BLAKE2B 3a3b1997a09f08093aa2d5cf6c7a3747d6a9a6c29e6c199574757d4d87fdd57b7cc8b18bb1ddfa7c47392f73a22211f996f6ba8175448162e305106c9ac6cafe SHA512 409525040ec8fe6c6a6d923c4e23ab93f5ccc62d01d310ad6b56d55f45d88c2bf469e9b46943e799b8d5238cbc0a9610d0f64f35cf0f3a68b79cbd8c92f044a3
 DIST repo-2.14 44203 BLAKE2B 72094daad380b3a03c9dca488e0bfc2a64bcaed5b025490c07fdc627eaae825bd71d0a8aafca5307dd4a0fecf59d530e7a692b030699a2cdc34cbec569076383 SHA512 37bc4e5b63e2cb1567633708f9680817c346b8105ca495538036aad87fe278f3ab5143f0f57fd40d4051de8016cc785648e9f0b65ebf2430677f037030f71343
+DIST repo-2.15 44704 BLAKE2B 6d90cecb4d748f7fb3febec95e16ed1638112a945aa36f7d7cc12232cdf4bcd66d286aa1054fd23de5ae7e896ac52c05465778aaec759e5d0251227deb220d18 SHA512 e6aad90f6058f4e5750ce44f8951ac4df39dd39c1615d7f68670a0b8ac5007f52e3bb6219d6ca0842908ef6c87843c6fd655b3b2a47fcf410e2a74d47a334d34
 DIST repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64 4280 BLAKE2B 6c369d36176d5bd4d3f4ed4df39bbd6542022dd186375bd05a978889c574819e3328d19c7dac2982233614786078f73bfd1f0c80aa7c0c6c79bdfab776ed6e39 SHA512 f484bee79c3724a6daf8a69b3df80feef3c6aaad3bfb49443caabc52735dd7f3b0fcb3ad4b7480bc020c9b4cac2f3b044693ef761df6fc9d34e854289baf1f3d
-EBUILD repo-2.11.ebuild 855 BLAKE2B 90ed321fac6817e45621968f6468786c86e3c113d2f3b5fcbf0b8c4088f95e8aa9e278953fcd10b3c81cddf006c4cabd8edb82cf4e231d074382cb81f163836b SHA512 0a35308ab33a968f1127455ee1b924176448fb5b02e293fd4e1ae352191a72d4b160395edf49a5ec2d4f9c59866ed13bd59c93a33d797397fcf972de4029f5ab
 EBUILD repo-2.12-r1.ebuild 1253 BLAKE2B f9a3b7eb2a335376a68519eb2d7cad7ea7765c28132b23b31ba6fde4c2a1cf81304f2d1d84d4293346f8a99e9c02934824d9db40d62f57ca4537ebfeb9a21bd4 SHA512 7706d0558c7c5d2c5975dbde52cce0710deea1b3204ff499e83f20e49bf66275481f122f7a76919abd58b23a7d565a0be89b0cedc72cd60e8301207e2063e3e2
-EBUILD repo-2.12.ebuild 882 BLAKE2B a2a00314a8c618249302208fe2f6e052ce77436b497753d3f7f752f45a41ee1d89399e0392b8da344941c11e0c3bf1ab5ba98657c011456c989f2e16188e1cd0 SHA512 f498665d9813bd127149d53f82cb0df9d1d7c07dd098442ecdf237492d50f0115a90794e90cfa11f7138a633978772438ca56970626483b25964bdbb931c1562
-EBUILD repo-2.14.ebuild 1259 BLAKE2B 72d5575bb10ced240034b4cc2aa4928e519ffa1bbe5dcc381a8443f98a84896656020df70d783820ef8eac5c86d6b35f30354e7f9673b1ba7e3e4d525ec2a366 SHA512 85fbf59f7e4cea4011aaf4eb65449e6b6ffea04f5d8370f126db8f4ec99ed1b6dfe485772a0efc5f3db8d7b935bff05c505c95aab73ef68ca6f19aec6a89178e
+EBUILD repo-2.14.ebuild 1253 BLAKE2B f9a3b7eb2a335376a68519eb2d7cad7ea7765c28132b23b31ba6fde4c2a1cf81304f2d1d84d4293346f8a99e9c02934824d9db40d62f57ca4537ebfeb9a21bd4 SHA512 7706d0558c7c5d2c5975dbde52cce0710deea1b3204ff499e83f20e49bf66275481f122f7a76919abd58b23a7d565a0be89b0cedc72cd60e8301207e2063e3e2
+EBUILD repo-2.15.ebuild 1259 BLAKE2B 72d5575bb10ced240034b4cc2aa4928e519ffa1bbe5dcc381a8443f98a84896656020df70d783820ef8eac5c86d6b35f30354e7f9673b1ba7e3e4d525ec2a366 SHA512 85fbf59f7e4cea4011aaf4eb65449e6b6ffea04f5d8370f126db8f4ec99ed1b6dfe485772a0efc5f3db8d7b935bff05c505c95aab73ef68ca6f19aec6a89178e
 MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd
diff --git a/dev-vcs/repo/repo-2.11.ebuild b/dev-vcs/repo/repo-2.11.ebuild
deleted file mode 100644
index 742d33af95de..000000000000
--- a/dev-vcs/repo/repo-2.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The ${PV} tracks the *repo launcher version*, not the last signed release
-# of the repo project.  The launcher only gets a new update when changes are
-# made in it.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-r1
-
-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}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!app-admin/radmind
-	!dev-util/repo"
-
-S=${WORKDIR}
-
-src_install() {
-	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
-}
diff --git a/dev-vcs/repo/repo-2.14.ebuild b/dev-vcs/repo/repo-2.14.ebuild
index a1697a75edb5..583e55b6f0eb 100644
--- a/dev-vcs/repo/repo-2.14.ebuild
+++ b/dev-vcs/repo/repo-2.14.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.12.ebuild b/dev-vcs/repo/repo-2.15.ebuild
index 0df8d726dda8..a1697a75edb5 100644
--- a/dev-vcs/repo/repo-2.12.ebuild
+++ b/dev-vcs/repo/repo-2.15.ebuild
@@ -9,11 +9,16 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit python-r1
+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}"
+SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
+	https://gerrit.googlesource.com/git-repo/+/${COMP_VER}/completion.bash?format=TEXT -> ${COMP_NAME}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -27,8 +32,11 @@ RDEPEND="${PYTHON_DEPS}
 
 S=${WORKDIR}
 
-src_unpack() { :; }
+src_unpack() {
+	base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die
+}
 
 src_install() {
 	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
+	newbashcomp completion.bash ${PN}
 }