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.

(Portage version: 2.1.4.4)

3 files changed, 85 insertions, 43 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/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
+}