diff options
| author |   Andrej Kacian <ticho@gentoo.org> | 2006-08-28 16:49:20 +0000 |
|---|---|---|
| committer | Andrej Kacian <ticho@gentoo.org> | 2006-08-28 16:49:20 +0000 |
| commit | e03a5eb943413f9bcfe55d423a37b5346c32fe4a (patch) | |
| tree | d6253b5ca6e5150bc5f00190340be18e920f6b4a /media-sound/mpd | |
| parent | old (diff) | |
| download | gentoo-2-e03a5eb943413f9bcfe55d423a37b5346c32fe4a.tar.gz gentoo-2-e03a5eb943413f9bcfe55d423a37b5346c32fe4a.tar.bz2 gentoo-2-e03a5eb943413f9bcfe55d423a37b5346c32fe4a.zip | |
Block sys-cluster/mpich2, since it also installs /usr/bin/mpd and /etc/mpd.conf. Bug #145367.
(Portage version: 2.1.1_pre4-r4)
Diffstat (limited to 'media-sound/mpd')
| -rw-r--r-- | media-sound/mpd/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/mpd/mpd-0.11.5-r2.ebuild | 3 | ||||
| -rw-r--r-- | media-sound/mpd/mpd-0.12.0_rc1.ebuild | 3 | ||||
| -rw-r--r-- | media-sound/mpd/mpd-0.12.0_rc2.ebuild | 3 | ||||
| -rw-r--r-- | media-sound/mpd/mpd-0.12.0_rc3.ebuild | 3 |
5 files changed, 14 insertions, 5 deletions
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog index 522fbb956c8a..1629cebb007b 100644 --- a/media-sound/mpd/ChangeLog +++ b/media-sound/mpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/mpd # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.75 2006/08/24 23:27:29 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.76 2006/08/28 16:49:20 ticho Exp $ + + 28 Aug 2006; Andrej Kacian <ticho@gentoo.org> mpd-0.11.5-r2.ebuild, + mpd-0.12.0_rc1.ebuild, mpd-0.12.0_rc2.ebuild, mpd-0.12.0_rc3.ebuild: + Block sys-cluster/mpich2, since it also installs /usr/bin/mpd and + /etc/mpd.conf. Bug #145367. *mpd-0.12.0_rc3 (24 Aug 2006) diff --git a/media-sound/mpd/mpd-0.11.5-r2.ebuild b/media-sound/mpd/mpd-0.11.5-r2.ebuild index a0e1f851cdd3..a6421c8ada73 100644 --- a/media-sound/mpd/mpd-0.11.5-r2.ebuild +++ b/media-sound/mpd/mpd-0.11.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.5-r2.ebuild,v 1.10 2006/06/14 18:44:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.11.5-r2.ebuild,v 1.11 2006/08/28 16:49:20 ticho Exp $ inherit eutils @@ -15,6 +15,7 @@ IUSE="aac alsa audiofile flac ipv6 mad mikmod unicode vorbis" DEPEND=">=media-libs/libao-0.8.4 !media-sound/mpd-svn + !sys-cluster/mpich2 sys-libs/zlib aac? ( >=media-libs/faad2-2.0_rc2 ) alsa? ( media-sound/alsa-utils ) diff --git a/media-sound/mpd/mpd-0.12.0_rc1.ebuild b/media-sound/mpd/mpd-0.12.0_rc1.ebuild index 16aabd2f228a..6cf18180335e 100644 --- a/media-sound/mpd/mpd-0.12.0_rc1.ebuild +++ b/media-sound/mpd/mpd-0.12.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.0_rc1.ebuild,v 1.3 2006/08/18 02:39:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.0_rc1.ebuild,v 1.4 2006/08/28 16:49:20 ticho Exp $ inherit eutils @@ -17,6 +17,7 @@ pulseaudio unicode vorbis" DEPEND="dev-util/gperf !media-sound/mpd + !sys-cluster/mpich2 sys-libs/zlib aac? ( >=media-libs/faad2-2.0_rc2 ) alsa? ( media-sound/alsa-utils ) diff --git a/media-sound/mpd/mpd-0.12.0_rc2.ebuild b/media-sound/mpd/mpd-0.12.0_rc2.ebuild index 1024a7d70fa3..ae43b7497bdf 100644 --- a/media-sound/mpd/mpd-0.12.0_rc2.ebuild +++ b/media-sound/mpd/mpd-0.12.0_rc2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.0_rc2.ebuild,v 1.1 2006/08/19 18:43:48 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.0_rc2.ebuild,v 1.2 2006/08/28 16:49:20 ticho Exp $ inherit eutils @@ -17,6 +17,7 @@ pulseaudio unicode vorbis" DEPEND="dev-util/gperf !media-sound/mpd + !sys-cluster/mpich2 sys-libs/zlib aac? ( >=media-libs/faad2-2.0_rc2 ) alsa? ( media-sound/alsa-utils ) diff --git a/media-sound/mpd/mpd-0.12.0_rc3.ebuild b/media-sound/mpd/mpd-0.12.0_rc3.ebuild index 9b100d54f7ff..4f021fa370f4 100644 --- a/media-sound/mpd/mpd-0.12.0_rc3.ebuild +++ b/media-sound/mpd/mpd-0.12.0_rc3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.0_rc3.ebuild,v 1.1 2006/08/24 23:27:29 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.12.0_rc3.ebuild,v 1.2 2006/08/28 16:49:20 ticho Exp $ inherit eutils @@ -17,6 +17,7 @@ pulseaudio unicode vorbis" DEPEND="dev-util/gperf !media-sound/mpd-svn + !sys-cluster/mpich2 sys-libs/zlib aac? ( >=media-libs/faad2-2.0_rc2 ) alsa? ( media-sound/alsa-utils ) |