gentoo auto-resync : 18:12:2023 - 07:50:03

5 files changed, 129 insertions, 2 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index dae61bba8819..e5ca93ddb7b2 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 9b35c74579c2..b08e3f88f832 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -3,9 +3,11 @@ DIST buildah-1.30.0.tar.gz 15623786 BLAKE2B e0b2f6d26827cfe40f88a9915f12b6acb385
 DIST buildah-1.32.2.tar.gz 18451694 BLAKE2B 885b940e804394d18451e5dce3e3af4097a8adf01e59d7a288dda7063a888759abd9a5c18d8f4522709c7d296fc9a2b5d61229143f3545a786dc59ac837214e2 SHA512 3a50e53e047aa0e23643d8751af1fb51a83fd51e5440111432eb34bdb07e95f24676a917b54409c223df444fe123c8df4aa9af435737cfdd02d0eda0d3f5bba1
 DIST buildah-1.33.1.tar.gz 18635429 BLAKE2B 93883b02e6b790c029b03dd3ebb5f0d7c8e184989c987034cd429ea804d17b275a2b81c9f37bbaff1a54367bb93a9b0870af86293aa0332c3ccac1bbb6a750fe SHA512 4abab105f6b242dc38e443b53b6c0c90fd7897bceb6b491fd067cd56767616a3df4005bc0bd0d10f217df2e6716cf950d8662788b110929a826660f29516703e
 DIST buildah-1.33.2.tar.gz 18580150 BLAKE2B 523b75974a27695bbf818f4a1499d15e48e254934549f2ae191f462334aa4dd34a60c82b78b0d3351e05b297a40a8f8e2df94e75d22779a5c042dbd3dd307e4a SHA512 574c1a249d93edd5f89e106cd192da94235edcff097d9bce841e3b3b3a9588029deddaceb301505114b994e854016c72090cc0016a00ef027b25f3672a3fab32
+DIST buildah-1.34.0.tar.gz 18751419 BLAKE2B 6584c5234e849f9b8cde5e4188791024c8ac5c0ba85859e289f3eb2ec32f97f722ebf25f1291f29e14edf4adc14e19d6a6a76630c820085e9f345736aeb3d4eb SHA512 a3836ce540058f418131969e157d548864727398535e4e99a693d883419b8d764da7166f9b9376c2b9686d8beac101687843c2e93198b16328ef333ad96d55db
 EBUILD buildah-1.30.0.ebuild 1196 BLAKE2B eefce023ce7e2662b1598fb3f6d5b885816d54a6397a788e10851b7ccc174ae6d9e4fa4ec387d3a21a7fdff4670ee68bfb59e9171e76032c3c28882d164cc446 SHA512 3c139484015e3e85c8f891babb375c560c3fc3e1827a44862eb262f95b8654a2c8d2a3c4102d3081c3a3677f20c0c5371a6579e9c0e1adfa339e5198475c357b
 EBUILD buildah-1.32.2.ebuild 2916 BLAKE2B cb1f1303a4fa575efe0cb997081e6fa3d0d5de9d92fbc01b275adcb02a0e2fada75a095b63a15dd25f11d29db6c06b63352c50e9b19e95fbe4f22f56e0a8622d SHA512 c40613b2003eaea9983fbfbb648be24f009e2f854fadd784db4a8633871f26dbc8863f5f1ac4be4d6f942031c8e7f24bd663911869205639cfb3c99e992b13d5
 EBUILD buildah-1.33.1.ebuild 2969 BLAKE2B 66ed4c6dc4b0f221b599219ce6b8f921db416befb0d0ce7009cedae3a798e49baabd381402cef9f294733888d47c03dc7fbc7144ed761fad633bf83f1c853453 SHA512 d4e572bbd3a54fb26c4b35e0127498610c83c5945e8f87f843b63376b62b81e797244987fc393d86fbf2992c746c1910941649e5963e9d5b5dab52219f3e7b84
 EBUILD buildah-1.33.2.ebuild 2970 BLAKE2B a0fcc79cd1cc18807a53204f5c1212a3ff64603b4799cafd4ae73d7301f977e2cda942b1e894ee4853ef77e0892822c9edb744bc4bcb88cfb0ca160902265272 SHA512 8600cb37fbccbd5d39f9cfa3d3213a5705367808b04b6308869c336279993fff5c5347d5af0aa66a9e4912e6be8151491df5a00e255b99b3b95460c25c53b2a7
