sys-devel/icecream: Bump to 1.3.1, various fixes

* Fixes bug #602492
* Adds systemd support
* Installs firewalld service files

Bug: https://bugs.gentoo.org/602492
Closes: https://bugs.gentoo.org/527376
Closes: https://bugs.gentoo.org/642674
Closes: https://github.com/gentoo/gentoo/pull/15975
Signed-off-by: Lucas Yamanishi <lucas.yamanishi@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 81 insertions, 0 deletions

diff --git a/sys-devel/icecream/files/icecc-scheduler.service b/sys-devel/icecream/files/icecc-scheduler.service
new file mode 100644
index 000000000000..f0db05af534e
--- /dev/null
+++ b/sys-devel/icecream/files/icecc-scheduler.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Icecream distributed compiler scheduler
+
+[Service]
+Type=simple
+User=icecream
+Group=icecream
+SyslogIdentifier=icecc-scheduler
+ExecStart=/usr/sbin/icecc-scheduler -u icecream -l /var/log/icecream/scheduler -v
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-devel/icecream/files/iceccd.service b/sys-devel/icecream/files/iceccd.service
new file mode 100644
index 000000000000..0b74362dfb3a
--- /dev/null
+++ b/sys-devel/icecream/files/iceccd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Icecream Distributed Compiler
+After=network.target nss-lookup.target
+
+[Service]
+Type=simple
+SyslogIdentifier=iceccd
+ExecStart=/usr/sbin/iceccd -u icecream -b /var/cache/icecream -l /var/log/icecream/iceccd -v
+Nice=5
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-devel/icecream/files/icecream-tmpfiles.conf b/sys-devel/icecream/files/icecream-tmpfiles.conf
new file mode 100644
index 000000000000..a7cbf53f96ef
--- /dev/null
+++ b/sys-devel/icecream/files/icecream-tmpfiles.conf
@@ -0,0 +1,2 @@
+d     /run/icecc          0775 root     icecream -
+d     /var/cache/icecream 0755 icecream icecream 3d
diff --git a/sys-devel/icecream/files/icecream.openrc b/sys-devel/icecream/files/icecream.openrc
new file mode 100644
index 000000000000..b574874b2075
--- /dev/null
+++ b/sys-devel/icecream/files/icecream.openrc
@@ -0,0 +1,55 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+start() {
+	basedir="${ICECREAM_BASEDIR:-'/var/cache/icecream'}"
+	verbosity="${ICECREAM_VERBOSITY:-'-v'}"
+	netname="${ICECREAM_NETNAME:+"-n ${ICECREAM_NETNAME}"}"
+	iceccd_logfile="${ICECREAM_LOG_FILE:-'/var/log/icecream/iceccd'}"
+	nice="${ICECREAM_NICE_LEVEL:+"--nice ${ICECREAM_NICE_LEVEL}"}"
+	scheduler="${ICECREAM_SCHEDULER_HOST:+"-s ${ICECREAM_SCHEDULER_HOST}"}"
+
+	if [ "$ICECREAM_RUN_SCHEDULER" = 'yes' ]; then
+		sched_logfile="${ICECREAM_SCHEDULER_LOG_FILE:-'/var/log/icecream/scheduler'}"
+
+		ebegin 'Starting Distributed Compiler Scheduler'
+		start-stop-daemon -u icecream --start --quiet --exec /usr/sbin/icecc-scheduler -- -d -l "$sched_logfile" $netname $verbosity
+		eend ${?}
+	fi
+
+	noremote=''
+	if test "$ICECREAM_ALLOW_REMOTE" = 'no' 2> /dev/null; then
+		noremote='--no-remote'
+	fi
+
+	maxjobs=''
+	if [ -n "$ICECREAM_MAX_JOBS" ]; then
+		if test "$ICECREAM_MAX_JOBS" -eq 0 2> /dev/null; then
+			maxjobs='-m 1'
+			noremote='--no-remote'
+		else
+			maxjobs="-m $ICECREAM_MAX_JOBS"
+		fi
+	fi
+
+	ebegin 'Starting Distributed Compiler Daemon'
+	start-stop-daemon --start --quiet --exec /usr/sbin/iceccd -- -d -l "$iceccd_logfile" $nice $scheduler $netname -u icecream -b "$basedir" $maxjobs $noremote $verbosity
+	eend ${?}
+}
+
+stop() {
+	ebegin 'Stopping Distributed Compiler Daemon'
+	start-stop-daemon --stop --quiet --name iceccd
+	eend ${?}
+
+	if [ "${ICECREAM_RUN_SCHEDULER}" = 'yes' ]; then
+		ebegin 'Stopping Distributed Compiler Scheduler'
+		start-stop-daemon --stop --quiet --name icecc-scheduler
+		eend ${?}
+	fi
+}