gentoo resync : 02.06.2019

4 files changed, 27 insertions, 29 deletions

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index eee3590919e3..eb7e45ae959d 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,9 +1,9 @@
 AUX cri-o.logrotated 81 BLAKE2B f17d96920c3e9bbfe68a38fcae49be999c0edcea085ebbc1f09585284c5b7930c185d5cd0ef6c2f7de5db2a6af80355518628a050c1cb0639ccf3b53c6c338da SHA512 1115228546a696eeebeb6d4b3e5c3152af0c99a2559097fc5829d8b416d979c457b4b1789e0120054babf57f585d3f63cbe49949d40417ae7aab613184bf4516
 AUX crio.initd 846 BLAKE2B 844400d3cd706d4f78616edb3c8a50a9819ee21aecc7fc33f7d3d00871fde86b59e4b604ccc7cdb0058b10ccd28277f19dbdce34c83b2529c14e063126318617 SHA512 29561e95398975748236217bbd9df64997f6e3de6c0555d007306bd0535895a648368385a13079eb7d52c06249a91980523a73b6563e86d0575d9cd9c3fa4ee9
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367 SHA512 b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
-DIST cri-o-1.13.5.tar.gz 6683259 BLAKE2B 982de5590411ad618401a2909dcd4f0404d5bfc49667027e29fd266e3e2d15bbf0d7716db570d433eec7f2baacbb33f7e9e0f347aa2ef964a06b8b883f76404c SHA512 116e51e9b31fca66b4edd9aac5d1f0c8929ba9a740af8b611fb7fa0e675e37facd4114d0848090b32f72f58d17c85060c15e07bee82098d83a0bd5b563f4c875
-DIST cri-o-1.13.7.tar.gz 6657183 BLAKE2B 8073211bb188bf6a03615fe5d3f931d45dee09bb506316e80c6b0914d3b798e77e194d6f31e74e314406af28c4a882e45250f8c6792c82d9b0e3cceb0750cf1a SHA512 5056f26decc96798738aa67350b0d7353ac025518c82e2591f4541284bbc3620976a97dcc805429adc748131f38d13edcdb77c3b6f1ba6b93f672637437acb10
+DIST cri-o-1.13.9.tar.gz 6685519 BLAKE2B 5d9e68c7a0ae532e2406e5e47562693cddbc34a8b3ddcab0a7a34509dff8383d1fc255cba634efb186193e5784cc6a7638387ca29e68288af7621b8b25f1a71a SHA512 1541368955c62c697dbd6b850cdf6762a13a7a308f699e3a50dbfe29fbf991f4f47cfcce75bc41745e0c27acb29457ec86d3312ef13341a5d94526865e60eb3e
+DIST cri-o-1.14.2.tar.gz 9347347 BLAKE2B 83a0d77245bc841a9f89c55c853b64e69cec124da07b1314cfc27237cc82c55e49becc0f14c579a09d23e8da047c6bbb285b0eb79c4609a23827ab24ae28ce4a SHA512 1499b09a8f5c51b426bd8fba7c254288707524a363bfa97537edd35fdf29ac354d13578f2bf3c09c2d128650082f9a2bfbf69872fa9fce77dbff43913afc8066
 EBUILD cri-o-1.10.6.ebuild 2850 BLAKE2B c83cc04c151b93c1fa95920dbc99e1a27f0add2fd17fdfdf5179df04438f0c62ab06c4df3cb352359bef1ba02805fe1b311ad9670481282e9dfc2e8d6feba14d SHA512 d08b6ce7eae731aed66892753dfe2ec8872bddc4054446c74ca084cf814c9a95033b996037b26d49bfff100e605edb6ee284ecb57fe959d705c5465c67ec5c2c
-EBUILD cri-o-1.13.5.ebuild 3075 BLAKE2B 34c608002088de6253a3bdd5445ccccfc806da1dafb3cb47b5de67986de5b4d803fd7790e5e573a1f055a5b63797209f761b542182fd677e8edc8111f72e1bbe SHA512 318d67f5c853cbd773ae2b6d92a593e093c6456e5622dddf4f1fbb4bed64dfdf721dced841a7018e14e5f27a6ee1a5b4e0324272d01cf05c9c443c9e8aa4331e
-EBUILD cri-o-1.13.7.ebuild 3075 BLAKE2B cfcf1ee7ce2d1ec39e917507b8eff776f13c23c789af4411eb2f4d4bcfc19d59b937ef0e2de924f318d1e6681e74530d99c607a075d0827796dcfbd8c22a27ed SHA512 3db46d7063fd93e5461b399f61bb85a15194237ddb0715bb3ab39affabd0e201587e553b099d3eb33226ae4e3824cec442a44c84681cabfae5acb72a15381493
-MISC metadata.xml 1005 BLAKE2B 2135f0344ae8ddad14851716be3816eca09e8fd44179cb1853ce35ab96ea77187e0028b2d53ab6802fc40df72d9dac568cc2dd2665e85d9ade71bce0ebddd995 SHA512 db455ac2997f0487aab95c753b8b19a89e863b2d1bb97b5d340d5cea511650cc2abde6f67c2e113517b01a2445f276cff5b5615cd6a6b69c7f590550192b5ac6
+EBUILD cri-o-1.13.9.ebuild 3075 BLAKE2B 232426f67cc91dce71e79bf89dfca85901bdb89cc48d9d8841e17d68414db749937ca21efaaa3f3014976a993eb598694b5ef61ee2ff8340620207db3ef22a58 SHA512 67b26c8a9b4e997ff7b5bee0603de14358f7fc4c99b662f0de839aa66457f1e81e341a3caccaececf62c721d4b059a864d6610fa0ecf38b648c70308e4f89e83
+EBUILD cri-o-1.14.2.ebuild 3004 BLAKE2B f8d1d2e2282275f99ff8132cd998cd3d378f9fe75152770f2f813e8606ef814700c304d93159e7d47a41c58b05db69699bce23fb4aa6f4f8fa61a0824345de0d SHA512 de591769d120c1c1b0898b9b7533083b94ba176684441f3ea5d02a6dbd314f85ab3152f3bcd3556509e01d81de9db4e8d56a2a52e8ba633cd48360f3b99a53a1
+MISC metadata.xml 995 BLAKE2B 81f504df91c54970e7bc65cc4085db45f8f95f354b578cd7ddbae6c34036201335af3c3e07efb39583314c53bdb7cde341568e7d912fa926978b5f146e9e8d25 SHA512 00809a79f64c171d9df3eda85b079bf7c36e46afe8c31c0a0cddb3999d23b09ac2282cd17e4e876a132fed55e5311990a4a4461265d409e976b23ad8ee13e759
diff --git a/app-emulation/cri-o/cri-o-1.13.7.ebuild b/app-emulation/cri-o/cri-o-1.13.9.ebuild
index a032de19c999..8fc1dca0d81e 100644
--- a/app-emulation/cri-o/cri-o-1.13.7.ebuild
+++ b/app-emulation/cri-o/cri-o-1.13.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-EGIT_COMMIT="42585737f5eb59273e791e47ab1643e10862d67f"
+EGIT_COMMIT="d70609afd5e933948284aebf15966bdc098d28b3"
 EGO_PN="github.com/kubernetes-sigs/${PN}"
 
 inherit golang-vcs-snapshot systemd
