Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/icecream/files/
Date: Sun, 27 Mar 2022 22:08:33
Message-Id: 1648418828.7b2cb158ffe6906b5951a886260801a8d0976318.conikost@gentoo
1 commit: 7b2cb158ffe6906b5951a886260801a8d0976318
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Mar 13 10:08:39 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 27 22:07:08 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2cb158
7
8 sys-devel/icecream: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/24533
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../icecream/files/icecream-1.0.0-libcap-ng.patch | 8 ----
16 sys-devel/icecream/files/icecream-r2 | 44 ----------------------
17 2 files changed, 52 deletions(-)
18
19 diff --git a/sys-devel/icecream/files/icecream-1.0.0-libcap-ng.patch b/sys-devel/icecream/files/icecream-1.0.0-libcap-ng.patch
20 deleted file mode 100644
21 index 3dc0e3713b0a..000000000000
22 --- a/sys-devel/icecream/files/icecream-1.0.0-libcap-ng.patch
23 +++ /dev/null
24 @@ -1,8 +0,0 @@
25 ---- a/services/icecc.pc.in
26 -+++ b/services/icecc.pc.in
27 -@@ -11,4 +11,5 @@ Version: @VERSION@
28 - Requires:
29 - Conflicts:
30 - Libs: -L${libdir} -licecc
31 -+Libs.private: @CAPNG_LDADD@
32 - Cflags: -I${includedir}
33
34 diff --git a/sys-devel/icecream/files/icecream-r2 b/sys-devel/icecream/files/icecream-r2
35 deleted file mode 100644
36 index 21cfddeda8c3..000000000000
37 --- a/sys-devel/icecream/files/icecream-r2
38 +++ /dev/null
39 @@ -1,44 +0,0 @@
40 -#!/sbin/openrc-run
41 -# Copyright 1999-2013 Gentoo Foundation
42 -# Distributed under the terms of the GNU General Public License v2
43 -
44 -depend() {
45 - need net
46 -}
47 -
48 -start() {
49 - local basedir=${ICECREAM_BASEDIR:-"/var/cache/icecream"}
50 - local netname=${ICECREAM_NETNAME:+"-n ${ICECREAM_NETNAME}"}
51 - local logfile=${ICECREAM_LOG_FILE:+"-l ${ICECREAM_LOG_FILE}"}
52 - local nice=${ICECREAM_NICE_LEVEL:+"--nice ${ICECREAM_NICE_LEVEL}"}
53 - local scheduler=${ICECREAM_SCHEDULER_HOST:+"-s ${ICECREAM_SCHEDULER_HOST}"}
54 - local maxjobs=${ICECREAM_MAX_JOBS:+"-m ${ICECREAM_MAX_JOBS}"}
55 - local verbosity=${ICECREAM_VERBOSITY:-"-v"}
56 -
57 - [[ ! -d /var/log/icecream/ ]] && mkdir -p /var/log/icecream/ && chown icecream:icecream /var/log/icecream/
58 - if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
59 - local slogfile=${ICECREAM_SCHEDULER_LOG_FILE:-"/var/log/icecc_scheduler"}
60 - touch ${slogfile} && chown icecream:icecream ${slogfile}
61 - slogfile=${slogfile:+"-l ${slogfile}"}
62 - ebegin "Starting Distributed Compiler Scheduler"
63 - start-stop-daemon -u icecream --start --quiet --exec /usr/sbin/icecc-scheduler -- -d ${slogfile} ${netname} ${verbosity}
64 - eend ${?}
65 - fi
66 -
67 - [[ ! -d ${basedir} ]] && mkdir -p ${basedir} && chown icecream:icecream ${basedir}
68 - ebegin "Starting Distributed Compiler Daemon"
69 - start-stop-daemon --start --quiet --exec /usr/sbin/iceccd -- -d ${logfile} ${nice} ${scheduler} ${netname} -u icecream -b "${basedir}" ${maxjobs} ${verbosity}
70 - eend ${?}
71 -}
72 -
73 -stop() {
74 - ebegin "Stopping Distributed Compiler Daemon"
75 - start-stop-daemon --stop --quiet --name iceccd
76 - eend ${?}
77 -
78 - if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
79 - ebegin "Stopping Distributed Compiler Scheduler"
80 - start-stop-daemon --stop --quiet --name icecc-scheduler
81 - eend ${?}
82 - fi
83 -}