commit: 6e4d097a30fd39a781d3534531be92e53696c264 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Nov 26 03:23:11 2024 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Nov 26 03:23:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4d097a
app-containers/buildah: drop 1.33.7, 1.34.3, 1.35.3, 1.35.4, 1.36.0 Bug: https://bugs.gentoo.org/942557 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> app-containers/buildah/Manifest | 5 - app-containers/buildah/buildah-1.33.7.ebuild | 160 -------------------------- app-containers/buildah/buildah-1.34.3.ebuild | 161 --------------------------- app-containers/buildah/buildah-1.35.3.ebuild | 134 ---------------------- app-containers/buildah/buildah-1.35.4.ebuild | 134 ---------------------- app-containers/buildah/buildah-1.36.0.ebuild | 129 --------------------- 6 files changed, 723 deletions(-) diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest index 15b28e9ff037..341683b7d49d 100644 --- a/app-containers/buildah/Manifest +++ b/app-containers/buildah/Manifest @@ -1,7 +1,2 @@ -DIST buildah-1.33.7.tar.gz 18604354 BLAKE2B d2788096d8d6fd6cc528e8f33edc577778a2775a561ea3c4a983eb4a6fa1d5b570f6d8dc0f77e464d0c242add5d641e20afce83c9f5157021fbc82a009ea47c9 SHA512 1248ad1dcf0d10608674543caf4d78f5052db7932102226e23b73add5e129bd8c614672f3d06aa8052675dd83fa83ef2742ef08fe1a883037b41df8fde893ea1 -DIST buildah-1.34.3.tar.gz 18856476 BLAKE2B c91c995a2ff4be8b4e84a70c581a817cb2f1333b08ca297163d218f80d538905c41718cfc267c03173330234c3476344be44df799eaaac891395a22bc7a020b3 SHA512 26d5c48cb5b056a274c1a9c6820a6076337f625fc6dd6683000db871f3de9d37907bd962ced3400334bfc230718219cda2108e2e984be5f8c76ecfa4a2f1e1ac -DIST buildah-1.35.3.tar.gz 19372597 BLAKE2B 014bea80b3a8c4482bbe098a0c5293892cf9f4f0d4d74ecaba8f155e49fab326689b95b690b413d64f6b576c7269bdb9d0f446244b832afe311e909b3f96856d SHA512 ca325ce1a878eb9e9a6caedf236add16702d8dcd83f15a1995b8215998821218104ea8cb7a5d11fc354ee01d9805c339578975d35db859f1d53b08e0a2139fe3 -DIST buildah-1.35.4.tar.gz 19370823 BLAKE2B 6dc8ad2a21c3ce41d4b8a2908d90bcbb32f5598c11fcde49a706334407370998731fedac7d8ee8e080a6a168c10b4a0404bf1120cab8b561e916a9df2bd2d115 SHA512 679f2328f675a39f9965128d51a6e8a3f82d64a6d3c3cdcb862cfcb7691eba272d869b6718147da1590aa573534081329ef05e879875024a11aa9ad52b2f292f -DIST buildah-1.36.0.tar.gz 19328201 BLAKE2B d3602b62a587d75904741b086bea6d789ac30fb6079b574214368552269e48310921340f42050c5c648173452fab7b478690fbfbd80bbebda4a5ec9a102aa4e6 SHA512 feb55b0dfb3cba4e9c6776b0f4730ebb4b9ea416f507e342f3b1cbf23b2bb79d96a58622faac7a980727e6739df7e0ceddf1a9d5ae483a3c7e781f7af75d115f DIST buildah-1.37.5.tar.gz 19323742 BLAKE2B 1c03cc201f10f4d3645ecd3dac9ae97b3fe585b63ca8980e22e8b13d6dab05842c47e694b45c13875f03dadf0a656177445b0f3835a8a6faca63b288ff136013 SHA512 ee33d85ea3aa9ec423b4e48e19db69359e3fc480a61abd511fa473257aa326e9a9c4dafc985afb83f7caa9a7a5ba6a89b2a1c028fe6ef7bd4ef382ec8591331d DIST buildah-1.38.0.tar.gz 18547712 BLAKE2B a7c8df00ecc570d44173318adf68036389ce27bad5c10c7ba2bf7a728c29647186fcf0bfb9d0949e7947aff1e64cb2683b69ea0b4cb3d4181697813de8a5870f SHA512 c9f31693043e348c2bee6219f5a42738d93aa690a81f6bb283bd4d93ea6fe0cbde50754f7ee1a7e690853b7cfb934ce60e35ceb029180f41a95192773023c243 diff --git a/app-containers/buildah/buildah-1.33.7.ebuild b/app-containers/buildah/buildah-1.33.7.ebuild deleted file mode 100644 index a24bd18a767c..000000000000 --- a/app-containers/buildah/buildah-1.33.7.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module linux-info toolchain-funcs - -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah"; - -# main pkg -LICENSE="Apache-2.0" -# deps -LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" - -SLOT="0" -IUSE="apparmor btrfs +seccomp systemd test" -RESTRICT="test" -DOCS=( - "CHANGELOG.md" - "troubleshooting.md" - "docs/tutorials" -) - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/buildah.git"; -else - SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64" -fi - -RDEPEND=" - systemd? ( sys-apps/systemd ) - btrfs? ( sys-fs/btrfs-progs ) - seccomp? ( sys-libs/libseccomp:= ) - apparmor? ( sys-libs/libapparmor:= ) - app-containers/containers-common - app-crypt/gpgme:= - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-apps/shadow:= -" -DEPEND="${RDEPEND}" -BDEPEND="dev-go/go-md2man" - -PATCHES=( - "${T}"/dont-call-as-directly-upstream-pr-5436.patch -) - -pkg_pretend() { - local CONFIG_CHECK="" - use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" - check_extra_config - - linux_config_exists || ewarn "Cannot determine configuration of your kernel." -} - -src_prepare() { - cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch" ---- a/Makefile -+++ b/Makefile -@@ -10,6 +10,8 @@ - BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions - BUILDFLAGS := -tags "$(BUILDTAGS)" - BUILDAH := buildah -+AS ?= as -+STRIP ?= strip - - GO := go - GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; else echo "-ldflags"; fi) -@@ -72,11 +74,11 @@ - bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint.gz - $(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah - --ifneq ($(shell as --version | grep x86_64),) -+ifneq ($(shell $(AS) --version | grep x86_64),) - internal/mkcw/embed/entrypoint: internal/mkcw/embed/entrypoint.s - $(AS) -o $(patsubst %.s,%.o,$^) $^ - $(LD) -o $@ $(patsubst %.s,%.o,$^) -- strip $@ -+ $(STRIP) $@ - else - .PHONY: internal/mkcw/embed/entrypoint - endif -EOF - - default - - # ensure all necessary files are there - local file - for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \ - hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do - [[ -f "${file}" ]] || die - done - - sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die - echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die - - cat <<-EOF > hack/apparmor_tag.sh || die - #!/usr/bin/env bash - $(usex apparmor 'echo apparmor' echo) - EOF - - use seccomp || { - cat <<-'EOF' > "${T}/disable_seccomp.patch" - --- a/Makefile - +++ b/Makefile - @@ -5 +5 @@ - -SECURITYTAGS ?= seccomp $(APPARMORTAG) - +SECURITYTAGS ?= $(APPARMORTAG) - EOF - eapply "${T}/disable_seccomp.patch" || die - } - - cat <<-EOF > hack/systemd_tag.sh || die - #!/usr/bin/env bash - $(usex systemd 'echo systemd' echo) - EOF - - echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die - cat <<-EOF > btrfs_tag.sh || die - #!/usr/bin/env bash - $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') - EOF - - use test || { - cat <<-'EOF' > "${T}/disable_tests.patch" - --- a/Makefile - +++ b/Makefile - @@ -54 +54 @@ - -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs - +all: bin/buildah docs - @@ -123 +123 @@ - -docs: install.tools ## build the docs on the host - +docs: ## build the docs on the host - EOF - eapply "${T}/disable_tests.patch" || die - } - -} - -src_compile() { - # For non-live versions, prevent git operations which causes sandbox violations - # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 - [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" - - tc-export AS LD STRIP - export GOMD2MAN="$(command -v go-md2man)" - default -} - -src_test() { - emake test-unit -} - -src_install() { - emake DESTDIR="${ED}" install install.completions - einstalldocs -} diff --git a/app-containers/buildah/buildah-1.34.3.ebuild b/app-containers/buildah/buildah-1.34.3.ebuild deleted file mode 100644 index cc06bf2ff42d..000000000000 --- a/app-containers/buildah/buildah-1.34.3.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module linux-info toolchain-funcs - -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah"; - -# main pkg -LICENSE="Apache-2.0" -# deps -LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" - -SLOT="0" -IUSE="apparmor btrfs +seccomp systemd test" -RESTRICT="test" -DOCS=( - "CHANGELOG.md" - "troubleshooting.md" - "docs/tutorials" -) - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/buildah.git"; -else - SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64" -fi - -RDEPEND=" - systemd? ( sys-apps/systemd ) - btrfs? ( sys-fs/btrfs-progs ) - seccomp? ( sys-libs/libseccomp:= ) - apparmor? ( sys-libs/libapparmor:= ) - app-containers/containers-common - app-crypt/gpgme:= - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-apps/shadow:= -" -DEPEND="${RDEPEND}" -BDEPEND="dev-go/go-md2man" - -PATCHES=( - "${T}"/dont-call-as-directly-upstream-pr-5436.patch -) - -pkg_pretend() { - local CONFIG_CHECK="" - use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" - check_extra_config - - linux_config_exists || ewarn "Cannot determine configuration of your kernel." -} - -src_prepare() { - cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch" ---- a/Makefile -+++ b/Makefile -@@ -14,6 +14,8 @@ - BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions - BUILDFLAGS := -tags "$(BUILDTAGS)" - BUILDAH := buildah -+AS ?= as -+STRIP ?= strip - - GO := go - GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; else echo "-ldflags"; fi) -@@ -76,14 +78,14 @@ - bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint_amd64.gz - $(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah - --ifneq ($(shell as --version | grep x86_64),) -+ifneq ($(shell $(AS) --version | grep x86_64),) - internal/mkcw/embed/entrypoint_amd64.gz: internal/mkcw/embed/entrypoint_amd64 - gzip -k9nf $^ - - internal/mkcw/embed/entrypoint_amd64: internal/mkcw/embed/entrypoint_amd64.s - $(AS) -o $(patsubst %.s,%.o,$^) $^ - $(LD) -o $@ $(patsubst %.s,%.o,$^) -- strip $@ -+ $(STRIP) $@ - endif -EOF - - default - - # ensure all necessary files are there - local file - for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \ - hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do - [[ -f "${file}" ]] || die - done - - sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die - echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die - - cat <<-EOF > hack/apparmor_tag.sh || die - #!/usr/bin/env bash - $(usex apparmor 'echo apparmor' echo) - EOF - - use seccomp || { - cat <<-'EOF' > "${T}/disable_seccomp.patch" - --- a/Makefile - +++ b/Makefile - @@ -5 +5 @@ - -SECURITYTAGS ?= seccomp $(APPARMORTAG) - +SECURITYTAGS ?= $(APPARMORTAG) - EOF - eapply "${T}/disable_seccomp.patch" || die - } - - cat <<-EOF > hack/systemd_tag.sh || die - #!/usr/bin/env bash - $(usex systemd 'echo systemd' echo) - EOF - - echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die - cat <<-EOF > btrfs_tag.sh || die - #!/usr/bin/env bash - $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') - EOF - - use test || { - cat <<-'EOF' > "${T}/disable_tests.patch" - --- a/Makefile - +++ b/Makefile - @@ -54 +54 @@ - -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs - +all: bin/buildah docs - @@ -123 +123 @@ - -docs: install.tools ## build the docs on the host - +docs: ## build the docs on the host - EOF - eapply "${T}/disable_tests.patch" || die - } - -} - -src_compile() { - # For non-live versions, prevent git operations which causes sandbox violations - # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 - [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" - - tc-export AS LD STRIP - export GOMD2MAN="$(command -v go-md2man)" - default -} - -src_test() { - emake test-unit -} - -src_install() { - emake DESTDIR="${ED}" install install.completions - einstalldocs -} diff --git a/app-containers/buildah/buildah-1.35.3.ebuild b/app-containers/buildah/buildah-1.35.3.ebuild deleted file mode 100644 index 36648c2ae5a7..000000000000 --- a/app-containers/buildah/buildah-1.35.3.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module linux-info toolchain-funcs - -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah"; - -# main pkg -LICENSE="Apache-2.0" -# deps -LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" - -SLOT="0" -IUSE="apparmor btrfs +seccomp systemd test" -RESTRICT="test" -DOCS=( - "CHANGELOG.md" - "troubleshooting.md" - "docs/tutorials" -) - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/buildah.git"; -else - SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64" -fi - -RDEPEND=" - systemd? ( sys-apps/systemd ) - btrfs? ( sys-fs/btrfs-progs ) - seccomp? ( sys-libs/libseccomp:= ) - apparmor? ( sys-libs/libapparmor:= ) - >=app-containers/containers-common-0.58.0-r1 - app-crypt/gpgme:= - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-apps/shadow:= -" -DEPEND="${RDEPEND}" -BDEPEND="dev-go/go-md2man" - -PATCHES=( - "${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch - "${FILESDIR}"/softcode-strip-upstream-pr-5446.patch -) - -pkg_pretend() { - local CONFIG_CHECK="" - use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" - check_extra_config - - linux_config_exists || ewarn "Cannot determine configuration of your kernel." -} - -src_prepare() { - default - - # ensure all necessary files are there - local file - for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \ - hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do - [[ -f "${file}" ]] || die - done - - sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die - echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die - - cat <<-EOF > hack/apparmor_tag.sh || die - #!/usr/bin/env bash - $(usex apparmor 'echo apparmor' echo) - EOF - - use seccomp || { - cat <<-'EOF' > "${T}/disable_seccomp.patch" - --- a/Makefile - +++ b/Makefile - @@ -5 +5 @@ - -SECURITYTAGS ?= seccomp $(APPARMORTAG) - +SECURITYTAGS ?= $(APPARMORTAG) - EOF - eapply "${T}/disable_seccomp.patch" || die - } - - cat <<-EOF > hack/systemd_tag.sh || die - #!/usr/bin/env bash - $(usex systemd 'echo systemd' echo) - EOF - - echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die - cat <<-EOF > btrfs_tag.sh || die - #!/usr/bin/env bash - $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') - EOF - - use test || { - cat <<-'EOF' > "${T}/disable_tests.patch" - --- a/Makefile - +++ b/Makefile - @@ -54 +54 @@ - -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs - +all: bin/buildah docs - @@ -123 +123 @@ - -docs: install.tools ## build the docs on the host - +docs: ## build the docs on the host - EOF - eapply "${T}/disable_tests.patch" || die - } - -} - -src_compile() { - # For non-live versions, prevent git operations which causes sandbox violations - # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 - [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" - - tc-export AS LD STRIP - export GOMD2MAN="$(command -v go-md2man)" - export SELINUXOPT= - default -} - -src_test() { - emake test-unit -} - -src_install() { - emake DESTDIR="${ED}" SELINUXOPT= install install.completions - einstalldocs -} diff --git a/app-containers/buildah/buildah-1.35.4.ebuild b/app-containers/buildah/buildah-1.35.4.ebuild deleted file mode 100644 index 79687044616a..000000000000 --- a/app-containers/buildah/buildah-1.35.4.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module linux-info toolchain-funcs - -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah"; - -# main pkg -LICENSE="Apache-2.0" -# deps -LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" - -SLOT="0" -IUSE="apparmor btrfs +seccomp systemd test" -RESTRICT="test" -DOCS=( - "CHANGELOG.md" - "troubleshooting.md" - "docs/tutorials" -) - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/buildah.git"; -else - SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64" -fi - -RDEPEND=" - systemd? ( sys-apps/systemd ) - btrfs? ( sys-fs/btrfs-progs ) - seccomp? ( sys-libs/libseccomp:= ) - apparmor? ( sys-libs/libapparmor:= ) - >=app-containers/containers-common-0.58.0-r1 - app-crypt/gpgme:= - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-apps/shadow:= -" -DEPEND="${RDEPEND}" -BDEPEND="dev-go/go-md2man" - -PATCHES=( - "${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch - "${FILESDIR}"/softcode-strip-upstream-pr-5446.patch -) - -pkg_pretend() { - local CONFIG_CHECK="" - use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" - check_extra_config - - linux_config_exists || ewarn "Cannot determine configuration of your kernel." -} - -src_prepare() { - default - - # ensure all necessary files are there - local file - for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \ - hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do - [[ -f "${file}" ]] || die - done - - sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die - echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die - - cat <<-EOF > hack/apparmor_tag.sh || die - #!/usr/bin/env bash - $(usex apparmor 'echo apparmor' echo) - EOF - - use seccomp || { - cat <<-'EOF' > "${T}/disable_seccomp.patch" - --- a/Makefile - +++ b/Makefile - @@ -5 +5 @@ - -SECURITYTAGS ?= seccomp $(APPARMORTAG) - +SECURITYTAGS ?= $(APPARMORTAG) - EOF - eapply "${T}/disable_seccomp.patch" || die - } - - cat <<-EOF > hack/systemd_tag.sh || die - #!/usr/bin/env bash - $(usex systemd 'echo systemd' echo) - EOF - - echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die - cat <<-EOF > btrfs_tag.sh || die - #!/usr/bin/env bash - $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') - EOF - - use test || { - cat <<-'EOF' > "${T}/disable_tests.patch" - --- a/Makefile - +++ b/Makefile - @@ -54 +54 @@ - -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs - +all: bin/buildah docs - @@ -123 +123 @@ - -docs: install.tools ## build the docs on the host - +docs: ## build the docs on the host - EOF - eapply "${T}/disable_tests.patch" || die - } - -} - -src_compile() { - # For non-live versions, prevent git operations which causes sandbox violations - # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 - [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" - - tc-export AS LD STRIP - export GOMD2MAN="$(command -v go-md2man)" - export SELINUXOPT= - default -} - -src_test() { - emake test-unit -} - -src_install() { - emake DESTDIR="${ED}" SELINUXOPT= install install.completions - einstalldocs -} diff --git a/app-containers/buildah/buildah-1.36.0.ebuild b/app-containers/buildah/buildah-1.36.0.ebuild deleted file mode 100644 index 2dcea51820e2..000000000000 --- a/app-containers/buildah/buildah-1.36.0.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module linux-info toolchain-funcs - -DESCRIPTION="A tool that facilitates building OCI images" -HOMEPAGE="https://github.com/containers/buildah"; - -# main pkg -LICENSE="Apache-2.0" -# deps -LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0" - -SLOT="0" -IUSE="apparmor btrfs +seccomp systemd test" -RESTRICT="test" -DOCS=( - "CHANGELOG.md" - "troubleshooting.md" - "docs/tutorials" -) - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/containers/buildah.git"; -else - SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64" -fi - -RDEPEND=" - systemd? ( sys-apps/systemd ) - btrfs? ( sys-fs/btrfs-progs ) - seccomp? ( sys-libs/libseccomp:= ) - apparmor? ( sys-libs/libapparmor:= ) - >=app-containers/containers-common-0.58.0-r1 - app-crypt/gpgme:= - dev-libs/libgpg-error:= - dev-libs/libassuan:= - sys-apps/shadow:= -" -DEPEND="${RDEPEND}" -BDEPEND="dev-go/go-md2man" - -pkg_pretend() { - local CONFIG_CHECK="" - use btrfs && CONFIG_CHECK+=" ~BTRFS_FS" - check_extra_config - - linux_config_exists || ewarn "Cannot determine configuration of your kernel." -} - -src_prepare() { - default - - # ensure all necessary files are there - local file - for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \ - hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do - [[ -f "${file}" ]] || die - done - - sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die - echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die - - cat <<-EOF > hack/apparmor_tag.sh || die - #!/usr/bin/env bash - $(usex apparmor 'echo apparmor' echo) - EOF - - use seccomp || { - cat <<-'EOF' > "${T}/disable_seccomp.patch" - --- a/Makefile - +++ b/Makefile - @@ -5 +5 @@ - -SECURITYTAGS ?= seccomp $(APPARMORTAG) - +SECURITYTAGS ?= $(APPARMORTAG) - EOF - eapply "${T}/disable_seccomp.patch" || die - } - - cat <<-EOF > hack/systemd_tag.sh || die - #!/usr/bin/env bash - $(usex systemd 'echo systemd' echo) - EOF - - echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die - cat <<-EOF > btrfs_tag.sh || die - #!/usr/bin/env bash - $(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion') - EOF - - use test || { - cat <<-'EOF' > "${T}/disable_tests.patch" - --- a/Makefile - +++ b/Makefile - @@ -54 +54 @@ - -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs - +all: bin/buildah docs - @@ -123 +123 @@ - -docs: install.tools ## build the docs on the host - +docs: ## build the docs on the host - EOF - eapply "${T}/disable_tests.patch" || die - } - -} - -src_compile() { - # For non-live versions, prevent git operations which causes sandbox violations - # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493 - [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" - - tc-export AS LD STRIP - export GOMD2MAN="$(command -v go-md2man)" - export SELINUXOPT= - default -} - -src_test() { - emake test-unit -} - -src_install() { - emake DESTDIR="${ED}" SELINUXOPT= install install.completions - einstalldocs -}
