Added upstream patches to change view of some letters, bug #199696, thank Kir Kolyshkin for report and Leonid Evdokimov for work. Ported to use font.eclass; changed installation to install all fonts not depending on X USE flag, bug #155783, thank J.Taimr for report.

Package-Manager: portage-2.1.4.4

4 files changed, 98 insertions, 46 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index a88afc4f477f..fec1072fb2ea 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-fonts/terminus-font
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.56 2008/06/16 11:04:22 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.57 2008/06/21 09:25:04 pva Exp $
+
+*terminus-font-4.26-r1 (21 Jun 2008)
+
+  21 Jun 2008; Peter Volkov <pva@gentoo.org> -terminus-font-4.07.ebuild,
+  +terminus-font-4.26-r1.ebuild:
+  Added upstream patches to change view of some letters, bug #199696, thank
+  Kir Kolyshkin for report and Leonid Evdokimov for work. Ported to use
+  font.eclass; changed installation to install all fonts not depending on X
+  USE flag, bug #155783, thank J.Taimr for report.
 
   16 Jun 2008; Santiago M. Mola <coldwind@gentoo.org>
   terminus-font-4.26.ebuild:
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index aed70c29f747..e659589c408f 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,8 +1,18 @@
-DIST terminus-font-4.07.tar.gz 124505 RMD160 8255c8a043684347fb43b641bd5cee0a02bd069f SHA1 bdc3303501537667e1ab43d013d2f888e0c15552 SHA256 fe77e82c87850a1f69ab4dae58e1890c77cb55739aba13daa20cc9df0cc37441
 DIST terminus-font-4.20.tar.gz 201816 RMD160 f7e8a3d6990d036d00c748dbb5ba466e3694e708 SHA1 f8215f8236e72423c4720956587cbda4eeea9176 SHA256 fe10b94591e77fd49a0dee00976e31cc3378fef74a6ec1fc93022e6479e1d687
+DIST terminus-font-4.26-ao2.diff.gz 3567 RMD160 a0db35927f06e6466b3baa61d20869cf7707b191 SHA1 80e0be9902ac955f4d7479097d2288e2cb6f3112 SHA256 e544279b54088198e95e599b2b3b0864661fe13b4599779b84c363b4c591d450
+DIST terminus-font-4.26-cm2.diff.gz 1380 RMD160 09e926e628e893f4b6d32aefd1ac45cf4d1fc296 SHA1 92a4cf0e0eafce7ea69a87494820f3e812e7d339 SHA256 5bc0bca82dd3fb33d3e81f81f364d11273eaa712427ba247669d4c328edad986
+DIST terminus-font-4.26-dv1.diff.gz 1184 RMD160 0631b56255a9158ed501e8aaadc7f0162ecff57d SHA1 ab8c32090996eeb48b349fde544aeeb744242034 SHA256 d6d8e822ef72399051342d85ddd9c9cd508b09ba6688d5aac577c21ad43647ea
+DIST terminus-font-4.26-ge1.diff.gz 1041 RMD160 c3977b3bd57e930ac2e4094a46152f70662e9718 SHA1 c69df1c565a1d1a0ba78e403d46685d0664bb739 SHA256 35b5f903b4c11f2ff0388a9f96323868f2e363697cd65b297292b6a56a319c64
+DIST terminus-font-4.26-gq2.diff.gz 574 RMD160 19caed681b93d32b228cb23d57eb79b82d668f88 SHA1 edf4ea7d54e9f33c85bc5e81befe67a09b4c41d4 SHA256 5a753a4bb9399e53b8c7df7e93f4085b183fbbc88dd19001832bd707287213ea
+DIST terminus-font-4.26-ij1.diff.gz 1373 RMD160 882b636679014f5a582ef585bb95d7db199011d0 SHA1 7672e9a7ced336ce3f061cb50e9cbfaa569bf96c SHA256 c3059cdac8b01a18deadc3a6cfc03f5c6f17fdcbb771a5c84c61ce51b208d584
+DIST terminus-font-4.26-ka2.diff.gz 1017 RMD160 b6017c6cf47c583096535c16b49d9692b9cd4430 SHA1 3a7004c474924ab357eb07dc1724f89753fe9293 SHA256 3bd76eaa52061d99b3f79ce1321971cba52985d164da7398ffdf1026f7808ea4
+DIST terminus-font-4.26-kx3-ao2.diff.gz 3567 RMD160 eacbcc784bdb87beaada659916bc5d3dd5df29db SHA1 f8278af12d41a142f288ffdf021edaf9868f0525 SHA256 7e97f01f7db2fa0d69626f77e137317a5fb1ce1707367ad7aa62d75a827e5339
+DIST terminus-font-4.26-kx3-ij1.diff.gz 1421 RMD160 751b5479c7064d44217252cf0365be8170e4eec5 SHA1 cab4bd087a0240b4ece89c5c43785750bf5e48db SHA256 8762cee055f750cabf8a8963d74a5694b3fa8ae33d1e413fe3b7e164457f5fb3
+DIST terminus-font-4.26-kx3-ka2.diff.gz 1018 RMD160 dd497f267af455c60ad85cab187bb92542f809f8 SHA1 121a3ee002a5e0917098262ba76088b311e001f6 SHA256 19c5f320310b9966dda8a0a6b9133fdd6b5de996d0a46b01d12df0c54a986acf
+DIST terminus-font-4.26-kx3.diff.gz 3166 RMD160 a768f8ed0ed6ad2d60b817e9ef7d003a5a768477 SHA1 f303bfbe3db644a7117597fd30037d8e5a7165cd SHA256 14a844b75f8cf59f0e44755a1c319e389794ad47b3abfbe6dd806a9a07e14d1f
 DIST terminus-font-4.26.tar.gz 215154 RMD160 70ff3e4125e8e89ad76d9ea9b16c624096c79384 SHA1 19ab13e1f2b4b6d284c2d4a0e1982df2a79f4a06 SHA256 ade97252374a9722b0489b81dd1300be93fb4fa819e456b5fe13f95c6b6e9299
