Removed broken USE=width and add new USE=distinct-l for new upstream l form patch, #379455; thanks Conway S. Smith for the patched ebuild

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

4 files changed, 35 insertions, 23 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index 1c71c7a1dbfe..fe1594d7c187 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-fonts/terminus-font
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.86 2011/08/15 11:36:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.87 2011/08/27 10:52:22 jlec Exp $
+
+  27 Aug 2011; Justin Lecher <jlec@gentoo.org> terminus-font-4.36.ebuild,
+  metadata.xml:
+  Removed broken USE=width and add new USE=distinct-l for new upstream l form
+  patch, #379455; thanks Conway S. Smith for the patched ebuild
 
 *terminus-font-4.36 (15 Aug 2011)
 
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index fa745863e588..da3d2635db10 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -20,13 +20,13 @@ DIST terminus-font-4.36.tar.gz 309387 RMD160 a10138462e6aa7cf2b6a3f7960b72b1703f
 EBUILD terminus-font-4.30.ebuild 3296 RMD160 6d2920d1ff3c1c1ca8ead19bd625877e1abf0781 SHA1 5756cd77d06e37b9b7725bcaf14c00c96128d834 SHA256 50ee2dbbf541d9243f17c6d2823cc490eb63feb588f04790e11b9de2777a6e22
 EBUILD terminus-font-4.32.ebuild 2572 RMD160 c430d651b370208ad1dd5db336ae6c1350398953 SHA1 21c0e8b157f26bc81af0af70e5c4cc37ada4722b SHA256 3f4354182484cad334f7ce8b9b7602d5deb24255482850501bb2618efa57df80
 EBUILD terminus-font-4.35.ebuild 2614 RMD160 6c0c253d0e460dea78232adab6d0ce24757d18f2 SHA1 01e56852bc7c9cd7e506e6440360d2e18571f212 SHA256 74a81c5753025e4ada2e9dd0925f28703581186d39bb41d84cde33ec21cb1173
-EBUILD terminus-font-4.36.ebuild 2554 RMD160 7ea97f73fedb3cdeca2dfcd6a066c7702ba070ee SHA1 338ba654bd4415f89e00f2b16aa083b17bb9db47 SHA256 21485ab0accdacb0d17283f4d56ec71f2df21cddef33f564e60d06265290f111
-MISC ChangeLog 12264 RMD160 0a67c88f5d2f35970deeb794cd5a3a5cdb5f2198 SHA1 afdd431c91f2ba76ee8a56b671ffd48eb913b836 SHA256 38ce73a6a67bbf16eee57c868823fb7dd470bf89c903652b3ae8b8d7744ff48f
-MISC metadata.xml 1279 RMD160 003c14a4ed98b98853650de21fa8fe6d3823e854 SHA1 060ab983ac67ad25f7f374c658117d81e35dfcf3 SHA256 04e72a7092135c122aa6c7baef6f732bc54d588e50f9a2a5ba2f288e8e5379da
+EBUILD terminus-font-4.36.ebuild 2561 RMD160 5c1ec4d6766794050c85b550f3d4d9ec73ead69f SHA1 8e218347dd06b4b0eba0ab4db316fafba3883c4b SHA256 6360b9f83b8ecd2874e762de97aeb4be12f558096544aec3155c483228491c36
+MISC ChangeLog 12497 RMD160 21e64528f89dfd44370287040f18c172c663c432 SHA1 15ec6ec6623475ddb539918a22fe3bcd0c2f1de2 SHA256 0c8ddae010496ffde5463fbef3a2b0891dfe1ebbd60db052f22f214fcf08e175
+MISC metadata.xml 1383 RMD160 10305c0ca265e71ded682332f2bc9b32942b337d SHA1 49efad96b10452f3ffa0eebb8977e351bf5443bd SHA256 94eb6c480f9f50ceae2a83b86f0b2973f5564d867f434198fd79e18ac03b808a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5JBNsACgkQgAnW8HDreRaLVACfZ6jYZd+rNHgwncIBWFDtA19/
-+DIAoK+YfaZ1+v6yuk7mTG9uNZg7yRL3
-=y3s2
+iEYEAREKAAYFAk5YzHAACgkQgAnW8HDreRZAUgCfWxryV5kxfae2zi8QRZ5IhUgV
+IZ0AniYeeNy2CGq19v13hgIPSWNwV9m0
+=UH8g
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index f12d248c81fc..aaa5d2ecfec9 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -3,35 +3,42 @@
 <pkgmetadata>
 	<herd>fonts</herd>
 	<use>
