[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/files/, app-emulation/cri-o/, app-containers/cri-o/, ...

2021-12-20 Thread Georgy Yakovlev 
commit: 28e20789d699f4e9cc0a4107b84b4e5566391bdb
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Mon Dec 20 07:29:50 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Mon Dec 20 08:51:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28e20789

Move {app-emulation -> app-containers}/cri-o

Signed-off-by: Georgy Yakovlev  gentoo.org>

 {app-emulation => app-containers}/cri-o/Manifest   | 0
 {app-emulation => app-containers}/cri-o/cri-o-1.21.0.ebuild| 0
 {app-emulation => app-containers}/cri-o/cri-o-1.21.4.ebuild| 0
 {app-emulation => app-containers}/cri-o/cri-o-1.22.1.ebuild| 0
 {app-emulation => app-containers}/cri-o/files/cri-o.logrotated | 0
 {app-emulation => app-containers}/cri-o/files/crio.initd   | 0
 {app-emulation => app-containers}/cri-o/metadata.xml   | 0
 profiles/updates/4Q-2021   | 1 +
 8 files changed, 1 insertion(+)

diff --git a/app-emulation/cri-o/Manifest b/app-containers/cri-o/Manifest
similarity index 100%
rename from app-emulation/cri-o/Manifest
rename to app-containers/cri-o/Manifest

diff --git a/app-emulation/cri-o/cri-o-1.21.0.ebuild 
b/app-containers/cri-o/cri-o-1.21.0.ebuild
similarity index 100%
rename from app-emulation/cri-o/cri-o-1.21.0.ebuild
rename to app-containers/cri-o/cri-o-1.21.0.ebuild

diff --git a/app-emulation/cri-o/cri-o-1.21.4.ebuild 
b/app-containers/cri-o/cri-o-1.21.4.ebuild
similarity index 100%
rename from app-emulation/cri-o/cri-o-1.21.4.ebuild
rename to app-containers/cri-o/cri-o-1.21.4.ebuild

diff --git a/app-emulation/cri-o/cri-o-1.22.1.ebuild 
b/app-containers/cri-o/cri-o-1.22.1.ebuild
similarity index 100%
rename from app-emulation/cri-o/cri-o-1.22.1.ebuild
rename to app-containers/cri-o/cri-o-1.22.1.ebuild

diff --git a/app-emulation/cri-o/files/cri-o.logrotated 
b/app-containers/cri-o/files/cri-o.logrotated
similarity index 100%
rename from app-emulation/cri-o/files/cri-o.logrotated
rename to app-containers/cri-o/files/cri-o.logrotated

diff --git a/app-emulation/cri-o/files/crio.initd 
b/app-containers/cri-o/files/crio.initd
similarity index 100%
rename from app-emulation/cri-o/files/crio.initd
rename to app-containers/cri-o/files/crio.initd

diff --git a/app-emulation/cri-o/metadata.xml 
b/app-containers/cri-o/metadata.xml
similarity index 100%
rename from app-emulation/cri-o/metadata.xml
rename to app-containers/cri-o/metadata.xml

diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index 84d6192b4cc1..cb230041d8fc 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -37,3 +37,4 @@ move app-emulation/buildah app-containers/buildah
 move app-emulation/cadvisor app-containers/cadvisor
 move app-emulation/conmon app-containers/conmon
 move app-emulation/containers-storage app-containers/containers-storage
+move app-emulation/cri-o app-containers/cri-o

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2021-04-26 Thread Zac Medico 
commit: 449dae000afa1038f206f231ada81254df905a5d
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Apr 26 23:18:45 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 26 23:20:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=449dae00

app-emulation/cri-o: Remove vulnerable versions

Bug: https://bugs.gentoo.org/785904
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|  3 --
 app-emulation/cri-o/cri-o-1.17.1.ebuild | 95 -
 app-emulation/cri-o/cri-o-1.18.3.ebuild | 95 -
 app-emulation/cri-o/cri-o-1.19.0.ebuild | 95 -
 4 files changed, 288 deletions(-)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index d7ff5b78000..150bb961cd3 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -41,9 +41,6 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.12.0.mod 443 
BLAKE2B 067bb19e6d9f
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B 
c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead
 SHA512 
33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 
2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b
 SHA512 
e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 
621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511
 SHA512 
409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
-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
 DIST cri-o-1.21.0.tar.gz 14014014 BLAKE2B 
352f0313eba7b984dd37e64791c25e5d1dd1ab52ed7123062485362542f7b143aa2324b0788ff86a30423e10ec6b9df276a97f2ab7f7c2f2db0c4516f7c78931
 SHA512 
69c13b00d259f9dc45192493dff0ab853f181629fba5408d895a96e291c2ed20235beea18b70ab77d6d8f593dc0a2c06ca29a40211caaedf51d89b58afcfe77e
 DIST 
dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 
36 BLAKE2B 
b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00
 SHA512 
196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 DIST 
dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20201218220906-28db891af037.mod 
36 BLAKE2B 
b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00
 SHA512 
196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1

diff --git a/app-emulation/cri-o/cri-o-1.17.1.ebuild 
b/app-emulation/cri-o/cri-o-1.17.1.ebuild
deleted file mode 100644
index d528603cf52..000
--- a/app-emulation/cri-o/cri-o-1.17.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT=ee2de87bd8e2a7a84799476cb4fc4ce8a78fdf6d
-
-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:=
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/, app-emulation/podman/, app-emulation/libpod/, ...

2021-01-18 Thread Zac Medico 
commit: 7bbc3ba1cb59752158092a0b1df0abc9dc70901b
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Jan 18 15:50:10 2021 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Jan 18 17:04:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bbc3ba1

app-emulation/podman: rename app-emulation/libpod

Closes: https://bugs.gentoo.org/765844
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/cri-o-1.17.1.ebuild |  2 +-
 app-emulation/cri-o/cri-o-1.18.3.ebuild |  2 +-
 app-emulation/cri-o/cri-o-1.19.0.ebuild |  2 +-
 app-emulation/{libpod => podman}/Manifest   |  0
 app-emulation/{libpod => podman}/files/podman.initd |  0
 app-emulation/{libpod => podman}/files/podman.logrotated|  0
 app-emulation/{libpod => podman}/metadata.xml   | 13 -
 .../libpod-2.2.1.ebuild => podman/podman-2.2.1.ebuild}  |  8 
 profiles/updates/1Q-2021|  1 +
 9 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app-emulation/cri-o/cri-o-1.17.1.ebuild 
