gentoo auto-resync : 25:09:2023 - 11:25:16

15 files changed, 111 insertions, 217 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 61fc28c7ce73..e74639049ee0 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/containers-common/Manifest b/app-containers/containers-common/Manifest
index 8edc1e87001d..1d1bcddd99c1 100644
--- a/app-containers/containers-common/Manifest
+++ b/app-containers/containers-common/Manifest
@@ -1,9 +1,11 @@
 AUX default.yaml 978 BLAKE2B ab316e77c296f0ea9e51788bd62cf3abbbc0fb5b3f630acfd8d138f61802477f3d1bc75bd538200bebadd11637baf88e5ecc602db459bfa335d77704bae437e2 SHA512 84c9e1dab4d071d74a6dc8e1f02dae948e81a7e7af1810860a320c8857cf69e354e3d8c87ead2e4c15f80a1ca144116c08b0715bdd97ffc5ae2bfea3883d73e5
+AUX examplify-mounts-conf.patch 214 BLAKE2B 3e72e91ce65190acb437a1ec5e0cbbb27b46b8581a062729bd90792bea8ea3a9549c4cc4d445198eda05ef4673391aa8bff6616918fab427fb2c9973e81484e1 SHA512 2f1aaadca8644c6e7062ac7d79864297b3bcd34c4c84a6d2651ac24e159fae8773cc240d0916f27354e394ab701a4339c15d5dde6957d61f5b153677a5bebca1
 AUX fix-warnings.patch 419 BLAKE2B 55f23a30af6225b6e56dc7ba97d1af8052a6fa06ee7e29816ff00d7a7847136ec916eca07ddaa86f0529beef41e30f433f341497f8dd914a736ccfc0e29a2841 SHA512 b247af0b4540f80662f8ba53f531bf1ee5ee0f944862c0baf2806df5dad0ef0d44af5cb1d3ce28de956194a9d4a2b92c897e8a432dbeb4b5f52486e7e291a9de
 AUX mounts.conf 87 BLAKE2B 5760f93194f6966388837d02d2505d9c7a9bf27e35bc5b5adb242288876e3afc1a9ad7da512da8a48835784a22d82c0b9e1fb112a7f29a4db8d6332a716658bf SHA512 4c52c52251558e59aefa0ccd8d733a6a67326f205219ae0dba5893be0f93090133fff954e05f31fcfaff2eb2aa48e032bb94d8ec4ac395ea3c071883dde3edcb
 AUX policy.json 256 BLAKE2B 78693988b98b88c35807db755bea923203ab289435d2c4ffd914ec52904dadded467ff131d90b337bf7534d533e478420a0c81599858a9012668bc4d1815144f SHA512 120f43f579f48758af6b8292fc2cfbcb5ecc46564d2d16afb74dbd1c043de44daec6633ff585b0046c55fd48aed6dbc2901623c753ec13670d3fdcecb19a42c5
 AUX seccomp.json 16401 BLAKE2B 4123dd5d166de192c8cbc89caac8a2cc82cd58054109b4650e7203003474b3e389ef08ca5798d606004adc80f9e1a3035b13978b0beec9f1193627b2867b206a SHA512 742ca8f5b4720b05246113fb6aa29311c32f58502dd8ad99fa66d9c9ce83f46e338ed08c2a90bd15f05903953edffeab92a6d509aa88b57b15dec5e052ea8c07
 DIST containers-common-0.56.0.tar.gz 12616120 BLAKE2B 6495ca7d0c9134bc8bd5f7b7541bb4f1160c74abb7a64bd4d2124104ea563f5381f0092da20ab45d81929a8632b1fcc1107ac05fdae011be446cff14ebf88c45 SHA512 4af720be95e6b5ca7d0664f99a389bf092b9f45d4e0602d9b49ef1d21b359d2307a94e0c88378fe0c751f5b40db54d7aab67eb497185a289cea9288cbfaa042c
