Version bump to 4.38. Stabilise 4.36 on all archs. Remove older. Resolves bug#428608.

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

8 files changed, 43 insertions, 251 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index fe1594d7c187..9dbe037ad8bc 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,15 @@
 # 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.87 2011/08/27 10:52:22 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.88 2012/08/21 12:11:49 scarabeus Exp $
+
+*terminus-font-4.38 (21 Aug 2012)
+
+  21 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> +terminus-font-4.38.ebuild,
+  -files/terminus-font-4.32-parallel-install.patch, -terminus-font-4.30.ebuild,
+  -terminus-font-4.32.ebuild, -terminus-font-4.35.ebuild, metadata.xml,
+  terminus-font-4.36.ebuild:
+  Version bump to 4.38. Stabilise 4.36 on all archs. Remove older. Resolves
+  bug#428608.
 
   27 Aug 2011; Justin Lecher <jlec@gentoo.org> terminus-font-4.36.ebuild,
   metadata.xml:
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index da3d2635db10..23520b396ee5 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,32 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX terminus-font-4.32-parallel-install.patch 310 RMD160 c8531c74c222f72cf031abfa98d0502378db6ade SHA1 02fe72c4e8a8cdd16450ae7a064490083e834bb5 SHA256 3ca83cd99f02a348920973796989c15ea52b3c57586887aa23993939a9b4f0c7
-DIST terminus-font-4.30-ao2.diff.gz 4064 RMD160 042b4d1fde790cc9414d20235079f8487c69857e SHA1 15c1c2d0221b302bcbc57c2595dc39c0db9509a7 SHA256 4586eb56533c3fad417b13d64c88bb97a3604f68dac1fc4c90372c9c93cc82ac
-DIST terminus-font-4.30-cm2.diff.gz 1429 RMD160 6ad6d4e981569bc6a3097aafe47c431b7fd5b41b SHA1 50e0f6a13e04bc426921bbf5ff155ede00756a04 SHA256 eae31c02216ea9b586eea121b7ab70ac71a869c8a62551c719ef1fac397db744
-DIST terminus-font-4.30-dv1.diff.gz 1242 RMD160 f3f7b53f7fa5e35f025f2a8ae72f20075542194d SHA1 d0d5dcf08b0725c41bfb3fc98ef17c14591f9387 SHA256 fc2c3a28e1542ec19083c0739c39fa2e914047173cd78e0da824c41ba2315399
-DIST terminus-font-4.30-ge1.diff.gz 1158 RMD160 56dd9d18a721b213db7fdeb2ccd5564970058341 SHA1 bc5074cdbdf1ceca727c686c5d08e0cac63a7e8b SHA256 c84dab5738dbd174399e05ff62e4e7ebaf77c6b1ff24c8c423bd4a7cd47b5f90
-DIST terminus-font-4.30-gq2.diff.gz 648 RMD160 dee6939d9b46dbccd36265084cd675ff180f13ba SHA1 73e590b8c14ebfbfc074772988f45f3304aaf2a9 SHA256 a021be2398dbc3895ad1bfc7367fd45c96fee42b1c98a53a52aa19732441c563
-DIST terminus-font-4.30-ij1.diff.gz 1494 RMD160 ad46abe1e206de607e0fc7c23b4657bfc958ff2a SHA1 d37baec795b11963cbd8d551a42ff2508e4fbaef SHA256 3c9d74b764d144e963e6d2e41969593a4888b2a3c131466226c0b455993f37ba
-DIST terminus-font-4.30-ka2.diff.gz 1067 RMD160 08bd223420025521389b1c6895a912708e36161f SHA1 26fb854effec59dd539445ae983f08a2ef75ac90 SHA256 e829803252a6250172902afa65a9cd207ffdf0b57248c26506b9e8abac0363ce
-DIST terminus-font-4.30-kx3-ao2.diff.gz 4065 RMD160 e300efaa247e62f78bd187be6a43565e0d188b52 SHA1 e3b7b89a80982865fba3589bbb895789c053e931 SHA256 c099c3151f44112d8ce2b515ba109575b0fa81ef452e45764f8af59bc320377d
-DIST terminus-font-4.30-kx3-ij1.diff.gz 1533 RMD160 d0dcd9fe3b5baf9d75972c53f3dc738c2e6c5705 SHA1 19d326d20d85a50be6b6e72357c12d802b798a31 SHA256 a696eb58c2967d64d08d387a2db02762b734a0847833a07032aefbb08cfe82a9
-DIST terminus-font-4.30-kx3-ka2.diff.gz 1060 RMD160 ded6be39049d8371531016ea6304149aa67d9183 SHA1 c48c55bb07264206da89957459208b18933c50d7 SHA256 9933acd1ca3408e653012f1da86e78a5189b5131f6189792850326214812af45
-DIST terminus-font-4.30-kx3.diff.gz 3135 RMD160 0744f53720b1f9196e1122f85dd9f3d5b347b323 SHA1 3dccf0b9bdc37e9ec80de3109d7ecc741ea2edb6 SHA256 6672e498b85614cb6a5d01c3576e0a1511962b2d6d6ae3f55ea2dd53c57bcfcf
-DIST terminus-font-4.30.tar.gz 267236 RMD160 d7835e99012895b15f295fc1d19551c9ed241354 SHA1 472dbdc8ee7fa42ea8f91e41e9f154f23f9453b9 SHA256 ca15718f715f1ca7af827a8ab5543b0c0339b2515f39f8c15f241b2bc1a15a9a
-DIST terminus-font-4.32.tar.gz 278839 RMD160 7b649f6610764763bdb8e44c39c95fe06edd6d93 SHA1 10be9f7f09f642b941acc7f644545e23fbb0494d SHA256 f05a8afb426af080bc94b6ac9846daac2a3f2e2883feaf96a503bb2e5507aea4
-DIST terminus-font-4.35.tar.gz 313577 RMD160 8c9dba3bb135536777b790f3c9623eb14db44f78 SHA1 0cd2707c7041ae6e34f743c2401c510053e9c9cf SHA256 6ae4cd2186050c96997052e167013aa21b6039a164f31fa06e9ae697f3d8b8dc
-DIST terminus-font-4.36.tar.gz 309387 RMD160 a10138462e6aa7cf2b6a3f7960b72b1703fa5f7d SHA1 bbd839f8d21f4bcbf2c6d98aa1b5842bddc675c0 SHA256 7b0dcebd8ef2e36aeeb7fcd97082ad881e95b2871e40c9a6255377bea6bcd345
-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 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
+DIST terminus-font-4.36.tar.gz 309387 SHA256 7b0dcebd8ef2e36aeeb7fcd97082ad881e95b2871e40c9a6255377bea6bcd345 SHA512 c42b8aac1cb7ba8d2259a1d1c37fccc885b91818129802917c01697397f3cb9ee6ce5510a42892ab531597d339e65462292ea72d7927598271fc24c31ef7a033 WHIRLPOOL e9be1019b6bd755c1361f308d760b032dc9ddae50c25c89e36bc12d65cb1300afc37d3cf4e642eedf9aac9fba3243e5adc320539079b07d183c2b5c507bc0d36
+DIST terminus-font-4.38.tar.gz 316507 SHA256 f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5eed97b7 SHA512 e37e20852645b247dffedf37f864e1cdbe2a23287e7f5737d89289eef1058f9621ef8d6339045b1be9ef603237a855a9f295022b8117685a6840c1f260966fd5 WHIRLPOOL e7f8c1b0040eb2e41869351360463783a0394d3c2ad3cccffbd80769046994b0cd76f8e16d1a38c88f1bee97ed28c8c6c2ce4166c0138fe6cb25848754dd0b44
+EBUILD terminus-font-4.36.ebuild 2557 SHA256 8496706caff78182df609039d414832dd6dcc6ffc91e828200f8640bb14de65e SHA512 29acec2497d8c6fffed823fda9b22a1c255ec9db7628fcb4305bfb37fb9b1c9300b2adb913a0fd29d9f668d414f419c704ab845d0c5374e4f0e96edbcff4dbec WHIRLPOOL f04c0bad9466ad73cfabcf057cb369703a24957348015e0377c1ecab62e9cbd1463a6f6f02db332f04bb265b84105594ab44e779d1127439f61c6fa4cb507ccb
+EBUILD terminus-font-4.38.ebuild 2303 SHA256 cca257ea30914fcef405994ca054b791e0ba867c5ed061ef29df2e60184db8d9 SHA512 16384f0c9c9bddf6748383bedcb90d6d59003fd4b25d105858b236d89cc35d4fcb4e48f26b19f65e47c507b8d83743cc0c166b1e2f2d445eecf75512512197f0 WHIRLPOOL daacec4ff612c09b1f753177ce2f9e419e1363b706c692b5d2ff4f8464fbb13bf49e542d8f4613ac7a18e92658a7b75aa73734273cea25b78d99082496516520
+MISC ChangeLog 12892 SHA256 040cdfc9661e8924aac7333c72f907e00a3a4684fbbcbe9d0b180ff4237c9af5 SHA512 abc96b31d91af3489013304b6843a05953675ea8ea3be4c0922a07dc99348d76d822ef306253d63480425d175cc388ddbc1cf4b9ee1c7797f9587e49f6871365 WHIRLPOOL 45e89139d5d829a77f59d8b8b841eaead1616f53e30f9a601daa8a70769226388dd316fa05696745487bc71e45cebbc9b7013ba2a5caf27843fdd6f26c8008ac
+MISC metadata.xml 1217 SHA256 14d2531927b6431d6ac21a2dbeaaa9bcbc1bc388ae6bda042fb35ef0a6fcd39f SHA512 a93dc8a0e406dfce6c41bc76cbb4bf32f3999d59d40d1bfba5d95ed6e8b7a1d75a759d1c5c78824f23a451b5dfb2d4d414d651a706ab4e99ce6f0694154bec93 WHIRLPOOL 52af5c71cf70408ad24875be9d9e0cfeb1f9f8f9a5c5a373b86e0ff423151f2600294593be085ec880fc9a7a9800381b4386c5ecf502b8885b93e413333fdc9e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk5YzHAACgkQgAnW8HDreRZAUgCfWxryV5kxfae2zi8QRZ5IhUgV
-IZ0AniYeeNy2CGq19v13hgIPSWNwV9m0
-=UH8g
+iQIcBAEBCAAGBQJQM3sIAAoJEOSiRoyO7jvon5UP/0OkmGWGqUG54B9piw7L1Zaf
+OSc2YfSGKje0LwAXM1IRYbm8LLG7a8Ju+sPw0A3+yFi2Ym1EhD7AI3uMTRKwUipb
+CDrGJGIoOZRlBLIT2H1eXXlf+spfS52yuxCdFYgo72XlsyMe77d1Qr6fi10pmGZS
+xRySkhsnALQfZ1nFIn4OI+7A+SjhNZAiIrlm+1F8QRs+HwzI48pJeyN7ORz9Krzb
+yub6oz35Wak9vB8SK3NCvXgBIXpGVsZCyeLkAOBP75sh3Z764JzT5CxnyyVCeGZf
++WtgiILHhkpVO6cFyX1Hb39IM6CzGNYbHKdT59UP7/aViSDiYiXiA0fUQk50DV7Z
+xRN9TrQ3+WiEHAnUobKceFT9JZXsu9JljGfNzE86Wvnu8Tv4s+hJ4XLSCIZfhYxD
+UFAx5v58cSH9lwbxUknNAK2it2+zaXNZYH5fZmOt5nrgJ5K32rngI/1SnE+WpWr3
+qxIcPpQ/QijOc9OoppgmVnu61UBnZI3PEgXRbFukqq/eRiSM+6rMEGGdrDcZ0tAt
+Brw8FE7kH/H9LwNA+Qe0MsPjlAPNa0W2zWW/rwElRkixJHU1EINC1RS1KmEfn3HT
+fztrPpKuxm0Wgp0YGlavnWOmbyWBoSISaDXPW6zTmkuVNmuCGBP2fdDBKgbi1Fjt
+EJ3svKlWK4hc/nut9edy
+=935k
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/terminus-font/files/terminus-font-4.32-parallel-install.patch b/media-fonts/terminus-font/files/terminus-font-4.32-parallel-install.patch
deleted file mode 100644
index cda6fb318872..000000000000
--- a/media-fonts/terminus-font/files/terminus-font-4.32-parallel-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile b/Makefile
-index eff66f7..f71b025 100644
---- a/Makefile
-+++ b/Makefile
-@@ -197,6 +197,7 @@ uninstall-psf-512:
- ref = $(psfdir)/README.terminus
- 
- install-ref: README
-+	mkdir -p $(DESTDIR)$(psfdir)
- 	sed -e"/^2\.4/,/^2\.5/p" -n README | grep -v "^2\." > $(DESTDIR)$(ref)
- 
- uninstall-ref:
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index aaa5d2ecfec9..29b73cb75d3a 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -6,9 +6,6 @@
 		<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>
