gentoo auto-resync : 23:03:2024 - 13:01:09

5 files changed, 132 insertions, 11 deletions

diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 323d315c29a0..02ffc39411cb 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,12 +1,14 @@
 DIST buildah-1.33.5.tar.gz 18579521 BLAKE2B a59bfda3dea1f588a2f77a26b942da6ae02a00f1169008f776a2d7699b6b14f38ab29b46b7d0651e9fff3f007e5f95caed99952cc7585c25ea2a3153402958e9 SHA512 82ddfacd69918fb4ca8110d7d5279f4075385e5db5b64b58cf41a90c47e16093f1e65d8ef20136a4cd8f5c23ea8da7f35fb72581cec6472497b9c5b458023e9c
 DIST buildah-1.33.6.tar.gz 18585405 BLAKE2B 4a6f6ebfce7799a45b0984b6f9a319becfed87d5acf5f1f784249ff6e5397495ac72c00a22ff0bcc68fd94f1d0a591fa4ac5f0f88bcc9c0a6cdefe117166b4ec SHA512 86eab18af459b0b92361d6e9f56ebe9dab65527d829e7771c13b6c574ef45746a7f53520783ff52978b14aac0d6ee8de32cdabf807666a96dcf46e07e36157e2
+DIST buildah-1.33.7.tar.gz 18604354 BLAKE2B d2788096d8d6fd6cc528e8f33edc577778a2775a561ea3c4a983eb4a6fa1d5b570f6d8dc0f77e464d0c242add5d641e20afce83c9f5157021fbc82a009ea47c9 SHA512 1248ad1dcf0d10608674543caf4d78f5052db7932102226e23b73add5e129bd8c614672f3d06aa8052675dd83fa83ef2742ef08fe1a883037b41df8fde893ea1
 DIST buildah-1.34.0.tar.gz 18751419 BLAKE2B 6584c5234e849f9b8cde5e4188791024c8ac5c0ba85859e289f3eb2ec32f97f722ebf25f1291f29e14edf4adc14e19d6a6a76630c820085e9f345736aeb3d4eb SHA512 a3836ce540058f418131969e157d548864727398535e4e99a693d883419b8d764da7166f9b9376c2b9686d8beac101687843c2e93198b16328ef333ad96d55db
-DIST buildah-1.34.1.tar.gz 18838539 BLAKE2B de11f64a54fa24c8aa543dd44e6a3fca9df62eecf39541fa37c22a2dc64560d056f638a6b1f8aa564a09f0594a5e7150ef14fd9ab8cc61390dc6d7d8afa5545b SHA512 2d229ead1149b66d1b7d91f596809e97e5316356ab0997ea335eb3e246ed8bc6879e0e260bb478b4d7ec7c42c7dbf33d0e91086a34e89a3b79eb27322da06c1e
-DIST buildah-1.35.0.tar.gz 19353483 BLAKE2B 806c098d557480b6d6e92e6da61c32e48dfd6c1bfa4926a2871a8f41a3ef5f35d91381e51d33636a892bce930eabfda509e97e9efa60ba5c4feab75781d027ee SHA512 b4dd30b4d8087bbd0bbfd9a7b9791afc015a0c489041b38d6b6241df27a97286083dcf7b25102ce1fa1080265378442be73313e301c22660f21d8e4f39bb3aa4
+DIST buildah-1.34.3.tar.gz 18856476 BLAKE2B c91c995a2ff4be8b4e84a70c581a817cb2f1333b08ca297163d218f80d538905c41718cfc267c03173330234c3476344be44df799eaaac891395a22bc7a020b3 SHA512 26d5c48cb5b056a274c1a9c6820a6076337f625fc6dd6683000db871f3de9d37907bd962ced3400334bfc230718219cda2108e2e984be5f8c76ecfa4a2f1e1ac
+DIST buildah-1.35.1.tar.gz 19349661 BLAKE2B 31b633f35f937364816dac65e7a801676043630bc3c00ac445ad67afea04142748f76c4aed16690aa990e2c15ed220bdb42b96c6dd9bb0dac9c9d16fc2a27ddc SHA512 3e5af28b3d45e51674d08bef9a92cd64589026d9c6ebee51156738151681395860e372bba2667815e0f90e37984eb9dfdc9b8ad0675b62c8751582b29485d159
 EBUILD buildah-1.33.5.ebuild 2909 BLAKE2B 661fe0713bc3359843c53397d1b5b0cf4fb90e953699c302d3dd00aa0fc3ea4e6885e31d076f91924d47f99fad87e5b309f450be1e04f9c37a2b5b22bc562ea7 SHA512 2728c95830caea275f18063fd2ff3b41b958a8b3b6b94bc7db6a488ae9c0e0a5f57d65c332740efb29afd31e91c934250e8c8b9953a95891ffb6ce34e3cafdba
 EBUILD buildah-1.33.6.ebuild 2909 BLAKE2B 028314b5c62013ce5ebd147a45944e5e27f2150ad51f2fc566c5ebe45a64ad78ea068962b41dbb5fb657312bf5a48f06e75a920b0f9a4190a06c0b96f7ce02c8 SHA512 48e37433580225f5dbaccbdb2748d7e9715793692c5a2a570ef7cfafcb1994d72583b1bba46c17d81bc5e53603f9ea8f2ac5d8fdcde7377641dd58d08d1040ac
