1 |
commit: 02b76e7d9468c1e08ea2fe35fac31dfa617c8ead |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 8 01:19:35 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 8 01:19:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b76e7d |
7 |
|
8 |
sys-devel/icecream: cleanup old EAPI 4, 5 ebuilds |
9 |
|
10 |
Closes: https://bugs.gentoo.org/724216 |
11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
sys-devel/icecream/Manifest | 1 - |
15 |
sys-devel/icecream/files/0.9.6-crosscompile.patch | 12 --- |
16 |
sys-devel/icecream/files/0.9.6-symlinks.patch | 19 ----- |
17 |
sys-devel/icecream/files/0.9.7-automake.patch | 32 -------- |
18 |
sys-devel/icecream/files/0.9.7-glibc2.16.patch | 16 ---- |
19 |
sys-devel/icecream/files/icecream | 43 ----------- |
20 |
.../icecream/files/icecream-conf.d-verbosity.patch | 18 ----- |
21 |
sys-devel/icecream/files/icecream-config | 69 ----------------- |
22 |
sys-devel/icecream/files/icecream-create-env | 82 --------------------- |
23 |
.../icecream/files/icecream-gentoo-multilib.patch | 59 --------------- |
24 |
sys-devel/icecream/icecream-0.9.7-r1.ebuild | 86 ---------------------- |
25 |
sys-devel/icecream/icecream-1.0.0-r1.ebuild | 51 ------------- |
26 |
12 files changed, 488 deletions(-) |
27 |
|
28 |
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest |
29 |
index 56616a9e27c..2cfb48ce5b5 100644 |
30 |
--- a/sys-devel/icecream/Manifest |
31 |
+++ b/sys-devel/icecream/Manifest |
32 |
@@ -1,2 +1 @@ |
33 |
-DIST icecc-0.9.7.tar.bz2 379527 BLAKE2B 547bc2e534192a6628c261f4d7244eff31bea438cc0273b06c69ef188ffedebaebb028fa2433c5549c52d99ecd0c530a1040db392d8f34537023be9ebdca465e SHA512 023a77d6df33af9837a87218272dc61d68f3782ad59dc8783ec3ca47cbb38619dbcaa25ac7e6654c6cacbd79477c3403b0a73aca595c6fe20aa9a39268f4f2e2 |
34 |
DIST icecc-1.0.0.tar.bz2 485534 BLAKE2B 31a978a4a461f20716a95277426e79d4c298c212d36361dbbd68c5affcbbbe2f0c71f743cc7b731d86fbb5f09ab556182482f56e1382be8572d019f80a004fc8 SHA512 4292ecef6232112c3f4531cb2290a55f70c5c24095fef0865af2526d49fc10a043ffb06d22552e161f671c18ff1ab62795c3a63e2c8cb26f869cf65d0938af2a |
35 |
|
36 |
diff --git a/sys-devel/icecream/files/0.9.6-crosscompile.patch b/sys-devel/icecream/files/0.9.6-crosscompile.patch |
37 |
deleted file mode 100644 |
38 |
index 990072bbb8f..00000000000 |
39 |
--- a/sys-devel/icecream/files/0.9.6-crosscompile.patch |
40 |
+++ /dev/null |
41 |
@@ -1,12 +0,0 @@ |
42 |
-diff -urN icecc-0.9.6.old//client/icecc-create-env icecc-0.9.6//client/icecc-create-env |
43 |
---- icecc-0.9.6.old//client/icecc-create-env 2010-09-18 12:10:08.143391700 +0200 |
44 |
-+++ icecc-0.9.6//client/icecc-create-env 2010-09-18 12:10:46.574391700 +0200 |
45 |
-@@ -97,7 +97,7 @@ |
46 |
- |
47 |
- add_file $added_gcc /usr/bin/gcc |
48 |
- add_file $added_gxx /usr/bin/g++ |
49 |
--add_file /usr/bin/as |
50 |
-+add_file `$added_gcc -print-prog-name=as` /usr/bin/as |
51 |
- |
52 |
- if test "$is_darwin" = 1; then |
53 |
- # add dynamic linker |
54 |
|
55 |
diff --git a/sys-devel/icecream/files/0.9.6-symlinks.patch b/sys-devel/icecream/files/0.9.6-symlinks.patch |
56 |
deleted file mode 100644 |
57 |
index 279ee0cc0f9..00000000000 |
58 |
--- a/sys-devel/icecream/files/0.9.6-symlinks.patch |
59 |
+++ /dev/null |
60 |
@@ -1,19 +0,0 @@ |
61 |
-diff -urN icecc-0.9.6//client/Makefile.am icecc-0.9.6.new//client/Makefile.am |
62 |
---- icecc-0.9.6//client/Makefile.am 2010-09-11 13:43:53.922000148 +0200 |
63 |
-+++ icecc-0.9.6.new//client/Makefile.am 2010-09-11 13:44:39.950000148 +0200 |
64 |
-@@ -7,15 +7,3 @@ |
65 |
- noinst_HEADERS = client.h md5.h util.h |
66 |
- |
67 |
- EXTRA_DIST = icecc-create-env |
68 |
-- |
69 |
--install-exec-local: |
70 |
-- $(mkinstalldirs) $(DESTDIR)$(bindir) |
71 |
-- for link in g++ gcc c++ cc icerun; do \ |
72 |
-- rm -f $(DESTDIR)$(bindir)/$$link ;\ |
73 |
-- $(LN_S) icecc $(DESTDIR)$(bindir)/$$link ;\ |
74 |
-- done |
75 |
-- |
76 |
--uninstall-local: |
77 |
-- for link in g++ gcc c++ cc; do \ |
78 |
-- rm $(DESTDIR)$(bindir)/$$link ;\ |
79 |
-- done |
80 |
|
81 |
diff --git a/sys-devel/icecream/files/0.9.7-automake.patch b/sys-devel/icecream/files/0.9.7-automake.patch |
82 |
deleted file mode 100644 |
83 |
index 6905a2a3415..00000000000 |
84 |
--- a/sys-devel/icecream/files/0.9.7-automake.patch |
85 |
+++ /dev/null |
86 |
@@ -1,32 +0,0 @@ |
87 |
-Backport upstream patch to fix automake-1.12 issues |
88 |
- |
89 |
-https://bugs.gentoo.org/show_bug.cgi?id=397715 |
90 |
-https://bugs.gentoo.org/show_bug.cgi?id=399259 |
91 |
---- client/Makefile.am |
92 |
-+++ client/Makefile.am |
93 |
-@@ -1,10 +1,11 @@ |
94 |
- INCLUDES = -I$(srcdir)/../services |
95 |
- |
96 |
- bin_PROGRAMS = icecc |
97 |
--pkglib_SCRIPTS = icecc-create-env |
98 |
-+pkglibexec_SCRIPTS = icecc-create-env |
99 |
- icecc_SOURCES = main.cpp arg.cpp cpp.cpp local.cpp remote.cpp util.cpp md5.c safeguard.cpp |
100 |
- icecc_LDADD = ../services/libicecc.la $(LIBRSYNC) |
101 |
- noinst_HEADERS = client.h md5.h util.h |
102 |
-+AM_CPPFLAGS = -DPLIBDIR=\"$(pkglibexecdir)\" |
103 |
- |
104 |
- EXTRA_DIST = icecc-create-env |
105 |
- |
106 |
---- configure.in |
107 |
-+++ configure.in |
108 |
-@@ -246,10 +246,6 @@ |
109 |
- KDE_EXPAND_MAKEVAR(mybindir, bindir) |
110 |
- AC_DEFINE_UNQUOTED(BINDIR, "$mybindir", [Where to look for icecc]) |
111 |
- |
112 |
--myopkglibdir='${libdir}/'"$PACKAGE" |
113 |
--KDE_EXPAND_MAKEVAR(mypkglibdir, myopkglibdir) |
114 |
--AC_DEFINE_UNQUOTED(PLIBDIR, "$mypkglibdir", [Where to look for icecc-create-env]) |
115 |
-- |
116 |
- myorundir='${localstatedir}/run' |
117 |
- KDE_EXPAND_MAKEVAR(myrundir, myorundir) |
118 |
- AC_DEFINE_UNQUOTED(RUNDIR, "$myrundir", [Where to place pid files]) |
119 |
|
120 |
diff --git a/sys-devel/icecream/files/0.9.7-glibc2.16.patch b/sys-devel/icecream/files/0.9.7-glibc2.16.patch |
121 |
deleted file mode 100644 |
122 |
index 7ccbd735a46..00000000000 |
123 |
--- a/sys-devel/icecream/files/0.9.7-glibc2.16.patch |
124 |
+++ /dev/null |
125 |
@@ -1,16 +0,0 @@ |
126 |
-Fix building with glibc-2.16 |
127 |
- |
128 |
-https://bugs.gentoo.org/show_bug.cgi?id=425248 |
129 |
- |
130 |
-Patch written by Kacper Kowalik <xarthisius@g.o> |
131 |
---- a/daemon/workit.cpp |
132 |
-+++ b/daemon/workit.cpp |
133 |
-@@ -26,6 +26,7 @@ |
134 |
- #include "exitcode.h" |
135 |
- #include "logging.h" |
136 |
- #include <sys/select.h> |
137 |
-+#include <sys/resource.h> |
138 |
- #include <algorithm> |
139 |
- |
140 |
- #ifdef __FreeBSD__ |
141 |
- |
142 |
|
143 |
diff --git a/sys-devel/icecream/files/icecream b/sys-devel/icecream/files/icecream |
144 |
deleted file mode 100644 |
145 |
index db24c4046c7..00000000000 |
146 |
--- a/sys-devel/icecream/files/icecream |
147 |
+++ /dev/null |
148 |
@@ -1,43 +0,0 @@ |
149 |
-#!/sbin/openrc-run |
150 |
-# Copyright 1999-2010 Gentoo Foundation |
151 |
-# Distributed under the terms of the GNU General Public License v2 |
152 |
- |
153 |
-depend() { |
154 |
- need net |
155 |
-} |
156 |
- |
157 |
-start() { |
158 |
- local basedir=${ICECREAM_BASEDIR:-"/var/cache/icecream"} |
159 |
- local netname=${ICECREAM_NETNAME:+"-n ${ICECREAM_NETNAME}"} |
160 |
- local logfile=${ICECREAM_LOG_FILE:+"-l ${ICECREAM_LOG_FILE}"} |
161 |
- local nice=${ICECREAM_NICE_LEVEL:+"--nice ${ICECREAM_NICE_LEVEL}"} |
162 |
- local scheduler=${ICECREAM_SCHEDULER_HOST:+"-s ${ICECREAM_SCHEDULER_HOST}"} |
163 |
- local maxjobs=${ICECREAM_MAX_JOBS:+"-m ${ICECREAM_MAX_JOBS}"} |
164 |
- local verbosity=${ICECREAM_VERBOSITY:-"-v"} |
165 |
- |
166 |
- if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then |
167 |
- local slogfile=${ICECREAM_SCHEDULER_LOG_FILE:-"/var/log/icecc_scheduler"} |
168 |
- touch ${slogfile} && chown icecream:icecream ${slogfile} |
169 |
- slogfile=${slogfile:+"-l ${slogfile}"} |
170 |
- ebegin "Starting Distributed Compiler Scheduler" |
171 |
- start-stop-daemon -u icecream --start --quiet --exec /usr/sbin/scheduler -- -d ${slogfile} ${netname} ${verbosity} |
172 |
- eend ${?} |
173 |
- fi |
174 |
- |
175 |
- [[ ! -d ${basedir} ]] && mkdir -p ${basedir} && chown icecream:icecream ${basedir} |
176 |
- ebegin "Starting Distributed Compiler Daemon" |
177 |
- start-stop-daemon --start --quiet --exec /usr/sbin/iceccd -- -d ${logfile} ${nice} ${scheduler} ${netname} -u icecream -b "${basedir}" ${maxjobs} ${verbosity} |
178 |
- eend ${?} |
179 |
-} |
180 |
- |
181 |
-stop() { |
182 |
- ebegin "Stopping Distributed Compiler Daemon" |
183 |
- start-stop-daemon --stop --quiet --name iceccd |
184 |
- eend ${?} |
185 |
- |
186 |
- if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then |
187 |
- ebegin "Stopping Distributed Compiler Scheduler" |
188 |
- start-stop-daemon --stop --quiet --name scheduler |
189 |
- eend ${?} |
190 |
- fi |
191 |
-} |
192 |
|
193 |
diff --git a/sys-devel/icecream/files/icecream-conf.d-verbosity.patch b/sys-devel/icecream/files/icecream-conf.d-verbosity.patch |
194 |
deleted file mode 100644 |
195 |
index 1ee93c5741a..00000000000 |
196 |
--- a/sys-devel/icecream/files/icecream-conf.d-verbosity.patch |
197 |
+++ /dev/null |
198 |
@@ -1,18 +0,0 @@ |
199 |
---- a/suse/sysconfig.icecream |
200 |
-+++ b/suse/sysconfig.icecream |
201 |
-@@ -39,6 +39,15 @@ |
202 |
- # |
203 |
- ## Type: string |
204 |
- ## Path: Applications/icecream |
205 |
-+## Default: -v |
206 |
-+# |
207 |
-+# icecream's level of verbosity ([-v[v[v]]]) |
208 |
-+# |
209 |
-+ICECREAM_VERBOSITY="-v" |
210 |
-+ |
211 |
-+# |
212 |
-+## Type: string |
213 |
-+## Path: Applications/icecream |
214 |
- ## Defaut: "" |
215 |
- # |
216 |
- # Identification for the network the scheduler and daemon run on. |
217 |
|
218 |
diff --git a/sys-devel/icecream/files/icecream-config b/sys-devel/icecream/files/icecream-config |
219 |
deleted file mode 100644 |
220 |
index 6ed24c74377..00000000000 |
221 |
--- a/sys-devel/icecream/files/icecream-config |
222 |
+++ /dev/null |
223 |
@@ -1,69 +0,0 @@ |
224 |
-#!/bin/sh |
225 |
-# |
226 |
-# icecream-config - helper script for icecream and its ebuild |
227 |
-# |
228 |
-# Copyright 2003-2010 Superlucidity Services, LLC |
229 |
-# This program licensed under the GNU GPL version 2. |
230 |
-# |
231 |
-# This script developed by Zachary T Welch at Superlucidity Services, LLC |
232 |
-# it was cloned from the distcc-config script to make ccache-config |
233 |
-# and then modified by Marcus Furlong to configure icecream too. |
234 |
-# |
235 |
-# Additional features to come; this provides a starting point |
236 |
- |
237 |
-# this should be getopt'd someday (override with ICEC_QUIET=1) |
238 |
-ICECC_VERBOSE=1 |
239 |
- |
240 |
-icecc_echo() { |
241 |
- [ -z "${ICECC_QUIET}" -a -n "${ICECC_VERBOSE}" ] && echo "$*" |
242 |
-} |
243 |
- |
244 |
-### |
245 |
-# the following functions manage the icecream symlinks |
246 |
-# they allow the user or other scripts (namely gcc-config) to |
247 |
-# automatically update icecream's links when upgrading toolchains |
248 |
-# |
249 |
-icecc_remove_link() { |
250 |
- local t="/usr/lib/icecc/bin/${1}" |
251 |
- if [ -L ${t} ]; then |
252 |
- icecc_echo "Removing ${t}..." |
253 |
- rm -f "${t}" |
254 |
- fi |
255 |
-} |
256 |
-icecc_install_link() { |
257 |
- # Search the PATH for the specified compiler |
258 |
- # then create shadow link in /usr/lib/icecc/bin to icecc |
259 |
- |
260 |
- if [ -n "$(type -p ${1})" ]; then |
261 |
- # first be sure any old link is removed |
262 |
- ICECC_QUIET=1 icecc_remove_link "${1}" |
263 |
- |
264 |
- # then create the new link |
265 |
- local t="/usr/lib/icecc/bin/${1}" |
266 |
- icecc_echo "Creating icecream shadow link: ${t}..." |
267 |
- ln -s /usr/bin/icecc "${t}" |
268 |
- fi |
269 |
-} |
270 |
-icecc_links() { |
271 |
- local a |
272 |
- for a in gcc cc c++ g++ ; do |
273 |
- [ -n "${2}" ] && a="${2}-${a}" |
274 |
- eval "icecc_${1}_link" "${a}" |
275 |
- done |
276 |
-} |
277 |
- |
278 |
-### |
279 |
-# main routine |
280 |
- |
281 |
-case "${1}" in |
282 |
- --install-links ) |
283 |
- icecc_links install "${2}" |
284 |
- ;; |
285 |
- --remove-links ) |
286 |
- icecc_links remove "${2}" |
287 |
- ;; |
288 |
- * ) |
289 |
- echo "usage: ${0} {--install-links|--remove-links} [ CHOST ]" |
290 |
- ;; |
291 |
-esac |
292 |
- |
293 |
|
294 |
diff --git a/sys-devel/icecream/files/icecream-create-env b/sys-devel/icecream/files/icecream-create-env |
295 |
deleted file mode 100644 |
296 |
index dafdc13b433..00000000000 |
297 |
--- a/sys-devel/icecream/files/icecream-create-env |
298 |
+++ /dev/null |
299 |
@@ -1,82 +0,0 @@ |
300 |
-#!/bin/sh |
301 |
-# |
302 |
-# icecream-create-env - helper script to create icecc environments(mostly for cross-compiling) |
303 |
-# |
304 |
-# Copyright 1999-2012 Gentoo Foundation |
305 |
-# Distributed under the terms of the GNU General Public License v2 |
306 |
-# |
307 |
-# Please note, this script has been designed to work with Gentoo's crossdev, it may or may |
308 |
-# not work with cross-toolchains that were build differently. |
309 |
-# |
310 |
-# |
311 |
-# Usage: "./icecream-create-env" creates a native environment(similar to icecc --build-native) |
312 |
-# "./icecream-create-env prefix" creates a cross-compile environment using the cross-toolchain created by crossdev |
313 |
-# Example: |
314 |
-# "emerge crossdev && crossdev -t sparc-unknown-linux-gnu && icecream-create-env sparc-unknown-linux" |
315 |
- |
316 |
-if [ `id -u` -ne 0 ] |
317 |
-then |
318 |
- echo "Only the superuser can execute this script." |
319 |
- exit 1 |
320 |
-fi |
321 |
- |
322 |
-# param 1 = CHOST |
323 |
-prefix="${1}" |
324 |
- |
325 |
-if [ -z "${prefix}" ] |
326 |
-then |
327 |
- prefix="`gcc -dumpmachine`" |
328 |
-fi |
329 |
- |
330 |
-gccbin=`which ${prefix}-gcc 2>/dev/null` |
331 |
-if [ ! -e "${gccbin}" ] |
332 |
-then |
333 |
- echo "Can't find ${prefix}-gcc!" |
334 |
- exit 1 |
335 |
-fi |
336 |
- |
337 |
-gxxbin=`which ${prefix}-g++ 2>/dev/null` |
338 |
-if [ ! -e "${gxxbin}" ] |
339 |
-then |
340 |
- echo "Can't find ${prefix}-g++!" |
341 |
- exit 2 |
342 |
-fi |
343 |
- |
344 |
-version="`${prefix}-gcc -dumpversion`" |
345 |
- |
346 |
-tmpdir=`mktemp -d` |
347 |
-tmpfile=`mktemp` |
348 |
- |
349 |
-target=`gcc -dumpmachine` |
350 |
-if [ "x${target}" = "x${prefix}" ] |
351 |
-then |
352 |
- /usr/libexec/icecc/icecc-create-env \ |
353 |
- /usr/${prefix}/gcc-bin/${version}/gcc \ |
354 |
- /usr/${prefix}/gcc-bin/${version}/g++ \ |
355 |
- | tee ${tmpfile} |
356 |
-else |
357 |
- /usr/libexec/icecc/icecc-create-env \ |
358 |
- /usr/${target}/${prefix}/gcc-bin/${version}/${prefix}-gcc \ |
359 |
- /usr/${target}/${prefix}/gcc-bin/${version}/${prefix}-g++ \ |
360 |
- | tee ${tmpfile} |
361 |
-fi |
362 |
- |
363 |
-# figure out the name of the archive |
364 |
-icecc_envname=`grep "creating" ${tmpfile} | awk '{print $2}'` |
365 |
- |
366 |
-echo "Testing icecc environment..." |
367 |
-tar -x -z -f ${icecc_envname} -C ${tmpdir} |
368 |
-touch ${tmpdir}/empty.c |
369 |
-chroot ${tmpdir}/ /usr/bin/gcc -c /empty.c |
370 |
-tested=${?} |
371 |
-rm ${tmpdir}/empty.c |
372 |
- |
373 |
-if [ "${tested}" -ne 0 ] |
374 |
-then |
375 |
- echo "" |
376 |
- echo "Creating icecc environment failed. Please see error message(s) above! The temporary directory is: ${tmpdir}/" |
377 |
-else |
378 |
- echo "" |
379 |
- echo "Icecc environment has been created. It has been saved as ${icecc_envname}!" |
380 |
-fi |
381 |
- |
382 |
|
383 |
diff --git a/sys-devel/icecream/files/icecream-gentoo-multilib.patch b/sys-devel/icecream/files/icecream-gentoo-multilib.patch |
384 |
deleted file mode 100644 |
385 |
index 94c6a41b3af..00000000000 |
386 |
--- a/sys-devel/icecream/files/icecream-gentoo-multilib.patch |
387 |
+++ /dev/null |
388 |
@@ -1,59 +0,0 @@ |
389 |
-Index: services/job.h |
390 |
-=================================================================== |
391 |
---- services/job.h (revision 843731) |
392 |
-+++ services/job.h (working copy) |
393 |
-@@ -57,6 +57,10 @@ |
394 |
- |
395 |
- unsigned int argumentFlags() const; |
396 |
- |
397 |
-+ const ArgumentsList getFlags() { |
398 |
-+ return m_flags; |
399 |
-+ } |
400 |
-+ |
401 |
- void setFlags( const ArgumentsList &flags ) { |
402 |
- m_flags = flags; |
403 |
- } |
404 |
-Index: client/main.cpp |
405 |
-=================================================================== |
406 |
---- client/main.cpp (revision 843731) |
407 |
-+++ client/main.cpp (working copy) |
408 |
-@@ -218,6 +218,39 @@ |
409 |
- |
410 |
- local |= analyse_argv( argv, job ); |
411 |
- |
412 |
-+ /* honour Gentoo's ${CFLAGS_${ABI}} environment variable */ |
413 |
-+ if (getenv("ABI") != NULL) { |
414 |
-+ char* envar = (char*) malloc(sizeof(char) * |
415 |
-+ (strlen("CFLAGS_") + strlen(getenv("ABI")) + 1)); |
416 |
-+ |
417 |
-+ if (!envar) |
418 |
-+ return 1; |
419 |
-+ |
420 |
-+ /* We use CFLAGS_${ABI} for gcc, g++, g77, etc as they are |
421 |
-+ * the same no matter which compiler we are using. |
422 |
-+ */ |
423 |
-+ sprintf(envar, "CFLAGS_%s", getenv("ABI")); |
424 |
-+ |
425 |
-+ if (getenv(envar)) { |
426 |
-+ ArgumentsList args = job.getFlags(); |
427 |
-+ |
428 |
-+ char* pch = strtok(getenv(envar)," \t"); |
429 |
-+ while (pch != NULL) { |
430 |
-+ #if CLIENT_DEBUG |
431 |
-+ log_info() << "adding CFLAG '" << pch << "' as specified in environment variable ${CFLAGS_${ABI}}" << endl; |
432 |
-+ #endif |
433 |
-+ args.append(pch, Arg_Remote); |
434 |
-+ pch = strtok(NULL, " \t"); |
435 |
-+ } |
436 |
-+ |
437 |
-+ job.setFlags(args); |
438 |
-+ |
439 |
-+ free(pch); |
440 |
-+ } |
441 |
-+ |
442 |
-+ free(envar); |
443 |
-+ } |
444 |
-+ |
445 |
- /* if ICECC is set to no, then run job locally */ |
446 |
- char* icecc = getenv("ICECC"); |
447 |
- if ( icecc && !strcasecmp(icecc, "no") ) |
448 |
|
449 |
diff --git a/sys-devel/icecream/icecream-0.9.7-r1.ebuild b/sys-devel/icecream/icecream-0.9.7-r1.ebuild |
450 |
deleted file mode 100644 |
451 |
index 1c43a464442..00000000000 |
452 |
--- a/sys-devel/icecream/icecream-0.9.7-r1.ebuild |
453 |
+++ /dev/null |
454 |
@@ -1,86 +0,0 @@ |
455 |
-# Copyright 1999-2017 Gentoo Foundation |
456 |
-# Distributed under the terms of the GNU General Public License v2 |
457 |
- |
458 |
-EAPI=4 |
459 |
- |
460 |
-inherit autotools base user |
461 |
- |
462 |
-MY_P=icecc-${PV} |
463 |
- |
464 |
-DESCRIPTION="Distributed compiling of C(++) code across several machines; based on distcc" |
465 |
-HOMEPAGE="http://en.opensuse.org/Icecream" |
466 |
-SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2" |
467 |
- |
468 |
-LICENSE="GPL-2" |
469 |
-SLOT="0" |
470 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86" |
471 |
-IUSE="" |
472 |
- |
473 |
-S=${WORKDIR}/${MY_P} |
474 |
- |
475 |
-PATCHES=( |
476 |
- "${FILESDIR}/0.9.6-symlinks.patch" |
477 |
- "${FILESDIR}/0.9.6-crosscompile.patch" |
478 |
- "${FILESDIR}/${PV}-automake.patch" |
479 |
- "${FILESDIR}/${PV}-glibc2.16.patch" |
480 |
- "${FILESDIR}/${PN}-conf.d-verbosity.patch" |
481 |
- "${FILESDIR}/${PN}-gentoo-multilib.patch" |
482 |
-) |
483 |
- |
484 |
-pkg_setup() { |
485 |
- enewgroup icecream |
486 |
- enewuser icecream -1 -1 /var/cache/icecream icecream |
487 |
-} |
488 |
- |
489 |
-src_prepare() { |
490 |
- base_src_prepare |
491 |
- sed -i -e "s/Defaut/Default/g" suse/sysconfig.icecream || die #275761 |
492 |
- eautoreconf |
493 |
-} |
494 |
- |
495 |
-src_install() { |
496 |
- default |
497 |
- |
498 |
- dosbin "${FILESDIR}"/icecream-config |
499 |
- dosbin "${FILESDIR}"/icecream-create-env |
500 |
- |
501 |
- newconfd suse/sysconfig.icecream icecream |
502 |
- doinitd "${FILESDIR}"/icecream |
503 |
- |
504 |
- diropts -m0755 |
505 |
- keepdir /usr/lib/icecc/bin |
506 |
-} |
507 |
- |
508 |
-pkg_postinst() { |
509 |
- ebegin "Scanning for compiler front-ends..." |
510 |
- /usr/sbin/icecream-config --install-links |
511 |
- /usr/sbin/icecream-config --install-links "${CHOST}" |
512 |
- eend ${?} |
513 |
- |
514 |
- elog |
515 |
- elog "If you have compiled binutils/gcc/glibc with processor-specific flags" |
516 |
- elog "(as normal using Gentoo), there is a greater chance that your compiler" |
517 |
- elog "won't work on other machines. The best would be to build gcc, glibc and" |
518 |
- elog "binutils without those flags and then copy the needed files into your" |
519 |
- elog "tarball for distribution to other machines. This tarball can be created" |
520 |
- elog "by running /usr/bin/icecc --build-native, and used by setting" |
521 |
- elog "ICECC_VERSION in /etc/conf.d/icecream" |
522 |
- elog ' ICECC_VERSION=<filename_of_archive_containing_your_environment>' |
523 |
- elog |
524 |
- elog "To use icecream with portage add the following line to /etc/portage/make.conf" |
525 |
- elog ' PREROOTPATH=/usr/lib/icecc/bin' |
526 |
- elog |
527 |
- elog "To use icecream with normal make use (e.g. in /etc/profile)" |
528 |
- elog ' PATH=/usr/lib/icecc/bin:$PATH' |
529 |
- elog |
530 |
- elog "N.B. To use icecream with ccache, the ccache PATH should come first:" |
531 |
- elog ' PATH=/usr/lib/ccache/bin:/usr/lib/icecc/bin:$PATH' |
532 |
- elog |
533 |
- elog "Don't forget to open the following ports in your firewall(s):" |
534 |
- elog " TCP/10245 on the daemon computers (required)" |
535 |
- elog " TCP/8765 for the the scheduler computer (required)" |
536 |
- elog " TCP/8766 for the telnet interface to the scheduler (optional)" |
537 |
- elog " UDP/8765 for broadcast to find the scheduler (optional)" |
538 |
- elog |
539 |
- elog "Further usage instructions: ${HOMEPAGE}" |
540 |
-} |
541 |
|
542 |
diff --git a/sys-devel/icecream/icecream-1.0.0-r1.ebuild b/sys-devel/icecream/icecream-1.0.0-r1.ebuild |
543 |
deleted file mode 100644 |
544 |
index ab7e41ef9c2..00000000000 |
545 |
--- a/sys-devel/icecream/icecream-1.0.0-r1.ebuild |
546 |
+++ /dev/null |
547 |
@@ -1,51 +0,0 @@ |
548 |
-# Copyright 1999-2020 Gentoo Authors |
549 |
-# Distributed under the terms of the GNU General Public License v2 |
550 |
- |
551 |
-EAPI=5 |
552 |
- |
553 |
-MY_P="${P/icecream/icecc}" |
554 |
- |
555 |
-inherit base eutils ltprune user |
556 |
- |
557 |
-DESCRIPTION="Distributed compiling of C(++) code across several machines; based on distcc" |
558 |
-HOMEPAGE="https://github.com/icecc/icecream" |
559 |
-SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2" |
560 |
- |
561 |
-LICENSE="GPL-2" |
562 |
-SLOT="0" |
563 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86" |
564 |
-IUSE="" |
565 |
- |
566 |
-RDEPEND=" |
567 |
- sys-libs/libcap-ng |
568 |
-" |
569 |
-DEPEND="${RDEPEND}" |
570 |
- |
571 |
-S="${WORKDIR}/${MY_P}" |
572 |
- |
573 |
-PATCHES=( |
574 |
- "${FILESDIR}/${P}-libcap-ng.patch" |
575 |
-) |
576 |
- |
577 |
-pkg_setup() { |
578 |
- enewgroup icecream |
579 |
- enewuser icecream -1 -1 /var/cache/icecream icecream |
580 |
-} |
581 |
- |
582 |
-src_configure() { |
583 |
- econf \ |
584 |
- --enable-shared --disable-static \ |
585 |
- --enable-clang-wrappers \ |
586 |
- --enable-clang-rewrite-includes |
587 |
-} |
588 |
- |
589 |
-src_install() { |
590 |
- default |
591 |
- prune_libtool_files --all |
592 |
- |
593 |
- newconfd suse/sysconfig.icecream icecream |
594 |
- newinitd "${FILESDIR}"/icecream-r2 icecream |
595 |
- |
596 |
- insinto /etc/logrotate.d |
597 |
- newins suse/logrotate icecream |
598 |
-} |