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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 64 insertions, 6 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/Manifest b/net-misc/mediatomb/Manifest
index a816fdce2436..84d573689d48 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -2,12 +2,14 @@ AUX mediatomb-0.11.0+curl-7.18.patch 524 RMD160 beb5dd3f23437af630182ef1b4228622
 AUX mediatomb-0.11.0+glibc-2.10.patch 733 RMD160 277863d375f03b5aed4e7479594daf6e221b9f91 SHA1 fa8f13b3cc5181efacac58dfcc6d097e287f6b82 SHA256 be29e7344db08bd07a449c0bb2a30e9aa4c59bc97275e7534aaf7a4a3d218211
 AUX mediatomb-0.11.0-newffmpeg.patch 2410 RMD160 112b1683bc86325e5584b9e7089f46d4a218d8fc SHA1 4af90200a3cf0a07ce47ea42b6b398002f3d99c1 SHA256 7566cd01d9af848bdfd75949bb586b9a83bb6b9501fe9dba921e93960e2f2fdb
 AUX mediatomb-0.11.0.config 2739 RMD160 0f6d8108052d19940e7f5d2288c9027aa2976dc6 SHA1 2c8bfdf7d370ca7782a930d8ef70a242a2942d37 SHA256 0c02298dd2078fed683dad661d933c1f7e43086c77999bf651065ec40ea762c4
+AUX mediatomb-0.12.0.confd 732 RMD160 b426cecb920cda23401e7551fd66adc4a468a728 SHA1 6a3cfaeb4a6f0cd3270965e6273ed00bfd38d487 SHA256 3aea898aed5f3f0d7dce14fbdeec115d6e5c76447590132692fd8d4db39bb421
 AUX mediatomb-0.12.0.config 6180 RMD160 ee51ad90cd9c4107376b80af19dfe076f06df8e7 SHA1 41376b8a161d8523846c5adb5375af5bc0c1a0d1 SHA256 cb43e92639e5e53908567c050c9a2fc0e5c349fd11a149414590c2c6a402b4d2
+AUX mediatomb-0.12.0.initd 541 RMD160 cb4ccfebbe98d38a9e4fdedc6f0fa9aa7ab18453 SHA1 e3c8ed51e118cc72a164b908fe4d629a1ebbf14b SHA256 8dfe99d619a3384b2fb9105051daae1fc6c88402364d4203b21344f766a6b696
 AUX mediatomb.confd 857 RMD160 66c19ff63accb09048250daa94b7fdea208616fa SHA1 3ab51654efbb89aa9a8beb5ca47170ba86fd1320 SHA256 9d8b7e044f9ac684b33ea2ac97ddcfb2c038cb5038d4149e11441d5e24d7d92d
 AUX mediatomb.initd 576 RMD160 e92a6f915eb6d1a0fff1e82a74004ed8a430d503 SHA1 d2c7f0e7e86d8e7add10566d1928b45a953ce39b SHA256 f9f53683b6a6ad11ee1aab2cb8c604cd6639872c1abe36bf5d7006ffbbd7ca14
 DIST mediatomb-0.11.0.tar.gz 1059429 RMD160 11c53d5757da3a689c025107331526c0486befc4 SHA1 1d7c86924686f9999a359ba96092aa36d30832a6 SHA256 25e0b3d761e41fc6793c780eb7f638719867cdc6d3429ec24f72d1e9556ac1d2
 DIST mediatomb-0.12.0.tar.gz 1149071 RMD160 5d46fa16d8614f853ec52212cd5df00a204c6e47 SHA1 50333464ce42e14488f9c63243ab0ab34e36c762 SHA256 3fc4d4aef09952e8a1814f2dbf6eefa66b4a01a6cc1c41dee9e0edd60faf51f7
 EBUILD mediatomb-0.11.0.ebuild 3457 RMD160 5dfc8ae48da2c9ceca5e8f4addc2704905d7d28b SHA1 5ea193a2843dbea38f465865ac767d1217ede322 SHA256 14954d9a5eace85755c4dfe857bb8484ecba9f31dc46e9aa73415739f6c480c0
-EBUILD mediatomb-0.12.0.ebuild 3262 RMD160 cfacda4f314f2e39c347ddc2ec74a1cc6ba953b3 SHA1 0925242997eaa29d7767b3edd4c6f794bdbd4e7c SHA256 7da970dba4354ae1be2e1e50aafef3583138dbaccd93238d27d4bfcdd9cbee7e
-MISC ChangeLog 2142 RMD160 3284ec52fc96059358dabb4e3b2b4beffb174add SHA1 7074826da6b023a4dceedf1090eb498636f08c66 SHA256 a2a864405ce74f0bb0d85190a4fc62826cfa2c78b316fc9c7b744bf858991343
+EBUILD mediatomb-0.12.0-r1.ebuild 3255 RMD160 e24551263e41e03f9e6f48f7814a912514e9b6dd SHA1 709fbbd27df389866dfc37fddc78cc21f8fa4f60 SHA256 5e55911d93ea6a77cbd5d2f3b29a0a5e8eaa74b559ad49a9dd09e9100f423048
+MISC ChangeLog 2424 RMD160 66e6a1318e142190080f4cb54ee0e053cfa6acfb SHA1 e0972a20521e21af5d91e86e5b53dd0cba6f7051 SHA256 9c5d8983ecf7afb05623094472bfaf77b8232dbf33e16d47ead99292cedbbd10
 MISC metadata.xml 918 RMD160 d18de020cdcde81043b741ec9559ec7fc876ab7a SHA1 960fe7688bca5979124b4af2f738d39374c0ff7e SHA256 5c0d8edf0926420938cdf081d7ccb049750747f53b183619575c402ec96334d0
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