From 20295df1afc2853be357c57779b4f86b5568eb42 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 13 Jan 2025 07:04:45 +0000 Subject: [PATCH] app-containers/containers-storage: Sync with Gentoo It's from Gentoo commit 03d790f5aaf062135a9e6b888d914907a55ae641. --- .../containers-storage/Manifest | 4 -- .../containers-storage-1.51.0.ebuild | 37 ------------------- .../containers-storage-1.53.0.ebuild | 32 ---------------- .../containers-storage-1.54.0.ebuild | 32 ---------------- .../containers-storage-1.55.0.ebuild | 32 ---------------- .../containers-storage-1.55.1.ebuild | 2 +- .../files/system-md2man-path.patch | 7 ---- 7 files changed, 1 insertion(+), 145 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.51.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.53.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.54.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.55.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/containers-storage/files/system-md2man-path.patch diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/Manifest index a0750afba0..828d588b19 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/Manifest @@ -1,5 +1 @@ -DIST containers-storage-1.51.0.tar.gz 4283732 BLAKE2B 108401d68e617e6237e68cf2147113680e0452a8d15ee099da9872508800f3e7b8f2c5508e17d9c5f3d58fec4efc1c20f23f1a567fe592533c0e63efd05ae5c8 SHA512 89916b49438bce8bb774b4aa799676d4b3a946a0b5207a1b5241b1a3ac0875b06b3cd8e81d7e23332ceae6010b693516fc31d8c7f75a37e7ad3056a83c75b6c1 -DIST containers-storage-1.53.0.tar.gz 4291738 BLAKE2B 939ecca8a948165c42453d5461429d46249d73582869793969f9d4ae52d0a9fec25e6c39cd13190dad0730d9a17de7af1f237b3cf5434fd30f442c78e57ee7b3 SHA512 ea4a1d1899208eb8861e36beba206724b1f55cfd6007bc5a90c3a6a5e02835b4a2985814dc9363c31dcdc81a3fb331b29f51f5523628edb8d9c64c465d6dcaa3 -DIST containers-storage-1.54.0.tar.gz 4165066 BLAKE2B 30f3e4287e9db46fca81ae6c08d3016ec4be6f38a4981d310f06cbc72e4125b458446fe49675f53232efdf0bec58e9cd18aa90424677e1b726338f1fb62b7172 SHA512 e3535ab378bcb7b852d1ebf431e94696f53da469278f618c07dde2d3c8c6b5b3a4c71d65a9c14d1c1b4fa1e41a0550029468ef9ba1f24c1d3294a5aeec55b5fd -DIST containers-storage-1.55.0.tar.gz 4197147 BLAKE2B 62bf192225383961d045f7128b4da32af2b1c9a5f9844e17b2264e81b8fa4494f6d2705ec6415245c0c5d889604e712d922d76c46e8ec6600dff5476b2a530ff SHA512 4c035385167c4c3f6048f8bc2bbbd3cfe9993390d580449e0e5b52576a27d286bd536799c96e46d946b9bfa61ff7263325145acddd7fabfbfbacb967d81843d3 DIST containers-storage-1.55.1.tar.gz 4197824 BLAKE2B 5859e2267096541449aeff8576ad1dc00a72993d123ec5571e775f0081a6bc9cfc588bfd522bf7742bd417314e3a699d51e57127f66c152abb7cf805ffe61464 SHA512 3ba244d28e25c6a88f01a73ff26a4a0747c71124a6191d086d8521e1622f36740cfa0b1cbac56f7699a5af9a7001382e71c32fd0644960a53a97c00fd09a754e diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.51.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.51.0.ebuild deleted file mode 100644 index e06dc0abad..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.51.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Default config and docs related to Containers' storage" -HOMEPAGE="https://github.com/containers/storage" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/storage.git" -else - SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P#containers-}" - KEYWORDS="amd64 arm64 ~riscv" -fi - -LICENSE="Apache-2.0" -SLOT="0" - -BDEPEND=">=dev-go/go-md2man-2.0.2" - -src_prepare() { - default - eapply "${FILESDIR}"/system-md2man-path.patch -} - -src_compile() { - emake -C docs containers-storage.conf.5 -} - -src_install() { - emake DESTDIR="${ED}" -C docs install - - insinto /etc/containers - doins storage.conf -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.53.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.53.0.ebuild deleted file mode 100644 index 2b2cde252b..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.53.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Default config and docs related to Containers' storage" -HOMEPAGE="https://github.com/containers/storage" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/storage.git" -else - SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P#containers-}" - KEYWORDS="amd64 arm64 ~riscv" -fi - -LICENSE="Apache-2.0" -SLOT="0" - -BDEPEND=">=dev-go/go-md2man-2.0.2" - -src_compile() { - emake -C docs GOMD2MAN=go-md2man containers-storage.conf.5 -} - -src_install() { - emake DESTDIR="${ED}" -C docs install - - insinto /etc/containers - doins storage.conf -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.54.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.54.0.ebuild deleted file mode 100644 index be92b5c954..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.54.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Default config and docs related to Containers' storage" -HOMEPAGE="https://github.com/containers/storage" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/storage.git" -else - SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P#containers-}" - KEYWORDS="~amd64 ~arm64 ~loong ~riscv" -fi - -LICENSE="Apache-2.0" -SLOT="0" - -BDEPEND=">=dev-go/go-md2man-2.0.2" - -src_compile() { - emake -C docs GOMD2MAN=go-md2man containers-storage.conf.5 -} - -src_install() { - emake DESTDIR="${ED}" -C docs install - - insinto /etc/containers - doins storage.conf -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.55.0.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.55.0.ebuild deleted file mode 100644 index be92b5c954..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.55.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Default config and docs related to Containers' storage" -HOMEPAGE="https://github.com/containers/storage" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/storage.git" -else - SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P#containers-}" - KEYWORDS="~amd64 ~arm64 ~loong ~riscv" -fi - -LICENSE="Apache-2.0" -SLOT="0" - -BDEPEND=">=dev-go/go-md2man-2.0.2" - -src_compile() { - emake -C docs GOMD2MAN=go-md2man containers-storage.conf.5 -} - -src_install() { - emake DESTDIR="${ED}" -C docs install - - insinto /etc/containers - doins storage.conf -} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.55.1.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.55.1.ebuild index be92b5c954..360694b3ad 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.55.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/containers-storage-1.55.1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then else SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P#containers-}" - KEYWORDS="~amd64 ~arm64 ~loong ~riscv" + KEYWORDS="amd64 arm64 ~loong ~riscv" fi LICENSE="Apache-2.0" diff --git a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/files/system-md2man-path.patch b/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/files/system-md2man-path.patch deleted file mode 100644 index f7d8d58aeb..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/containers-storage/files/system-md2man-path.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/docs/Makefile -+++ b/docs/Makefile -@@ -1,2 +1,3 @@ --GOMD2MAN = ../tests/tools/build/go-md2man -+GOMD2MAN = $(shell command -v go-md2man) -+ - PREFIX ?= ${DESTDIR}/usr