truetype/iconv useflag logic improved...

Package-Manager: portage-2.1.2_rc2

3 files changed, 27 insertions, 16 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index a5d75f77a566..e4ed0bdb07e3 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.435 2006/11/14 12:05:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.436 2006/11/21 20:43:05 lu_zero Exp $
+
+  21 Nov 2006; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_rc1.ebuild:
+  fix the iconv-truetype logic, thanks to hansmi for pointing the issue
 
   14 Nov 2006; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_rc1.ebuild:
   Typo, fixed thanks to baru reddy <barureddy@yahoo.com> and zzam, see 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index c2576878bacf..fdff44ac923a 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -27,14 +27,14 @@ EBUILD mplayer-1.0_pre8.ebuild 15502 RMD160 f5a95b76f748d84dd3c9f48250abdb371f0c
 MD5 db980765b40b1685613b1c2b3f91ecbc mplayer-1.0_pre8.ebuild 15502
 RMD160 f5a95b76f748d84dd3c9f48250abdb371f0c1143 mplayer-1.0_pre8.ebuild 15502
 SHA256 064f4421b0e091fba4c575b09cedd21cf6c4b8757bdc4608519d63d5b2dd5c9e mplayer-1.0_pre8.ebuild 15502
-EBUILD mplayer-1.0_rc1.ebuild 15672 RMD160 3c76fb6ceab49ee4d608fa86a49c4ffbdc31510c SHA1 a24d94e8ac4d2e3e9124d43ff85221a6a3ed0a6c SHA256 76f418d713b51641ad74ebf180cfc5c7bd3b697ae753e68d1f1d19a528dbb1aa
-MD5 b3074d1ad694d7478304de7d850b6891 mplayer-1.0_rc1.ebuild 15672
-RMD160 3c76fb6ceab49ee4d608fa86a49c4ffbdc31510c mplayer-1.0_rc1.ebuild 15672
-SHA256 76f418d713b51641ad74ebf180cfc5c7bd3b697ae753e68d1f1d19a528dbb1aa mplayer-1.0_rc1.ebuild 15672
-MISC ChangeLog 78602 RMD160 935018be148e8f7e49a9a0441e2fbfa78a252ade SHA1 07248e7ca2cd5cc6204b969552eb9463bb8265db SHA256 684262ffebef5d265a1dd48b65cca3c21c2e51cbcf86de59f41f8cd0c6ed4391
-MD5 e5d186f2885351dd963b6fbae9c7573f ChangeLog 78602
-RMD160 935018be148e8f7e49a9a0441e2fbfa78a252ade ChangeLog 78602
-SHA256 684262ffebef5d265a1dd48b65cca3c21c2e51cbcf86de59f41f8cd0c6ed4391 ChangeLog 78602
+EBUILD mplayer-1.0_rc1.ebuild 15946 RMD160 bf3f007342f0a2c17a1a0b70daa83d5c3925373c SHA1 544a3cbe55317206f7d18c8fafa550b423cb48da SHA256 dd6de14693f8c7e6b9fd3e053beffc6f8f9e476c2705cf14569ecb2bf2704788
+MD5 d7b657dfa2cdf95083945987b8019d83 mplayer-1.0_rc1.ebuild 15946
+RMD160 bf3f007342f0a2c17a1a0b70daa83d5c3925373c mplayer-1.0_rc1.ebuild 15946
+SHA256 dd6de14693f8c7e6b9fd3e053beffc6f8f9e476c2705cf14569ecb2bf2704788 mplayer-1.0_rc1.ebuild 15946
+MISC ChangeLog 78748 RMD160 96808582f20b88fef5d9a5343ca681ca0d8daa7f SHA1 aa3f9626681db436d06d62b78b44b36fae864864 SHA256 617fbc39515e11c82f268bd8a01cab6685a52781b953f6b1c603da9073559e1c
+MD5 47d7b887a3b27feadf4247ac8fb674b5 ChangeLog 78748
+RMD160 96808582f20b88fef5d9a5343ca681ca0d8daa7f ChangeLog 78748
+SHA256 617fbc39515e11c82f268bd8a01cab6685a52781b953f6b1c603da9073559e1c ChangeLog 78748
 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_rc1.ebuild b/media-video/mplayer/mplayer-1.0_rc1.ebuild
index f8b423ca18d8..c2fbb8096d29 100644
--- a/media-video/mplayer/mplayer-1.0_rc1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc1.ebuild
@@ -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/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.13 2006/11/14 12:05:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.14 2006/11/21 20:43:05 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -30,6 +30,9 @@ SRC_URI="mirror://mplayer/releases/${MY_P}.tar.bz2
 	!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
 				 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
 				 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
+	!iconv? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+			  mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+			  mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
 	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )
 	amr? ( ${AMR_URI}/26_series/26.104/26104-510.zip
@@ -127,7 +130,7 @@ pkg_setup() {
 		REALLIBDIR="/opt/RealPlayer/codecs"
 	fi
 
-	if use truetype && ! use iconv; then
+	if use truetype && ! use iconv ; then
 		ewarn "You enabled the 'truetype' USE flag, but support will be"
 		ewarn "disabled unless you also use 'iconv'."
 	fi
@@ -137,9 +140,11 @@ src_unpack() {
 
 	unpack ${MY_P}.tar.bz2
 
-	use truetype || unpack font-arial-iso-8859-1.tar.bz2 \
-							font-arial-iso-8859-2.tar.bz2 \
-							font-arial-cp1250.tar.bz2
+	if ! use truetype || ! use iconv ; then
+		unpack font-arial-iso-8859-1.tar.bz2 \
+			   font-arial-iso-8859-2.tar.bz2 \
+			   font-arial-cp1250.tar.bz2
+	fi
 
 	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
 
@@ -476,7 +481,7 @@ src_install() {
 		insinto /usr/share/applications
 		doins ${FILESDIR}/mplayer.desktop
 	fi
-	if ! use truetype
+	if ! use truetype || ! use iconv
 	then
 		dodir /usr/share/mplayer/fonts
 		local x=
@@ -495,11 +500,14 @@ src_install() {
 	newins ${S}/etc/example.conf mplayer.conf
 	dosed -e 's/include =/#include =/' /etc/mplayer.conf
 	dosed -e 's/fs=yes/fs=no/' /etc/mplayer.conf
-	use truetype && cat >> ${D}/etc/mplayer.conf << EOT
+	if use truetype && use iconv
+	then
+		cat >> ${D}/etc/mplayer.conf << EOT
 fontconfig=1
 subfont-osd-scale=4
 subfont-text-scale=3
 EOT
+	fi
 	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
 
 	#mv the midentify script to /usr/bin for emovix.