[gentoo-commits] repo/gentoo:master commit in: app-emulation/containers-storage/ - 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:	Fri, 15 Nov 2019 20:33:28
Message-Id:	`1573849994.d9d0bce00623333e13bb75b56fd1feb3b56f3f73.zmedico@gentoo`

1

commit:     d9d0bce00623333e13bb75b56fd1feb3b56f3f73

2

Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>

3

AuthorDate: Fri Nov 15 20:30:14 2019 +0000

4

Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>

5

CommitDate: Fri Nov 15 20:33:14 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d0bce0

7

8

app-emulation/containers-storage: Remove old versions

9

10

Package-Manager: Portage-2.3.79, Repoman-2.3.18

11

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

12

13

 app-emulation/containers-storage/Manifest          |   2 -

14

 .../containers-storage-1.13.1.ebuild               | 110 ---------------------

15

 .../containers-storage-1.13.3.ebuild               | 110 ---------------------

16

 app-emulation/containers-storage/metadata.xml      |   3 -

17

 4 files changed, 225 deletions(-)

18

19

diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest

20

index 91bec43f25d..9342b4834ba 100644

21

--- a/app-emulation/containers-storage/Manifest

22

+++ b/app-emulation/containers-storage/Manifest

23

@@ -1,4 +1,2 @@

24

-DIST containers-storage-1.13.1.tar.gz 5983556 BLAKE2B 1d0b6aba0464603fb26c45beecdb9b4afe6566dff4698da980ad6f9736a6d810ec41334f181d5709f78bab986e704c965b1967ed591348cd687d9cb92875321d SHA512 9fa686f44dda3d363f7c623abc9baa0911e26eb5e7dbb7bc60da259fe8d52411cb25fb98e2c8db10a5a80ebf04d07af8390acd48d26706f913900b19e58eac9f

25

-DIST containers-storage-1.13.3.tar.gz 5983607 BLAKE2B 9e591873da4824a133e3818ba9a97074bca234c3154bef9c4febcfd559d0b2ab7462c7da24ce7d391bbdbe2d9a62cb9fd711624623ba28cd8e79d0ca7fcabb47 SHA512 83fd16cbe5821c68092845defc2c5b8407b03c3972b146f409be3444a114d357709fefc25206a1ca26e6ef4a5fc219f360bb0195ffdc1c6e9f79e90f07740820

26

 DIST containers-storage-1.13.5.tar.gz 5968281 BLAKE2B 9690ebc87ce32a82b7560d594e192e0ad4dc9e8885797593d8c9699c13b9ddf0814773bce081edafe3050aba5d2bc470855c0717874c091b1468d52f7ad08658 SHA512 7f9f65e3141b7843a42389c78b3fbcc55a205eb661968f85942ccc2751fa6eb3fdf1199e8d244264d1b8f392e290a1770f93d5a8fd58de98f9d9a277aa39155f

27

 DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6

28

29

diff --git a/app-emulation/containers-storage/containers-storage-1.13.1.ebuild b/app-emulation/containers-storage/containers-storage-1.13.1.ebuild

30

deleted file mode 100644

31

index daa6f6e3484..00000000000

32

--- a/app-emulation/containers-storage/containers-storage-1.13.1.ebuild

33

+++ /dev/null

34

@@ -1,110 +0,0 @@

35

-# Copyright 1999-2019 Gentoo Authors

36

-# Distributed under the terms of the GNU General Public License v2

37

-

38

-EAPI=7

39

-

40

-EGO_VENDOR=(

41

-	"github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"

42

-)

43

-

44

-inherit golang-vcs-snapshot

45

-

46

-KEYWORDS="~amd64"

47

-DESCRIPTION="containers/storage library"

48

-HOMEPAGE="https://github.com/containers/storage"

49

-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"

50

-SLOT="0"

51

-IUSE="btrfs +device-mapper ostree test"

52

-EGO_PN="${HOMEPAGE#*//}"

53

-EGIT_COMMIT="v${PV}"

54

-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz

55

-	${EGO_VENDOR_URI}"

56

-RDEPEND="

57

-	btrfs? ( sys-fs/btrfs-progs )

58

-	device-mapper? ( sys-fs/lvm2:= )

59

-	ostree? (

60

-		dev-libs/glib:=

61

-		dev-util/ostree:=

62

-	)"

