Rename USE opencore-amr to amr.

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

6 files changed, 22 insertions, 27 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 739ef834b72b..d1403667f631 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.720 2010/04/07 10:49:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.721 2010/04/23 13:04:43 ssuominen Exp $
+
+  23 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  mplayer-1.0_rc4_p20091026-r1.ebuild, mplayer-1.0_rc4_p20100213-r1.ebuild,
+  mplayer-9999.ebuild, metadata.xml:
+  Rename USE opencore-amr to amr.
 
   07 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   mplayer-1.0_rc4_p20091026-r1.ebuild, mplayer-1.0_rc4_p20100213-r1.ebuild,
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 76ed48af4b66..bd88450973ab 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch 689 RMD160 a2a26ad4129bcfb4330ed6f1ee35e6ee1b73fb0d SHA1 918dee2cdff42297376d1afcb9eb9cff6f6f4094 SHA256 54b129ae19a1728981fef5530ba12828f163079201bb479afba7a74d4425e847
 AUX mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch 986 RMD160 4ff6e06c604c3d609d1f4cbdd560577d89f3eabc SHA1 cf26d0c5a6b5ab9a36864cfdfb34106e2676ab2f SHA256 63e43820838365fec77e53d7f2b70091045b350c5c4e7c304c5ca692c20551d7
 AUX mplayer-1.0_rc2_p20090731-linguas.patch 699 RMD160 eccde57fe14b664e962ca5c997fa6b72ebadc763 SHA1 0f036a975250a7ef6429f9c6dce036453c3a1d25 SHA256 c0939c548249afbc45905570c99bb6593175ebaf6e34bfceda284253600d9d22
@@ -13,15 +10,8 @@ DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d14
 DIST mplayer-1.0_rc4_p20091026.tbz2 15508762 RMD160 f4a6b4253cfbea8d3f7d6e1ac1c5a0d2a0775289 SHA1 dcd55d37d2866ef43b626db62572d7b03a8ca0d9 SHA256 bea714010cf4b0b4f1003716b36d03b73b694dc81a68785c11ef0a9bcafbaa3a
 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 18954 RMD160 f7a567c76323d8dbfa6022d2ba13ff8e2004d467 SHA1 870b95514c4d3535f7544dfdc6af86f494e341e8 SHA256 e059c5265126882fe2a18fa420539f030e3c2125deaa777dd1fb0f6ebc56ff0a
-EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19876 RMD160 4a1d9fb3d3593290811509be78812c4b8bdb7452 SHA1 48a186149fe8aa727c1e1fd3a90de4afa14931ae SHA256 acef18c8b03baec417ca2329053424bab91a8a2fb2ce0b3f69c3e3b2c136fdce
-EBUILD mplayer-9999.ebuild 19822 RMD160 9be3d8881026710a02b67f8a54ee29a7880fe2da SHA1 b32b6a9859edb7407b775703d30d277adfb81747 SHA256 a5b02747647fc8f09e25b3ea0749fcba924abe7a884fb94061318ab853e2f294
-MISC ChangeLog 127315 RMD160 0e375abdabd2d7207bc9a8d748c97b13625dca86 SHA1 7d2456f780f71f2077fcda58bd5db6b70f029b07 SHA256 79e1428c2d68623bd4b3cc94b258c9bc01f21d8e11b76f252c01ca207445ce07
-MISC metadata.xml 3592 RMD160 283728925342ad60ab657686a28c4b23498be4d8 SHA1 83077e1c109828be3970cf9faa24dde8a1434ad2 SHA256 f03e536b7c341c873dbf18fb23a29e648a80f07cf26f68246acf2664923f6df1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAku8Y1EACgkQHB6c3gNBRYerhQCdG7VYbYkjpizi1pDzzr0euqjO
-5l4AnREJBlrNr6BJY6T4AK3Z39uoOyMS
-=DKwg
------END PGP SIGNATURE-----
+EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070
+EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19858 RMD160 5f77503100806ab35de8133fa488d965438b73f6 SHA1 2d24955936312f05e7c21e0121ca0140d2fc2f0e SHA256 1655621f8bd99ed913f5e3b3104645c2c4fb6644a0de4dcc26b28c71ef1b5fd8
+EBUILD mplayer-9999.ebuild 19804 RMD160 1f3287c53e98c0b655a1bf0632243f4419770570 SHA1 72bf48a6f6f85b3a2f4b534dc9eb6a80ce38bee3 SHA256 e99ba917f51972d703ace4d353820e6f1643620aad6824eca0438be0c5b172a7
+MISC ChangeLog 127517 RMD160 68916cea962f868e211f580b04977ed59d6bcd68 SHA1 ded52dcfca0e975a95a0febdd2aec8680c61fdf6 SHA256 e70f91a567500f2977bdf25017347654ae6e9029a16d401394042582901ce2d2
+MISC metadata.xml 3583 RMD160 139bd1ef6b0628371e72fae6a93989a411606635 SHA1 edb785eb73b2d958860e24851272519f3eb3ee3b SHA256 0c76d73ae04fd2dd1823611c0487a4f3548585636106ed6bb45c14257127300d
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index eeb89b4a9ff8..9bf3f16cc4e4 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <use>
     <flag name="3dnowext">Enable 3dnowext cpu instructions</flag>