b/app-emulation/cri-o/cri-o-1.17.1.ebuild
index f8d6d2c59f4..d528603cf52 100644
--- a/app-emulation/cri-o/cri-o-1.17.1.ebuild
+++ b/app-emulation/cri-o/cri-o-1.17.1.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 DEPEND="
${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
-   !Zac Medico


-   libpod provides a library for applications looking to use the
-   Container Pod concept popularized by Kubernetes. libpod also
-   contains a tool called podman for managing Pods, Containers,
-   and Container Images.
+   Podman (the POD MANager) is a tool for managing containers
+   and images, volumes mounted into those containers, and pods
+   made from groups of containers. Podman is based on libpod,
+   a library for container lifecycle management that is also
+   contained in this repository. The libpod library provides
+   APIs for managing containers, pods, container images,
+   and volumes.



@@ -28,6 +31,6 @@



-   containers/libpod
+   containers/podman

 

diff --git a/app-emulation/libpod/libpod-2.2.1.ebuild 
b/app-emulation/podman/podman-2.2.1.ebuild
similarity index 95%
rename from app-emulation/libpod/libpod-2.2.1.ebuild
rename to app-emulation/podman/podman-2.2.1.ebuild
index fc16a6b258e..bca75d6fddb 100644
--- a/app-emulation/libpod/libpod-2.2.1.ebuild
+++ b/app-emulation/podman/podman-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -131,9 +131,9 @@ src_install() {
 }
 
 pkg_preinst() {
-   LIBPOD_ROOTLESS_UPGRADE=false
+   PODMAN_ROOTLESS_UPGRADE=false
if use rootless; then
-   has_version 'app-emulation/libpod[rootless]' || 
LIBPOD_ROOTLESS_UPGRADE=true
+   has_version 'app-emulation/podman[rootless]' || 
PODMAN_ROOTLESS_UPGRADE=true
fi
 }
 
@@ -148,7 +148,7 @@ pkg_postinst() {
elog "cp /etc/containers/policy.json{.example,}"
want_newline=true
fi
-   if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+   if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
${want_newline} && elog ""
elog "For rootless operation, you need to configure 
subuid/subgid"
elog "for user running podman. In case subuid/subgid has only 
been"

diff --git a/profiles/updates/1Q-2021 b/profiles/updates/1Q-2021
index 38b0edfd30f..0cd6d895028 100644
--- a/profiles/updates/1Q-2021
+++ b/profiles/updates/1Q-2021
@@ -1 +1,2 @@
 slotmove >=sys-auth/libfprint-1.90 0 2
+move app-emulation/libpod app-emulation/podman

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2020-09-21 Thread Zac Medico 
commit: 5b4c72bac5701d30978cc09be05e99623a09eccc
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Sep 21 16:32:57 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Sep 21 16:34:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4c72ba

app-emulation/cri-o: Bump to version 1.19.0

Reported-by: Nick Pavlov  gmail.com>
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|  1 +
 app-emulation/cri-o/cri-o-1.19.0.ebuild | 95 +
 2 files changed, 96 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index c6b29f8e29a..10b6399bd01 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,2 +1,3 @@
 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

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 000..35566324ab4
--- /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}
+   !> 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
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2020-08-31 Thread Alexis Ballier 
commit: 18928c4fd8ac5c14586943145a02fbfec71fff9b
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Aug 31 10:15:09 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Aug 31 10:18:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18928c4f

app-emulation/cri-o: keyword ~arm64

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Alexis Ballier  gentoo.org>

 app-emulation/cri-o/cri-o-1.18.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cri-o/cri-o-1.18.3.ebuild 
b/app-emulation/cri-o/cri-o-1.18.3.ebuild
index f74c4b4386e..96ab6f0d285 100644
--- a/app-emulation/cri-o/cri-o-1.18.3.ebuild
+++ b/app-emulation/cri-o/cri-o-1.18.3.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~amd64 ~arm64"
 IUSE="btrfs +device-mapper selinux systemd"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2020-08-19 Thread Zac Medico 
commit: 6054f419e41266317d49e42bb378f83c575b21d8
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Aug 19 16:47:25 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Aug 19 16:47:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6054f419

app-emulation/cri-o: Remove old versions

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   6 --
 app-emulation/cri-o/cri-o-1.10.6.ebuild | 105 --
 app-emulation/cri-o/cri-o-1.13.9.ebuild | 112 
 app-emulation/cri-o/cri-o-1.15.1.ebuild | 107 --
 app-emulation/cri-o/cri-o-1.15.2.ebuild | 107 --
 app-emulation/cri-o/cri-o-1.16.3.ebuild |  97 ---
 app-emulation/cri-o/cri-o-1.17.0.ebuild |  95 ---
 app-emulation/cri-o/metadata.xml|   3 -
 8 files changed, 632 deletions(-)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 3c47d5db492..c6b29f8e29a 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,8 +1,2 @@
-DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B 
bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367
 SHA512 
b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
-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 
2b9122692d84e8a6832d7172782c41d354185809cd3fa51485f8df8fd1750dd15b2005fbb3bc422f5199daeb32a768e824402c9e95f25593e250bd7ecc07
-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
 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

diff --git a/app-emulation/cri-o/cri-o-1.10.6.ebuild 
b/app-emulation/cri-o/cri-o-1.10.6.ebuild
deleted file mode 100644
index a5292a57902..000
--- a/app-emulation/cri-o/cri-o-1.10.6.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_COMMIT="56d7d9a0750d7deb06182361837b690683f13dfe"
-EGO_PN="github.com/kubernetes-incubator/${PN}"
-
-inherit golang-vcs-snapshot systemd
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime 
Interface"
-HOMEPAGE="https://cri-o.io/;
-SRC_URI="https://github.com/kubernetes-incubator/${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 ostree seccomp selinux"
-
-COMMON_DEPEND="
-   app-crypt/gpgme:=
-   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
-   btrfs? ( sys-fs/btrfs-progs )
-   device-mapper? ( sys-fs/lvm2:= )
-   ostree? ( dev-util/ostree )
-   seccomp? (

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2020-08-19 Thread Zac Medico 
commit: e1831069e295b9a3cd213159de150f0dc8a4a838
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Aug 19 16:35:06 2020 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Aug 19 16:39:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1831069

app-emulation/cri-o: Bump to version 1.18.3

Reported-by: Konstantin (Qrator Labs)  qrator.net>
Bug: https://bugs.gentoo.org/720740
Bug: https://bugs.gentoo.org/737994
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|  1 +
 app-emulation/cri-o/cri-o-1.18.3.ebuild | 95 +
 2 files changed, 96 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index ebf01ec2a21..3c47d5db492 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -5,3 +5,4 @@ DIST cri-o-1.15.2.tar.gz 11861335 BLAKE2B 
159bdf322540c3d49f44b1fc1106d1717706f7
 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
 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

diff --git a/app-emulation/cri-o/cri-o-1.18.3.ebuild 
b/app-emulation/cri-o/cri-o-1.18.3.ebuild
new file mode 100644
index 000..f74c4b4386e
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.18.3.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=61de18161fb4ccda720768c001713592b5a04e46
+
+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}
+   !> 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

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2020-03-17 Thread William Hubbs 
commit: 4a4777fce5f9887dfe36457982cc36ad9263b80d
Author: William Hubbs  gentoo  org>
AuthorDate: Tue Mar 17 15:00:49 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Tue Mar 17 15:01:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a4777fc

app-emulation/cri-o: 1.17.1 bump

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/cri-o/Manifest|  1 +
 app-emulation/cri-o/cri-o-1.17.1.ebuild | 95 +
 2 files changed, 96 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 09b55302975..ebf01ec2a21 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -4,3 +4,4 @@ DIST cri-o-1.15.1.tar.gz 11811389 BLAKE2B 
2f6e223e2d3964f480e9739ee4808101ae2ca8
 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
+DIST cri-o-1.17.1.tar.gz 10532728 BLAKE2B 
12747b0161ca2fa7dc7e95fd4c000b9011402e65dac0885ed59a37a87b53907044d3b3c873d6fe82186313af6745e463ce84be259dae99793c6363794c76e16f
 SHA512 
1548c4b20081e8f1af772b0b0fadd0f1b63af641283bef8b8cd8478bd626699c23b30b39fe460660776bc7e6509e85db73d1d7e0d030dd7bd3dbfe319c82e332

diff --git a/app-emulation/cri-o/cri-o-1.17.1.ebuild 
b/app-emulation/cri-o/cri-o-1.17.1.ebuild
new file mode 100644
index 000..f8d6d2c59f4
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.17.1.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=ee2de87bd8e2a7a84799476cb4fc4ce8a78fdf6d
+
+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}
+   !> 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
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2020-02-12 Thread William Hubbs 
commit: 3e82a94eecb261166b1cf6008999d19902deb0ad
Author: William Hubbs  sony  com>
AuthorDate: Wed Feb 12 20:48:31 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Feb 12 21:33:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e82a94e

app-emulation/cri-o: 1.16.3 bump

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/cri-o/Manifest|  1 +
 app-emulation/cri-o/cri-o-1.16.3.ebuild | 97 +
 2 files changed, 98 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index d271f088bf6..26a040d9ef6 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -2,3 +2,4 @@ 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 
2b9122692d84e8a6832d7172782c41d354185809cd3fa51485f8df8fd1750dd15b2005fbb3bc422f5199daeb32a768e824402c9e95f25593e250bd7ecc07
 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

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 000..f0c8df12dba
--- /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}
+   !> 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

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2020-02-12 Thread William Hubbs 
commit: 4aaeab90759e78c4c79b8ee4d04557033c00c465
Author: William Hubbs  sony  com>
AuthorDate: Wed Feb 12 21:32:33 2020 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Feb 12 21:34:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aaeab90

app-emulation/cry-o: 1.17.0 bump

Signed-off-by: William Hubbs  gentoo.org>

 app-emulation/cri-o/Manifest|  1 +
 app-emulation/cri-o/cri-o-1.17.0.ebuild | 95 +
 2 files changed, 96 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 26a040d9ef6..09b55302975 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -3,3 +3,4 @@ DIST cri-o-1.13.9.tar.gz 6685519 BLAKE2B 
5d9e68c7a0ae532e2406e5e47562693cddbc34a
 DIST cri-o-1.15.1.tar.gz 11811389 BLAKE2B 
