gentoo auto-resync : 19:11:2023 - 05:02:03

5 files changed, 18 insertions, 98 deletions

diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 8280853b3815..72f437584e96 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,10 +1,8 @@
 DIST buildah-1.30.0.tar.gz 15623786 BLAKE2B e0b2f6d26827cfe40f88a9915f12b6acb385fbd576fa227d4fee02c162077e9c6fe0591c7171405f5645cd06e4068f26e17c2cb963898e38cfbdd61abe68dae2 SHA512 185fd98a59fa8d86fe9f1eadc9b7591e5053674464be10538a7581d8e1f6a25e5032a354c821c32a167e2864acea010243efbbe4f5a4205d8eaa2894f062a25b
-DIST buildah-1.32.0.tar.gz 18445843 BLAKE2B d7471e3f0733bc626f665c592701666ba41732eb53bf4679da7e9e28dad388532ab8c88e86db553790ced7822168fd6388dc08121e1456404f18a5d96017da60 SHA512 7c61141e43ea2f968a50b4c5ae6b69c2b9734a19774c7ca48bc942b900ca55ec381ac93fdf04f08061640a457551a9e03a45a37d22cb94b34cecded192dced8f
-DIST buildah-1.32.1.tar.gz 18452695 BLAKE2B b4f3644a046d0dd96555b810e488ea78dc396692e539978856fbc2b22010bce3ed9f578949e8de02579325fa59e00fba59908724952b8c323889c816ae4f1af6 SHA512 e5c59f158b786809c89465361a662211bbef6bb4c27c79490604923d924c2030398a0878b122b246b02ae246bd977b7ccffdc6de4f06e80f096c2921c34bf04a
 DIST buildah-1.32.2.tar.gz 18451694 BLAKE2B 885b940e804394d18451e5dce3e3af4097a8adf01e59d7a288dda7063a888759abd9a5c18d8f4522709c7d296fc9a2b5d61229143f3545a786dc59ac837214e2 SHA512 3a50e53e047aa0e23643d8751af1fb51a83fd51e5440111432eb34bdb07e95f24676a917b54409c223df444fe123c8df4aa9af435737cfdd02d0eda0d3f5bba1
+DIST buildah-1.33.0.tar.gz 18632278 BLAKE2B f5984aa01fbe4957de07c5925795ceb106af07fc05f2f772ff8a5812f8ebcc5b9e86ec1d2f04bda5fa0e264a1c904f74a6e8795e1af8a0dbe9e1dabfe5832bc9 SHA512 926c748bd9dbbaf86e266dec778ecf31c65c58016f09ae8b6f9e570a6603fd9c6fc72db4b8c371e999ecb4e1a2cb2429082da66bd8069916652318a0362b40da
 EBUILD buildah-1.30.0.ebuild 1196 BLAKE2B eefce023ce7e2662b1598fb3f6d5b885816d54a6397a788e10851b7ccc174ae6d9e4fa4ec387d3a21a7fdff4670ee68bfb59e9171e76032c3c28882d164cc446 SHA512 3c139484015e3e85c8f891babb375c560c3fc3e1827a44862eb262f95b8654a2c8d2a3c4102d3081c3a3677f20c0c5371a6579e9c0e1adfa339e5198475c357b