diff --git a/app-emulation/cri-o/cri-o-1.13.5.ebuild b/app-emulation/cri-o/cri-o-1.14.2.ebuild
index 2478498c2a74..5e2a18c86067 100644
--- a/app-emulation/cri-o/cri-o-1.13.5.ebuild
+++ b/app-emulation/cri-o/cri-o-1.14.2.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_COMMIT="a9d8dde49418572b6ea843a5d3346c966e82077f"
-EGO_PN="github.com/kubernetes-sigs/${PN}"
+EGIT_COMMIT="76b057a5a72ae379bb2f4915b791146d37a3f6cf"
+EGO_PN="github.com/cri-o/${PN}"
 
-inherit golang-vcs-snapshot systemd
+inherit golang-vcs-snapshot
 
 DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
 HOMEPAGE="https://cri-o.io/"
-SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="btrfs +device-mapper ostree seccomp selinux"
+IUSE="btrfs +device-mapper ostree selinux systemd"
 
 COMMON_DEPEND="
 	app-crypt/gpgme:=
@@ -28,15 +28,17 @@ COMMON_DEPEND="
 	net-misc/cni-plugins
 	net-misc/socat
 	sys-apps/iproute2
+	sys-libs/libseccomp:=
 	btrfs? ( sys-fs/btrfs-progs )
 	device-mapper? ( sys-fs/lvm2:= )
 	ostree? ( dev-util/ostree )
-	seccomp? ( sys-libs/libseccomp:= )
-	selinux? ( sys-libs/libselinux:= )"
+	selinux? ( sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )"
 DEPEND="
 	${COMMON_DEPEND}
 	dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!<app-emulation/libpod-1.3.2-r1"
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 
 src_prepare() {
@@ -56,6 +58,12 @@ src_prepare() {
 
 	sed -e 's:/usr/local/bin:/usr/bin:' \
 		-i contrib/systemd/* || die
+
+	if ! use systemd; then
+		sed -e 's| pkg-config --exists libsystemd-journal | false |' \
+			-e 's| pkg-config --exists libsystemd | false |' \
+			-i conmon/Makefile || die
+	fi
 }
 
 src_compile() {
@@ -71,28 +79,20 @@ src_compile() {
 	use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
 		hack/ostree_tag.sh || die; }
 
-	[[ -f hack/seccomp_tag.sh ]] || die
-	use seccomp || { echo -e "#!/bin/sh\ntrue" > \
-		hack/seccomp_tag.sh || die; }
-
 	[[ -f hack/selinux_tag.sh ]] || die
 	use selinux || { echo -e "#!/bin/sh\ntrue" > \
 		hack/selinux_tag.sh || die; }
 
 	mkdir -p bin || die
 	GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
-		emake binaries docs
+		emake all
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
 
 	keepdir /etc/crio
-	insinto /etc/crio
-	use seccomp && doins seccomp.json
-
-	"${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die
-	doins   "${T}/crio.conf.example"
+	mv "${ED}/etc/crio/crio.conf"{,.example} || die
 
 	newinitd "${FILESDIR}/crio.initd" crio
 
@@ -107,6 +107,4 @@ src_install() {
 	keepdir /etc/cni/net.d
 	insinto /etc/cni/net.d
 	doins contrib/cni/99-loopback.conf
-
-	systemd_dounit contrib/systemd/*
 }
diff --git a/app-emulation/cri-o/metadata.xml b/app-emulation/cri-o/metadata.xml
index e48b961a7b5a..0ebb508fdee4 100644
--- a/app-emulation/cri-o/metadata.xml
+++ b/app-emulation/cri-o/metadata.xml
@@ -26,6 +26,6 @@
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">kubernetes-sigs/cri-o</remote-id>
+		<remote-id type="github">cri-o/cri-o</remote-id>
 	</upstream>
 </pkgmetadata>