force libmikmod to slot 0, as ssuominen suggested

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

13 files changed, 46 insertions, 31 deletions

diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index 58b15cdeff63..f94c52f381f4 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/alsaplayer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.77 2012/01/09 18:36:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.78 2012/01/20 12:32:06 ago Exp $
+
+  20 Jan 2012; Agostino Sarubbo <ago@gentoo.org> alsaplayer-0.99.81.ebuild:
+  force libmikmod to slot 0, as ssuominen suggested
 
   09 Jan 2012; Agostino Sarubbo <ago@gentoo.org> alsaplayer-0.99.81.ebuild:
   Stable for AMD64, wrt bug #398271
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
index c968f8b5d0f1..d5302297d8a7 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild,v 1.5 2012/01/09 18:36:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild,v 1.6 2012/01/20 12:32:06 ago Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -23,7 +23,7 @@ RDEPEND="media-libs/libsndfile
 	id3tag? ( media-libs/libid3tag )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.80 )
 	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
+	mikmod? ( media-libs/libmikmod:0 )
 	nas? ( media-libs/nas )
 	ogg? ( media-libs/libogg )
 	opengl? ( virtual/opengl )
diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog
index 9057a3dd6497..82fe055c5d14 100644
--- a/media-sound/cmus/ChangeLog
+++ b/media-sound/cmus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cmus
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.53 2011/12/01 02:38:57 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.54 2012/01/20 12:30:44 ago Exp $
+
+  20 Jan 2012; Agostino Sarubbo <ago@gentoo.org> cmus-2.4.2.ebuild,
+  cmus-2.4.3.ebuild:
+  force libmikmod to slot 0, as ssuominen suggested
 
 *cmus-2.4.3 (01 Dec 2011)
 
diff --git a/media-sound/cmus/cmus-2.4.2.ebuild b/media-sound/cmus/cmus-2.4.2.ebuild
index 5e5d1a26e0f7..6a65e6d3f0d8 100644
--- a/media-sound/cmus/cmus-2.4.2.ebuild
+++ b/media-sound/cmus/cmus-2.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.2.ebuild,v 1.3 2011/11/02 14:53:45 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.2.ebuild,v 1.4 2012/01/20 12:30:44 ago Exp $
 
 EAPI=4
 inherit eutils multilib
@@ -23,7 +23,7 @@ CDEPEND="sys-libs/ncurses[unicode?]
 	ao? (  media-libs/libao )
 	flac? ( media-libs/flac )
 	mad? ( >=media-libs/libmad-0.14 )
-	mikmod? ( media-libs/libmikmod )
+	mikmod? ( media-libs/libmikmod:0 )
 	modplug? ( >=media-libs/libmodplug-0.7 )
 	mp4? ( >=media-libs/libmp4v2-1.9 )
 	musepack? ( >=media-sound/musepack-tools-444 )
diff --git a/media-sound/cmus/cmus-2.4.3.ebuild b/media-sound/cmus/cmus-2.4.3.ebuild
index b778aa707952..2a8678822b3e 100644
--- a/media-sound/cmus/cmus-2.4.3.ebuild
+++ b/media-sound/cmus/cmus-2.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.3.ebuild,v 1.1 2011/12/01 02:38:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.3.ebuild,v 1.2 2012/01/20 12:30:44 ago Exp $
 
 EAPI=4
 inherit eutils multilib
@@ -23,7 +23,7 @@ CDEPEND="sys-libs/ncurses[unicode?]
 	ao? (  media-libs/libao )
 	flac? ( media-libs/flac )
 	mad? ( >=media-libs/libmad-0.14 )
-	mikmod? ( media-libs/libmikmod )
+	mikmod? ( media-libs/libmikmod:0 )
 	modplug? ( >=media-libs/libmodplug-0.7 )
 	mp4? ( >=media-libs/libmp4v2-1.9 )
 	musepack? ( >=media-sound/musepack-tools-444 )
diff --git a/media-sound/ecasound/ChangeLog b/media-sound/ecasound/ChangeLog
index d357760b49a9..bd8df26057bb 100644
--- a/media-sound/ecasound/ChangeLog
+++ b/media-sound/ecasound/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/ecasound
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ChangeLog,v 1.60 2011/07/24 18:15:44 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ChangeLog,v 1.61 2012/01/20 12:29:31 ago Exp $
+
+  20 Jan 2012; Agostino Sarubbo <ago@gentoo.org> ecasound-2.6.0.ebuild,
+  ecasound-2.8.1.ebuild:
+  force libmikmod to slot 0, as ssuominen suggested
 
   24 Jul 2011; Raúl Porcel <armin76@gentoo.org> ecasound-2.6.0.ebuild:
   Drop sparc keyword
diff --git a/media-sound/ecasound/ecasound-2.6.0.ebuild b/media-sound/ecasound/ecasound-2.6.0.ebuild
index d43f5fc6d888..f0a1f6ebedc7 100644
--- a/media-sound/ecasound/ecasound-2.6.0.ebuild
+++ b/media-sound/ecasound/ecasound-2.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.6.0.ebuild,v 1.8 2011/07/24 18:15:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.6.0.ebuild,v 1.9 2012/01/20 12:29:31 ago Exp $
 
 EAPI=3
 
