testing/mopidy: cleanup, add init file, logging, and manpages, and fix permissions

testing/mopidy: upgrade to 2.2.2

7 files changed, 104 insertions, 23 deletions

diff --git a/testing/mopidy/APKBUILD b/testing/mopidy/APKBUILD
index 7f3b699683..afaeb617e5 100644
--- a/testing/mopidy/APKBUILD
+++ b/testing/mopidy/APKBUILD
@@ -1,46 +1,69 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Marvin Steadfast <marvin@xsteadfastx.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mopidy
 _pkgname=Mopidy
-pkgver=2.1.0
-pkgrel=1
+pkgver=2.2.2
+pkgrel=0
 pkgdesc="Mopidy is an extensible music server"
 url="http://www.mopidy.com/"
 arch="noarch"
 license="Apache-2.0"
 depends="python py-pykka py-tornado gst-plugins-base gst-plugins-good
 	gst-plugins-ugly py-gst py-setuptools py-libxml2 py-requests
-	py-six
-	"
-depends_dev=""
-makedepends="python-dev"
-install=""
-subpackages=""
+	py-six"
+makedepends="python-dev py2-sphinx"
+install="$pkgname.pre-install $pkgname.post-deinstall"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
 	mopidy.conf
+	logging.conf
+	mopidy.initd
 	"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