2f6e223e2d3964f480e9739ee4808101ae2ca8c0a16eb589d2e3501d370c60694843309b602a4a4b8e16ed97094f97c81ff4f23b542a9536b38f9fe9a97bcd97
 SHA512 
2b9122692d84e8a6832d7172782c41d354185809cd3fa51485f8df8fd1750dd15b2005fbb3bc422f5199daeb32a768e824402c9e95f25593e250bd7ecc07
 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

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 000..e5cd2811c96
--- /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}
+   !> 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
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-09-18 Thread Zac Medico 
commit: c6f2fb6ee370a263bda4d95ce7ecbd6659719d07
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Sep 19 04:05:52 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Sep 19 04:05:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f2fb6e

app-emulation/cri-o: Bump to version 1.15.2

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 +
 app-emulation/cri-o/cri-o-1.15.2.ebuild | 107 
 2 files changed, 108 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 5dd7da5d78d..d271f088bf6 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,3 +1,4 @@
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B 
bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367
 SHA512 
b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
 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 
2b9122692d84e8a6832d7172782c41d354185809cd3fa51485f8df8fd1750dd15b2005fbb3bc422f5199daeb32a768e824402c9e95f25593e250bd7ecc07
+DIST cri-o-1.15.2.tar.gz 11861335 BLAKE2B 
159bdf322540c3d49f44b1fc1106d1717706f7817e4621743078dfbb5d9088318d7dda5da54ff94ed43ea58204413d496ffda424ea94ed6fd0c6e090bbba37f0
 SHA512 
d30a27d98537cd73bf341267922b94434958bf5e5d3a26de3af2b7899fd9d860be12a194531f81fb704abed79eac1c5139271fab1e52b994b939dafab00f1cfd

