5 files changed, 146 insertions, 7 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 448910d880b6..479a6abd9a7d 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index cf06de73adf7..f307560c608c 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -4,10 +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.0_rc1.tar.gz 21624090 BLAKE2B 0b11d3419e7934697e085daab4ea756cdd7f2d1ab059f8c35a78c60fee826757d208a48f4862e0105fe5a9e7b48c846d9ecdd32db8a74dd6fe0499b57ce0b3d2 SHA512 5b3cb3e78d311cf41c5b79ac0b93c34e77b7168230b6f307304be210a34606a937aa6039e2de14a5ae6271b94e7a19e12503335c3796f57c968df004d5f13607
 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 3607 BLAKE2B 11b3dd76f057d0f37ebc5e3332d960af027407eb07cc3a0e5a4099c1e6c6aa6d7b41d462f8e9dbcf213f5011d9b756e7cf273f6f45b69d6015aff9b27161cfa0 SHA512 4b46f60c59b808aecc94ba8c1cb5d59542111e8dae20fc3fcd6f618cb28f3fbf9a3af8622871f66fea74e136dc4b6b11079994f3d87532de9b616b3b9ca62588
+EBUILD podman-4.8.0.ebuild 3644 BLAKE2B ac04302a9c2da6e897b7b000b3578979e97cb9aec9ff778f6662811a019d3a1a2a191a458eb2f084df71e3a038d50c55f4f36da226e1565825385a1ef006d6e9 SHA512 4c469f14741cb925ba672eaa84f381a2375ac5fb6d5f7c9d1cad7a714618e99988c5cdd9a2ed63e12a54b7a3da45228aefd6bd2bd5b3ba99ec87064c87d5c73e
 EBUILD podman-4.8.0_rc1.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.0.ebuild
