Changed home directory of mpd user and all related config settings to /var/lib/mpd. Closes bug #83644.

Package-Manager: portage-2.0.53_rc7

4 files changed, 126 insertions, 5 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 70ec126ed3e3..0ea651148826 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.62 2005/10/24 13:41:23 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.63 2005/11/01 10:48:50 ticho Exp $
+
+*mpd-0.11.5-r2 (01 Nov 2005)
+
+  01 Nov 2005; Andrej Kacian <ticho@gentoo.org> +mpd-0.11.5-r2.ebuild:
+  Changed home directory of mpd user and all related config settings to
+  /var/lib/mpd. Closes bug #83644.
 
   24 Oct 2005; Andrej Kacian <ticho@gentoo.org> files/mpd.rc6:
   Use nfsmount in initscript depend(). Closes bug #110065, reported by Daniel
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index a74fdaced36b..72ee2ec5b7cd 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 818422939618bf07a99b267e3e4e1c79 ChangeLog 9884
+MD5 75cfbff39f9d16eaefad863150504743 ChangeLog 10093
 MD5 aaa9ab8f094750f87da906c9b0e28a5c files/digest-mpd-0.11.5 63
 MD5 aaa9ab8f094750f87da906c9b0e28a5c files/digest-mpd-0.11.5-r1 63
+MD5 aaa9ab8f094750f87da906c9b0e28a5c files/digest-mpd-0.11.5-r2 63
 MD5 18eeb3875218f95e4351130c755f38e6 files/mpd.rc6 898
 MD5 9fd12e4e26817b28026335eff94d2fde metadata.xml 252
 MD5 93b346619a73f75c37dfc54a54966374 mpd-0.11.5-r1.ebuild 3137
+MD5 f51261e273dd8b98c961327195cd1096 mpd-0.11.5-r2.ebuild 3372
 MD5 d785bc485b235bd032eca3d7a23a938a mpd-0.11.5.ebuild 2948
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDXOScQlM6RnzZP+IRAiu8AJ0RY+rphftEh3UtiHhOkqOm/qu+mgCfUHtW
-u51oP50P8v9iUvm5WwExA18=
-=g/Gc
+iD8DBQFDZ0ghQlM6RnzZP+IRAklHAJ9Dpymp2xpz0Yud1w67Z5/hXupAsQCfX5rH
+cD5venJp3pqTk2tgS65crbY=
+=nxQ9
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/files/digest-mpd-0.11.5-r2 b/media-sound/mpd/files/digest-mpd-0.11.5-r2
new file mode 100644
index 000000000000..51d37f4d0442
--- /dev/null
+++ b/media-sound/mpd/files/digest-mpd-0.11.5-r2
@@ -0,0 +1 @@
+MD5 1a9a1a9d31f00a43838b3752024f7ebe mpd-0.11.5.tar.gz 1127523
diff --git a/media-sound/mpd/mpd-0.11.5-r2.ebuild b/media-sound/mpd/mpd-0.11.5-r2.ebuild
new file mode 100644
index 000000000000..09f6439e4f46
--- /dev/null
+++ b/media-sound/mpd/mpd-0.11.5-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.5-r2.ebuild,v 1.1 2005/11/01 10:48:50 ticho Exp $
+
+inherit eutils
+
+DESCRIPTION="Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="aac alsa audiofile flac ipv6 mad mikmod unicode vorbis"
+
+DEPEND=">=media-libs/libao-0.8.4
+	!media-sound/mpd-svn
+	sys-libs/zlib
+	aac? ( >=media-libs/faad2-2.0_rc2 )
+	alsa? ( media-libs/alsa-lib )
+	audiofile? ( media-libs/audiofile )
+	flac? ( >=media-libs/flac-1.1.0 )
+	mad? ( media-libs/libmad
+	       media-libs/libid3tag )
+	mikmod? ( media-libs/libmikmod )
+	vorbis? ( media-libs/libvorbis )"
+
+upgrade_warning() {
+	echo
+	ewarn "This package now correctly uses 'vorbis' USE flag, instead of 'ogg'."
+	ewarn "See http://bugs.gentoo.org/show_bug.cgi?id=101877 for details."
+	echo
+	ewarn "Home directory of user mpd, as well as default locations in mpd.conf have"
+	ewarn "been changed to /var/lib/mpd, please bear that in mind while updating."
+	ewarn "your mpd.conf file."
+	echo
+}
+
+pkg_setup() {
+	upgrade_warning
+	epause 7
+	enewuser mpd '' '' "/var/lib/mpd" audio || die "problem adding user mpd"
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
+
+src_compile() {
+	econf \
+		$(use_enable aac) \
+		$(use_enable audiofile) \
+		$(use_enable audiofile audiofiletest) \
+		$(use_enable flac libFLACtest) \
+		$(use_enable flac) \
+		$(use_enable ipv6) \
+		$(use_enable !mad mpd-mad) \
+		$(use_enable !mad id3tag) \
+		$(use_enable mikmod libmikmodtest) \
+		$(use_enable mikmod mod) \
+		$(use_enable vorbis ogg) \
+		$(use_enable vorbis oggtest) \
+		$(use_enable vorbis vorbistest) \
+		|| die "could not configure"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "make install failed"
+
+	rm -rf ${D}/usr/share/doc/mpd/
+	dodoc ChangeLog INSTALL README TODO UPGRADING
+	dodoc doc/COMMANDS doc/mpdconf.example
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/mpd.rc6 mpd
+
+	if use unicode; then
+		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' /etc/mpd.conf
+	fi
+	dosed 's:^#user.*$:user "mpd":' /etc/mpd.conf
+	dosed 's:^#bind.*$:bind_to_address "localhost":' /etc/mpd.conf
+	dosed 's:^port.*$:port "6600":' /etc/mpd.conf
+	dosed 's:^music_directory.*$:music_directory "/var/lib/mpd/music":' /etc/mpd.conf
+	dosed 's:^playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' /etc/mpd.conf
+	dosed 's:^log_file.*$:log_file "/var/log/mpd.log":' /etc/mpd.conf
+	dosed 's:^error_file.*$:error_file "/var/log/mpd.error.log":' /etc/mpd.conf
+	dosed 's:^db_file.*:db_file "/var/lib/mpd/database":' /etc/mpd.conf
+	dosed 's:^#state_file.*$:state_file "/var/lib/mpd/state":' /etc/mpd.conf
+
+	diropts -m0755 -o mpd -g audio
+	dodir /usr/share/mpd/music
+	keepdir /usr/share/mpd/music
+	dodir /usr/share/mpd/playlists
+	keepdir /usr/share/mpd/playlists
+	dodir /usr/share/mpd/
+	insinto /var/log
+	touch ${T}/blah
+	insopts -m0640 -o mpd -g audio
+	newins ${T}/blah mpd.log
+	newins ${T}/blah mpd.error.log
+
+	use alsa && \
+		dosed 's:need :need alsasound :' /etc/init.d/mpd
+}
+
+pkg_postinst() {
+	upgrade_warning
+}