Don't set any font defaults, just rely on upstream.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 16 insertions, 38 deletions

diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 4737fee3357f..1dc3d4a74783 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.10 2011/04/03 20:03:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.11 2011/04/03 20:46:39 scarabeus Exp $
+
+  03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
+  mplayer2-9999.ebuild:
+  Don't set any font defaults, just rely on upstream.
 
   03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
   mplayer2-9999.ebuild:
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index 4dce96ac2514..add59f072b9e 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
 DIST mplayer2-2.0.tar.xz 3675080 RMD160 7dc37f0071a9a8bc348a40b26b480a365a904d62 SHA1 0df8d4e5484128b7b28029273b7704ab5d5419bc SHA256 f1d17397bbdfcff2220d8b4bc17e7de5b78488736e21dca2df0d8a3216c85910
-EBUILD mplayer2-2.0.ebuild 17429 RMD160 c160a95b4982f80ac9ca81930e2ca112b3e53329 SHA1 f3ab8c217a0386aa6060c6e39f562f045c32d92f SHA256 acdcde35195a721ebf535ea2db571285c79f03e99f8ee6bf397d56a273bc6675
-EBUILD mplayer2-9999.ebuild 17379 RMD160 f097ecc864080cf7bc4565496f73f50d0986d267 SHA1 08dfee8e8fe6247553420452ddc74c672e343e33 SHA256 b03197f18a9a2be7bd326836f3e33abd164e9c71fe0a5db90e0d75f8a6db91c8
-MISC ChangeLog 5077 RMD160 36b0805e609e47c3edd54db2a4eada7c7c1c517a SHA1 174f04d59c323a2fca1961d8453bcc2a5a3b9355 SHA256 8427431fd026937eeec76b075ae523de342b730f2577373e9e0353cb8c873ca8
+EBUILD mplayer2-2.0.ebuild 17205 RMD160 3ab0df115457a551e71cab11186c5e551cf742f0 SHA1 4180a2169e8e6c3a1b09523f15a352a58c8656c6 SHA256 e6bd4a8221a3a15121cfa5878a0c5306018e13e881540b9c74ddc00438428672
+EBUILD mplayer2-9999.ebuild 17155 RMD160 5a1b34a24229fec91b35f29fb54748af0337efc3 SHA1 706e1de538dff29fb4beb3afd9c50f7214f4f3ba SHA256 1e2e05e0545d68b944a0cf62a2b57eb54745d6e2dff251ece12b200415cb83f5
+MISC ChangeLog 5232 RMD160 35ab22ce5de57798c631ea9e40d70282954613d7 SHA1 8667906bc340ffc7d4ae08c997b8de2b0da02627 SHA256 898bd533aeea281f94b159d7ee3fcf4572c1695daadcb1af53705ae903a9caa7
 MISC metadata.xml 3362 RMD160 92db76b2da1919db7ba1293c9ca665db2a2230dd SHA1 a5c3ca0b0dc0c1765a96f250e3ba4471926bec21 SHA256 3e1e3815b292a52c6215a97e38341460ce3d054d0b55dbd880a059c6b60f70de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2Y2McACgkQXkR9YqOcLPHnSAEAjalCd1FzYsYIZjl+cpk1Arby
-WIE46o76NCjZ6TRG3REA/AjPBlaQh3lMMGxaRiuoI8irSkjd1U5mCUs6Xutcitej
-=S1i1
+iEYEARECAAYFAk2Y22kACgkQHB6c3gNBRYdP4wCgwPlXAKptfSmk9MAPl6dRxz3s
+unUAnRsHEOR8Uogm0P+5HOrqypZCsAb5
+=iBGW
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/mplayer2-2.0.ebuild b/media-video/mplayer2/mplayer2-2.0.ebuild
index 8d52cab2e14e..5dfd5748d916 100644
--- a/media-video/mplayer2/mplayer2-2.0.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.7 2011/04/03 20:03:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.8 2011/04/03 20:46:39 scarabeus Exp $
 
 EAPI=4
 
@@ -641,20 +641,7 @@ _EOF_
 	doins "${S}/etc/input.conf"
 	use osdmenu && doins "${S}/etc/menu.conf"
 
-	if use ass || use truetype; then
-		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-ass-hinting=3
-ass-use-margins=1
-ass-font-scale=2
-ass-border-color=00000000
-ass-color=ffff0000
-_EOF_
-	fi
-
-	# bug 256203
+	# set unrar path when required
 	if use rar; then
 		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
 unrarexec=${EPREFIX}/usr/bin/unrar
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index 0aeab231b575..12fe5f7b302b 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.8 2011/04/03 20:03:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.9 2011/04/03 20:46:39 scarabeus Exp $
 
 EAPI=4
 
@@ -640,20 +640,7 @@ _EOF_
 	doins "${S}/etc/input.conf"
 	use osdmenu && doins "${S}/etc/menu.conf"
 
-	if use ass || use truetype; then
-		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-ass-hinting=3
-ass-use-margins=1
-ass-font-scale=2
-ass-border-color=00000000
-ass-color=ffff0000
-_EOF_
-	fi
-
-	# bug 256203
+	# set unrar path when required
 	if use rar; then
 		cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
 unrarexec=${EPREFIX}/usr/bin/unrar