Rename center-tilde useflag (bug #432886). Remove unnecessary dies (eapi=4).

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

3 files changed, 58 insertions, 53 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index dcd16162dc0a..945c8827a6f7 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/terminus-font
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.89 2012/08/21 18:15:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.90 2012/08/29 06:04:00 yngwin Exp $
+
+  29 Aug 2012; Ben de Groot <yngwin@gentoo.org> metadata.xml,
+  terminus-font-4.38.ebuild:
+  Rename center-tilde useflag (bug #432886). Remove unnecessary dies (eapi=4).
 
   21 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml,
   terminus-font-4.38.ebuild:
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index 96b071005a7e..5211551219ff 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -1,43 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<use>
-		<flag name="a-like-o">
-			Changes view of letter 'a' - a looks like o	(see homepage)
-		</flag>
-		<flag name="distinct-l">
-			ll2 variant with more distinctive l (lowercase L)
-		</flag>
-		<flag name="pcf">
-			Install Portable Compiled Font (PCF) (required for X11)
-		</flag>
-		<flag name="psf">
-			Install PC Screen Font (PSF) with unicode data (for linux console)
-		</flag>
-		<flag name="quote">
-			Changes view of quotes: symmetric ` and ' 
-			instead of asymmetric one (see homepage)
-		</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="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="center-tilda">
-			Place the '~' character vertically centered on the line instead of to the top.
-		</flag>
-	</use>
+  <herd>fonts</herd>
+  <use>
+    <flag name="a-like-o">
+      Changes view of letter 'a' - a looks like o (see homepage)
+    </flag>
+    <flag name="distinct-l">
+      ll2 variant with more distinctive l (lowercase L)
+    </flag>
+    <flag name="pcf">
+      Install Portable Compiled Font (PCF) (required for X11)
+    </flag>
+    <flag name="psf">
+      Install PC Screen Font (PSF) with unicode data (for linux console)
+    </flag>
+    <flag name="quote">
+      Changes view of quotes: symmetric ` and '
+      instead of asymmetric one (see homepage)
+    </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="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="center-tilde">
+      Place the '~' character vertically centered on the line instead of to the
+      top.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/media-fonts/terminus-font/terminus-font-4.38.ebuild b/media-fonts/terminus-font/terminus-font-4.38.ebuild
index f31a48b6ce65..ce8f0750294d 100644
--- a/media-fonts/terminus-font/terminus-font-4.38.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.38.ebuild
@@ -1,6 +1,6 @@
 # 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.38.ebuild,v 1.2 2012/08/21 18:15:38 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.38.ebuild,v 1.3 2012/08/29 06:04:00 yngwin Exp $
 
 EAPI=4
 
@@ -13,12 +13,12 @@ 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 +center-tilda distinct-l ru-dv +ru-g quote ru-i ru-k +psf raw-font-data +pcf"
+IUSE="a-like-o +center-tilde distinct-l ru-dv +ru-g quote ru-i ru-k +psf raw-font-data +pcf"
 
-DEPEND="dev-lang/perl
-		sys-apps/gawk
-		app-arch/gzip
-		pcf? ( x11-apps/bdftopcf )"
+DEPEND="app-arch/gzip
+	dev-lang/perl
+	sys-apps/gawk
+	pcf? ( x11-apps/bdftopcf )"
 RDEPEND=""
 
 FONTDIR=/usr/share/fonts/terminus
@@ -33,7 +33,7 @@ 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 center-tilda && epatch "${S}"/alt/td1.diff
+	use center-tilde && epatch "${S}"/alt/td1.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
@@ -54,20 +54,20 @@ src_configure() {
 }
 
 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
+	if use psf; then emake psf txt; fi
+	if use raw-font-data; then emake raw; fi
+	if use pcf; then emake pcf; fi
 }
 
 src_install() {
 	if use psf; then
-		emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
+		emake DESTDIR="${D}" install-psf install-uni install-acm install-ref
 	fi
 	if use raw-font-data; then
-		emake DESTDIR="${D}" install.raw || die
+		emake DESTDIR="${D}" install.raw
 	fi
 	if use pcf; then
-		emake DESTDIR="${D}" install-pcf || die
+		emake DESTDIR="${D}" install-pcf
 	fi
 
 	font_src_install