Gentoo Archives: gentoo-commits

From: Erik Mackdanz <stasibear@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/, app-emulation/lxd/files/
Date: Tue, 29 Dec 2015 01:41:25
Message-Id: 1451353330.b56cffd436a6624b7b80d9ebbeaa87a8d2602294.stasibear@gentoo
1 commit: b56cffd436a6624b7b80d9ebbeaa87a8d2602294
2 Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 29 01:42:10 2015 +0000
4 Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 29 01:42:10 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b56cffd4
7
8 app-emulation/lxd: remove old
9
10 Package-Manager: portage-2.2.26
11
12 app-emulation/lxd/Manifest | 1 -
13 app-emulation/lxd/files/lxd-0.22-dont-go-get.patch | 18 ---
14 .../lxd/files/lxd-0.22-nc-binary-name.patch | 11 --
15 app-emulation/lxd/files/lxd-0.22.confd | 27 ----
16 app-emulation/lxd/files/lxd-0.22.initd | 43 ------
17 app-emulation/lxd/lxd-0.22.ebuild | 157 ---------------------
18 6 files changed, 257 deletions(-)
19
20 diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
21 index e9f110b..fafcf9f 100644
22 --- a/app-emulation/lxd/Manifest
23 +++ b/app-emulation/lxd/Manifest
24 @@ -1,4 +1,3 @@
25 -DIST lxd-0.22.tar.bz2 2685133 SHA256 66dc30b82fba7f606658280d0dbac67a32152644a403ab00285fc3907b50082e SHA512 ab5384143edd03dfa1ef956c64e9fce2d845ce07c5388f719c202fd1ff9059282e104400f39f23ff1c4fefc8a23dd1d4c6c9094b497c40c659b087989bf07d44 WHIRLPOOL 27559c50f6aa55edb533046bb49b04784c63003569e7920261504a7b4c69891a80ff8432421352c13f274bb21876f2cf5266e9de2b1302d69e0254be87c17137
26 DIST lxd-0.23.tar.bz2 2606330 SHA256 06335bd15b00db2dec06114427b1d934fe1ac5271b85eb19074c508cb2466695 SHA512 2f73817c800c55c722a3017ee3064587c04730d5da9846b44be99b4541e739b466bcb7e924fcb18a15f1d49d010d471510378060530f6a15f6e60363b4d556b3 WHIRLPOOL 455b782ed2d21d5a720e06e356e1dd2115df174893e66710c74d02596deb8a66ff6e77b400f2ebeb047209b3bfed0927ff21a3a9f7cf9924719b84742f0eb5a7
27 DIST lxd-0.24.tar.bz2 1973022 SHA256 e3851bded0f2639e4aec9c63797135bfa3b27def17123c8e506c784b1ab4c99a SHA512 e7593136fd1fb13542a8415d964ff3bab8bcc7f7a7d806874e7c21fd9d96652aa5716a9d3318cea3d849a19aa96b40bfea27f4edd528c8307efaeeac88971f2e WHIRLPOOL 69b6722a25c9e75e533436a37951dc893cbf3d3c0f5d31b3ccc2cf0a7dede9cf16c53e68562348ab9bf9e621421030b826df21e5fb32df8a496127601fa5d898
28 DIST lxd-0.25.tar.bz2 1983043 SHA256 1cfdf1a5e8638060e2368e9e5cf8763406857309f08c4668fa0756e85ba7b89e SHA512 001e52826a3bbe00121115ddace14b3f552321f16e97700763ff6dd23b5babd3c1393cbc9b9b263b6a18c31e49c30d612e3d7153d4987644689989be0be50d00 WHIRLPOOL 496f3f19c50c1ee79ba8b5625cf34b6f57683f4066a09b3edc2cbd017cc5ebc2cc7ac9e569c94bcba0d699c6efb722b79ae43541e0dfddc2fb8d877131519b06
29
30 diff --git a/app-emulation/lxd/files/lxd-0.22-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.22-dont-go-get.patch
31 deleted file mode 100644
32 index 1b229ea..0000000
33 --- a/app-emulation/lxd/files/lxd-0.22-dont-go-get.patch
34 +++ /dev/null
35 @@ -1,18 +0,0 @@
36 ---- Makefile.orig 2015-09-17 20:37:16.481867339 -0500
37 -+++ Makefile 2015-09-17 20:53:27.715800926 -0500
38 -@@ -12,15 +12,11 @@
39 -
40 - .PHONY: default
41 - default:
42 -- -go get -t -v -d ./...
43 -- -go get -t -v -d ./...
44 - go install -v ./...
45 - @echo "LXD built succesfuly"
46 -
47 - .PHONY: client
48 - client:
49 -- -go get -t -v -d ./...
50 -- -go get -t -v -d ./...
51 - go install -v ./lxc
52 - @echo "LXD client built succesfuly"
53 -
54
55 diff --git a/app-emulation/lxd/files/lxd-0.22-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.22-nc-binary-name.patch
56 deleted file mode 100644
57 index 7373b66..0000000
58 --- a/app-emulation/lxd/files/lxd-0.22-nc-binary-name.patch
59 +++ /dev/null
60 @@ -1,11 +0,0 @@
61 ---- lxd/rsync.go.orig 2015-11-11 20:54:37.402700202 -0600
62 -+++ lxd/rsync.go 2015-11-11 20:55:06.704698199 -0600
63 -@@ -91,7 +91,7 @@
64 - * command (i.e. the command to run on --server). However, we're
65 - * hardcoding that at the other end, so we can just ignore it.
66 - */
67 -- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
68 -+ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
69 - cmd := exec.Command(
70 - "rsync",
71 - "-arvP",
72
73 diff --git a/app-emulation/lxd/files/lxd-0.22.confd b/app-emulation/lxd/files/lxd-0.22.confd
74 deleted file mode 100644
75 index 3d55327..0000000
76 --- a/app-emulation/lxd/files/lxd-0.22.confd
77 +++ /dev/null
78 @@ -1,27 +0,0 @@
79 -# Group which owns the shared socket
80 -LXD_OPTIONS+=" --group lxd"
81 -
82 -
83 -
84 -# Enable cpu profiling into the specified file
85 -#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
86 -
87 -# Enable memory profiling into the specified file
88 -#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
89 -
90 -
91 -
92 -# Enables debug mode
93 -#LXD_OPTIONS+=" --debug"
94 -
95 -# For debugging, print a complete stack trace every n seconds
96 -#LXD_OPTIONS+=" --print-goroutines-every 5"
97 -
98 -# Enables verbose mode
99 -#LXD_OPTIONS+=" -v"
100 -
101 -# Logfile to log to
102 -#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
103 -
104 -# Enables syslog logging
105 -#LXD_OPTIONS+=" --syslog"
106
107 diff --git a/app-emulation/lxd/files/lxd-0.22.initd b/app-emulation/lxd/files/lxd-0.22.initd
108 deleted file mode 100644
109 index 65915f0..0000000
110 --- a/app-emulation/lxd/files/lxd-0.22.initd
111 +++ /dev/null
112 @@ -1,43 +0,0 @@
113 -#!/sbin/runscript
114 -# Copyright 1999-2015 Gentoo Foundation
115 -# Distributed under the terms of the GNU General Public License v2
116 -# $Id$
117 -
118 -DAEMON=/usr/sbin/lxd
119 -PIDFILE=/run/lxd.pid
120 -
121 -extra_commands="shutdown"
122 -
123 -depend() {
124 - need cgmanager
125 - need net
126 -}
127 -
128 -start() {
129 - ebegin "Starting lxd server"
130 -
131 - start-stop-daemon --start \
132 - --pidfile ${PIDFILE} \
133 - --exec ${DAEMON} \
134 - --background \
135 - --make-pidfile \
136 - -- \
137 - ${LXD_OPTIONS}
138 -
139 - eend $?
140 -}
141 -
142 -stop() {
143 - ebegin "Stopping lxd server"
144 - start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
145 - eend $?
146 -}
147 -
148 -shutdown() {
149 - ebegin "Stopping lxd server and containers"
150 - if ${DAEMON} shutdown; then
151 - /etc/init.d/lxd zap
152 - rm -f ${PIDFILE}
153 - fi
154 - eend $?
155 -}
156
157 diff --git a/app-emulation/lxd/lxd-0.22.ebuild b/app-emulation/lxd/lxd-0.22.ebuild
158 deleted file mode 100644
159 index a56c9bd..0000000
160 --- a/app-emulation/lxd/lxd-0.22.ebuild
161 +++ /dev/null
162 @@ -1,157 +0,0 @@
163 -# Copyright 1999-2015 Gentoo Foundation
164 -# Distributed under the terms of the GNU General Public License v2
165 -# $Id$
166 -
167 -EAPI=5
168 -
169 -DESCRIPTION="Fast, dense and secure container management"
170 -HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
171 -EGO_PN_PARENT="github.com/lxc"
172 -EGO_PN="${EGO_PN_PARENT}/lxd"
173 -SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
174 -LICENSE="Apache-2.0"
175 -SLOT="0"
176 -KEYWORDS="~amd64"
177 -
178 -PLOCALES="de fr ja"
179 -IUSE="+daemon nls test"
180 -
181 -# IUSE and PLOCALES must be defined before l10n inherited
182 -inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
183 -
184 -DEPEND="
185 - dev-go/go-crypto
186 - >=dev-lang/go-1.4.2:=
187 - dev-libs/protobuf
188 - dev-vcs/git
189 - nls? ( sys-devel/gettext )
190 - test? (
191 - app-misc/jq
192 - dev-db/sqlite
193 - net-misc/curl
194 - sys-devel/gettext
195 - )
196 -"
197 -
198 -RDEPEND="
199 - daemon? (
200 - app-admin/cgmanager
201 - app-arch/xz-utils
202 - app-emulation/lxc[cgmanager,seccomp]
203 - net-analyzer/openbsd-netcat
204 - net-misc/bridge-utils
205 - net-misc/rsync[xattr]
206 - sys-apps/iproute2
207 - virtual/acl
208 - )
209 -"
210 -
211 -# KNOWN ISSUES:
212 -# - Translations may not work. I've been unsuccessful in forcing
213 -# localized output. Anyway, upstream (Canonical) doesn't install the
214 -# message files.
215 -
216 -# TODO:
217 -# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
218 -# be preferable for that support to go into the golang-build eclass not
219 -# this package directly.
220 -
221 -src_prepare() {
222 - cd "${S}/src/${EGO_PN}"
223 -
224 - epatch "${FILESDIR}/${P}-dont-go-get.patch"
225 -
226 - # Upstream requires the openbsd flavor of netcat (with -U), but
227 - # Gentoo installs that with a renamed binary
228 - epatch "${FILESDIR}/${P}-nc-binary-name.patch"
229 -
230 - # Warn on unhandled locale changes
231 - l10n_find_plocales_changes po "" .po
232 -}
233 -
234 -src_compile() {
235 - golang-build_src_compile
236 -
237 - cd "${S}/src/${EGO_PN}"
238 -
239 - if use daemon; then
240 - # Build binaries
241 - GOPATH="${S}:$(get_golibdir_gopath)" emake
242 - else
243 - # build client tool
244 - GOPATH="${S}:$(get_golibdir_gopath)" emake client
245 - fi
246 -
247 - use nls && emake build-mo
248 -}
249 -
250 -src_test() {
251 - if use daemon; then
252 - # Go native tests should succeed
253 - golang-build_src_test
254 - fi
255 -}
256 -
257 -src_install() {
258 - # Installs all src,pkg to /usr/lib/go-gentoo
259 - golang-build_src_install
260 -
261 - cd "${S}"
262 - dobin bin/lxc
263 - if use daemon; then
264 - dobin bin/fuidshift
265 -
266 - dosbin bin/lxd
267 - fi
268 -
269 - cd "src/${EGO_PN}"
270 -
271 - if use nls; then
272 - for lingua in ${PLOCALES}; do
273 - if use linguas_${lingua}; then
274 - domo po/${lingua}.mo
275 - fi
276 - done
277 - fi
278 -
279 - if use daemon; then
280 - newinitd "${FILESDIR}"/${P}.initd lxd
281 - newconfd "${FILESDIR}"/${P}.confd lxd
282 -
283 - systemd_dounit "${FILESDIR}"/lxd.service
284 - fi
285 -
286 - newbashcomp config/bash/lxc.in lxc
287 -
288 - dodoc AUTHORS CONTRIBUTING.md README.md
289 -
290 - docinto specs
291 - dodoc specs/*
292 -}
293 -
294 -pkg_postinst() {
295 - einfo
296 - einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
297 - einfo "including a Quick Start."
298 -
299 - # The messaging below only applies to daemon installs
300 - use daemon || return 0
301 -
302 - # The control socket will be owned by (and writeable by) this group.
303 - enewgroup lxd
304 -
305 - # Ubuntu also defines an lxd user but it appears unused (the daemon
306 - # must run as root)
307 -
308 - einfo
309 - einfo "Though not strictly required, some features are enabled at run-time"
310 - einfo "when the relevant helper programs are detected:"
311 - einfo "- sys-apps/apparmor"
312 - einfo "- sys-fs/btrfs-progs"
313 - einfo "- sys-fs/lvm2"
314 - einfo "- sys-fs/zfs"
315 - einfo "- sys-process/criu"
316 - einfo
317 - einfo "Since these features can't be disabled at build-time they are"
318 - einfo "not USE-conditional."
319 -}