Updated the 0.16.1 ebuild to EAPI4 and removed old versions

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

8 files changed, 207 insertions, 617 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 8f9339e919b0..6208624507a7 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.237 2011/01/14 09:36:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.238 2011/02/19 23:00:28 angelos Exp $
+
+*mpd-0.16.1-r2 (19 Feb 2011)
+
+  19 Feb 2011; <angelos@gentoo.org> -mpd-0.15.9.ebuild, -mpd-0.15.10.ebuild,
+  -mpd-0.15.12-r2.ebuild, -mpd-0.15.13.ebuild, +mpd-0.16.1-r2.ebuild,
+  metadata.xml:
+  Updated the 0.16.1 ebuild to EAPI4 and removed old versions
 
 *mpd-0.16.1-r1 (14 Jan 2011)
 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 388865869aea..dfa7dcd361c3 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,31 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0.15.1-mpdconf.patch 2912 RMD160 6683618151f0f10dc94b5563a48be3729919ef08 SHA1 fc67f59f808d77332a20261525ca74bf1d67b228 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523
 AUX mpd-0.16.conf.patch 2655 RMD160 ad8a9eb214c1c446505becedfe2587bd1997cbaa SHA1 d695f1a8d885e5f44f394e39a76a0d700b955ab6 SHA256 c6b9573c035fb3aace9a0d5277503d7ca6184d92798fbb3f17dd85596e0926fd
 AUX mpd.conf.patch 2566 RMD160 50cb8539749355f610b82b527ed1438f1e5d64b0 SHA1 82c5c3288a3318bb61625edfd266ee453c928109 SHA256 b73ec60d2766d86d78f9ba63d3e5973e8ffb3c1f412f450949bbd3e6dfcbf24f
 AUX mpd.init 824 RMD160 e58cc1644628fb931f5d8bd5726fdceebd29493d SHA1 72377bfa801f6bbcc5474c725303fd234a6bc148 SHA256 a6565c16ffd8ee69d63ead18c967e05abcab2eb64d9810c9f4711aef358cc048
 AUX mpd.rc 672 RMD160 278e4f59433656b930a9f35e59747681a2e4918d SHA1 06cf045b9d994aff0653f085761871e44fe3aebc SHA256 6b0c65dc4394108b3720afdc865f8692aa80c94ed12f351dce5f11537ffd84a8
-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.15.tar.bz2 391688 RMD160 16b6196f698f0442ad6d76b7a03f06f0dcc5a245 SHA1 2ec37cc32469255ea603d15617f100d1f12e766c SHA256 db6dc242722e3178bcbff6b67ced8caccbb8dcddf867b8ab6bab42d6e55982ab
 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
 DIST mpd-0.16.1.tar.bz2 480244 RMD160 f96ecb6a337043ea4982a2fa609d026b0d571647 SHA1 328d6d1e118e7d0029535559b2ae87ac10b79d6e SHA256 b85ca840e31aea2249ad8e9c5c36f6533fc0f88d357a7441817ccacb1e31df57
-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 4650 RMD160 8143fad65d5f43eed5aa0d2121689f1c16b1b69a SHA1 99d46cf82de586e48665549dcb2c72be47975b58 SHA256 237f07be37886ad13b203dbfe2e21164e4b2e2f6329fb43e32c8403fb8b9d338
 EBUILD mpd-0.15.15.ebuild 4811 RMD160 5d07d81ddbdcea0338df757eecd9955ff34d8a8c SHA1 41c0f95e3c7a5562e75e9b03fdd10019e38caff1 SHA256 646f6b819c080188a15539c9abd2ab3b24d124e3c451cdfb5c3ad87f00062ea3
 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
 EBUILD mpd-0.16.1-r1.ebuild 5212 RMD160 195e74c78a11b19437b34d0980d0f5b95d79a1b6 SHA1 67471c4a459e5efb5023167565c3f2cc559cc677 SHA256 d9c20bbfd3b990f3429e772f627eb43d217e777d2dbb05408ef049a562bca704
