From af7fce8f1f528a1a3cbfdcd686b239635bceccc4 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 25 Jan 2023 18:04:27 +0100 Subject: [PATCH] dev-vcs/repo: Sync with Gentoo It's from Gentoo commit ed468028e725c9580a7b2ee02d6b7b9375f7a0b2. --- .../portage-stable/dev-vcs/repo/Manifest | 8 ++-- .../portage-stable/dev-vcs/repo/metadata.xml | 7 ++-- .../dev-vcs/repo/repo-2.15.ebuild | 42 ------------------- .../{repo-2.14.ebuild => repo-2.29.ebuild} | 20 +++------ .../{repo-2.17.ebuild => repo-2.30.ebuild} | 17 +++----- 5 files changed, 18 insertions(+), 76 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.15.ebuild rename sdk_container/src/third_party/portage-stable/dev-vcs/repo/{repo-2.14.ebuild => repo-2.29.ebuild} (55%) rename sdk_container/src/third_party/portage-stable/dev-vcs/repo/{repo-2.17.ebuild => repo-2.30.ebuild} (67%) diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest index 5e024334fd..70a20a9848 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest @@ -1,5 +1,3 @@ -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-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64 4280 BLAKE2B 6c369d36176d5bd4d3f4ed4df39bbd6542022dd186375bd05a978889c574819e3328d19c7dac2982233614786078f73bfd1f0c80aa7c0c6c79bdfab776ed6e39 SHA512 f484bee79c3724a6daf8a69b3df80feef3c6aaad3bfb49443caabc52735dd7f3b0fcb3ad4b7480bc020c9b4cac2f3b044693ef761df6fc9d34e854289baf1f3d -DIST repo-v2.17-bash-completion.sh.base64 5736 BLAKE2B 59c357d76feb176b7c64791ffb838ab522179c7e05d1a1cca6e121c9c908cdbccc49f177951986470806302b881b39ab44710b66b0a6a8c9643d4a647841eddf SHA512 9bc4f57d58222297f53e6dcbed1b895e8d0a90558be58a423243c886cb5cfad11c32e7c599b2e237e3f53b2857f8441ddb476484189135b71f52ca7250dfaf62 +DIST repo-2.29.tar.gz 248253 BLAKE2B 6b51a0416634eab52f44410fe156c736a6c69234345b4cf5115692a9b56d479c0bce780583fb2ee6b9ca206e5163adbf6ded85ff5d7f2b174a7e7cd6dc37dd57 SHA512 7323b52709164999a80172bc39398ad9989c3eb97bcfda66a675c3f94792cdd742068d47bbcc66dc8fffbe3b661c2fb19332a72a7f889a249f73fa448fcb32d1 +DIST repo-2.30 45769 BLAKE2B 46e8f37b138f1ebfa3109962f2690cc3bc6c38a2dd4333cd5be6fc1168476945cbd73f142486141a00552b8a998d4a765e54fce605d1872a670a3043fb213b05 SHA512 e8ad4e35417992f15bfa081ce282e1e518dcb885c04176f18ff2859ccb1dd397087224980f441020be12083c9847fcce661370119fe08f17be04718eff4a7a96 +DIST repo-2.30.tar.gz 252945 BLAKE2B ebaadc1f624941139c14417e86e1a4960fbba9da7b9053bab8f2cb1647c40a6f1f63951bcbb6d9162803066f9b05d1fb469e82b7d3b2bea31215b97b1bddf84f SHA512 7d184605e8d8e30bc48a4d3f2345c7ee9a8075711729108b5d487242c9311dc1cf22595f9ba09192a28460d6127e8cbe96a70fcdaf7c6baeb1e26a8ac15a7cae diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml index 8041df9275..7517f8d97d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml @@ -1,7 +1,8 @@ - - vapier@gentoo.org - + + Mike Frysinger + vapier@gentoo.org + diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.15.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.15.ebuild deleted file mode 100644 index 583e55b6f0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.15.ebuild +++ /dev/null @@ -1,42 +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 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}" - -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_unpack() { - base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die -} - -src_install() { - python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN} - newbashcomp completion.bash ${PN} -} diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.14.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.29.ebuild similarity index 55% rename from sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.14.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.29.ebuild index 583e55b6f0..1a47a8ee8c 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.14.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.29.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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 @@ -7,18 +7,13 @@ EAPI="7" -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{9..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" @@ -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] } diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.17.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.30.ebuild similarity index 67% rename from sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.17.ebuild rename to sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.30.ebuild index 69044e1775..a758514924 100644 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.17.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.30.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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 @@ -7,18 +7,14 @@ EAPI="7" -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{9..11} ) 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}" + https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" @@ -30,13 +26,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} newbashcomp completion.bash ${PN} + doman man/*.[0-9] }