unicode vs iconv

Package-Manager: portage-2.1.1_pre2-r4

3 files changed, 22 insertions, 18 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 58cb43026b04..eb18da866aeb 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.401 2006/07/13 02:24:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.402 2006/07/15 20:52:49 lu_zero Exp $
+
+  15 Jul 2006; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre8-r1.ebuild:
+  split unicode from iconv
 
   13 Jul 2006; Aron Griffis <agriffis@gentoo.org> mplayer-1.0_pre8.ebuild,
   mplayer-1.0_pre8-r1.ebuild, mplayer-1.0.20060102.ebuild,
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 613faa532189..3e0dd9523a9b 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -65,18 +65,18 @@ EBUILD mplayer-1.0_pre7-r1.ebuild 16946 RMD160 a4b8a7b145a1966115700b8f5ad029703
 MD5 6665717da157777f9f197f883e032185 mplayer-1.0_pre7-r1.ebuild 16946
 RMD160 a4b8a7b145a1966115700b8f5ad029703e4e7933 mplayer-1.0_pre7-r1.ebuild 16946
 SHA256 953fdad4dd350a4b691d73ed23405286ed5e93e2ab122c7e428ebd34ff92d4f9 mplayer-1.0_pre7-r1.ebuild 16946
-EBUILD mplayer-1.0_pre8-r1.ebuild 16659 RMD160 0b01eda587fcc795eb7acc0a655588ff23c18981 SHA1 96385abcbcad686784028656788a7af81fca9062 SHA256 9f46f589c1e173b3ec2b6a9ac68c6b8501a1b1341e440dba1b786ad5070caf6f
-MD5 468aa2aaba445699838d54b963cd0c0f mplayer-1.0_pre8-r1.ebuild 16659
-RMD160 0b01eda587fcc795eb7acc0a655588ff23c18981 mplayer-1.0_pre8-r1.ebuild 16659
-SHA256 9f46f589c1e173b3ec2b6a9ac68c6b8501a1b1341e440dba1b786ad5070caf6f mplayer-1.0_pre8-r1.ebuild 16659
+EBUILD mplayer-1.0_pre8-r1.ebuild 16675 RMD160 a3aa80cc6b0be836d5f627facc223f3097322e3b SHA1 c2aeb566f5dfc33b6b8802eb58059f595e8e31b2 SHA256 fb189c3126734c9d4510eb4e2e73e8c168848b4c1729350181a55c3bf8605b87
+MD5 c8662772861193dfc2495cf9448a8f2b mplayer-1.0_pre8-r1.ebuild 16675
+RMD160 a3aa80cc6b0be836d5f627facc223f3097322e3b mplayer-1.0_pre8-r1.ebuild 16675
+SHA256 fb189c3126734c9d4510eb4e2e73e8c168848b4c1729350181a55c3bf8605b87 mplayer-1.0_pre8-r1.ebuild 16675
 EBUILD mplayer-1.0_pre8.ebuild 16974 RMD160 a8222bc01ba2ffbf4395a120cd21fa04050b8a8c SHA1 4101c472774d7781ca6373a92749013b1088b32b SHA256 49bc9c292ac2852fc178221c37e403f795bd78aaed037e4008b3929addb41330
 MD5 edfea0472d42833ae261ec4f2ed4f353 mplayer-1.0_pre8.ebuild 16974
 RMD160 a8222bc01ba2ffbf4395a120cd21fa04050b8a8c mplayer-1.0_pre8.ebuild 16974
 SHA256 49bc9c292ac2852fc178221c37e403f795bd78aaed037e4008b3929addb41330 mplayer-1.0_pre8.ebuild 16974
-MISC ChangeLog 72742 RMD160 5b4f5b049e976285dae1b5814370bf0b6b06eef9 SHA1 6278703ba2240f387b06d226a2e3b7634c91b700 SHA256 1e29d9861521b2f3d4fd470d85d3e5336f6c30d256abf6cb6058703655903a9c
-MD5 f97ba72cccba1bd74fa88e24e9eeb004 ChangeLog 72742
-RMD160 5b4f5b049e976285dae1b5814370bf0b6b06eef9 ChangeLog 72742
-SHA256 1e29d9861521b2f3d4fd470d85d3e5336f6c30d256abf6cb6058703655903a9c ChangeLog 72742
+MISC ChangeLog 72846 RMD160 fd18c311b2aaf6cfb43710f30c0d89755942afae SHA1 0163adce314bd9f447fa8bb8b26961736cf88295 SHA256 80e9fd61fce16bbbfcc090dfc06d760d9c5a6517c1a0c97cc760a6d6bd4ed503
+MD5 7a2746f6a66652f8b5248190780cbf04 ChangeLog 72846
+RMD160 fd18c311b2aaf6cfb43710f30c0d89755942afae ChangeLog 72846
+SHA256 80e9fd61fce16bbbfcc090dfc06d760d9c5a6517c1a0c97cc760a6d6bd4ed503 ChangeLog 72846
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
diff --git a/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
index e6193c02e215..50f2a6ce77b8 100644
--- a/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild,v 1.5 2006/07/13 02:24:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre8-r1.ebuild,v 1.6 2006/07/15 20:52:49 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
 RESTRICT="nostrip"
 IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec amr arts bidi bl bindist
-cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv
-dvdread enca encode esd fbcon gif ggi gtk ipv6 jack joystick jpeg libcaca
-lirc live livecd lzo mad matrox mmx mmxext musepack nas unicode vorbis
-opengl openal oss png real rtc samba sdl speex sse sse2 svga tga theora
-truetype v4l v4l2 win32codecs X x264 xanim xinerama xmms xv xvid xvmc"
+cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd
+dv dvdread enca encode esd fbcon gif ggi gtk iconv ipv6 jack joystick jpeg
+libcaca lirc live livecd lzo mad matrox mmx mmxext musepack nas unicode
+vorbis opengl openal oss png real rtc samba sdl speex sse sse2 svga tga
+theora truetype v4l v4l2 win32codecs X x264 xanim xinerama xmms xv xvid
+xvmc"
 
 BLUV=1.5
 SVGV=1.9.17
@@ -107,7 +108,7 @@ DEPEND="${RDEPEND}
 		   x11-proto/xf86vidmodeproto )
 	X? ( x11-proto/xextproto
 		 x11-proto/xf86vidmodeproto )
-	unicode? ( virtual/libiconv )"
+	iconv? ( virtual/libiconv )"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -249,9 +250,9 @@ src_compile() {
 
 	myconf="${myconf} $(use_enable bidi fribidi)"
 
-	if use unicode
+	if use iconv
 	then
-		myconf="${myconf} --charset=UTF-8"
+		use unicode && myconf="${myconf} --charset=UTF-8"
 	else
 		myconf="${myconf} --charset=noconv"
 	fi