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: Sun, 02 Jun 2019 06:23:17
Message-Id: 1559456584.22b11dbcb538f0a44cf8808bd13bd43091acaa18.zmedico@gentoo
1 commit: 22b11dbcb538f0a44cf8808bd13bd43091acaa18
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 2 06:21:18 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 2 06:23:04 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b11dbc
7
8 app-emulation/containers-storage: remove old version
9
10 Package-Manager: Portage-2.3.67, Repoman-2.3.13
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-emulation/containers-storage/Manifest | 2 -
14 .../containers-storage-0_pre20180730.ebuild | 110 ---------------------
15 2 files changed, 112 deletions(-)
16
17 diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
18 index 9a4450ee62a..35b17c1a255 100644
19 --- a/app-emulation/containers-storage/Manifest
20 +++ b/app-emulation/containers-storage/Manifest
21 @@ -1,4 +1,2 @@
22 -DIST containers-storage-0_pre20180730.tar.gz 1410155 BLAKE2B 24595693e9f5706130dd5e9bf38d11b2b267a64924cb854ad2d9db8c0a3d7c47fec5a00fa100be67ceaf35ea1a08fada7314d5fbe114fe7508f54e8bfc4f64b4 SHA512 25c5c3c16bb9f0da4e590cf658e56cc2ce1dbc81751f984b426b5e09a95ee816632b0267c8f3028254e88fcd39f5d087f0357862b34379180b33ff38d7028453
23 DIST containers-storage-1.12.7.tar.gz 1562420 BLAKE2B 84b8f5a329aa191eb07bfab9e4b547e1a48cf5ff30b389f4b8f5aea702e5536cd420aeffb93cc0d15dcd33f3f0d1779f19fdfe2363b027ba3bb8e4776f411a78 SHA512 c0dc5aa32c3d439427ccd1721dd9d0b3119cd15b1cf65dc8079714a0df38e961084d090bb9cedd98a0e33c4d530ce898d885447974a86e024ec721d4f2900f34
24 -DIST github.com-pquerna-ffjson-af8b230fcd2007c7095168ca8ab94c68b60840c6.tar.gz 103474 BLAKE2B 66b456484cec51106e328a6d2c58a8597c1208956fca0c9f0ea45108b8d0942561882004a1ed5b90daa21509c9e0bc090dc9beed89b5a161f52ee8cf58e5d48f SHA512 243d8aed943dbadf3b127e07ad29a830ecded24aa80bb3bcc101db90ba8f3bfa03832e9d1f452e94b3eaccd683a044d0687a168e7e41979eb470442e689659c9
25 DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6
26
27 diff --git a/app-emulation/containers-storage/containers-storage-0_pre20180730.ebuild b/app-emulation/containers-storage/containers-storage-0_pre20180730.ebuild
28 deleted file mode 100644
29 index d5caa6e3a62..00000000000
30 --- a/app-emulation/containers-storage/containers-storage-0_pre20180730.ebuild
31 +++ /dev/null
32 @@ -1,110 +0,0 @@
33 -# Copyright 1999-2019 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -EGO_VENDOR=(
39 - "github.com/pquerna/ffjson af8b230fcd2007c7095168ca8ab94c68b60840c6"
40 -)
41 -
42 -inherit golang-vcs-snapshot
43 -
44 -KEYWORDS="~amd64"
45 -DESCRIPTION="containers/storage library"
46 -HOMEPAGE="https://github.com/containers/storage"
47 -LICENSE="Apache-2.0"
48 -SLOT="0"
49 -IUSE="btrfs +device-mapper ostree test"
50 -EGO_PN="${HOMEPAGE#*//}"
51 -EGIT_COMMIT="17c7d1fee5603ccf6dd97edc14162fc1510e7e23"
52 -SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
53 - ${EGO_VENDOR_URI}"
54 -RDEPEND="
55 - btrfs? ( sys-fs/btrfs-progs )
56 - device-mapper? ( sys-fs/lvm2:= )
57 - ostree? (
58 - dev-libs/glib:=
59 - dev-util/ostree:=
60 - )"
61 -DEPEND="${RDEPEND}
62 - dev-go/go-md2man
63 - test? (
64 - sys-fs/btrfs-progs
65 - sys-fs/lvm2
66 - sys-apps/util-linux
67 - )"
68 -RESTRICT="test? ( userpriv ) !test? ( test )"
69 -
70 -src_unpack() {
71 - golang-vcs-snapshot_src_unpack
72 -}
73 -
74 -src_prepare() {
75 - default
76 -
77 - [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
78 - use btrfs || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_btrfs" > \
79 - "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
80 -
81 - [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
82 - use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
83 - "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
84 -
85 - [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die
86 - use ostree || { echo -e "#!/bin/sh\ntrue" > \
87 - "${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }
88 -
89 - sed -e 's:TestChrootUntarPath(:_\0:' \
90 - -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
91 - sed -e 's:TestTarUntar(:_\0:' \
92 - -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
93 - -e 's:TestTarWithOptions(:_\0:' \
94 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
95 - sed -e 's:TestTarUntarWithXattr(:_\0:' \
96 - -e 's:TestTarWithBlockCharFifo(:_\0:' \
97 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
98 - sed -e 's:TestTarUntarWithXattr(:_\0:' \
99 - -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
100 - sed -e 's:TestApplyLayer(:_\0:' \
101 - -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
102 - sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
103 - -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
104 - -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
105 - -e 's:TestApplyLayerWhiteouts(:_\0:' \
106 - -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
107 - sed -e 's:TestCopyCaseE(:_\0:' \
108 - -e 's:TestCopyCaseEFSym(:_\0:' \
109 - -e 's:TestCopyCaseG(:_\0:' \
110 - -e 's:TestCopyCaseGFSym(:_\0:' \
111 - -e 's:TestCopyCaseH(:_\0:' \
112 - -e 's:TestCopyCaseHFSym(:_\0:' \
113 - -e 's:TestCopyCaseJ(:_\0:' \
114 - -e 's:TestCopyCaseJFSym(:_\0:' \
115 - -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
116 - sed -e 's:TestMount(:_\0:' \
117 - -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
118 -}
119 -
120 -src_compile() {
121 - export -n GOCACHE XDG_CACHE_HOME #678856
122 - mkdir -p "${S}/src/github.com/pquerna" || die
123 - ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
124 - mkdir -p "${S}/bin" || die
125 - cd "${S}/bin" || die
126 - GOPATH="${S}" GOBIN="${S}/bin" \
127 - go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
128 - GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
129 - emake -C "${S}/src/${EGO_PN}" containers-storage docs
130 -}
131 -
132 -src_install() {
133 - dobin "${S}/src/${EGO_PN}/${PN}"
134 - while read -r -d ''; do
135 - mv "${REPLY}" "${REPLY%.1}" || die
136 - done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
137 - find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
138 -}
139 -
140 -src_test() {
141 - GOPATH="${S}" GOCACHE=off unshare -m emake -C "${S}/src/${EGO_PN}" local-test-unit
142 -}