diff --git a/app-emulation/cri-o/cri-o-1.15.2.ebuild 
b/app-emulation/cri-o/cri-o-1.15.2.ebuild
new file mode 100644
index 000..c439086a987
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.15.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="f0827bb332854ffcff2f4d9f64d68b8139970b3d"
+EGO_PN="github.com/cri-o/${PN}"
+
+inherit golang-vcs-snapshot
+
+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/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}
+   !> 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
+
+   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() {
+   [[ -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
+   GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/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

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-09-18 Thread Zac Medico 
commit: c0b30a20965f3138f4c31286c35d43248c3893dc
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Sep 19 03:42:02 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Sep 19 03:42:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b30a20

app-emulation/cri-o: Remove old versions

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   4 --
 app-emulation/cri-o/cri-o-1.14.2.ebuild | 110 
 app-emulation/cri-o/cri-o-1.14.4.ebuild | 110 
 app-emulation/cri-o/cri-o-1.14.9.ebuild | 110 
 app-emulation/cri-o/cri-o-1.15.0.ebuild | 107 ---
 5 files changed, 441 deletions(-)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 5f31325a077..5dd7da5d78d 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,7 +1,3 @@
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B 
bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367
 SHA512 
b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
 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
-DIST cri-o-1.14.4.tar.gz 9370878 BLAKE2B 
50fd9b9c4802d2d89b8bbc83d1faf3084a2978835c579814730b93772f3e04cef8d1b46b2176eff494906e89fc20a53cbcab0cf0cabaed74ddcf56bd9f89b14d
 SHA512 
2a78e7ec3ba5ff80649ec11e42da80b15ab86e5b541ffa626a65042b362ac8445bbf00ec46014c0fdd8baec2e4777e23a2463de318113f9c4c6ddda92b5cf3b7
-DIST cri-o-1.14.9.tar.gz 8357782 BLAKE2B 
ab4df69f231a0e1998182b086eb92e72211282c3f136e3cb2a4f06a94a4de86616d6a540ee8645cfb8d2189e791181b2b39f0e76f19e1a181e495dd5321eb7e7
 SHA512 
afa17b8a43e7776b44250bfa4657c6a7d4ddd1438ef012a0cb78a98fb73bdc477e990109355d97a84dd38f4ac13d42785c065eb577f978c124e6f8c95e751f94
-DIST cri-o-1.15.0.tar.gz 12153225 BLAKE2B 
c2db397cb2660af62c53bb5b166854d43cab665f53979ea45e6352929f0070ce7a730d356c7e71edb376d89baa0f616d84fe71017a6d6ca4d6b1270196cc1804
 SHA512 
4d5460f1e476085523cd82136d80ef32de645a8e6dd2da3ba7b1575cfee9e8ed44de7c144a8338aeb379a6ba506350e10cfc6feb3317b34429d41cb5fe6e20c4
 DIST cri-o-1.15.1.tar.gz 11811389 BLAKE2B 
2f6e223e2d3964f480e9739ee4808101ae2ca8c0a16eb589d2e3501d370c60694843309b602a4a4b8e16ed97094f97c81ff4f23b542a9536b38f9fe9a97bcd97
 SHA512 
2b9122692d84e8a6832d7172782c41d354185809cd3fa51485f8df8fd1750dd15b2005fbb3bc422f5199daeb32a768e824402c9e95f25593e250bd7ecc07

diff --git a/app-emulation/cri-o/cri-o-1.14.2.ebuild 
b/app-emulation/cri-o/cri-o-1.14.2.ebuild
deleted file mode 100644
index 5e2a18c8606..000
--- a/app-emulation/cri-o/cri-o-1.14.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="76b057a5a72ae379bb2f4915b791146d37a3f6cf"
-EGO_PN="github.com/cri-o/${PN}"
-
-inherit golang-vcs-snapshot
-
-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"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="btrfs +device-mapper ostree selinux systemd"
-
-COMMON_DEPEND="
-   app-crypt/gpgme:=
-   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:= )
-   ostree? ( dev-util/ostree )
-   selinux? ( sys-libs/libselinux:= )
-   systemd? ( sys-apps/systemd:= )"
-DEPEND="
-   ${COMMON_DEPEND}
-   dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
-   !> 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
-
-   if ! use systemd; then
-   sed -e 's| pkg-config --exists libsystemd-journal | false |' \
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-09-18 Thread Zac Medico 
commit: 45470fbba409d453715b2ace41e40cea0f9b16de
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Sep 19 03:56:33 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Sep 19 03:57:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45470fbb

app-emulation/cri-o: LICENSE: account for vendored software

Reported-by: Michał Górny  gentoo.org>
Bug: https://bugs.gentoo.org/694890
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/cri-o-1.10.6.ebuild | 2 +-
 app-emulation/cri-o/cri-o-1.13.9.ebuild | 2 +-
 app-emulation/cri-o/cri-o-1.15.1.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/cri-o/cri-o-1.10.6.ebuild 
b/app-emulation/cri-o/cri-o-1.10.6.ebuild
index 845da94a93b..a5292a57902 100644
--- a/app-emulation/cri-o/cri-o-1.10.6.ebuild
+++ b/app-emulation/cri-o/cri-o-1.10.6.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="OCI-based implementation of Kubernetes Container 
Runtime Interface"
 HOMEPAGE="https://cri-o.io/;
 SRC_URI="https://github.com/kubernetes-incubator/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+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 ostree seccomp selinux"

diff --git a/app-emulation/cri-o/cri-o-1.13.9.ebuild 
b/app-emulation/cri-o/cri-o-1.13.9.ebuild
index 8fc1dca0d81..3331e9719be 100644
--- a/app-emulation/cri-o/cri-o-1.13.9.ebuild
+++ b/app-emulation/cri-o/cri-o-1.13.9.ebuild
@@ -12,7 +12,7 @@ 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"
 
-LICENSE="Apache-2.0"
+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 ostree seccomp selinux"

diff --git a/app-emulation/cri-o/cri-o-1.15.1.ebuild 
b/app-emulation/cri-o/cri-o-1.15.1.ebuild
index cfbec5e0e93..c439086a987 100644
--- a/app-emulation/cri-o/cri-o-1.15.1.ebuild
+++ b/app-emulation/cri-o/cri-o-1.15.1.ebuild
@@ -12,7 +12,7 @@ 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"
+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"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-09-06 Thread Zac Medico 
commit: df4a6e6f9bbadd0dd77c5f2ce5e4447f764d4faa
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Sep  6 22:57:24 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Fri Sep  6 22:57:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df4a6e6f

app-emulation/cri-o: Bump to version 1.15.1

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 +
 app-emulation/cri-o/cri-o-1.15.1.ebuild | 107 
 2 files changed, 108 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 7bd5610901c..5f31325a077 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -4,3 +4,4 @@ DIST cri-o-1.14.2.tar.gz 9347347 BLAKE2B 
83a0d77245bc841a9f89c55c853b64e69cec124
 DIST cri-o-1.14.4.tar.gz 9370878 BLAKE2B 
50fd9b9c4802d2d89b8bbc83d1faf3084a2978835c579814730b93772f3e04cef8d1b46b2176eff494906e89fc20a53cbcab0cf0cabaed74ddcf56bd9f89b14d
 SHA512 
2a78e7ec3ba5ff80649ec11e42da80b15ab86e5b541ffa626a65042b362ac8445bbf00ec46014c0fdd8baec2e4777e23a2463de318113f9c4c6ddda92b5cf3b7
 DIST cri-o-1.14.9.tar.gz 8357782 BLAKE2B 
ab4df69f231a0e1998182b086eb92e72211282c3f136e3cb2a4f06a94a4de86616d6a540ee8645cfb8d2189e791181b2b39f0e76f19e1a181e495dd5321eb7e7
 SHA512 
afa17b8a43e7776b44250bfa4657c6a7d4ddd1438ef012a0cb78a98fb73bdc477e990109355d97a84dd38f4ac13d42785c065eb577f978c124e6f8c95e751f94
 DIST cri-o-1.15.0.tar.gz 12153225 BLAKE2B 
c2db397cb2660af62c53bb5b166854d43cab665f53979ea45e6352929f0070ce7a730d356c7e71edb376d89baa0f616d84fe71017a6d6ca4d6b1270196cc1804
 SHA512 
4d5460f1e476085523cd82136d80ef32de645a8e6dd2da3ba7b1575cfee9e8ed44de7c144a8338aeb379a6ba506350e10cfc6feb3317b34429d41cb5fe6e20c4
+DIST cri-o-1.15.1.tar.gz 11811389 BLAKE2B 
2f6e223e2d3964f480e9739ee4808101ae2ca8c0a16eb589d2e3501d370c60694843309b602a4a4b8e16ed97094f97c81ff4f23b542a9536b38f9fe9a97bcd97
 SHA512 
2b9122692d84e8a6832d7172782c41d354185809cd3fa51485f8df8fd1750dd15b2005fbb3bc422f5199daeb32a768e824402c9e95f25593e250bd7ecc07

diff --git a/app-emulation/cri-o/cri-o-1.15.1.ebuild 
b/app-emulation/cri-o/cri-o-1.15.1.ebuild
new file mode 100644
index 000..cfbec5e0e93
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.15.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="f0827bb332854ffcff2f4d9f64d68b8139970b3d"
+EGO_PN="github.com/cri-o/${PN}"
+
+inherit golang-vcs-snapshot
+
+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"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper selinux systemd"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   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}
+   !> 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
+
+   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() {
+   [[ -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
+   GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/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}"
+
+   #

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-09-06 Thread Zac Medico 
commit: 47e78e715f170ce2cfc48d7568cc83b597663c2d
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Sep  6 22:45:30 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Fri Sep  6 22:47:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e78e71

app-emulation/cri-o: Fix compile for go-1.13

Reported-by: Toralf Förster  gentoo.org>
Closes: https://bugs.gentoo.org/693630
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/cri-o-1.15.0.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-emulation/cri-o/cri-o-1.15.0.ebuild 
b/app-emulation/cri-o/cri-o-1.15.0.ebuild
index 32d09b53550..808c52e4c27 100644
--- a/app-emulation/cri-o/cri-o-1.15.0.ebuild
+++ b/app-emulation/cri-o/cri-o-1.15.0.ebuild
@@ -42,6 +42,9 @@ S="${WORKDIR}/${P}/src/${EGO_PN}"
 src_prepare() {
default
 
+   # Avoid network-sandbox violations since go-1.13
+   rm go.mod || die
+
sed -e '/^GIT_.*/d' \
-e '/   git diff --exit-code/d' \
-e 's/$(GO) build -i/$(GO) build -v -work -x/' \

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-07-21 Thread Zac Medico 
commit: d989fb70df2600b3726ab73984112e07aae8cdf7
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Jul 21 05:56:18 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Jul 21 05:58:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d989fb70

app-emulation/cri-o: Bump to version 1.15.0

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 +
 app-emulation/cri-o/cri-o-1.15.0.ebuild | 104 
 2 files changed, 105 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index c05e993564a..7bd5610901c 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -3,3 +3,4 @@ DIST cri-o-1.13.9.tar.gz 6685519 BLAKE2B 
5d9e68c7a0ae532e2406e5e47562693cddbc34a
 DIST cri-o-1.14.2.tar.gz 9347347 BLAKE2B 
83a0d77245bc841a9f89c55c853b64e69cec124da07b1314cfc27237cc82c55e49becc0f14c579a09d23e8da047c6bbb285b0eb79c4609a23827ab24ae28ce4a
 SHA512 
1499b09a8f5c51b426bd8fba7c254288707524a363bfa97537edd35fdf29ac354d13578f2bf3c09c2d128650082f9a2bfbf69872fa9fce77dbff43913afc8066
 DIST cri-o-1.14.4.tar.gz 9370878 BLAKE2B 
50fd9b9c4802d2d89b8bbc83d1faf3084a2978835c579814730b93772f3e04cef8d1b46b2176eff494906e89fc20a53cbcab0cf0cabaed74ddcf56bd9f89b14d
 SHA512 
2a78e7ec3ba5ff80649ec11e42da80b15ab86e5b541ffa626a65042b362ac8445bbf00ec46014c0fdd8baec2e4777e23a2463de318113f9c4c6ddda92b5cf3b7
 DIST cri-o-1.14.9.tar.gz 8357782 BLAKE2B 
ab4df69f231a0e1998182b086eb92e72211282c3f136e3cb2a4f06a94a4de86616d6a540ee8645cfb8d2189e791181b2b39f0e76f19e1a181e495dd5321eb7e7
 SHA512 
afa17b8a43e7776b44250bfa4657c6a7d4ddd1438ef012a0cb78a98fb73bdc477e990109355d97a84dd38f4ac13d42785c065eb577f978c124e6f8c95e751f94
+DIST cri-o-1.15.0.tar.gz 12153225 BLAKE2B 
c2db397cb2660af62c53bb5b166854d43cab665f53979ea45e6352929f0070ce7a730d356c7e71edb376d89baa0f616d84fe71017a6d6ca4d6b1270196cc1804
 SHA512 
4d5460f1e476085523cd82136d80ef32de645a8e6dd2da3ba7b1575cfee9e8ed44de7c144a8338aeb379a6ba506350e10cfc6feb3317b34429d41cb5fe6e20c4

diff --git a/app-emulation/cri-o/cri-o-1.15.0.ebuild 
b/app-emulation/cri-o/cri-o-1.15.0.ebuild
new file mode 100644
index 000..32d09b53550
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.15.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="0af20c51a25a04ef77f7e038ff4f24a5a87cd1df"
+EGO_PN="github.com/cri-o/${PN}"
+
+inherit golang-vcs-snapshot
+
+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"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper selinux systemd"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   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}
+   !> 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
+
+   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() {
+   [[ -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
+   GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/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}"
+
+   #

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-07-20 Thread Zac Medico 
commit: 47845ffb8ab4f11eed15551deefdcd6011aa05d9
Author: Zac Medico  gentoo  org>
AuthorDate: Sun Jul 21 05:32:13 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Jul 21 05:32:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47845ffb

app-emulation/cri-o: Bump to version 1.14.9

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 +
 app-emulation/cri-o/cri-o-1.14.9.ebuild | 110 
 2 files changed, 111 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index f358d62e965..c05e993564a 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -2,3 +2,4 @@ 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.14.2.tar.gz 9347347 BLAKE2B 
83a0d77245bc841a9f89c55c853b64e69cec124da07b1314cfc27237cc82c55e49becc0f14c579a09d23e8da047c6bbb285b0eb79c4609a23827ab24ae28ce4a
 SHA512 
1499b09a8f5c51b426bd8fba7c254288707524a363bfa97537edd35fdf29ac354d13578f2bf3c09c2d128650082f9a2bfbf69872fa9fce77dbff43913afc8066
 DIST cri-o-1.14.4.tar.gz 9370878 BLAKE2B 
50fd9b9c4802d2d89b8bbc83d1faf3084a2978835c579814730b93772f3e04cef8d1b46b2176eff494906e89fc20a53cbcab0cf0cabaed74ddcf56bd9f89b14d
 SHA512 
2a78e7ec3ba5ff80649ec11e42da80b15ab86e5b541ffa626a65042b362ac8445bbf00ec46014c0fdd8baec2e4777e23a2463de318113f9c4c6ddda92b5cf3b7
+DIST cri-o-1.14.9.tar.gz 8357782 BLAKE2B 
ab4df69f231a0e1998182b086eb92e72211282c3f136e3cb2a4f06a94a4de86616d6a540ee8645cfb8d2189e791181b2b39f0e76f19e1a181e495dd5321eb7e7
 SHA512 
afa17b8a43e7776b44250bfa4657c6a7d4ddd1438ef012a0cb78a98fb73bdc477e990109355d97a84dd38f4ac13d42785c065eb577f978c124e6f8c95e751f94

diff --git a/app-emulation/cri-o/cri-o-1.14.9.ebuild 
b/app-emulation/cri-o/cri-o-1.14.9.ebuild
new file mode 100644
index 000..3a0a7e52018
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.14.9.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="0af20c51a25a04ef77f7e038ff4f24a5a87cd1df"
+EGO_PN="github.com/cri-o/${PN}"
+
+inherit golang-vcs-snapshot
+
+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"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree selinux systemd"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   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:= )
+   ostree? ( dev-util/ostree )
+   selinux? ( sys-libs/libselinux:= )
+   systemd? ( sys-apps/systemd:= )"
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+   !> 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
+
+   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() {
+   [[ -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/ostree_tag.sh ]] || die
+   use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" 
> \
+   hack/ostree_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 all
+}
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install install.config 
install.systemd

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-06-12 Thread Zac Medico 
commit: 25163adcbe486d1cb9676754f490aad29682974d
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Jun 12 17:59:47 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Jun 12 18:01:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25163adc

app-emulation/cri-o: Bump to version 1.14.4

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 +
 app-emulation/cri-o/cri-o-1.14.4.ebuild | 110 
 2 files changed, 111 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 9b2463258a6..f358d62e965 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,3 +1,4 @@
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B 
bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367
 SHA512 
b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
 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
+DIST cri-o-1.14.4.tar.gz 9370878 BLAKE2B 
50fd9b9c4802d2d89b8bbc83d1faf3084a2978835c579814730b93772f3e04cef8d1b46b2176eff494906e89fc20a53cbcab0cf0cabaed74ddcf56bd9f89b14d
 SHA512 
2a78e7ec3ba5ff80649ec11e42da80b15ab86e5b541ffa626a65042b362ac8445bbf00ec46014c0fdd8baec2e4777e23a2463de318113f9c4c6ddda92b5cf3b7

diff --git a/app-emulation/cri-o/cri-o-1.14.4.ebuild 
b/app-emulation/cri-o/cri-o-1.14.4.ebuild
new file mode 100644
index 000..219a35d4866
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.14.4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="66a9cf7c79b529c0f76546a352c1a4eb04b7721c"
+EGO_PN="github.com/cri-o/${PN}"
+
+inherit golang-vcs-snapshot
+
+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"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree selinux systemd"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   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:= )
+   ostree? ( dev-util/ostree )
+   selinux? ( sys-libs/libselinux:= )
+   systemd? ( sys-apps/systemd:= )"
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+   !> 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
+
+   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() {
+   [[ -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/ostree_tag.sh ]] || die
+   use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" 
> \
+   hack/ostree_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 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} ||

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-06-01 Thread Zac Medico 
commit: 9404e266b9e807d5f4f86ecf8f4f0dea7b441ea6
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Jun  1 01:45:39 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Jun  1 06:33:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9404e266

app-emulation/cri-o: version bump to 1.14.2

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 +
 app-emulation/cri-o/cri-o-1.14.2.ebuild | 110 
 2 files changed, 111 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 3e19b8d9e83..9b2463258a6 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,2 +1,3 @@
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B 
bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367
 SHA512 
b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
 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

diff --git a/app-emulation/cri-o/cri-o-1.14.2.ebuild 
b/app-emulation/cri-o/cri-o-1.14.2.ebuild
new file mode 100644
index 000..5e2a18c8606
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.14.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="76b057a5a72ae379bb2f4915b791146d37a3f6cf"
+EGO_PN="github.com/cri-o/${PN}"
+
+inherit golang-vcs-snapshot
+
+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"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree selinux systemd"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   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:= )
+   ostree? ( dev-util/ostree )
+   selinux? ( sys-libs/libselinux:= )
+   systemd? ( sys-apps/systemd:= )"
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+   !> 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
+
+   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() {
+   [[ -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/ostree_tag.sh ]] || die
+   use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" 
> \
+   hack/ostree_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 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

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-05-31 Thread Zac Medico 
commit: 6294e4ec348fab89f723cc33f6baa449c608968a
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Jun  1 03:47:27 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Jun  1 03:47:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6294e4ec

app-emulation/cri-o: update upstream in metadata.xml

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cri-o/metadata.xml b/app-emulation/cri-o/metadata.xml
index e48b961a7b5..0ebb508fdee 100644
--- a/app-emulation/cri-o/metadata.xml
+++ b/app-emulation/cri-o/metadata.xml
@@ -26,6 +26,6 @@



-   kubernetes-sigs/cri-o
+   cri-o/cri-o

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-05-31 Thread Zac Medico 
commit: 02ceffca106c927189b518e48585ae4777df7e04
Author: Zac Medico  gentoo  org>
AuthorDate: Sat Jun  1 00:11:20 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sat Jun  1 00:11:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ceffca

app-emulation/cri-o: remove old versions

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   2 -
 app-emulation/cri-o/cri-o-1.13.5.ebuild | 112 
 app-emulation/cri-o/cri-o-1.13.7.ebuild | 112 
 3 files changed, 226 deletions(-)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index a6b77e4ee2d..3e19b8d9e83 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,4 +1,2 @@
 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

diff --git a/app-emulation/cri-o/cri-o-1.13.5.ebuild 
b/app-emulation/cri-o/cri-o-1.13.5.ebuild
deleted file mode 100644
index 2478498c2a7..000
--- a/app-emulation/cri-o/cri-o-1.13.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_COMMIT="a9d8dde49418572b6ea843a5d3346c966e82077f"
-EGO_PN="github.com/kubernetes-sigs/${PN}"
-
-inherit golang-vcs-snapshot systemd
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="btrfs +device-mapper ostree seccomp selinux"
-
-COMMON_DEPEND="
-   app-crypt/gpgme:=
-   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
-   btrfs? ( sys-fs/btrfs-progs )
-   device-mapper? ( sys-fs/lvm2:= )
-   ostree? ( dev-util/ostree )
-   seccomp? ( sys-libs/libseccomp:= )
-   selinux? ( sys-libs/libselinux:= )"
-DEPEND="
-   ${COMMON_DEPEND}
-   dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-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/ostree_tag.sh ]] || die
-   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

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-05-28 Thread Zac Medico 
commit: 4f65261df1f8dba30c1eca6fd8e6318be40515fc
Author: Zac Medico  gentoo  org>
AuthorDate: Tue May 28 23:33:47 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue May 28 23:33:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f65261d

app-emulation/cri-o: version bump to 1.13.9

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 +
 app-emulation/cri-o/cri-o-1.13.9.ebuild | 112 
 2 files changed, 113 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index fd856a5b0ce..a6b77e4ee2d 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/app-emulation/cri-o/cri-o-1.13.9.ebuild 
b/app-emulation/cri-o/cri-o-1.13.9.ebuild
new file mode 100644
index 000..8fc1dca0d81
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.13.9.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="d70609afd5e933948284aebf15966bdc098d28b3"
+EGO_PN="github.com/kubernetes-sigs/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree seccomp selinux"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   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
+   btrfs? ( sys-fs/btrfs-progs )
+   device-mapper? ( sys-fs/lvm2:= )
+   ostree? ( dev-util/ostree )
+   seccomp? ( sys-libs/libseccomp:= )
+   selinux? ( sys-libs/libselinux:= )"
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+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/ostree_tag.sh ]] || die
+   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}"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-05-01 Thread Zac Medico 
commit: 69a0e83bf709b07c170da026e1f4cf5ee09d950d
Author: Zac Medico  gentoo  org>
AuthorDate: Wed May  1 22:24:12 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed May  1 22:27:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69a0e83b