-EBUILD terminus-font-4.07.ebuild 1062 RMD160 bdaad7668e89f4c0631679b42b4d1a151977f3c9 SHA1 6e1149110516eb036cc639f10916449cddebc2da SHA256 b2e4e138dc64feb8881688aac245f24e5146e81acb9fa6b31cc82605059cf293
 EBUILD terminus-font-4.20.ebuild 1083 RMD160 9a423d3335f3fd1b9564e4bb6a722d88257d88d7 SHA1 3cc9b123480d39072d93ddfecf2f8b70ce949729 SHA256 c72ca13922a79f5047e27d168f1704f562a2edc6eaa96ccb508df996d010068e
+EBUILD terminus-font-4.26-r1.ebuild 2699 RMD160 e06de0088175cc084da6346c9e6227d845ade8e2 SHA1 61787255a28464b93d990f988c1062075622ea6b SHA256 9ce1125817de771adc2bd355429171d3c77b73eaa32e873c1732f21a2eb1ff9c
 EBUILD terminus-font-4.26.ebuild 1090 RMD160 ff2cfa302bbc76b9dacac270a8910fffc9b55877 SHA1 a8a1ff7c7c5b7328a92a5a5d3f2bf11cffdeba04 SHA256 45a4e160060d4e73bdd35ad69a866e7fbe203ff6bfe0da3f578e87f66dde3da3
-MISC ChangeLog 7250 RMD160 ede4a3cf8f223777d9624ceccc2dd40d360584da SHA1 4ae4308e9cf362105f2b206b891640b672c8bfd1 SHA256 c251a23bdc5986e74ba70d42d269cc43be8a17d653c328c718762fb162e7e482
+MISC ChangeLog 7665 RMD160 4adbd21ab0a055303deb3955086ba39052c700fe SHA1 d28aae88be15df8778ac8a2df5242738d33f02b9 SHA256 6032635fe26b2de983cbce4832608460a430de6aa1dbd511d7653089f15162e5
 MISC metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca SHA1 8e4ca6d183e52cdbea8cfba08b7a7910e648fc84 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8
