gentoo auto-resync : 10:05:2024 - 00:01:13

3 files changed, 64 insertions, 5 deletions

diff --git a/app-containers/conmon/Manifest b/app-containers/conmon/Manifest
index f518b0aff34e..fd8fce312ab8 100644
--- a/app-containers/conmon/Manifest
+++ b/app-containers/conmon/Manifest
@@ -1,7 +1,10 @@
 AUX conmon-2.1.8-Makefile.patch 2294 BLAKE2B 7c80598c80fe68246ff1745091df7a95a31b990d5e473253b2f879e4bf2e610305985f3a654944fcb0bc8ce6a22790a7a48c6974c1cc6d954ae4932f6efdad94 SHA512 8c703ff19461a456d8097f14cdd0b8f222e727b7b132ea9d614587f6d8af3c9d44523fc3ff4aa465072ceaf3dd0869e9d355bb82c9f63caf43e668628cfd2d55
 DIST conmon-2.1.10.tar.gz 121047 BLAKE2B 14b4c2d541607eac0af6b335f35bd506c9a6c3d2b4e4e3ad79f32550385e90b6f7533f505565f90fb4bb1f42d528c41e9ddc7ec275c16ee982a6d0afe1c65bff SHA512 ecf1a961f431b005b54faa68b5c1bcf31d448f994ca66a56f13002216074dba79b53b52a377d4f8dab08141d6c6cf44467352fbff37175135d3da84081b27a18
+DIST conmon-2.1.11-make-docs-target-not-depend-on-install.tools.patch 985 BLAKE2B f2f34ca9a6f067f88f39726b52c5d476946413e84a93bfff2b9d4e9a0b9b117bf25a903455c3a762895746c5bca6eb93bf2ac7c2c6123d7b9bca9c345aba6230 SHA512 a9716057b0127d2b5aaca303e6d26484a5dbe91b9114259b2fded2a0c803568749b725e816004c80cb8b47ddff7a2fbcc231edd2df1d78a56ecaf6d3020c7fd7
+DIST conmon-2.1.11.tar.gz 121573 BLAKE2B 600a3e13eee5f71ef5f7aa21d9cf0184dd01c8e5e68d31aa35efcb08c3cf4305313fcfcf0aba3eedb243fe36f0e1e27f68a71627e2050c8ed4a73de273b98131 SHA512 47952f6cbbb810591d78c67856100be0edbf96d30328a10f22c3ec927bc6d1187540824c388d1fc7f3bb16fb7414339f3f20311d1baffb1fae1e38c4d5e7249c
 DIST conmon-2.1.8.tar.gz 120541 BLAKE2B 8ae12e674edf49f233f7423f2566a1ddea793bd4fc888618a8903a84309cb4aacea9d200bb0f8e0895c96796dca9bc2e6e73c9c8a7dcc5f2c540b05f7a73a21e SHA512 a277de8f8adf001c3e3ef6ef19d4bade36d48c5395a624ee99cb22708ea26a9954df76362006a1331efc06265cb790883b43e84f0006f80c1725a7470ff244c3
 EBUILD conmon-2.1.10.ebuild 1175 BLAKE2B 2618e38081f3d3923fd90ca1b9d3aca99030de051ae9736a45c52fef0d4f6836de12b4da7cabb82bc11cd6d339369b30c884c4c52dfc4c7a7ceeb891a264ee9e SHA512 fc55388d936190ad53957f6bcb79cdc6e4fa501ab4ed92c6b85984e1f5d33e181341a8f5d5e0359aaf26fd2a5261a98c99e10f2a4c2f67541f50398611551bb7
+EBUILD conmon-2.1.11.ebuild 1525 BLAKE2B 71fad1e77c95ac5f8c83f9fdf23b4e81af1f75841b72a6f401d0ad9fd999d76ea03f373ab22653b985cf6069ba9f476ee818980900aebce0bd76acc1fa77bc56 SHA512 a63543bf326238b576410fb67f66b1ca5cfa97bdc1d218dbdc962cd5a64700eaf89a57df4244a0fa9c3f1514615d07de209b15f78b9f4bb60d442c0c695bc24d
 EBUILD conmon-2.1.8.ebuild 1528 BLAKE2B ad4eaf787c5aaf86a1211c15c99a1feef0108dc007ecbe7c5e2802abe165343a15a6584193accefd704cc252219f9b093d935a40c8f5ce79694bf94a436bc0ab SHA512 d394e22f4398fe2f7dc034e3e136a163cdc9c476f0294ddbc2022b953bff5b1b3343cb49772804349b9cd3a3f869174b7a9f823d11612d5c897099e8be698746