app-emulation/cri-o: version bump to 1.13.7

Reported-by: Bruce Guenter  untroubled.org>
Closes: https://bugs.gentoo.org/684898
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 +
 app-emulation/cri-o/cri-o-1.13.7.ebuild | 112 
 2 files changed, 113 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index cb7d987023a..fd856a5b0ce 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/app-emulation/cri-o/cri-o-1.13.7.ebuild 
b/app-emulation/cri-o/cri-o-1.13.7.ebuild
new file mode 100644
index 000..a032de19c99
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.13.7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="42585737f5eb59273e791e47ab1643e10862d67f"
+EGO_PN="github.com/kubernetes-sigs/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree seccomp selinux"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   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
+   btrfs? ( sys-fs/btrfs-progs )
+   device-mapper? ( sys-fs/lvm2:= )
+   ostree? ( dev-util/ostree )
+   seccomp? ( sys-libs/libseccomp:= )
+   selinux? ( sys-libs/libselinux:= )"
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+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/ostree_tag.sh ]] || die
+   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
+}
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
+
+   keepdir /etc/crio
+   insinto /etc/crio
+   use

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-04-29 Thread Zac Medico 
commit: a0e75219444993d81826f7650bcccad80c968b5d
Author: Dongsu Park  kinvolk  io>
AuthorDate: Mon Apr 29 05:42:50 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 29 17:32:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0e75219

