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/containers-storage/
Date: Wed, 07 Aug 2019 23:35:03
Message-Id: 1565220868.24a45e403a7c371948d5a54318b806781fb88c3a.zmedico@gentoo
1 commit: 24a45e403a7c371948d5a54318b806781fb88c3a
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 7 23:34:28 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 7 23:34:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a45e40
7
8 app-emulation/containers-storage: Remove old versions
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-emulation/containers-storage/Manifest | 3 -
14 .../containers-storage-1.12.10.ebuild | 110 ---------------------
15 .../containers-storage-1.12.15.ebuild | 110 ---------------------
16 .../containers-storage-1.12.9.ebuild | 110 ---------------------
17 4 files changed, 333 deletions(-)
18
19 diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
20 index 8aaa370a6f9..2c97b469015 100644
21 --- a/app-emulation/containers-storage/Manifest
22 +++ b/app-emulation/containers-storage/Manifest
23 @@ -1,5 +1,2 @@
24 -DIST containers-storage-1.12.10.tar.gz 1593313 BLAKE2B 4b0c412304dc6b3aa79064a6071abfdd325cffd7405c50d57008f3139cfd9afd450a21773e4463650b63720210381e58e11b8c019efcf0297377821c3b76c276 SHA512 83b7e353efe89192e1c956742202395981849f68d53967df14a6952e36c458a2a2adaed4cf7d959e3b73114906deb5056591b8fc3aefbc83b85f9f5dd378f031
25 -DIST containers-storage-1.12.15.tar.gz 5968064 BLAKE2B 180583da6271c23f828ba5d91e8f1db64ac1aa8f9bb1f308b59e0eb0bdcd7afb94509aa0556bfc86a4e182cbdb6501b9c51b58499a61c2773254b03a6c3bc621 SHA512 523e4d35995fa169701551f91362fafd67f25ad1cbe733a5ae2614a198a4d71c5b5f319a539dd5a6a38e79ca46b8979ed62918a3bd69fb39d8d14d259f197408
26 DIST containers-storage-1.12.16.tar.gz 5970004 BLAKE2B 0e9f473c9315acb22b94c9cd17072659afe2270e05d7c7c595d0563bd4d96420b3ecaaaeaf61ce4a10647e40c7177b7483aadf62ce40237dea10c23cb91bba62 SHA512 17a073bb338547c1e64065a1a0013e083565abeb6aa366989160c90dfb6bd6d306ea25fc938194b607b0cc74918b1ff40b12ea274b3df771e2d848b2bbab2b5c
27 -DIST containers-storage-1.12.9.tar.gz 1593286 BLAKE2B f53ef233e3d08dad84cda9154271254f9fe04e951643f20e8ab5bd37456e4eeb7083c1810656072c2b4bdeea0f6188871d4db566363c8363d2c2087ab9a4d3cb SHA512 0b5ad6cb52b4b74da7c574ec6841d74b92ef20f853e8d8fed83e0f9d529a7749692225e26ae4ab89fbd2a6202651c8a3a44a57bc1f42bcbb755fdba26e9cb3fd
28 DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6
29
30 diff --git a/app-emulation/containers-storage/containers-storage-1.12.10.ebuild b/app-emulation/containers-storage/containers-storage-1.12.10.ebuild
31 deleted file mode 100644
32 index 312d2cda060..00000000000
33 --- a/app-emulation/containers-storage/containers-storage-1.12.10.ebuild
34 +++ /dev/null
35 @@ -1,110 +0,0 @@
36 -# Copyright 1999-2019 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -EGO_VENDOR=(
42 - "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
43 -)
44 -
45 -inherit golang-vcs-snapshot
46 -
47 -KEYWORDS="~amd64"
48 -DESCRIPTION="containers/storage library"
49 -HOMEPAGE="https://github.com/containers/storage"
50 -LICENSE="Apache-2.0"
51 -SLOT="0"
52 -IUSE="btrfs +device-mapper ostree test"
53 -EGO_PN="${HOMEPAGE#*//}"
54 -EGIT_COMMIT="v${PV}"
55 -SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
56 - ${EGO_VENDOR_URI}"
57 -RDEPEND="
58 - btrfs? ( sys-fs/btrfs-progs )
59 - device-mapper? ( sys-fs/lvm2:= )
60 - ostree? (
61 - dev-libs/glib:=
62 - dev-util/ostree:=
63 - )"
64 -DEPEND="${RDEPEND}
65 - dev-go/go-md2man
66 - test? (
67 - sys-fs/btrfs-progs
68 - sys-fs/lvm2
69 - sys-apps/util-linux
70 - )"
71 -RESTRICT="test? ( userpriv ) !test? ( test )"
72 -
73 -src_unpack() {
74 - golang-vcs-snapshot_src_unpack
75 -}
76 -
77 -src_prepare() {
78 - default
79 -
80 - [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
81 - use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
82 - "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
83 -
84 - [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
85 - use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
86 - "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
87 -
88 - [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
89 - use ostree || { echo -e "#!/bin/sh\ntrue" > \
90 - "${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
91 -
92 - sed -e 's:TestChrootUntarPath(:_\0:' \
93 - -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
94 - sed -e 's:TestTarUntar(:_\0:' \
95 - -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
96 - -e 's:TestTarWithOptions(:_\0:' \
97 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
98 - sed -e 's:TestTarUntarWithXattr(:_\0:' \
99 - -e 's:TestTarWithBlockCharFifo(:_\0:' \
100 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
101 - sed -e 's:TestTarUntarWithXattr(:_\0:' \
102 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
103 - sed -e 's:TestApplyLayer(:_\0:' \
104 - -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
105 - sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
106 - -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
107 - -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
108 - -e 's:TestApplyLayerWhiteouts(:_\0:' \
109 - -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
110 - sed -e 's:TestCopyCaseE(:_\0:' \
111 - -e 's:TestCopyCaseEFSym(:_\0:' \
112 - -e 's:TestCopyCaseG(:_\0:' \
113 - -e 's:TestCopyCaseGFSym(:_\0:' \
114 - -e 's:TestCopyCaseH(:_\0:' \
115 - -e 's:TestCopyCaseHFSym(:_\0:' \
116 - -e 's:TestCopyCaseJ(:_\0:' \
117 - -e 's:TestCopyCaseJFSym(:_\0:' \
118 - -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
119 - sed -e 's:TestMount(:_\0:' \
120 - -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
121 -}
122 -
123 -src_compile() {
124 - export -n GOCACHE XDG_CACHE_HOME #678856
125 - mkdir -p "${S}/src/github.com/pquerna" || die
126 - ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
127 - mkdir -p "${S}/bin" || die
128 - cd "${S}/bin" || die
129 - GOPATH="${S}" GOBIN="${S}/bin" \
130 - go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
131 - GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
132 - emake -C "${S}/src/${EGO_PN}" containers-storage docs
133 -}
134 -
135 -src_install() {
136 - dobin "${S}/src/${EGO_PN}/${PN}"
137 - while read -r -d ''; do
138 - mv "${REPLY}" "${REPLY%.1}" || die
139 - done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
140 - find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
141 -}
142 -
143 -src_test() {
144 - GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
145 -}
146
147 diff --git a/app-emulation/containers-storage/containers-storage-1.12.15.ebuild b/app-emulation/containers-storage/containers-storage-1.12.15.ebuild
148 deleted file mode 100644
149 index 312d2cda060..00000000000
150 --- a/app-emulation/containers-storage/containers-storage-1.12.15.ebuild
151 +++ /dev/null
152 @@ -1,110 +0,0 @@
153 -# Copyright 1999-2019 Gentoo Authors
154 -# Distributed under the terms of the GNU General Public License v2
155 -
156 -EAPI=7
157 -
158 -EGO_VENDOR=(
159 - "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
160 -)
161 -
162 -inherit golang-vcs-snapshot
163 -
164 -KEYWORDS="~amd64"
165 -DESCRIPTION="containers/storage library"
166 -HOMEPAGE="https://github.com/containers/storage"
167 -LICENSE="Apache-2.0"
168 -SLOT="0"
169 -IUSE="btrfs +device-mapper ostree test"
170 -EGO_PN="${HOMEPAGE#*//}"
171 -EGIT_COMMIT="v${PV}"
172 -SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
173 - ${EGO_VENDOR_URI}"
174 -RDEPEND="
175 - btrfs? ( sys-fs/btrfs-progs )
176 - device-mapper? ( sys-fs/lvm2:= )
177 - ostree? (
178 - dev-libs/glib:=
179 - dev-util/ostree:=
180 - )"
181 -DEPEND="${RDEPEND}
182 - dev-go/go-md2man
183 - test? (
184 - sys-fs/btrfs-progs
185 - sys-fs/lvm2
186 - sys-apps/util-linux
187 - )"
188 -RESTRICT="test? ( userpriv ) !test? ( test )"
189 -
190 -src_unpack() {
191 - golang-vcs-snapshot_src_unpack
192 -}
193 -
194 -src_prepare() {
195 - default
196 -
197 - [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
198 - use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
199 - "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
200 -
201 - [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
202 - use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
203 - "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
204 -
205 - [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
206 - use ostree || { echo -e "#!/bin/sh\ntrue" > \
207 - "${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
208 -
209 - sed -e 's:TestChrootUntarPath(:_\0:' \
210 - -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
211 - sed -e 's:TestTarUntar(:_\0:' \
212 - -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
213 - -e 's:TestTarWithOptions(:_\0:' \
214 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
215 - sed -e 's:TestTarUntarWithXattr(:_\0:' \
216 - -e 's:TestTarWithBlockCharFifo(:_\0:' \
217 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
218 - sed -e 's:TestTarUntarWithXattr(:_\0:' \
219 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
220 - sed -e 's:TestApplyLayer(:_\0:' \
221 - -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
222 - sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
223 - -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
224 - -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
225 - -e 's:TestApplyLayerWhiteouts(:_\0:' \
226 - -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
227 - sed -e 's:TestCopyCaseE(:_\0:' \
228 - -e 's:TestCopyCaseEFSym(:_\0:' \
229 - -e 's:TestCopyCaseG(:_\0:' \
230 - -e 's:TestCopyCaseGFSym(:_\0:' \
231 - -e 's:TestCopyCaseH(:_\0:' \
232 - -e 's:TestCopyCaseHFSym(:_\0:' \
233 - -e 's:TestCopyCaseJ(:_\0:' \
234 - -e 's:TestCopyCaseJFSym(:_\0:' \
235 - -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
236 - sed -e 's:TestMount(:_\0:' \
237 - -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
238 -}
239 -
240 -src_compile() {
241 - export -n GOCACHE XDG_CACHE_HOME #678856
242 - mkdir -p "${S}/src/github.com/pquerna" || die
243 - ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
244 - mkdir -p "${S}/bin" || die
245 - cd "${S}/bin" || die
246 - GOPATH="${S}" GOBIN="${S}/bin" \
247 - go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
248 - GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
249 - emake -C "${S}/src/${EGO_PN}" containers-storage docs
250 -}
251 -
252 -src_install() {
253 - dobin "${S}/src/${EGO_PN}/${PN}"
254 - while read -r -d ''; do
255 - mv "${REPLY}" "${REPLY%.1}" || die
256 - done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
257 - find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
258 -}
259 -
260 -src_test() {
261 - GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
262 -}
263
264 diff --git a/app-emulation/containers-storage/containers-storage-1.12.9.ebuild b/app-emulation/containers-storage/containers-storage-1.12.9.ebuild
265 deleted file mode 100644
266 index 312d2cda060..00000000000
267 --- a/app-emulation/containers-storage/containers-storage-1.12.9.ebuild
268 +++ /dev/null
269 @@ -1,110 +0,0 @@
270 -# Copyright 1999-2019 Gentoo Authors
271 -# Distributed under the terms of the GNU General Public License v2
272 -
273 -EAPI=7
274 -
275 -EGO_VENDOR=(
276 - "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
277 -)
278 -
279 -inherit golang-vcs-snapshot
280 -
281 -KEYWORDS="~amd64"
282 -DESCRIPTION="containers/storage library"
283 -HOMEPAGE="https://github.com/containers/storage"
284 -LICENSE="Apache-2.0"
285 -SLOT="0"
286 -IUSE="btrfs +device-mapper ostree test"
287 -EGO_PN="${HOMEPAGE#*//}"
288 -EGIT_COMMIT="v${PV}"
289 -SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
290 - ${EGO_VENDOR_URI}"
291 -RDEPEND="
292 - btrfs? ( sys-fs/btrfs-progs )
293 - device-mapper? ( sys-fs/lvm2:= )
294 - ostree? (
295 - dev-libs/glib:=
296 - dev-util/ostree:=
297 - )"
298 -DEPEND="${RDEPEND}
299 - dev-go/go-md2man
300 - test? (
301 - sys-fs/btrfs-progs
302 - sys-fs/lvm2
303 - sys-apps/util-linux
304 - )"
305 -RESTRICT="test? ( userpriv ) !test? ( test )"
306 -
307 -src_unpack() {
308 - golang-vcs-snapshot_src_unpack
309 -}
310 -
311 -src_prepare() {
312 - default
313 -
314 - [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
315 - use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
316 - "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
317 -
318 - [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
319 - use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
320 - "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
321 -
322 - [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
323 - use ostree || { echo -e "#!/bin/sh\ntrue" > \
324 - "${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
325 -
326 - sed -e 's:TestChrootUntarPath(:_\0:' \
327 - -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
328 - sed -e 's:TestTarUntar(:_\0:' \
329 - -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
330 - -e 's:TestTarWithOptions(:_\0:' \
331 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
332 - sed -e 's:TestTarUntarWithXattr(:_\0:' \
333 - -e 's:TestTarWithBlockCharFifo(:_\0:' \
334 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
335 - sed -e 's:TestTarUntarWithXattr(:_\0:' \
336 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
337 - sed -e 's:TestApplyLayer(:_\0:' \
338 - -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
339 - sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
340 - -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
341 - -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
342 - -e 's:TestApplyLayerWhiteouts(:_\0:' \
343 - -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
344 - sed -e 's:TestCopyCaseE(:_\0:' \
345 - -e 's:TestCopyCaseEFSym(:_\0:' \
346 - -e 's:TestCopyCaseG(:_\0:' \
347 - -e 's:TestCopyCaseGFSym(:_\0:' \
348 - -e 's:TestCopyCaseH(:_\0:' \
349 - -e 's:TestCopyCaseHFSym(:_\0:' \
350 - -e 's:TestCopyCaseJ(:_\0:' \
351 - -e 's:TestCopyCaseJFSym(:_\0:' \
352 - -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
353 - sed -e 's:TestMount(:_\0:' \
354 - -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
355 -}
356 -
357 -src_compile() {
358 - export -n GOCACHE XDG_CACHE_HOME #678856
359 - mkdir -p "${S}/src/github.com/pquerna" || die
360 - ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
361 - mkdir -p "${S}/bin" || die
362 - cd "${S}/bin" || die
363 - GOPATH="${S}" GOBIN="${S}/bin" \
364 - go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
365 - GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
366 - emake -C "${S}/src/${EGO_PN}" containers-storage docs
367 -}
368 -
369 -src_install() {
370 - dobin "${S}/src/${EGO_PN}/${PN}"
371 - while read -r -d ''; do
372 - mv "${REPLY}" "${REPLY%.1}" || die
373 - done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
374 - find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
375 -}
376 -
377 -src_test() {
378 - GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
379 -}