@@ -22,7 +22,7 @@ RDEPEND="python? ( dev-lang/python )
 	alsa? ( media-libs/alsa-lib )
 	vorbis? ( media-libs/libvorbis )
 	libsamplerate? ( media-libs/libsamplerate )
-	mikmod? ( media-libs/libmikmod )
+	mikmod? ( media-libs/libmikmod:0 )
 	ruby? ( dev-lang/ruby )
 	python? ( dev-lang/python )
 	ncurses? ( sys-libs/ncurses )
diff --git a/media-sound/ecasound/ecasound-2.8.1.ebuild b/media-sound/ecasound/ecasound-2.8.1.ebuild
index 804d3392c924..1e91266377a7 100644
--- a/media-sound/ecasound/ecasound-2.8.1.ebuild
+++ b/media-sound/ecasound/ecasound-2.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.8.1.ebuild,v 1.1 2011/06/28 04:21:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.8.1.ebuild,v 1.2 2012/01/20 12:29:31 ago Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2"
@@ -23,7 +23,7 @@ RDEPEND="sys-libs/readline
 	jack? ( media-sound/jack-audio-connection-kit )
 	libsamplerate? ( media-libs/libsamplerate )
 	media-libs/ladspa-sdk
-	mikmod? ( media-libs/libmikmod )
+	mikmod? ( media-libs/libmikmod:0 )
 	ncurses? ( sys-libs/ncurses )
 	oil? ( dev-libs/liboil )
 	osc? ( media-libs/liblo )
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 27dea27f4906..136382798c83 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.275 2012/01/05 10:26:03 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.276 2012/01/20 12:27:58 ago Exp $
+
+  20 Jan 2012; Agostino Sarubbo <ago@gentoo.org> mpd-0.16.2.ebuild,
+  mpd-0.16.5.ebuild, mpd-0.16.6.ebuild, mpd-9999.ebuild:
+  force libmikmod to slot 0, as ssuominen suggested
 
   05 Jan 2012; Michael Weber <xmw@gentoo.org> mpd-0.16.5.ebuild:
   ppc/ppc64 stable (bug 388369)
diff --git a/media-sound/mpd/mpd-0.16.2.ebuild b/media-sound/mpd/mpd-0.16.2.ebuild
index 7d0662e2ce46..1ef33309d980 100644
--- a/media-sound/mpd/mpd-0.16.2.ebuild
+++ b/media-sound/mpd/mpd-0.16.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.14 2011/08/07 14:24:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.2.ebuild,v 1.15 2012/01/20 12:27:58 ago Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib
@@ -44,7 +44,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	mms? ( media-libs/libmms )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
+	mikmod? ( media-libs/libmikmod:0 )
 	modplug? ( media-libs/libmodplug )
 	mpg123? ( >=media-sound/mpg123-1.12.2 )
 	musepack? ( media-sound/musepack-tools )
diff --git a/media-sound/mpd/mpd-0.16.5.ebuild b/media-sound/mpd/mpd-0.16.5.ebuild
index a6137af1ebfa..87a507405738 100644
--- a/media-sound/mpd/mpd-0.16.5.ebuild
+++ b/media-sound/mpd/mpd-0.16.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.5.ebuild,v 1.7 2012/01/05 10:26:03 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.5.ebuild,v 1.8 2012/01/20 12:27:58 ago Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib
@@ -44,7 +44,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	mms? ( media-libs/libmms )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
+	mikmod? ( media-libs/libmikmod:0 )
 	modplug? ( media-libs/libmodplug )
 	mpg123? ( >=media-sound/mpg123-1.12.2 )
 	musepack? ( media-sound/musepack-tools )
diff --git a/media-sound/mpd/mpd-0.16.6.ebuild b/media-sound/mpd/mpd-0.16.6.ebuild
index 7856a88a94d8..586c2e1b9e67 100644
--- a/media-sound/mpd/mpd-0.16.6.ebuild
+++ b/media-sound/mpd/mpd-0.16.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.6.ebuild,v 1.1 2011/12/04 13:01:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.6.ebuild,v 1.2 2012/01/20 12:27:58 ago Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib
@@ -44,7 +44,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	mms? ( media-libs/libmms )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
+	mikmod? ( media-libs/libmikmod:0 )
 	modplug? ( media-libs/libmodplug )
 	mpg123? ( >=media-sound/mpg123-1.12.2 )
 	musepack? ( media-sound/musepack-tools )
diff --git a/media-sound/mpd/mpd-9999.ebuild b/media-sound/mpd/mpd-9999.ebuild
index 76c4e25badaf..c2972cf921a8 100644
--- a/media-sound/mpd/mpd-9999.ebuild
+++ b/media-sound/mpd/mpd-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-9999.ebuild,v 1.2 2011/07/17 16:08:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-9999.ebuild,v 1.3 2012/01/20 12:27:58 ago Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic linux-info multilib git-2
@@ -43,7 +43,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	lame? ( network? ( media-sound/lame ) )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
+	mikmod? ( media-libs/libmikmod:0 )
 	mms? ( media-libs/libmms )
 	modplug? ( media-libs/libmodplug )
 	mpg123? ( >=media-sound/mpg123-1.12.2 )