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/buildah/
Date: Tue, 26 Nov 2019 03:29:57
Message-Id: 1574738986.309920a20b484cd31e20b7ec111b970803ec8f06.zmedico@gentoo
1 commit: 309920a20b484cd31e20b7ec111b970803ec8f06
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 26 03:29:27 2019 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 26 03:29:46 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=309920a2
7
8 app-emulation/buildah: 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/buildah/Manifest | 2 -
14 app-emulation/buildah/buildah-1.11.2.ebuild | 57 -----------------------------
15 app-emulation/buildah/buildah-1.11.3.ebuild | 57 -----------------------------
16 app-emulation/buildah/metadata.xml | 5 ---
17 4 files changed, 121 deletions(-)
18
19 diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
20 index 7ca2df07441..4cbdecb560f 100644
21 --- a/app-emulation/buildah/Manifest
22 +++ b/app-emulation/buildah/Manifest
23 @@ -1,3 +1 @@
24 -DIST buildah-1.11.2.tar.gz 10128075 BLAKE2B ad8f4253b62cd7709bf5ae530d002190c1850da6bbfa7dff2281de0592422eccc67a4ba6e52f7a82d6c1b320b986237a84d0ffaaf9b3b1b93822a54621365250 SHA512 f491d96d5bb4d0aa03981fb58d24f36c2e3928179c8fb79e85f323ce9a65ae6da05b816d86ae43f94a83a1b2445b315f93ca28b531436d9b4e5861e4adef2aac
25 -DIST buildah-1.11.3.tar.gz 10429884 BLAKE2B 2d433a128d115c6b2f3a9d246d41406993905dee357237796cea3295036d026ca93f8c98ca992cfebfa574ab0d5e7b974fd356a146b7cde58986166bc18a5645 SHA512 07fff3f8c044ad01a663bf5470b19f75568ce741b3bb45f656200099ba559622597111ede3e20331dc06139f2e58d962d92bf0fdd00284ca6ed05b5b66500975
26 DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e2aa1f83e261a8b5b1f3f41a5be4ea2fdeb41d4e27fb52bf23f309b8aea1d050cea0c6deffcad0ebb273032e712ba SHA512 04a9c51e1cb6f3a88f118b69dcea1eba85b02d534e671cd5bf31a6d6a797bce4a488c9373c92736fccd74331c1242ff60a95f44626ecbb50c32db176c7106e86
27
28 diff --git a/app-emulation/buildah/buildah-1.11.2.ebuild b/app-emulation/buildah/buildah-1.11.2.ebuild
29 deleted file mode 100644
30 index 6a58e5f4b30..00000000000
31 --- a/app-emulation/buildah/buildah-1.11.2.ebuild
32 +++ /dev/null
33 @@ -1,57 +0,0 @@
34 -# Copyright 1999-2019 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -inherit bash-completion-r1 golang-vcs-snapshot
39 -
40 -KEYWORDS="~amd64"
41 -DESCRIPTION="A tool that facilitates building OCI images"
42 -HOMEPAGE="https://github.com/containers/buildah"
43 -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
44 -SLOT="0"
45 -IUSE="ostree selinux"
46 -EGO_PN="${HOMEPAGE#*//}"
47 -EGIT_COMMIT="v${PV}"
48 -GIT_COMMIT="0bafbfe"
49 -SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
50 -RDEPEND="app-crypt/gpgme:=
51 - app-emulation/skopeo
52 - dev-libs/libgpg-error:=
53 - dev-libs/libassuan:=
54 - sys-fs/lvm2:=
55 - sys-libs/libseccomp:=
56 - selinux? ( sys-libs/libselinux:= )"
57 -DEPEND="${RDEPEND}"
58 -RESTRICT="test"
59 -REQUIRED_USE="!selinux? ( !ostree )"
60 -S="${WORKDIR}/${P}/src/${EGO_PN}"
61 -
62 -src_prepare() {
63 - default
64 - sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
65 -
66 - [[ -f ostree_tag.sh ]] || die
67 - use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
68 - ostree_tag.sh || die; }
69 -
70 - [[ -f selinux_tag.sh ]] || die
71 - use selinux || { echo -e "#!/bin/sh\ntrue" > \
72 - selinux_tag.sh || die; }
73 -}
74 -
75 -src_compile() {
76 - export -n GOCACHE XDG_CACHE_HOME
77 - GOPATH="${WORKDIR}/${P}" emake all
78 -}
79 -
80 -src_install() {
81 - dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
82 - doman docs/*.1
83 - dodoc -r docs/tutorials
84 - dobin ${PN} imgtype
85 - dobashcomp contrib/completions/bash/buildah
86 -}
87 -
88 -src_test() {
89 - GOPATH="${WORKDIR}/${P}" emake test-unit
90 -}
91
92 diff --git a/app-emulation/buildah/buildah-1.11.3.ebuild b/app-emulation/buildah/buildah-1.11.3.ebuild
93 deleted file mode 100644
94 index 42661d17b64..00000000000
95 --- a/app-emulation/buildah/buildah-1.11.3.ebuild
96 +++ /dev/null
97 @@ -1,57 +0,0 @@
98 -# Copyright 1999-2019 Gentoo Authors
99 -# Distributed under the terms of the GNU General Public License v2
100 -
101 -EAPI=7
102 -inherit bash-completion-r1 golang-vcs-snapshot
103 -
104 -KEYWORDS="~amd64"
105 -DESCRIPTION="A tool that facilitates building OCI images"
106 -HOMEPAGE="https://github.com/containers/buildah"
107 -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
108 -SLOT="0"
109 -IUSE="ostree selinux"
110 -EGO_PN="${HOMEPAGE#*//}"
111 -EGIT_COMMIT="v${PV}"
112 -GIT_COMMIT="bdd78ad"
113 -SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
114 -RDEPEND="app-crypt/gpgme:=
115 - app-emulation/skopeo
116 - dev-libs/libgpg-error:=
117 - dev-libs/libassuan:=
118 - sys-fs/lvm2:=
119 - sys-libs/libseccomp:=
120 - selinux? ( sys-libs/libselinux:= )"
121 -DEPEND="${RDEPEND}"
122 -RESTRICT="test"
123 -REQUIRED_USE="!selinux? ( !ostree )"
124 -S="${WORKDIR}/${P}/src/${EGO_PN}"
125 -
126 -src_prepare() {
127 - default
128 - sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
129 -
130 - [[ -f ostree_tag.sh ]] || die
131 - use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
132 - ostree_tag.sh || die; }
133 -
134 - [[ -f selinux_tag.sh ]] || die
135 - use selinux || { echo -e "#!/bin/sh\ntrue" > \
136 - selinux_tag.sh || die; }
137 -}
138 -
139 -src_compile() {
140 - export -n GOCACHE XDG_CACHE_HOME
141 - GOPATH="${WORKDIR}/${P}" emake all
142 -}
143 -
144 -src_install() {
145 - dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
146 - doman docs/*.1
147 - dodoc -r docs/tutorials
148 - dobin ${PN} imgtype
149 - dobashcomp contrib/completions/bash/buildah
150 -}
151 -
152 -src_test() {
153 - GOPATH="${WORKDIR}/${P}" emake test-unit
154 -}
155
156 diff --git a/app-emulation/buildah/metadata.xml b/app-emulation/buildah/metadata.xml
157 index aef68f1e538..491730ac55c 100644
158 --- a/app-emulation/buildah/metadata.xml
159 +++ b/app-emulation/buildah/metadata.xml
160 @@ -5,11 +5,6 @@
161 <email>zmedico@g.o</email>
162 <name>Zac Medico</name>
163 </maintainer>
164 - <use>
165 - <flag name="ostree">
166 - Enables dependencies for handling of OSTree images.
167 - </flag>
168 - </use>
169 <upstream>
170 <remote-id type="github">containers/buildah</remote-id>
171 </upstream>