-EBUILD buildah-1.32.0.ebuild 1958 BLAKE2B 20b9c0182b44e0a96891dc95f3ecb36a1a0bfc217c41eac2d8e613e35d54533ee3aa3bfc6314998350d5460f3a924282fab0b537dcc1fa3c9bef43be3a687819 SHA512 26cb4c1a9545c53a4c29021f672d844dd4ca6861aa0fc25b57b128798b2d19b72739ba77c6cc13c89a63f9089a7e56833dfb407e28de44b4cd0b19b9e70f4bdf
-EBUILD buildah-1.32.1.ebuild 2734 BLAKE2B 4b6d0c38e38efeb505f56e3e4b59a770d1d068d01021aa27b4b968d857ae18e8f052dd28e8369cd2d44f5e1e1c5f7256f554aec723ae322152b46bac9a950169 SHA512 0480b51867415728f852e3f3714f037361f54d1a98ebd5be60d2d69b0ba652aee63538ec648f833679394f96c3e02cdcf914b77e094e2773e7cd18f3eed1658a
 EBUILD buildah-1.32.2.ebuild 2918 BLAKE2B 89f20f481c3f35b29175f7544214be1259d36ddeb4096a7e89418d5d0d40d48435c26caa146cd07ce1e47d9da3c86b5e9ddc52fec2e0bab7936f222e065f4cc1 SHA512 099c0c6bee12574558f630f98a94e482cdea04310d6bd6bfea82e470efcb9e000146d57620965b1ae580d4766e1f34b8f9946edbd1903e28b82a6d0f748c3f80
