gentoo (leap year) resync : 29.02.2020

8 files changed, 10 insertions, 90 deletions

diff --git a/dev-util/sccache/files/scheduler.confd b/dev-util/sccache/files/scheduler.confd
index a70327100fca..5cb8299fd37b 100644
--- a/dev-util/sccache/files/scheduler.confd
+++ b/dev-util/sccache/files/scheduler.confd
@@ -4,18 +4,9 @@
 # Full path to config file. /etc/sccache/scheduler.conf is default if not set.
 #SCCACHE_SCHEDULER_CONF="/etc/sccache/scheduler.conf"
 
-# logging is off by default, see https://docs.rs/env_logger for possible values
+# logging is off by default, possible values are: error warn info debug trace
 #SCCACHE_SCHEDULER_LOGLEVEL=info
 
-# plain file (preferred), change logrotate file as well if you change this.
-#output_log=/var/log/"${RC_SVCNAME}.log"
-#error_log=/var/log/"${RC_SVCNAME}.error.log"
-
-# syslog support via LOGGER(1). Note this spawns logger processes per io stream
-#output_logger="logger -p daemon.none --"
-#error_logger="logger -p daemon.err --"
-
-
 # no limits set by default, see IONICE(1), NICE(1), START-STOP-DAEMON(8)
 #SSD_NICELEVEL=15
 #SSD_IONICELEVEL=3
