Removed last 0.11 ebuild from the tree. Added "before xdm" to initscript depends, as suggested by Tom Wesley <tom at tomaw.net>.

Package-Manager: portage-2.1.2-r6

3 files changed, 2 insertions, 41 deletions

diff --git a/media-sound/mpd/files/digest-mpd-0.11.5-r2 b/media-sound/mpd/files/digest-mpd-0.11.5-r2
deleted file mode 100644
index e0008866aec2..000000000000
--- a/media-sound/mpd/files/digest-mpd-0.11.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1a9a1a9d31f00a43838b3752024f7ebe mpd-0.11.5.tar.gz 1127523
-RMD160 4a7dd3473110aa1f860fbd7a760da7fdfe2a9ebf mpd-0.11.5.tar.gz 1127523
-SHA256 30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd mpd-0.11.5.tar.gz 1127523
diff --git a/media-sound/mpd/files/mpd-0.12.rc6 b/media-sound/mpd/files/mpd-0.12.rc6
index cb03d0f10c02..d94b3b19c3e9 100755
--- a/media-sound/mpd/files/mpd-0.12.rc6
+++ b/media-sound/mpd/files/mpd-0.12.rc6
@@ -1,11 +1,12 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd-0.12.rc6,v 1.3 2006/10/03 19:26:17 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd-0.12.rc6,v 1.4 2007/02/18 03:35:15 ticho Exp $
 
 depend() {
 	need localmount
 	use netmount nfsmount esound pulseaudio
+	before xdm
 } 
 
 checkconfig() {
diff --git a/media-sound/mpd/files/mpd.rc6 b/media-sound/mpd/files/mpd.rc6
deleted file mode 100644
index 01b366f53a94..000000000000
--- a/media-sound/mpd/files/mpd.rc6
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd.rc6,v 1.16 2005/10/24 13:41:23 ticho Exp $
-
-depend() {
-	need localmount
-	use netmount nfsmount
-} 
-
-checkconfig() {
-	if [ -f /etc/conf.d/mpd ]; then
-		eerror "Please remove the /etc/conf.d/mpd file as it is no longer used."
-		eerror "You may configure your mpd settings in /etc/mpd.conf"
-	fi
-
-	if ! [ -f /etc/mpd.conf ]; then
-		eerror "Configuration file /etc/mpd.conf does not exist."
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting Music Player Daemon" 
-	start-stop-daemon --start --quiet --exec /usr/bin/mpd -- --no-create-db /etc/mpd.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Music Player Daemon"
-	start-stop-daemon --stop --quiet --exec /usr/bin/mpd --oknodo
-	eend $? 
-}