-EBUILD buildah-9999.ebuild 2918 BLAKE2B 89f20f481c3f35b29175f7544214be1259d36ddeb4096a7e89418d5d0d40d48435c26caa146cd07ce1e47d9da3c86b5e9ddc52fec2e0bab7936f222e065f4cc1 SHA512 099c0c6bee12574558f630f98a94e482cdea04310d6bd6bfea82e470efcb9e000146d57620965b1ae580d4766e1f34b8f9946edbd1903e28b82a6d0f748c3f80
-MISC metadata.xml 721 BLAKE2B bcce737e131e4e85a37129361dd5c1d33e170e3a8630369f4394bb81d4ddb1f784459bfa2fbd72f970c2fc86a1145e63a4c965d537b97271d8a6342f0c691a8c SHA512 54f7e1721775e8b08e90ea43ea50aef5ef9a6e2f4cabf1783e539e886b891b358376ff48e53bbcb07880c90141eee80e832b19cdd8c37099c490f02a1c2784a3
+EBUILD buildah-1.33.0.ebuild 2909 BLAKE2B 1bd072e376d43d94301c5b5ead70c2036cb15326bdbcc5d862641457a4a91d3fd9c12ca5c7d1921b6a1622370076d5eff58c962abb541a3cc8ea590512e64909 SHA512 5f4232178cd668a54127a2e7f3ed87012279e0379c07951664ecaa0bfa8f443db9a86b8456db02b33a2ed5e6c46adad2889b2c00a5d618e3d0590991d9cb232a
+EBUILD buildah-9999.ebuild 2909 BLAKE2B 1bd072e376d43d94301c5b5ead70c2036cb15326bdbcc5d862641457a4a91d3fd9c12ca5c7d1921b6a1622370076d5eff58c962abb541a3cc8ea590512e64909 SHA512 5f4232178cd668a54127a2e7f3ed87012279e0379c07951664ecaa0bfa8f443db9a86b8456db02b33a2ed5e6c46adad2889b2c00a5d618e3d0590991d9cb232a
+MISC metadata.xml 718 BLAKE2B 8a075660ff80fd4dddf223b5f5fbe42b1d32febfbd67cd6e52bc750958209d4b24c6f42e62e65d3efa771eb171378f4a869ce20566b2d9abae03546c149c6351 SHA512 cad4369d24640e41ccc6427260733681631cef23250fd6f5fe2e50af778ca0cae31cb7b4498f24e08e0ad1051340b801f18f4da035850172bb15e34fe6ae8e16
diff --git a/app-containers/buildah/buildah-1.32.0.ebuild b/app-containers/buildah/buildah-1.32.0.ebuild
deleted file mode 100644
index 99b52da91893..000000000000
--- a/app-containers/buildah/buildah-1.32.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info
-GIT_COMMIT=2326d49
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="btrfs systemd doc test"
-RESTRICT="test"
-
-DEPEND="
-	systemd? ( sys-apps/systemd )
-	btrfs? ( sys-fs/btrfs-progs )
-	app-crypt/gpgme:=
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-apps/shadow:=
-	sys-libs/libseccomp:=
-"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	local CONFIG_CHECK=""
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	check_extra_config
-
-	if ! linux_config_exists; then
-		ewarn "Cannot determine configuration of your kernel."
-	fi
-}
-
-src_prepare() {
-	default
-
-	[[ -f hack/systemd_tag.sh ]] || die
-	if use systemd; then
-		echo -e '#!/usr/bin/env bash\necho systemd' > hack/systemd_tag.sh || die
-	else
-		echo -e '#!/usr/bin/env bash\necho' > hack/systemd_tag.sh || die
-	fi
-
-	[[ -f btrfs_installed_tag.sh ]] || die
-	[[ -f btrfs_tag.sh ]] || die
-	if use btrfs; then
-		echo -e '#!/usr/bin/env bash\necho btrfs_noversion' > btrfs_tag.sh || die
-	else
-		echo -e '#!/usr/bin/env bash\necho exclude_graphdriver_btrfs' > btrfs_installed_tag.sh || die
-	fi
-
-	if ! use test; then
-		cat << 'EOF' > "${T}/Makefile.patch"
---- Makefile
-+++ Makefile
-@@ -54 +54 @@
--all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
-+all: bin/buildah docs
-EOF
-		eapply -p0 "${T}/Makefile.patch"
-	fi
-}
-
-src_compile() {
-	emake GIT_COMMIT=${GIT_COMMIT} all
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	use doc && dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
-	use doc && dodoc -r docs/tutorials
-	doman docs/*.1
-	dobin bin/${PN}
-	dobashcomp contrib/completions/bash/buildah
-}
diff --git a/app-containers/buildah/buildah-1.32.1.ebuild b/app-containers/buildah/buildah-1.33.0.ebuild
index ffbc1878df1b..09a8f30b55b0 100644
--- a/app-containers/buildah/buildah-1.32.1.ebuild
+++ b/app-containers/buildah/buildah-1.33.0.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 	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:=
@@ -43,9 +44,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-export COMMIT_NO=bfd436d159059b45d770a0fc62386c9e0b9bdbb1
-export GIT_COMMIT=${COMMIT_NO}
-
 pkg_pretend() {
 	local CONFIG_CHECK=""
 	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
@@ -64,7 +62,7 @@ src_prepare() {
 		[[ -f "${file}" ]] || die
 	done
 
-	sed -i -e "s|/usr/local|${EPREFIX}/usr|g" Makefile docs/Makefile || die
+	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
@@ -107,12 +105,20 @@ src_prepare() {
 
 }
 
+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="${D}" install install.completions
+	emake DESTDIR="${ED}" install install.completions
 	einstalldocs
 	use doc && dodoc -r "${EXTRA_DOCS[@]}"
 }
diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild
index 819e3535fea9..09a8f30b55b0 100644
--- a/app-containers/buildah/buildah-9999.ebuild
+++ b/app-containers/buildah/buildah-9999.ebuild
@@ -62,7 +62,7 @@ src_prepare() {
 		[[ -f "${file}" ]] || die
 	done
 
-	sed -i -e "s|/usr/local|${EPREFIX}/usr|g" Makefile docs/Makefile || die
+	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
@@ -118,7 +118,7 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install install.completions
+	emake DESTDIR="${ED}" install install.completions
 	einstalldocs
 	use doc && dodoc -r "${EXTRA_DOCS[@]}"
 }
diff --git a/app-containers/buildah/metadata.xml b/app-containers/buildah/metadata.xml
index 02ed3dfe2380..39a06aa24f30 100644
--- a/app-containers/buildah/metadata.xml
+++ b/app-containers/buildah/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Zac Medico</name>
 	</maintainer>
 	<maintainer type="person" proxied="yes">
-		<email>rahil3108@gmail.com</email>
+		<email>me@rahil.website</email>
 		<name>Rahil Bhimjiani</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">