Version bump

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

3 files changed, 157 insertions, 5 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 9d904c49ef6f..b9f2d1e9ff73 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.213 2010/10/12 21:23:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.214 2010/11/07 17:21:32 hwoarang Exp $
+
+*mpd-0.15.14 (07 Nov 2010)
+
+  07 Nov 2010; Markos Chandras <hwoarang@gentoo.org> +mpd-0.15.14.ebuild:
+  Version bump
 
 *mpd-0.15.13 (12 Oct 2010)
 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 0ae56c2fec1e..9f4500d94a46 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -8,19 +8,21 @@ AUX mpd.rc 672 RMD160 278e4f59433656b930a9f35e59747681a2e4918d SHA1 06cf045b9d99
 DIST mpd-0.15.10.tar.bz2 390045 RMD160 853732cdba27e83235cd359cdd5a3caf30e64649 SHA1 ff77af4a9609162b1285abd58500435dc499f024 SHA256 fabb48214e27bfaa2bc29c2ad56b5835fc9572951106ae77bb481e892bfc423a
 DIST mpd-0.15.12.tar.bz2 391039 RMD160 00327a216268770e60ddb50b78d0863e534654c9 SHA1 a2b9e64ce9b413bb1451b2a9f58f01dc7cc58721 SHA256 0a9ff27d265b3ca2892bf56f2b01acffc657a81833e83dabbec9b7a4be80b3b3
 DIST mpd-0.15.13.tar.bz2 391234 RMD160 1792a565d90e218c949dae54f1c5c00f6a414848 SHA1 d47775ecb101a7b79334509cd4a4369738f66479 SHA256 0e3215eb15377c39f1fb40c1bad3e3ec30f1c42ed36ad695a7b7721738ef437d
+DIST mpd-0.15.14.tar.bz2 391978 RMD160 3ce9c7425f9fc8e4486e4bdc440364a76fdf1abf SHA1 b439fe9abcc2c6e17527606de3d9944b6eab9c03 SHA256 234d562b8fbbaf11f1c3bf545264e14c324019f5d085a7c8794ef11d83a0edd2
 DIST mpd-0.15.8.tar.bz2 390489 RMD160 8b98e16e84b19bf0174ffffb8a59c88e605523b4 SHA1 a6503a4fde45d19c550febd0a84e329bf83dfcfb SHA256 5de1bac0af52c6d2d2744a8c8c84bb1423de4eff2351790068173cf4f287aad7
 DIST mpd-0.15.9.tar.bz2 390141 RMD160 566440dbc16ac46f20d8d11bfe09ffe43423eb34 SHA1 9dbef302ef44372f2232c1df1af2f3a958ff601d SHA256 4a57a1a0dc71606d0db926b67d5b2c1ed2bfaf94baca7889d4b994a37bf367bb
 EBUILD mpd-0.15.10.ebuild 4856 RMD160 f29d15928d045d01e082bfd779a627e824ac150a SHA1 1919f9748f195d11a931de60d584bfcc82704248 SHA256 058c537587cce8d3248ed025ae13448065d349c34a24466f443a31b18e2d67b8
 EBUILD mpd-0.15.12-r2.ebuild 4662 RMD160 b029a3897719cc08a515b879427792951877943c SHA1 727c82cf181898cf5dd84c976db46cef20d56d00 SHA256 97c6a35bef3b53070088c061e6d4786e98ef1f53d80a17fabaae50db8a6728c1
 EBUILD mpd-0.15.13.ebuild 4660 RMD160 edc4234c4872473dcfe7e4b227cd97382e099833 SHA1 867adab1c52db9807b3dcd5dff02d0d97e6cd90d SHA256 3ba25d3896afa4c54b29320ad3b2ef4b83651f88af5754316a7ffaabf665674c
+EBUILD mpd-0.15.14.ebuild 4660 RMD160 f32d32311ab8cfcb93452b12580b9fca871f0e12 SHA1 567223758ae68bf3f32231ecf3eee4941107890f SHA256 eba453af75e0b7e0c542406d64c945ad79b498b408330b607d4972a45ddd2960
 EBUILD mpd-0.15.8.ebuild 4863 RMD160 9e8f822f4d14afad7236f3f4d71f699003e1ca33 SHA1 e015c81dd883a457bb761755d8d2ec50f224c336 SHA256 f6816267b72be8934f8cb156a1e287dad1d815b4373a1869c9bc865ee1d7b06e
 EBUILD mpd-0.15.9.ebuild 4855 RMD160 9da20eabc1e9701e3fa28dc853450ce4bd229b8d SHA1 c865262ae66b18c3220317a6b012fce9c752a654 SHA256 43c7e2d1796f28a3dee972afb71e9592c29ea1639c849080007f71a09e7d7e7c
