Version bump. Fix conditional opus support (bug #498926).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 220 insertions, 9 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index a9cf8301c462..7b8347baf7c2 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.336 2014/02/05 04:14:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.337 2014/02/07 03:32:58 radhermit Exp $
+
+*mpd-0.18.8 (07 Feb 2014)
+
+  07 Feb 2014; Tim Harder <radhermit@gentoo.org> +mpd-0.18.8.ebuild:
+  Version bump. Fix conditional opus support (bug #498926).
 
 *mpd-0.18.7 (05 Feb 2014)
 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index d36800bfc1a0..2da079edc484 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -11,21 +11,23 @@ DIST mpd-0.17.6.tar.bz2 585951 SHA256 9788948175157dc1c4da4a7d36e04a4b4812cb3a79
 DIST mpd-0.18.4.tar.xz 579680 SHA256 aa409ca6973029f2cd3986df5e9f8488ad206838c31b9dead03dc8433eb7e326 SHA512 f12e3bca60be59ad45493c03ef49284807ab5ed5401a476407361f69d093e71ffa22004b55c18b633833e982524815335b14cce5bdfdee90b82abac3a3c347da WHIRLPOOL ca7e406fb89d222587de971e2dfddf23381e88a4fc375c74029c1d78868a2384ea262bfd389025ff7fe0abcb92deabc73c30c070a55128ae3575054f9de8edcc
 DIST mpd-0.18.5.tar.xz 580332 SHA256 3424a520f76da90a6869039eb7e89e1e6e3973a6da9e89ffdadf1c4a4ac6e11c SHA512 e907a28f675a524228abae2ea9bf05106bb370ea34124e64e76623b50a66bedfa702d619ea88e789914c323622d5490dd0d62f25b472188346d6b3719139774a WHIRLPOOL 216c2582c6318a185f1f9646d6155c1a62df4e145328207fd4f6e77594c57b356026f3f1880c5eca0c95f0e3d489c3de6c8f84d7a65cd48c8b544e81b5749c31
 DIST mpd-0.18.7.tar.xz 582480 SHA256 3f61b548536ca2b4c6e89fde0b85aa3ce22856fb35053c5b194d9a47daecfb82 SHA512 8f495263242adbf56c2f27ea773c5d829d752ccd9165d127786f444a2f3fb76a0af931fc562ae44c033ae4058ed741f1a8de661ce306aba4f8a2dd189c563443 WHIRLPOOL 3fcee4bd8acd316bf0b864ce066ff9dab388a14011615d1b6c06be579035705c4936e8a14d0c5ffc7fcf3de09e1de54c1f60e335d569fd5eba2752a155ec0d41
+DIST mpd-0.18.8.tar.xz 583812 SHA256 5366378e548fb77996cc33b0e15165ddd84f1e496bdd04616bd593aecdc26450 SHA512 a6f540813b3f91c74645d3903a0b36edd1546880bfa7d1c06f2cb61b37e9c1e343b03ff06a685c4ded796a7f486b19e89849ca43f2b978c839b72eb0be184f34 WHIRLPOOL 24d1703fd7537bee7eb422b81b4f4c371df84a6a8d50fec1b5eaee2851f2c7c03f44ed1ab3d99a97ff4fe1c36158ea06c2829629914cff03b78d8d68f328f715
 EBUILD mpd-0.17.4-r2.ebuild 6339 SHA256 4e32a66a955c33ab69e2599846258c4d1765331bb552294b4d7b5c5e1b1b02cb SHA512 6d8e0a56f6ed7d6cccfaf6a4592b0fcdb800d0f04d05f533927b5b0be59d4a681d8507c4628c46a90a1b446092aa332a1d136e676c5c9d247a22d5a0981292d9 WHIRLPOOL 8d205f74e91f0e0cb437d5bf321c85e350822bbf20fc420302b15c4029fe05184d2218a4e34b617c44c4ed1c72f571afd377b0a56ca6b8a4d84b5597eee0c762
 EBUILD mpd-0.17.6.ebuild 6308 SHA256 d1f9f9e12f74c5fda255aebd3e994f43511c48b17e9289791a6c470f4c6cd721 SHA512 cbd8aaf31b04821151607e0827c159808b0b681f7e991d6d10322a7d8151b35346b53b9b942a8e24254e812f67bac0bd83c7c82c4c3251cb3b0defe5346e3864 WHIRLPOOL 977ab20709e003002d8a415a003a07b498e8329da89dccd0a1988a30f4019159f752681e0e13f2b84fe2e40d8f683576c3e05e9c0e2e87bcc7ce83d8d4f4a958
 EBUILD mpd-0.18.4.ebuild 6260 SHA256 169d82aed741f3d2d3a1b91ec2fb1870e67b9fdb4314671e6cfd9e4b13e9798c SHA512 181772c1648fc06f85e87aff1b0a4f5bbb11b3297e7e2c9c5789c4e07a385bf7184b3b943dab90a7bebad607cc845681b0390909a0655ffb181561e426191927 WHIRLPOOL 38fe5fb2e58441e01a82e3447f944e44a5748ab68662f14612bd690ce05ba2805d474343796fbcc0232c90cfa3375ed25d1f8f521d744482faa3f795e8b33486
 EBUILD mpd-0.18.5.ebuild 6264 SHA256 7754802114579743ff4751e410d0f01a58629f8dbe54c10a4db51c99d039041f SHA512 5883cdc0f5b1d9f41a7f4d64708e8d19eb8d1d0585eabda923a3f742e486dd5413d185ab8e905745d70bde4b534d96ea7e54612a691a1656736d508831664ab6 WHIRLPOOL 42f836b2c7dd488a5a7581224f99e8dbcdb817b94cc99eca991695b0e3d1cf7dce6c4620380e1aa29fbf7d2e7e334ecce506dd9963bd5dafae5fb0f5deb6d229
 EBUILD mpd-0.18.7.ebuild 6267 SHA256 fe4158865401e7dc9c86ab4a635b9293650cf717c53897d01a6a78ea5448c510 SHA512 c81ea89aa33d9135991e1eb8b90dddf87851298304c688daca6d53a84bce28f2cd005abefb18874b017048cf43fbf558984d1fe48b61b019eb0d85cc00781263 WHIRLPOOL 1a1688ff2a4fcf505353720ba4963a770fa02c49182ce370e582561121c1358dcb5a24eaaf6bcd2bfd0d3b0b94eb938217733faf042f7796314f48a4edbaf010
-MISC ChangeLog 47710 SHA256 229498a3f724db0cdb146dee5a57d8a6f3686728c71c7b761712b8632ddec92a SHA512 fc9d56b8ec030d6c90174d1f0587d5ab35cc8d28c68aa572f94040430ebf493235f8cca46dc4ec28500d3da2d51a9a41f0bccae1c32e4cd7805a8c6ca26fda86 WHIRLPOOL 18e164d91047bf032f9da84b05d5ea2f190e48d8cd436a4a163202952b89038c278903f46f254e4177fa64b47b32b924f7b0866a9aa10e4d0514895acdf60db5
+EBUILD mpd-0.18.8.ebuild 6290 SHA256 390dfa9d9455cc944f0cb411696f144aefc496b2c3610ecc4e66d44da41e6cc3 SHA512 a84687b48c4395eecb841f6ca486fda392c6f504fbede1341949bc45e36ea7ba79ab49dc468f29c7e7249ff123d2a5eec9b8ae2f3aa192e3a0a8d33b5d74dd37 WHIRLPOOL 2917f620861b3cf9d9f1c605f38e29b49b991eb6b62a04226df67e773e0491fb74eca22e94b8e64918de7bb77d49674620d6c5c3efae4bb56cb66f5077d51a2b
+MISC ChangeLog 47867 SHA256 cf5a16caa68256eb1c981e5069a9971056afd1e4b821fa000169d7d5a60fc109 SHA512 58add7b358d1bf0af94c75ce033f5c490af089d29b8bce1f40812eb59a4bb277a873070c4c70d37b45c2710c9c46557d273b307a6116e46f8a1168f31bd44ef6 WHIRLPOOL 14fc842018d1abd55abf8801367b944285addbcad1dd70f0e8ebb385b7ae8df620dd150860f50176a4826e011db737593ec230047ef82b8689b0cc4cf01a3999
 MISC metadata.xml 2057 SHA256 03ab12c4339334c9925649d19c61844c14600680d33b83736922b4537b94515c SHA512 71f55e89be531d5e1aa32182b8348899b87dfa3ef13782f52cc39748cce307273b714975016e2737d4e9941f2f4e71f31d6b38856eb5a9f1c1d33b2afc28fbb6 WHIRLPOOL 160272fbeffa01fbec0fc5bbb75f643cc4540def81f6e31bde450e18865bf43a6a329890db0bb8d3c6a22fdd740c1c1bf213cf87bc54fe103c7fadcba892a9d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS8bqiAAoJEEqz6FtPBkyjcG0H/1K1P3wnRoEC0qmtN3vdJmu3
-NDc3DEOYC429jivOVlBDdtwD1PasbWMj82VMxxHH7dIie+qaFy/kNQj1GRbJ3v4j
-fujVdnHaNEVZBlbeD1+NaUso4+RWR6eeVxUmKPEHDWKzlPCy0iRib6jdyOwrTptV
-e8yQS49bNP3iJ8X2/xV4VGBgl25vu+O0ClWg6vogw6Sv18gizTqFML1A47vBRyId
-M02SAKbT/ttxwxKiOKT7BJSLOE6wqRRQbJ6kt9QY49X3pCQJ865lv+vMO+ytbnxs
-ibmo5t5tUdTMr95S/R/xXBT5cV8R+RHyCL8f4SJ8VjBsGhdznnZ+DVaSNcd25uI=
-=hL5v
+iQEcBAEBCAAGBQJS9FPtAAoJEEqz6FtPBkyjnYoH/jsNkIslhD+n/WVJ4Ixn4eMn
+Kun2bYogX/tr7/EN+9oJmczQ523uHHhZUHgP/ShddoNiblC8xg6VSaT0xWsG/3kx
+ZwJGloQBOzUy2WHHqkpnFOX/CRVsO4A4rKm836AD0LzqQXhUBM3mZ0LaUymMkC7M
+gS6Pe6zqPzj9glfFm3Vicai86pXZD5FkQWCeX/9miing2+gyZuhWbTOiowk7VGh/
+PFaGAXWNYCNAUY/eYLVbDsyieKHMicTxV2+GxVEHcf98/373VOj1SGHxcdXhbzVc
+ipHMsaFqJpjAzLphzSRmaQAsCI483jnFYI+Sy81O/xHclFXT8W8mw/nfuCiR+PE=
+=JFbs
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.18.8.ebuild b/media-sound/mpd/mpd-0.18.8.ebuild
new file mode 100644
index 000000000000..cd975538c194
--- /dev/null
+++ b/media-sound/mpd/mpd-0.18.8.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.18.8.ebuild,v 1.1 2014/02/07 03:32:58 radhermit Exp $
+
+EAPI=4
+inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
+	fluidsynth gme +id3tag inotify ipv6 jack lame mms libmpdclient
+	libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
+	oss pipe pulseaudio recorder sid sndfile soundcloud sqlite systemd tcpd
+	twolame unicode vorbis wavpack wildmidi zeroconf zip"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )"
+
+RDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	dev-libs/glib:2
+	adplug? ( media-libs/adplug )
+	alsa? ( media-sound/alsa-utils
+		media-libs/alsa-lib )
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+	curl? ( net-misc/curl )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	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}
+	virtual/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() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is unset."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+			src/input/CdioParanoiaInputPlugin.cxx || die
+	fi
+}
+
+src_configure() {
+	local mpdconf="--disable-despotify --disable-documentation --disable-roar
+		--enable-largefile --enable-tcp --enable-un
+		--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
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable alsa) \
+		$(use_enable ao) \
+		$(use_enable audiofile) \
+		$(use_enable bzip2) \
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable cdio iso9660) \
+		$(use_enable curl) \
+		$(use_enable debug) \
+		$(use_enable faad aac) \
+		$(use_enable ffmpeg) \
+		$(use_enable fifo) \
+		$(use_enable flac) \
+		$(use_enable fluidsynth) \
+		$(use_enable gme) \
+		$(use_enable id3tag id3) \
+		$(use_enable inotify) \
+		$(use_enable ipv6) \
+		$(use_enable jack) \
+		$(use_enable libmpdclient) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable mad) \
+		$(use_enable mikmod) \
+		$(use_enable mms) \
+		$(use_enable modplug) \
+		$(use_enable mpg123) \
+		$(use_enable musepack mpc) \
+		$(use_enable openal) \
+		$(use_enable opus) \
+		$(use_enable oss) \
+		$(use_enable pipe pipe-output) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable recorder recorder-output) \
+		$(use_enable sid sidplay) \
+		$(use_enable sndfile sndfile) \
+		$(use_enable soundcloud) \
+		$(use_enable sqlite) \
+		$(use_enable systemd systemd-daemon) \
+		$(use_enable tcpd libwrap) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable wildmidi) \
+		$(use_enable zip zzip) \
+		$(use_with zeroconf zeroconf avahi) \
+		"$(systemd_with_unitdir)" \
+		${mpdconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/mpd.init mpd
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	use prefix || 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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}