Version bump, bug #238415 reported by Arfrever Frehtes Taifersar Arahesis. Fixes missing glyph problem, bug #233363, reported by Alexey Charkov. Added +pcf, +psf and raw USE flags so now you can select what font formats you are interested in, fixes bug #228793 reported by Nikita Ofitserov. Removed broken ebuild.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)

3 files changed, 47 insertions, 11 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index e20b6834b2d5..c03b4277564a 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,16 @@
 # 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.60 2008/08/17 06:31:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.61 2008/10/06 07:22:36 pva Exp $
+
+*terminus-font-4.28 (06 Oct 2008)
+
+  06 Oct 2008; Peter Volkov <pva@gentoo.org> metadata.xml,
+  -terminus-font-4.26-r2.ebuild, +terminus-font-4.28.ebuild:
+  Version bump, bug #238415 reported by Arfrever Frehtes Taifersar Arahesis.
+  Fixes missing glyph problem, bug #233363, reported by Alexey Charkov.
+  Added +pcf, +psf and raw USE flags so now you can select what font formats
+  you are interested in, fixes bug #228793 reported by Nikita Ofitserov.
+  Removed broken ebuild.
 
   17 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index bc973f0f8a4e..e8e574f753cd 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -3,6 +3,11 @@
 <pkgmetadata>
 <herd>fonts</herd>
 <use>
+	<flag name='psf'>Install PC Screen Font (PSF) with unicode data (for linux
+		console)</flag>
+	<flag name='raw'>Install RAW font data which should be compatible with most
+	UNIX systems (you don't need this on linux)</flag>
+	<flag name='pcf'>Intall 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
diff --git a/media-fonts/terminus-font/terminus-font-4.26-r2.ebuild b/media-fonts/terminus-font/terminus-font-4.28.ebuild
index 7f91465b373f..4a88b205e1b5 100644
--- a/media-fonts/terminus-font/terminus-font-4.26-r2.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.28.ebuild
@@ -1,22 +1,22 @@
 # 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-r2.ebuild,v 1.1 2008/06/22 11:33:59 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.28.ebuild,v 1.1 2008/10/06 07:22:36 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"
+HOMEPAGE="http://www.is-vn.bg/hamster/"
 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 )
 		quote? ( 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 ) )
+				a-like-o? ( http://www.is-vn.bg/hamster/${P}-kx3-ao2.diff.gz )
+				ru-i? ( http://www.is-vn.bg/hamster/${P}-kx3-ij1.diff.gz )
+				ru-k? ( http://www.is-vn.bg/hamster/${P}-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 ) )
@@ -24,15 +24,26 @@ SRC_URI="http://www.is-vn.bg/hamster/${P}.tar.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 quote ru-i ru-k width bolddiag"
+IUSE="a-like-o ru-dv +ru-g quote ru-i ru-k width bolddiag +psf raw +pcf"
 
-DEPEND="sys-apps/gawk
-		x11-apps/bdftopcf"
+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
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -67,11 +78,21 @@ src_compile() {
 		--unidir=/usr/share/consoletrans \
 		--x11dir=${FONTDIR}
 
-	emake psf txt pcf || die
+	if use psf; then emake psf txt || die; fi
+	if use raw; then emake raw || die; fi
+	if use pcf; then emake pcf || die; fi
 }
 
 src_install() {
-	make DESTDIR="${D}" install-psf install-acm install-ref install-pcf || die
+	if use psf; then
+		emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
+	fi
+	if use raw; then
+		emake DESTDIR="${D}" install.raw || die
+	fi
+	if use pcf; then
+		emake DESTDIR="${D}" install-pcf || die
+	fi
 
 	font_src_install
 }