Version bump

Package-Manager: portage-2.2.0_alpha27/cvs/Linux x86_64

3 files changed, 201 insertions, 8 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index e4df20416bea..f384f4883409 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.241 2011/03/16 19:30:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.242 2011/03/19 08:59:00 angelos Exp $
+
+*mpd-0.16.2 (19 Mar 2011)
+
+  19 Mar 2011; Christoph Mende <angelos@gentoo.org> +mpd-0.16.2.ebuild:
+  Version bump
 
   16 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> mpd-0.15.15.ebuild:
   ppc64 stable wrt #348798
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 01bc29c6c6e3..ab4cd9ac00b3 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,5 +1,5 @@
 -----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
@@ -10,19 +10,19 @@ DIST mpd-0.15.15.tar.bz2 391688 RMD160 16b6196f698f0442ad6d76b7a03f06f0dcc5a245
 DIST mpd-0.15.16.tar.bz2 392986 RMD160 8b5e627e9a52702003e0cd57806d78a195d711af SHA1 af5695af1ca2b12b5ac92d840bff28f111558209 SHA256 6f5b6c722e21a90dc0deace4897342410c58b3b81f15019aacc69d9cfabbaa8b
 DIST mpd-0.15.8.tar.bz2 390489 RMD160 8b98e16e84b19bf0174ffffb8a59c88e605523b4 SHA1 a6503a4fde45d19c550febd0a84e329bf83dfcfb SHA256 5de1bac0af52c6d2d2744a8c8c84bb1423de4eff2351790068173cf4f287aad7
 DIST mpd-0.16.1.tar.bz2 480244 RMD160 f96ecb6a337043ea4982a2fa609d026b0d571647 SHA1 328d6d1e118e7d0029535559b2ae87ac10b79d6e SHA256 b85ca840e31aea2249ad8e9c5c36f6533fc0f88d357a7441817ccacb1e31df57
+DIST mpd-0.16.2.tar.bz2 478096 RMD160 74e63fe4514eb8309bf2b2e4e4012566e14b6262 SHA1 ce0b8cd473f8acb45c06d73f41c18fc4dabbe440 SHA256 59a3c191bbfcbbbc119f4b1e44bcb62ce15e45bc4d5041153408acc3074cb1d5
 EBUILD mpd-0.15.15.ebuild 4818 RMD160 ad1404ce8a9391dfd102156a377318795b828bc4 SHA1 1b81e4b29232c2bfc751e1fcbdf332fba1e3caea SHA256 f072f0ed5f5350ac33bc39a0cfab2865e5dbd7055310f8c0ef934ff7d4017a67
 EBUILD mpd-0.15.16.ebuild 4822 RMD160 36024de0158db3f2766519ab49031058c4351686 SHA1 ada86d45f6392e4cd555225a1c618cb6a01182a7 SHA256 17926b55b0b928b150b5354533dbe2a99ca8f03da1429d9dcee089c315331de3
 EBUILD mpd-0.15.8.ebuild 4863 RMD160 9e8f822f4d14afad7236f3f4d71f699003e1ca33 SHA1 e015c81dd883a457bb761755d8d2ec50f224c336 SHA256 f6816267b72be8934f8cb156a1e287dad1d815b4373a1869c9bc865ee1d7b06e
 EBUILD mpd-0.16.1-r1.ebuild 5212 RMD160 195e74c78a11b19437b34d0980d0f5b95d79a1b6 SHA1 67471c4a459e5efb5023167565c3f2cc559cc677 SHA256 d9c20bbfd3b990f3429e772f627eb43d217e777d2dbb05408ef049a562bca704
 EBUILD mpd-0.16.1-r2.ebuild 5540 RMD160 2effae36f38f07a549c865bcfc784359f395b449 SHA1 f2d0e6fa8d61c127f6125e529eb2e75b94020ab9 SHA256 7932652d7e8da805787e60657ce5d3fb43ddf19460e4ab728b6c32e9f6b7b3fa
-MISC ChangeLog 35243 RMD160 fc409b2566ef2642d5a4eaceb637db05204308c7 SHA1 0554613f4211af64c61460d29ea40eb2f98e8d41 SHA256 7990ac1c718d505c37b299f3ba3b8ef23de70d715d0ef0c6a64e41b627e44489
+EBUILD mpd-0.16.2.ebuild 5537 RMD160 2d2e9dab86724190b72e09c5e082138827464ac3 SHA1 4f377821c5cf66507ae57f372a2e4e23f71ab071 SHA256 413171b3db608db57b140efe9982aec9540c7d03dfb9046825d4af2bda169c96
+MISC ChangeLog 35355 RMD160 ec5e90fa00147a959eac60fe0e5bfa25e33ea394 SHA1 7e8f3b59cec636aa0ff86d5f6a915a3b18f0964c SHA256 9a1ded05da6ab0b6a452ee7ac576e1a8b2366dacbf07147c709dc41d1cd8e133
 MISC metadata.xml 1519 RMD160 4231c2d53cf47048c4638a9d49b48f7f72212550 SHA1 423766ff1530f40ef17a2c84c92add1ffe4a7d62 SHA256 f8c901bf6b4e25af758178c8b91d043771418ba112d435973b7ead5bd5151bec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2BD/MACgkQIiMqcbOVdxRXwAP/ZZPyRyvYEeJRLVZBKXAaOSf/
-jyB2Ym8QtE7tsxIaM5k6MuRcXMWe1zA0OG1M3v0Wh+PBu1Ukb22F9BpcSp0gvW58
-aZV2YqL0puQIsk0VbfN/NyyJUJ5zfd+mjQrB3D6MZtloFTK5/bBrZlk6zg6yEfVF
-D11LFdkUewkXYD0Zai8=
-=Xi2u
+iF4EAREIAAYFAk2EcEIACgkQmWq1bYTyC0P8jQD/ebcBIwW7H38p9Fo/bIThomPR
+UAjo505YBEeHjGCaW7gBAIb2NWv7iipMDsUMB837IdPqTJmdKt387lLqvssVzaLb
+=IjqK
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.16.2.ebuild b/media-sound/mpd/mpd-0.16.2.ebuild
new file mode 100644
index 000000000000..dc6c0d7910ce
--- /dev/null
+++ b/media-sound/mpd/mpd-0.16.2.ebuild
@@ -0,0 +1,188 @@
+# 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.2.ebuild,v 1.1 2011/03/19 08:59:00 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)
+			$(use_enable audiofile wave-encoder)"
+	else
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder
+			--disable-twolame-encoder --disable-wave-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_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
+}