gentoo resync : 17.02.2020

3 files changed, 196 insertions, 0 deletions

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 9dab3d0e53dc..fa0fb011212d 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -4,8 +4,12 @@ DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0f
 DIST cri-o-1.13.9.tar.gz 6685519 BLAKE2B 5d9e68c7a0ae532e2406e5e47562693cddbc34a8b3ddcab0a7a34509dff8383d1fc255cba634efb186193e5784cc6a7638387ca29e68288af7621b8b25f1a71a SHA512 1541368955c62c697dbd6b850cdf6762a13a7a308f699e3a50dbfe29fbf991f4f47cfcce75bc41745e0c27acb29457ec86d3312ef13341a5d94526865e60eb3e
 DIST cri-o-1.15.1.tar.gz 11811389 BLAKE2B 2f6e223e2d3964f480e9739ee4808101ae2ca8c0a16eb589d2e3501d370c60694843309b602a4a4b8e16ed97094f97c81ff4f23b542a9536b38f9fe9a97bcd97 SHA512 2b9122692d84e8a6832d7172782c41d354185809cd3fa999951485f8df8fd1750dd15b2005fbb3bc422f5199daeb32a768e824402c9e95f25593e250bd7ecc07
 DIST cri-o-1.15.2.tar.gz 11861335 BLAKE2B 159bdf322540c3d49f44b1fc1106d1717706f7817e4621743078dfbb5d9088318d7dda5da54ff94ed43ea58204413d496ffda424ea94ed6fd0c6e090bbba37f0 SHA512 d30a27d98537cd73bf341267922b94434958bf5e5d3a26de3af2b7899fd9d860be12a194531f81fb704abed79eac1c5139271fab1e52b994b939dafab00f1cfd
+DIST cri-o-1.16.3.tar.gz 12274620 BLAKE2B e297996184e765a89cc68adbb531eb249ad74804b05d233b4730fe56cb530e2d6d7f44ecf6939730a055acff43b0bdec13fd40583fcf003740e6dacc9770d868 SHA512 cf3d8748696e14a9fe7bb1f4e4ed5532a84367e1de42da89e1c85c33f249525a42000c74445b1f6859099a43d4076c4078efe5990a7e663795121d54d1ee1354
+DIST cri-o-1.17.0.tar.gz 10528650 BLAKE2B ba1240e602be576eb74bd9dd0c7b5d0ae3c78172902c74725ce3b85b90c739a79cf260b9ab441bc632eba85951ff1968a946824dd20849bb9ccae268b76e3fec SHA512 08b1ede35d44dd72f7a20ef02e3d27198d349d05b3fd41fc319bfba44dafdaf1843c1a6b04cd4d07ad80b5d2022376a8173b7459658a3c22011970561a1af308
 EBUILD cri-o-1.10.6.ebuild 2889 BLAKE2B 1dfaa54c22db81ef2dd51604465b4f0e030a0fb13249d4a31483648b6ce09b694ba1032310e58afca7e38230a2d0ee024e0ce0f57bb465f26dbafc36512cf36d SHA512 80d938b1c63f2499eb7acc992bbbd668a70f596f82c492360acaf2148cf0ad26959623aed55648b19179dc3db407d42952572726a056ee335a366086790bd5fc
 EBUILD cri-o-1.13.9.ebuild 3114 BLAKE2B 15fe25488ff4309d6fa4f1fe43e26380353d0f65fcce4a5cfb423af3d86cf6888da05f337ff799ad42256f9c40603f2a20dc4d2e3741bef64279a475c2ebe337 SHA512 6d8697a6e56795854582df64ae26eb116232e7e79e1217e154d02fcb0270bf2dcea111192270dab27ad8aa41ff11494a82a021cf5b0201251d0844562ad55a42
 EBUILD cri-o-1.15.1.ebuild 2914 BLAKE2B a7a7305cc116f348bbcbe68751f89aef1f75c28c960f0dd1c9503e21fa9a6edf3bd77edd69e9704c1f27116cc37d1254a26bdac6c404f5d15725cdf62be270fb SHA512 054721cef63a25757926bbc84ce8d04f3e452ac630ae61e96859bb636174c35fc29d8367b7d2a141883bbd5d912df74d334f4edb3b83a823d54e4df514653556
 EBUILD cri-o-1.15.2.ebuild 2914 BLAKE2B a7a7305cc116f348bbcbe68751f89aef1f75c28c960f0dd1c9503e21fa9a6edf3bd77edd69e9704c1f27116cc37d1254a26bdac6c404f5d15725cdf62be270fb SHA512 054721cef63a25757926bbc84ce8d04f3e452ac630ae61e96859bb636174c35fc29d8367b7d2a141883bbd5d912df74d334f4edb3b83a823d54e4df514653556
