Raw USE flag renamed to raw-font-data as it had inconsistent usage with global USE flag, bug #271918, thank Antti Mäkelä for report

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 13 insertions, 8 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index eec99991a3c1..c58ea9428a3e 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-fonts/terminus-font
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.68 2009/01/12 04:25:00 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.69 2009/06/05 16:59:12 pva Exp $
+
+  05 Jun 2009; Peter Volkov <pva@gentoo.org> terminus-font-4.28.ebuild,
+  metadata.xml:
+  Raw USE flag renamed to raw-font-data as it had inconsistent usage with
+  global USE flag, bug #271918, thank Antti Mäkelä for report
 
   12 Jan 2009; Jeroen Roovers <jer@gentoo.org> terminus-font-4.28.ebuild:
   Stable for HPPA (bug #252648).
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index e8e574f753cd..fa5c23847582 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -5,8 +5,8 @@
 <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='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'>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>
diff --git a/media-fonts/terminus-font/terminus-font-4.28.ebuild b/media-fonts/terminus-font/terminus-font-4.28.ebuild
index dc48debe56cc..65e48ab07c65 100644
--- a/media-fonts/terminus-font/terminus-font-4.28.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.28.ebuild,v 1.8 2009/01/12 04:25:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.28.ebuild,v 1.9 2009/06/05 16:59:12 pva Exp $
 
 EAPI="1"
 
@@ -24,7 +24,7 @@ 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 +psf raw +pcf"
+IUSE="a-like-o ru-dv +ru-g quote ru-i ru-k width bolddiag +psf raw-font-data +pcf"
 
 DEPEND="dev-lang/perl
 		sys-apps/gawk
@@ -79,7 +79,7 @@ src_compile() {
 		--x11dir=${FONTDIR}
 
 	if use psf; then emake psf txt || die; fi
-	if use raw; then emake raw || die; fi
+	if use raw-font-data; then emake raw || die; fi
 	if use pcf; then emake pcf || die; fi
 }
 
@@ -87,7 +87,7 @@ src_install() {
 	if use psf; then
 		emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
 	fi
-	if use raw; then
+	if use raw-font-data; then
 		emake DESTDIR="${D}" install.raw || die
 	fi
 	if use pcf; then