63

-DEPEND="${RDEPEND}

64

-	dev-go/go-md2man

65

-	test? (

66

-		sys-fs/btrfs-progs

67

-		sys-fs/lvm2

68

-		sys-apps/util-linux

69

-	)"

70

-RESTRICT="test? ( userpriv ) !test? ( test )"

71

-

72

-src_unpack() {

73

-	golang-vcs-snapshot_src_unpack

74

-}

75

-

76

-src_prepare() {

77

-	default

78

-

79

-	[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die

80

-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \

81

-		"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }

82

-

83

-	[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die

84

-	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \

85

-		"${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }

86

-

87

-	[[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die

88

-	use ostree || { echo -e "#!/bin/sh\ntrue" > \

89

-		"${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }

90

-

91

-	sed -e 's:TestChrootUntarPath(:_\0:' \

92

-		-i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die

93

-	sed -e 's:TestTarUntar(:_\0:' \

94

-		-e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \

95

-		-e 's:TestTarWithOptions(:_\0:' \

96

-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die

97

-	sed -e 's:TestTarUntarWithXattr(:_\0:' \

98

-		-e 's:TestTarWithBlockCharFifo(:_\0:' \

99

-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die

100

-	sed -e 's:TestTarUntarWithXattr(:_\0:' \

101

-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die

102

-	sed -e 's:TestApplyLayer(:_\0:' \

103

-		-i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die

104

-	sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \

105

-		-e 's:TestApplyLayerInvalidHardlink(:_\0:' \

106

-		-e 's:TestApplyLayerInvalidSymlink(:_\0:' \

107

-		-e 's:TestApplyLayerWhiteouts(:_\0:' \

108

-		-i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die

109

-	sed -e 's:TestCopyCaseE(:_\0:' \

110

-		-e 's:TestCopyCaseEFSym(:_\0:' \

111

-		-e 's:TestCopyCaseG(:_\0:' \

112

-		-e 's:TestCopyCaseGFSym(:_\0:' \

113

-		-e 's:TestCopyCaseH(:_\0:' \

114

-		-e 's:TestCopyCaseHFSym(:_\0:' \

115

-		-e 's:TestCopyCaseJ(:_\0:' \

116

-		-e 's:TestCopyCaseJFSym(:_\0:' \

117

-		-i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die

118

-	sed -e 's:TestMount(:_\0:' \

119

-		-i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die

120

-}

121

-

122

-src_compile() {

123

-	export -n GOCACHE XDG_CACHE_HOME #678856

124

-	mkdir -p "${S}/src/github.com/pquerna" || die

125

-	ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die

126

-	mkdir -p "${S}/bin" || die

127

-	cd "${S}/bin" || die

128

-	GOPATH="${S}" GOBIN="${S}/bin" \

129

-		go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die

130

-	GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \

131

-		emake -C "${S}/src/${EGO_PN}" containers-storage docs

132

-}

133

-

134

-src_install() {

135

-	dobin "${S}/src/${EGO_PN}/${PN}"

136

-	while read -r -d ''; do

137

-		mv "${REPLY}" "${REPLY%.1}" || die

138

-	done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)

139

-	find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die

140

-}

141

-

142

-src_test() {

143

-	GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die

144

-}

145

146

diff --git a/app-emulation/containers-storage/containers-storage-1.13.3.ebuild b/app-emulation/containers-storage/containers-storage-1.13.3.ebuild

147

deleted file mode 100644

148

index 0e74471b34d..00000000000

149

--- a/app-emulation/containers-storage/containers-storage-1.13.3.ebuild

150

+++ /dev/null

151

@@ -1,110 +0,0 @@

152

-# Copyright 1999-2019 Gentoo Authors

153

-# Distributed under the terms of the GNU General Public License v2

154

-

155

-EAPI=7

156

-

157

-EGO_VENDOR=(

158

-	"github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"

159

-)

160

-

161

-inherit golang-vcs-snapshot

162

-

163

-KEYWORDS="~amd64"

164

-DESCRIPTION="containers/storage library"

165

-HOMEPAGE="https://github.com/containers/storage"

166

-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"

167

-SLOT="0"

168

-IUSE="btrfs +device-mapper ostree test"

169

-EGO_PN="${HOMEPAGE#*//}"

170

-EGIT_COMMIT="v${PV}"

171

-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz

172

-	${EGO_VENDOR_URI}"

173

-RDEPEND="

174

-	btrfs? ( sys-fs/btrfs-progs )

175

-	device-mapper? ( sys-fs/lvm2:= )

176

-	ostree? (

177

-		dev-libs/glib:=

178

-		dev-util/ostree:=

179

-	)"

180

-DEPEND="${RDEPEND}

181

-	dev-go/go-md2man

182

-	test? (

183

-		sys-fs/btrfs-progs

184

-		sys-fs/lvm2

185

-		sys-apps/util-linux

186

-	)"

187

-RESTRICT="test? ( userpriv ) !test? ( test )"

188

-

189

-src_unpack() {

190

-	golang-vcs-snapshot_src_unpack

191

-}

192

-

193

-src_prepare() {

194

-	default

195

-

196

-	[[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die

197

-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \

198

-		"${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }

199

-

200

-	[[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die

201

-	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \

202

-		"${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }

203

-

204

-	[[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] || die

205

-	use ostree || { echo -e "#!/bin/sh\ntrue" > \

206

-		"${S}/src/${EGO_PN}/hack/ostree_tag.sh" || die; }

207

-

208

-	sed -e 's:TestChrootUntarPath(:_\0:' \

209

-		-i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die

210

-	sed -e 's:TestTarUntar(:_\0:' \

211

-		-e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \

212

-		-e 's:TestTarWithOptions(:_\0:' \

213

-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die

214

-	sed -e 's:TestTarUntarWithXattr(:_\0:' \

215

-		-e 's:TestTarWithBlockCharFifo(:_\0:' \

216

-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die

217

-	sed -e 's:TestTarUntarWithXattr(:_\0:' \

218

-		-i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die

219

-	sed -e 's:TestApplyLayer(:_\0:' \

220

-		-i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die

221

-	sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \

222

-		-e 's:TestApplyLayerInvalidHardlink(:_\0:' \

223

-		-e 's:TestApplyLayerInvalidSymlink(:_\0:' \

224

-		-e 's:TestApplyLayerWhiteouts(:_\0:' \

225

-		-i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die

226

-	sed -e 's:TestCopyCaseE(:_\0:' \

227

-		-e 's:TestCopyCaseEFSym(:_\0:' \

228

-		-e 's:TestCopyCaseG(:_\0:' \

229

-		-e 's:TestCopyCaseGFSym(:_\0:' \

230

-		-e 's:TestCopyCaseH(:_\0:' \

231

-		-e 's:TestCopyCaseHFSym(:_\0:' \

232

-		-e 's:TestCopyCaseJ(:_\0:' \

233

-		-e 's:TestCopyCaseJFSym(:_\0:' \

234

-		-i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die

235

-	sed -e 's:TestMount(:_\0:' \

236

-		-i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die

237

-}

238

-

239

-src_compile() {

240

-	export -n GOCACHE XDG_CACHE_HOME #678856

241

-	mkdir -p "${S}/src/github.com/pquerna" || die

242

-	ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die

243

-	mkdir -p "${S}/bin" || die

244

-	cd "${S}/bin" || die

245

-	GOPATH="${S}" GOBIN="${S}/bin" \

246

-		go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die

247

-	GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \

248

-		emake -C "${S}/src/${EGO_PN}" containers-storage docs

249

-}

250

-

251

-src_install() {

252

-	dobin "${S}/src/${EGO_PN}/${PN}"

253

-	while read -r -d ''; do

254

-		mv "${REPLY}" "${REPLY%.1}" || die

255

-	done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)

256

-	find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die

257

-}

258

-

259

-src_test() {

260

-	GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die

261

-}

262

263

diff --git a/app-emulation/containers-storage/metadata.xml b/app-emulation/containers-storage/metadata.xml

264

index 17371971e52..ea691c78983 100644

265

--- a/app-emulation/containers-storage/metadata.xml

266

+++ b/app-emulation/containers-storage/metadata.xml

267

@@ -14,9 +14,6 @@

268

 			Enables dependencies for the "devicemapper" graph driver, including

269

 			necessary kernel flags.

270

 		</flag>

271

-		<flag name="ostree">

272

-			Enables dependencies for handling of OSTree images.

273

-		</flag>

274

 	</use>

275

 	<upstream>

276

 		<remote-id type="github">containers/storage</remote-id>

1	commit: d9d0bce00623333e13bb75b56fd1feb3b56f3f73
2	Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3	AuthorDate: Fri Nov 15 20:30:14 2019 +0000
4	Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5	CommitDate: Fri Nov 15 20:33:14 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d0bce0
7
8	app-emulation/containers-storage: Remove old versions
9
10	Package-Manager: Portage-2.3.79, Repoman-2.3.18
11	Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13	app-emulation/containers-storage/Manifest \| 2 -
14	.../containers-storage-1.13.1.ebuild \| 110 ---------------------
15	.../containers-storage-1.13.3.ebuild \| 110 ---------------------
16	app-emulation/containers-storage/metadata.xml \| 3 -
17	4 files changed, 225 deletions(-)
18
19	diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
20	index 91bec43f25d..9342b4834ba 100644
21	--- a/app-emulation/containers-storage/Manifest
22	+++ b/app-emulation/containers-storage/Manifest
23	@@ -1,4 +1,2 @@
24	-DIST containers-storage-1.13.1.tar.gz 5983556 BLAKE2B 1d0b6aba0464603fb26c45beecdb9b4afe6566dff4698da980ad6f9736a6d810ec41334f181d5709f78bab986e704c965b1967ed591348cd687d9cb92875321d SHA512 9fa686f44dda3d363f7c623abc9baa0911e26eb5e7dbb7bc60da259fe8d52411cb25fb98e2c8db10a5a80ebf04d07af8390acd48d26706f913900b19e58eac9f
25	-DIST containers-storage-1.13.3.tar.gz 5983607 BLAKE2B 9e591873da4824a133e3818ba9a97074bca234c3154bef9c4febcfd559d0b2ab7462c7da24ce7d391bbdbe2d9a62cb9fd711624623ba28cd8e79d0ca7fcabb47 SHA512 83fd16cbe5821c68092845defc2c5b8407b03c3972b146f409be3444a114d357709fefc25206a1ca26e6ef4a5fc219f360bb0195ffdc1c6e9f79e90f07740820
26	DIST containers-storage-1.13.5.tar.gz 5968281 BLAKE2B 9690ebc87ce32a82b7560d594e192e0ad4dc9e8885797593d8c9699c13b9ddf0814773bce081edafe3050aba5d2bc470855c0717874c091b1468d52f7ad08658 SHA512 7f9f65e3141b7843a42389c78b3fbcc55a205eb661968f85942ccc2751fa6eb3fdf1199e8d244264d1b8f392e290a1770f93d5a8fd58de98f9d9a277aa39155f
27	DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6
28
29	diff --git a/app-emulation/containers-storage/containers-storage-1.13.1.ebuild b/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
30	deleted file mode 100644
31	index daa6f6e3484..00000000000
32	--- a/app-emulation/containers-storage/containers-storage-1.13.1.ebuild
33	+++ /dev/null
34	@@ -1,110 +0,0 @@
35	-# Copyright 1999-2019 Gentoo Authors
36	-# Distributed under the terms of the GNU General Public License v2
37	-
38	-EAPI=7
39	-
40	-EGO_VENDOR=(
41	- "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
42	-)
43	-
44	-inherit golang-vcs-snapshot
45	-
46	-KEYWORDS="~amd64"
47	-DESCRIPTION="containers/storage library"
48	-HOMEPAGE="https://github.com/containers/storage"
49	-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
50	-SLOT="0"
51	-IUSE="btrfs +device-mapper ostree test"
52	-EGO_PN="${HOMEPAGE#*//}"
53	-EGIT_COMMIT="v${PV}"
54	-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
55	- ${EGO_VENDOR_URI}"
56	-RDEPEND="
57	- btrfs? ( sys-fs/btrfs-progs )
58	- device-mapper? ( sys-fs/lvm2:= )
59	- ostree? (
60	- dev-libs/glib:=
61	- dev-util/ostree:=
62	- )"
63	-DEPEND="${RDEPEND}
64	- dev-go/go-md2man
65	- test? (
66	- sys-fs/btrfs-progs
67	- sys-fs/lvm2
68	- sys-apps/util-linux
69	- )"
70	-RESTRICT="test? ( userpriv ) !test? ( test )"
71	-
72	-src_unpack() {
73	- golang-vcs-snapshot_src_unpack
74	-}
75	-
76	-src_prepare() {
77	- default
78	-
79	- [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] \|\| die
80	- use btrfs \|\| { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
81	- "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" \|\| die; }
82	-
83	- [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] \|\| die
84	- use device-mapper \|\| { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
85	- "${S}/src/${EGO_PN}/hack/libdm_tag.sh" \|\| die; }
86	-
87	- [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] \|\| die
88	- use ostree \|\| { echo -e "#!/bin/sh\ntrue" > \
89	- "${S}/src/${EGO_PN}/hack/ostree_tag.sh" \|\| die; }
90	-
91	- sed -e 's:TestChrootUntarPath(:_\0:' \
92	- -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" \|\| die
93	- sed -e 's:TestTarUntar(:_\0:' \
94	- -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
95	- -e 's:TestTarWithOptions(:_\0:' \
96	- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" \|\| die
97	- sed -e 's:TestTarUntarWithXattr(:_\0:' \
98	- -e 's:TestTarWithBlockCharFifo(:_\0:' \
99	- -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" \|\| die
100	- sed -e 's:TestTarUntarWithXattr(:_\0:' \
101	- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" \|\| die
102	- sed -e 's:TestApplyLayer(:_\0:' \
103	- -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" \|\| die
104	- sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
105	- -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
106	- -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
107	- -e 's:TestApplyLayerWhiteouts(:_\0:' \
108	- -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" \|\| die
109	- sed -e 's:TestCopyCaseE(:_\0:' \
110	- -e 's:TestCopyCaseEFSym(:_\0:' \
111	- -e 's:TestCopyCaseG(:_\0:' \
112	- -e 's:TestCopyCaseGFSym(:_\0:' \
113	- -e 's:TestCopyCaseH(:_\0:' \
114	- -e 's:TestCopyCaseHFSym(:_\0:' \
115	- -e 's:TestCopyCaseJ(:_\0:' \
116	- -e 's:TestCopyCaseJFSym(:_\0:' \
117	- -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" \|\| die
118	- sed -e 's:TestMount(:_\0:' \
119	- -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" \|\| die
120	-}
121	-
122	-src_compile() {
123	- export -n GOCACHE XDG_CACHE_HOME #678856
124	- mkdir -p "${S}/src/github.com/pquerna" \|\| die
125	- ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" \|\| die
126	- mkdir -p "${S}/bin" \|\| die
127	- cd "${S}/bin" \|\| die
128	- GOPATH="${S}" GOBIN="${S}/bin" \
129	- go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" \|\| die
130	- GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
131	- emake -C "${S}/src/${EGO_PN}" containers-storage docs
132	-}
133	-
134	-src_install() {
135	- dobin "${S}/src/${EGO_PN}/${PN}"
136	- while read -r -d ''; do
137	- mv "${REPLY}" "${REPLY%.1}" \|\| die
138	- done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
139	- find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + \|\| die
140	-}
141	-
142	-src_test() {
143	- GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit \|\| die
144	-}
145
146	diff --git a/app-emulation/containers-storage/containers-storage-1.13.3.ebuild b/app-emulation/containers-storage/containers-storage-1.13.3.ebuild
147	deleted file mode 100644
148	index 0e74471b34d..00000000000
149	--- a/app-emulation/containers-storage/containers-storage-1.13.3.ebuild
150	+++ /dev/null
151	@@ -1,110 +0,0 @@
152	-# Copyright 1999-2019 Gentoo Authors
153	-# Distributed under the terms of the GNU General Public License v2
154	-
155	-EAPI=7
156	-
157	-EGO_VENDOR=(
158	- "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
159	-)
160	-
161	-inherit golang-vcs-snapshot
162	-
163	-KEYWORDS="~amd64"
164	-DESCRIPTION="containers/storage library"
165	-HOMEPAGE="https://github.com/containers/storage"
166	-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
167	-SLOT="0"
168	-IUSE="btrfs +device-mapper ostree test"
169	-EGO_PN="${HOMEPAGE#*//}"
170	-EGIT_COMMIT="v${PV}"
171	-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
172	- ${EGO_VENDOR_URI}"
173	-RDEPEND="
174	- btrfs? ( sys-fs/btrfs-progs )
175	- device-mapper? ( sys-fs/lvm2:= )
176	- ostree? (
177	- dev-libs/glib:=
178	- dev-util/ostree:=
179	- )"
180	-DEPEND="${RDEPEND}
181	- dev-go/go-md2man
182	- test? (
183	- sys-fs/btrfs-progs
184	- sys-fs/lvm2
185	- sys-apps/util-linux
186	- )"
187	-RESTRICT="test? ( userpriv ) !test? ( test )"
188	-
189	-src_unpack() {
190	- golang-vcs-snapshot_src_unpack
191	-}
192	-
193	-src_prepare() {
194	- default
195	-
196	- [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] \|\| die
197	- use btrfs \|\| { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
198	- "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" \|\| die; }
199	-
200	- [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] \|\| die
201	- use device-mapper \|\| { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
202	- "${S}/src/${EGO_PN}/hack/libdm_tag.sh" \|\| die; }
203	-
204	- [[ -f ${S}/src/${EGO_PN}/hack/ostree_tag.sh ]] \|\| die
205	- use ostree \|\| { echo -e "#!/bin/sh\ntrue" > \
206	- "${S}/src/${EGO_PN}/hack/ostree_tag.sh" \|\| die; }
207	-
208	- sed -e 's:TestChrootUntarPath(:_\0:' \
209	- -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" \|\| die
210	- sed -e 's:TestTarUntar(:_\0:' \
211	- -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
212	- -e 's:TestTarWithOptions(:_\0:' \
213	- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" \|\| die
214	- sed -e 's:TestTarUntarWithXattr(:_\0:' \
215	- -e 's:TestTarWithBlockCharFifo(:_\0:' \
216	- -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" \|\| die
217	- sed -e 's:TestTarUntarWithXattr(:_\0:' \
218	- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" \|\| die
219	- sed -e 's:TestApplyLayer(:_\0:' \
220	- -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" \|\| die
221	- sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
222	- -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
223	- -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
224	- -e 's:TestApplyLayerWhiteouts(:_\0:' \
225	- -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" \|\| die
226	- sed -e 's:TestCopyCaseE(:_\0:' \
227	- -e 's:TestCopyCaseEFSym(:_\0:' \
228	- -e 's:TestCopyCaseG(:_\0:' \
229	- -e 's:TestCopyCaseGFSym(:_\0:' \
230	- -e 's:TestCopyCaseH(:_\0:' \
231	- -e 's:TestCopyCaseHFSym(:_\0:' \
232	- -e 's:TestCopyCaseJ(:_\0:' \
233	- -e 's:TestCopyCaseJFSym(:_\0:' \
234	- -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" \|\| die
235	- sed -e 's:TestMount(:_\0:' \
236	- -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" \|\| die
237	-}
238	-
239	-src_compile() {
240	- export -n GOCACHE XDG_CACHE_HOME #678856
241	- mkdir -p "${S}/src/github.com/pquerna" \|\| die
242	- ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" \|\| die
243	- mkdir -p "${S}/bin" \|\| die
244	- cd "${S}/bin" \|\| die
245	- GOPATH="${S}" GOBIN="${S}/bin" \
246	- go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" \|\| die
247	- GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
248	- emake -C "${S}/src/${EGO_PN}" containers-storage docs
249	-}
250	-
251	-src_install() {
252	- dobin "${S}/src/${EGO_PN}/${PN}"
253	- while read -r -d ''; do
254	- mv "${REPLY}" "${REPLY%.1}" \|\| die
255	- done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
256	- find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + \|\| die
257	-}
258	-
259	-src_test() {
260	- GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit \|\| die
261	-}
262
263	diff --git a/app-emulation/containers-storage/metadata.xml b/app-emulation/containers-storage/metadata.xml
264	index 17371971e52..ea691c78983 100644
265	--- a/app-emulation/containers-storage/metadata.xml
266	+++ b/app-emulation/containers-storage/metadata.xml
267	@@ -14,9 +14,6 @@
268	Enables dependencies for the "devicemapper" graph driver, including
269	necessary kernel flags.
270	</flag>
271	- <flag name="ostree">
272	- Enables dependencies for handling of OSTree images.
273	- </flag>
274	</use>
275	<upstream>
276	<remote-id type="github">containers/storage</remote-id>

Gentoo Archives: gentoo-commits