gentoo auto-resync : 26:09:2023 - 05:27:14

5 files changed, 156 insertions, 1 deletions

diff --git a/app-containers/conmon/Manifest b/app-containers/conmon/Manifest
index 176da3a246c0..c277b56c27ed 100644
--- a/app-containers/conmon/Manifest
+++ b/app-containers/conmon/Manifest
@@ -1,5 +1,9 @@
+AUX conmon-2.1.8-Makefile.patch 579 BLAKE2B 29c8d059cd863fe8e04a374ad99ad6e804696ae9095f3a495cc7afd09c58c1b5c7872c0a9d4645fc1e664bfdd556b43fcb450d912b660b8ac9930235fa7c5a47 SHA512 06d5d0779093ebc8b3b5ee93197c0199a146a043a3f895f1c871bba0a60505476e018685be89c1c52ac8cc2243ada4a769b4a360e598b257b2160ada5d577d34
 DIST conmon-2.1.6.tar.gz 157838 BLAKE2B 319a170ab048c14f3be998391da403799171c5d0e342ac4214a6456398ab872cb6a77cb4d67dbb97a0bc47008c6fa657ba2a166eea4c56ee65db545b08e032bd SHA512 0b5d7f33745766f4f1646e79554e16e1d6c977fd08c5a86c72068aec9f28110b5981c38972134741281c8470c295b6195843f3dbb78e1e9da34b8d577ea41d65
 DIST conmon-2.1.7.tar.gz 158201 BLAKE2B 2f159177cfa78ecafef0217d21c9c56942c5498022d3777368d8caf81c2503aafabf002c0f9ec0537936eca34c156ed9bdd037b5543eca1edd5489d9bc1ac215 SHA512 95d394b399a19a62b894cdd03937ab79b81051eea1db461b1bf957ddd7626d6ca4aa108b8319ed8c08adbdf99fd960c5ba29146e8b0673b5c920708912a72973
+DIST conmon-2.1.8.tar.gz 120541 BLAKE2B 8ae12e674edf49f233f7423f2566a1ddea793bd4fc888618a8903a84309cb4aacea9d200bb0f8e0895c96796dca9bc2e6e73c9c8a7dcc5f2c540b05f7a73a21e SHA512 a277de8f8adf001c3e3ef6ef19d4bade36d48c5395a624ee99cb22708ea26a9954df76362006a1331efc06265cb790883b43e84f0006f80c1725a7470ff244c3
 EBUILD conmon-2.1.6.ebuild 1128 BLAKE2B 2b355a1821c8252a815039b0e9658e18b5dbde2ea1e66bc3355d0e43b0ffda211deaf10733aca60187912ba685298940354e0027bb5cc147e1d9edbe76abb290 SHA512 197d4be8955cde92ee0ec8c54cfa5807309efccac70d10aa493db64543ff4808651a9c956170f0b57a1804ea81c6efd61f0792db2d8d83c9b8f9697c910dc712
 EBUILD conmon-2.1.7.ebuild 1128 BLAKE2B 2b355a1821c8252a815039b0e9658e18b5dbde2ea1e66bc3355d0e43b0ffda211deaf10733aca60187912ba685298940354e0027bb5cc147e1d9edbe76abb290 SHA512 197d4be8955cde92ee0ec8c54cfa5807309efccac70d10aa493db64543ff4808651a9c956170f0b57a1804ea81c6efd61f0792db2d8d83c9b8f9697c910dc712