+EBUILD buildah-1.34.0.ebuild 2910 BLAKE2B 5404bfec930d2b0867255f716d91ce2925be49ea07a79343670d4400eb323dc0b552ff5792d63d839e0b1b1cc4b6daaab701e568f1c5a81328233ddb8e637010 SHA512 c4c7a4cce89ac13185f05c401eec0b895875baf0e38d9a077357d9bef9d749edb59cf020cd68149eea77fddcb89e8464769ef3d000ded2bcdc6af03fc36fd06e
 EBUILD buildah-9999.ebuild 2910 BLAKE2B 5404bfec930d2b0867255f716d91ce2925be49ea07a79343670d4400eb323dc0b552ff5792d63d839e0b1b1cc4b6daaab701e568f1c5a81328233ddb8e637010 SHA512 c4c7a4cce89ac13185f05c401eec0b895875baf0e38d9a077357d9bef9d749edb59cf020cd68149eea77fddcb89e8464769ef3d000ded2bcdc6af03fc36fd06e
 MISC metadata.xml 718 BLAKE2B 8a075660ff80fd4dddf223b5f5fbe42b1d32febfbd67cd6e52bc750958209d4b24c6f42e62e65d3efa771eb171378f4a869ce20566b2d9abae03546c149c6351 SHA512 cad4369d24640e41ccc6427260733681631cef23250fd6f5fe2e50af778ca0cae31cb7b4498f24e08e0ad1051340b801f18f4da035850172bb15e34fe6ae8e16
diff --git a/app-containers/buildah/buildah-1.34.0.ebuild b/app-containers/buildah/buildah-1.34.0.ebuild
new file mode 100644
index 000000000000..4b4a54c71ba9
--- /dev/null
+++ b/app-containers/buildah/buildah-1.34.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2023 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 doc test"
+RESTRICT="test"
+EXTRA_DOCS=(
+	"CHANGELOG.md"
+	"CONTRIBUTING.md"
+	"install.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
+	use doc && dodoc -r "${EXTRA_DOCS[@]}"
+}
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index aec45c23b136..ce04f20bd375 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -4,12 +4,12 @@ AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690ca
 AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B 9f02e58c06b507a294207c66bd5ea218f87803a9b9f0ddafc86a8b21df912589357adf054302e5a69d300155bdf8dcd8b77c18c1ddf8a4042ae1f05de5faf46d SHA512 e507e3a52d2f5f48b65fdb77ceaa095f13fda3e834dafc976bcd291cb35755da879c9c99b7950b2905399dedf4ac3370bd70462343648613a7c6aedc141d7ef7
 DIST podman-4.5.0.tar.gz 17423692 BLAKE2B ba28e77626bb4bcdb85b20031e12cf93f2eb3174b678cb8e99557df13e2cdf377ea402eb373a51ea44302f878f8e1cdedda14a2f3ad8c9e88895754fc50c272e SHA512 8a699dc01fc3d7c4a9e5ef4f166170303fc30e0f6695c61f763944e1cb755e75896108e0c4166d184fe49e3a6859f045aa3883047ebba9290e851fc128d77cac
 DIST podman-4.7.2.tar.gz 20554551 BLAKE2B a53bbe6b21145ab394b4a9bc540d4335ca6cdd0e0a98e741e5cfb8aa19aaeb2801ca8d117d42b0d66f618018a2d4b1d736fc851b58b661cbae6ee815712fb936 SHA512 1873a158f2e0527b6e57929f391c4ea5adee5fba33e861eb7744cd0ac845f7296f6149b5e824142e701e5b4db95466585206f37402298301f99cc40b781a51ba
-DIST podman-4.8.0.tar.gz 21565805 BLAKE2B 830d24033b9ca21b404f67ec8d58b843430410493dd40ceb95ccbcbae761c421f41ea51b7d535c625ddeebb6df6e6ee9ade5613b244397c0da3edb214e5de8fb SHA512 2178a9c8428a0cf2c402e0f299efe2ad9a797143e641a92438112694a4acbdfb69ba8c104c87f4763d001f17cedb709eef24d86460d095a61a64d29a168a2051
 DIST podman-4.8.1.tar.gz 21569190 BLAKE2B ea142f6ee120008c96fa1edef9be9a22cd846483f37a42ce3e5755aefcc5d9ee0c22b85edc7677e4bc6e4416870d8a45b382018865170fa922e97700504d4682 SHA512 a9188b81d4f4babb04c5a44d8a3aefb73c5d8f53d056d32c5c8563f296e27fa4f4b60f6c8581bebb7ee47c3f760743fd386211906ef0a88249f78256b24a4764
