[gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/

[Michał Górny]

commit:     bc7c4426464a1a62e8aadea4e52446034803a6e5
Author:     Jakub Jirutka <jakub <AT> jirutka <DOT> cz>
AuthorDate: Sun Sep 27 17:01:56 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 17:01:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc7c4426

net-misc/minidlna: Fix typo in OpenRC runscripts

 net-misc/minidlna/files/minidlna-1.0.23-r1.initd | 2 +-
 net-misc/minidlna/files/minidlna-1.1.0.initd     | 2 +-
 net-misc/minidlna/files/minidlna-1.1.2.initd     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/minidlna/files/minidlna-1.0.23-r1.initd b/net-misc/minidlna/files/minidlna-1.0.23-r1.initd
index 1ba3e1b..b014edb 100644
--- a/net-misc/minidlna/files/minidlna-1.0.23-r1.initd
+++ b/net-misc/minidlna/files/minidlna-1.0.23-r1.initd
@@ -16,7 +16,7 @@ start() {
 
 	params="$params -P /var/run/minidlna/minidlna.pid"
 
-	if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then
+	if [[ "${RESCAN}" = "true" || "${RESCAN}" = yes ]]; then
 		params="$params -R"
 	fi
 

diff --git a/net-misc/minidlna/files/minidlna-1.1.0.initd b/net-misc/minidlna/files/minidlna-1.1.0.initd
index 9ccffe7..856606e 100644
--- a/net-misc/minidlna/files/minidlna-1.1.0.initd
+++ b/net-misc/minidlna/files/minidlna-1.1.0.initd
@@ -16,7 +16,7 @@ start() {
 
 	params="$params -P /var/run/minidlna/minidlna.pid"
 
-	if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then
+	if [[ "${RESCAN}" = "true" || "${RESCAN}" = yes ]]; then
 		params="$params -R"
 	fi
 

diff --git a/net-misc/minidlna/files/minidlna-1.1.2.initd b/net-misc/minidlna/files/minidlna-1.1.2.initd
index c7f3026..7b5366e 100644
--- a/net-misc/minidlna/files/minidlna-1.1.2.initd
+++ b/net-misc/minidlna/files/minidlna-1.1.2.initd
@@ -16,7 +16,7 @@ start() {
 
 	params="$params -P /run/minidlna/minidlna.pid"
 
-	if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then
+	if [[ "${RESCAN}" = "true" || "${RESCAN}" = yes ]]; then
 		params="$params -R"
 	fi
 

[gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/

[Michael Weber]

commit:     bbae599699063133cdc9764b93270b11e3af9108
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 17:03:57 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 17:04:54 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbae5996

net-misc/minidlna: cleanup FILESDIR

Package-Manager: portage-2.2.21

 .../minidlna/files/minidlna-1.0.18-Makefile.patch  | 11 -----
 net-misc/minidlna/files/minidlna-1.0.23-r1.initd   | 53 ----------------------
 net-misc/minidlna/files/minidlna-1.0.23.confd      | 14 ------
 net-misc/minidlna/files/minidlna-1.1.0.initd       | 53 ----------------------
 net-misc/minidlna/files/minidlna-1.1.0.service     | 13 ------
 5 files changed, 144 deletions(-)

diff --git a/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch b/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch
deleted file mode 100644
index 2ce5e64..0000000
--- a/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -12,7 +12,7 @@
- #
- #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
- #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
--CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
-+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
-	 -I/usr/include/ffmpeg \
- 	 -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
-	 -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat

diff --git a/net-misc/minidlna/files/minidlna-1.0.23-r1.initd b/net-misc/minidlna/files/minidlna-1.0.23-r1.initd
deleted file mode 100644
index b014edb..0000000
--- a/net-misc/minidlna/files/minidlna-1.0.23-r1.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting MiniDLNA"
-	local params=""
-	local stop=0
-
-	checkpath -q -d -m 0755 -o ${M_USER:-nobody}:${M_GROUP:-nogroup} /var/run/minidlna
-
-	params="$params -P /var/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:-nobody} --group ${M_GROUP:-nogroup} \
-			--exec /usr/sbin/minidlna -- ${params}
-		eend $?
-	fi
-}
-
-stop() {
-	ebegin "Stopping MiniDLNA"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/minidlna
-	eend $?
-}

diff --git a/net-misc/minidlna/files/minidlna-1.0.23.confd b/net-misc/minidlna/files/minidlna-1.0.23.confd
deleted file mode 100644
index c98c7ab..0000000
--- a/net-misc/minidlna/files/minidlna-1.0.23.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# /etc/conf.d/minidlna
-
-# Should minidlna rescan the entire collection on startup?
-# Warning: This may take a long time!
-RESCAN="false"
-
-# The location of the config file
-#CONFIG="/etc/minidlna.conf"
-
-# Specify the user/group minidlna should run as
-#M_USER="nobody"
-#M_GROUP="nogroup"
-
-# vim: ft=gentoo-conf-d

diff --git a/net-misc/minidlna/files/minidlna-1.1.0.initd b/net-misc/minidlna/files/minidlna-1.1.0.initd
deleted file mode 100644
index 856606e..0000000
--- a/net-misc/minidlna/files/minidlna-1.1.0.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting MiniDLNA"
-	local params=""
-	local stop=0
-
-	checkpath -q -d -m 0755 -o ${M_USER:-minidlna}:${M_GROUP:-minidlna} /var/run/minidlna
-
-	params="$params -P /var/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.service b/net-misc/minidlna/files/minidlna-1.1.0.service
deleted file mode 100644
index 908b1d5..0000000
--- a/net-misc/minidlna/files/minidlna-1.1.0.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=MiniDLNA is a DLNA/UPnP-AV server software
-After=syslog.target local-fs.target network.target
-
-[Service]
-User=minidlna
-Group=minidlna
-Type=forking
-PIDFile=/var/run/minidlna/minidlna.pid
-ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf -P /var/run/minidlna/minidlna.pid
-
-[Install]
-WantedBy=multi-user.target