Rename local USE flag openjpeg to global USE flag jpeg2k.

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

3 files changed, 11 insertions, 8 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index ea6f69a53b7f..560f2d21f234 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.709 2010/02/13 19:43:45 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.710 2010/02/13 21:50:48 ssuominen Exp $
+
+  13 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  mplayer-1.0_rc4_p20100213.ebuild, metadata.xml:
+  Rename local USE flag openjpeg to global USE flag jpeg2k.
 
 *mplayer-1.0_rc4_p20100213 (13 Feb 2010)
 
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 26ea657ada87..d54334ab004f 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -29,7 +29,6 @@
 	<flag name="network">Enables network streaming support</flag>
 	<flag name="nut">Enables support for the NUT container format</flag>
 	<flag name="opencore-amr">Enables Adaptive Multi-Rate format support</flag>
-	<flag name="openjpeg">OpenJPEG (JPEG2000) input/output support</flag>
 	<flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag>
     <flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag>
     <flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20100213.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20100213.ebuild
index 2a4c1b11cb49..13626520bb2b 100644
--- a/media-video/mplayer/mplayer-1.0_rc4_p20100213.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc4_p20100213.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100213.ebuild,v 1.1 2010/02/13 19:43:45 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100213.ebuild,v 1.2 2010/02/13 21:50:48 ssuominen Exp $
 
 EAPI="2"
 
@@ -14,9 +14,9 @@ inherit eutils flag-o-matic multilib base ${SVN_ECLASS}
 IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass bidi bindist bl bs2b
 +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
-gif ggi -gmplayer +iconv ipv6 jack joystick jpeg kernel_linux ladspa libcaca
-lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
-+opengl openjpeg +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
+gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal
++opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
 samba +shm +schroedinger sdl +speex sse sse2 ssse3 svga tga +theora +tremor
 +truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis win32codecs
 +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
@@ -128,7 +128,7 @@ RDEPEND+="
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
 	openal? ( media-libs/openal )
-	openjpeg? ( media-libs/openjpeg )
+	jpeg2k? ( media-libs/openjpeg )
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )
 	pulseaudio? ( media-sound/pulseaudio )
@@ -429,7 +429,7 @@ src_configure() {
 	for i in ${uses}; do
 		use ${i} || myconf+=" --disable-${i}"
 	done
-	use openjpeg || myconf+=" --disable-libopenjpeg"
+	use jpeg2k || myconf+=" --disable-libopenjpeg"
 	if use vorbis || use tremor; then
 		use tremor || myconf+=" --disable-tremor-internal"
 		use vorbis || myconf+=" --disable-libvorbis"