-MISC ChangeLog 34661 RMD160 da6ad3c6e686e5c4fa8095c2fe962f24780ad788 SHA1 78cd9a81cd1651cc5acc7370dd7d379452e69ac8 SHA256 e475be3622fbf5c6755e1c09b6f9df0b14d0e406a6dfd7b9c3bfd4d5a2a3e801
-MISC metadata.xml 1459 RMD160 8c586d2fd713d9d43b21016e53aa1c6fe2037609 SHA1 5c8fa337495549bb88db2db19c80fd2b16091a7d SHA256 17360565f5af1ce4bd3010c915498eddcec2af29e6a290ec3b98d5c96247d1ec
+EBUILD mpd-0.16.1-r2.ebuild 5519 RMD160 2f2e1a969d111de28d23d1c0bd1e856c7ec0f8d8 SHA1 d82ff7b5d8e09500735f665ae0d8de41dc3229d4 SHA256 1224c005c09a5f35440c1605ff69336933bb940994d3ec40133aae515bca0840
+MISC ChangeLog 34916 RMD160 96d0abce65d138f060c84a18a1e48219f41ce5fb SHA1 c604a309682e5ebb43c0d1ebe0d1f4901d78f971 SHA256 f6ae908cd4213e59dba3e3b50b72aa8c650a9496c5cb6ad14cb86c1e65a84ebe
+MISC metadata.xml 1519 RMD160 4231c2d53cf47048c4638a9d49b48f7f72212550 SHA1 423766ff1530f40ef17a2c84c92add1ffe4a7d62 SHA256 f8c901bf6b4e25af758178c8b91d043771418ba112d435973b7ead5bd5151bec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0wGQkACgkQ9/cejkQaxBCW3ACeP4fG0w3B+HaztnD5UuFDnWUX
-WKIAnRFU5lyL3zS8Hbhds3alBlS1GiFW
-=GOUo
+iF4EAREIAAYFAk1gS5IACgkQmWq1bYTyC0NU9QEAgytZlBzJH70qVMF+RJxDnU0m
+1Jc3jAMgGg9uuhb+Ni4A/RNBjuT7urYmlCTAA5lyy1HFSwi0TENxVLogmDOwbUzT
+=7KzP
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 50ee87f81293..f38f84ab8291 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -20,8 +20,9 @@
 	<flag name="inotify">Use the Linux kernel inotify subsystem to notice changes to mpd music library</flag>
 	<flag name="lame">Support for MP3 streaming via Icecast2</flag>
 	<flag name="lastfmradio">Support listening to last.fm radio stations</flag>
+	<flag name="twolame">Support twolame MPEG-2 encoding</flag>
 	<flag name="libmms">Support for Microsoft Media Server (MMS) streams via libmms</flag>
-    <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123.</flag>
+    <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
 	<flag name="network">Enables network streaming support</flag>
 	<flag name="pipe">Support writing audio to a pipe</flag>
 	<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