new file mode 100644
index 000000000000..e71d643e48de
--- /dev/null
+++ b/app-containers/podman/podman-4.8.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module tmpfiles linux-info
+
+DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
+HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/podman.git"
+else
+	SRC_URI="https://github.com/containers/podman/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P/_rc/-rc}"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+# 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 cgroup-hybrid wrapper +fuse +init +rootless +seccomp selinux systemd"
+RESTRICT="test"
+
+RDEPEND="
+	app-crypt/gpgme:=
+	>=app-containers/conmon-2.0.0
+	>=app-containers/containers-common-0.56.0
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	sys-apps/shadow:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
+	!cgroup-hybrid? ( app-containers/crun )
+	wrapper? ( !app-containers/docker-cli )
+	fuse? ( sys-fs/fuse-overlayfs )
+	init? ( app-containers/catatonit )
+	rootless? ( app-containers/slirp4netns )
+	seccomp? ( sys-libs/libseccomp:= )
+	selinux? ( sec-policy/selinux-podman sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-go/go-md2man
+"
+
+PATCHES=(
+	"${FILESDIR}/seccomp-toggle-4.7.0.patch"
+)
+
+CONFIG_CHECK="
+	~USER_NS
+"
+
+pkg_setup() {
+	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# assure necessary files are present
+	local file
+	for file in apparmor_tag btrfs_installed_tag btrfs_tag systemd_tag; do
+		[[ -f hack/"${file}".sh ]] || die
+	done
+
+	local feature
+	for feature in apparmor systemd; do
+		cat <<-EOF > hack/"${feature}"_tag.sh || die
+		#!/usr/bin/env bash
+		$(usex ${feature} "echo ${feature}" echo)
+		EOF
+	done
+
+	echo -e "#!/usr/bin/env bash\n echo" > hack/btrfs_installed_tag.sh || die
+	cat <<-EOF > hack/btrfs_tag.sh || die
+	#!/usr/bin/env bash
+	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
+	EOF
+}
+
+src_compile() {
+	export PREFIX="${EPREFIX}/usr"
+
+	# 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=""
+
+	# BUILD_SECCOMP is used in the patch to toggle seccomp
+	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.completions $(usev wrapper install.docker-full)
+
+	insinto /etc/cni/net.d
+	doins cni/87-podman-bridge.conflist
+
+	newconfd "${FILESDIR}"/podman.confd podman
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	PODMAN_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process podman.conf $(usev wrapper podman-docker.conf)
+
+	local want_newline=false
+	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index 0ba82e8ca777..dcf0ce05c44f 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -7,5 +7,5 @@ EBUILD skopeo-1.10.0-r1.ebuild 1066 BLAKE2B f55aa099a396fca1f8513786c48929923d74
 EBUILD skopeo-1.11.1.ebuild 1066 BLAKE2B d304dfa99199b32528a24710a716ab757f9670e4b474fd48c5284005a0a01cc457af1d3882572f27aa81eadb058ec495c7dcebf775dec238ae4b44f0d748d0d0 SHA512 14ad618519d078c4f539afdc3595bd80a1fd102e21abd231f71a530de5019557d915a6809ce1cecb7dc1ee6be57ee9a5b12add0fee1fc8d7325fc2f1f567896b
 EBUILD skopeo-1.14.0-r1.ebuild 2097 BLAKE2B 4f25431121f91ecf094f74820c9a948252ecaaa611b824e8b2dcdc6452a3c4de67c0f9dee07585f15cd6c57bb98aae661618f4cbf017b13160161cceb4143030 SHA512 428330a458080957266cc56f9214e25b08f964c20e33534b771a1f83e9812aca5d2d5703991a089258ab035192939669efb9103c88d8aebc7278dc8ac257c328
 EBUILD skopeo-1.5.1.ebuild 1403 BLAKE2B a4c236cb6248a1551c90683a45247d19d5634ca7e9ca801761953131f73a7bd0058ab5bcea1d7b2593229eb20c6482e2dae833443227467daccef020b23b5f88 SHA512 b163486639a8831eb20db3a5906378485f0aaf3299e815217b1c8a2f4e27ca35af0bda40e6265a7c58107588cab429c0044717666cd22c43e8e21c73a75277dd
-EBUILD skopeo-9999.ebuild 2074 BLAKE2B e5622deab234e5555773f35887ddb7dacd0bd77cc5f2575e9d65f3dd2faefd58e9ae91c8b43b6f1fa80e24135fff0099a0b93634ad3a88b399272d1fa5426610 SHA512 c12a399c3ffd129ba266def0421b0cff2c755f86b18b04f5bc5b830c56f3d1dd98ddc46dd0129362afe8548647944b260ea8d3194525f95f0909279f871cb412
+EBUILD skopeo-9999.ebuild 2097 BLAKE2B 4f25431121f91ecf094f74820c9a948252ecaaa611b824e8b2dcdc6452a3c4de67c0f9dee07585f15cd6c57bb98aae661618f4cbf017b13160161cceb4143030 SHA512 428330a458080957266cc56f9214e25b08f964c20e33534b771a1f83e9812aca5d2d5703991a089258ab035192939669efb9103c88d8aebc7278dc8ac257c328
 MISC metadata.xml 932 BLAKE2B 07a3c417bf16785676ad46085fd30feef0bb9970157a34a48b5f633878633788de20da8d9d24b14b356ff19bd7012ceeb9ace0aee84dcece374dd609a14d9ce3 SHA512 33a8355d730bf0f6f53f77ef2a1d0cb5a3a3e9f4b9bb76603e2da9fa087e9065b6bf950170cdb3b194105a24e34ab98e006880b3ac9d737152a4d309ec4d0fe7
diff --git a/app-containers/skopeo/skopeo-9999.ebuild b/app-containers/skopeo/skopeo-9999.ebuild
index 9fc4a1466912..b7a859d817d5 100644
--- a/app-containers/skopeo/skopeo-9999.ebuild
+++ b/app-containers/skopeo/skopeo-9999.ebuild
@@ -16,14 +16,11 @@ else
 fi
 
 # main
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
 IUSE="btrfs device-mapper rootless"
 
-RDEPEND="
-	app-containers/containers-common
+COMMON_DEPEND="
 	>=app-crypt/gpgme-1.5.5:=
 	>=dev-libs/libassuan-2.4.3:=
 	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
@@ -33,7 +30,11 @@ RDEPEND="
 
 # TODO: Is this really needed? cause upstream doesnt mention it https://github.com/containers/skopeo/blob/main/install.md#building-from-source
 # 	dev-libs/libgpg-error:=
-DEPEND="${RDEPEND}"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-containers/containers-common
+"
 BDEPEND="dev-go/go-md2man"
 
 RESTRICT="test"