diff --git a/dev-util/sccache/files/scheduler.confd-r1 b/dev-util/sccache/files/scheduler.confd-r1
deleted file mode 100644
index 5cb8299fd37b..000000000000
--- a/dev-util/sccache/files/scheduler.confd-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/conf.d/sccache-scheduler: config file for /etc/init.d/sccache-scheduler
-#
-
-# Full path to config file. /etc/sccache/scheduler.conf is default if not set.
-#SCCACHE_SCHEDULER_CONF="/etc/sccache/scheduler.conf"
-
-# logging is off by default, possible values are: error warn info debug trace
-#SCCACHE_SCHEDULER_LOGLEVEL=info
-
-# no limits set by default, see IONICE(1), NICE(1), START-STOP-DAEMON(8)
-#SSD_NICELEVEL=15
-#SSD_IONICELEVEL=3
diff --git a/dev-util/sccache/files/scheduler.initd b/dev-util/sccache/files/scheduler.initd
index fd4d616a6bd6..dc0ca5a5e7bc 100644
--- a/dev-util/sccache/files/scheduler.initd
+++ b/dev-util/sccache/files/scheduler.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 SCCACHE_SCHEDULER_CONF="${SCCACHE_SCHEDULER_CONF:-/etc/sccache/scheduler.conf}"
@@ -12,8 +12,6 @@ depend() {
 description="Starts sccache build scheduler server"
 
 command="/usr/bin/sccache-dist"
-command_args="scheduler ${SCCACHE_SCHEDULER_CONF:+--config ${SCCACHE_SCHEDULER_CONF}}"
-command_background="true"
-pidfile="/run/${RC_SVCNAME}.pid"
+command_args="--config ${SCCACHE_SCHEDULER_CONF} ${SCCACHE_SCHEDULER_LOGLEVEL:+--syslog ${SCCACHE_SCHEDULER_LOGLEVEL}}"
+procname="${command} scheduler"
 required_files="${SCCACHE_SCHEDULER_CONF}"
-start_stop_daemon_args="--env RUST_LOG=${SCCACHE_SCHEDULER_LOGLEVEL:- }"
diff --git a/dev-util/sccache/files/scheduler.initd-r1 b/dev-util/sccache/files/scheduler.initd-r1
deleted file mode 100644
index ae9f60bff8b2..000000000000
--- a/dev-util/sccache/files/scheduler.initd-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-SCCACHE_SCHEDULER_CONF="${SCCACHE_SCHEDULER_CONF:-/etc/sccache/scheduler.conf}"
-
-depend() {
-	need localmount
-	use net
-}
-
-description="Starts sccache build scheduler server"
-
-command="/usr/bin/sccache-dist"
-command_args="--config ${SCCACHE_SCHEDULER_CONF} ${SCCACHE_SCHEDULER_LOGLEVEL:+--syslog ${SCCACHE_SCHEDULER_LOGLEVEL}}"
-procname="${command} scheduler"
-required_files="${SCCACHE_SCHEDULER_CONF}"
diff --git a/dev-util/sccache/files/server.confd b/dev-util/sccache/files/server.confd
index 5bd110a3c2b0..4413f0c9bca2 100644
--- a/dev-util/sccache/files/server.confd
+++ b/dev-util/sccache/files/server.confd
@@ -4,18 +4,9 @@
 # Full path to config file. /etc/sccache/server.conf is default if not set.
 #SCCACHE_SERVER_CONF="/etc/sccache/server.conf"
 
-# logging is off by default, see https://docs.rs/env_logger for possible values
+# logging is off by default, possible values are: error warn info debug trace
 #SCCACHE_SERVER_LOGLEVEL=info
 
-# plain file (preferred), change logrotate file as well if you change this.
-#output_log=/var/log/"${RC_SVCNAME}.log"
-#error_log=/var/log/"${RC_SVCNAME}.error.log"
-
-# syslog support via LOGGER(1). Note this spawns logger processes per io stream
-#output_logger="logger -p daemon.none --"
-#error_logger="logger -p daemon.err --"
-
-
 # no limits set by default, see IONICE(1), NICE(1), START-STOP-DAEMON(8)
 #SSD_NICELEVEL=15
 #SSD_IONICELEVEL=3
diff --git a/dev-util/sccache/files/server.confd-r1 b/dev-util/sccache/files/server.confd-r1
deleted file mode 100644
index 4413f0c9bca2..000000000000
--- a/dev-util/sccache/files/server.confd-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/conf.d/sccache-server: config file for /etc/init.d/sccache-server
-#
-
-# Full path to config file. /etc/sccache/server.conf is default if not set.
-#SCCACHE_SERVER_CONF="/etc/sccache/server.conf"
-
-# logging is off by default, possible values are: error warn info debug trace
-#SCCACHE_SERVER_LOGLEVEL=info
-
-# no limits set by default, see IONICE(1), NICE(1), START-STOP-DAEMON(8)
-#SSD_NICELEVEL=15
-#SSD_IONICELEVEL=3
diff --git a/dev-util/sccache/files/server.initd b/dev-util/sccache/files/server.initd
index 0c37ee400b05..b7453a03ca0f 100644
--- a/dev-util/sccache/files/server.initd
+++ b/dev-util/sccache/files/server.initd
@@ -1,19 +1,19 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 SCCACHE_SERVER_CONF="${SCCACHE_SERVER_CONF:-/etc/sccache/server.conf}"
 
 depend() {
-	need localmount
-	use net
+        need localmount
+        use net
 }
 
 description="Starts sccache build server"
 
 command="/usr/bin/sccache-dist"
-command_args="server ${SCCACHE_SERVER_CONF:+--config ${SCCACHE_SERVER_CONF}}"
+command_args="--config ${SCCACHE_SERVER_CONF} ${SCCACHE_SERVER_LOGLEVEL:+--syslog ${SCCACHE_SERVER_LOGLEVEL}}"
 command_background="true"
 pidfile="/run/${RC_SVCNAME}.pid"
+procname="${command} server"
 required_files="${SCCACHE_SERVER_CONF}"
-start_stop_daemon_args="--env RUST_LOG=${SCCACHE_SERVER_LOGLEVEL:- }"
diff --git a/dev-util/sccache/files/server.initd-r1 b/dev-util/sccache/files/server.initd-r1
deleted file mode 100644
index 19656cc6a058..000000000000
--- a/dev-util/sccache/files/server.initd-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-SCCACHE_SERVER_CONF="${SCCACHE_SERVER_CONF:-/etc/sccache/server.conf}"
-
-depend() {
-        need localmount
-        use net
-}
-
-description="Starts sccache build server"
-
-command="/usr/bin/sccache-dist"
-command_args="--config ${SCCACHE_SERVER_CONF} ${SCCACHE_SERVER_LOGLEVEL:+--syslog ${SCCACHE_SERVER_LOGLEVEL}}"
-command_background="true"
-pidfile="/run/${RC_SVCNAME}.pid"
-procname="${command} server"
-required_files="${SCCACHE_SERVER_CONF}"