diff --git a/media-sound/mpd/mpd-0.15.10.ebuild b/media-sound/mpd/mpd-0.15.10.ebuild
deleted file mode 100644
index 1ef3d337050d..000000000000
--- a/media-sound/mpd/mpd-0.15.10.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# 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.10.ebuild,v 1.1 2010/05/31 19:23:17 angelos 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 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 )
-	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}"/0.15.1-mpdconf.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) \
-		${mpdconf}
-}
-
-src_install() {
-	dodir /var/run/mpd
-	fowners mpd:audio /var/run/mpd
-	fperms 750 /var/run/mpd
-	keepdir /var/run/mpd
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	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 || 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
-	dodir /var/log/mpd
-	keepdir /var/log/mpd
-
-	if use alsa; then
-		dosed 's:need :need alsasound :' /etc/init.d/mpd || die "dosed failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd, 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.15.12-r2.ebuild b/media-sound/mpd/mpd-0.15.12-r2.ebuild
deleted file mode 100644
index d878a564708e..000000000000
--- a/media-sound/mpd/mpd-0.15.12-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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.12-r2.ebuild,v 1.3 2010/10/12 11:59:49 armin76 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
-}
diff --git a/media-sound/mpd/mpd-0.15.13.ebuild b/media-sound/mpd/mpd-0.15.13.ebuild
deleted file mode 100644
index 061f8d034a87..000000000000
--- a/media-sound/mpd/mpd-0.15.13.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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.13.ebuild,v 1.6 2010/11/26 17:27:36 jer 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
-}
diff --git a/media-sound/mpd/mpd-0.15.9.ebuild b/media-sound/mpd/mpd-0.15.9.ebuild
deleted file mode 100644
index 01a4ace7d6a5..000000000000
--- a/media-sound/mpd/mpd-0.15.9.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# 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.9.ebuild,v 1.2 2010/05/26 17:49:54 angelos 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 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 )
-	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}"/0.15.1-mpdconf.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) \
-		${mpdconf}
-}
-
-src_install() {
-	dodir /var/run/mpd
-	fowners mpd:audio /var/run/mpd
-	fperms 750 /var/run/mpd
-	keepdir /var/run/mpd
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	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 || 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
-	dodir /var/log/mpd
-	keepdir /var/log/mpd
-
-	if use alsa; then
-		dosed 's:need :need alsasound :' /etc/init.d/mpd || die "dosed failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "If you will be starting mpd via /etc/init.d/mpd, 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.16.1-r2.ebuild b/media-sound/mpd/mpd-0.16.1-r2.ebuild
new file mode 100644
index 000000000000..1b854860ae70
--- /dev/null
+++ b/media-sound/mpd/mpd-0.16.1-r2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.1-r2.ebuild,v 1.1 2011/02/19 23:00:28 angelos Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic linux-info 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 bzip2 cdio cue +curl debug +fifo +ffmpeg flac
+fluidsynth profile +id3 inotify ipv6 jack lame lastfmradio libmms libsamplerate
++mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
+sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
+
+REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
+	|| ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack
+			ogg flac sid vorbis wavpack wildmidi )
+	network? ( || ( audiofile flac lame twolame vorbis ) )
+	lastfmradio? ( curl )"
+
+RDEPEND="!sys-cluster/mpich2
+	dev-libs/glib:2
+	aac? ( media-libs/faad2 )
+	alsa? ( media-sound/alsa-utils )
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio )
+	cue? ( media-libs/libcue )
+	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 )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	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
+
+	if use inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
+}
+
+src_configure() {
+	local mpdconf="--enable-tcp --enable-un	--disable-documentation
+		--disable-ffado --disable-gme --enable-largefile
+		--disable-mvp --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)
+			$(use_enable twolame twolame-encoder)"
+	else
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder
+			--disable-twolame-encoder"
+	fi
+
+	if use flac && use ogg; then
+		mpdconf+=" --enable-oggflac"
+	else
+		mpdconf+=" --disable-oggflac"
+	fi
+
+	if use lastfmradio && use curl; then
+		mpdconf+=" --enable-lastfm"
+	else
+		mpdconf+=" --disable-lastfm"
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	cd "${S}"
+
+	econf \
+		$(use_enable aac) \
+		$(use_enable alsa) \
+		$(use_enable ao) \
+		$(use_enable audiofile) \
+		$(use_enable audiofile wave-encoder) \
+		$(use_with zeroconf zeroconf avahi) \
+		$(use_enable bzip2) \
+		$(use_enable cdio iso9660) \
+		$(use_enable cue) \
+		$(use_enable curl) \
+		$(use_enable debug) \
+		$(use_enable ffmpeg) \
+		$(use_enable fifo) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable jack) \
+		$(use_enable id3) \
+		$(use_enable inotify) \
+		$(use_enable ipv6) \
+		$(use_enable libmms mms) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable mad) \
+		$(use_enable mikmod) \
+		$(use_enable modplug) \
+		$(use_enable mpg123) \
+		$(use_enable musepack mpc) \
+		$(use_enable openal) \
+		$(use_enable oss) \
+		$(use_enable pipe pipe-output) \
+		$(use_enable profile gprof) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable sid sidplay) \
+		$(use_enable sndfile sndfile) \
+		$(use_enable sqlite) \
+		$(use_enable tcpd libwrap) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable wildmidi) \
+		$(use_enable zip zzip) \
+		${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
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${D}"/etc/mpd.conf || die "sed 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
+}