[gentoo-commits] repo/gentoo:master commit in: www-apps/radicale/files/, www-apps/radicale/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     4859bc9fe2b11a7b8a8233462b8efe91781f41dc
Author:     Marco Scardovi <Marco <Scardovi>
AuthorDate: Sun Mar 28 11:02:08 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Apr  7 07:51:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4859bc9f

www-apps/radicale: fix radicale.init.d

Closes: https://bugs.gentoo.org/778878
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 www-apps/radicale/files/radicale-r2.init.d         | 26 ++++++++++-----------
 www-apps/radicale/files/radicale-r3.init.d         | 27 ++++++++++++++++++++++
 ...icale-3.0.6.ebuild => radicale-3.0.6-r1.ebuild} |  4 ++--
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/www-apps/radicale/files/radicale-r2.init.d b/www-apps/radicale/files/radicale-r2.init.d
index 6e7d734ebef..6b1e0b37d95 100644
--- a/www-apps/radicale/files/radicale-r2.init.d
+++ b/www-apps/radicale/files/radicale-r2.init.d
@@ -5,23 +5,23 @@
 PIDFILE=/run/radicale.pid
 
 depend() {
-    need localmount
+	need localmount
 }
 
 start() {
-    ebegin "Starting radicale"
-        start-stop-daemon --start --quiet --background \
-        --user radicale \
-	--umask 0027 \
-        --stderr-logger /usr/bin/logger \
-        --pidfile ${PIDFILE} --make-pidfile \
-        --exec /usr/bin/radicale -- --foreground
-    eend $?
+	ebegin "Starting radicale"
+		start-stop-daemon --start --quiet --background \
+		--user radicale \
+		--umask 0027 \
+		--stderr-logger /usr/bin/logger \
+		--pidfile ${PIDFILE} --make-pidfile \
+		--exec /usr/bin/radicale -- --foreground
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping radicale"
-        start-stop-daemon --stop --quiet \
-        --pidfile ${PIDFILE}
-    eend $?
+	ebegin "Stopping radicale"
+		start-stop-daemon --stop --quiet \
+		--pidfile ${PIDFILE}
+	eend $?
 }

diff --git a/www-apps/radicale/files/radicale-r3.init.d b/www-apps/radicale/files/radicale-r3.init.d
new file mode 100644
index 00000000000..bb0cc5db08b
--- /dev/null
+++ b/www-apps/radicale/files/radicale-r3.init.d
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/run/radicale.pid
+
+depend() {
+	need localmount
+}
+
+start() {
+	ebegin "Starting radicale"
+		start-stop-daemon --start --quiet --background \
+		--user radicale \
+		--umask 0027 \
+		--stderr-logger /usr/bin/logger \
+		--pidfile ${PIDFILE} --make-pidfile \
+		--exec /usr/bin/radicale
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping radicale"
+		start-stop-daemon --stop --quiet \
+		--pidfile ${PIDFILE}
+	eend $?
+}

diff --git a/www-apps/radicale/radicale-3.0.6.ebuild b/www-apps/radicale/radicale-3.0.6-r1.ebuild
similarity index 96%
rename from www-apps/radicale/radicale-3.0.6.ebuild
rename to www-apps/radicale/radicale-3.0.6-r1.ebuild
index 9f347464292..c0d9d9f313b 100644
--- a/www-apps/radicale/radicale-3.0.6.ebuild
+++ b/www-apps/radicale/radicale-3.0.6-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{7..9} )
@@ -37,7 +37,7 @@ python_install_all() {
 	rm README* || die
 
 	# init file
-	newinitd "${FILESDIR}"/radicale-r2.init.d radicale
+	newinitd "${FILESDIR}"/radicale-r3.init.d radicale
 	systemd_dounit "${FILESDIR}/${PN}.service"
 
 	# directories