@@ -39,6 +36,5 @@
 		<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.30.ebuild b/media-fonts/terminus-font/terminus-font-4.30.ebuild
deleted file mode 100644
index 77d0cf5f77e0..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.30.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.30.ebuild,v 1.12 2011/05/06 15:38:03 jlec Exp $
-
-EAPI="3"
-
-inherit eutils font
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://terminus-font.sourceforge.net/"
-URI="mirror://sourceforge/${PN}/files/${P}"
-SRC_URI="${URI}/${P}.tar.gz
-		ru-dv? ( ${URI}/${P}-dv1.diff.gz )
-		ru-g? ( ${URI}/${P}-ge1.diff.gz )
-		quote? ( ${URI}/${P}-gq2.diff.gz )
-		width? ( ${URI}/${P}-cm2.diff.gz )
-		bolddiag? ( ${URI}/${P}-kx3.diff.gz
-				a-like-o? ( ${URI}/${P}-kx3-ao2.diff.gz )
-				ru-i? ( ${URI}/${P}-kx3-ij1.diff.gz )
-				ru-k? ( ${URI}/${P}-kx3-ka2.diff.gz ) )
-		!bolddiag? ( a-like-o? ( ${URI}/${P}-ao2.diff.gz )
-				ru-i? ( ${URI}/${P}-ij1.diff.gz )
-				ru-k? ( ${URI}/${P}-ka2.diff.gz ) )
-			"
-LICENSE="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"
-IUSE="a-like-o ru-dv +ru-g quote ru-i ru-k width bolddiag +psf raw-font-data +pcf"
-
-DEPEND="dev-lang/perl
-		sys-apps/gawk
-		app-arch/gzip
-		pcf? ( x11-apps/bdftopcf )"
-RDEPEND=""
-
-FONTDIR=/usr/share/fonts/terminus
-DOCS="README README-BG"
-
-pkg_setup() {
-	# Note: that pcf fonts can be loaded by freetype even if X is not installed.
-	# That's why configuration +pcf and -X is supported, bug #155783.
-	if use X && ! use pcf ; then
-		eerror "Fonts which works with Xserver are intalled only if pcf is enabled."
-		die "Either disable X use flag or enabled pcf."
-	fi
-
-	font_pkg_setup
-}
-
-src_prepare() {
-	# Upstream patches. Some of them are suggested to be applied by default
-	# dv - de NOT like latin g, but like caps greek delta
-	#      ve NOT like greek beta, but like caps latin B
-	# 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
-	if use bolddiag; then
-		epatch "${WORKDIR}"/${P}-kx3.diff
-		use a-like-o && epatch "${WORKDIR}"/${P}-kx3-ao2.diff
-		use ru-i && epatch "${WORKDIR}"/${P}-kx3-ij1.diff
-		use ru-k && epatch "${WORKDIR}"/${P}-kx3-ka2.diff
-	else
-		use a-like-o && epatch "${WORKDIR}"/${P}-ao2.diff
-		use ru-i && epatch "${WORKDIR}"/${P}-ij1.diff
-		use ru-k && epatch "${WORKDIR}"/${P}-ka2.diff
-	fi
-	use ru-dv && epatch "${WORKDIR}"/${P}-dv1.diff
-	use ru-g && epatch "${WORKDIR}"/${P}-ge1.diff
-	use quote && epatch "${WORKDIR}"/${P}-gq2.diff
-	use width && epatch "${WORKDIR}"/${P}-cm2.diff
-
-	epatch "${FILESDIR}"/${PN}-4.32-parallel-install.patch
-}
-
-src_configure() {
-	# selfwritten configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--psfdir="${EPREFIX}"/usr/share/consolefonts \
-		--acmdir="${EPREFIX}"/usr/share/consoletrans \
-		--unidir="${EPREFIX}"/usr/share/consoletrans \
-		--x11dir="${EPREFIX}"/${FONTDIR} || die
-}
-
-src_compile() {
-	if use psf; then emake psf txt || die; fi
-	if use raw-font-data; then emake raw || die; fi
-	if use pcf; then emake pcf || die; fi
-}
-
-src_install() {
-	if use psf; then
-		emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
-	fi
-	if use raw-font-data; then
-		emake DESTDIR="${D}" install.raw || die
-	fi
-	if use pcf; then
-		emake DESTDIR="${D}" install-pcf || die
-	fi
-
-	font_src_install
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.32.ebuild b/media-fonts/terminus-font/terminus-font-4.32.ebuild
deleted file mode 100644
index dce679d54704..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.32.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.32.ebuild,v 1.3 2011/01/22 01:32:11 dirtyepic Exp $
-
-EAPI=3
-
-inherit eutils font
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://terminus-font.sourceforge.net/"
-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"
-IUSE="a-like-o ru-dv +ru-g quote ru-i ru-k width +psf raw-font-data +pcf"
-
-DEPEND="dev-lang/perl
-		sys-apps/gawk
-		app-arch/gzip
-		pcf? ( x11-apps/bdftopcf )"
-RDEPEND=""
-
-FONTDIR=/usr/share/fonts/terminus
-DOCS="README README-BG"
-
-pkg_setup() {
-	# Note: that pcf fonts can be loaded by freetype even if X is not installed.
-	# That's why configuration +pcf and -X is supported, bug #155783.
-	if use X && ! use pcf ; then
-		eerror "Fonts which works with Xserver are intalled only if pcf is enabled."
-		die "Either disable X use flag or enabled pcf."
-	fi
-
-	font_pkg_setup
-}
-
-src_prepare() {
-	# Upstream patches. Some of them are suggested to be applied by default
-	# dv - de NOT like latin g, but like caps greek delta
-	#      ve NOT like greek beta, but like caps latin B
-	# 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 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/ge1.diff
-	use quote    && epatch "${S}"/alt/gq2.diff
-	use width    && epatch "${S}"/alt/cm2.diff
-
-	epatch "${FILESDIR}"/${P}-parallel-install.patch
-}
-
-src_configure() {
-	# selfwritten configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--psfdir="${EPREFIX}"/usr/share/consolefonts \
-		--acmdir="${EPREFIX}"/usr/share/consoletrans \
-		--unidir="${EPREFIX}"/usr/share/consoletrans \
-		--x11dir="${EPREFIX}"/${FONTDIR} || die
-}
-
-src_compile() {
-	if use psf; then emake psf txt || die; fi
-	if use raw-font-data; then emake raw || die; fi
-	if use pcf; then emake pcf || die; fi
-}
-
-src_install() {
-	if use psf; then
-		emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
-	fi
-	if use raw-font-data; then
-		emake DESTDIR="${D}" install.raw || die
-	fi
-	if use pcf; then
-		emake DESTDIR="${D}" install-pcf || die
-	fi
-
-	font_src_install
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.36.ebuild b/media-fonts/terminus-font/terminus-font-4.36.ebuild
index c7b8239a1c2b..7e82b991b735 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
+# Copyright 1999-2012 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.2 2011/08/27 10:52:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.36.ebuild,v 1.3 2012/08/21 12:11:49 scarabeus Exp $
 
 EAPI=3
 
@@ -12,7 +12,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"
+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 distinct-l ru-dv +ru-g quote ru-i ru-k +psf raw-font-data +pcf"
 
 DEPEND="dev-lang/perl
diff --git a/media-fonts/terminus-font/terminus-font-4.35.ebuild b/media-fonts/terminus-font/terminus-font-4.38.ebuild
index b9b8cd307445..5b77ba116608 100644
--- a/media-fonts/terminus-font/terminus-font-4.35.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.38.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.35.ebuild,v 1.2 2011/06/14 17:49:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.38.ebuild,v 1.1 2012/08/21 12:11:49 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 inherit eutils font
 
@@ -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
@@ -24,16 +24,7 @@ RDEPEND=""
 FONTDIR=/usr/share/fonts/terminus
 DOCS="README README-BG AUTHORS CHANGES"
 
-pkg_setup() {
-	# Note: that pcf fonts can be loaded by freetype even if X is not installed.
-	# That's why configuration +pcf and -X is supported, bug #155783.
-	if use X && ! use pcf ; then
-		eerror "Fonts which works with Xserver are intalled only if pcf is enabled."
-		die "Either disable X use flag or enabled pcf."
-	fi
-
-	font_pkg_setup
-}
+REQUIRED_USE="X? ( pcf )"
 
 src_prepare() {
 	# Upstream patches. Some of them are suggested to be applied by default
@@ -42,18 +33,17 @@ 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
-
-	epatch "${FILESDIR}"/${PN}-4.32-parallel-install.patch
 }
 
 src_configure() {
-	# selfwritten configure script
+	# selfwritten configure script without executable bit
+	chmod +x ./configure || die
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--psfdir="${EPREFIX}"/usr/share/consolefonts \