minor revbump to grab new init/conf files from bug 264235 that I forgot

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 60 insertions, 4 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index 83b697064c63..ad180e888982 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.11 2010/03/29 22:32:23 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.12 2010/03/30 01:13:26 darkside Exp $
+
+*mediatomb-0.12.0-r1 (30 Mar 2010)
+
+  30 Mar 2010; Jeremy Olexa <darkside@gentoo.org> -mediatomb-0.12.0.ebuild,
+  +mediatomb-0.12.0-r1.ebuild, +files/mediatomb-0.12.0.confd,
+  +files/mediatomb-0.12.0.initd:
+  minor revbump to grab new init/conf files from bug 264235 that I forgot
 
   29 Mar 2010; Jeremy Olexa <darkside@gentoo.org> +mediatomb-0.12.0.ebuild,
   +files/mediatomb-0.12.0.config, metadata.xml:
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.0.confd b/net-misc/mediatomb/files/mediatomb-0.12.0.confd
new file mode 100644
index 000000000000..f531ec70dc82
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.0.confd
@@ -0,0 +1,27 @@
+# /etc/conf.d/mediatomb: config file for /etc/init.d/mediatomb
+
+# See the mediatomb(1) manpage for more info.
+
+# MediaTomb Web UI port.
+# NOTE: The minimum value allowed is 49152
+MEDIATOMB_PORT=49152
+
+# Run MediaTomb as this user.
+# NOTE: For security reasons do not run MediaTomb as root.
+MEDIATOMB_USER="mediatomb"
+
+# Run MediaTomb as this group.
+# NOTE: For security reasons do not run MediaTomb as root.
+MEDIATOMB_GROUP="mediatomb"
+
+# Path to MediaTomb config file.
+MEDIATOMB_CONFIG="/etc/mediatomb/config.xml"
+
+# Path to MediaTomb log file.
+MEDIATOMB_LOGFILE="/var/log/mediatomb.log"
+
+# Path to MediaTomb pid file.
+MEDIATOMB_PIDFILE="/var/run/mediatomb.pid"
+
+# Other options you want to pass to MediaTomb.
+MEDIATOMB_OPTIONS=""
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.0.initd b/net-misc/mediatomb/files/mediatomb-0.12.0.initd
new file mode 100644
index 000000000000..5f6112b3499b
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.0.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+
+depend() {
+	need net #MYSQL#
+}
+
+start() {
+	ebegin "Starting MediaTomb"
+	start-stop-daemon --start --quiet --exec /usr/bin/mediatomb \
+		--pidfile ${MEDIATOMB_PIDFILE} -- --daemon \
+		--pidfile ${MEDIATOMB_PIDFILE} --user ${MEDIATOMB_USER} \
+		--group ${MEDIATOMB_GROUP} --logfile ${MEDIATOMB_LOGFILE} \
+		--config ${MEDIATOMB_CONFIG} --port ${MEDIATOMB_PORT} \
+		${MEDIATOMB_OPTIONS}
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping MediaTomb"
+	start-stop-daemon --stop --retry 10 --quiet --pidfile ${MEDIATOMB_PIDFILE}
+	eend $?
+}
diff --git a/net-misc/mediatomb/mediatomb-0.12.0.ebuild b/net-misc/mediatomb/mediatomb-0.12.0-r1.ebuild
index 0bd22c6d1a83..f4ab9568c609 100644
--- a/net-misc/mediatomb/mediatomb-0.12.0.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.0.ebuild,v 1.1 2010/03/29 22:32:23 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.0-r1.ebuild,v 1.1 2010/03/30 01:13:26 darkside Exp $
 
 EAPI=2
 
@@ -81,9 +81,9 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS README TODO
 
 	sed -e "s:#MYSQL#:$(use mysql && has_version dev-db/mysql[-minimal] && echo "mysql"):" \
-		"${FILESDIR}/mediatomb.initd" > "${T}/mediatomb.initd" || die
+		"${FILESDIR}/${P}.initd" > "${T}/mediatomb.initd" || die
 	newinitd "${T}/mediatomb.initd" mediatomb || die
-	newconfd "${FILESDIR}/mediatomb.confd" mediatomb || die
+	newconfd "${FILESDIR}/${P}.confd" mediatomb || die
 
 	insinto /etc/mediatomb
 	newins "${FILESDIR}/${P}.config" config.xml || die