Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-cli/
Date: Wed, 06 Oct 2021 16:49:56
Message-Id: 1633538984.119eddeda445019d4203d3f3e687290c36cc3245.williamh@gentoo
1 commit: 119eddeda445019d4203d3f3e687290c36cc3245
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 6 16:49:17 2021 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 6 16:49:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=119edded
7
8 app-emulation/docker-cli: remove old
9
10 Bug: https://bugs.gentoo.org/816321
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
13
14 app-emulation/docker-cli/Manifest | 2 -
15 app-emulation/docker-cli/docker-cli-20.10.7.ebuild | 64 ---------------------
16 app-emulation/docker-cli/docker-cli-20.10.8.ebuild | 66 ----------------------
17 3 files changed, 132 deletions(-)
18
19 diff --git a/app-emulation/docker-cli/Manifest b/app-emulation/docker-cli/Manifest
20 index 19899e3c61f..32326b4ca4f 100644
21 --- a/app-emulation/docker-cli/Manifest
22 +++ b/app-emulation/docker-cli/Manifest
23 @@ -1,3 +1 @@
24 -DIST docker-cli-20.10.7.tar.gz 7523515 BLAKE2B 36ae46a28ca943e75419014b8b8453dbdd36bf240b9c36aed245447241dd07635da0319fd9b6ea409ecbe4c419eec8650d94d2a296e45a9c3b02a9a47a314888 SHA512 4523ae70cb27d848da119070171af2eb84e974ac39d70be4feee105e37c949487c7f72a9bc30c32ce71bffb0787e27b7b9194ce5a8aeae57bdfeb3f2d730010f
25 -DIST docker-cli-20.10.8.tar.gz 7526374 BLAKE2B 65b7733c9a71c7f266e83b7014ecdca998915e71352a1bbbb346be6a3a65f1ed6644b321b62d0592f2dbf308ff51d3d4ad0d9828831f5f90b451c6ff23452faa SHA512 60e9e623180d3cafd8bd6458d02574274871f94e88a0fa461e2200520717e837371a1b5d7fab6c9c4591e64807ab6f560e0756a9cfb1c1c8c9624b1f653346d0
26 DIST docker-cli-20.10.9.tar.gz 7525889 BLAKE2B 7b12f81ed98ed416fb00211b9e6d965ed3209fd83db17a98bef7fef0eb56b27f495093facb3d43e40ec651568a7d83dd484c014c998e046a57662087b1d7c2c6 SHA512 0a9bd36c139bb5e1cd4a975913aa5429ffce8c746d2104aa2a54d937c67073ddaa2a8a5e93d71d2d435459af58168de0e7e3a44fd452da535f3995738da206df
27
28 diff --git a/app-emulation/docker-cli/docker-cli-20.10.7.ebuild b/app-emulation/docker-cli/docker-cli-20.10.7.ebuild
29 deleted file mode 100644
30 index 89c5fce7fea..00000000000
31 --- a/app-emulation/docker-cli/docker-cli-20.10.7.ebuild
32 +++ /dev/null
33 @@ -1,64 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -GIT_COMMIT=f0df35096d5f5e6b559b42c7fde6c65a2909f7c5
39 -EGO_PN="github.com/docker/cli"
40 -inherit bash-completion-r1 golang-vcs-snapshot
41 -
42 -DESCRIPTION="the command line binary for docker"
43 -HOMEPAGE="https://www.docker.com/"
44 -MY_PV=${PV/_/-}
45 -SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
46 -
47 -LICENSE="Apache-2.0"
48 -SLOT="0"
49 -KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
50 -IUSE="hardened"
51 -
52 -RDEPEND="!<app-emulation/docker-20.10.1"
53 -BDEPEND="dev-go/go-md2man"
54 -
55 -RESTRICT="installsources strip"
56 -
57 -S="${WORKDIR}/${P}/src/${EGO_PN}"
58 -
59 -src_prepare() {
60 - default
61 - sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
62 -}
63 -
64 -src_compile() {
65 - export DISABLE_WARN_OUTSIDE_CONTAINER=1
66 - export GOPATH="${WORKDIR}/${P}"
67 - # setup CFLAGS and LDFLAGS for separate build target
68 - # see https://github.com/tianon/docker-overlay/pull/10
69 - export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
70 - export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
71 - emake \
72 - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
73 - VERSION="${PV}" \
74 - GITCOMMIT="${GIT_COMMIT}" \
75 - dynbinary
76 -
77 - # build man pages
78 - # see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
79 - mkdir -p ./man/man1 || die "mkdir failed"
80 - go build -o "${T}"/gen-manpages ./man ||
81 - die 'build gen-manpages failed'
82 - "${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
83 - die 'gen-manpages failed'
84 - ./man/md2man-all.sh -q ||
85 - die 'md2man-all.sh failed'
86 -}
87 -
88 -src_install() {
89 - dobin build/docker
90 - doman man/man*/*
91 - dobashcomp contrib/completion/bash/*
92 - bashcomp_alias docker dockerd
93 - insinto /usr/share/fish/vendor_completions.d/
94 - doins contrib/completion/fish/docker.fish
95 - insinto /usr/share/zsh/site-functions
96 - doins contrib/completion/zsh/_*
97 -}
98
99 diff --git a/app-emulation/docker-cli/docker-cli-20.10.8.ebuild b/app-emulation/docker-cli/docker-cli-20.10.8.ebuild
100 deleted file mode 100644
101 index 849c6810779..00000000000
102 --- a/app-emulation/docker-cli/docker-cli-20.10.8.ebuild
103 +++ /dev/null
104 @@ -1,66 +0,0 @@
105 -# Copyright 1999-2021 Gentoo Authors
106 -# Distributed under the terms of the GNU General Public License v2
107 -
108 -EAPI=7
109 -GIT_COMMIT=3967b7d28e
110 -EGO_PN="github.com/docker/cli"
111 -MY_PV=${PV/_/-}
112 -inherit bash-completion-r1 golang-vcs-snapshot
113 -
114 -DESCRIPTION="the command line binary for docker"
115 -HOMEPAGE="https://www.docker.com/"
116 -SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
117 -
118 -LICENSE="Apache-2.0"
119 -SLOT="0"
120 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
121 -IUSE="hardened"
122 -
123 -RDEPEND="!<app-emulation/docker-20.10.1"
124 -BDEPEND="
125 - >=dev-lang/go-1.16.6
126 - dev-go/go-md2man"
127 -
128 -RESTRICT="installsources strip"
129 -
130 -S="${WORKDIR}/${P}/src/${EGO_PN}"
131 -
132 -src_prepare() {
133 - default
134 - sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
135 -}
136 -
137 -src_compile() {
138 - export DISABLE_WARN_OUTSIDE_CONTAINER=1
139 - export GOPATH="${WORKDIR}/${P}"
140 - # setup CFLAGS and LDFLAGS for separate build target
141 - # see https://github.com/tianon/docker-overlay/pull/10
142 - export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
143 - export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
144 - emake \
145 - LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
146 - VERSION="${PV}" \
147 - GITCOMMIT="${GIT_COMMIT}" \
148 - dynbinary
149 -
150 - # build man pages
151 - # see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
152 - mkdir -p ./man/man1 || die "mkdir failed"
153 - go build -o "${T}"/gen-manpages ./man ||
154 - die 'build gen-manpages failed'
155 - "${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
156 - die 'gen-manpages failed'
157 - ./man/md2man-all.sh -q ||
158 - die 'md2man-all.sh failed'
159 -}
160 -
161 -src_install() {
162 - dobin build/docker
163 - doman man/man*/*
164 - dobashcomp contrib/completion/bash/*
165 - bashcomp_alias docker dockerd
166 - insinto /usr/share/fish/vendor_completions.d/
167 - doins contrib/completion/fish/docker.fish
168 - insinto /usr/share/zsh/site-functions
169 - doins contrib/completion/zsh/_*
170 -}