+EBUILD containers-common-0.56.0-r1.ebuild 1736 BLAKE2B bd66ba6b3c4ab0a72458611cd18597e218211caa412f5c853384225d444fba2429bf545cc7f021bc2973af9ebee826b593bec42c76516cbeb4332297d5707d8b SHA512 a53441e66dadb11f2c519071fadf857e66456da3cd8a184f5bbb050787338d2267fab1ba82e15d7c3afb7ecde84f49e27cb5f56397a6d3440884650f5cae1157
 EBUILD containers-common-0.56.0.ebuild 1834 BLAKE2B 4cfdd7393af5371b4c3b4fc5a8e7646b6ff2b9d87105099403dd09307cb337fef29683b1d8465a08c2ff3021724c4bc46a0747772efab1738ef18f11d0fecb1d SHA512 1870d60fc62d0f32dc556124eef3054f61b195289316348108d4c7a527d0a39ac777dc9d3c7ba799da7adc0fa6104a8fa674bd72d23fe319fcc8db7cbfff7d48
-EBUILD containers-common-9999.ebuild 1834 BLAKE2B 4cfdd7393af5371b4c3b4fc5a8e7646b6ff2b9d87105099403dd09307cb337fef29683b1d8465a08c2ff3021724c4bc46a0747772efab1738ef18f11d0fecb1d SHA512 1870d60fc62d0f32dc556124eef3054f61b195289316348108d4c7a527d0a39ac777dc9d3c7ba799da7adc0fa6104a8fa674bd72d23fe319fcc8db7cbfff7d48
+EBUILD containers-common-9999.ebuild 1729 BLAKE2B eecfc378b46951b65ca37715883349b62d05d147faa56ee89b0b361efde563e07a1faf75bba94b89ece380b0a1546b6ad2cef3e30a5ac04db327a84ed639fe53 SHA512 c3eb26870458bdeadeded468b206f60725f09b770c86662938dc536cff2c01d180f9a614721198a230966a6ce42084e795e2caf05fdfb07d48336bdfc3ffb97b
 MISC metadata.xml 635 BLAKE2B ccb2fc61af04b1fc78a5fa4b75a17ac26f1fe0b76eedc022a752b9672dbd4ec72bf26a811b65b391811b973e387a8fdc2b79fdb54ab468a8bd59b8db7a6c5f9e SHA512 f99685c268495ab84c1b72c5c9ca21c562a4adaecab52c3c1b2eff45ed31c2a150a2db8428b70393814d663c5042bea2454d3c447b0f52d6db4fcf81d6423c0f
diff --git a/app-containers/containers-common/containers-common-0.56.0-r1.ebuild b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild
new file mode 100644
index 000000000000..a0b2b2c3a20d
--- /dev/null
+++ b/app-containers/containers-common/containers-common-0.56.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Common config files and docs for Containers eco-system"
+HOMEPAGE="https://github.com/containers/common"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/common.git"
+else
+	SRC_URI="https://github.com/containers/common/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P#containers-}"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+RESTRICT="test"
+RDEPEND="
+	app-containers/containers-image
+	app-containers/containers-storage
+	app-containers/containers-shortnames
+	!<app-containers/podman-4.5.0-r1
+	net-firewall/nftables
+	net-firewall/iptables[nftables]
+	|| ( app-containers/crun app-containers/runc )
+	|| (
+		( >=app-containers/netavark-1.6.0 >=app-containers/aardvark-dns-1.6.0 )
+		>=app-containers/cni-plugins-0.9.1
+	)
+"
+
+BDEPEND="
+	>=dev-go/go-md2man-2.0.2
+"
+
+src_prepare() {
+	default
+
+	[[ -f docs/Makefile ]] || die
+	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile || die
+
+	eapply "${FILESDIR}/fix-warnings.patch"
+	eapply "${FILESDIR}/examplify-mounts-conf.patch"
+}
+
+src_compile() {
+	emake docs
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/containers
+	# https://github.com/containers/skopeo/raw/main/default-policy.json
+	doins pkg/config/containers.conf "${FILESDIR}/policy.json"
+
+	insinto /etc/containers/registries.d
+	# https://github.com/containers/skopeo/raw/main/default.yaml
+	doins "${FILESDIR}/default.yaml"
+
+	insinto /usr/share/containers
+	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
+
+	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
+}
diff --git a/app-containers/containers-common/containers-common-9999.ebuild b/app-containers/containers-common/containers-common-9999.ebuild
index f2bba24b1975..73407d6e4994 100644
--- a/app-containers/containers-common/containers-common-9999.ebuild
+++ b/app-containers/containers-common/containers-common-9999.ebuild
@@ -17,11 +17,12 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-
+RESTRICT="test"
 RDEPEND="
 	app-containers/containers-image
 	app-containers/containers-storage
 	app-containers/containers-shortnames
