Remove mplayer local flags, add to global

2 files changed, 3 insertions, 7 deletions

diff --git a/profiles/use.desc b/profiles/use.desc
index da568145ef82..4ac38a544ce0 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.310 2006/10/21 17:54:17 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.311 2006/10/26 15:49:31 beandog Exp $
 
 # Keep them sorted
 
@@ -213,6 +213,7 @@ mozilla - Adds support for the Mozilla web-browser
 mp3 - Add support for reading mp3 files
 mpeg - Adds libmpeg3 support to various packages.
 mpi - Adds MPI (Message Passing Interface) layer to the apps that support it.
+mplayer - Enable mplayer support for playback or encoding
 msession - Adds support for msession daemon
 msn - Enable MSN Messenger IM protocol support
 msql - Adds support for the MSQL database server
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ba6c198ada7f..b2aaa8d2278c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -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/profiles/use.local.desc,v 1.2277 2006/10/25 21:03:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.local.desc,v 1.2278 2006/10/26 15:49:31 beandog Exp $
 
 # This file contains descriptions of local USE flags, and the ebuilds which
 # contain them.
@@ -721,7 +721,6 @@ media-gfx/blender:blender-game - Adds game engine support to blender
 media-gfx/blender:openexr - Adds support for openexr
 media-gfx/comix:rar - Pulls app-arch/unrar for rar file support
 media-gfx/digikam:nfs - Create sqlite db within ~/.kde, instead in the albums base directory.
-media-gfx/gimageview:mplayer - Enable mplayer support
 media-gfx/gimp:gimpprint - Enable gimp-print printing support
 media-gfx/gimp:print - Enable print plug-in
 media-gfx/gimp:smp - Enable support for multiprocessors
@@ -745,7 +744,6 @@ media-gfx/k3d:plib - build plib-based import/export library
 media-gfx/maya:bundled-libs - Use the bundled versions of libs rather than system ones (libstdc++, libgcc_s, libqt, and libXm)
 media-gfx/maya:maya-shaderlibrary - Install the maya shader library
 media-gfx/pixie:openexr - build OpenEXR display module
-media-gfx/pornview:mplayer - Enables mplayer support
 media-gfx/pstoedit:emf - enables media-libs/libemf support
 media-gfx/sane-frontends:gimp - Build a plugin for the GIMP
 media-gfx/showimg:kipi - Support for the KDE Image Plugin Interface.
@@ -946,7 +944,6 @@ media-video/chaplin:transcode - Enable DVD ripping and transcoding
 media-video/cinelerra-cvs:css - Enable support for encrypted files through libmpeg3
 media-video/cinelerra-cvs:freetype2 - Enable freetype2 support
 media-video/dvdrip:fping - Enables fping support for cluster rendering
-media-video/dvdrip:mplayer - Enables video playback by mplayer
 media-video/dvdrip:rar - Enables rar compression of VOB fiels
 media-video/dvdrip:subtitles - Enables support for subtitle ripping
 media-video/dxr3player:dxr3 - Support for DXR3 mpeg accelleration cards
@@ -955,7 +952,6 @@ media-video/ffmpeg:network - Enables network streaming support
 media-video/ffmpeg:x264 - Enables h264 encoding using x264
 media-video/flumotion:gstreamer08 - Use GStreamer 0.8 over GStreamer 0.10
 media-video/gpac:amr - Adaptive Multi-Rate Audio support (commonly used in telephony)
-media-video/kmplayer:mplayer - Enables video playback by mplayer
 media-video/linux-uvc:isight - Apply patch to work _only_ with the Apple iSight
 media-video/lives:libvisual - Enable libvisual support
 media-video/mjpegtools:yv12 - Enables support for the YV12 pixel format
@@ -990,7 +986,6 @@ media-video/mplayer:xanim - Enables support for xanim based codecs
 media-video/mplayer:xvmc - Enables X-Video Motion Compensation support
 media-video/ogmrip:srt - Support for SRT subtitle format
 media-video/oxine:polling - Enables support to automatically check the drive for a new disc
-media-video/qdvdauthor:mplayer - Enables video playback by mplayer
 media-video/totem:nvtv - Support for nvtv to use tv in on nvidia cards
 media-video/transcode:extrafilters - Install some filters only if we ask for them
 media-video/transcode:fame - Enables libfame support