7 files changed, 106 insertions, 2 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index fc57cc41d7cc..bf2b45f66bd0 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest
index 5841903a6c3f..a5e17353cdf3 100644
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@@ -1,6 +1,6 @@
 AUX apptainer-1.0.2-trim_upstream_cflags.patch 1142 BLAKE2B 7238229b70a8ac37f3401a163d19dc705adb6a4ab6355e4eaa386ad5c639bfc1443cf61507112a53b66816399ca5fe2c32de964dd602ea16c5dfbf9003343f8c SHA512 1351ee000274567bb5a63aa740fbc43510d84ccad42c9af0c555943b99d93d86a2b036801c1681b93548a874bda1bab3304c2bf0da83bbca102a71e82574a032
 DIST apptainer-1.1.2.tar.gz 12896912 BLAKE2B 29a8df78617661e0a181955942e8321c112a69efaf15f4bb3e1563cc0789197916a3be1eb5396fb608d57b0edd5d5de2a70a2bda935095d8d511410660ebc106 SHA512 3fad253379a87ea790f22a14aec703296f606255d4ce847454a59f9dba0b9a6fc449489e7760c4696c1df90fc6abec198934310c1b762e33a83c72cafc7cb370
-DIST apptainer-1.1.5.tar.gz 12915073 BLAKE2B 0cd696adb9f99782f6f1dd4d384f6aacb11a71f3df13c07775c376d42b88993ca82c02ad545a57b012a151403c3a3719e3e4512fe34e7de540d04d7d27ddf86f SHA512 e6a5d392f3874f093a8580508e83e270140ad52606c7856797e7e7665dd6687e63900984a4cb920c3cba9a4b7148047de4085a4353c9c77697b94f8d9cd099fc
+DIST apptainer-1.1.6.tar.gz 12914465 BLAKE2B a04ed9b9b429d7885d6c91f72d574d2a3a2955fdbe5cb2d30b59744b1f3bfb6f7d4f07ce7f1863caa83fb3361d7fdd2739b82334458d606ce053de43e1e9f755 SHA512 dd38abe1e343352e29a8a1fd1922901e4d48282fef641c75360253392ad53c6f1e5f7510ef612594e29db5f090fb41ff55b9d52d126be253450b0630fc7d383b
 EBUILD apptainer-1.1.2.ebuild 2452 BLAKE2B ad348c5bc7cc3097e69a43313c6118c57dc76b499cfa38a82ed9e07bd9668f9bdcdd1ff92d37f8d566fd85e8df8a2cf94d7abb629bbb7583ddc375ec47a1b583 SHA512 3bc7302d9d4448fa493f77646aa1fcd85a0c19b8b50c54bdaf47310b41ec28c01dc8137229e1c39e56838912fcc9b996c515bbf04caba23dcdcc16839f95b2f5
-EBUILD apptainer-1.1.5.ebuild 2463 BLAKE2B 331d94b48d64fc381d906a945ec557e898b2151ae98156090c13340f018aaa3fca2c1a8bb72a075ff642a9e5ae68229c55cc7d443c57274603127467df4c5df3 SHA512 bd6dd3d00c06634501d3af8b0358c3f4225414603f5280027a0d7376306f6340c7ff01519dddf1248828dc680bd5e0ee91232ff25a1f293de3c0b19d0e03f214
+EBUILD apptainer-1.1.6.ebuild 2463 BLAKE2B 331d94b48d64fc381d906a945ec557e898b2151ae98156090c13340f018aaa3fca2c1a8bb72a075ff642a9e5ae68229c55cc7d443c57274603127467df4c5df3 SHA512 bd6dd3d00c06634501d3af8b0358c3f4225414603f5280027a0d7376306f6340c7ff01519dddf1248828dc680bd5e0ee91232ff25a1f293de3c0b19d0e03f214
 MISC metadata.xml 454 BLAKE2B 7891b6acae30424b8b6877166b856c1113a13e40ebec9051935df10a0650bf941f52d75bdb6a4258795e07b080082979469b8b8242d2ddd56c52f9c5b6759f0e SHA512 ef53c2dee45734f36403ab71549494f3c24707bc183353e4bd9c548a97b3ab5d7877f4fc9d311d9e86ab249cbdb379f0a1a211ee36afda99fd552f0a5cac30bb