+	!<app-containers/podman-4.5.0-r1
 	net-firewall/nftables
 	net-firewall/iptables[nftables]
 	|| ( app-containers/crun app-containers/runc )
@@ -42,20 +43,13 @@ src_prepare() {
 	sed -i -e 's|/usr/local|/usr|g;' docs/Makefile || die
 
 	eapply "${FILESDIR}/fix-warnings.patch"
-}
-
-src_configure() {
-	return
+	eapply "${FILESDIR}/examplify-mounts-conf.patch"
 }
 
 src_compile() {
 	emake docs
 }
 
-src_test() {
-	return
-}
-
 src_install() {
 	emake DESTDIR="${D}" install
 
@@ -68,9 +62,7 @@ src_install() {
 	doins "${FILESDIR}/default.yaml"
 
 	insinto /usr/share/containers
-	# https://github.com/containers/common/raw/main/pkg/seccomp/seccomp.json
-	# https://github.com/containers/common/raw/main/pkg/subscriptions/mounts.conf
-	doins "${FILESDIR}/seccomp.json" "${FILESDIR}/mounts.conf"
+	doins pkg/seccomp/seccomp.json pkg/subscriptions/mounts.conf
 
 	keepdir /etc/containers/certs.d /etc/containers/oci/hooks.d /etc/containers/systemd /var/lib/containers/sigstore
 }
diff --git a/app-containers/containers-common/files/examplify-mounts-conf.patch b/app-containers/containers-common/files/examplify-mounts-conf.patch
new file mode 100644
index 000000000000..eeaca09d5f1e
--- /dev/null
+++ b/app-containers/containers-common/files/examplify-mounts-conf.patch
@@ -0,0 +1,7 @@
+--- a/pkg/subscriptions/mounts.conf
++++ a/pkg/subscriptions/mounts.conf
+@@ -1 +1,3 @@
+-/usr/share/rhel/secrets:/run/secrets
++# Refer to containers-mounts.conf(5)
++# Example:
++# /usr/share/rhel/secrets:/run/secrets
diff --git a/app-containers/containers-image/Manifest b/app-containers/containers-image/Manifest
index afc95688396f..5510fe005a9a 100644
--- a/app-containers/containers-image/Manifest
+++ b/app-containers/containers-image/Manifest
@@ -1,5 +1,5 @@
 AUX fix-warnings.patch 397 BLAKE2B a5922e061c825e25398fc3fccdf683abf8331b065337ff240227478d7d3ef5398957d56a430c0b04aa823033b56653e87c8186065e5898818e75310451b347e0 SHA512 a96ab3fea76be4751d6dc3893b4272b063c854503e1a65b4501819a5925f3911c285fbfb4ee6827795a41c696015cc06f446e4ddb1318e21cf0141e15804833e
 DIST containers-image-5.28.0.tar.gz 688100 BLAKE2B 0cee8be579bd11eb0524590d8afe16b6ef863d7adfd74db51b68385142804c8096fec3f2a492e0d5a5021eba9edc91219b327138635aaa329c6ef7d0c01129c8 SHA512 0b76539e04016f5f1067c576a877ace475f25d0f0840fc969606601105a8a7f0e242cc054b0a2cfb6f1b751d850734360a524c78563fdf2330c8ae8c11bba1cf
-EBUILD containers-image-5.28.0.ebuild 794 BLAKE2B 68a7bbe15e21f49a15ba685c6e30374dc3ed15309ef600537d54d28d63046b2289ce76cb44f170ae52303e7b2553a88265468630a7a697aa32d8d3945c2a5fa7 SHA512 7552a9e886c485aba8451c25695a79be561fbed5dcf0e171424b2d2dfc605d0b93853d7161d481e2f8877066c60b07c084fc3ef4f25f9cac64657ef2f5471b52
+EBUILD containers-image-5.28.0.ebuild 801 BLAKE2B 76edd242cd0e9de3a9b3ab8e8c07e796b259a4b1308d820f234407a74c7861b43cc96d3be4530299e95ab4e51c37bbdb152d80e18caf49547508daeceb256e28 SHA512 e26fc82d90f3678f577d8aa2090060f3c8a932d98c663006b40390b92b5a59b97e776b5dc479bc1a9c1e0271e92a864af1f120e74b7b4a3f90875d5b1698b006
 EBUILD containers-image-9999.ebuild 794 BLAKE2B 68a7bbe15e21f49a15ba685c6e30374dc3ed15309ef600537d54d28d63046b2289ce76cb44f170ae52303e7b2553a88265468630a7a697aa32d8d3945c2a5fa7 SHA512 7552a9e886c485aba8451c25695a79be561fbed5dcf0e171424b2d2dfc605d0b93853d7161d481e2f8877066c60b07c084fc3ef4f25f9cac64657ef2f5471b52
 MISC metadata.xml 632 BLAKE2B c48672fb67a353cb54f27fb541d91899a27b913ac6036000d65f8ee0356aad9ea9a7e796aa239b3b6fa2b3e08cd9890a142e20ef46e6f5bc5577c6d82cdd6f1e SHA512 a989fa8d4076d55b36e2727250f0c622dd821791cd55b650c585e15689d21da8e1158c869348b6c7e772db8729b84c2e93ab10918b9e9b8a646b639c2959852c
diff --git a/app-containers/containers-image/containers-image-5.28.0.ebuild b/app-containers/containers-image/containers-image-5.28.0.ebuild
index a29e5e602b78..63b2ea7beda4 100644
--- a/app-containers/containers-image/containers-image-5.28.0.ebuild
+++ b/app-containers/containers-image/containers-image-5.28.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/image/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-shortnames/Manifest b/app-containers/containers-shortnames/Manifest
index 6cb0e4a295ca..5b2e19dccc1a 100644
--- a/app-containers/containers-shortnames/Manifest
+++ b/app-containers/containers-shortnames/Manifest
@@ -1,4 +1,4 @@
 DIST containers-shortnames-2023.02.20.tar.gz 13527 BLAKE2B 165a4c51bd284078990c94059145bb6b4bd5de4d8595eb2ccd2acc6fe8561e7edc300b7edadc684675ee281d7ada1c3a6d5aa0117c640ec22c2d2ef7e46486b5 SHA512 856dbbeb2acda276e9605bd1ecec0f8d65952c597ee2af61dd8909d7d3c04e5ef06c40b69ec4a98f79e623c536850f614c1b0af3a19637e300e7d3a285933193
-EBUILD containers-shortnames-2023.02.20.ebuild 710 BLAKE2B 06c0997714cf105a2e1bd76cd27a88eaaaa95027d6a64282adb3de09a5555263bc2bf7dc5055556bd276e549429b2e8bfef93d293757a8d592429b0415464079 SHA512 2eb4c972c63ed6de36276e0543bc7ab54b3ff12200089aa9260b2b3ab6f40cc07c20009a961411c6ba74679b179028a8db74485a3f49b7a1a56b16b6e63f4635
+EBUILD containers-shortnames-2023.02.20.ebuild 717 BLAKE2B 733fe87425afb776f85bcdc8471137171848c82dd00f4700b1342f8b6e8e7cd9d122cb09d897888e5bc1c72925606d429d511a88159f4c9293e4fe1e5f5cf43d SHA512 da2187e4aedda8f25ab2250f17f952164294c5f134396cefe740641b4d449fcd181420cdf9f1274ec47961690ddb878d718ae451f2b33ff3f4d22db191fdb2e5
 EBUILD containers-shortnames-9999.ebuild 710 BLAKE2B 06c0997714cf105a2e1bd76cd27a88eaaaa95027d6a64282adb3de09a5555263bc2bf7dc5055556bd276e549429b2e8bfef93d293757a8d592429b0415464079 SHA512 2eb4c972c63ed6de36276e0543bc7ab54b3ff12200089aa9260b2b3ab6f40cc07c20009a961411c6ba74679b179028a8db74485a3f49b7a1a56b16b6e63f4635
 MISC metadata.xml 647 BLAKE2B 33eeb1747f7a6e3740b2ebc5d005623079f532aada2db0452b5844e3cd7e0696131829005e57faa6f7cf806503554c05d06762459a6e3596f924968ad6d3e200 SHA512 b740386a29dc1777d9952ac5b66c140341a9dc3e1d8f5621ae4dbcbda37723a62f55d2ddb44843010859d9975bc109b3a35eb993e6904f3d57c5b3cda462ca19
diff --git a/app-containers/containers-shortnames/containers-shortnames-2023.02.20.ebuild b/app-containers/containers-shortnames/containers-shortnames-2023.02.20.ebuild
index fc6e0837c92f..fb1cc99ecdbc 100644
--- a/app-containers/containers-shortnames/containers-shortnames-2023.02.20.ebuild
+++ b/app-containers/containers-shortnames/containers-shortnames-2023.02.20.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/shortnames/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/containers-storage/Manifest b/app-containers/containers-storage/Manifest
index d24452d61978..85fa9d9a94ae 100644
--- a/app-containers/containers-storage/Manifest
+++ b/app-containers/containers-storage/Manifest
@@ -1,5 +1,5 @@
 AUX system-md2man-path.patch 169 BLAKE2B 707d7396af9c6a04a3a4860198acb927d6fbc68d8a1375340220778528f472f9026fff63c24cfa11ba48f6157faff3f993c0d9bac3e125de6152045ec3c9876b SHA512 6430e890fa731b4a8646bd001557bc17180c312d1efdccfd3aa611f7402eb8e8cc0ef551b5cfc9b0db60a0e69a6dd90b5c75c46139fa3d9424ae6f9700c91f64
 DIST containers-storage-1.50.2.tar.gz 4278269 BLAKE2B 3a2b08c710c043cfc130b9ffe39807e5ced8aa3cdb9805e9d9a4d0f60d8136f99e78ca03992c566b7c7d9aa1c25a2ab9da5e9edc4f1f841663302f5873dce419 SHA512 eb2ca9d243511abd5d6d1727c60166422dbfef4a3ddbb5062e58d915d0705afcd10ded8f1f79e897f9f5244fb6b6d349fbf3ed86ae57f41e31a1965c4e926941
-EBUILD containers-storage-1.50.2.ebuild 841 BLAKE2B 767bbfc7a815dd17883d59bdc4e5a530a9140c2d30dbebb818da82946db373bd95c21ecb644ea2f58c14a40ddbb334aeede16c10fe87407a9b04c8aad89308ea SHA512 cae56fcb1a491193b10bd195b46f97043af30a340aac3a6abf82ed67380e5c0d6c8893c550c13f2feba6d6c5273dbbf305afb4b8808da958b86c0ce03ddbb7ef
+EBUILD containers-storage-1.50.2.ebuild 848 BLAKE2B 3a1e022dd42dff742eab3ae424a722a2ac82fb6e57cd33844394873c7135b943356153988f26ae8ec2d006bca9b377459ee70f55c4da2cbb84b651ea01472f16 SHA512 2803733a2d2848a12bd5e00294734a0ac71d68e267e196b18b3ae7639f751ce6f6d93946789b91ae5347ca9c10b5798316574443e2134c47c99ab9e31dc1116c
 EBUILD containers-storage-9999.ebuild 841 BLAKE2B 767bbfc7a815dd17883d59bdc4e5a530a9140c2d30dbebb818da82946db373bd95c21ecb644ea2f58c14a40ddbb334aeede16c10fe87407a9b04c8aad89308ea SHA512 cae56fcb1a491193b10bd195b46f97043af30a340aac3a6abf82ed67380e5c0d6c8893c550c13f2feba6d6c5273dbbf305afb4b8808da958b86c0ce03ddbb7ef
 MISC metadata.xml 749 BLAKE2B ce52512722537fc1032a3ec28540328008665966819cf9faaa53144362bcc39a070452f688a429446fb9eaf5b55c185a4c16ccd3d3334ed632d87143acb25411 SHA512 05d49c0424b1d04dcc7a648968e41a1ef7f1c136e44d99d813708951231fb79069899304498cbd715f25785b63c6a38b66320bc670a72775a96a14079cd31864
diff --git a/app-containers/containers-storage/containers-storage-1.50.2.ebuild b/app-containers/containers-storage/containers-storage-1.50.2.ebuild
index 523b3a92b7ba..b6068bb8f73c 100644
--- a/app-containers/containers-storage/containers-storage-1.50.2.ebuild
+++ b/app-containers/containers-storage/containers-storage-1.50.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P#containers-}"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 735f75c8f482..d0b5e1d498b6 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -1,10 +1,7 @@
 AUX podman.confd 328 BLAKE2B e03a1f7f5cec555f195bd1ca9bea050a67ccac7866bd68f0c74dcbd3a6629b2da6f368274b4b664eaaa410773337a1f352c3144c3682ea0ea56b8c958b9d00a6 SHA512 58b05b7ff574f2153d7eeb3f726808e22ebe0821afc4d86dc3dea189944cdd6f2d6e1b051046456e149505b4b558a7957a278c1dba21db2fec65f2efbb3e1d84
 AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23bc6d7a3f597c04268d7f5580852dae4ab412629a513fed152f6a20a7ed432ef00cb96848c290c SHA512 bcf3e74a4a77bac82fc4679b3161091692b301426ecf81af7c5ea7e23ba66d15602d0cf1284f160d4179e52ae78f309ad826d9f3698dfcb78c2be2c6ac51417c
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
-DIST podman-4.3.1.tar.gz 12674902 BLAKE2B 6a6412e62004693cd734725556ee8a7082300676398fd2714c02168eaae29e56ec506755ef2a05b32c57620379ada3162607d01b641bc9197f9d9c77ff865fb8 SHA512 907dafc6481cbcb7a9b6771c3682a88d6c3b055050c0a180f9ceb985c1a3826318056b62dd6d2859a2a23eba7aad4bf26404327d5479bde98658745fa7d88efa
-DIST podman-4.4.1.tar.gz 14396828 BLAKE2B 4d5ff7d14fc3cbf5fce4b86bda81abfe2575f090820cd020b3c473aa46849dacf56986ef0a2cc1820536b2e89cddbd1f34d13c4e9338cb95bc9ac6ec25006f79 SHA512 33a22b7941f4f6715baa1cd2d5b29a4e2e95264c5239877122448f71e1408d8c393bcd2cdaef9516a580eede911c84f1cfea9d7b4c9d287a2737986fdc604e2c
 DIST podman-4.5.0.tar.gz 17423692 BLAKE2B ba28e77626bb4bcdb85b20031e12cf93f2eb3174b678cb8e99557df13e2cdf377ea402eb373a51ea44302f878f8e1cdedda14a2f3ad8c9e88895754fc50c272e SHA512 8a699dc01fc3d7c4a9e5ef4f166170303fc30e0f6695c61f763944e1cb755e75896108e0c4166d184fe49e3a6859f045aa3883047ebba9290e851fc128d77cac
-EBUILD podman-4.3.1.ebuild 4782 BLAKE2B 87f1324881c4b0ed54ac37a61e811b14e7b3afe42eee5408906f958b3cde4994a7a14da6e4286a67a05655d2b47578512ba57930845806d4fed8492d9cc1e982 SHA512 921dd64bc9bec2d9c7235894cdd9cd29f3cd950a534c86d278ddb8a4bdc1eab355d92aded07c3eb79bbf48c52e652c28ad0a607959e058b0c99410d31562584d
-EBUILD podman-4.4.1-r1.ebuild 4813 BLAKE2B 10518d471f431d2f61661d8ebf681595762c13f83e73ea46793483711e746b51959391e90780198cea4ac58b803e52dd5e4c5bb438bb21b1bf38b3b2651ea2db SHA512 1e5fe4f2d495a6967eb4a2cd8843fba949077390960eb27e7effbb4bd072faa4849439c3f7b665aa710c62686b0b8a4603e094986a2ce38b61b22924db779edb
+EBUILD podman-4.5.0-r1.ebuild 4159 BLAKE2B 31ce7c73fae4dd0d406fc3b772b43c4fd0c59da66fa8a6bf38e5e7ba7e85a8e0ee045e4c6810a2220df7d7db69c393a2c324dba40e444fd8fe7ea9572595804d SHA512 932b3866e31891cf9ef5b8bcda0beee02210c749ab58f64555081cd57a3a9643c4f59ce4e58ef56b7560f345262667d508cc84a7adc366be11c92af5148a6b9a
 EBUILD podman-4.5.0.ebuild 4939 BLAKE2B bf6c2708e30d5d505f7010befbbce321ee78fd525cbd16523b95dcabf744b2c0f9bc0d15dcd2547660b2791bc3ec6b5bbff188463a74e3df330961129985a133 SHA512 0980613932f7a549ccb324b8597250ca004d9ffc768e79a6a2d0f6fa28048e777b98efa91332d48ebd57c9c83e0c4a8c5d06fa988c3e64393e052c94af256dba
-MISC metadata.xml 1309 BLAKE2B f4e08317d4ed405eca3964b49bbc3a5b8a915245bc5e2b3912d254ee3e75e6475d44879b1118a34bd3fe7568d9be9f4747303eba821cda94d97a16d693f71b49 SHA512 ebabde88fb088061c48400021521c9b8b35f1c5af6a3bb8194f8eb1f4bad2506b77ed8ee8a30e76eb4e262c3d132e03930d23feb43a82604499a5c49ee35886f
+MISC metadata.xml 1668 BLAKE2B 4e6c205678b613c36205b24037fb4f9646d1d11db8c0e9e2192e945ea945aa22fc8285c39b71498127ccf673ff36b7827fff8ba9f01dc4e4fe34c43f6923edac SHA512 29d0df9df82c1073427d68aa19d6bffd0e2fd6cba5b14aa7b1ea1698815e9e5359c5d3680ae33b739e2e4eb68d6b489a587303f344e36bb7da1f42eabc79a198
diff --git a/app-containers/podman/metadata.xml b/app-containers/podman/metadata.xml
index 3a429ae48984..59685cf20a43 100644
--- a/app-containers/podman/metadata.xml
+++ b/app-containers/podman/metadata.xml
@@ -5,6 +5,14 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>rahil3108@gmail.com</email>
+		<name>Rahil Bhimjiani</name>
+	</maintainer>
 	<longdescription lang="en">
 		Podman (the POD MANager) is a tool for managing containers
 		and images, volumes mounted into those containers, and pods
@@ -35,5 +43,7 @@
 	</use>
 	<upstream>
 		<remote-id type="github">containers/podman</remote-id>
+		<bugs-to>https://github.com/containers/podman/issues</bugs-to>
+		<doc>https://podman.io/docs</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/app-containers/podman/podman-4.3.1.ebuild b/app-containers/podman/podman-4.3.1.ebuild
deleted file mode 100644
index feeee30c1bc9..000000000000
--- a/app-containers/podman/podman-4.3.1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGIT_COMMIT="814b7b003cc630bf6ab188274706c383f9fb9915"
-
-inherit bash-completion-r1 flag-o-matic go-module tmpfiles
-
-DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/"
-MY_PN=podman
-MY_P=${MY_PN}-${PV}
-SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_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 ~ppc64 ~riscv"
-IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	app-crypt/gpgme:=
-	>=app-containers/conmon-2.0.0
-	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
-	!cgroup-hybrid? ( app-containers/crun )
-	dev-libs/libassuan:=
-	dev-libs/libgpg-error:=
-	>=app-containers/cni-plugins-0.8.6
-	sys-apps/shadow:=
-	sys-fs/lvm2
-	sys-libs/libseccomp:=
-
-	apparmor? ( sys-libs/libapparmor )
-	btrfs? ( sys-fs/btrfs-progs )
-	init? ( app-containers/catatonit )
-	rootless? ( app-containers/slirp4netns )
-	selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-	fuse? ( sys-fs/fuse-overlayfs )
-	selinux? ( sec-policy/selinux-podman )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# Disable installation of python modules here, since those are
-	# installed by separate ebuilds.
-	local makefile_sed_args=(
-		-e '/^GIT_.*/d'
-		-e 's/$(GO) build/$(GO) build -v -work -x/'
-		-e 's/^\(install:.*\) install\.python$/\1/'
-		-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
-	)
-
-	has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
-	sed "${makefile_sed_args[@]}" -i Makefile || die
-}
-
-src_compile() {
-	local git_commit=${EGIT_COMMIT}
-
-	# Filter unsupported linker flags
-	filter-flags '-Wl,*'
-
-	[[ -f hack/apparmor_tag.sh ]] || die
-	if use apparmor; then
-		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
-	fi
-
-	[[ -f hack/btrfs_installed_tag.sh ]] || die
-	if use btrfs; then
-		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
-	else
-		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-			hack/btrfs_installed_tag.sh || die
-	fi
-
-	[[ -f hack/selinux_tag.sh ]] || die
-	if use selinux; then
-		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
-	else
-		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
-	fi
-
-	# Avoid this error when generating pkg/varlink/iopodman.go:
-	# cannot find package "github.com/varlink/go/varlink/idl"
-	mkdir -p _output || die
-	ln -snf ../vendor _output/src || die
-	GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
-	rm _output/src || die
-
-	export -n GOCACHE GOPATH XDG_CACHE_HOME
-	GOBIN="${S}/bin" \
-		emake all \
-			GIT_BRANCH=master \
-			GIT_BRANCH_CLEAN=master \
-			COMMIT_NO="${git_commit}" \
-			GIT_COMMIT="${git_commit}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	insinto /usr/share/containers
-	doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
-
-	newconfd "${FILESDIR}"/podman.confd podman
-	newinitd "${FILESDIR}"/podman.initd podman
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/podman.logrotated" podman
-
-	dobashcomp completions/bash/*
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/*
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/*
-
-	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
-
-	local want_newline=false
-	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-		elog "You need to create the following config files:"
-		elog "/etc/containers/registries.conf"
-		elog "/etc/containers/policy.json"
-		elog "To copy over default examples, use:"
-		elog "cp /etc/containers/registries.conf{.example,}"
-		elog "cp /etc/containers/policy.json{.example,}"
-		want_newline=true
-	fi
-	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/podman/podman-4.4.1-r1.ebuild b/app-containers/podman/podman-4.5.0-r1.ebuild
index bfb6c4323abe..d976c81b520a 100644
--- a/app-containers/podman/podman-4.4.1-r1.ebuild
+++ b/app-containers/podman/podman-4.5.0-r1.ebuild
@@ -1,31 +1,31 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-EGIT_COMMIT="34e8f3933242f2e566bbbbf343cf69b7d506c1cf"
+EAPI=8
+EGIT_COMMIT="75e3c12579d391b81d871fd1cded6cf0d043550a"
 
-inherit bash-completion-r1 flag-o-matic go-module tmpfiles
+inherit shell-completion flag-o-matic go-module tmpfiles
 
 DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
-HOMEPAGE="https://github.com/containers/podman/"
+HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
 MY_PN=podman
 MY_P=${MY_PN}-${PV}
 SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_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 ~ppc64 ~riscv"
+KEYWORDS="~amd64 ~arm64"
 IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
-RESTRICT+=" test"
+RESTRICT="test"
 
 COMMON_DEPEND="
 	app-crypt/gpgme:=
+	>=app-containers/containers-common-0.56.0
 	>=app-containers/conmon-2.0.0
 	cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6  )
 	!cgroup-hybrid? ( app-containers/crun )
 	dev-libs/libassuan:=
 	dev-libs/libgpg-error:=
-	>=app-containers/cni-plugins-0.8.6
 	sys-apps/shadow:=
 	sys-fs/lvm2
 	sys-libs/libseccomp:=
@@ -110,12 +110,8 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 
-	insinto /etc/containers
-	newins test/registries.conf registries.conf.example
-	newins test/policy.json policy.json.example
-
-	insinto /usr/share/containers
-	doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
+	insinto /etc/cni/net.d
+	doins cni/87-podman-bridge.conflist
 
 	newconfd "${FILESDIR}"/podman.confd podman
 	newinitd "${FILESDIR}"/podman.initd podman
@@ -124,12 +120,8 @@ src_install() {
 	newins "${FILESDIR}/podman.logrotated" podman
 
 	dobashcomp completions/bash/*
-
-	insinto /usr/share/zsh/site-functions
-	doins completions/zsh/*
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins completions/fish/*
+	dozshcomp completions/zsh/*
+	dofishcomp completions/fish/*
 
 	keepdir /var/lib/containers
 }
@@ -145,15 +137,6 @@ pkg_postinst() {
 	tmpfiles_process podman.conf
 
 	local want_newline=false
-	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
-		elog "You need to create the following config files:"
-		elog "/etc/containers/registries.conf"
-		elog "/etc/containers/policy.json"
-		elog "To copy over default examples, use:"
-		elog "cp /etc/containers/registries.conf{.example,}"
-		elog "cp /etc/containers/policy.json{.example,}"
-		want_newline=true
-	fi
 	if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
 		${want_newline} && elog ""
 		elog "For rootless operation, you need to configure subuid/subgid"