-MISC ChangeLog 31516 RMD160 ddef7411e9f222b62cf4ea5a6da2cb278925e3b6 SHA1 33f04ebfba41cf531dd4f7426629abdbd24ef768 SHA256 6d6079d0b03a0b61c026c5bee04c2d39230955b00e53022cecd92d68c2707449
+MISC ChangeLog 31634 RMD160 41f1a242e8570c02606d978c073fb9e9d2321b99 SHA1 31c0de1c256311f6cc02c5a174d01893c4ec5943 SHA256 6c732632f89b7bc94811a0527d7ea3c3f3152e650b898460d719da695496d17c
 MISC metadata.xml 1165 RMD160 299dd7565f872817d7f42729790bff04727569e7 SHA1 43ebac2612e2fcc9c0e3f64ef296905030fbb2f0 SHA256 02537c5f7f51efaa0aa04d74d3315850a1e12334d592bd2fe896bbbb5af20623
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAky00ToACgkQ9/cejkQaxBBhjgCfW9X4e6OgHXGI4s2dShwkLER6
-xx0An0hmEyYYDk5Gqa6sIvg7QS7DXwV/
-=M2fM
+iEYEARECAAYFAkzW4DYACgkQ9/cejkQaxBDs0QCdERcpUwN5yRYxL/gcdXQBYS/y
+wyEAn1dX9DaRudthXD293eAbNS2YV81r
+=hEcD
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.15.14.ebuild b/media-sound/mpd/mpd-0.15.14.ebuild
new file mode 100644
index 000000000000..d46ba36687ba
--- /dev/null
+++ b/media-sound/mpd/mpd-0.15.14.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.14.ebuild,v 1.1 2010/11/07 17:21:32 hwoarang Exp $
+
+EAPI=2
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="mirror://sourceforge/musicpd/${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 bzip2 cdio cue +curl debug +fifo +ffmpeg flac
+fluidsynth profile +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad
+mikmod modplug musepack +network ogg oss pipe pulseaudio sid sqlite unicode
+vorbis wavpack wildmidi zip"
+
+RDEPEND="!sys-cluster/mpich2
+	>=dev-libs/glib-2.6:2
+	aac? ( >=media-libs/faad2-2 )
+	alsa? ( media-sound/alsa-utils )
+	ao? ( >=media-libs/libao-0.8.4[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio )
+	cue? ( >=media-libs/libcue-0.13 )
+	curl? ( net-misc/curl )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	network? ( >=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
+	id3? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	libmms? ( >=media-libs/libmms-0.4 )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	ogg? ( media-libs/libogg )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( >=media-libs/libsidplay-2.1.1-r2:2 )
+	sqlite? ( dev-db/sqlite:3 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	avahi? ( net-dns/avahi )
+	zip? ( dev-libs/zziplib )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/mpd.conf.patch
+}
+
+src_configure() {
+	local mpdconf="--disable-dependency-tracking --enable-tcp --enable-un
+		--disable-wildmidi --disable-libOggFLACtest --disable-documentation
+		--docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	if use network; then
+		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output $(use_enable lame lame-encoder)"
+		if ! use lame && ! use vorbis; then
+			ewarn "At least one encoder is required, enabling vorbis for you."
+			mpdconf+=" --enable-vorbis-encoder"
+		fi
+	else
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder"
+	fi
+
+	if use flac && use ogg; then
+		mpdconf+=" --enable-oggflac"
+	else
+		mpdconf+=" --disable-oggflac"
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	cd "${S}"
+
+	econf \
+		$(use_enable ipv6) $(use_enable cue) \
+		$(use_enable sqlite) $(use_enable curl) \
+		$(use_enable lastfmradio lastfm) $(use_enable libmms mms) \
+		$(use_enable bzip2) $(use_enable zip) \
+		$(use_enable cdio iso9660) $(use_enable id3) \
+		$(use_enable audiofile) $(use_enable ffmpeg) \
+		$(use_enable flac) $(use_enable mad) \
+		$(use_enable mikmod) $(use_enable modplug) \
+		$(use_enable musepack mpc) $(use_enable vorbis) \
+		$(use_enable sid sidplay) $(use_enable fluidsynth) \
+		$(use_enable wavpack) $(use_enable libsamplerate lsr) \
+		$(use_enable alsa) $(use_enable ao) \
+		$(use_enable fifo) $(use_enable pipe pipe-output) \
+		$(use_enable jack) $(use_enable oss) \
+		$(use_enable pulseaudio pulse) $(use_enable aac) \
+		$(use_enable debug) $(use_enable profile gprof) \
+		$(use_with avahi zeroconf avahi) $(use_enable wildmidi) \
+		${mpdconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	newinitd "${FILESDIR}"/mpd.init mpd
+
+	if use unicode; then
+		dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			/etc/mpd.conf || die "dosed failed"
+	fi
+
+	diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make"
+	elog "sure that MPD's pid_file is unset."
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}