summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2024-04-14 11:59:13 -0700
committerZac Medico <zmedico@gentoo.org>2024-04-14 12:14:26 -0700
commit445d9f92ddafad40e2a2c0bbc22945dda89d9b47 (patch)
tree574dd43978c920168ac0d9802733b7a95c24d4da /app-containers/containers-image
parentdev-lang/elixir: drop 1.16.1 (diff)
downloadgentoo-445d9f92ddafad40e2a2c0bbc22945dda89d9b47.tar.gz
gentoo-445d9f92ddafad40e2a2c0bbc22945dda89d9b47.tar.bz2
gentoo-445d9f92ddafad40e2a2c0bbc22945dda89d9b47.zip
app-containers/containers-image: Block older containers-common
In 5.29.2 (commit 3ce5be3e30a8d60756b3685d1069788ec801f7f8) the policy.json and registries.d/default.yaml files moved to the containers-image package. Bug: https://bugs.gentoo.org/930027 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'app-containers/containers-image')
-rw-r--r--app-containers/containers-image/containers-image-5.29.2-r1.ebuild1
-rw-r--r--app-containers/containers-image/containers-image-5.30.0.ebuild1
-rw-r--r--app-containers/containers-image/containers-image-9999.ebuild1
3 files changed, 3 insertions, 0 deletions
diff --git a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
index 770d024fa41e..5a0b9d37566c 100644
--- a/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
+++ b/app-containers/containers-image/containers-image-5.29.2-r1.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
RESTRICT='test'
BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
PATCHES=(
"${FILESDIR}"/moving-policy-json-default-yaml.patch
"${FILESDIR}"/prevent-downloading-mods-5.29.2.patch
diff --git a/app-containers/containers-image/containers-image-5.30.0.ebuild b/app-containers/containers-image/containers-image-5.30.0.ebuild
index f4507f8d00cf..9d755c4cf4ad 100644
--- a/app-containers/containers-image/containers-image-5.30.0.ebuild
+++ b/app-containers/containers-image/containers-image-5.30.0.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
RESTRICT='test'
BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
PATCHES=(
"${FILESDIR}"/fix-warnings.patch
)
diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-9999.ebuild
index f4507f8d00cf..9d755c4cf4ad 100644
--- a/app-containers/containers-image/containers-image-9999.ebuild
+++ b/app-containers/containers-image/containers-image-9999.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
# https://github.com/gentoo/gentoo/pull/35012#discussion_r1473740969
RESTRICT='test'
BDEPEND=">=dev-go/go-md2man-2.0.3"
+RDEPEND="!<=app-containers/containers-common-0.57.0"
PATCHES=(
"${FILESDIR}"/fix-warnings.patch
)