gentoo resync : 20.03.2022

3 files changed, 54 insertions, 2 deletions

diff --git a/app-containers/conmon/Manifest b/app-containers/conmon/Manifest
index b387a41b472d..e05f7aef64cb 100644
--- a/app-containers/conmon/Manifest
+++ b/app-containers/conmon/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD conmon-2.0.30.ebuild 1091 BLAKE2B e824f91e4495954361b47e65b55f916a56bd0391d561158f431c8774253dc558880ffff0ba9219dbc80704e867a6b2e64c29bca329d26f304de783d2fb198f97 SHA512 8973dbf92e9c2a6adb568ace44750e93c988b80b4359b365dec87f40452516418485f53dd47f2502ad84d5effed16b8b0e540628ef8c03bbccd0632985890982
-EBUILD conmon-2.0.31.ebuild 1093 BLAKE2B 1130b19d09380025cd7e24eaea16fcea0ac63fb704c121a1688438a409a47dbb81c6ae35623af674b28b634cb617f74213984ad2dc75a31a8fc8284f17750f2d SHA512 2d4b8bddddefd8a0a0bbc2f392aaca8f2676fde3f5dbcc6e54f9570963fc2a7b257c37abb28a51318bf438a4ba301d5ac64507ee53debe3153dda1c5def2d38b
+EBUILD conmon-2.0.31.ebuild 1114 BLAKE2B d1dde0e7551c3f69780e90f2ab271497fec8e376dc796415a6656dd0db7445407d3fa47d7bd51a46bb603846c914ecaa5e738ab2a07bd85f95e9695885ec36cb SHA512 27974fe51072e7f104d4a292fb6debcd1eceb4b96b0b4736cad7864b7c4149af8200de0e7a36a586c3055a8db0889a12990b9fe2df7b1893d2b68ee96bc71b3e
+EBUILD conmon-2.1.0.ebuild 1121 BLAKE2B ff88099f36ffc8ac8930ddc480ffcf5d1979d9b4a0be5c433326cd4d28ab5de03cdd3630508149b23ad79a6fa5c992a51ee53807ff6fc1f6712a785b5c629c8d SHA512 e2f05a9e134a94c0a9cc8ec6c522af5a426e9de8eca496916ea4ca5dfbb1ade924123393930e8f032a7663c8b5457f69ec5e88d3db80acffdba1a22438e67040
 MISC metadata.xml 327 BLAKE2B f45e25a9bbdbdaf8142c7919e209ed153b819e5222f957600260362211946936c5cefc4f575a84930cad94d8e693efcb40e948c0f976e504a038c99b047be34b SHA512 55a208c97c7671ec03ac0a0b46ccbe70d21e336fe5e1cdc92eb987c9f499453a5f94927b7e3f397651477cf744613d39407d8d5fe1c8e730507077a3c5117b06
diff --git a/app-containers/conmon/conmon-2.0.31.ebuild b/app-containers/conmon/conmon-2.0.31.ebuild
index 0f5ca7319b06..ac41e5569b88 100644
--- a/app-containers/conmon/conmon-2.0.31.ebuild
+++ b/app-containers/conmon/conmon-2.0.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ IUSE="systemd"
 RESTRICT="test"
 
 RDEPEND="dev-libs/glib:=
+	sys-libs/libseccomp
 	systemd? ( sys-apps/systemd:= )"
 DEPEND="${RDEPEND}
 	dev-go/go-md2man"
diff --git a/app-containers/conmon/conmon-2.1.0.ebuild b/app-containers/conmon/conmon-2.1.0.ebuild
new file mode 100644
index 000000000000..2d8d39bc47d0
--- /dev/null
+++ b/app-containers/conmon/conmon-2.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+}