-EBUILD conmon-9999.ebuild 1175 BLAKE2B 2618e38081f3d3923fd90ca1b9d3aca99030de051ae9736a45c52fef0d4f6836de12b4da7cabb82bc11cd6d339369b30c884c4c52dfc4c7a7ceeb891a264ee9e SHA512 fc55388d936190ad53957f6bcb79cdc6e4fa501ab4ed92c6b85984e1f5d33e181341a8f5d5e0359aaf26fd2a5261a98c99e10f2a4c2f67541f50398611551bb7
+EBUILD conmon-9999.ebuild 1134 BLAKE2B 0b63958fb15025171ce0d86d6354f4336b35bfdf0bb292ebb5c604c125e05795ac580efa564292b3f55aae225122644587827edd3accb6c7c6b53e5bf20d2ec3 SHA512 dcf406072a7d7d2e3c42de239f1c2fa6d29e5b9fa372d5042fc01a2f3e1c0e8fb8643837f71e0e68d66391e47ed9bb0e58bc0d71c4005ac7e84f13e8ea02de69
 MISC metadata.xml 715 BLAKE2B 90d22c010d0f541ce8b15c23027c5ce0683eee92ad263fbe9e877797f724f1c226dc4499ca147919aafcafe14c0dc8083daef946cf9e5ca74114e7d21c1f531f SHA512 f17ce6cdd2215bc4a047c9eb62282407d7b39932affea659ef100f7972c9b4db176e0dcd036d731bf870bc149d6afcb4be0dda03e8f4c411c8c828f166a995d4
diff --git a/app-containers/conmon/conmon-2.1.11.ebuild b/app-containers/conmon/conmon-2.1.11.ebuild
new file mode 100644
index 000000000000..13d3d6c215c3
--- /dev/null
+++ b/app-containers/conmon/conmon-2.1.11.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 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"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/conmon.git"
+else
+	SRC_URI="
+		https://github.com/containers/conmon/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz
+		https://github.com/Flowdalic/conmon/commit/ff8794c5bc0805cc430229728befde16da47b68c.patch
+			-> ${PN}-2.1.11-make-docs-target-not-depend-on-install.tools.patch
+	"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+seccomp systemd"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:=
+	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-go/go-md2man"
+
+PATCHES=(
+	# https://github.com/containers/conmon/pull/507
+	"${DISTDIR}"/${PN}-2.1.11-make-docs-target-not-depend-on-install.tools.patch
+)
+
+src_prepare() {
+	# https://github.com/containers/conmon/pull/505
+	echo "${PV}" > VERSION || die
+
+	default
+	sed -i -e "s|shell.*--exists libsystemd.* && echo \"0\"|shell echo $(usex systemd 0 1)|g;" Makefile || die
+	echo -e "#!/usr/bin/env bash\necho $(usex seccomp 0 1)" > hack/seccomp-notify.sh || die
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	export PREFIX="${EPREFIX}/usr" GOMD2MAN=$(command -v go-md2man)
+	default
+}
+
+src_install() {
+	default
+	dodir /usr/libexec/podman
+	dosym ../../bin/"${PN}" /usr/libexec/podman/"${PN}"
+}
diff --git a/app-containers/conmon/conmon-9999.ebuild b/app-containers/conmon/conmon-9999.ebuild
index c41813b997a1..bed057cb8f10 100644
--- a/app-containers/conmon/conmon-9999.ebuild
+++ b/app-containers/conmon/conmon-9999.ebuild
@@ -26,9 +26,6 @@ RDEPEND="dev-libs/glib:=
 	systemd? ( sys-apps/systemd:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-go/go-md2man"
-PATCHES=(
-	"${FILESDIR}/conmon-2.1.8-Makefile.patch"
-)
 
 src_prepare() {
 	default
@@ -38,7 +35,7 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC PKG_CONFIG
-	export PREFIX="${EPREFIX}/usr" GOMD2MAN=go-md2man
+	export PREFIX="${EPREFIX}/usr" GOMD2MAN=$(command -v go-md2man)
 	default
 }