Revbump to fix systemd support (thanks Dmitry, bug 483780).Revbump to fix systemd support (thanks Dmitry, bug 483780).

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 158 insertions, 1 deletions

diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog
index 94a0cb302505..794dda01e972 100644
--- a/net-misc/minidlna/ChangeLog
+++ b/net-misc/minidlna/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/minidlna
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.37 2013/06/25 18:43:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.38 2013/09/05 20:25:35 xmw Exp $
+
+*minidlna-1.1.0-r3 (05 Sep 2013)
+
+  05 Sep 2013; Michael Weber <xmw@gentoo.org> +files/minidlna-1.1.0-r3.initd,
+  +files/minidlna-1.1.0-r3.service, +minidlna-1.1.0-r3.ebuild:
+  Revbump to fix systemd support (thanks Dmitry, bug 483780).Revbump to fix
+  systemd support (thanks Dmitry, bug 483780).
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> minidlna-1.1.0-r2.ebuild:
   Stable for amd64, wrt bug #474282
diff --git a/net-misc/minidlna/files/minidlna-1.1.0-r3.initd b/net-misc/minidlna/files/minidlna-1.1.0-r3.initd
new file mode 100644
index 000000000000..0c971781ecf7
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.1.0-r3.initd
@@ -0,0 +1,53 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/files/minidlna-1.1.0-r3.initd,v 1.1 2013/09/05 20:25:35 xmw Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting MiniDLNA"
+	local params=""
+	local stop=0
+
+	checkpath -q -d -m 0755 -o ${M_USER:-minidlna}:${M_GROUP:-minidlna} /run/minidlna
+
+	params="$params -P /run/minidlna/minidlna.pid"
+
+	if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then
+		params="$params -R"
+	fi
+
+	#set the config file and check if it exists
+	if [ -z "${CONFIG}" ]; then
+		if [ ! -f "/etc/minidlna.conf" ]; then
+			ewarn "You did not set the config file correctly"
+			stop=1
+		fi
+		params="$params -f /etc/minidlna.conf"
+	else
+		if [ ! -f "${CONFIG}" ]; then
+			ewarn "The specified config file does not exist"
+			stop=1
+		fi
+		params="$params -f ${CONFIG}"
+	fi
+
+
+	if [ $stop -eq 1 ]; then
+		eend 1
+	else
+		start-stop-daemon --start \
+			--user ${M_USER:-minidlna} --group ${M_GROUP:-minidlna} \
+			--exec /usr/sbin/minidlnad -- ${params}
+		eend $?
+	fi
+}
+
+stop() {
+	ebegin "Stopping MiniDLNA"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/minidlnad
+	eend $?
+}
diff --git a/net-misc/minidlna/files/minidlna-1.1.0-r3.service b/net-misc/minidlna/files/minidlna-1.1.0-r3.service
new file mode 100644
index 000000000000..9102c4905272
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.1.0-r3.service
@@ -0,0 +1,11 @@
+[Unit]

+Description=MiniDLNA is a DLNA/UPnP-AV server software

+After=syslog.target local-fs.target network.target

+

+[Service]

+User=minidlna

+Group=minidlna

+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf -P /run/minidlna/minidlna.pid -S

+

+[Install]

+WantedBy=multi-user.target

diff --git a/net-misc/minidlna/minidlna-1.1.0-r3.ebuild b/net-misc/minidlna/minidlna-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..11d28a759458
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.1.0-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.1.0-r3.ebuild,v 1.1 2013/09/05 20:25:35 xmw Exp $
+
+EAPI=4
+
+inherit eutils systemd toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="http://minidlna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="netgear readynas"
+
+RDEPEND="dev-db/sqlite
+	media-libs/flac
+	media-libs/libexif
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/ffmpeg
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	local my_is_new="yes"
+	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
+		# created by above enewuser command w/ wrong group and permissions
+		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
+		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
+		# if user already exists, but /var/lib/minidlna is missing
+		# rely on ${D}/var/lib/minidlna created in src_install
+	fi
+}
+
+src_prepare() {
+	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+		-e "/db_dir/s:/var/cache/:/var/lib/:" \
+		-i ${PN}.conf || die
+
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--with-db-path=/var/lib/${PN} \
+		--with-log-path=/var/log/${PN} \
+		--enable-tivo \
+		$(use_enable netgear) \
+		$(use_enable readynas)
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins ${PN}.conf
+
+	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+	newinitd "${FILESDIR}"/${PF}.initd ${PN}
+	systemd_newunit "${FILESDIR}"/${PF}.service ${PN}.service
+	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
+	systemd_dotmpfilesd "${T}"/${PN}.conf
+
+	dodir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+
+	dodoc AUTHORS NEWS README TODO
+	doman ${PN}d.8 ${PN}.conf.5
+}
+
+pkg_postinst() {
+	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
+	elog "cache is moved to /var/lib/minidlna."
+	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
+}