gentoo resync : 10.03.2018

3 files changed, 3 insertions, 41 deletions

diff --git a/net-misc/kafka-bin/files/kafka.init.d b/net-misc/kafka-bin/files/kafka.init.d
deleted file mode 100644
index 3b23a7fac7c9..000000000000
--- a/net-misc/kafka-bin/files/kafka.init.d
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Kafka distributed messaging system"
-
-logfile="/var/log/kafka/kafka.log"
-
-command="/opt/kafka/bin/kafka-server-start.sh"
-command_args="/etc/kafka/server.properties"
-start_stop_daemon_args="--user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile"
-
-command_background=yes
-pidfile=/run/kafka.pid
-
-depend() {
-       after zookeeper kafka-zookeeper
-}
diff --git a/net-misc/kafka-bin/files/kafka.init.d.2 b/net-misc/kafka-bin/files/kafka.init.d.2
deleted file mode 100755
index 87b4b47a4469..000000000000
--- a/net-misc/kafka-bin/files/kafka.init.d.2
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Kafka distributed messaging system"
-
-logfile="/var/log/kafka/kafka.log"
-
-command="/opt/kafka/bin/kafka-server-start.sh"
-command_args="/etc/kafka/server.properties"
-
-command_background=yes
-pidfile=/run/kafka.pid
-
-start() {
-	start-stop-daemon --start --background --user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile \
-	--env KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS}" \
-	--pidfile $pidfile --exec /opt/kafka/bin/kafka-server-start.sh -- /etc/kafka/server.properties
-}
-depend() {
-       after zookeeper kafka-zookeeper
-}
diff --git a/net-misc/kafka-bin/files/kafka.init.d.3 b/net-misc/kafka-bin/files/kafka.init.d.4
index c355f21612ca..064821f669de 100644
--- a/net-misc/kafka-bin/files/kafka.init.d.3
+++ b/net-misc/kafka-bin/files/kafka.init.d.4
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Kafka distributed messaging system"
@@ -13,9 +13,11 @@ command_background=yes
 pidfile=/run/kafka.pid
 
 start() {
+	ebegin "Starting kafka ..."
 	start-stop-daemon --start --background --user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile \
 	-m --env KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS}" \
 	--pidfile $pidfile --exec /opt/kafka/bin/kafka-server-start.sh -- /etc/kafka/server.properties
+	eend $?
 }
 depend() {
        after zookeeper kafka-zookeeper