+DIST podman-4.8.2.tar.gz 21561815 BLAKE2B 7e922f0c7efdd359793891895977662793f400cc54802f56a75e9acc9c7dedf3da4fb10212fb54734edcf9eba28219c4c6de875f002085c0a47cb50c9c41cd53 SHA512 4ad4d03010fc706bb53de4d5de4779f0f32f623cda301f5bbcfd9d2e8f443f2955d2c8b9278f4741aad72498e87081475a53d5e5b1ce8a28035e18aa6d5acb0c
 EBUILD podman-4.5.0-r1.ebuild 4166 BLAKE2B 94f8f30f755c9fff8975bb3abb883e285587fde977c1f37917d3e6cefd0be27b8d1c88b595fd803ec19c70744aa532c2919b23b7b28700a0c8d4e071f514af63 SHA512 b85d481ba927771f769d93bce9928cb97031c14ba1a1a9e95f1eec07284291cd500d51b5f174bb6a03405909e06ce0491172e863e15420bea5fc39cfa05c871b
 EBUILD podman-4.5.0.ebuild 4939 BLAKE2B bf6c2708e30d5d505f7010befbbce321ee78fd525cbd16523b95dcabf744b2c0f9bc0d15dcd2547660b2791bc3ec6b5bbff188463a74e3df330961129985a133 SHA512 0980613932f7a549ccb324b8597250ca004d9ffc768e79a6a2d0f6fa28048e777b98efa91332d48ebd57c9c83e0c4a8c5d06fa988c3e64393e052c94af256dba
 EBUILD podman-4.7.2.ebuild 3605 BLAKE2B 6f055c191d3fb4e39394e48d9c7370eaf014db6a0cd8f1b11b89750ec93287b7e294abee9d11c613763e1b2ef19b5ee1a84eaa35281401371f1fdbede8fb5bb3 SHA512 6d28c69cdd85f26e0b72ffd984e67227722a2cd31234833e77c263d646de9b66074506412d4b95264f0d729da157a287f26b3bcdbb87f95802ad903854bb2f9c
-EBUILD podman-4.8.0.ebuild 3644 BLAKE2B ac04302a9c2da6e897b7b000b3578979e97cb9aec9ff778f6662811a019d3a1a2a191a458eb2f084df71e3a038d50c55f4f36da226e1565825385a1ef006d6e9 SHA512 4c469f14741cb925ba672eaa84f381a2375ac5fb6d5f7c9d1cad7a714618e99988c5cdd9a2ed63e12a54b7a3da45228aefd6bd2bd5b3ba99ec87064c87d5c73e
 EBUILD podman-4.8.1.ebuild 3644 BLAKE2B ac04302a9c2da6e897b7b000b3578979e97cb9aec9ff778f6662811a019d3a1a2a191a458eb2f084df71e3a038d50c55f4f36da226e1565825385a1ef006d6e9 SHA512 4c469f14741cb925ba672eaa84f381a2375ac5fb6d5f7c9d1cad7a714618e99988c5cdd9a2ed63e12a54b7a3da45228aefd6bd2bd5b3ba99ec87064c87d5c73e
+EBUILD podman-4.8.2.ebuild 3644 BLAKE2B ac04302a9c2da6e897b7b000b3578979e97cb9aec9ff778f6662811a019d3a1a2a191a458eb2f084df71e3a038d50c55f4f36da226e1565825385a1ef006d6e9 SHA512 4c469f14741cb925ba672eaa84f381a2375ac5fb6d5f7c9d1cad7a714618e99988c5cdd9a2ed63e12a54b7a3da45228aefd6bd2bd5b3ba99ec87064c87d5c73e
 EBUILD podman-9999.ebuild 3644 BLAKE2B ac04302a9c2da6e897b7b000b3578979e97cb9aec9ff778f6662811a019d3a1a2a191a458eb2f084df71e3a038d50c55f4f36da226e1565825385a1ef006d6e9 SHA512 4c469f14741cb925ba672eaa84f381a2375ac5fb6d5f7c9d1cad7a714618e99988c5cdd9a2ed63e12a54b7a3da45228aefd6bd2bd5b3ba99ec87064c87d5c73e
 MISC metadata.xml 1752 BLAKE2B 614035afc57cf9a567b96891d1f14451dc1e564a6764f6e2bcf099729f7ed5dd54ab966870e33d07c49a74084b9b3d8bd286512585d6302ac49f8d389122ffd6 SHA512 bf28d859db0962963147a9ce777f6b38c16e253d818adf131d4c8dfe631a703e8631e93bd06906e7cefdc9a483832776acd29c6876b689fc89e7bbee39916aeb
diff --git a/app-containers/podman/podman-4.8.0.ebuild b/app-containers/podman/podman-4.8.2.ebuild
index e71d643e48de..e71d643e48de 100644
--- a/app-containers/podman/podman-4.8.0.ebuild
+++ b/app-containers/podman/podman-4.8.2.ebuild