diff --git a/app-containers/apptainer/apptainer-1.1.5.ebuild b/app-containers/apptainer/apptainer-1.1.6.ebuild
index 11042b31127b..11042b31127b 100644
--- a/app-containers/apptainer/apptainer-1.1.5.ebuild
+++ b/app-containers/apptainer/apptainer-1.1.6.ebuild
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 5ce8368de293..c8f1d96c8655 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,7 +1,9 @@
 DIST buildah-1.27.1.tar.gz 14825932 BLAKE2B bf290eeb4d96d255c7cdaa07af49eff44191664ac7dee255c7979656383daaa93c3673ba82ac1cbff033de769ffa08ad027f5d91c81b08a36222cb73e8a1e399 SHA512 a5e2ddf837e613554ffe8fe9c15ac9c8f9c2564c403e5544df7fb8802962581fb4e9dd4361c28c93443ede74c20c82f1631990e443c7895a3b4c3b8a659ee05a
 DIST buildah-1.28.0.tar.gz 14579386 BLAKE2B effc7d0a154e30790585c19e19655f98026c34687e79b91777700bc2f387b96896d88855cd5ec34573dd2678e4a30a832c39f789d53b61b45cb5f682dacd252e SHA512 f5e82a22648fa0d0ba7f5dcf3b97a2ec1182f31d3e03cd2624e01fe76fcdddf0a5605c59816eeef6401d151864b6b6be493c144b83f5667ab3947eea902f0086
 DIST buildah-1.28.1.tar.gz 14576193 BLAKE2B 5317b991780b0c2539802495a2a15e91d4e1623700d0a3fa354e362bd647e59a0e9c34d8f19858e129d0028c71bb04665bde7668e3b5f3f3e5b85c944f7108b5 SHA512 c674a90a0cae2977b76c2b68c06a0006f89d74b5b41362c2512a3f8d7ba515c3bd693648a0ba955dad7bea1a43da6890d80855e1283f0fc0136d16d77a798fba
+DIST buildah-1.29.1.tar.gz 15594930 BLAKE2B 71b87352062b3a5df67389897fd0d82c2491c48cffbda808b30e2767a1e290eccfd726be26dbd57fd8d08cfacb74f313058179c40600225d863a9340b772df1e SHA512 ea78aacee9b5cc10e299789d739e7086579e67719ab72b84f6ea5acbaf31d443284387ac92e7c5c1c3da9bd6523f43e2d9c7e2ea5698c251cb5458a384f41b04
 EBUILD buildah-1.27.1.ebuild 1196 BLAKE2B b9b0c03282cd8d03a88649c1156361c8eaf64009147a8f78b9f9f7ab7c72dbb3d340221bc73e36ea1478d46a72e6c57622451c34b8e7f511fba93554dd0afdb7 SHA512 2c64885a361dbe355b5d8cfce1e9febc223fd1331dc3e7358f9f32f2281e8992d00c74de2337aafde4aab6473bfdd2a67aaab7597de8904bca2ad913c060b6a7
 EBUILD buildah-1.28.0.ebuild 1198 BLAKE2B 3c5a4ddabe6075badd8595d46c9f12764e173690fb5cfc67cb5a2e60cf8bc3dbce1d6d05d548a41740cf346e9498313c05497d4a71632848d60b6eb3d9d740ac SHA512 128aae74d0c13b6ec7a9cf7a2c3b09cefd13606ab4c685d72d85bca6f36723943a08918d315dc3f8328c622bdde2fd099fa3bce35db99e297c44e802c97d9df9
 EBUILD buildah-1.28.1.ebuild 1198 BLAKE2B b7ea4bc84b50a4ce3a48208f4a5f95eec49954709ec59ee1a0f79b57554aa581f6fa90b9a59e34b2ba1b47a0dce5cf295a5a74d7696a859b93079399f77dd853 SHA512 3b2f433fe794e8c7e0fb598018c20895db04479b2d03544c126dd83fb2a17cb1ed03d4efe2210b0423f3957b2c5a159e21fd0628c54ebc8bc14444087c7e6cd5
