From 12ce55a392beace2101de310870fbff85887b2e1 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 14 Jun 2024 17:31:51 +0100 Subject: [PATCH] Drop the dev-vcs/repo tool now that cros_workon no longer uses it Signed-off-by: James Le Cuirot --- .../workflows/portage-stable-packages-list | 1 - ...r85.ebuild => coreos-dev-0.1.0-r86.ebuild} | 0 .../coreos-dev/coreos-dev-0.1.0.ebuild | 1 - .../sdk-depends/sdk-depends-0.0.1.ebuild | 1 - .../src/third_party/portage-stable/README.md | 2 +- .../portage-stable/dev-vcs/repo/Manifest | 2 -- .../portage-stable/dev-vcs/repo/metadata.xml | 11 ------ .../dev-vcs/repo/repo-2.37.ebuild | 34 ------------------- .../dev-vcs/repo/repo-2.40.ebuild | 34 ------------------- 9 files changed, 1 insertion(+), 85 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/{coreos-dev-0.1.0-r85.ebuild => coreos-dev-0.1.0-r86.ebuild} (100%) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.40.ebuild diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 8f1f8a281e..8aff44662d 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -309,7 +309,6 @@ dev-util/pkgconf dev-util/re2c dev-vcs/git -dev-vcs/repo eclass/acct-group.eclass eclass/acct-user.eclass diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r85.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r86.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r85.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0-r86.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild index 3c16138144..889e44e3b0 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-dev/coreos-dev-0.1.0.ebuild @@ -23,7 +23,6 @@ RDEPEND=" dev-debug/strace dev-lang/python dev-util/pahole - dev-vcs/repo net-analyzer/netperf net-analyzer/traceroute net-dialup/minicom diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index de9f637cca..8056e13f26 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild @@ -33,7 +33,6 @@ DEPEND=" dev-util/checkbashisms dev-util/pahole dev-util/patchelf - dev-vcs/repo net-dns/bind-tools >=net-dns/dnsmasq-2.72[dhcp,ipv6] net-libs/rpcsvc-proto diff --git a/sdk_container/src/third_party/portage-stable/README.md b/sdk_container/src/third_party/portage-stable/README.md index 70d6f21243..2d42d1b212 100644 --- a/sdk_container/src/third_party/portage-stable/README.md +++ b/sdk_container/src/third_party/portage-stable/README.md @@ -8,7 +8,7 @@ of the Container Linux build and are exact copies of upstream Gentoo packages. Use `src/scripts/update_ebuilds` to fetch the latest copy from Gentoo: cd ~/trunk/src/scripts - repo start update-foo ../third-party/portage-stable + git checkout -b update-foo ./update_ebuilds --commit app-fun/foo Note: `update_ebuilds` can fetch from either Gentoo's Github mirror or 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 deleted file mode 100644 index 72b8ad2f08..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST repo-2.37.tar.gz 273445 BLAKE2B 7934581c5c55896d8ba58f5841a028f4676062197498ef601fa005f4e19428eee552e66d057a1e0d033eff8691df2de8e130ff96aec0e4537a462be81796e249 SHA512 6aa11e9fc9d899866dd89788c94ef188ea89dc6757a4e4fe0f1284898315723f72b3b97b60d39194f34e56332057545eb9c99b6483bc3e0513f747410226b9fa -DIST repo-2.40.tar.gz 277118 BLAKE2B 57ebd20e323a4c3d02885c71f599bf57d23e68b8199b136095ce77a479a815439c51844b11744e0c9555091e91821ba49715c57d985a3a30579497b4617b6361 SHA512 0cd9df29edf14acdaeb0e4d07dea13f6e3bfa77ac36ffe7c4042d050c5d3fb36a7ff9a249e521aef7d7e5fbff9fe1c4b94df02c0d435353e0c169a94254f78ba 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 deleted file mode 100644 index 0885b487b6..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - Mike Frysinger - vapier@gentoo.org - - - GerritCodeReview/git-repo - - diff --git a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild deleted file mode 100644 index c51d27d5ee..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.37.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# 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 -# of the repo project. The launcher only gets a new update when changes are -# made in it. - -EAPI="7" - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit bash-completion-r1 python-r1 - -DESCRIPTION="Google tool for managing git, particularly multiple repos" -HOMEPAGE="https://gerrit.googlesource.com/git-repo" -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" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - !app-admin/radmind -" - -S="${WORKDIR}/git-${P}" - -src_install() { - 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.40.ebuild b/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.40.ebuild deleted file mode 100644 index 3203603bb0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-vcs/repo/repo-2.40.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# 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 -# of the repo project. The launcher only gets a new update when changes are -# made in it. - -EAPI="7" - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit bash-completion-r1 python-r1 - -DESCRIPTION="Google tool for managing git, particularly multiple repos" -HOMEPAGE="https://gerrit.googlesource.com/git-repo" -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" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - !app-admin/radmind -" - -S="${WORKDIR}/git-${P}" - -src_install() { - python_foreach_impl python_doscript ${PN} - newbashcomp completion.bash ${PN} - doman man/*.[0-9] -}