+	<flag name="amr">Enables Adaptive Multi-Rate format support</flag>
     <flag name="ass">Internal SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support</flag>
     <flag name="bl">Blinkenlights video output</flag>
 	<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
@@ -27,7 +28,6 @@
     <flag name="mng">MNG input support</flag>
 	<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="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_p20091026-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20091026-r1.ebuild
index 1bf019c23a2f..df145f698244 100644
--- a/media-video/mplayer/mplayer-1.0_rc4_p20091026-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc4_p20091026-r1.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_p20091026-r1.ebuild,v 1.17 2010/04/07 10:49:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20091026-r1.ebuild,v 1.18 2010/04/23 13:04:43 ssuominen Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -12,7 +12,7 @@ IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass bidi bindist bl bs2b
 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
-opencore-amr +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real
+amr +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real
 +rtc samba +shm +schroedinger sdl +speex sse sse2 ssse3 svga teletext tga
 +theora +toolame +tremor +truetype +twolame +unicode v4l v4l2 vdpau vidix +vorbis
 win32codecs +X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran"
@@ -50,7 +50,7 @@ RDEPEND="sys-libs/ncurses
 	)
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
-	opencore-amr? ( media-libs/opencore-amr )
+	amr? ( media-libs/opencore-amr )
 	openal? ( media-libs/openal )
 	bidi? ( dev-libs/fribidi )
 	bs2b? ( media-libs/libbs2b )
@@ -331,7 +331,7 @@ src_configure() {
 	# Use internal musepack codecs for SV7 and SV8 support
 	myconf="${myconf} --disable-musepack"
 
-	use opencore-amr || myconf="${myconf} --disable-libopencore_amrnb
+	use amr || myconf="${myconf} --disable-libopencore_amrnb
 		--disable-libopencore_amrwb"
 	use aac || myconf="${myconf} --disable-faad-internal"
 	use dirac || myconf="${myconf} --disable-libdirac-lavc"
diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild
index 91f6209300d4..6521e5e87dc3 100644
--- a/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.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-r1.ebuild,v 1.8 2010/04/07 10:49:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild,v 1.9 2010/04/23 13:04:43 ssuominen Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass bidi bindist bl bs2b
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
 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
-opencore-amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
+amr +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"
@@ -126,7 +126,7 @@ RDEPEND+="
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
 	openal? ( media-libs/openal )
-	opencore-amr? ( media-libs/opencore-amr )
+	amr? ( media-libs/opencore-amr )
 	jpeg2k? ( media-libs/openjpeg )
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index dd6b6a0d4630..639fd667e869 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.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-9999.ebuild,v 1.35 2010/04/07 10:49:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.36 2010/04/23 13:04:43 ssuominen Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass bidi bindist bl bs2b
 doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp
 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
-opencore-amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc
+amr +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"
@@ -126,7 +126,7 @@ RDEPEND+="
 	nas? ( media-libs/nas )
 	nut? ( >=media-libs/libnut-661 )
 	openal? ( media-libs/openal )
-	opencore-amr? ( media-libs/opencore-amr )
+	amr? ( media-libs/opencore-amr )
 	jpeg2k? ( media-libs/openjpeg )
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )