gentoo resync : 06.08.2019

4 files changed, 62 insertions, 15 deletions

diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index 922da5188b5f..129e54ec91c2 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,5 +1,7 @@
-DIST conmon-0.2.0.tar.gz 48349 BLAKE2B f61d1750437102c3772669ac8cff75204bf6811a221212cb7127a439b57b70afacb460f4128413e242ccceb0fe44c417dcd0a7f08536f272131704f3a6cbd599 SHA512 81b6eb88a473c6b4e349e18ba48682dd15f5f1ad841d2ca6bead8b5f9b418dd20832a855a1c8d81ac77562d00cb6e5852aab4f6f4ce15f099ca63a0a3f432ec8
 DIST conmon-0.3.0.tar.gz 49021 BLAKE2B ca753f8fe0801cef4e392e2f60e58c51100628f0576c46d139c9c9827a927970ec63bb0aaebce6ac6ffaedae75b141730833b8adcafc8d9777900d96319edff3 SHA512 9a60f3eace596a8d12dc950597a9e3619a6728bf4555bb1636da3ac8ed8a6bc2ae28471cba9c7c3ad04b61a24aa4bbd28242a22940240bf27babb834031deea4
-EBUILD conmon-0.2.0.ebuild 929 BLAKE2B 8cebe07ee1dd31992efb45a3c35a1564c7806453d5c60d6f5a89a381a5c30476fae984736252f6868062161a462d7f2070ca796da3e49f54e921dd2146e03aa5 SHA512 08fefcc27c504946f006c5edd0c8a96fd55ae55db6208fdc865dbc65202f23eb79de876d2778c2c6dc3ee194227f6dfbe27dbf10aef98d24154405fba9337a11
-EBUILD conmon-0.3.0.ebuild 890 BLAKE2B 863ac75499780fe264c05e2535383e8f9a82d928236a8628f26b99d1c676273a47d4a2422d83a5df5993e1f575d59028c749d47b0fccd65f3bdd875a73112760 SHA512 e1c5230789d4285de2d98dc9d1cc34838f84b2526da176a5df8d5d1b299acc53470b0f8c93cecfc18357cded1dd62aae35e223ef4136cf730a8b632b2f46ca6d
+DIST conmon-0.4.0.tar.gz 48889 BLAKE2B 50bfa534d04428b422902ab3cd4feec5cb1cf7a6411eb35fc2420680eccc95dd17d7cd1ed8af904f6d246f10511b23b69ff112fee70d3a734098fcd7f5d7d7e7 SHA512 6aa9e0f72231bd890df4f4fe96b8831ad0fcb3e1f0edef74af8471aa227aefc3d8ea20d8bf0d50a6c06913c6360970464ea1b44fb68c77dbcc2da55073704bdd
+DIST conmon-2.0.0.tar.gz 51805 BLAKE2B 4c9e89c7d2339c82eda41b35f014ef392e185a28e93e81770bb1b9c629709c9b20ce0e7d78a0a1e2a68193e791ec45e70d427d8f4533adf5817bf806e919b524 SHA512 0d903f1b83248a130fa6a5c212f96a5bcc37113cfb93c73847a3744b9da8ca355f93f16ca57f4bfb50bcba13b272f23970fdec8ab7ac1862e93b3057512e572b
+EBUILD conmon-0.3.0.ebuild 917 BLAKE2B f725e979caeecc2467d5152230530b4cc0c63f536c0dc47c198b2c0b03e41b365b12e0f0f707cb598ef757e5d294611d0926457ee1e75ad71d1b5a8a817ecf1f SHA512 bf854a15acae1b18a6ec2ca80a5063ed64da5b46b4b39d6a8f213fd7bd7005ab672e3ede077531fa01dc32c4accb00651aaedb27294b56b7ec1bd0c70b61bd1d
+EBUILD conmon-0.4.0.ebuild 923 BLAKE2B adc16561c26da5483166b64cade0b8964f8549145f9bd503187c1d17829794c6dceacfa5276168ac51f33d5bdca5bd616c08db33f44c7f57ae0bb93d057f1ef8 SHA512 578a793aed849dc6f438a7ce35e9c9de1b914831983c423e01ab4496848699513a87ae78f918d06943636d533720e234c80cab2b8d567d564ccbd1cc2bc232b0
+EBUILD conmon-2.0.0.ebuild 923 BLAKE2B 3e6cf43b42c098ce9d4e3ec7cb62884c5587d591c0e2f1060d323954102ffeff7710a44de0560aab5ab3652c1ce34e9669d550d5057504d11330c35ed28fa256 SHA512 ba960efa3aba615d0ba4b82b832072a383c01acc2b4ffaa74af454bf8fe2bd86984fc34eb681927703868e707730d74887fae12d707cff3caf993978575b99f3
 MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775
diff --git a/app-emulation/conmon/conmon-0.3.0.ebuild b/app-emulation/conmon/conmon-0.3.0.ebuild
index 72995a2d2822..0946d32bf2f1 100644
--- a/app-emulation/conmon/conmon-0.3.0.ebuild
+++ b/app-emulation/conmon/conmon-0.3.0.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=7
 
-KEYWORDS="~amd64"
+EGIT_COMMIT="8455ce1ef385120deb827d0f0588c04357bad4c4"
 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"
 IUSE="systemd"
-EGIT_COMMIT="8455ce1ef385120deb827d0f0588c04357bad4c4"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 RDEPEND="dev-libs/glib:=
 	systemd? ( sys-apps/systemd:= )"
 DEPEND="${RDEPEND}"
diff --git a/app-emulation/conmon/conmon-0.2.0.ebuild b/app-emulation/conmon/conmon-0.4.0.ebuild
index b529698cd21c..65866c0ffe79 100644
--- a/app-emulation/conmon/conmon-0.2.0.ebuild
+++ b/app-emulation/conmon/conmon-0.4.0.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=7
 
-KEYWORDS="~amd64"
+EGIT_COMMIT="ba305505e9621fc0b4429287bfc2c2a7057af51a"
 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"
 IUSE="systemd"
-EGIT_COMMIT="59952292a3b07ac125575024ae21956efe0ecdfb"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 RDEPEND="dev-libs/glib:=
 	systemd? ( sys-apps/systemd:= )"
 DEPEND="${RDEPEND}"
@@ -19,8 +21,8 @@ src_prepare() {
 	default
 
 	if ! use systemd; then
-		sed -e 's| pkg-config --exists libsystemd-journal | false |' \
-			-e 's| pkg-config --exists libsystemd | false |' \
+		sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
 			-i Makefile || die
 	fi
 }
@@ -32,10 +34,9 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" \
-		PREFIX="${ED}/usr" \
+		PREFIX="/usr" \
 		install
-	mv "${ED}/usr/libexec"/{crio,podman} || die
-	dodir /usr/bin
-	ln "${ED}/usr/"{libexec/podman,bin}/conmon || die
+	dodir /usr/libexec/podman
+	ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
 	dodoc README.md
 }
diff --git a/app-emulation/conmon/conmon-2.0.0.ebuild b/app-emulation/conmon/conmon-2.0.0.ebuild
new file mode 100644
index 000000000000..f204af5c41de
--- /dev/null
+++ b/app-emulation/conmon/conmon-2.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="e217fdff82e0b1a6184a28c43043a4065083407f"
+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"
+IUSE="systemd"
+
+RDEPEND="dev-libs/glib:=
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}"
+
+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
+}