gentoo auto-resync : 06:05:2023 - 17:34:33

6 files changed, 57 insertions, 6 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index f4a723fbaedc..16cc3f341cac 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/conmon/Manifest b/app-containers/conmon/Manifest
index e188f6469afc..05b17c3d08a7 100644
--- a/app-containers/conmon/Manifest
+++ b/app-containers/conmon/Manifest
@@ -2,8 +2,10 @@ DIST conmon-2.0.30.tar.gz 161285 BLAKE2B c4e01759d819d3dff94b9ae09caa72b6f664e49
 DIST conmon-2.0.31.tar.gz 158184 BLAKE2B b14bae77a18cc352bc9583604544b4e7ffe4bd8a77e5c3185c897c11819bba227edcbd84b559d998a2b5648ca371f0e98e4d9cd15951a953cbe05a9c9ae9d434 SHA512 ff879fcd5a3b7de8ee6ff9de2a13d0afc36fdb392390278b26ee179be26ff375ddce4f5ae24e3e88b737f63202af64b49e82b2ffbfc0de8bfd14690dac523747
 DIST conmon-2.1.0.tar.gz 159045 BLAKE2B a39b7620091ca17f4d91a26e040f886293688562cba1827cc09c1da1c1401ad78cbb16420c9df8a055ab5ca3eb2933aec6ac1b9fbb1eea10f33b1b0d76c5dd54 SHA512 0f27a1b048c2dcafb40cd67f80c2a5d7e92f5beb849174233dc10e2db42b4ea8b89f27c901d3f38cf1d412ed875c5521e07140038e859fb54bcc554cb9197e74
 DIST conmon-2.1.6.tar.gz 157838 BLAKE2B 319a170ab048c14f3be998391da403799171c5d0e342ac4214a6456398ab872cb6a77cb4d67dbb97a0bc47008c6fa657ba2a166eea4c56ee65db545b08e032bd SHA512 0b5d7f33745766f4f1646e79554e16e1d6c977fd08c5a86c72068aec9f28110b5981c38972134741281c8470c295b6195843f3dbb78e1e9da34b8d577ea41d65
+DIST conmon-2.1.7.tar.gz 158201 BLAKE2B 2f159177cfa78ecafef0217d21c9c56942c5498022d3777368d8caf81c2503aafabf002c0f9ec0537936eca34c156ed9bdd037b5543eca1edd5489d9bc1ac215 SHA512 95d394b399a19a62b894cdd03937ab79b81051eea1db461b1bf957ddd7626d6ca4aa108b8319ed8c08adbdf99fd960c5ba29146e8b0673b5c920708912a72973
 EBUILD conmon-2.0.30.ebuild 1091 BLAKE2B e824f91e4495954361b47e65b55f916a56bd0391d561158f431c8774253dc558880ffff0ba9219dbc80704e867a6b2e64c29bca329d26f304de783d2fb198f97 SHA512 8973dbf92e9c2a6adb568ace44750e93c988b80b4359b365dec87f40452516418485f53dd47f2502ad84d5effed16b8b0e540628ef8c03bbccd0632985890982
 EBUILD conmon-2.0.31.ebuild 1114 BLAKE2B d1dde0e7551c3f69780e90f2ab271497fec8e376dc796415a6656dd0db7445407d3fa47d7bd51a46bb603846c914ecaa5e738ab2a07bd85f95e9695885ec36cb SHA512 27974fe51072e7f104d4a292fb6debcd1eceb4b96b0b4736cad7864b7c4149af8200de0e7a36a586c3055a8db0889a12990b9fe2df7b1893d2b68ee96bc71b3e
 EBUILD conmon-2.1.0.ebuild 1121 BLAKE2B ff88099f36ffc8ac8930ddc480ffcf5d1979d9b4a0be5c433326cd4d28ab5de03cdd3630508149b23ad79a6fa5c992a51ee53807ff6fc1f6712a785b5c629c8d SHA512 e2f05a9e134a94c0a9cc8ec6c522af5a426e9de8eca496916ea4ca5dfbb1ade924123393930e8f032a7663c8b5457f69ec5e88d3db80acffdba1a22438e67040
-EBUILD conmon-2.1.6.ebuild 1121 BLAKE2B 0cc624b01ebd5ac4d9a80c73ee7f75599fcf152aa68278f0ea898915f9ea99d6516f638d5688779c28a40adc3311129ecbab785946ebe438228094fbff42d3ee SHA512 36befc1261d82b7dcd8daecb171685c624a5ad5875ad4fed123e5226b6fba84408537eb34b026d00fcae3b7baa6730a96bc998cce95cab2502380936ce1397b7
+EBUILD conmon-2.1.6.ebuild 1128 BLAKE2B 2b355a1821c8252a815039b0e9658e18b5dbde2ea1e66bc3355d0e43b0ffda211deaf10733aca60187912ba685298940354e0027bb5cc147e1d9edbe76abb290 SHA512 197d4be8955cde92ee0ec8c54cfa5807309efccac70d10aa493db64543ff4808651a9c956170f0b57a1804ea81c6efd61f0792db2d8d83c9b8f9697c910dc712
+EBUILD conmon-2.1.7.ebuild 1130 BLAKE2B b940f56d8b07cdeeb6f93f1b262cdf14346b4125f64cd6df3125abe423a5dcf428dba82d8e0fb6ae5b32b13f2898f7b4e2c5704d2891b484ac62f44834f2ed34 SHA512 75ac70b8e06ecaa391c3c65748eedd5deaea6d5d566ed68ccef0c971261efc0033083cea7c41f4041b4b56923fcba13941086b730ededb4029a3d12fd4b55f72
 MISC metadata.xml 327 BLAKE2B f45e25a9bbdbdaf8142c7919e209ed153b819e5222f957600260362211946936c5cefc4f575a84930cad94d8e693efcb40e948c0f976e504a038c99b047be34b SHA512 55a208c97c7671ec03ac0a0b46ccbe70d21e336fe5e1cdc92eb987c9f499453a5f94927b7e3f397651477cf744613d39407d8d5fe1c8e730507077a3c5117b06
