gentoo resync : 30.05.2020

4 files changed, 38 insertions, 4 deletions

diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 2ee2969876fb..c39f414efcd5 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,7 +1,9 @@
 DIST repo-1.26 29829 BLAKE2B c5dc74214d404e6c11189a3d34c9a771ed5689da14e64588b5db144b6ea3ec38a727238d7dc6e609a22edb5b84d350210564615016f6b36599cf9e3fc3b34ef9 SHA512 1398fab95b4fb4a24fda93d4054384a801b5b70e3dca3a794f458d8e19582ef833ef5a3a0f3a571121d2d9172ce0e70f8b3c6719f6c2f47643ffe6de181e34b4
 DIST repo-1.27 29945 BLAKE2B 930fa876b8889d64c8d12444f4cd59bebbdf9848d455e114fc9306922d931aa721320db65a07c38f705c39950538a1d5ae5ca66e359d2f2e38061d144ac11cb2 SHA512 a9f651e5fd1da1c74b31aebf32d03cf868183fa529eaf2b079015f9e778a2bb7c1ef49e06564703534c45fa1bd7bc5bd3d91a91477c336e549c1208afa74ace6
 DIST repo-2.4 35152 BLAKE2B a069c095524574ee4a7d18cc5cd023f6d71b9ed9b57941180a6ec3ab3c33b2ed18b5dfc7d225a7bc849b7ebfd28bc0e672f7796eb2bb37af0685539c850cfe34 SHA512 46d7b8f699246ad625d5eb714791c29b949c40793343ba56681554040dc1d6a0a5f049e8d96f1e12ca93d77291e95ffd756f76554ebc1062f9cf6fc014aa116a
+DIST repo-2.5 38761 BLAKE2B 26d002bb7e5a24dc958bb4e0653c2cc260b2766d81fd55edf9a0373542365ed89a224805293383e2c16d8fc331038b265d3b2aca3a9a637d893f4a9c8221ce76 SHA512 36e515241fd9705c63beaf662309dc2ab6406552ba845fe020c878ac82e7eb7e1cd73924a076cf5fe4800ea70919bb5ad5d2d43566d5b0a559f81a45f9a58fe8
 EBUILD repo-1.26.ebuild 833 BLAKE2B d72c019f5e48b45f1129b6947f1823cd750d3fcc693efcbaf4ad7be2dfe41f36fdd1fb9fdbe9893b13dc6b7e8ffcbfa82c3747689f3b5ec5ac960777fe1cf2ba SHA512 5ab0f30d198d4e6225f576a348f12eef8f1485272223052311795f214d80a95db1d5f4fafebb22ef53cf8e0d775ed4703d43d8c3c30a28bff35e9979590ce640
-EBUILD repo-1.27.ebuild 829 BLAKE2B 7740a54b72afc6a1f697aaa1ce3bcc562c814ee37b29efb9409b8e5babcfa39b009f77e5db47345c9aa1c56a6f1af144a034ba5ac4adb0bed9cadbcfd99a6b80 SHA512 231aba3d1c707fc1ffb0aa06ef9c5f5e0add6df55af6c7b152bc27a4851bff5e1451f95921e3b1cd80231a58bf3aa8cf115e38ea5bb613b65ce15a66917f01c1
-EBUILD repo-2.4.ebuild 859 BLAKE2B 71c1c64a6ea18200b81a0cdd1877179f7cb5427b2e865b562a054f667782bbfd62dec4f054716693269902fb3162c9d4f9b2ad28447c4dfeb36084131432844c SHA512 a7d0f642a33d0c19d8e44ab77ab74cf9d4f913c33ce21422f08e3818ff1543dcee5c7d507063f8f9f53d1d84c865573d3e0c383ffb0f11303d4f2a0b45fe5d00
+EBUILD repo-1.27.ebuild 823 BLAKE2B 159755dc5fdb25fae05fa1026c3f19ccd4b93a412d6b425a541a4c6f794c7f5922d6ead911177f55ea8e298555b82447668f7439724a12647dabeeb2e8794ea8 SHA512 638ae406a07fae698242a91e4d2aad5fc723fa2236a90c914e30064f018abe4f06a4be832c88148e49eb256c6d73f6a9c961696720afbff92a09f919c37aeb1b
+EBUILD repo-2.4.ebuild 853 BLAKE2B 5123c3b627a65cf07ab9586308676a9c3edb1b5037525d6b2af702203b4223676ebf5a018239d6655aae90c2daef1358995a490b37a0c67bda6e66c000907ae0 SHA512 b5862ce4158e106a6a21138371b5471f6f70bc5844b074de0f1334daf3183238df0d81784afc448c403cdbb027ce240948c0743d9e39a2c19f053112bf578883
+EBUILD repo-2.5.ebuild 859 BLAKE2B 71c1c64a6ea18200b81a0cdd1877179f7cb5427b2e865b562a054f667782bbfd62dec4f054716693269902fb3162c9d4f9b2ad28447c4dfeb36084131432844c SHA512 a7d0f642a33d0c19d8e44ab77ab74cf9d4f913c33ce21422f08e3818ff1543dcee5c7d507063f8f9f53d1d84c865573d3e0c383ffb0f11303d4f2a0b45fe5d00
 MISC metadata.xml 338 BLAKE2B 49e4b3e3767754bb7a0661cb388f3e18b372fa713d0e3b92c742cddb2fe21e384b1689fd72b23865d7b363ab01bae90a5a11956593eccc915f1b6c99e52c2718 SHA512 0a83263d882281636f6925d20c9e8b991267a1b7d73d7bd6e545c77372424fd602e28d6c9a82668d0a73500bcb8dd8287f7891b66e3fe1517907001f3fb43cd4
diff --git a/dev-vcs/repo/repo-1.27.ebuild b/dev-vcs/repo/repo-1.27.ebuild
index 02aa1a54881c..668b64040fce 100644
--- a/dev-vcs/repo/repo-1.27.ebuild
+++ b/dev-vcs/repo/repo-1.27.ebuild
@@ -16,7 +16,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.4.ebuild b/dev-vcs/repo/repo-2.4.ebuild
index 5664a3767c19..a2713bffea7f 100644
--- a/dev-vcs/repo/repo-2.4.ebuild
+++ b/dev-vcs/repo/repo-2.4.ebuild
@@ -17,7 +17,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.5.ebuild b/dev-vcs/repo/repo-2.5.ebuild
new file mode 100644
index 000000000000..5664a3767c19
--- /dev/null
+++ b/dev-vcs/repo/repo-2.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 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_{6..8} )
+
+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}
+}