Adding metadata

7 files changed, 127 insertions, 71 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-r2 b/sys-devel/icecream/files/icecream-r2
deleted file mode 100644
index 21cfddeda8c3..000000000000
--- a/sys-devel/icecream/files/icecream-r2
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-        need net
-}
-
-start() {
-	local basedir=${ICECREAM_BASEDIR:-"/var/cache/icecream"}
-	local netname=${ICECREAM_NETNAME:+"-n ${ICECREAM_NETNAME}"}
-	local logfile=${ICECREAM_LOG_FILE:+"-l ${ICECREAM_LOG_FILE}"}
-	local nice=${ICECREAM_NICE_LEVEL:+"--nice ${ICECREAM_NICE_LEVEL}"}
-	local scheduler=${ICECREAM_SCHEDULER_HOST:+"-s ${ICECREAM_SCHEDULER_HOST}"}
-	local maxjobs=${ICECREAM_MAX_JOBS:+"-m ${ICECREAM_MAX_JOBS}"}
-	local verbosity=${ICECREAM_VERBOSITY:-"-v"}
-
-	[[ ! -d /var/log/icecream/ ]] && mkdir -p /var/log/icecream/ && chown icecream:icecream /var/log/icecream/
-	if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
-		local slogfile=${ICECREAM_SCHEDULER_LOG_FILE:-"/var/log/icecc_scheduler"}
-		touch ${slogfile} && chown icecream:icecream ${slogfile}
-		slogfile=${slogfile:+"-l ${slogfile}"}
-		ebegin "Starting Distributed Compiler Scheduler"
-		start-stop-daemon -u icecream --start --quiet --exec /usr/sbin/icecc-scheduler -- -d ${slogfile} ${netname} ${verbosity}
-		eend ${?}
-	fi
-
-	[[ ! -d ${basedir} ]] && mkdir -p ${basedir} && chown icecream:icecream ${basedir}
-	ebegin "Starting Distributed Compiler Daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/iceccd -- -d ${logfile} ${nice} ${scheduler} ${netname} -u icecream -b "${basedir}" ${maxjobs} ${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
-}
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..116d440cb1c4
--- /dev/null
+++ b/sys-devel/icecream/files/icecream.openrc
@@ -0,0 +1,55 @@
+#!/sbin/openrc-run
+# Copyright 1999-2024 Gentoo Authors
+# 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
+}
diff --git a/sys-devel/icecream/icecream-1.4-r1.ebuild b/sys-devel/icecream/icecream-1.4-r1.ebuild
index f51356619bed..ca61c97635a2 100644
--- a/sys-devel/icecream/icecream-1.4-r1.ebuild
+++ b/sys-devel/icecream/icecream-1.4-r1.ebuild
@@ -1,65 +1,84 @@
-# Copyright 2020-2022 LiGurOs Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
-inherit autotools
+AT_NOELIBTOOLIZE="yes"
+inherit autotools dot-a systemd tmpfiles
 
-DESCRIPTION="Distributed compiling of C(++) code across several machines; based on distcc"
+DESCRIPTION="Distributed compiler with a central scheduler to share build load"
 HOMEPAGE="https://github.com/icecc/icecream"
-SRC_URI="https://github.com/icecc/icecream/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/icecc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~hppa ~loong ~ppc ~sparc ~x86"
 
-DEPEND="
-	app-arch/zstd
+DEPEND="app-arch/libarchive:=
+	app-arch/zstd:=
 	acct-user/icecream
 	acct-group/icecream
-	sys-libs/libcap-ng
-	dev-libs/lzo
-	app-text/docbook2X
-"
-RDEPEND="
-	${DEPEND}
-	dev-util/shadowman
-"
+	dev-libs/lzo:2
+	sys-libs/libcap-ng"
+RDEPEND="${DEPEND}
+	dev-util/shadowman"
+BDEPEND="app-text/docbook2X
+	virtual/pkgconfig"
 
 src_prepare() {
-	eapply_user
+	default
+
 	eautoreconf
 }
 
 src_configure() {
+	lto-guarantee-fat
+
 	econf \
-		--enable-shared --disable-static \
-		--enable-clang-wrappers \
-		--enable-clang-rewrite-includes
+		--enable-clang-rewrite-includes \
+		--enable-clang-wrappers
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+
+	strip-lto-bytecode
+
+	find "${ED}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}"/iceccd.service
+	systemd_dounit "${FILESDIR}"/icecc-scheduler.service
 
 	newconfd suse/sysconfig.icecream icecream
-	newinitd "${FILESDIR}"/icecream-r2 icecream
+	newinitd "${FILESDIR}"/icecream.openrc icecream
+
+	keepdir /var/log/icecream
+	fowners icecream:icecream /var/log/icecream
+	fperms 0750 /var/log/icecream
+
+	newtmpfiles "${FILESDIR}"/icecream-tmpfiles.conf icecream.conf
 
 	insinto /etc/logrotate.d
 	newins suse/logrotate icecream
 
+	insinto /etc/firewalld/services
+	doins suse/iceccd.xml
+	doins suse/icecc-scheduler.xml
+
 	insinto /usr/share/shadowman/tools
-	newins - icecc <<<'/usr/libexec/icecc/bin'
+	newins - icecc <<<"${EPREFIX}"/usr/libexec/icecc/bin
 }
 
 pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]]; then
+	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
 		eselect compiler-shadow remove icecc
 	fi
 }
 
 pkg_postinst() {
-	if [[ ${ROOT} == / ]]; then
+	tmpfiles_process icecream.conf
+
+	if [[ -z ${ROOT} ]] ; then
 		eselect compiler-shadow update icecc
 	fi
 }
diff --git a/sys-devel/icecream/metadata.xml b/sys-devel/icecream/metadata.xml
index 75e2e665e6b4..5a4faf5ec896 100644
--- a/sys-devel/icecream/metadata.xml
+++ b/sys-devel/icecream/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
   </maintainer>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>