-MISC metadata.xml 327 BLAKE2B f45e25a9bbdbdaf8142c7919e209ed153b819e5222f957600260362211946936c5cefc4f575a84930cad94d8e693efcb40e948c0f976e504a038c99b047be34b SHA512 55a208c97c7671ec03ac0a0b46ccbe70d21e336fe5e1cdc92eb987c9f499453a5f94927b7e3f397651477cf744613d39407d8d5fe1c8e730507077a3c5117b06
+EBUILD conmon-2.1.8.ebuild 1530 BLAKE2B c4dfd90eb0dccd81f071bb8a842686cfee9682611e904205bdaba7fd027df0db0fe969a745998d93d55e2cf883190480beac1563cf546007069796b0b0392170 SHA512 8c8aec1dadb0081dd4d1f3d656647e31f1b2676b809ae70bec4c0263111de50e88c53ea67e4a1a63fff51392860c29c216324f5b8fa641dd49d0a2ef9da88e3e
+EBUILD conmon-9999.ebuild 1530 BLAKE2B c4dfd90eb0dccd81f071bb8a842686cfee9682611e904205bdaba7fd027df0db0fe969a745998d93d55e2cf883190480beac1563cf546007069796b0b0392170 SHA512 8c8aec1dadb0081dd4d1f3d656647e31f1b2676b809ae70bec4c0263111de50e88c53ea67e4a1a63fff51392860c29c216324f5b8fa641dd49d0a2ef9da88e3e
+MISC metadata.xml 720 BLAKE2B e7620fd23d5d0617bebc50c2fe154f0e79129a4f94c2349f7d791f0c8beaafa7154668940ad5c31e51bb90591fad5b7212cd161fa6121a84ccf5d8f6463ded67 SHA512 73ed4a64df8585753e4bd78943bf7616f1426f9e36d6ef9eac629d0c21c00c57ce5513f75434a80d7c4e902f1279ca5931048fa588b7e78928224f40cb2aa3b0
diff --git a/app-containers/conmon/conmon-2.1.8.ebuild b/app-containers/conmon/conmon-2.1.8.ebuild
new file mode 100644
index 000000000000..073e0db942c9
--- /dev/null
+++ b/app-containers/conmon/conmon-2.1.8.ebuild
@@ -0,0 +1,63 @@
+# 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"
+
+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"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	GIT_COMMIT="00e08f4a9ca5420de733bf542b930ad58e1a7e7d"
+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=(
+	"${FILESDIR}/conmon-2.1.8-Makefile.patch"
+)
+
+src_prepare() {
+	default
+	if use systemd; then
+		sed -i -e 's|shell $(PKG_CONFIG) --exists libsystemd.* && echo "0"|shell echo "0"|g;' Makefile || die
+	else
+		sed -i -e 's|shell $(PKG_CONFIG) --exists libsystemd.* && echo "0"|shell echo "1"|g;' Makefile || die
+	fi
+
+	if use seccomp; then
+		echo -e '#!/usr/bin/env bash\necho "0"' > hack/seccomp-notify.sh || die
+	else
+		echo -e '#!/usr/bin/env bash\necho "1"' > hack/seccomp-notify.sh || die
+	fi
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	export PREFIX=${EPREFIX}/usr GOMD2MAN=go-md2man
+	if [[ ${PV} == *9999* ]]; then
+		default
+	else
+		emake GIT_COMMIT="${GIT_COMMIT}"
+	fi
+}
+
+src_install() {
+	default
+	dodir /usr/libexec/podman
+	dosym ../../bin/"${PN}" /usr/libexec/podman/conmon
+}
diff --git a/app-containers/conmon/conmon-9999.ebuild b/app-containers/conmon/conmon-9999.ebuild
new file mode 100644
index 000000000000..073e0db942c9
--- /dev/null
+++ b/app-containers/conmon/conmon-9999.ebuild
@@ -0,0 +1,63 @@
+# 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"
+
+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"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+	GIT_COMMIT="00e08f4a9ca5420de733bf542b930ad58e1a7e7d"
+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=(
+	"${FILESDIR}/conmon-2.1.8-Makefile.patch"
+)
+
+src_prepare() {
+	default
+	if use systemd; then
+		sed -i -e 's|shell $(PKG_CONFIG) --exists libsystemd.* && echo "0"|shell echo "0"|g;' Makefile || die
+	else
+		sed -i -e 's|shell $(PKG_CONFIG) --exists libsystemd.* && echo "0"|shell echo "1"|g;' Makefile || die
+	fi
+
+	if use seccomp; then
+		echo -e '#!/usr/bin/env bash\necho "0"' > hack/seccomp-notify.sh || die
+	else
+		echo -e '#!/usr/bin/env bash\necho "1"' > hack/seccomp-notify.sh || die
+	fi
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	export PREFIX=${EPREFIX}/usr GOMD2MAN=go-md2man
+	if [[ ${PV} == *9999* ]]; then
+		default
+	else
+		emake GIT_COMMIT="${GIT_COMMIT}"
+	fi
+}
+
+src_install() {
+	default
+	dodir /usr/libexec/podman
+	dosym ../../bin/"${PN}" /usr/libexec/podman/conmon
+}
diff --git a/app-containers/conmon/files/conmon-2.1.8-Makefile.patch b/app-containers/conmon/files/conmon-2.1.8-Makefile.patch
new file mode 100644
index 000000000000..3c3aa0def57f
--- /dev/null
+++ b/app-containers/conmon/files/conmon-2.1.8-Makefile.patch
@@ -0,0 +1,15 @@
+--- a/Makefile
++++ b/Makefile
+@@ -41,4 +41 @@
+-ifeq ($(shell $(PKG_CONFIG) --exists libsystemd-journal && echo "0"), 0)
+-	override LIBS += $(shell $(PKG_CONFIG) --libs libsystemd-journal)
+-	override CFLAGS += $(shell $(PKG_CONFIG) --cflags libsystemd-journal) -D USE_JOURNALD=1
+-else ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0)
++ifeq ($(shell $(PKG_CONFIG) --exists libsystemd && echo "0"), 0)
+@@ -127 +123,0 @@
+-	$(MAKE) -C tools
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -4 +4 @@
+-GOMD2MAN = ../tools/build/go-md2man
++GOMD2MAN ?= ../tools/build/go-md2man
diff --git a/app-containers/conmon/metadata.xml b/app-containers/conmon/metadata.xml
index b4e9640c5697..b38c7b074e2e 100644
--- a/app-containers/conmon/metadata.xml
+++ b/app-containers/conmon/metadata.xml
@@ -5,7 +5,17 @@
 		<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>
 	<upstream>
 		<remote-id type="github">containers/conmon</remote-id>
+		<bugs-to>https://github.com/containers/conmon/issues</bugs-to>
+		<doc>https://github.com/containers/conmon/blob/main/README.md</doc>
 	</upstream>
 </pkgmetadata>