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

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

4 files changed, 61 insertions, 76 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/Manifest b/media-fonts/terminus-font/Manifest
index 5e3ba48973ba..520ba8433b0d 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,26 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST terminus-font-4.36.tar.gz 309387 SHA256 7b0dcebd8ef2e36aeeb7fcd97082ad881e95b2871e40c9a6255377bea6bcd345 SHA512 c42b8aac1cb7ba8d2259a1d1c37fccc885b91818129802917c01697397f3cb9ee6ce5510a42892ab531597d339e65462292ea72d7927598271fc24c31ef7a033 WHIRLPOOL e9be1019b6bd755c1361f308d760b032dc9ddae50c25c89e36bc12d65cb1300afc37d3cf4e642eedf9aac9fba3243e5adc320539079b07d183c2b5c507bc0d36
 DIST terminus-font-4.38.tar.gz 316507 SHA256 f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5eed97b7 SHA512 e37e20852645b247dffedf37f864e1cdbe2a23287e7f5737d89289eef1058f9621ef8d6339045b1be9ef603237a855a9f295022b8117685a6840c1f260966fd5 WHIRLPOOL e7f8c1b0040eb2e41869351360463783a0394d3c2ad3cccffbd80769046994b0cd76f8e16d1a38c88f1bee97ed28c8c6c2ce4166c0138fe6cb25848754dd0b44
 EBUILD terminus-font-4.36.ebuild 2557 SHA256 8496706caff78182df609039d414832dd6dcc6ffc91e828200f8640bb14de65e SHA512 29acec2497d8c6fffed823fda9b22a1c255ec9db7628fcb4305bfb37fb9b1c9300b2adb913a0fd29d9f668d414f419c704ab845d0c5374e4f0e96edbcff4dbec WHIRLPOOL f04c0bad9466ad73cfabcf057cb369703a24957348015e0377c1ecab62e9cbd1463a6f6f02db332f04bb265b84105594ab44e779d1127439f61c6fa4cb507ccb
-EBUILD terminus-font-4.38.ebuild 2365 SHA256 f3a3bad581496a96cac6976820d9bc14458ee21da785eeea04dc75256afadaa2 SHA512 c36480b7470f2beb48844fa7a7df61d74c1b3e7013003265fef119a4220b3226e66605cfb61c0b295d2a1d2770b45ffb150127b85c712577f3507711830ad789 WHIRLPOOL a856951bab43481578d39239faf9bf529eca429e8a95bf68b69ead1fbdff44e2291c4662657d7bfb3a21ac7ca61cb606d428fd24f3fbef87798428d645e29c98
-MISC ChangeLog 13026 SHA256 0109cd4aab4961b257d2e6a3395fca66b8f86aea7a21574f4b4118a1ef32948a SHA512 18e9eb514c956fe471fe9ac152f8cae146b599ec9246d8668bf15ef4b4cbf7e4c68e21710b766da0709775e00394b67b35995e2b6431300e02fb7321499df39f WHIRLPOOL f43d6bce3be5ad59d754a030bb2905b97dad72c5111f93662e2ade0778ab632448bd2663fc646188f89726265faed410393223a1a329eefb368a5f07365b363d
-MISC metadata.xml 1338 SHA256 1b1cf9464ead1d27a2dcc1240e8919b5645de2ddd8ec8fe963a47b8fda2af23d SHA512 25804c0d17a3199da237c996958ff538678b57440856f1014198430494db71fad3dd4fa90b086fba686ad3006fa2bf6a523a75b1323fcb361c6788c7b33f323a WHIRLPOOL 037ef57fbc233ec3270468b2fa23ed87639f37ca373dc09de8406d8fafe5ff50ab4fb862d54b9e0e291637cd13607094096de779926b6692693097a9a55a7352
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQM9BQAAoJEOSiRoyO7jvorOsP+weD00tRvPdiLFkEhgVLIbRd
-8HIVqX44vOKzs0/7bQeKIiU0gBOou5HVQn4KZ8O5IXMJk5DT73NhJZBB0jUAQ8rm
-+2eo/n1U5Jhyx7tiSbxr/SnFBf2Y4Q672ejBMK0gYnK++NHt7DORcN/pWvY0L0qM
-PV1YOMpCIyV6yGBb503HVcIIYk0tcsgE0KyMn5ZDyZoXexCglITayBPx4kMzj/Ue
-ri8A6CZVPIT0D/6ChrgLEQ4rqmc2XA5T++naN67b/s/vofLxWgzbPtLHFKwTk8MV
-u/xvFOc9Kr3aSRIviZMujAiLbOOTiQ0OLLBjSo4PPnMFvFkyBm41zcIT41rvtjAf
-4jhd/I3enK4jsinKSTMPst8S83vxfrATnJ0970KzXnkEEhzcNnEv6dE6GBM8f5z9
-weCrF9HrvN+7umbk4w3JRijZnvmiWglW5e/qauZCaEQnt2dpw/WFodAx/6g58CKd
-f30NmFJsXuPXTxTsPXSiEWcD1s9vrromCAE7jjVrhDE1xCd3myQbOTqF0pCWal6p
-T4Hvsj9oYhOZwOOJdmKj2FTj0EOLh6yRmXuCDmpchHsWs5sCjoY8cTZ0uC/kw83c
-iXrdvwBsX4e/1VumkisNhPIuK8Bkv4LaX9LwMIEy8Q6/fVahVQO9cBvQHR7eq3Yt
-d31JuzEKYvYW/jLLFqsI
-=1Dxr
------END PGP SIGNATURE-----
+EBUILD terminus-font-4.38.ebuild 2317 SHA256 045890311807729d04665f7e42d116f50dd4a65e1adcce5d19e47ee334fdd226 SHA512 b4bfe39bb88fa063c450757cf976674a1a9201767ac0159db4f92112488250b922e3f3c47809fccfd6ff7b56e273e02734967f3eb8949d621ff2c0e597583e97 WHIRLPOOL 56be880e593c3fe143d3b20563e96997bfb25bc30c521bd5abc98eb9b00ab7744e2c535f2708b96e3a2e9832f8a899114725b19fff0f43a635fd8200b7e8bcc0
+MISC ChangeLog 13194 SHA256 77c8258363746dcf30970df068b11b76e4756674e72f14dbec6b7fc702fdfb44 SHA512 431e2c776f80c7b0c335e0d920edddf729150ab3b6483683df740f69d23e90258b29e8c6a6bfb71d99111e838a134b81e892e68c0e2391ee6dd04607b7b340be WHIRLPOOL a6a1d46e18d9c400f1335cc832f43fbbdea3384d6a401b6ad7ebf9b84673fc64c15989603a8d45f7443df099b6347472992fe59cfe075b4844265cb83d1c7fc3
+MISC metadata.xml 1430 SHA256 d482e291cf08a3bc4e4b2cc6157df02def9f683c35234fea5e8fcbb500c0b090 SHA512 e8ff7722b6810604b8a564e3be6a5a972fa96cd639a8445dda14394eaa81c77f41c7b3bdeaf04ad63c6682393dbf24d08032920a62e52fc4cf96b29f3d972023 WHIRLPOOL e6cb694c18142bad1a8b874d896cfe1d5c79d246782f5407a123d1e73e0e33e99ce5dc3ff297b15e3489fcfeb1ceeac3fba2cbd7388d4b4c7e75dcfb3cb894a1
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