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

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     6f6b42f6f6efdd9ddfb0bb39111292cb2c6d6c2b
Author:     Karel Kočí <cynerd <AT> email <DOT> cz>
AuthorDate: Tue Dec  4 21:53:48 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 21:00:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f6b42f6

www-apps/radicale: log stdout and stderr to syslog

Radicale in default sends all its logs to stderr and stdout. This
redirect them to syslog.

Bug: https://bugs.gentoo.org/672534
Signed-off-by: Karel Kočí <cynerd <AT> email.cz>
Closes: https://github.com/gentoo/gentoo/pull/10574
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 www-apps/radicale/files/radicale-r1.init.d         | 27 ++++++++++++++++++++++
 ...ale-2.1.11.ebuild => radicale-2.1.10-r1.ebuild} | 10 ++++----
 www-apps/radicale/radicale-2.1.11.ebuild           |  8 +++----
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/www-apps/radicale/files/radicale-r1.init.d b/www-apps/radicale/files/radicale-r1.init.d
new file mode 100644
index 00000000000..9e2ddb7c510
--- /dev/null
+++ b/www-apps/radicale/files/radicale-r1.init.d
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/var/run/radicale.pid
+
+depend() {
+    use net
+    need localmount
+}
+
+start() {
+    ebegin "Starting radicale"
+        start-stop-daemon --start --quiet --background \
+        --user radicale \
+        --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 $?
+}

diff --git a/www-apps/radicale/radicale-2.1.11.ebuild b/www-apps/radicale/radicale-2.1.10-r1.ebuild
similarity index 90%
copy from www-apps/radicale/radicale-2.1.11.ebuild
copy to www-apps/radicale/radicale-2.1.10-r1.ebuild
index 4872a7b5e46..34fd1a1d2f8 100644
--- a/www-apps/radicale/radicale-2.1.11.ebuild
+++ b/www-apps/radicale/radicale-2.1.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,14 +19,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+bcrypt"
 
-RDEPEND=">=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
+RDEPEND="sys-apps/util-linux
+	>=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
 	bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )"
 
 S=${WORKDIR}/${MY_P}
 
 RDIR=/var/lib/radicale
-LDIR=/var/log/radicale
 
 pkg_pretend() {
 	if [[ -f ${RDIR}/.props && ${MERGE_TYPE} != buildonly ]]; then
@@ -59,13 +59,11 @@ python_install_all() {
 	rm README* || die
 
 	# init file
-	newinitd "${FILESDIR}"/radicale.init.d radicale
+	newinitd "${FILESDIR}"/radicale-r1.init.d radicale
 
 	# directories
 	diropts -m0750 -oradicale -gradicale
 	keepdir ${RDIR}
-	diropts -m0755 -oradicale -gradicale
-	keepdir ${LDIR}
 
 	# config file
 	insinto /etc/${PN}

diff --git a/www-apps/radicale/radicale-2.1.11.ebuild b/www-apps/radicale/radicale-2.1.11.ebuild
index 4872a7b5e46..a65d7bc588b 100644
--- a/www-apps/radicale/radicale-2.1.11.ebuild
+++ b/www-apps/radicale/radicale-2.1.11.ebuild
@@ -19,14 +19,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+bcrypt"
 
-RDEPEND=">=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
+RDEPEND="sys-apps/util-linux
+	>=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
 	bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )"
 
 S=${WORKDIR}/${MY_P}
 
 RDIR=/var/lib/radicale
-LDIR=/var/log/radicale
 
 pkg_pretend() {
 	if [[ -f ${RDIR}/.props && ${MERGE_TYPE} != buildonly ]]; then
@@ -59,13 +59,11 @@ python_install_all() {
 	rm README* || die
 
 	# init file
-	newinitd "${FILESDIR}"/radicale.init.d radicale
+	newinitd "${FILESDIR}"/radicale-r1.init.d radicale
 
 	# directories
 	diropts -m0750 -oradicale -gradicale
 	keepdir ${RDIR}
-	diropts -m0755 -oradicale -gradicale
-	keepdir ${LDIR}
 
 	# config file
 	insinto /etc/${PN}