+EBUILD cri-o-1.16.3.ebuild 2576 BLAKE2B 95a9088bebd4a5f1848f5367152fc924116a9b8e1925c6757a825b64285abb23076521012dadf3490928cd1c716f68bed1a1f8fb4d4954b256a52afdb656acaa SHA512 e522a1135dcf8d119d06a85b938bd0eef9196ccbf6f24b0f8d05ca8b39797b9e6d94643f320e8383d8a2b286b0c02d6ccd3348959ae9576f400e903cb5f30f1b
+EBUILD cri-o-1.17.0.ebuild 2547 BLAKE2B e80f2c540d5b5ada86a0ff5c90b28023bc4072b1228750a5d4bfd9bd36b35e1f829227f4f4992932e04a29133785930ac70b65370b00ab0b9164ee9e3beab5c9 SHA512 ee1ce8ddf14893e4a760164ed6119e9b7b0abcf1d3271cccb9b1a7ee3234220333881356859e5710e3236a2e7b82887e4100af470e1893037c6076aa8f9dcfae
 MISC metadata.xml 995 BLAKE2B 81f504df91c54970e7bc65cc4085db45f8f95f354b578cd7ddbae6c34036201335af3c3e07efb39583314c53bdb7cde341568e7d912fa926978b5f146e9e8d25 SHA512 00809a79f64c171d9df3eda85b079bf7c36e46afe8c31c0a0cddb3999d23b09ac2282cd17e4e876a132fed55e5311990a4a4461265d409e976b23ad8ee13e759
diff --git a/app-emulation/cri-o/cri-o-1.16.3.ebuild b/app-emulation/cri-o/cri-o-1.16.3.ebuild
new file mode 100644
index 000000000000..f0c8df12dba2
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.16.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT=dd73a465144f71031728f0de8439ddda08c98119
+
+inherit go-module
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
+HOMEPAGE="https://cri-o.io/"
+SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper selinux systemd"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	app-emulation/conmon
+	app-emulation/runc
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	net-firewall/conntrack-tools
+	net-firewall/iptables
+	net-misc/cni-plugins
+	net-misc/socat
+	sys-apps/iproute2
+	sys-libs/libseccomp:=
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	selinux? ( sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="
+	${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!<app-emulation/libpod-1.3.2-r1"
+
+src_prepare() {
+	default
+
+	sed -e '/^GIT_.*/d' \
+		-e '/	git diff --exit-code/d' \
+		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
+		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+		-i Makefile || die
+
+	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
+
+	sed -e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
+		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
+		-i Makefile.inc || die
+
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-i contrib/systemd/* || die
+}
+
+src_compile() {
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+		hack/btrfs_installed_tag.sh || die; }
+
+	[[ -f hack/libdm_installed.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
+		hack/libdm_installed.sh || die; }
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		hack/selinux_tag.sh || die; }
+
+	mkdir -p bin || die
+	GOBIN="${S}/bin" \
+		emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
+
+	keepdir /etc/crio
+	mv "${ED}/etc/crio/crio.conf"{,.example} || die
+
+	newinitd "${FILESDIR}/crio.initd" crio
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+	# Suppress crio log error messages triggered if these don't exist.
+	keepdir /etc/containers/oci/hooks.d
+	keepdir /usr/share/containers/oci/hooks.d
+
+	# Suppress crio "Missing CNI default network" log message.
+	keepdir /etc/cni/net.d
+	insinto /etc/cni/net.d
+	doins contrib/cni/99-loopback.conf
+}
diff --git a/app-emulation/cri-o/cri-o-1.17.0.ebuild b/app-emulation/cri-o/cri-o-1.17.0.ebuild
new file mode 100644
index 000000000000..e5cd2811c967
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.17.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT=6d0ffae63b9b7d8f07e7f9cf50736a67fb31faf3
+
+inherit go-module
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
+HOMEPAGE="https://cri-o.io/"
+SRC_URI="https://github.com/cri-o/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper selinux systemd"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	app-emulation/conmon
+	app-emulation/runc
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	net-firewall/conntrack-tools
+	net-firewall/iptables
+	net-misc/cni-plugins
+	net-misc/socat
+	sys-apps/iproute2
+	sys-libs/libseccomp:=
+	btrfs? ( sys-fs/btrfs-progs )
+	device-mapper? ( sys-fs/lvm2:= )
+	selinux? ( sys-libs/libselinux:= )
+	systemd? ( sys-apps/systemd:= )"
+DEPEND="
+	${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!<app-emulation/libpod-1.3.2-r1"
+
+src_prepare() {
+	default
+
+	sed -e '/^GIT_.*/d' \
+		-e '/	git diff --exit-code/d' \
+		-e 's/$(GO) build -i/$(GO) build -v -work -x/' \
+		-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+		-e "s|^GIT_COMMIT := .*|GIT_COMMIT := ${EGIT_COMMIT}|" \
+		-e "s|^COMMIT_NO := .*|COMMIT_NO := ${EGIT_COMMIT}|" \
+		-i Makefile || die
+
+	echo ".NOTPARALLEL: binaries docs" >> Makefile || die
+
+	sed -e 's:/usr/local/bin:/usr/bin:' \
+		-i contrib/systemd/* || die
+}
+
+src_compile() {
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+		hack/btrfs_installed_tag.sh || die; }
+
+	[[ -f hack/libdm_installed.sh ]] || die
+	use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
+		hack/libdm_installed.sh || die; }
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		hack/selinux_tag.sh || die; }
+
+	mkdir -p bin || die
+	GOBIN="${S}/bin" \
+		emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config install.systemd
+
+	keepdir /etc/crio
+	mv "${ED}/etc/crio/crio.conf"{,.example} || die
+
+	newinitd "${FILESDIR}/crio.initd" crio
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+
+	# Suppress crio log error messages triggered if these don't exist.
+	keepdir /etc/containers/oci/hooks.d
+	keepdir /usr/share/containers/oci/hooks.d
+
+	# Suppress crio "Missing CNI default network" log message.
+	keepdir /etc/cni/net.d
+	insinto /etc/cni/net.d
+	doins contrib/cni/99-loopback.conf
+}