Gentoo Archives: gentoo-commits

From: Michael Weber <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/files/
Date: Sat, 03 Oct 2015 17:05:18
Message-Id: 1443891894.bbae599699063133cdc9764b93270b11e3af9108.xmw@gentoo
1 commit: bbae599699063133cdc9764b93270b11e3af9108
2 Author: Michael Weber <xmw <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 3 17:03:57 2015 +0000
4 Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 3 17:04:54 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbae5996
7
8 net-misc/minidlna: cleanup FILESDIR
9
10 Package-Manager: portage-2.2.21
11
12 .../minidlna/files/minidlna-1.0.18-Makefile.patch | 11 -----
13 net-misc/minidlna/files/minidlna-1.0.23-r1.initd | 53 ----------------------
14 net-misc/minidlna/files/minidlna-1.0.23.confd | 14 ------
15 net-misc/minidlna/files/minidlna-1.1.0.initd | 53 ----------------------
16 net-misc/minidlna/files/minidlna-1.1.0.service | 13 ------
17 5 files changed, 144 deletions(-)
18
19 diff --git a/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch b/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch
20 deleted file mode 100644
21 index 2ce5e64..0000000
22 --- a/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch
23 +++ /dev/null
24 @@ -1,11 +0,0 @@
25 ---- Makefile
26 -+++ Makefile
27 -@@ -12,7 +12,7 @@
28 - #
29 - #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
30 - #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
31 --CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
32 -+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
33 - -I/usr/include/ffmpeg \
34 - -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
35 - -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
36
37 diff --git a/net-misc/minidlna/files/minidlna-1.0.23-r1.initd b/net-misc/minidlna/files/minidlna-1.0.23-r1.initd
38 deleted file mode 100644
39 index b014edb..0000000
40 --- a/net-misc/minidlna/files/minidlna-1.0.23-r1.initd
41 +++ /dev/null
42 @@ -1,53 +0,0 @@
43 -#!/sbin/runscript
44 -# Copyright 1999-2012 Gentoo Foundation
45 -# Distributed under the terms of the GNU General Public License v2
46 -# $Id$
47 -
48 -depend() {
49 - need net
50 -}
51 -
52 -start() {
53 - ebegin "Starting MiniDLNA"
54 - local params=""
55 - local stop=0
56 -
57 - checkpath -q -d -m 0755 -o ${M_USER:-nobody}:${M_GROUP:-nogroup} /var/run/minidlna
58 -
59 - params="$params -P /var/run/minidlna/minidlna.pid"
60 -
61 - if [[ "${RESCAN}" = "true" || "${RESCAN}" = yes ]]; then
62 - params="$params -R"
63 - fi
64 -
65 - #set the config file and check if it exists
66 - if [ -z "${CONFIG}" ]; then
67 - if [ ! -f "/etc/minidlna.conf" ]; then
68 - ewarn "You did not set the config file correctly"
69 - stop=1
70 - fi
71 - params="$params -f /etc/minidlna.conf"
72 - else
73 - if [ ! -f "${CONFIG}" ]; then
74 - ewarn "The specified config file does not exist"
75 - stop=1
76 - fi
77 - params="$params -f ${CONFIG}"
78 - fi
79 -
80 -
81 - if [ $stop -eq 1 ]; then
82 - eend 1
83 - else
84 - start-stop-daemon --start \
85 - --user ${M_USER:-nobody} --group ${M_GROUP:-nogroup} \
86 - --exec /usr/sbin/minidlna -- ${params}
87 - eend $?
88 - fi
89 -}
90 -
91 -stop() {
92 - ebegin "Stopping MiniDLNA"
93 - start-stop-daemon --stop --quiet --exec /usr/sbin/minidlna
94 - eend $?
95 -}
96
97 diff --git a/net-misc/minidlna/files/minidlna-1.0.23.confd b/net-misc/minidlna/files/minidlna-1.0.23.confd
98 deleted file mode 100644
99 index c98c7ab..0000000
100 --- a/net-misc/minidlna/files/minidlna-1.0.23.confd
101 +++ /dev/null
102 @@ -1,14 +0,0 @@
103 -# /etc/conf.d/minidlna
104 -
105 -# Should minidlna rescan the entire collection on startup?
106 -# Warning: This may take a long time!
107 -RESCAN="false"
108 -
109 -# The location of the config file
110 -#CONFIG="/etc/minidlna.conf"
111 -
112 -# Specify the user/group minidlna should run as
113 -#M_USER="nobody"
114 -#M_GROUP="nogroup"
115 -
116 -# vim: ft=gentoo-conf-d
117
118 diff --git a/net-misc/minidlna/files/minidlna-1.1.0.initd b/net-misc/minidlna/files/minidlna-1.1.0.initd
119 deleted file mode 100644
120 index 856606e..0000000
121 --- a/net-misc/minidlna/files/minidlna-1.1.0.initd
122 +++ /dev/null
123 @@ -1,53 +0,0 @@
124 -#!/sbin/runscript
125 -# Copyright 1999-2013 Gentoo Foundation
126 -# Distributed under the terms of the GNU General Public License v2
127 -# $Id$
128 -
129 -depend() {
130 - need net
131 -}
132 -
133 -start() {
134 - ebegin "Starting MiniDLNA"
135 - local params=""
136 - local stop=0
137 -
138 - checkpath -q -d -m 0755 -o ${M_USER:-minidlna}:${M_GROUP:-minidlna} /var/run/minidlna
139 -
140 - params="$params -P /var/run/minidlna/minidlna.pid"
141 -
142 - if [[ "${RESCAN}" = "true" || "${RESCAN}" = yes ]]; then
143 - params="$params -R"
144 - fi
145 -
146 - #set the config file and check if it exists
147 - if [ -z "${CONFIG}" ]; then
148 - if [ ! -f "/etc/minidlna.conf" ]; then
149 - ewarn "You did not set the config file correctly"
150 - stop=1
151 - fi
152 - params="$params -f /etc/minidlna.conf"
153 - else
154 - if [ ! -f "${CONFIG}" ]; then
155 - ewarn "The specified config file does not exist"
156 - stop=1
157 - fi
158 - params="$params -f ${CONFIG}"
159 - fi
160 -
161 -
162 - if [ $stop -eq 1 ]; then
163 - eend 1
164 - else
165 - start-stop-daemon --start \
166 - --user ${M_USER:-minidlna} --group ${M_GROUP:-minidlna} \
167 - --exec /usr/sbin/minidlnad -- ${params}
168 - eend $?
169 - fi
170 -}
171 -
172 -stop() {
173 - ebegin "Stopping MiniDLNA"
174 - start-stop-daemon --stop --quiet --exec /usr/sbin/minidlnad
175 - eend $?
176 -}
177
178 diff --git a/net-misc/minidlna/files/minidlna-1.1.0.service b/net-misc/minidlna/files/minidlna-1.1.0.service
179 deleted file mode 100644
180 index 908b1d5..0000000
181 --- a/net-misc/minidlna/files/minidlna-1.1.0.service
182 +++ /dev/null
183 @@ -1,13 +0,0 @@
184 -[Unit]
185 -Description=MiniDLNA is a DLNA/UPnP-AV server software
186 -After=syslog.target local-fs.target network.target
187 -
188 -[Service]
189 -User=minidlna
190 -Group=minidlna
191 -Type=forking
192 -PIDFile=/var/run/minidlna/minidlna.pid
193 -ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf -P /var/run/minidlna/minidlna.pid
194 -
195 -[Install]
196 -WantedBy=multi-user.target