summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2009-01-12 23:38:52 +0000
committerChristoph Mende <angelos@gentoo.org>2009-01-12 23:38:52 +0000
commit58475438866c7ba329e1b84cd7d1e377befea089 (patch)
tree4a4c3df18c4a61962af5b98be1f11e506507e3ba /media-sound/mpd
parentVersion bump (diff)
downloadhistorical-58475438866c7ba329e1b84cd7d1e377befea089.tar.gz
historical-58475438866c7ba329e1b84cd7d1e377befea089.tar.bz2
historical-58475438866c7ba329e1b84cd7d1e377befea089.zip
die if no audio outputs were enabled, bug 254731
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.29-rc1 x86_64
Diffstat (limited to 'media-sound/mpd')
-rw-r--r--media-sound/mpd/ChangeLog5
-rw-r--r--media-sound/mpd/Manifest10
-rw-r--r--media-sound/mpd/mpd-0.14.ebuild20
3 files changed, 26 insertions, 9 deletions
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 3660b00efa03..79dce8a4923a 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/mpd
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.148 2009/01/12 21:08:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.149 2009/01/12 23:38:52 angelos Exp $
+
+ 12 Jan 2009; Christoph Mende <angelos@gentoo.org> mpd-0.14.ebuild:
+ die if no audio outputs were enabled, bug 254731
12 Jan 2009; Christoph Mende <angelos@gentoo.org> mpd-0.14.ebuild:
Add use_enable for lame, bug 254545
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index bb2824974a80..d82323b327aa 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -7,13 +7,13 @@ AUX mpdconf1.patch 2835 RMD160 db96c64f9ca1f7ab74ab3a0d1205a32b4bb7c755 SHA1 70a
DIST mpd-0.13.2.tar.bz2 413347 RMD160 39825142d8f19ca04d7a2e025b59043a8adb53fa SHA1 3b826bc75c314e6db6715a978c9b405775d3478c SHA256 d98db80ec0bba7d4a82a8aecff965f6887f7b055ad064d8d5ccb55cc614cdfb5
DIST mpd-0.14.tar.bz2 286017 RMD160 a9719ce539cd3a0cee7222f751b2566334a7d96d SHA1 e9de568ffd9c1d414ffaca6f84671891bfe03158 SHA256 0276e88162f6722f27ea4aa0dcd1d6cf4ebc3b535151f9e1b89ace8fc9b282db
EBUILD mpd-0.13.2.ebuild 3742 RMD160 b1da179dd33276c8bbe89f25841857d720cd8f54 SHA1 c5d49608c3bf36fd067c60496c418895df10c92e SHA256 84cb728fbb51fceb26134727416986dfccde829e9213f9d21a25fd49f1f91572
-EBUILD mpd-0.14.ebuild 3989 RMD160 cfc84a7740dd51446e4f986db4c4052da2dd62be SHA1 ad775a5ce38c27962ff4c5ea482a5051eeec5d0b SHA256 dfb3aff91a63fc3d309f173c172bd128d0c65edf8d54594d7a1e596d313dbf2c
-MISC ChangeLog 22722 RMD160 c5363c20ba5c26942e8336590b8e4d7d47578d25 SHA1 f88edaa9480e303df04027a09b10955d0fc3f7b6 SHA256 039433fbb00710d5438385679acc245086ea18602602d6942175b8d57e87629a
+EBUILD mpd-0.14.ebuild 4540 RMD160 31d7a8f9fdc993a6b47fd541a5230d2843977ab0 SHA1 12cc46fbec5f006f58523d30d7838e595a9af929 SHA256 ed50abd6f5af25d5f7a7f915070d82ff56a87217fce3d273b296008998d89060
+MISC ChangeLog 22843 RMD160 3d54a51d3038a1b5cd48b6a6499c4be1004e8b77 SHA1 3dc7345726c993cf0f7bd0fc1ecf3ae9c2152693 SHA256 d11aca762d472e34e939b5c810404e3c488e2d243308213202363d845a58a67e
MISC metadata.xml 376 RMD160 912f0c343887855312c7fd9867cba6b23291cec0 SHA1 3f59b493d6350cb20817bdb95d2283d96f8a9f50 SHA256 4db97047d3e3398f6ff4a8d7c581de110ebdd21c0f8dd64492a7e4cbbbbba853
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAklrsVEACgkQKhnDs22gwa8D9wCdEZ5ZzXvz0eXlC9jgk4RNMMNR
-lREAoNELFGEEOerJiGCZgA2YWCDnG7pm
-=E8Xh
+iEYEARECAAYFAklr1JUACgkQKhnDs22gwa/DZQCdHEV3smXmCg1r0TXWemlPJqhv
+QHgAn1f4MtzNGN5ZG5MBYGHalT1ZjaBr
+=eB9V
-----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.14.ebuild b/media-sound/mpd/mpd-0.14.ebuild
index c524f6d82fb9..97b615fef623 100644
--- a/media-sound/mpd/mpd-0.14.ebuild
+++ b/media-sound/mpd/mpd-0.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.ebuild,v 1.4 2009/01/12 21:08:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.14.ebuild,v 1.5 2009/01/12 23:38:52 angelos Exp $
EAPI=2
@@ -13,7 +13,7 @@ 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 curl debug doc ffmpeg flac icecast id3 ipv6 jack lame libsamplerate mad mikmod musepack ogg oss pulseaudio +sysvipc unicode vorbis wavpack zeroconf"
+IUSE="aac +alsa ao audiofile curl debug doc ffmpeg flac icecast id3 ipv6 jack lame libsamplerate mad mikmod musepack ogg oss pulseaudio +sysvipc unicode vorbis wavpack zeroconf"
RDEPEND="!sys-cluster/mpich2
>=dev-libs/glib-2.4:2
@@ -48,7 +48,7 @@ pkg_setup() {
ewarn "USE=icecast enabled but lame and vorbis disabled,"
ewarn "disabling icecast"
fi
-
+
enewuser mpd "" "" "/var/lib/mpd" audio
}
@@ -60,6 +60,20 @@ src_prepare() {
src_configure() {
local myconf=""
+
+ if ! use alsa && ! use ao && ! use icecast && ! use jack && ! use oss && \
+ ! use pulseaudio; then
+ eerror "You did not enable any output backend."
+ einfo "Please enable one of the following USE flags:"
+ einfo "USE=alsa - output via ALSA"
+ einfo "USE=ao - output via media-libs/libao"
+ einfo "USE=icecast - output via net-misc/icecast"
+ einfo "USE=jack - output via media-sound/jack-audio-connection-kit"
+ einfo "USE=oss - output via OSS"
+ einfo "USE=pulseaudio - output via media-sound/pulseaudio"
+ die "No audio output enabled"
+ fi
+
if use icecast; then
myconf+=" $(use_enable vorbis shout_ogg) $(use_enable lame shout_mp3)
$(use_enable lame lametest) $(use_enable lame)"