1 |
commit: 4ad0a95574bdc6a59e682bae1ce69aabe7e03fd2 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 29 16:03:29 2019 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 29 16:06:44 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad0a955 |
7 |
|
8 |
dev-util/catalyst: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
dev-util/catalyst/Manifest | 5 - |
13 |
dev-util/catalyst/catalyst-2.0.18-r1.ebuild | 115 -------------------- |
14 |
dev-util/catalyst/catalyst-2.0.18-r4.ebuild | 120 --------------------- |
15 |
dev-util/catalyst/catalyst-3.0.1.ebuild | 65 ----------- |
16 |
dev-util/catalyst/catalyst-3.0.2-r1.ebuild | 71 ------------ |
17 |
dev-util/catalyst/catalyst-3.0.2.ebuild | 70 ------------ |
18 |
dev-util/catalyst/catalyst-3.0.3.ebuild | 71 ------------ |
19 |
dev-util/catalyst/catalyst-3.0.4.ebuild | 68 ------------ |
20 |
.../catalyst-2.0.18-Do-notuntarwith--acls.patch | 95 ---------------- |
21 |
.../files/catalyst-2.0.18-fix-quotes.patch | 38 ------- |
22 |
.../files/catalyst-2.0.18-remove-machine-id.patch | 25 ----- |
23 |
.../files/catalyst-2.0.18-stage1-export-ROOT.patch | 42 -------- |
24 |
12 files changed, 785 deletions(-) |
25 |
|
26 |
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest |
27 |
index 05f5851fdef..b3742172451 100644 |
28 |
--- a/dev-util/catalyst/Manifest |
29 |
+++ b/dev-util/catalyst/Manifest |
30 |
@@ -1,6 +1 @@ |
31 |
-DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a |
32 |
-DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8 |
33 |
-DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749af96a1de6401749131a40c2f1f70975d0c449e1a116623c1aec4d3302670ac058fffd80c4f546fae0609d0c3b7f SHA512 02092b39c70095ab49db28c3289a5d3eb4f73cb3aeda79b3e707cbe2710761cf0060493da7d8a5098e1453320b65654bbe34dd37d5f07623fa90d52579869070 |
34 |
-DIST catalyst-3.0.3.tar.bz2 878309 BLAKE2B 38cba740718a034c104d272aa24fa6964a8dd7fc77d5ccbb481308bb0a38c01d3f0d64e48c1708cab4a723b5a4e0f23727d1c2a0dd0ae4832810e09f76aa335c SHA512 26024dbea3afbc843563a0bf2cd68cc953818caccdf8a42c45ac1df25bd396064a604787807e2db847b4467e9a19df6b2f746eb178d99cbe79889070a2fc4b8a |
35 |
-DIST catalyst-3.0.4.tar.bz2 873281 BLAKE2B 8177cee09402ccd02343766facbac3011b45165211a207e8e2c07d53a40091202c84e8294a58ed02a193cab3b3d704fafb50322719257a62092fe39b895d7771 SHA512 5fc5ee9faba6874d1b57fed47a9f92fab9adc03544938d1b1f1d6d867215a36f1efd391849b21300034d27be3207bcc28b4792b8c9c4caec72040d4d30741c2a |
36 |
DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4 |
37 |
|
38 |
diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild |
39 |
deleted file mode 100644 |
40 |
index 9562f69636d..00000000000 |
41 |
--- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild |
42 |
+++ /dev/null |
43 |
@@ -1,115 +0,0 @@ |
44 |
-# Copyright 1999-2018 Gentoo Foundation |
45 |
-# Distributed under the terms of the GNU General Public License v2 |
46 |
- |
47 |
-EAPI=5 |
48 |
- |
49 |
-if [[ ${PV} == *9999* ]]; then |
50 |
- SRC_ECLASS="git-2" |
51 |
- EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git" |
52 |
- EGIT_MASTER="master" |
53 |
- S="${WORKDIR}/${PN}" |
54 |
-else |
55 |
- SRC_URI="mirror://gentoo/${P}.tar.bz2 |
56 |
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 |
57 |
- https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 |
58 |
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 |
59 |
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" |
60 |
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" |
61 |
-fi |
62 |
- |
63 |
-PYTHON_COMPAT=( python2_7 ) |
64 |
- |
65 |
-inherit eutils multilib python-single-r1 ${SRC_ECLASS} |
66 |
- |
67 |
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" |
68 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" |
69 |
- |
70 |
-LICENSE="GPL-2" |
71 |
-SLOT="0" |
72 |
-IUSE="ccache kernel_linux" |
73 |
- |
74 |
-DEPEND=" |
75 |
- app-text/asciidoc |
76 |
- ${PYTHON_DEPS} |
77 |
-" |
78 |
-RDEPEND=" |
79 |
- app-arch/lbzip2 |
80 |
- app-crypt/shash |
81 |
- app-arch/tar[xattr] |
82 |
- sys-fs/dosfstools |
83 |
- virtual/cdrtools |
84 |
- amd64? ( >=sys-boot/syslinux-3.72 ) |
85 |
- x86? ( >=sys-boot/syslinux-3.72 ) |
86 |
- ccache? ( dev-util/ccache ) |
87 |
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) |
88 |
- ${PYTHON_DEPS} |
89 |
-" |
90 |
- |
91 |
-REQUIRED_USE=${PYTHON_REQUIRED_USE} |
92 |
- |
93 |
-PATCHES=( "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" ) |
94 |
- |
95 |
-pkg_setup() { |
96 |
- if use ccache ; then |
97 |
- einfo "Enabling ccache support for catalyst." |
98 |
- else |
99 |
- ewarn "By default, ccache support for catalyst is disabled." |
100 |
- ewarn "If this is not what you intended," |
101 |
- ewarn "then you should add ccache to your USE." |
102 |
- fi |
103 |
- |
104 |
- echo |
105 |
- einfo "The template spec files are now installed by default. You can find" |
106 |
- einfo "them under /usr/share/doc/${PF}/examples" |
107 |
- einfo "and they are considered to be the authorative source of information" |
108 |
- einfo "on catalyst." |
109 |
- echo |
110 |
- |
111 |
- python-single-r1_pkg_setup |
112 |
-} |
113 |
- |
114 |
-src_prepare() { |
115 |
- epatch "${PATCHES[@]}" |
116 |
-} |
117 |
- |
118 |
-src_install() { |
119 |
- insinto /usr/$(get_libdir)/${PN} |
120 |
- exeinto /usr/$(get_libdir)/${PN} |
121 |
- doexe catalyst || die "copying catalyst" |
122 |
- |
123 |
- if [[ ${PV} == 3.9999* ]]; then |
124 |
- doins -r modules files || die "copying files" |
125 |
- else |
126 |
- doins -r arch modules livecd || die "copying files" |
127 |
- fi |
128 |
- |
129 |
- for x in targets/*; do |
130 |
- exeinto /usr/$(get_libdir)/${PN}/$x |
131 |
- doexe $x/* || die "copying ${x}" |
132 |
- done |
133 |
- |
134 |
- # Here is where we actually enable ccache |
135 |
- use ccache && \ |
136 |
- sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \ |
137 |
- files/catalyst.conf |
138 |
- |
139 |
- sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ |
140 |
- files/catalyst.conf |
141 |
- |
142 |
- make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst |
143 |
- insinto /etc/catalyst |
144 |
- doins files/catalyst.conf files/catalystrc || die "copying configuration" |
145 |
- insinto /usr/share/doc/${PF}/examples |
146 |
- doins examples/* || die |
147 |
- dodoc README AUTHORS |
148 |
- doman files/catalyst.1 files/catalyst-spec.5 |
149 |
- |
150 |
- python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst" |
151 |
- python_optimize "${ED}" |
152 |
-} |
153 |
- |
154 |
-pkg_postinst() { |
155 |
- einfo "You can find more information about catalyst by checking out the" |
156 |
- einfo "catalyst project page at:" |
157 |
- einfo "https://wiki.gentoo.org/wiki/Catalyst" |
158 |
-} |
159 |
|
160 |
diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild |
161 |
deleted file mode 100644 |
162 |
index 98e502b926c..00000000000 |
163 |
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild |
164 |
+++ /dev/null |
165 |
@@ -1,120 +0,0 @@ |
166 |
-# Copyright 1999-2018 Gentoo Foundation |
167 |
-# Distributed under the terms of the GNU General Public License v2 |
168 |
- |
169 |
-EAPI=5 |
170 |
- |
171 |
-if [[ ${PV} == *9999* ]]; then |
172 |
- SRC_ECLASS="git-2" |
173 |
- EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git" |
174 |
- EGIT_MASTER="master" |
175 |
- S="${WORKDIR}/${PN}" |
176 |
-else |
177 |
- SRC_URI="mirror://gentoo/${P}.tar.bz2 |
178 |
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 |
179 |
- https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2 |
180 |
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2 |
181 |
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2" |
182 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" |
183 |
-fi |
184 |
- |
185 |
-PYTHON_COMPAT=( python2_7 ) |
186 |
- |
187 |
-inherit eutils multilib python-single-r1 ${SRC_ECLASS} |
188 |
- |
189 |
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" |
190 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" |
191 |
- |
192 |
-LICENSE="GPL-2" |
193 |
-SLOT="0" |
194 |
-IUSE="ccache kernel_linux" |
195 |
- |
196 |
-DEPEND=" |
197 |
- app-text/asciidoc |
198 |
- ${PYTHON_DEPS} |
199 |
-" |
200 |
-RDEPEND=" |
201 |
- app-arch/lbzip2 |
202 |
- app-crypt/shash |
203 |
- app-arch/tar[xattr] |
204 |
- sys-fs/dosfstools |
205 |
- virtual/cdrtools |
206 |
- amd64? ( >=sys-boot/syslinux-3.72 ) |
207 |
- x86? ( >=sys-boot/syslinux-3.72 ) |
208 |
- ccache? ( dev-util/ccache ) |
209 |
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) |
210 |
- ${PYTHON_DEPS} |
211 |
-" |
212 |
- |
213 |
-REQUIRED_USE=${PYTHON_REQUIRED_USE} |
214 |
- |
215 |
-PATCHES=( |
216 |
- "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" |
217 |
- "${FILESDIR}/catalyst-2.0.18-fix-quotes.patch" |
218 |
- "${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch" |
219 |
- "${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch" |
220 |
-) |
221 |
- |
222 |
-pkg_setup() { |
223 |
- if use ccache ; then |
224 |
- einfo "Enabling ccache support for catalyst." |
225 |
- else |
226 |
- ewarn "By default, ccache support for catalyst is disabled." |
227 |
- ewarn "If this is not what you intended," |
228 |
- ewarn "then you should add ccache to your USE." |
229 |
- fi |
230 |
- |
231 |
- echo |
232 |
- einfo "The template spec files are now installed by default. You can find" |
233 |
- einfo "them under /usr/share/doc/${PF}/examples" |
234 |
- einfo "and they are considered to be the authorative source of information" |
235 |
- einfo "on catalyst." |
236 |
- echo |
237 |
- |
238 |
- python-single-r1_pkg_setup |
239 |
-} |
240 |
- |
241 |
-src_prepare() { |
242 |
- epatch "${PATCHES[@]}" |
243 |
-} |
244 |
- |
245 |
-src_install() { |
246 |
- insinto /usr/$(get_libdir)/${PN} |
247 |
- exeinto /usr/$(get_libdir)/${PN} |
248 |
- doexe catalyst || die "copying catalyst" |
249 |
- |
250 |
- if [[ ${PV} == 3.9999* ]]; then |
251 |
- doins -r modules files || die "copying files" |
252 |
- else |
253 |
- doins -r arch modules livecd || die "copying files" |
254 |
- fi |
255 |
- |
256 |
- for x in targets/*; do |
257 |
- exeinto /usr/$(get_libdir)/${PN}/$x |
258 |
- doexe $x/* || die "copying ${x}" |
259 |
- done |
260 |
- |
261 |
- # Here is where we actually enable ccache |
262 |
- use ccache && \ |
263 |
- sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \ |
264 |
- files/catalyst.conf |
265 |
- |
266 |
- sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ |
267 |
- files/catalyst.conf |
268 |
- |
269 |
- make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst |
270 |
- insinto /etc/catalyst |
271 |
- doins files/catalyst.conf files/catalystrc || die "copying configuration" |
272 |
- insinto /usr/share/doc/${PF}/examples |
273 |
- doins examples/* || die |
274 |
- dodoc README AUTHORS |
275 |
- doman files/catalyst.1 files/catalyst-spec.5 |
276 |
- |
277 |
- python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst" |
278 |
- python_optimize "${ED}" |
279 |
-} |
280 |
- |
281 |
-pkg_postinst() { |
282 |
- einfo "You can find more information about catalyst by checking out the" |
283 |
- einfo "catalyst project page at:" |
284 |
- einfo "https://wiki.gentoo.org/wiki/Catalyst" |
285 |
-} |
286 |
|
287 |
diff --git a/dev-util/catalyst/catalyst-3.0.1.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild |
288 |
deleted file mode 100644 |
289 |
index 7792b7e20a3..00000000000 |
290 |
--- a/dev-util/catalyst/catalyst-3.0.1.ebuild |
291 |
+++ /dev/null |
292 |
@@ -1,65 +0,0 @@ |
293 |
-# Copyright 1999-2019 Gentoo Authors |
294 |
-# Distributed under the terms of the GNU General Public License v2 |
295 |
- |
296 |
-EAPI=5 |
297 |
- |
298 |
-if [[ ${PV} == *9999* ]]; then |
299 |
- SRC_ECLASS="git-2" |
300 |
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git" |
301 |
- EGIT_BRANCH="master" |
302 |
- S="${WORKDIR}/${PN}" |
303 |
-else |
304 |
- SRC_URI="mirror://gentoo/${P}.tar.bz2 |
305 |
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 |
306 |
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 |
307 |
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" |
308 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
309 |
-fi |
310 |
- |
311 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
312 |
- |
313 |
-inherit distutils-r1 multilib ${SRC_ECLASS} |
314 |
- |
315 |
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" |
316 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" |
317 |
- |
318 |
-LICENSE="GPL-2" |
319 |
-SLOT="0" |
320 |
-IUSE="ccache doc kernel_linux" |
321 |
- |
322 |
-DEPEND=" |
323 |
- app-text/asciidoc |
324 |
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] |
325 |
-" |
326 |
-RDEPEND=" |
327 |
- >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}] |
328 |
- app-arch/lbzip2 |
329 |
- app-crypt/shash |
330 |
- sys-fs/dosfstools |
331 |
- !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) |
332 |
- kernel_FreeBSD? ( app-arch/libarchive[xattr] ) |
333 |
- virtual/cdrtools |
334 |
- amd64? ( >=sys-boot/syslinux-3.72 ) |
335 |
- x86? ( >=sys-boot/syslinux-3.72 ) |
336 |
- ccache? ( dev-util/ccache ) |
337 |
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) |
338 |
-" |
339 |
- |
340 |
-python_prepare_all() { |
341 |
- python_setup |
342 |
- echo VERSION="${PV}" "${PYTHON}" setup.py set_version |
343 |
- VERSION="${PV}" "${PYTHON}" setup.py set_version || die |
344 |
- distutils-r1_python_prepare_all |
345 |
-} |
346 |
- |
347 |
-python_compile_all() { |
348 |
- # build the man pages and docs |
349 |
- emake |
350 |
-} |
351 |
- |
352 |
-python_install_all() { |
353 |
- distutils-r1_python_install_all |
354 |
- if use doc; then |
355 |
- dodoc files/HOWTO.html files/docbook-xsl.css |
356 |
- fi |
357 |
-} |
358 |
|
359 |
diff --git a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild b/dev-util/catalyst/catalyst-3.0.2-r1.ebuild |
360 |
deleted file mode 100644 |
361 |
index 7aab281c337..00000000000 |
362 |
--- a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild |
363 |
+++ /dev/null |
364 |
@@ -1,71 +0,0 @@ |
365 |
-# Copyright 1999-2019 Gentoo Authors |
366 |
-# Distributed under the terms of the GNU General Public License v2 |
367 |
- |
368 |
-EAPI=6 |
369 |
- |
370 |
-if [[ ${PV} == *9999* ]]; then |
371 |
- SRC_ECLASS="git-r3" |
372 |
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git" |
373 |
- EGIT_BRANCH="master" |
374 |
-else |
375 |
- SRC_URI="mirror://gentoo/${P}.tar.bz2 |
376 |
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 |
377 |
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 |
378 |
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" |
379 |
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" |
380 |
-fi |
381 |
- |
382 |
-PYTHON_COMPAT=( python{3_5,3_6} ) |
383 |
- |
384 |
-inherit distutils-r1 ${SRC_ECLASS} |
385 |
- |
386 |
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" |
387 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" |
388 |
- |
389 |
-LICENSE="GPL-2" |
390 |
-SLOT="0" |
391 |
-IUSE="ccache doc kernel_linux system-bootloader" |
392 |
- |
393 |
-DEPEND=" |
394 |
- app-text/asciidoc |
395 |
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] |
396 |
-" |
397 |
-RDEPEND=" |
398 |
- app-arch/lbzip2 |
399 |
- app-crypt/shash |
400 |
- >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}] |
401 |
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] |
402 |
- sys-fs/dosfstools |
403 |
- !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) |
404 |
- kernel_FreeBSD? ( app-arch/libarchive[xattr] ) |
405 |
- virtual/cdrtools |
406 |
- amd64? ( >=sys-boot/syslinux-3.72 ) |
407 |
- x86? ( >=sys-boot/syslinux-3.72 ) |
408 |
- ccache? ( dev-util/ccache ) |
409 |
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) |
410 |
-" |
411 |
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 |
412 |
- sys-boot/grub:2 |
413 |
- amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) |
414 |
- x86? ( sys-boot/grub[grub_platforms_efi-32] ) |
415 |
- sys-boot/syslinux |
416 |
- sys-boot/shim )" |
417 |
- |
418 |
-python_prepare_all() { |
419 |
- python_setup |
420 |
- echo VERSION="${PV}" "${PYTHON}" setup.py set_version |
421 |
- VERSION="${PV}" "${PYTHON}" setup.py set_version || die |
422 |
- distutils-r1_python_prepare_all |
423 |
-} |
424 |
- |
425 |
-python_compile_all() { |
426 |
- # build the man pages and docs |
427 |
- emake |
428 |
-} |
429 |
- |
430 |
-python_install_all() { |
431 |
- distutils-r1_python_install_all |
432 |
- if use doc; then |
433 |
- dodoc files/HOWTO.html files/docbook-xsl.css |
434 |
- fi |
435 |
-} |
436 |
|
437 |
diff --git a/dev-util/catalyst/catalyst-3.0.2.ebuild b/dev-util/catalyst/catalyst-3.0.2.ebuild |
438 |
deleted file mode 100644 |
439 |
index 12d4b9dbf83..00000000000 |
440 |
--- a/dev-util/catalyst/catalyst-3.0.2.ebuild |
441 |
+++ /dev/null |
442 |
@@ -1,70 +0,0 @@ |
443 |
-# Copyright 1999-2019 Gentoo Authors |
444 |
-# Distributed under the terms of the GNU General Public License v2 |
445 |
- |
446 |
-EAPI=6 |
447 |
- |
448 |
-if [[ ${PV} == *9999* ]]; then |
449 |
- SRC_ECLASS="git-r3" |
450 |
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git" |
451 |
- EGIT_BRANCH="master" |
452 |
-else |
453 |
- SRC_URI="mirror://gentoo/${P}.tar.bz2 |
454 |
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 |
455 |
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 |
456 |
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" |
457 |
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" |
458 |
-fi |
459 |
- |
460 |
-PYTHON_COMPAT=( python{3_5,3_6} ) |
461 |
- |
462 |
-inherit distutils-r1 ${SRC_ECLASS} |
463 |
- |
464 |
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" |
465 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" |
466 |
- |
467 |
-LICENSE="GPL-2" |
468 |
-SLOT="0" |
469 |
-IUSE="ccache doc kernel_linux system-bootloader" |
470 |
- |
471 |
-DEPEND=" |
472 |
- app-text/asciidoc |
473 |
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] |
474 |
-" |
475 |
-RDEPEND=" |
476 |
- >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}] |
477 |
- app-arch/lbzip2 |
478 |
- app-crypt/shash |
479 |
- sys-fs/dosfstools |
480 |
- !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) |
481 |
- kernel_FreeBSD? ( app-arch/libarchive[xattr] ) |
482 |
- virtual/cdrtools |
483 |
- amd64? ( >=sys-boot/syslinux-3.72 ) |
484 |
- x86? ( >=sys-boot/syslinux-3.72 ) |
485 |
- ccache? ( dev-util/ccache ) |
486 |
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) |
487 |
-" |
488 |
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 |
489 |
- sys-boot/grub:2 |
490 |
- amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) |
491 |
- x86? ( sys-boot/grub[grub_platforms_efi-32] ) |
492 |
- sys-boot/syslinux |
493 |
- sys-boot/shim )" |
494 |
- |
495 |
-python_prepare_all() { |
496 |
- python_setup |
497 |
- echo VERSION="${PV}" "${PYTHON}" setup.py set_version |
498 |
- VERSION="${PV}" "${PYTHON}" setup.py set_version || die |
499 |
- distutils-r1_python_prepare_all |
500 |
-} |
501 |
- |
502 |
-python_compile_all() { |
503 |
- # build the man pages and docs |
504 |
- emake |
505 |
-} |
506 |
- |
507 |
-python_install_all() { |
508 |
- distutils-r1_python_install_all |
509 |
- if use doc; then |
510 |
- dodoc files/HOWTO.html files/docbook-xsl.css |
511 |
- fi |
512 |
-} |
513 |
|
514 |
diff --git a/dev-util/catalyst/catalyst-3.0.3.ebuild b/dev-util/catalyst/catalyst-3.0.3.ebuild |
515 |
deleted file mode 100644 |
516 |
index 7aab281c337..00000000000 |
517 |
--- a/dev-util/catalyst/catalyst-3.0.3.ebuild |
518 |
+++ /dev/null |
519 |
@@ -1,71 +0,0 @@ |
520 |
-# Copyright 1999-2019 Gentoo Authors |
521 |
-# Distributed under the terms of the GNU General Public License v2 |
522 |
- |
523 |
-EAPI=6 |
524 |
- |
525 |
-if [[ ${PV} == *9999* ]]; then |
526 |
- SRC_ECLASS="git-r3" |
527 |
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git" |
528 |
- EGIT_BRANCH="master" |
529 |
-else |
530 |
- SRC_URI="mirror://gentoo/${P}.tar.bz2 |
531 |
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2 |
532 |
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2 |
533 |
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" |
534 |
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" |
535 |
-fi |
536 |
- |
537 |
-PYTHON_COMPAT=( python{3_5,3_6} ) |
538 |
- |
539 |
-inherit distutils-r1 ${SRC_ECLASS} |
540 |
- |
541 |
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" |
542 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" |
543 |
- |
544 |
-LICENSE="GPL-2" |
545 |
-SLOT="0" |
546 |
-IUSE="ccache doc kernel_linux system-bootloader" |
547 |
- |
548 |
-DEPEND=" |
549 |
- app-text/asciidoc |
550 |
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] |
551 |
-" |
552 |
-RDEPEND=" |
553 |
- app-arch/lbzip2 |
554 |
- app-crypt/shash |
555 |
- >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}] |
556 |
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] |
557 |
- sys-fs/dosfstools |
558 |
- !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) |
559 |
- kernel_FreeBSD? ( app-arch/libarchive[xattr] ) |
560 |
- virtual/cdrtools |
561 |
- amd64? ( >=sys-boot/syslinux-3.72 ) |
562 |
- x86? ( >=sys-boot/syslinux-3.72 ) |
563 |
- ccache? ( dev-util/ccache ) |
564 |
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) |
565 |
-" |
566 |
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 |
567 |
- sys-boot/grub:2 |
568 |
- amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) |
569 |
- x86? ( sys-boot/grub[grub_platforms_efi-32] ) |
570 |
- sys-boot/syslinux |
571 |
- sys-boot/shim )" |
572 |
- |
573 |
-python_prepare_all() { |
574 |
- python_setup |
575 |
- echo VERSION="${PV}" "${PYTHON}" setup.py set_version |
576 |
- VERSION="${PV}" "${PYTHON}" setup.py set_version || die |
577 |
- distutils-r1_python_prepare_all |
578 |
-} |
579 |
- |
580 |
-python_compile_all() { |
581 |
- # build the man pages and docs |
582 |
- emake |
583 |
-} |
584 |
- |
585 |
-python_install_all() { |
586 |
- distutils-r1_python_install_all |
587 |
- if use doc; then |
588 |
- dodoc files/HOWTO.html files/docbook-xsl.css |
589 |
- fi |
590 |
-} |
591 |
|
592 |
diff --git a/dev-util/catalyst/catalyst-3.0.4.ebuild b/dev-util/catalyst/catalyst-3.0.4.ebuild |
593 |
deleted file mode 100644 |
594 |
index 8126cc04819..00000000000 |
595 |
--- a/dev-util/catalyst/catalyst-3.0.4.ebuild |
596 |
+++ /dev/null |
597 |
@@ -1,68 +0,0 @@ |
598 |
-# Copyright 1999-2019 Gentoo Authors |
599 |
-# Distributed under the terms of the GNU General Public License v2 |
600 |
- |
601 |
-EAPI=6 |
602 |
- |
603 |
-if [[ ${PV} == *9999* ]]; then |
604 |
- SRC_ECLASS="git-r3" |
605 |
- EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git" |
606 |
- EGIT_BRANCH="master" |
607 |
-else |
608 |
- SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2" |
609 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
610 |
-fi |
611 |
- |
612 |
-PYTHON_COMPAT=( python{3_5,3_6,3_7} ) |
613 |
- |
614 |
-inherit distutils-r1 ${SRC_ECLASS} |
615 |
- |
616 |
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux" |
617 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst" |
618 |
- |
619 |
-LICENSE="GPL-2" |
620 |
-SLOT="0" |
621 |
-IUSE="ccache doc +iso kernel_linux system-bootloader" |
622 |
- |
623 |
-DEPEND=" |
624 |
- app-text/asciidoc |
625 |
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] |
626 |
-" |
627 |
-RDEPEND=" |
628 |
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}] |
629 |
- >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}] |
630 |
- app-arch/lbzip2 |
631 |
- app-crypt/shash |
632 |
- sys-fs/dosfstools |
633 |
- !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) ) |
634 |
- kernel_FreeBSD? ( app-arch/libarchive[xattr] ) |
635 |
- amd64? ( >=sys-boot/syslinux-3.72 ) |
636 |
- x86? ( >=sys-boot/syslinux-3.72 ) |
637 |
- ccache? ( dev-util/ccache ) |
638 |
- iso? ( virtual/cdrtools ) |
639 |
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) |
640 |
-" |
641 |
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4 |
642 |
- sys-boot/grub:2 |
643 |
- amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] ) |
644 |
- x86? ( sys-boot/grub[grub_platforms_efi-32] ) |
645 |
- sys-boot/syslinux |
646 |
- sys-boot/shim )" |
647 |
- |
648 |
-python_prepare_all() { |
649 |
- python_setup |
650 |
- echo VERSION="${PV}" "${PYTHON}" setup.py set_version |
651 |
- VERSION="${PV}" "${PYTHON}" setup.py set_version || die |
652 |
- distutils-r1_python_prepare_all |
653 |
-} |
654 |
- |
655 |
-python_compile_all() { |
656 |
- # build the man pages and docs |
657 |
- emake |
658 |
-} |
659 |
- |
660 |
-python_install_all() { |
661 |
- distutils-r1_python_install_all |
662 |
- if use doc; then |
663 |
- dodoc files/HOWTO.html files/docbook-xsl.css |
664 |
- fi |
665 |
-} |
666 |
|
667 |
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch |
668 |
deleted file mode 100644 |
669 |
index f4cbcfbb7d3..00000000000 |
670 |
--- a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch |
671 |
+++ /dev/null |
672 |
@@ -1,95 +0,0 @@ |
673 |
-From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001 |
674 |
-From: "Anthony G. Basile" <blueness@g.o> |
675 |
-Date: Sun, 18 Jan 2015 22:21:16 -0500 |
676 |
-Subject: [PATCH] Do not untar with --acls, fixes bug #536762 |
677 |
-To: gentoo-catalyst@l.g.o |
678 |
- |
679 |
---- |
680 |
- modules/catalyst_support.py | 6 +++--- |
681 |
- modules/generic_stage_target.py | 18 +++++++++--------- |
682 |
- 2 files changed, 12 insertions(+), 12 deletions(-) |
683 |
- |
684 |
-diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py |
685 |
-index 0e9faac..702887d 100644 |
686 |
---- a/modules/catalyst_support.py |
687 |
-+++ b/modules/catalyst_support.py |
688 |
-@@ -108,9 +108,9 @@ contents_map={ |
689 |
- # 'find' is disabled because it requires the source path, which is not |
690 |
- # always available |
691 |
- #"find" :[calc_contents,"find %(path)s"], |
692 |
-- "tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"], |
693 |
-- "tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"], |
694 |
-- "tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"], |
695 |
-+ "tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"], |
696 |
-+ "tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"], |
697 |
-+ "tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"], |
698 |
- "isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"], |
699 |
- # isoinfo-f should be a last resort only |
700 |
- "isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"], |
701 |
-diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
702 |
-index c7db027..cc24c63 100644 |
703 |
---- a/modules/generic_stage_target.py |
704 |
-+++ b/modules/generic_stage_target.py |
705 |
-@@ -660,10 +660,10 @@ class generic_stage_target(generic_target): |
706 |
- self.settings["chroot_path"]+\ |
707 |
- " (This may take some time) ...\n" |
708 |
- if "bz2" == self.settings["chroot_path"][-3:]: |
709 |
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
710 |
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
711 |
- self.settings["chroot_path"] |
712 |
- else: |
713 |
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
714 |
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
715 |
- self.settings["chroot_path"] |
716 |
- error_msg="Tarball extraction of "+\ |
717 |
- self.settings["source_path"]+" to "+\ |
718 |
-@@ -675,10 +675,10 @@ class generic_stage_target(generic_target): |
719 |
- self.settings["chroot_path"]+\ |
720 |
- " (This may take some time) ...\n" |
721 |
- if "bz2" == self.settings["chroot_path"][-3:]: |
722 |
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
723 |
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
724 |
- self.settings["chroot_path"] |
725 |
- else: |
726 |
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
727 |
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
728 |
- self.settings["chroot_path"] |
729 |
- error_msg="Tarball extraction of "+self.settings["source_path"]+\ |
730 |
- " to "+self.settings["chroot_path"]+" failed." |
731 |
-@@ -777,9 +777,9 @@ class generic_stage_target(generic_target): |
732 |
- "catalyst-hash") |
733 |
- destdir=self.settings["snapshot_cache_path"] |
734 |
- if "bz2" == self.settings["chroot_path"][-3:]: |
735 |
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
736 |
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
737 |
- else: |
738 |
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
739 |
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
740 |
- unpack_errmsg="Error unpacking snapshot" |
741 |
- cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ |
742 |
- self.settings["snapshot_cache_path"]+\ |
743 |
-@@ -796,10 +796,10 @@ class generic_stage_target(generic_target): |
744 |
- cleanup_msg=\ |
745 |
- "Cleaning up existing portage tree (This can take a long time)..." |
746 |
- if "bz2" == self.settings["chroot_path"][-3:]: |
747 |
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ |
748 |
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ |
749 |
- self.settings["chroot_path"]+"/usr" |
750 |
- else: |
751 |
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ |
752 |
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ |
753 |
- self.settings["chroot_path"]+"/usr" |
754 |
- unpack_errmsg="Error unpacking snapshot" |
755 |
- |
756 |
-@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target): |
757 |
- |
758 |
- print "Creating stage tarball..." |
759 |
- |
760 |
-- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ |
761 |
-+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ |
762 |
- self.settings["stage_path"]+" .",\ |
763 |
- "Couldn't create stage tarball",env=self.env) |
764 |
- |
765 |
--- |
766 |
-2.2.2 |
767 |
- |
768 |
|
769 |
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch b/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch |
770 |
deleted file mode 100644 |
771 |
index ccaffbe6b03..00000000000 |
772 |
--- a/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch |
773 |
+++ /dev/null |
774 |
@@ -1,38 +0,0 @@ |
775 |
-From 1eabce3a9c15c5caf022e71c1959e8c8f4819fad Mon Sep 17 00:00:00 2001 |
776 |
-From: "Anthony G. Basile" <blueness@g.o> |
777 |
-Date: Thu, 3 Mar 2016 20:48:43 -0500 |
778 |
-Subject: [PATCH] targets/support/chroot-functions.sh: correct quotes to allow |
779 |
- expansion of $1 |
780 |
- |
781 |
-This is a backport of commit b2473eff. The single quotes prevented the proper |
782 |
-expansion of $1 in setup_pkgmgr(). Since this is usually called as |
783 |
-`setup_pkgmgr "build"` during stage1 builds, it is surprising this was |
784 |
-not caught earlier. |
785 |
---- |
786 |
- targets/support/chroot-functions.sh | 8 ++++---- |
787 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
788 |
- |
789 |
-diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
790 |
-index 3b7f77b..6c1a31c 100755 |
791 |
---- a/targets/support/chroot-functions.sh |
792 |
-+++ b/targets/support/chroot-functions.sh |
793 |
-@@ -172,12 +172,12 @@ setup_pkgmgr(){ |
794 |
- # Use --update or portage might just waste time/cycles and reinstall the same version. |
795 |
- # Use --newuse to make sure it rebuilds with any changed use flags. |
796 |
- if [ -n "$1" ];then |
797 |
-- echo "Adding USE='${USE} $1' to make.conf for portage build" |
798 |
-- [ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf |
799 |
-+ echo "Adding USE=\"${USE} $1\" to make.conf for portage build" |
800 |
-+ [ -e /etc/portage/make.conf ] && echo "USE=\"\${USE} $1\"" >> /etc/portage/make.conf |
801 |
- run_merge --oneshot --update --newuse sys-apps/portage |
802 |
-- sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf |
803 |
-+ sed -i "/USE=\"\${USE} $1\"/d" /etc/portage/make.conf |
804 |
- else |
805 |
-- echo "Updating portage with USE='${USE}'" |
806 |
-+ echo "Updating portage with USE=\"${USE}\"" |
807 |
- run_merge --oneshot --update --newuse sys-apps/portage |
808 |
- fi |
809 |
- } |
810 |
--- |
811 |
-2.4.10 |
812 |
- |
813 |
|
814 |
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch b/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch |
815 |
deleted file mode 100644 |
816 |
index 1c641fd2b90..00000000000 |
817 |
--- a/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch |
818 |
+++ /dev/null |
819 |
@@ -1,25 +0,0 @@ |
820 |
-From fbf94254a714c8d72840faee42cf348eb69b1a43 Mon Sep 17 00:00:00 2001 |
821 |
-From: "Anthony G. Basile" <blueness@g.o> |
822 |
-Date: Fri, 8 Apr 2016 17:58:15 -0400 |
823 |
-Subject: [PATCH] targets/support/chroot-functions.sh: remove machine-id for |
824 |
- systemd stages |
825 |
- |
826 |
---- |
827 |
- targets/support/chroot-functions.sh | 1 + |
828 |
- 1 file changed, 1 insertion(+) |
829 |
- |
830 |
-diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
831 |
-index 6c1a31c..67874a0 100755 |
832 |
---- a/targets/support/chroot-functions.sh |
833 |
-+++ b/targets/support/chroot-functions.sh |
834 |
-@@ -223,6 +223,7 @@ cleanup_stages() { |
835 |
- stage1|stage2|stage3|system) |
836 |
- rm -f /var/lib/portage/world |
837 |
- touch /var/lib/portage/world |
838 |
-+ rm -f /etc/machine-id |
839 |
- ;; |
840 |
- *) |
841 |
- echo "Skipping removal of world file for ${clst_target}" |
842 |
--- |
843 |
-2.7.3 |
844 |
- |
845 |
|
846 |
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch b/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch |
847 |
deleted file mode 100644 |
848 |
index 67fc2c631b0..00000000000 |
849 |
--- a/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch |
850 |
+++ /dev/null |
851 |
@@ -1,42 +0,0 @@ |
852 |
-From 5fd2d5edd3c4c1e99687beb9acc130bab162866b Mon Sep 17 00:00:00 2001 |
853 |
-From: "Anthony G. Basile" <blueness@g.o> |
854 |
-Date: Sat, 4 Jun 2016 12:43:44 -0400 |
855 |
-Subject: stage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for |
856 |
- setup_gcc() |
857 |
- |
858 |
-setup_gcc() calls gcc-config to select a particular gcc profile. At stage1 this |
859 |
-needs to be done in the /tmp/stage1root chroot. gcc-config looks for ROOT to |
860 |
-choose the root directory in which to make the selection. If we don't export |
861 |
-ROOT, then setup_gcc is ineffective. |
862 |
- |
863 |
-X-Gentoo-Bug: 584234 |
864 |
-X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=584234 |
865 |
- |
866 |
-Signed-off-by: Anthony G. Basile <blueness@g.o> |
867 |
---- |
868 |
- targets/stage1/stage1-preclean-chroot.sh | 3 +-- |
869 |
- 1 file changed, 1 insertion(+), 2 deletions(-) |
870 |
- |
871 |
-diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh |
872 |
-index a80fc92..dc67521 100755 |
873 |
---- a/targets/stage1/stage1-preclean-chroot.sh |
874 |
-+++ b/targets/stage1/stage1-preclean-chroot.sh |
875 |
-@@ -1,5 +1,6 @@ |
876 |
- #!/bin/bash |
877 |
- |
878 |
-+export ROOT=/tmp/stage1root |
879 |
- export RUN_DEFAULT_FUNCS="no" |
880 |
- |
881 |
- source /tmp/chroot-functions.sh |
882 |
-@@ -8,8 +9,6 @@ update_env_settings |
883 |
- show_debug |
884 |
- |
885 |
- # Now, some finishing touches to initialize gcc-config.... |
886 |
--unset ROOT |
887 |
-- |
888 |
- setup_gcc |
889 |
- setup_binutils |
890 |
- |
891 |
--- |
892 |
-cgit v0.12 |
893 |
- |