-prepare() {
-	default_prepare
-}
+
+pkgusers="mopidy"
+pkggroups="audio"
 
 build() {
 	cd "$_builddir"
 	python setup.py build
+
+	make -C docs SPHINXBUILD=sphinx-build-2 man
+	make -C docs SPHINXBUILD=sphinx-build-2 html
 }
 
 package() {
 	cd "$_builddir"
 	python setup.py install --prefix=/usr --root="$pkgdir"
-	install -Dm640 "${srcdir}/mopidy.conf" "${pkgdir}/etc/mopidy/mopidy.conf"
-	install -dm755 "${pkgdir}/etc/mopidy/extensions.d"
-	install -dm755 "${pkgdir}/var/cache/mopidy"
-	install -dm755 "${pkgdir}/var/log/mopidy"
-	install -dm755 "${pkgdir}/var/lib/mopidy/local"
-	install -dm755 "${pkgdir}/var/lib/mopidy/media"
-	install -dm755 "${pkgdir}/var/lib/mopidy/playlists"
+	install -Dm755 extra/mopidyctl/mopidyctl "${pkgdir}/usr/bin/mopidyctl"
+
+	install -dm755 "${pkgdir}/usr/share/doc/mopidy"
+	cp -r docs/_build/html "${pkgdir}/usr/share/doc/mopidy"
+
+	install -dm755 "${pkgdir}/usr/share/man/man1/"
+	gzip -c docs/_build/man/mopidy.1 > "${pkgdir}/usr/share/man/man1/mopidy.1.gz"
+
+	install -dm755 "${pkgdir}/usr/share/man/man8/"
+	gzip -c extra/mopidyctl/mopidyctl.8 > "${pkgdir}/usr/share/man/man8/mopidyctl.8.gz"
+
+	install -Dm644 "${srcdir}/mopidy.conf" \
+		"${pkgdir}/etc/mopidy/mopidy.conf"
+	install -Dm644 "${srcdir}/logging.conf" \
+		"${pkgdir}/etc/mopidy/logging.conf"
+
+	install -Dm755 "$srcdir/$pkgname.initd" \
+		"$pkgdir/etc/init.d/$pkgname"
+
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+	install -dm755 -o mopidy -g audio \
+		"${pkgdir}/etc/mopidy/extensions.d" \
+		"${pkgdir}/var/log/mopidy" \
+		"${pkgdir}/var/cache/mopidy" \
+		"${pkgdir}/var/lib/mopidy/media" \
+		"${pkgdir}/var/lib/mopidy/playlists"
 }
 
 check() {
@@ -48,5 +71,7 @@ check() {
 	python -m mopidy --help > /dev/null
 }
 
-sha512sums="14422ec706be70b3ce64e48be2c07677ac19fbb3a66f7ee4c9ad84ce47ffd8bf8a8b43edb7655f8437c50ac1366026ab96594f6598e033db8ffe094dd471d985  Mopidy-2.1.0.tar.gz
-593f872d072b32d3da92b8e60ad486c9ca6fa68eae5235e7724f3837d1fa4627694b5ebc8aaacedfba22c701e558e1d60b2f9c97139621a0eead3319446fe300  mopidy.conf"
+sha512sums="3ae9d1c4cc7b002095928a9c1b683ad94c4190c21b1451c176fdcf8c6daa174433a1be967d4143d03d4eeb2bfc680f7ab37d23a10fef9be76fc6e68bd0402ec1  Mopidy-2.2.2.tar.gz
+eb66e8e826640a939b1ba51569ab7fab041b8b5e8823ea2d5f05596faf1de8882fd8c1c32bdb92534e759243fb5ff741bda0d2ebb3282af542d1287c8c68b5ea  mopidy.conf
+0c438058500ab7559baae21b03b10e2b80b10c77776b240b2100da1f4c84ea8efe24dc7a38a95034e75605eaf5d21604d13e5b8c7358778c555ddb6372a49388  logging.conf
+de23c457de712efa04ccb4a3628710fd7c1be7b00ce73f138f613156d49862060a5a6be8c1491a5f3515537c0228f66aa28a0b751960563b533c2720ddbbe8c8  mopidy.initd"
diff --git a/testing/mopidy/logging.conf b/testing/mopidy/logging.conf
new file mode 100644
index 0000000000..777e93b8a0
--- /dev/null
+++ b/testing/mopidy/logging.conf
@@ -0,0 +1,21 @@
+[loggers]
+keys = root
+
+[handlers]
+keys = fileHandler
+
+[formatters]
+keys = simpleFormatter
+
+[logger_root]
+handlers = fileHandler
+
+[handler_fileHandler]
+class = FileHandler
+formatter = simpleFormatter
+level = INFO
+args = ('/var/log/mopidy/mopidy.log',)
+
+[formatter_simpleFormatter]
+format = %(asctime)s %(levelname)s [%(process)d:%(threadName)s] %(name)s: %(message)s
+datefmt =
diff --git a/testing/mopidy/mopidy.conf b/testing/mopidy/mopidy.conf
index 95b8b423ac..5be8d541fe 100644
--- a/testing/mopidy/mopidy.conf
+++ b/testing/mopidy/mopidy.conf
@@ -1,8 +1,15 @@
+[core]
+cache_dir = /var/cache/mopidy
+config_dir = /etc/mopidy
+data_dir = /var/lib/mopidy
+
 [logging]
+config_file = /etc/mopidy/logging.conf
 debug_file = /var/log/mopidy/mopidy-debug.log
 
 [local]
-enabled = true
 data_dir = /var/lib/mopidy/local
 media_dir = /var/lib/mopidy/media
+
+[m3u]
 playlists_dir = /var/lib/mopidy/playlists
diff --git a/testing/mopidy/mopidy.initd b/testing/mopidy/mopidy.initd
new file mode 100644
index 0000000000..6028d1e754
--- /dev/null
+++ b/testing/mopidy/mopidy.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+
+name=mopidy
+command="/usr/bin/mopidy"
+command_args="--config /etc/mopidy/mopidy.conf"
+command_user="mopidy"
+start_stop_daemon_args="--background --make-pidfile"
+pidfile="/run/mopidy.pid"
+
+depend() {
+	need net
+	after firewall
+}
+
+start_pre() {
+	checkpath --directory --owner mopidy:audio --mode 0775 \
+		/var/log/mopidy
+}
diff --git a/testing/mopidy/mopidy.post-deinstall b/testing/mopidy/mopidy.post-deinstall
new file mode 100644
index 0000000000..229c294e2c
--- /dev/null
+++ b/testing/mopidy/mopidy.post-deinstall
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+deluser mopidy
+
+exit 0
diff --git a/testing/mopidy/mopidy.pre-install b/testing/mopidy/mopidy.pre-install
new file mode 100644
index 0000000000..80ae1504a5
--- /dev/null
+++ b/testing/mopidy/mopidy.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+adduser -S -D -h /var/lib/mopidy -s /sbin/nologin -G audio mopidy 2>/dev/null
+
+exit 0
diff --git a/testing/py-pykka/APKBUILD b/testing/py-pykka/APKBUILD
index 60bf4bc6d3..8724cb01a3 100644
--- a/testing/py-pykka/APKBUILD
+++ b/testing/py-pykka/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=py-pykka
 pkgver=1.2.1
 pkgrel=4