app-emulation/cri-o: disable go build install flag

There has been a corner case where `make bin/crio` failed like that:

```
go build runtime/cgo: open /usr/lib/go1.12/pkg/linux_amd64/runtime/cgo.a: 
permission denied
make: *** [Makefile:99: bin/crio] Error 1
```

The failure happens only under certain circumstances, for example in
Jenkins pipelines, where the standard Go runtime path `/usr/lib/go1.12`
is not writable for normal users like `jenkins`. On the other hand, the
failure is not reproducible when testing locally, nor when testing
with the root user who can write to the Go runtime path.

What happens is, the standard Go runtime sometime has incorrect
timestamps or checksums of `cgo.a`, which makes `go build -i` think
that it has to install its own library to the system directory. That's
obviously not what the build process should do. Since Go 1.10, it's
unnecessary to run `go build` with an `-i` option, because now `go build`
command itself maintains a cache of recently build packages. Build speed
will not be better by adding an `-i` option.
So let's remove `-i` flag from `go build`. That's actually what upstream
Go maintainers recommend to do.

See: https://github.com/golang/go/issues/24674
Closes: https://github.com/gentoo/gentoo/pull/11863
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Dongsu Park  kinvolk.io>
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/cri-o-1.10.6.ebuild | 2 +-
 app-emulation/cri-o/cri-o-1.13.5.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/cri-o/cri-o-1.10.6.ebuild 
b/app-emulation/cri-o/cri-o-1.10.6.ebuild
index dbb1db95a32..845da94a93b 100644
--- a/app-emulation/cri-o/cri-o-1.10.6.ebuild
+++ b/app-emulation/cri-o/cri-o-1.10.6.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
default
 
sed -e '/^GIT_.*/d' \
-   -e 's/$(GO) build/$(GO) build -v -work -x/' \
+   -e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-i Makefile || die
 

diff --git a/app-emulation/cri-o/cri-o-1.13.5.ebuild 
b/app-emulation/cri-o/cri-o-1.13.5.ebuild
index bf1e755e142..2478498c2a7 100644
--- a/app-emulation/cri-o/cri-o-1.13.5.ebuild
+++ b/app-emulation/cri-o/cri-o-1.13.5.ebuild
@@ -44,7 +44,7 @@ src_prepare() {
 
sed -e '/^GIT_.*/d' \
-e '/   git diff --exit-code/d' \
-   -e 's/$(GO) build/$(GO) build -v -work -x/' \
+   -e 's/$(GO) build -i/$(GO) build -v -work -x/' \
-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-i Makefile || die

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-04-29 Thread Zac Medico 
commit: 60b00d3a736212b41d6482784b8900bc7e43c6a0
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Apr 29 17:22:59 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Apr 29 17:23:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b00d3a

app-emulation/cri-o: remove old version 1.13.0

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 -
 app-emulation/cri-o/cri-o-1.13.0.ebuild | 105 
 2 files changed, 106 deletions(-)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index b372cadcda1..cb7d987023a 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,3 +1,2 @@
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B 
bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367
 SHA512 
b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
-DIST cri-o-1.13.0.tar.gz 6499846 BLAKE2B 
71edb779a4e126ca8a1959c51a86d3f223f66ecbd492a0c314de0f7b5ed0c39b5f0c0550e5690a388ebc00d6f2f5a2dc675e8bf67ed6805b0e5e0cd000e9211a
 SHA512 
52b764bda68d0f9f9467a5db92b5d955aa220f9570cfc2393854ca884b473cb2ef1cb0fc5ab3da9350a162e486440ad6109de9d9214b6b2fbe5bb82cb37c1283
 DIST cri-o-1.13.5.tar.gz 6683259 BLAKE2B 
982de5590411ad618401a2909dcd4f0404d5bfc49667027e29fd266e3e2d15bbf0d7716db570d433eec7f2baacbb33f7e9e0f347aa2ef964a06b8b883f76404c
 SHA512 
116e51e9b31fca66b4edd9aac5d1f0c8929ba9a740af8b611fb7fa0e675e37facd4114d0848090b32f72f58d17c85060c15e07bee82098d83a0bd5b563f4c875

diff --git a/app-emulation/cri-o/cri-o-1.13.0.ebuild 
b/app-emulation/cri-o/cri-o-1.13.0.ebuild
deleted file mode 100644
index 6b934dd9e8e..000
--- a/app-emulation/cri-o/cri-o-1.13.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_COMMIT="e8a2525c2e7f5ab057d5a2b5f1950be5643d8053"
-EGO_PN="github.com/kubernetes-sigs/${PN}"
-
-inherit golang-vcs-snapshot systemd
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="btrfs +device-mapper ostree seccomp selinux"
-
-COMMON_DEPEND="
-   app-crypt/gpgme:=
-   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
-   btrfs? ( sys-fs/btrfs-progs )
-   device-mapper? ( sys-fs/lvm2:= )
-   ostree? ( dev-util/ostree )
-   seccomp? ( sys-libs/libseccomp:= )
-   selinux? ( sys-libs/libselinux:= )"
-DEPEND="
-   ${COMMON_DEPEND}
-   dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-   default
-
-   sed -e '/^GIT_.*/d' \
-   -e 's/$(GO) build/$(GO) build -v -work -x/' \
-   -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-   -i 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/ostree_tag.sh ]] || die
-   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
-}
-
-src_install() {
-   emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
-
-   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"
-
-   newinitd "${FILESDIR}/crio.initd" crio
-
-   insinto /etc/logrotate.d
-   newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-   # Suppress crio log error messages triggered if these don't

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-04-11 Thread Zac Medico 
commit: 0b872f2e14bf543d60115d5fad6d6f4f54f929a3
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Apr 11 22:48:18 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Apr 11 22:49:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b872f2e

app-emulation/cri-o: version bump to 1.13.5

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 +
 app-emulation/cri-o/cri-o-1.13.5.ebuild | 112 
 2 files changed, 113 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 338565b16a2..b372cadcda1 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,2 +1,3 @@
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B 
bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367
 SHA512 
b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
 DIST cri-o-1.13.0.tar.gz 6499846 BLAKE2B 
71edb779a4e126ca8a1959c51a86d3f223f66ecbd492a0c314de0f7b5ed0c39b5f0c0550e5690a388ebc00d6f2f5a2dc675e8bf67ed6805b0e5e0cd000e9211a
 SHA512 
52b764bda68d0f9f9467a5db92b5d955aa220f9570cfc2393854ca884b473cb2ef1cb0fc5ab3da9350a162e486440ad6109de9d9214b6b2fbe5bb82cb37c1283
+DIST cri-o-1.13.5.tar.gz 6683259 BLAKE2B 
982de5590411ad618401a2909dcd4f0404d5bfc49667027e29fd266e3e2d15bbf0d7716db570d433eec7f2baacbb33f7e9e0f347aa2ef964a06b8b883f76404c
 SHA512 
116e51e9b31fca66b4edd9aac5d1f0c8929ba9a740af8b611fb7fa0e675e37facd4114d0848090b32f72f58d17c85060c15e07bee82098d83a0bd5b563f4c875

diff --git a/app-emulation/cri-o/cri-o-1.13.5.ebuild 
b/app-emulation/cri-o/cri-o-1.13.5.ebuild
new file mode 100644
index 000..bf1e755e142
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.13.5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT="a9d8dde49418572b6ea843a5d3346c966e82077f"
+EGO_PN="github.com/kubernetes-sigs/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree seccomp selinux"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   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
+   btrfs? ( sys-fs/btrfs-progs )
+   device-mapper? ( sys-fs/lvm2:= )
+   ostree? ( dev-util/ostree )
+   seccomp? ( sys-libs/libseccomp:= )
+   selinux? ( sys-libs/libselinux:= )"
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+   default
+
+   sed -e '/^GIT_.*/d' \
+   -e '/   git diff --exit-code/d' \
+   -e 's/$(GO) build/$(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/ostree_tag.sh ]] || die
+   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
+}
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
+
+   keepdir /etc/crio
+   insinto /etc/crio
+   use seccomp && doins seccomp.json
+
+   "${ED}"/usr/bin/crio --config="" config

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-04-11 Thread Zac Medico 
commit: 929ded094c8e9a91951eb26b49482a3fa7f02ac1
Author: Zac Medico  gentoo  org>
AuthorDate: Thu Apr 11 21:52:44 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Thu Apr 11 21:52:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929ded09

