commit: fe5e0b6f960d27f426ee7306e8b7f827c2b2f214 Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks> AuthorDate: Wed Mar 19 08:58:23 2025 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Mar 19 22:35:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5e0b6f
app-containers/containers-image: update to 5.34.2 & add back patch * Needed patch was removed in 7257745471693c4040eff09bdbe8f49616aba50c but it is needed because Makefile executes `go` which adds dev-lang/go as BDEPEND which isn't really needed here as this package only installs man pages & conf files. Also `go list` in Makefile tries to download go modules which prints warnings in build.log, thus I named fix-warnings.patch. Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks> From: https://github.com/gentoo/gentoo/pull/41170 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-containers/containers-image/Manifest | 1 + ...-9999.ebuild => containers-image-5.34.2.ebuild} | 5 ++++- .../containers-image/containers-image-9999.ebuild | 5 ++++- .../files/remove-go-as-bdepend-5.34.2.patch | 22 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest index c08b5f79dd8a..68134bbceedf 100644 --- a/app-containers/containers-image/Manifest +++ b/app-containers/containers-image/Manifest @@ -1,2 +1,3 @@ DIST containers-image-5.30.0.tar.gz 719070 BLAKE2B 5952ab703b6df793f326dd4fc82f50c5f672e2b9d142e0bc706014092420e3563599d9f1c1f65f743e1a8144b91f92b2326d7bf4c3024b5efb466d777a8ad613 SHA512 89cd0d482bb5d70037ff51413b7abca01d36bc7f39e9dc130c78462e501dae32193137a367d81532afd216a7432e127728147e6e839d5d99eeb6b6680f31d4dc DIST containers-image-5.32.2.tar.gz 735422 BLAKE2B a0585c877b4679226d1760bf873ceeb5cba7f5177ab83fa6f8a161b1f3958f3d660445556b13b4221712c241cee94429cabdb1fd4186d4dc6edba7b032fce2bc SHA512 7498f9e446b2c205b033703641f7cfcb6c8bd8f097b12ef3f734c94772d63fc7b9b40a6700d53d93919d2c34772f079aa3cb7d9f9e5a130b6587f4fe2a558df6 +DIST containers-image-5.34.2.tar.gz 766227 BLAKE2B 27593e4d0035aee9eabc1011a837f16369d7985558ae1275e6726ff1b859d09ab036f150dc978ab0290cee7ba2b0878c50edcb131a2eb63ff947567fa1f10c2a SHA512 7e7cc5bfd2e8d71c332f08aab34c1b1cccadcf9f313d9519a294e9dfc370fd48d18f1e00dd0d74a19edf40ac511a544033fc27cf9537dcbb9458f721d88d564d diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-5.34.2.ebuild similarity index 89% copy from app-containers/containers-image/containers-image-9999.ebuild copy to app-containers/containers-image/containers-image-5.34.2.ebuild index 2b3c1bcb8666..921fadc2e303 100644 --- a/app-containers/containers-image/containers-image-9999.ebuild +++ b/app-containers/containers-image/containers-image-5.34.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,6 +22,9 @@ SLOT="0" RESTRICT='test' BDEPEND=">=dev-go/go-md2man-2.0.3" RDEPEND="!<=app-containers/containers-common-0.57.0" +PATCHES=( + "${FILESDIR}"/remove-go-as-bdepend-5.34.2.patch +) src_compile() { emake docs diff --git a/app-containers/containers-image/containers-image-9999.ebuild b/app-containers/containers-image/containers-image-9999.ebuild index 2b3c1bcb8666..921fadc2e303 100644 --- a/app-containers/containers-image/containers-image-9999.ebuild +++ b/app-containers/containers-image/containers-image-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,6 +22,9 @@ SLOT="0" RESTRICT='test' BDEPEND=">=dev-go/go-md2man-2.0.3" RDEPEND="!<=app-containers/containers-common-0.57.0" +PATCHES=( + "${FILESDIR}"/remove-go-as-bdepend-5.34.2.patch +) src_compile() { emake docs diff --git a/app-containers/containers-image/files/remove-go-as-bdepend-5.34.2.patch b/app-containers/containers-image/files/remove-go-as-bdepend-5.34.2.patch new file mode 100644 index 000000000000..a128d64787cb --- /dev/null +++ b/app-containers/containers-image/files/remove-go-as-bdepend-5.34.2.patch @@ -0,0 +1,22 @@ +--- a/Makefile ++++ b/Makefile +@@ -3,11 +3,6 @@ + export GOPROXY=https://proxy.golang.org + + +-GOBIN := $(shell go env GOBIN) +-ifeq ($(GOBIN),) +-GOBIN := $(shell go env GOPATH)/bin +-endif +- + # when cross compiling _for_ a Darwin or windows host, then we must use openpgp + BUILD_TAGS_WINDOWS_CROSS = containers_image_openpgp + BUILD_TAGS_DARWIN_CROSS = containers_image_openpgp +@@ -15,7 +10,6 @@ BUILD_TAGS_DARWIN_CROSS = containers_image_openpgp + BUILDTAGS = btrfs_noversion libdm_no_deferred_remove + BUILDFLAGS := -tags "$(BUILDTAGS)" + +-PACKAGES := $(shell go list $(BUILDFLAGS) ./...) + SOURCE_DIRS = $(shell echo $(PACKAGES) | awk 'BEGIN{FS="/"; RS=" "}{print $$4}' | uniq) + + PREFIX ?= ${DESTDIR}/usr