diff --git a/app-containers/conmon/conmon-2.1.6.ebuild b/app-containers/conmon/conmon-2.1.6.ebuild
index e595091b3668..5460a4aebb3e 100644
--- a/app-containers/conmon/conmon-2.1.6.ebuild
+++ b/app-containers/conmon/conmon-2.1.6.ebuild
@@ -11,15 +11,15 @@ SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+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"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-go/go-md2man"
 
 src_prepare() {
 	default
diff --git a/app-containers/conmon/conmon-2.1.7.ebuild b/app-containers/conmon/conmon-2.1.7.ebuild
new file mode 100644
index 000000000000..86de80dc4020
--- /dev/null
+++ b/app-containers/conmon/conmon-2.1.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 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"
+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}"
+BDEPEND="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
+}
diff --git a/app-containers/cri-tools/Manifest b/app-containers/cri-tools/Manifest
index d896af98ae80..142e90bd3e31 100644
--- a/app-containers/cri-tools/Manifest
+++ b/app-containers/cri-tools/Manifest
@@ -7,5 +7,5 @@ EBUILD cri-tools-1.23.0.ebuild 857 BLAKE2B bf93d04d671c1b42ed9cb8e0ff6e77c5c2bb1
 EBUILD cri-tools-1.24.0.ebuild 858 BLAKE2B 502603915b37de1a2d861fc65f3531a257866fffdfa0c6397758fddb5ccd92b39b860d4f990bf0e19b2f4b688d3d1af2ebe113d47259bee9eb47a68fae42c1b9 SHA512 eb8e260618b408936d88608d54c4e247075971aaf99b36ac99d7b5cc59541e75b98b7cd2d02433bf774a2d0ba8facfcbbfe0adff111941120cd8718d4f0464c4
 EBUILD cri-tools-1.24.1.ebuild 864 BLAKE2B 7ebfdbcbf2d25fc0b7f57b4e4901a61014c771d96128ef0cd7cfa1237245181c0e31b57d91e6540da1b1cc3feedc95946f9a99ba7af9f0169d0c079cb94d57e3 SHA512 cb0c92161fde44266e721b864007f4d6850db1c808ca2573a5e47f6cb64da58366f6c1435e81a62447d8886f13260a13f9f290ba8e50467f6b105685f9354cba
 EBUILD cri-tools-1.24.2.ebuild 864 BLAKE2B 7ebfdbcbf2d25fc0b7f57b4e4901a61014c771d96128ef0cd7cfa1237245181c0e31b57d91e6540da1b1cc3feedc95946f9a99ba7af9f0169d0c079cb94d57e3 SHA512 cb0c92161fde44266e721b864007f4d6850db1c808ca2573a5e47f6cb64da58366f6c1435e81a62447d8886f13260a13f9f290ba8e50467f6b105685f9354cba
-EBUILD cri-tools-1.25.0.ebuild 871 BLAKE2B c36fe925ff186120b879aae4f340214c7ea5984c1e6309b20b406b74da88ba080130a66473b9cfc9ac0c5eacca1a12564121add963f6d751e7df62d50a4c9fb4 SHA512 2f5a4b1b60d74f2ef1253e945728833b671386c030ab716104627e438cd8cee66c1592d1c53909921308df50390c61224ee7a645fb5230b9b5efaeb76bbca70e
+EBUILD cri-tools-1.25.0.ebuild 870 BLAKE2B aa699a0838d60539138310248e4bffda10cf43d1feb1506fd496566554a787b4b8b4a1a27b2102e5ac85a57ee303f666cdb4070388f03c531445a57a8ef7f36f SHA512 d7c5660c72ebc6fd8e70611d6d2286a350421ae0d8afc5ef0517e0ed9e4d8835bce98df979d83acce2258b2da9d6a559c35144fad1a4e1031154659a9502b2a6
 MISC metadata.xml 335 BLAKE2B 2144a466f521028b7bc93b372ec9b8f81f6ef5317285dede88a71736bff65aa0908bd1c8ed18b2b7b0563f14a24b10862efc81985e78c75b5c2a786d501331b1 SHA512 ae1cb972ec7ddc298a8e1747503400f52b27e899ed51b1aeba877a66c8f883248ca782b437ffea4d06cb1ad80ff6e8f071445ba848f98240e48ef5814c866c2e
diff --git a/app-containers/cri-tools/cri-tools-1.25.0.ebuild b/app-containers/cri-tools/cri-tools-1.25.0.ebuild
index 85c5e0e10d08..67c3e8b38870 100644
--- a/app-containers/cri-tools/cri-tools-1.25.0.ebuild
+++ b/app-containers/cri-tools/cri-tools-1.25.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 DEPEND="dev-lang/go"