From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5FF75158043 for ; Sun, 14 Apr 2024 19:14:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4553E29E7; Sun, 14 Apr 2024 19:14:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8561FE29E7 for ; Sun, 14 Apr 2024 19:14:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96E2A335D1C for ; Sun, 14 Apr 2024 19:14:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31F611620 for ; Sun, 14 Apr 2024 19:14:32 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1713122066.445d9f92ddafad40e2a2c0bbc22945dda89d9b47.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/containers-image/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/containers-image/containers-image-5.29.2-r1.ebuild app-containers/containers-image/containers-image-5.30.0.ebuild app-containers/containers-image/containers-image-9999.ebuild X-VCS-Directories: app-containers/containers-image/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 445d9f92ddafad40e2a2c0bbc22945dda89d9b47 X-VCS-Branch: master Date: Sun, 14 Apr 2024 19:14:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 42594c95-63a3-4a20-b072-5e6ba200a2e9 X-Archives-Hash: 7cb3fa29b717f869ce5e58db3fb399f2 commit: 445d9f92ddafad40e2a2c0bbc22945dda89d9b47 Author: Zac Medico gentoo org> AuthorDate: Sun Apr 14 18:59:13 2024 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Apr 14 19:14:26 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445d9f92 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 gentoo.org> app-containers/containers-image/containers-image-5.29.2-r1.ebuild | 1 + app-containers/containers-image/containers-image-5.30.0.ebuild | 1 + app-containers/containers-image/containers-image-9999.ebuild | 1 + 3 files changed, 3 insertions(+) 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 )