Removed old, new snapshot, removed die calls from enewuser (bug 237292) and removed --no-create-db from the init script (bug 241840)

(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc6 x86_64)

7 files changed, 21 insertions, 149 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index f36024e373c2..1da0c5d63925 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.124 2008/07/22 01:32:50 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.125 2008/10/15 00:01:01 angelos Exp $
+
+*mpd-0.14.0_pre20081015 (14 Oct 2008)
+
+  14 Oct 2008; Christoph Mende <angelos@gentoo.org> files/mpd.rc,
+  mpd-0.13.0.ebuild, mpd-0.13.1.ebuild, mpd-0.13.2.ebuild,
+  -mpd-0.14.0_pre20080204.ebuild, -mpd-0.14.0_pre20080630.ebuild,
+  +mpd-0.14.0_pre20081015.ebuild:
+  Removed old, new snapshot, removed die calls from enewuser (bug 237292)
+  and removed --no-create-db from the init script (bug 241840)
 
   22 Jul 2008; Jeremy Olexa <darkside@gentoo.org> Manifest:
   re-manifest distfile for mpd-0.14.0_pre20080204 with Chainsaw's permission
diff --git a/media-sound/mpd/files/mpd.rc b/media-sound/mpd/files/mpd.rc
index 9350972fcff3..1f0ba260f1fb 100755
--- a/media-sound/mpd/files/mpd.rc
+++ b/media-sound/mpd/files/mpd.rc
@@ -1,7 +1,7 @@
 #!/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.rc,v 1.3 2008/04/11 21:31:05 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd.rc,v 1.4 2008/10/15 00:01:01 angelos Exp $
 
 depend() {
 	need localmount
@@ -21,7 +21,7 @@ start() {
 	checkconfig || return 1
 
 	ebegin "Starting Music Player Daemon" 
-	/usr/bin/mpd --no-create-db /etc/mpd.conf
+	/usr/bin/mpd /etc/mpd.conf
 	eend $?
 }
 
diff --git a/media-sound/mpd/mpd-0.13.0.ebuild b/media-sound/mpd/mpd-0.13.0.ebuild
index d1c5cb291eab..b0e21c7c1844 100644
--- a/media-sound/mpd/mpd-0.13.0.ebuild
+++ b/media-sound/mpd/mpd-0.13.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.0.ebuild,v 1.10 2007/10/08 23:49:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.0.ebuild,v 1.11 2008/10/15 00:01:01 angelos Exp $
 
 inherit eutils
 
@@ -39,7 +39,7 @@ pkg_setup() {
 		die "Missing libOggFLAC library."
 	fi
 
-	enewuser mpd "" "" "/var/lib/mpd" audio || die "problem adding user mpd"
+	enewuser mpd "" "" "/var/lib/mpd" audio
 }
 
 src_unpack() {
diff --git a/media-sound/mpd/mpd-0.13.1.ebuild b/media-sound/mpd/mpd-0.13.1.ebuild
index 1c4a8477538c..752bbd2cb4da 100644
--- a/media-sound/mpd/mpd-0.13.1.ebuild
+++ b/media-sound/mpd/mpd-0.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.1.ebuild,v 1.7 2008/02/07 12:27:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.1.ebuild,v 1.8 2008/10/15 00:01:01 angelos Exp $
 
 inherit eutils
 
@@ -39,7 +39,7 @@ pkg_setup() {
 		die "Missing libOggFLAC library."
 	fi
 
-	enewuser mpd "" "" "/var/lib/mpd" audio || die "problem adding user mpd"
+	enewuser mpd "" "" "/var/lib/mpd" audio
 }
 
 src_unpack() {
diff --git a/media-sound/mpd/mpd-0.13.2.ebuild b/media-sound/mpd/mpd-0.13.2.ebuild
index 02cd1f84b3b1..bf3cb4c4a076 100644
--- a/media-sound/mpd/mpd-0.13.2.ebuild
+++ b/media-sound/mpd/mpd-0.13.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.2.ebuild,v 1.1 2008/06/30 14:46:38 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.13.2.ebuild,v 1.2 2008/10/15 00:01:01 angelos Exp $
 
 inherit eutils
 
@@ -39,7 +39,7 @@ pkg_setup() {
 		die "Missing libOggFLAC library."
 	fi
 
-	enewuser mpd "" "" "/var/lib/mpd" audio || die "problem adding user mpd"
+	enewuser mpd "" "" "/var/lib/mpd" audio
 }
 
 src_unpack() {
diff --git a/media-sound/mpd/mpd-0.14.0_pre20080630.ebuild b/media-sound/mpd/mpd-0.14.0_pre20080630.ebuild
deleted file mode 100644
index 709072245f4d..000000000000
--- a/media-sound/mpd/mpd-0.14.0_pre20080630.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.0_pre20080630.ebuild,v 1.1 2008/06/30 14:46:38 angelos Exp $
-
-inherit eutils
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="aac alsa ao audiofile avahi flac icecast iconv ipv6 jack libsamplerate mp3 mikmod musepack ogg oss pulseaudio unicode vorbis wavpack"
-
-DEPEND="!sys-cluster/mpich2
-	aac? ( >=media-libs/faad2-2.0_rc2 )
-	alsa? ( media-sound/alsa-utils )
-	ao? ( >=media-libs/libao-0.8.4 )
-	audiofile? ( media-libs/audiofile )
-	avahi? ( net-dns/avahi )
-	flac? ( media-libs/flac )
-	icecast? ( media-libs/libshout )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	mp3? ( media-libs/libmad
-	       media-libs/libid3tag )
-	mikmod? ( media-libs/libmikmod )
-	musepack? ( media-libs/libmpcdec )
-	ogg? ( media-libs/libogg )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )"
-
-pkg_setup() {
-	if use ogg && use flac && ! built_with_use media-libs/flac ogg; then
-		eerror "To be able to play OggFlac files you need to build"
-		eerror "media-libs/flac with +ogg, to build libOggFLAC."
-		die "Missing libOggFLAC library."
-	fi
-
-	enewuser mpd "" "" "/var/lib/mpd" audio || die "problem adding user mpd"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/mpdconf.patch || die "epatch for config file failed"
-}
-
-src_compile() {
-	local myconf
-
-	myconf=""
-
-	if use avahi; then
-		myconf="${myconf} --with-zeroconf=avahi"
-	else
-		myconf="${myconf} --with-zeroconf=no"
-	fi
-
-	if use ogg && use flac; then
-		myconf="${myconf} --enable-oggflac --enable-libOggFLACtest"
-	else
-		myconf="${myconf} --disable-oggflac --disable-libOggFLACtest"
-	fi
-
-	econf \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa alsatest) \
-		$(use_enable ao) \
-		$(use_enable ao aotest) \
-		$(use_enable audiofile) \
-		$(use_enable audiofile audiofiletest) \
-		$(use_enable flac) \
-		$(use_enable flac libFLACtest) \
-		$(use_enable icecast shout) \
-		$(use_enable iconv) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable libsamplerate lsr) \
-		$(use_enable mp3) \
-		$(use_enable mp3 id3) \
-		$(use_enable mikmod mod) \
-		$(use_enable mikmod libmikmodtest) \
-		$(use_enable musepack mpc) \
-		$(use_enable oss) \
-		$(use_enable ogg oggtest) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable vorbis oggvorbis) \
-		$(use_enable vorbis vorbistest) \
-		$(use_enable wavpack) \
-		${myconf} || die "could not configure"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /var/run/mpd
-	fowners mpd:audio /var/run/mpd
-	fperms 750 /var/run/mpd
-	keepdir /var/run/mpd
-
-	emake install DESTDIR="${D}" || die
-	rm -rf "${D}"/usr/share/doc/mpd/
-	dodoc AUTHORS ChangeLog INSTALL README TODO UPGRADING
-	dodoc doc/COMMANDS doc/mpdconf.example
-
-	insinto /etc
-	newins doc/mpdconf.example mpd.conf
-
-	newinitd "${FILESDIR}"/mpd.rc mpd
-
-	if use unicode; then
-		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
-	fi
-	diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-	dodir /var/log/mpd
-	keepdir /var/log/mpd
-
-	use alsa && \
-		dosed 's:need :need alsasound :' /etc/init.d/mpd
-}
-
-pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd initscript, please make"
-	elog "sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
-
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.14.0_pre20080204.ebuild b/media-sound/mpd/mpd-0.14.0_pre20081015.ebuild
index 0535c8b4f2de..2945405aa522 100644
--- a/media-sound/mpd/mpd-0.14.0_pre20080204.ebuild
+++ b/media-sound/mpd/mpd-0.14.0_pre20081015.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.0_pre20080204.ebuild,v 1.2 2008/05/13 23:43:50 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.0_pre20081015.ebuild,v 1.1 2008/10/15 00:01:01 angelos Exp $
 
 inherit eutils
 
@@ -40,7 +40,7 @@ pkg_setup() {
 		die "Missing libOggFLAC library."
 	fi
 
-	enewuser mpd "" "" "/var/lib/mpd" audio || die "problem adding user mpd"
+	enewuser mpd "" "" "/var/lib/mpd" audio
 }
 
 src_unpack() {