Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/cri-o/
Date: Mon, 29 Apr 2019 17:23:32
Message-Id: 1556558601.60b00d3a736212b41d6482784b8900bc7e43c6a0.zmedico@gentoo
1 commit: 60b00d3a736212b41d6482784b8900bc7e43c6a0
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 29 17:22:59 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 29 17:23:21 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b00d3a
7
8 app-emulation/cri-o: remove old version 1.13.0
9
10 Package-Manager: Portage-2.3.65, Repoman-2.3.12
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-emulation/cri-o/Manifest | 1 -
14 app-emulation/cri-o/cri-o-1.13.0.ebuild | 105 --------------------------------
15 2 files changed, 106 deletions(-)
16
17 diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
18 index b372cadcda1..cb7d987023a 100644
19 --- a/app-emulation/cri-o/Manifest
20 +++ b/app-emulation/cri-o/Manifest
21 @@ -1,3 +1,2 @@
22 DIST cri-o-1.10.6.tar.gz 5161858 BLAKE2B bbfaf60c92dee3a9f42e9d4fc9b5482057a7a0ff2de36d74d434e2e60b53f92f70980c83825c18089c4a48bfa01c164b77aa01506c68c763f00265796e07d367 SHA512 b6a412cf5859dab79095732c2528e2ba373b3c21740203441fd3646862e2458e78e71f1895a5def05207964ef96a354c04395356e426600994bb39d3adfd0894
23 -DIST cri-o-1.13.0.tar.gz 6499846 BLAKE2B 71edb779a4e126ca8a1959c51a86d3f223f66ecbd492a0c314de0f7b5ed0c39b5f0c0550e5690a388ebc00d6f2f5a2dc675e8bf67ed6805b0e5e0cd000e9211a SHA512 52b764bda68d0f9f9467a5db92b5d955aa220f9570cfc2393854ca884b473cb2ef1cb0fc5ab3da9350a162e486440ad6109de9d9214b6b2fbe5bb82cb37c1283
24 DIST cri-o-1.13.5.tar.gz 6683259 BLAKE2B 982de5590411ad618401a2909dcd4f0404d5bfc49667027e29fd266e3e2d15bbf0d7716db570d433eec7f2baacbb33f7e9e0f347aa2ef964a06b8b883f76404c SHA512 116e51e9b31fca66b4edd9aac5d1f0c8929ba9a740af8b611fb7fa0e675e37facd4114d0848090b32f72f58d17c85060c15e07bee82098d83a0bd5b563f4c875
25
26 diff --git a/app-emulation/cri-o/cri-o-1.13.0.ebuild b/app-emulation/cri-o/cri-o-1.13.0.ebuild
27 deleted file mode 100644
28 index 6b934dd9e8e..00000000000
29 --- a/app-emulation/cri-o/cri-o-1.13.0.ebuild
30 +++ /dev/null
31 @@ -1,105 +0,0 @@
32 -# Copyright 1999-2019 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -EGIT_COMMIT="e8a2525c2e7f5ab057d5a2b5f1950be5643d8053"
38 -EGO_PN="github.com/kubernetes-sigs/${PN}"
39 -
40 -inherit golang-vcs-snapshot systemd
41 -
42 -DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
43 -HOMEPAGE="https://cri-o.io/"
44 -SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
45 -
46 -LICENSE="Apache-2.0"
47 -SLOT="0"
48 -KEYWORDS="~amd64"
49 -IUSE="btrfs +device-mapper ostree seccomp selinux"
50 -
51 -COMMON_DEPEND="
52 - app-crypt/gpgme:=
53 - app-emulation/runc
54 - dev-libs/glib:=
55 - dev-libs/libassuan:=
56 - dev-libs/libgpg-error:=
57 - net-firewall/conntrack-tools
58 - net-firewall/iptables
59 - net-misc/cni-plugins
60 - net-misc/socat
61 - sys-apps/iproute2
62 - btrfs? ( sys-fs/btrfs-progs )
63 - device-mapper? ( sys-fs/lvm2:= )
64 - ostree? ( dev-util/ostree )
65 - seccomp? ( sys-libs/libseccomp:= )
66 - selinux? ( sys-libs/libselinux:= )"
67 -DEPEND="
68 - ${COMMON_DEPEND}
69 - dev-go/go-md2man"
70 -RDEPEND="${COMMON_DEPEND}"
71 -S="${WORKDIR}/${P}/src/${EGO_PN}"
72 -
73 -src_prepare() {
74 - default
75 -
76 - sed -e '/^GIT_.*/d' \
77 - -e 's/$(GO) build/$(GO) build -v -work -x/' \
78 - -e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
79 - -i Makefile || die
80 -
81 - sed -e 's:/usr/local/bin:/usr/bin:' \
82 - -i contrib/systemd/* || die
83 -}
84 -
85 -src_compile() {
86 - [[ -f hack/btrfs_installed_tag.sh ]] || die
87 - use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
88 - hack/btrfs_installed_tag.sh || die; }
89 -
90 - [[ -f hack/libdm_installed.sh ]] || die
91 - use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
92 - hack/libdm_installed.sh || die; }
93 -
94 - [[ -f hack/ostree_tag.sh ]] || die
95 - use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
96 - hack/ostree_tag.sh || die; }
97 -
98 - [[ -f hack/seccomp_tag.sh ]] || die
99 - use seccomp || { echo -e "#!/bin/sh\ntrue" > \
100 - hack/seccomp_tag.sh || die; }
101 -
102 - [[ -f hack/selinux_tag.sh ]] || die
103 - use selinux || { echo -e "#!/bin/sh\ntrue" > \
104 - hack/selinux_tag.sh || die; }
105 -
106 - mkdir -p bin || die
107 - GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
108 - emake binaries docs
109 -}
110 -
111 -src_install() {
112 - emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
113 -
114 - keepdir /etc/crio
115 - insinto /etc/crio
116 - use seccomp && doins seccomp.json
117 -
118 - "${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die
119 - doins "${T}/crio.conf.example"
120 -
121 - newinitd "${FILESDIR}/crio.initd" crio
122 -
123 - insinto /etc/logrotate.d
124 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
125 -
126 - # Suppress crio log error messages triggered if these don't exist.
127 - keepdir /etc/containers/oci/hooks.d
128 - keepdir /usr/share/containers/oci/hooks.d
129 -
130 - # Suppress crio "Missing CNI default network" log message.
131 - keepdir /etc/cni/net.d
132 - insinto /etc/cni/net.d
133 - doins contrib/cni/99-loopback.conf
134 -
135 - systemd_dounit contrib/systemd/*
136 -}