Rename local USE flag openjpeg to global USE flag jpeg2k.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 14 insertions, 11 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/Manifest b/media-video/mplayer/Manifest
index c919b51f3dc4..eb7b8c8562ae 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,7 +11,7 @@ DIST mplayer-1.0_rc4_p20091026.tbz2 15508762 RMD160 f4a6b4253cfbea8d3f7d6e1ac1c5
 DIST mplayer-1.0_rc4_p20100213.tbz2 8811960 RMD160 b6991ef2dde9497bcffa32687f484598956db983 SHA1 350d39f2b42f5c5065abe7d64a4d759a9efa56f4 SHA256 59c09f6388ad15d12f74ae18ebe07945392e40d9096d5598bd496f857722bcb0
 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938
 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 19027 RMD160 5f5ae2bb3393c56d8e75a8523e491abd5264f086 SHA1 2754307d5bbc40e2c3043a66b16511d629b9b02f SHA256 4b41e26da8111aeb8229b57b2f5453c11a37c9b4382938fff03a72db8815120f
-EBUILD mplayer-1.0_rc4_p20100213.ebuild 19859 RMD160 c290d06e01cba3d09ac79353a43329fab8e00f97 SHA1 c3dfe07bf920764a340e3458308871a9491fa994 SHA256 331c51d243a8b05fee03ebe0106d38132313f64364e507f75e90217c52b85114
+EBUILD mplayer-1.0_rc4_p20100213.ebuild 19855 RMD160 fba44643404203ed19cdd09ee53883e58b46223a SHA1 8017b6c6b7122392af47d98183a7b6783e0903a8 SHA256 05327b4dfa2279a6487bcf303d20f73e25d4766d646a403d2a3c680622ae8d4e
 EBUILD mplayer-9999.ebuild 19681 RMD160 61f24d616a085623a8795898f0dd50778948e695 SHA1 7b2246199a6b41cac7decfc3c239a1f0e42dfe30 SHA256 a114fdd9a65c89123b9c9ad82474ab6e90f0dd2802969a4be46e7b0ec4a55883
-MISC ChangeLog 125315 RMD160 d8953e96b20cab9f9b3189363286fa0debeac8bc SHA1 0b9408a52be20f6c3303d7a894baa5d1a4f9769a SHA256 a74579bf21b78ba9caaced23241bad5bce7928385afdeec720725085acd5dae7
-MISC metadata.xml 3740 RMD160 4d99f018e8bee9b1d1f5ca83d3a8141fcde4eae1 SHA1 8c09bc369d2f53fcf2a057594b085818b5113129 SHA256 eed4c42b25af503bd31866e3b92a5497bf08d6e917a29d1f5c17c646acc8f177
+MISC ChangeLog 125482 RMD160 c766544b4c9fbc6ae4b8392d2ac3a9f87cf060e0 SHA1 b593d065a996ca45589c76c2696b0bfd6e7ae4d4 SHA256 bb2a9b713df43e07ecef3dbc03d8fe8935e04a047a4a6b65b9085fc398e7b806
+MISC metadata.xml 3669 RMD160 f5efa4d8b5b42acddd7a4e3ebce459dc90eeb05d SHA1 cd59f34ab27e32455a77aba91704896767330b97 SHA256 a9f4ace74fe3e15633efa39d68f33e99573dcf5158a0411f2571c29395c60bf6
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"