+EBUILD buildah-1.29.1.ebuild 1196 BLAKE2B ea78cc001cbe18dff23daa4b8c5c765a8ac844c5c7eb46139c053f4d9ca1215dfc1e4030d341da719ef373f06b68d14394653f3a796f52c0cc4930c4967411f8 SHA512 bd62baa2565245101efaacd82f203d7e729e6e3a1ad8f1e1c2ab4d0fc72cc4def9e618238a5f595cf1adc81e1e3a24fe323a5d12095bf6a08f0806709689e524
 MISC metadata.xml 328 BLAKE2B 55d2d2b5cc972b7e6b6fb77d14e79e304adcbc7056ff351f5ee3cac6cf5f83b4ef2a10c70754d1d30a5ecd88e652abc07cddd8005c3767e7f709c0c5cb61d068 SHA512 7520f5745909da195d4bfdd750e4c716c461a3789adfde56dd9be46b91dfb789653d642c0958b5a2950eea220cc00143bfcd5db402fcc2578c8fe5f8ff69275f
diff --git a/app-containers/buildah/buildah-1.29.1.ebuild b/app-containers/buildah/buildah-1.29.1.ebuild
new file mode 100644
index 000000000000..21c3a103bda8
--- /dev/null
+++ b/app-containers/buildah/buildah-1.29.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+GIT_COMMIT=faf0d4fc
+
+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="selinux"
+
+RDEPEND="app-crypt/gpgme:=
+	app-containers/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-apps/shadow:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+	sed -i -e 's/make -C/$(MAKE) -C/' Makefile || die 'sed failed'
+}
+
+src_compile() {
+	emake GIT_COMMIT=${GIT_COMMIT} all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin bin/{${PN},imgtype}
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
diff --git a/app-containers/conmon/Manifest b/app-containers/conmon/Manifest
index e05f7aef64cb..e188f6469afc 100644
--- a/app-containers/conmon/Manifest
+++ b/app-containers/conmon/Manifest
@@ -1,7 +1,9 @@
 DIST conmon-2.0.30.tar.gz 161285 BLAKE2B c4e01759d819d3dff94b9ae09caa72b6f664e49d907d3a1be9fb4a0e1f782fad29a7cd7c89703e861f4aa6d7955996386f81460f19f22be2889c4f88c34536cb SHA512 2451e441913925f8423385b83e97630e980948a9bd57ae8800889016c4412a26bed598825d3c034c3edcecbab66c38417f55ad3866d3c2c98cada6acce2b2d16
 DIST conmon-2.0.31.tar.gz 158184 BLAKE2B b14bae77a18cc352bc9583604544b4e7ffe4bd8a77e5c3185c897c11819bba227edcbd84b559d998a2b5648ca371f0e98e4d9cd15951a953cbe05a9c9ae9d434 SHA512 ff879fcd5a3b7de8ee6ff9de2a13d0afc36fdb392390278b26ee179be26ff375ddce4f5ae24e3e88b737f63202af64b49e82b2ffbfc0de8bfd14690dac523747
 DIST conmon-2.1.0.tar.gz 159045 BLAKE2B a39b7620091ca17f4d91a26e040f886293688562cba1827cc09c1da1c1401ad78cbb16420c9df8a055ab5ca3eb2933aec6ac1b9fbb1eea10f33b1b0d76c5dd54 SHA512 0f27a1b048c2dcafb40cd67f80c2a5d7e92f5beb849174233dc10e2db42b4ea8b89f27c901d3f38cf1d412ed875c5521e07140038e859fb54bcc554cb9197e74
+DIST conmon-2.1.6.tar.gz 157838 BLAKE2B 319a170ab048c14f3be998391da403799171c5d0e342ac4214a6456398ab872cb6a77cb4d67dbb97a0bc47008c6fa657ba2a166eea4c56ee65db545b08e032bd SHA512 0b5d7f33745766f4f1646e79554e16e1d6c977fd08c5a86c72068aec9f28110b5981c38972134741281c8470c295b6195843f3dbb78e1e9da34b8d577ea41d65
 EBUILD conmon-2.0.30.ebuild 1091 BLAKE2B e824f91e4495954361b47e65b55f916a56bd0391d561158f431c8774253dc558880ffff0ba9219dbc80704e867a6b2e64c29bca329d26f304de783d2fb198f97 SHA512 8973dbf92e9c2a6adb568ace44750e93c988b80b4359b365dec87f40452516418485f53dd47f2502ad84d5effed16b8b0e540628ef8c03bbccd0632985890982
 EBUILD conmon-2.0.31.ebuild 1114 BLAKE2B d1dde0e7551c3f69780e90f2ab271497fec8e376dc796415a6656dd0db7445407d3fa47d7bd51a46bb603846c914ecaa5e738ab2a07bd85f95e9695885ec36cb SHA512 27974fe51072e7f104d4a292fb6debcd1eceb4b96b0b4736cad7864b7c4149af8200de0e7a36a586c3055a8db0889a12990b9fe2df7b1893d2b68ee96bc71b3e
 EBUILD conmon-2.1.0.ebuild 1121 BLAKE2B ff88099f36ffc8ac8930ddc480ffcf5d1979d9b4a0be5c433326cd4d28ab5de03cdd3630508149b23ad79a6fa5c992a51ee53807ff6fc1f6712a785b5c629c8d SHA512 e2f05a9e134a94c0a9cc8ec6c522af5a426e9de8eca496916ea4ca5dfbb1ade924123393930e8f032a7663c8b5457f69ec5e88d3db80acffdba1a22438e67040
+EBUILD conmon-2.1.6.ebuild 1121 BLAKE2B 0cc624b01ebd5ac4d9a80c73ee7f75599fcf152aa68278f0ea898915f9ea99d6516f638d5688779c28a40adc3311129ecbab785946ebe438228094fbff42d3ee SHA512 36befc1261d82b7dcd8daecb171685c624a5ad5875ad4fed123e5226b6fba84408537eb34b026d00fcae3b7baa6730a96bc998cce95cab2502380936ce1397b7
 MISC metadata.xml 327 BLAKE2B f45e25a9bbdbdaf8142c7919e209ed153b819e5222f957600260362211946936c5cefc4f575a84930cad94d8e693efcb40e948c0f976e504a038c99b047be34b SHA512 55a208c97c7671ec03ac0a0b46ccbe70d21e336fe5e1cdc92eb987c9f499453a5f94927b7e3f397651477cf744613d39407d8d5fe1c8e730507077a3c5117b06
diff --git a/app-containers/conmon/conmon-2.1.6.ebuild b/app-containers/conmon/conmon-2.1.6.ebuild
new file mode 100644
index 000000000000..e595091b3668
--- /dev/null
+++ b/app-containers/conmon/conmon-2.1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="systemd"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:=
+	sys-libs/libseccomp
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}
+	dev-go/go-md2man"
+
+src_prepare() {
+	default
+
+	if ! use systemd; then
+		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+			-i Makefile || die
+	fi
+	sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die
+	sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake GIT_COMMIT="v${PV}" \
+		all
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		install
+	dodir /usr/libexec/podman
+	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+	dodoc README.md
+}