diff --git a/media-fonts/terminus-font/terminus-font-4.07.ebuild b/media-fonts/terminus-font/terminus-font-4.07.ebuild
deleted file mode 100644
index 7122c74d63a9..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.07.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 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.07.ebuild,v 1.8 2007/07/22 07:44:11 dirtyepic Exp $
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.html"
-SRC_URI="http://www.is-vn.bg/hamster/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc s390 sh sparc x86"
-IUSE="X"
-
-DEPEND="x11-apps/bdftopcf"
-RDEPEND=""
-
-src_compile() {
-	./configure \
-		--prefix=${D}/usr \
-		--psfdir=${D}/usr/share/consolefonts \
-		--acmdir=${D}/usr/share/consoletrans \
-		--unidir=${D}/usr/share/consoletrans \
-		--x11dir=${D}/usr/share/fonts/terminus
-
-	make psf txt || die
-
-	# If user wants fonts for X11
-	if use X; then
-		make pcf || die
-	fi
-}
-
-src_install() {
-	make install-psf install-acm install-uni install-ref || die
-
-	# If user wants fonts for X11
-	if use X; then
-		make install-pcf || die
-		mkfontdir ${D}/usr/share/fonts/terminus
-	fi
-
-	dodoc README*
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.26-r1.ebuild b/media-fonts/terminus-font/terminus-font-4.26-r1.ebuild
new file mode 100644
index 000000000000..7c313b82e4db
--- /dev/null
+++ b/media-fonts/terminus-font/terminus-font-4.26-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2008 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.26-r1.ebuild,v 1.1 2008/06/21 09:25:04 pva Exp $
+
+EAPI="1"
+
+inherit eutils font
+
+DESCRIPTION="A clean fixed font for the console and X11"
+HOMEPAGE="http://www.is-vn.bg/hamster/jimmy-en.html"
+SRC_URI="http://www.is-vn.bg/hamster/${P}.tar.gz
+		ru-dv? ( http://www.is-vn.bg/hamster/${P}-dv1.diff.gz )
+		ru-g? ( http://www.is-vn.bg/hamster/${P}-ge1.diff.gz )
+		qoute? ( http://www.is-vn.bg/hamster/${P}-gq2.diff.gz )
+		width? ( http://www.is-vn.bg/hamster/${P}-cm2.diff.gz )
+		bolddiag? ( http://www.is-vn.bg/hamster/${P}-kx3.diff.gz
+				a-like-o? ( http://www.is-vn.bg/hamster/terminus-font-4.26-kx3-ao2.diff.gz )
+				ru-i? ( http://www.is-vn.bg/hamster/terminus-font-4.26-kx3-ij1.diff.gz )
+				ru-k? ( http://www.is-vn.bg/hamster/terminus-font-4.26-kx3-ka2.diff.gz ) )
+		!bolddiag? ( a-like-o? ( http://www.is-vn.bg/hamster/${P}-ao2.diff.gz )
+				ru-i? ( http://www.is-vn.bg/hamster/${P}-ij1.diff.gz )
+				ru-k? ( http://www.is-vn.bg/hamster/${P}-ka2.diff.gz ) )
+			"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="a-like-o ru-dv +ru-g qoute ru-i ru-k width bolddiag"
+
+DEPEND="sys-apps/gawk"
+
+FONTDIR=/usr/share/fonts/terminus
+DOCS="README README-BG"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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 qoute && epatch "${WORKDIR}"/${P}-gq2.diff
+	use width && epatch "${WORKDIR}"/${P}-cm2.diff
+}
+
+src_compile() {
+	# selfwritten configure script
+	./configure \
+		--prefix=/usr \
+		--psfdir=/usr/share/consolefonts \
+		--acmdir=/usr/share/consoletrans \
+		--unidir=/usr/share/consoletrans \
+		--x11dir=${FONTDIR}
+
+	emake psf txt pcf || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install-psf install-acm install-ref install-pcf || die
+
+	font_src_install
+}