diff --git a/dev-python/podman-compose/Manifest b/dev-python/podman-compose/Manifest
new file mode 100644
index 0000000000..b79eeef249
--- /dev/null
+++ b/dev-python/podman-compose/Manifest
@@ -0,0 +1 @@
+DIST podman-compose-1.0.6.tar.gz 58426 BLAKE2B 4a200d7abb77535d631704e96f600c360cd03a70274c5ed763a6f21a309f9be1225749e4f34b1df00973e9c1de191ec3d43bf35588d912faac25de52e4dd85be SHA512 eb6972c51fd02c7a7dec364d18417c4f093f12ab90ba7061be189de7130c8eb0becb5a1653ebf7db0611470b52257a4a1eaae52891f434ca73fbc6dd30da5f56
diff --git a/dev-python/podman-compose/metadata.xml b/dev-python/podman-compose/metadata.xml
new file mode 100644
index 0000000000..67358b8c15
--- /dev/null
+++ b/dev-python/podman-compose/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mathieu.tortuyaux@gmail.com</email>
+		<name>Mathieu Tortuyaux</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">podman-compose</remote-id>
+		<remote-id type="github">containers/podman-compose</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/podman-compose/podman-compose-1.0.6.ebuild b/dev-python/podman-compose/podman-compose-1.0.6.ebuild
new file mode 100644
index 0000000000..f5bd604df4
--- /dev/null
+++ b/dev-python/podman-compose/podman-compose-1.0.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+inherit distutils-r1
+
+DESCRIPTION="A script to run docker-compose.yml using Podman"
+HOMEPAGE="https://github.com/containers/podman-compose"
+SRC_URI="https://github.com/containers/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	app-containers/podman
+	app-containers/dnsname-cni-plugin
+	dev-python/pyaml[${PYTHON_USEDEP}]
+	dev-python/python-dotenv[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-argparse-cli/Manifest b/dev-python/sphinx-argparse-cli/Manifest
index 0eb23194a0..b7d4d4a2ed 100644
--- a/dev-python/sphinx-argparse-cli/Manifest
+++ b/dev-python/sphinx-argparse-cli/Manifest
@@ -1,2 +1 @@
-DIST sphinx-argparse-cli-1.11.0.gh.tar.gz 18745 BLAKE2B 9660fc48b80885a9968cb664abd1234d8718d4757e64b0642a46e6fcab9b95c5888cb47acd0b731a88ee8da309a6325eca5ff06b6acac200553caf6446ef92f9 SHA512 adb1c9c2c04cc2d714403806b71705a09ea085e562bd2e97d73249e5b33a1341880151b200a96734291606318acc4d8f7c23d3d42798e677744a37496d88d5ac
 DIST sphinx-argparse-cli-1.11.1.gh.tar.gz 18689 BLAKE2B 34dd1f84547dd590e4d12a600cf14a8133fc4fefa1726e0af1b7d52cd3b24317d8a66597aa9e135c98b331af20f67c9a1698efeff73c2d8cd7d587e8b698aca4 SHA512 027ac458a5bb3ddec81e1b26fe422d66071609590aba5b97b5399071ed44e13ea03e67e2a1177c31284b8e3bbdebfd15a10a1805b5de2e8ee03eaf72a0aa02c5
diff --git a/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.11.0.ebuild b/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.11.0.ebuild
deleted file mode 100644
index ffeed59b7d..0000000000
--- a/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.11.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..11} ) # no pypy3 support
-inherit distutils-r1
-
-DESCRIPTION="Render CLI arguments (sub-commands friendly) defined by argparse module"
-HOMEPAGE="https://github.com/tox-dev/sphinx-argparse-cli https://pypi.org/project/sphinx-argparse-cli/"
-SRC_URI="https://github.com/tox-dev/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/sphinx-5.3.0[${PYTHON_USEDEP}]
-	<dev-python/sphinx-6.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/hatch-vcs[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/sys-fs/mountpoint-s3-bin/mountpoint-s3-bin-1.0.1.ebuild b/sys-fs/mountpoint-s3-bin/mountpoint-s3-bin-1.0.1.ebuild
index d10e0a3177..b25b7ecbb9 100644
--- a/sys-fs/mountpoint-s3-bin/mountpoint-s3-bin-1.0.1.ebuild
+++ b/sys-fs/mountpoint-s3-bin/mountpoint-s3-bin-1.0.1.ebuild
@@ -16,6 +16,8 @@ RDEPEND="sys-fs/fuse:0"
 
 S="${WORKDIR}"
 
+QA_FLAGS_IGNORED="/usr/bin/${PN}"
+
 src_install() {
 	newbin "${S}/bin/mount-s3" ${PN}
 }