Version Bump

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 121 insertions, 22 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index 046312966f04..1c71c7a1dbfe 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,12 @@
 # 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.85 2011/06/14 17:49:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.86 2011/08/15 11:36:53 jlec Exp $
+
+*terminus-font-4.36 (15 Aug 2011)
+
+  15 Aug 2011; Justin Lecher <jlec@gentoo.org> +terminus-font-4.36.ebuild,
+  metadata.xml:
+  Version Bump
 
   14 Jun 2011; Fabian Groffen <grobian@gentoo.org> terminus-font-4.35.ebuild:
   Marked ~x86-macos (#369547) and ~ppc-macos
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index 3b3f8532dad1..f12d248c81fc 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -1,25 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <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='quote'>Changes view of quotes: symmetric ` and ' instead of
-		asymmetric one (see homepage)</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-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='width'>Wider versions of some font elements</flag>
-</use>
+	<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="quote">
+			Changes view of quotes: symmetric ` and ' 
+			instead of asymmetric one (see homepage)
+		</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-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="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
new file mode 100644
index 000000000000..53e9feb7c6f4
--- /dev/null
+++ b/media-fonts/terminus-font/terminus-font-4.36.ebuild
@@ -0,0 +1,81 @@
+# 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 $
+
+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 ~ppc-macos ~x86-macos"
+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 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
+}
+
+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/ge2.diff
+	use quote    && epatch "${S}"/alt/gq2.diff
+	use width    && epatch "${S}"/alt/cm2.diff
+}
+
+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
+}