gentoo resync : 21.06.2020

2 files changed, 47 insertions, 0 deletions

diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index d325eed990fc..5d5c43dba4e8 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,5 +1,7 @@
 DIST conmon-2.0.15.tar.gz 61983 BLAKE2B c29de3c9df41b9f27fc2a0f0ac64c1ce27e5dbb21c9a74b060516692a910be4370f7cc4b6225e0243b809fd36848515b28017cb1766cc032a48d7e14b9a72726 SHA512 8310236045d8678bdd07bfd5a56f7ad1e9a01019e27ed8d24dcb83b4489240adce9e118a4fccb6cb0c0f3c31a0272d75bdafba9c50130903d87b7cb68288b470
 DIST conmon-2.0.16.tar.gz 62372 BLAKE2B 0f02689e6ca25ee2f8cdf649f60ed70ac25648dd35af765a5fd97573dd9c176d115b97cea0ea10521f055a92f0775430113f53724fc772d62630dc7daa05b4a7 SHA512 8f44b2426e3fdbb6ca0279b35262f5584c44898843daf6b64d54c3a87dcdfaf9a7283ad38973e6e0f7333ec37236ef7de1de03a3006f5f2593fdb8aff70e5e6c
+DIST conmon-2.0.18.tar.gz 63721 BLAKE2B 68b698687931bae0945d90f3c11025e1228e12d5dfba9dc9227e4d962234e50e9d775d1def0e5de1f55dbddf476449b131e4e17f83a9834fa472662a7d58ffac SHA512 1ab3e9675f16cd50e9f0fe83d473e8a91828485078add4eeb6bfb600cf3b8d0809f742a79f260aa793914e484f4f4d6c6ab287e0faa3a50f4d2a1da94a855248
 EBUILD conmon-2.0.15.ebuild 984 BLAKE2B c2486e7ee6acf3fdc0c5736891c3ab711db0ac822e4d5c5cc1a0202c3bb4b35bc9679079e7e78d6905a7f51d84caee5ad2d4aafbf667078af0d3245f5a2a4610 SHA512 fc282cc1bf20553d6948825d42a22deee3f08b0b93e991883be3de5ee5ef4d0d19d9244cb20a9cf54b9f613dac3ab6a0cb4b708e110d5a660e83bdbba6f15cba
 EBUILD conmon-2.0.16.ebuild 984 BLAKE2B 81e155f05e044b404ea55ce798d815fc220e56850ecbc6a6180d3670f3afc7650054e50f98b15f17e27714944b99614ed0dd7f981d303fbd4793be6f4388f941 SHA512 dd7532e31641fa83aa0dd040bc8cedd543ee0c9c94d6f3daab67d8f16de153b907912063cf4c5a95f3dfab5096bf8ef3284e5ffc6100082a76b753af5cdc2f3f
+EBUILD conmon-2.0.18.ebuild 984 BLAKE2B 631662ad595109f56178d1bc54535087ea2bdf591dc5ad4f33b8d020bd7e6797e076f32ec4e9cb2591d0c75926c424f771959497d6f9094ac1f7fbdcb89cb3d8 SHA512 cc0a4bf81a5fbe1073eff025644ed2886fdfa974d276b8d0eb6f50277e23ffc4a200fdef03452b50ef93c80c1180fff7dad5f956e4895d2622866e16898c50a9
 MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775
diff --git a/app-emulation/conmon/conmon-2.0.18.ebuild b/app-emulation/conmon/conmon-2.0.18.ebuild
new file mode 100644
index 000000000000..ae692f5f2207
--- /dev/null
+++ b/app-emulation/conmon/conmon-2.0.18.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="7b3e303be8f1aea7e0d4a784c8e64a75c14756a4"
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="systemd"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:=
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+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
+}
+
+src_compile() {
+	emake GIT_COMMIT="${EGIT_COMMIT}" \
+		all
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		PREFIX="/usr" \
+		install
+	dodir /usr/libexec/podman
+	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+	dodoc README.md
+}