-		<flag name="psf">
-			Install PC Screen Font (PSF) with unicode data (for linux console)
-		</flag>
-		<flag name="raw-font-data">
-			Install RAW font data which should be compatible with most 
-			UNIX systems (you don't need this on linux)
-		</flag>
-		<flag name="pcf">
-			Install Portable Compiled Font (PCF) (required for X11)
-		</flag>
 		<flag name="a-like-o">
 			Changes view of letter 'a' - a looks like o	(see homepage)
 		</flag>
 		<flag name="bolddiag">
 			Boldified diagonal parts of '4', 'k', 'x' and some other chars
 		</flag>
+		<flag name="distinct-l">
+			ll2 variant with more distinctive l (lowercase L)
+		</flag>
+		<flag name="pcf">
+			Install Portable Compiled Font (PCF) (required for X11)
+		</flag>
+		<flag name="psf">
+			Install PC Screen Font (PSF) with unicode data (for linux console)
+		</flag>
 		<flag name="quote">
 			Changes view of quotes: symmetric ` and ' 
 			instead of asymmetric one (see homepage)
 		</flag>
+		<flag name="raw-font-data">
+			Install RAW font data which should be compatible with most 
+			UNIX systems (you don't need this on linux)
+		</flag>
 		<flag name="ru-dv">
 			Changes view of Russian letters 'de' and 've' (see	homepage)
 		</flag>
-		<flag name="ru-g">Changes view of Russian letter 'ge' (see homepage)</flag>
+		<flag name="ru-g">
+			Changes view of Russian letter 'ge' (see homepage)
+		</flag>
 		<flag name="ru-i">
 			Changes view of Russian letter 'i' - not like Latin u, 
 			but like "mirrored" N (see homepage)
 		</flag>
-		<flag name="ru-k">Changes view of Russian letter 'k' (see homepage)</flag>
+		<flag name="ru-k">
+			Changes view of Russian letter 'k' (see homepage)
+		</flag>
 		<flag name="width">Wider versions of some font elements</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-fonts/terminus-font/terminus-font-4.36.ebuild b/media-fonts/terminus-font/terminus-font-4.36.ebuild
index 53e9feb7c6f4..c7b8239a1c2b 100644
--- a/media-fonts/terminus-font/terminus-font-4.36.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.36.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-fonts/terminus-font/terminus-font-4.36.ebuild,v 1.1 2011/08/15 11:36:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.36.ebuild,v 1.2 2011/08/27 10:52:22 jlec Exp $
 
 EAPI=3
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 LICENSE="OFL-1.1 GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="a-like-o ru-dv +ru-g quote ru-i ru-k width +psf raw-font-data +pcf"
+IUSE="a-like-o distinct-l ru-dv +ru-g quote ru-i ru-k +psf raw-font-data +pcf"
 
 DEPEND="dev-lang/perl
 		sys-apps/gawk
@@ -42,12 +42,12 @@ src_prepare() {
 	# ge - ge NOT like "mirrored" latin s, but like caps greek gamma
 	# ka - small ka NOT like minimised caps latin K, but like small latin k
 	use a-like-o && epatch "${S}"/alt/ao2.diff
+	use distinct-l && epatch "${S}"/alt/ll2.diff
 	use ru-i     && epatch "${S}"/alt/ij1.diff
 	use ru-k     && epatch "${S}"/alt/ka2.diff
 	use ru-dv    && epatch "${S}"/alt/dv1.diff
 	use ru-g     && epatch "${S}"/alt/ge2.diff
 	use quote    && epatch "${S}"/alt/gq2.diff
-	use width    && epatch "${S}"/alt/cm2.diff
 }
 
 src_configure() {