Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/containerd/
Date: Wed, 06 Dec 2017 18:50:16
Message-Id: 1512586191.330b6002c2efa1ed225dd03b92d926e90af4a2b9.mrueg@gentoo
1 commit: 330b6002c2efa1ed225dd03b92d926e90af4a2b9
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 6 18:49:51 2017 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 6 18:49:51 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330b6002
7
8 app-emulation/containerd: Remove old
9
10 Package-Manager: Portage-2.3.16, Repoman-2.3.6
11
12 app-emulation/containerd/Manifest | 2 -
13 .../containerd/containerd-1.0.0_beta3.ebuild | 52 ----------------------
14 .../containerd/containerd-1.0.0_rc0.ebuild | 52 ----------------------
15 3 files changed, 106 deletions(-)
16
17 diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
18 index 68c76a8d761..920bd7b5eba 100644
19 --- a/app-emulation/containerd/Manifest
20 +++ b/app-emulation/containerd/Manifest
21 @@ -2,5 +2,3 @@ DIST containerd-0.2.9_p20170605.tar.gz 1229549 SHA256 c506121c49e3bfea27018aa77e
22 DIST containerd-0.2.9_p20170917.tar.gz 1140788 BLAKE2B 96effa85f9cb03c3e416d53438376af6c7965660bf9c9931fdfa7fee94cca9386f2732e70dc88ee32b83e902b7d4a3072e22a817d9970ed1e07dc1271e8b33ab SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a
23 DIST containerd-1.0.0.tar.gz 3763785 BLAKE2B cd4af679c9028b616aeedd594518f796a350523899c13da5a848a5843b318394166ddfbf5e7ed1f473a3759b26d134659f928d8e15da17ebdf65a41d2fd5f914 SHA512 8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a
24 DIST containerd-1.0.0_beta2_p20171019.tar.gz 3682585 BLAKE2B a67b581e3e5ddf2e95d551a9cca3dafa14772dc6ec1f1b1226ce21b0d7f88f3f80669b21f471fede50d5dd68d3916ef8696d0551c333c57e87a8ee2db3d25488 SHA512 290dcc97c47dccc6af424f5bcdfa2b59ae29eda135f71fb68a456245017a7ce5262150088f91b9edcaa19886d8919e5b6246f2816d6947c0a9b33ec6b58185e9
25 -DIST containerd-1.0.0_beta3.tar.gz 3696070 SHA256 efd40a7fdcb07b23273c389453559c0521c2cf4baf669cdf134cd10a21627ee4 SHA512 45853001bcf57f7289747b71215eb0bc60b18e54db73896779f294db1b72374cf36c8792371a8d46ddfe283dfc9655f10cb61b3a74420a79a4abb9fa89b76323 WHIRLPOOL 63c47a18c4d5f09043d0449a042c453451bfe4fedcb1e22eb35080c3730b1f181fcb58131f58ecf8e819688ccdfd9dbe4fb70cb9f3d08782257bb6126f05e0c5
26 -DIST containerd-1.0.0_rc0.tar.gz 3757536 BLAKE2B f316f74ddbf6f5049e9124de47a6f988cefed6428080b3ba9939da1deb3f6146ce4d9c337b7b6f5931901390e34e8eca47b7070d4812dc4edc5bc6e280cfd777 SHA512 32d9a115214b15e10782abc8ef37115979ca49a0bbf38278c280dcb0822761f38178826f934fb034263e7e0ee07be7558b59c26276edf37294e908f4e51e3807
27
28 diff --git a/app-emulation/containerd/containerd-1.0.0_beta3.ebuild b/app-emulation/containerd/containerd-1.0.0_beta3.ebuild
29 deleted file mode 100644
30 index 1f0795bfd42..00000000000
31 --- a/app-emulation/containerd/containerd-1.0.0_beta3.ebuild
32 +++ /dev/null
33 @@ -1,52 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -EGO_PN="github.com/containerd/${PN}"
39 -
40 -inherit toolchain-funcs
41 -
42 -if [[ ${PV} == *9999 ]]; then
43 - inherit golang-vcs
44 -else
45 - MY_PV="${PV/_beta/-beta.}"
46 - EGIT_COMMIT="v${MY_PV}"
47 - CONTAINERD_COMMIT="2b8ed96"
48 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
49 - KEYWORDS="~amd64 ~arm ~ppc64"
50 - inherit golang-vcs-snapshot
51 -fi
52 -
53 -DESCRIPTION="A daemon to control runC"
54 -HOMEPAGE="https://containerd.tools"
55 -
56 -LICENSE="Apache-2.0"
57 -SLOT="0"
58 -IUSE="hardened +seccomp"
59 -
60 -DEPEND="sys-fs/btrfs-progs"
61 -RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
62 - >=app-emulation/runc-1.0.0_rc4 )
63 - seccomp? ( sys-libs/libseccomp )"
64 -
65 -S=${WORKDIR}/${P}/src/${EGO_PN}
66 -
67 -src_prepare() {
68 - default
69 - if [[ ${PV} != *9999* ]]; then
70 - sed -i -e "s/git describe --match.*$/echo ${PV})/"\
71 - -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
72 - -e "s/-s -w//" \
73 - Makefile || die
74 - fi
75 -}
76 -
77 -src_compile() {
78 - local options=( $(usex seccomp "seccomp" "") )
79 - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
80 - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
81 -}
82 -
83 -src_install() {
84 - dobin bin/containerd{-shim,-stress,} bin/ctr
85 -}
86
87 diff --git a/app-emulation/containerd/containerd-1.0.0_rc0.ebuild b/app-emulation/containerd/containerd-1.0.0_rc0.ebuild
88 deleted file mode 100644
89 index 5b020eaa7ee..00000000000
90 --- a/app-emulation/containerd/containerd-1.0.0_rc0.ebuild
91 +++ /dev/null
92 @@ -1,52 +0,0 @@
93 -# Copyright 1999-2017 Gentoo Foundation
94 -# Distributed under the terms of the GNU General Public License v2
95 -
96 -EAPI=6
97 -EGO_PN="github.com/containerd/${PN}"
98 -
99 -inherit toolchain-funcs
100 -
101 -if [[ ${PV} == *9999 ]]; then
102 - inherit golang-vcs
103 -else
104 - MY_PV="${PV/_rc/-rc.}"
105 - EGIT_COMMIT="v${MY_PV}"
106 - CONTAINERD_COMMIT="08f1793"
107 - SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
108 - KEYWORDS="~amd64 ~arm ~ppc64"
109 - inherit golang-vcs-snapshot
110 -fi
111 -
112 -DESCRIPTION="A daemon to control runC"
113 -HOMEPAGE="https://containerd.tools"
114 -
115 -LICENSE="Apache-2.0"
116 -SLOT="0"
117 -IUSE="+btrfs hardened"
118 -
119 -DEPEND="btrfs? ( sys-fs/btrfs-progs )"
120 -RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
121 - >=app-emulation/runc-1.0.0_rc4 )
122 - sys-libs/libseccomp"
123 -
124 -S=${WORKDIR}/${P}/src/${EGO_PN}
125 -
126 -src_prepare() {
127 - default
128 - if [[ ${PV} != *9999* ]]; then
129 - sed -i -e "s/git describe --match.*$/echo ${PV})/"\
130 - -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
131 - -e "s/-s -w//" \
132 - Makefile || die
133 - fi
134 -}
135 -
136 -src_compile() {
137 - local options=( $(usex btrfs "" "no_btrfs") )
138 - export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
139 - LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
140 -}
141 -
142 -src_install() {
143 - dobin bin/containerd{-shim,-stress,} bin/ctr
144 -}