app-emulation/cri-o: remove old version 1.10.1

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 -
 app-emulation/cri-o/cri-o-1.10.1.ebuild | 105 
 2 files changed, 106 deletions(-)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 54c311b4dfe..338565b16a2 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,3 +1,2 @@
-DIST cri-o-1.10.1.tar.gz 5159128 BLAKE2B 
bd6727bedb1f1ca99771995817897721b340331a28dc00646fe6b13765328bbba363aeba4490c12c8d38f9e204e6c744c38f43b4fbbd39d2b44c95be0681475b
 SHA512 
dc85a94cf980ba11a2213e7cec73eeb78460a6a14c50f02f8772ac0d0fe179374d88de01c72f24506a9f1a61db6bf6738114c8944631f76906f6e42f9cf35bde
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B 
bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367
 SHA512 
b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
 DIST cri-o-1.13.0.tar.gz 6499846 BLAKE2B 
71edb779a4e126ca8a1959c51a86d3f223f66ecbd492a0c314de0f7b5ed0c39b5f0c0550e5690a388ebc00d6f2f5a2dc675e8bf67ed6805b0e5e0cd000e9211a
 SHA512 
52b764bda68d0f9f9467a5db92b5d955aa220f9570cfc2393854ca884b473cb2ef1cb0fc5ab3da9350a162e486440ad6109de9d9214b6b2fbe5bb82cb37c1283

diff --git a/app-emulation/cri-o/cri-o-1.10.1.ebuild 
b/app-emulation/cri-o/cri-o-1.10.1.ebuild
deleted file mode 100644
index d85dbb3f836..000
--- a/app-emulation/cri-o/cri-o-1.10.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_COMMIT="728df92d3e4b77c5a1d3b8e2a5c3c8f3c5bc4f00"
-EGO_PN="github.com/kubernetes-incubator/${PN}"
-
-inherit golang-vcs-snapshot systemd
-
-DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime 
Interface"
-HOMEPAGE="https://cri-o.io/;
-SRC_URI="https://github.com/kubernetes-incubator/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="btrfs +device-mapper ostree seccomp selinux"
-
-COMMON_DEPEND="
-   app-crypt/gpgme:=
-   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
-   btrfs? ( sys-fs/btrfs-progs )
-   device-mapper? ( sys-fs/lvm2:= )
-   ostree? ( dev-util/ostree )
-   seccomp? ( sys-libs/libseccomp:= )
-   selinux? ( sys-libs/libselinux:= )"
-DEPEND="
-   ${COMMON_DEPEND}
-   dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_prepare() {
-   default
-
-   sed -e '/^GIT_.*/d' \
-   -e 's/$(GO) build/$(GO) build -v -work -x/' \
-   -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
-   -i 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/ostree_tag.sh ]] || die
-   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
-}
-
-src_install() {
-   emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
-
-   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"
-
-   newinitd "${FILESDIR}/crio.initd" crio
-
-   insinto /etc/logrotate.d
-   newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-
-   # Suppress crio log error messages triggered if

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-02-17 Thread Zac Medico 
commit: 2b2187c9a8da46359d56dd44bec30807b6c3180e
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Feb 17 16:44:14 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Sun Feb 17 18:29:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2187c9

app-emulation/cri-o: HOMEPAGE: use HTTPS

Closes: https://github.com/gentoo/gentoo/pull/11087
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/cri-o-1.10.1.ebuild | 4 ++--
 app-emulation/cri-o/cri-o-1.10.6.ebuild | 4 ++--
 app-emulation/cri-o/cri-o-1.13.0.ebuild | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-emulation/cri-o/cri-o-1.10.1.ebuild 
b/app-emulation/cri-o/cri-o-1.10.1.ebuild
index d0e7f55b7bb..d85dbb3f836 100644
--- a/app-emulation/cri-o/cri-o-1.10.1.ebuild
+++ b/app-emulation/cri-o/cri-o-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ EGO_PN="github.com/kubernetes-incubator/${PN}"
 inherit golang-vcs-snapshot systemd
 
 DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime 
Interface"
-HOMEPAGE="http://cri-o.io/;
+HOMEPAGE="https://cri-o.io/;
 SRC_URI="https://github.com/kubernetes-incubator/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"

diff --git a/app-emulation/cri-o/cri-o-1.10.6.ebuild 
b/app-emulation/cri-o/cri-o-1.10.6.ebuild
index 6d2d5d4a82c..dbb1db95a32 100644
--- a/app-emulation/cri-o/cri-o-1.10.6.ebuild
+++ b/app-emulation/cri-o/cri-o-1.10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ EGO_PN="github.com/kubernetes-incubator/${PN}"
 inherit golang-vcs-snapshot systemd
 
 DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime 
Interface"
-HOMEPAGE="http://cri-o.io/;
+HOMEPAGE="https://cri-o.io/;
 SRC_URI="https://github.com/kubernetes-incubator/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"

diff --git a/app-emulation/cri-o/cri-o-1.13.0.ebuild 
b/app-emulation/cri-o/cri-o-1.13.0.ebuild
index 32f4f437430..6b934dd9e8e 100644
--- a/app-emulation/cri-o/cri-o-1.13.0.ebuild
+++ b/app-emulation/cri-o/cri-o-1.13.0.ebuild
@@ -9,7 +9,7 @@ EGO_PN="github.com/kubernetes-sigs/${PN}"
 inherit golang-vcs-snapshot systemd
 
 DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime 
Interface"
-HOMEPAGE="http://cri-o.io/;
+HOMEPAGE="https://cri-o.io/;
 SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="Apache-2.0"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/files/

2019-01-17 Thread Zac Medico 
commit: 94b3794985f657fd7b7a62c2b763e6c9d0dcd505
Author: Zac Medico  gentoo  org>
AuthorDate: Fri Jan 18 01:05:52 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Fri Jan 18 01:05:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94b37949

app-emulation/cri-o: move init script start_pre to start

Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/files/crio.initd | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-emulation/cri-o/files/crio.initd 
b/app-emulation/cri-o/files/crio.initd
index 723773033f7..9e6383ac976 100644
--- a/app-emulation/cri-o/files/crio.initd
+++ b/app-emulation/cri-o/files/crio.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2015-2018 Gentoo Foundation
+# Copyright 2015-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="OCI Kubernetes Container Runtime daemon"
@@ -23,8 +23,9 @@ checkconfig() {
/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
 }
 
-start_pre() {
+start() {
checkconfig
+   default_start
 }
 
 reload() {

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2019-01-03 Thread Zac Medico 
commit: 451657b38764f4e9259ae37521231c3b9cfedf89
Author: Dan Molik  danmolik  com>
AuthorDate: Thu Jan  3 19:49:22 2019 +
Commit: Zac Medico  gentoo  org>
CommitDate: Fri Jan  4 00:06:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=451657b3

app-emulation/cri-o: version bump to 1.13.0

Closes: https://github.com/gentoo/gentoo/pull/10732
Tested-by: Dan Molik  danmolik.com>
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Dan Molik  danmolik.com>
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 +
 app-emulation/cri-o/cri-o-1.13.0.ebuild | 105 
 app-emulation/cri-o/metadata.xml|   2 +-
 3 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 144949df2fb..54c311b4dfe 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1,2 +1,3 @@
 DIST cri-o-1.10.1.tar.gz 5159128 BLAKE2B 
bd6727bedb1f1ca99771995817897721b340331a28dc00646fe6b13765328bbba363aeba4490c12c8d38f9e204e6c744c38f43b4fbbd39d2b44c95be0681475b
 SHA512 
dc85a94cf980ba11a2213e7cec73eeb78460a6a14c50f02f8772ac0d0fe179374d88de01c72f24506a9f1a61db6bf6738114c8944631f76906f6e42f9cf35bde
 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B 
bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367
 SHA512 
b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
+DIST cri-o-1.13.0.tar.gz 6499846 BLAKE2B 
71edb779a4e126ca8a1959c51a86d3f223f66ecbd492a0c314de0f7b5ed0c39b5f0c0550e5690a388ebc00d6f2f5a2dc675e8bf67ed6805b0e5e0cd000e9211a
 SHA512 
52b764bda68d0f9f9467a5db92b5d955aa220f9570cfc2393854ca884b473cb2ef1cb0fc5ab3da9350a162e486440ad6109de9d9214b6b2fbe5bb82cb37c1283

diff --git a/app-emulation/cri-o/cri-o-1.13.0.ebuild 
b/app-emulation/cri-o/cri-o-1.13.0.ebuild
new file mode 100644
index 000..32f4f437430
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.13.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT="e8a2525c2e7f5ab057d5a2b5f1950be5643d8053"
+EGO_PN="github.com/kubernetes-sigs/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime 
Interface"
+HOMEPAGE="http://cri-o.io/;
+SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree seccomp selinux"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   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
+   btrfs? ( sys-fs/btrfs-progs )
+   device-mapper? ( sys-fs/lvm2:= )
+   ostree? ( dev-util/ostree )
+   seccomp? ( sys-libs/libseccomp:= )
+   selinux? ( sys-libs/libselinux:= )"
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+   default
+
+   sed -e '/^GIT_.*/d' \
+   -e 's/$(GO) build/$(GO) build -v -work -x/' \
+   -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+   -i 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/ostree_tag.sh ]] || die
+   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
+}
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
+
+   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"
+
+   newinitd

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2018-12-04 Thread Zac Medico 
commit: 2877b5e0124049955860ab2741d38a42b59ddf78
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Dec  4 10:22:00 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue Dec  4 10:24:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2877b5e0

