Remove libmpcdec (SV7) support. Replaced by musepack-tools (SV7 and SV8) support.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

5 files changed, 15 insertions, 14 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index fa865bbaf75c..31f929161e79 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.520 2009/10/16 12:32:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.521 2009/10/17 10:46:44 ssuominen Exp $
+
+  17 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> vlc-0.9.10.ebuild,
+  vlc-1.0.2.ebuild, vlc-1.0.9999.ebuild, vlc-9999.ebuild:
+  Remove libmpcdec (SV7) support. Replaced by musepack-tools (SV7 and SV8)
+  support.
 
   16 Oct 2009; Alexis Ballier <aballier@gentoo.org> vlc-1.0.9999.ebuild:
   remove patch merged upstream
diff --git a/media-video/vlc/vlc-0.9.10.ebuild b/media-video/vlc/vlc-0.9.10.ebuild
index e9e0844330cb..1798cd0e2890 100644
--- a/media-video/vlc/vlc-0.9.10.ebuild
+++ b/media-video/vlc/vlc-0.9.10.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-video/vlc/vlc-0.9.10.ebuild,v 1.7 2009/09/30 12:56:40 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.10.ebuild,v 1.8 2009/10/17 10:46:44 ssuominen Exp $
 
 EAPI="1"
 
@@ -49,7 +49,7 @@ KEYWORDS="alpha amd64 ~arm ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="a52 aac aalib alsa altivec arts atmo avahi bidi cdda cddax cddb cdio dbus dc1394
 	debug dirac directfb dts dvb dvd elibc_glibc esd fbcon fluidsynth +ffmpeg flac fontconfig +gcrypt ggi gnome gnutls hal httpd
 	id3tag jack kate libass libcaca libnotify libsysfs libv4l2 lirc live lua matroska mmx modplug mp3 mpeg
-	musepack ncurses nsplugin ogg opengl optimisememory oss pda png	pulseaudio pvr +qt4
+	ncurses nsplugin ogg opengl optimisememory oss pda png	pulseaudio pvr +qt4
 	remoteosd rtsp run-as-root samba schroedinger sdl sdl-image seamonkey shout skins speex sse stream svg svga taglib
 	theora truetype twolame upnp v4l v4l2 vcdinfo vcdx vlm vorbis win32codecs
 	X x264 xinerama xml xosd xv zvbi"
@@ -105,7 +105,6 @@ RDEPEND="
 		modplug? ( media-libs/libmodplug )
 		mp3? ( media-libs/libmad )
 		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		musepack? ( media-libs/libmpcdec )
 		ncurses? ( sys-libs/ncurses )
 		nsplugin? (
 			seamonkey?  ( =www-client/seamonkey-1* )
@@ -292,7 +291,7 @@ src_compile () {
 		$(use_enable modplug mod) \
 		$(use_enable mp3 mad) \
 		$(use_enable mpeg libmpeg2) \
-		$(use_enable musepack mpc) \
+		--disable-mpc \
 		$(use_enable ncurses) \
 		$(use_enable nsplugin mozilla) --with-mozilla-pkg="${MOZILLA_PC}" \
 		$(use_enable ogg) \
diff --git a/media-video/vlc/vlc-1.0.2.ebuild b/media-video/vlc/vlc-1.0.2.ebuild
index 2ae892869d72..e5a97cc31c14 100644
--- a/media-video/vlc/vlc-1.0.2.ebuild
+++ b/media-video/vlc/vlc-1.0.2.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-video/vlc/vlc-1.0.2.ebuild,v 1.10 2009/10/10 10:46:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.2.ebuild,v 1.11 2009/10/17 10:46:44 ssuominen Exp $
 
 EAPI="2"
 
@@ -110,8 +110,7 @@ RDEPEND="
 		mp3? ( media-libs/libmad )
 		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
 		mtp? ( >=media-libs/libmtp-0.3.0 )
-		musepack? ( || ( >=media-sound/musepack-tools-444
-			media-libs/libmpcdec ) )
+		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
 		nsplugin? (
 			seamonkey?  ( =www-client/seamonkey-1* )
diff --git a/media-video/vlc/vlc-1.0.9999.ebuild b/media-video/vlc/vlc-1.0.9999.ebuild
index fdce1bab421f..7a18a4b93ebc 100644
--- a/media-video/vlc/vlc-1.0.9999.ebuild
+++ b/media-video/vlc/vlc-1.0.9999.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-video/vlc/vlc-1.0.9999.ebuild,v 1.30 2009/10/16 12:32:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.9999.ebuild,v 1.31 2009/10/17 10:46:44 ssuominen Exp $
 
 EAPI="2"
 
@@ -110,8 +110,7 @@ RDEPEND="
 		mp3? ( media-libs/libmad )
 		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
 		mtp? ( >=media-libs/libmtp-0.3.0 )
-		musepack? ( || ( >=media-sound/musepack-tools-444
-			media-libs/libmpcdec ) )
+		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
 		nsplugin? (
 			seamonkey?  ( =www-client/seamonkey-1* )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 45d6b588380f..29266853d8a3 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.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-video/vlc/vlc-9999.ebuild,v 1.43 2009/10/16 12:20:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.44 2009/10/17 10:46:44 ssuominen Exp $
 
 EAPI="2"
 
@@ -109,8 +109,7 @@ RDEPEND="
 		mp3? ( media-libs/libmad )
 		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
 		mtp? ( >=media-libs/libmtp-0.3.0 )
-		musepack? ( || ( >=media-sound/musepack-tools-444
-			media-libs/libmpcdec ) )
+		musepack? ( >=media-sound/musepack-tools-444 )
 		ncurses? ( sys-libs/ncurses )
 		nsplugin? (
 			seamonkey?  ( =www-client/seamonkey-1* )