+EBUILD buildah-1.33.7.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
 EBUILD buildah-1.34.0.ebuild 2910 BLAKE2B 005d1365c73b062d304f8cc729af70d27cb7ab8d74d94799ec7d4a5d293bf3cc2a436ec6d05de539f72c8c1af019ed3cc67312d67276ae5e611cb0e9893e1da8 SHA512 f7f3594f3c75db2fe2ea40645d398b64662d804a22510b22f3cc386b9827e3ce51fc4ee89230495454bc7783ae43185ddd576b85bf3433f29db345d04766c7b5
-EBUILD buildah-1.34.1.ebuild 2910 BLAKE2B 77283c1f12db741d30099b6f9a500a2fb2c5669b8d2241c044962b5caf278ff66a4d9f74531dcb656caa164af5b61d010e12237950f49c5fa4d74ee105a4c418 SHA512 ed979f1b6c25cc5a6b050586ef34127544e491ece492d94cf9311c68846bba4b9520201841f4009a48b31e60e62694d37036d052048e1bec17eaedc28272dec0
-EBUILD buildah-1.35.0.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
-EBUILD buildah-9999.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
+EBUILD buildah-1.34.3.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
+EBUILD buildah-1.35.1.ebuild 2827 BLAKE2B b810fee44fea3dd57934f408c78166e6976ba0c340599799d523341f9b60654a5e5c114a3ad412f840d87aafb95f0a15d3fef0218503493966d56405d4d51594 SHA512 b79b8bec1a0330a89b2f9975003f550fa085ffbee1b022c10f8c009ffbdda8e6d555802ab06de2126c5c864c1e0a80e92efd9c000a92b475a07ff5b0c8e8eb49
+EBUILD buildah-9999.ebuild 2839 BLAKE2B 79a7a6a23ac0cb736e361deeaeb850bf379baef028f75db6907ba978b7411b5468ada1cfee018a8abddf0604727b02beb6c8d685c6ee53d8a95698d0aaf66134 SHA512 09a1b7d2fbd2daa47ccd8fe6bc6adff24b5c91e98dfbb05f6368392b5a321d54d9d9e42bfd5961df72c1ce15e3f75564d11d0b2c95db79d38c7641e565fb05e0
 MISC metadata.xml 716 BLAKE2B 8d1868e48306b5ded8700bcfde93d2a0d1a4afedc5440781355f0645b5f71e5a80569be4b14ab459033c5ec7cf5f02eb49e3948154274ad09b088e09d8ac5069 SHA512 b8a7e951a5342ad1a32f650ab21d373c3afa86d482463d87dad5db0e6e715e3d4bde7642b75f68da7f5b4a7e935953ce2ac41affb66724e7882f75f97dfde023
diff --git a/app-containers/buildah/buildah-1.35.0.ebuild b/app-containers/buildah/buildah-1.33.7.ebuild
index 8d0698568fd3..8d0698568fd3 100644
--- a/app-containers/buildah/buildah-1.35.0.ebuild
+++ b/app-containers/buildah/buildah-1.33.7.ebuild
diff --git a/app-containers/buildah/buildah-1.34.1.ebuild b/app-containers/buildah/buildah-1.34.3.ebuild
index d5fd4e7a796e..8d0698568fd3 100644
--- a/app-containers/buildah/buildah-1.34.1.ebuild
+++ b/app-containers/buildah/buildah-1.34.3.ebuild
@@ -14,12 +14,10 @@ LICENSE="Apache-2.0"
 LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 
 SLOT="0"
-IUSE="apparmor btrfs +seccomp systemd doc test"
+IUSE="apparmor btrfs +seccomp systemd test"
 RESTRICT="test"
-EXTRA_DOCS=(
+DOCS=(
 	"CHANGELOG.md"
-	"CONTRIBUTING.md"
-	"install.md"
 	"troubleshooting.md"
 	"docs/tutorials"
 )
@@ -121,5 +119,4 @@ src_test() {
 src_install() {
 	emake DESTDIR="${ED}" install install.completions
 	einstalldocs
-	use doc && dodoc -r "${EXTRA_DOCS[@]}"
 }
diff --git a/app-containers/buildah/buildah-1.35.1.ebuild b/app-containers/buildah/buildah-1.35.1.ebuild
new file mode 100644
index 000000000000..8d0698568fd3
--- /dev/null
+++ b/app-containers/buildah/buildah-1.35.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info
+
+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}"
+
+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
+		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=""
+
+	default
+}
+
+src_test() {
+	emake test-unit
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install install.completions
+	einstalldocs
+}
diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild
index 8d0698568fd3..e8ee0949a819 100644
--- a/app-containers/buildah/buildah-9999.ebuild
+++ b/app-containers/buildah/buildah-9999.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	btrfs? ( sys-fs/btrfs-progs )
 	seccomp? ( sys-libs/libseccomp:= )
 	apparmor? ( sys-libs/libapparmor:= )
-	app-containers/containers-common
+	>=app-containers/containers-common-0.58.0-r1
 	app-crypt/gpgme:=
 	dev-libs/libgpg-error:=
 	dev-libs/libassuan:=