gentoo resync : 23.09.2020

2 files changed, 97 insertions, 0 deletions

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index f39e03185372..8d5399a58bbb 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -2,6 +2,8 @@ AUX cri-o.logrotated 81 BLAKE2B f17d96920c3e9bbfe68a38fcae49be999c0edcea085ebbc1
 AUX crio.initd 846 BLAKE2B 844400d3cd706d4f78616edb3c8a50a9819ee21aecc7fc33f7d3d00871fde86b59e4b604ccc7cdb0058b10ccd28277f19dbdce34c83b2529c14e063126318617 SHA512 29561e95398975748236217bbd9df64997f6e3de6c0555d007306bd0535895a648368385a13079eb7d52c06249a91980523a73b6563e86d0575d9cd9c3fa4ee9
 DIST cri-o-1.17.1.tar.gz 10532728 BLAKE2B 12747b0161ca2fa7dc7e95fd4c000b9011402e65dac0885ed59a37a87b53907044d3b3c873d6fe82186313af6745e463ce84be259dae99793c6363794c76e16f SHA512 1548c4b20081e8f1af772b0b0fadd0f1b63af641283bef8b8cd8478bd626699c23b30b39fe460660776bc7e6509e85db73d1d7e0d030dd7bd3dbfe319c82e332
 DIST cri-o-1.18.3.tar.gz 11210469 BLAKE2B 16a9ed89c594c082e18d5a08ba1f87eaed600b95baed1e36c5b718e9dbaf52c7b482dbf6dba94a1cbc5e02f3dc58f0f21236b6b11c65fa60666d654e28c793fd SHA512 28798d0a46a9fe361fa2e57f350375abe2a66b955447d667a0a51b39034d73f98abf06371ccf5ea27dfcad38dc46907a2fe9583b94c9a0092ad18b2485b12640
+DIST cri-o-1.19.0.tar.gz 13383665 BLAKE2B 8288985392a08fb7fdc58f509d34f8814bf9670386b7aae42be349765cb1f3bd3f4b77077e9c282a4a25b0f99b8a8fc335c6a53053bd2575b3e23c225483a1d3 SHA512 15b506d755be735d7b71e503b02b309693e3090be41f5790bd34cec460238eab56829239caf18849f3656cf8c12f77a10bbb3ae4ad81eb4e18858946e454583d
 EBUILD cri-o-1.17.1.ebuild 2547 BLAKE2B be9c8bd54a3cdfd9b9d8ba11aa58b23d26c7c58fbbb1430af0844a8356397e418972c08210f664c2c52c10529712e40f7a1a7e1dec12ae1f15c0750a6adf3d9c SHA512 02c7d53cc10c501849bf0bef5d523ab3a746f7e8c0888d732a5427dc7e5edcfacd076e93bbedb444bcb999017ed2bbbc1ad805dbbc6ae9c2458d649ef56e6668
 EBUILD cri-o-1.18.3.ebuild 2554 BLAKE2B 63fdb098fe0a0e7c73f237b7c99a6c27c1789baf6f774a791111e65a2065ec9efdb6478b79ed9dfba09aac92e0f7b0b40ea31fb497bfbb2fb8401ccb6b38218c SHA512 bd235d9e5df620783f9a40c2ff4799a4e36e948337beaae8ac104d3895b837bff4300de69bed2261bbdb32cb84960fb3e2509a1c67ec451621a4681304a9bd38
+EBUILD cri-o-1.19.0.ebuild 2554 BLAKE2B f4b09cf209c0e11b96fb2b92c1e5b969bf98a9a516039b714e455844b49f3857d153abf9c61bafc1c11a7e2be5743f7ec306e5f1ab2cebca681f4ca1ee139231 SHA512 cbd5d4071ddc0fc792e39d9585387e797fbca5426101ed1c324f2bc9abef5be52c259405f3f9814a665c5eeaccb3991358eed5beae0d6f82bfd15900751cf009
 MISC metadata.xml 907 BLAKE2B 60c92eb3aee1637dc4788228248ede35df42e6f2b82049c2a90c884c8cf676c18ed742c9935727b55c89c811e30f6eaee233cf65b6b0ebe61e86d7a3d6b842a8 SHA512 70fe7eb62159634ed9b6fe70f9c357e66979f5fca6eeb3103c0609fd6565709bf172b7d53d4ade9df89960e40538ce19434902449baa0ee6680e788dd2262b0a
diff --git a/app-emulation/cri-o/cri-o-1.19.0.ebuild b/app-emulation/cri-o/cri-o-1.19.0.ebuild
new file mode 100644
index 000000000000..35566324ab43
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.19.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT=99c925bebdd9e392f2d575e25f2e6a1082e6c232
+
+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 ~arm64"
+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
+}