app-emulation/cri-o: version bump to 1.10.6

Reported-by: Manuel Rüger  gentoo.org>
Closes: https://bugs.gentoo.org/668422
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Zac Medico  gentoo.org>

 app-emulation/cri-o/Manifest|   1 +
 app-emulation/cri-o/cri-o-1.10.6.ebuild | 105 
 2 files changed, 106 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 326f71beaf2..144949df2fb 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -1 +1,2 @@
 DIST cri-o-1.10.1.tar.gz 5159128 BLAKE2B 
bd6727bedb1f1ca99771995817897721b340331a28dc00646fe6b13765328bbba363aeba4490c12c8d38f9e204e6c744c38f43b4fbbd39d2b44c95be0681475b
 SHA512 
dc85a94cf980ba11a2213e7cec73eeb78460a6a14c50f02f8772ac0d0fe179374d88de01c72f24506a9f1a61db6bf6738114c8944631f76906f6e42f9cf35bde
+DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B 
bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367
 SHA512 
b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894

diff --git a/app-emulation/cri-o/cri-o-1.10.6.ebuild 
b/app-emulation/cri-o/cri-o-1.10.6.ebuild
new file mode 100644
index 000..6d2d5d4a82c
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.10.6.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT="56d7d9a0750d7deb06182361837b690683f13dfe"
+EGO_PN="github.com/kubernetes-incubator/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime 
Interface"
+HOMEPAGE="http://cri-o.io/;
+SRC_URI="https://github.com/kubernetes-incubator/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree seccomp selinux"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   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
+   btrfs? ( sys-fs/btrfs-progs )
+   device-mapper? ( sys-fs/lvm2:= )
+   ostree? ( dev-util/ostree )
+   seccomp? ( sys-libs/libseccomp:= )
+   selinux? ( sys-libs/libselinux:= )"
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+   default
+
+   sed -e '/^GIT_.*/d' \
+   -e 's/$(GO) build/$(GO) build -v -work -x/' \
+   -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+   -i 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/ostree_tag.sh ]] || die
+   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
+}
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
+
+   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"
+
+   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

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/

2018-06-04 Thread Zac Medico 
commit: db8e072eb93bb9fe50166ffbb9119f921c215f70
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Jun  4 08:31:30 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Jun  4 08:32:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db8e072e

app-emulation/cri-o: add libgpg-error dep

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/cri-o/cri-o-1.10.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/cri-o/cri-o-1.10.1.ebuild 
b/app-emulation/cri-o/cri-o-1.10.1.ebuild
index 675ac651d89..d0e7f55b7bb 100644
--- a/app-emulation/cri-o/cri-o-1.10.1.ebuild
+++ b/app-emulation/cri-o/cri-o-1.10.1.ebuild
@@ -22,6 +22,7 @@ COMMON_DEPEND="
app-emulation/runc
dev-libs/glib:=
dev-libs/libassuan:=
+   dev-libs/libgpg-error:=
net-firewall/conntrack-tools
net-firewall/iptables
net-misc/cni-plugins

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/files/, app-emulation/cri-o/

2018-06-04 Thread Zac Medico 
commit: 43081b4c1a5db43271206f712a11d68f814d0bc0
Author: Zac Medico  gentoo  org>
AuthorDate: Mon Jun  4 05:04:17 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Mon Jun  4 06:28:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43081b4c

app-emulation/cri-o: new package

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/cri-o/Manifest   |   1 +
 app-emulation/cri-o/cri-o-1.10.1.ebuild| 104 +
 app-emulation/cri-o/files/cri-o.logrotated |   7 ++
 app-emulation/cri-o/files/crio.initd   |  34 ++
 app-emulation/cri-o/metadata.xml   |  31 +
 5 files changed, 177 insertions(+)

diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
new file mode 100644
index 000..326f71beaf2
--- /dev/null
+++ b/app-emulation/cri-o/Manifest
@@ -0,0 +1 @@
+DIST cri-o-1.10.1.tar.gz 5159128 BLAKE2B 
bd6727bedb1f1ca99771995817897721b340331a28dc00646fe6b13765328bbba363aeba4490c12c8d38f9e204e6c744c38f43b4fbbd39d2b44c95be0681475b
 SHA512 
dc85a94cf980ba11a2213e7cec73eeb78460a6a14c50f02f8772ac0d0fe179374d88de01c72f24506a9f1a61db6bf6738114c8944631f76906f6e42f9cf35bde

diff --git a/app-emulation/cri-o/cri-o-1.10.1.ebuild 
b/app-emulation/cri-o/cri-o-1.10.1.ebuild
new file mode 100644
index 000..675ac651d89
--- /dev/null
+++ b/app-emulation/cri-o/cri-o-1.10.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT="728df92d3e4b77c5a1d3b8e2a5c3c8f3c5bc4f00"
+EGO_PN="github.com/kubernetes-incubator/${PN}"
+
+inherit golang-vcs-snapshot systemd
+
+DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime 
Interface"
+HOMEPAGE="http://cri-o.io/;
+SRC_URI="https://github.com/kubernetes-incubator/${PN}/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="btrfs +device-mapper ostree seccomp selinux"
+
+COMMON_DEPEND="
+   app-crypt/gpgme:=
+   app-emulation/runc
+   dev-libs/glib:=
+   dev-libs/libassuan:=
+   net-firewall/conntrack-tools
+   net-firewall/iptables
+   net-misc/cni-plugins
+   net-misc/socat
+   sys-apps/iproute2
+   btrfs? ( sys-fs/btrfs-progs )
+   device-mapper? ( sys-fs/lvm2:= )
+   ostree? ( dev-util/ostree )
+   seccomp? ( sys-libs/libseccomp:= )
+   selinux? ( sys-libs/libselinux:= )"
+DEPEND="
+   ${COMMON_DEPEND}
+   dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+   default
+
+   sed -e '/^GIT_.*/d' \
+   -e 's/$(GO) build/$(GO) build -v -work -x/' \
+   -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
+   -i 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/ostree_tag.sh ]] || die
+   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
+}
+
+src_install() {
+   emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
+
+   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"
+
+   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
+
+   systemd_dounit contrib/systemd/*
+}

diff --git a/app-emulation/cri-o/files/cri-o.logrotated 
b/app-emulation/cri-o/files/cri-o.logrotated
new file mode 100644
index 000..fb0b8b14a8a
--- /dev/null
+++