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

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 16 insertions, 11 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/Manifest b/media-fonts/terminus-font/Manifest
index e0a73a8b2683..7c48ea8856d9 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -14,6 +14,6 @@ DIST terminus-font-4.28-kx3.diff.gz 3242 RMD160 18aae71374d196ed3d4049594fb520d7
 DIST terminus-font-4.28.tar.gz 229336 RMD160 79bc8e60c660cf166825974dd76e5a3772131ac4 SHA1 5134a39dd6f50f07e77d20e0718fe8cd00cc16b4 SHA256 1e8010ded51141d26ec0bb9bea70cc1360d27d562b80ca7c2dcbf3fef90fb20f
 EBUILD terminus-font-4.20.ebuild 1083 RMD160 9a423d3335f3fd1b9564e4bb6a722d88257d88d7 SHA1 3cc9b123480d39072d93ddfecf2f8b70ce949729 SHA256 c72ca13922a79f5047e27d168f1704f562a2edc6eaa96ccb508df996d010068e
 EBUILD terminus-font-4.26.ebuild 1085 RMD160 721cf9754b4d996c64b81dbe462e8b4c9a3d045a SHA1 cecdd891010883b623ac69eef53388ce98aa350b SHA256 25af2b3acedbcc1dee1f332cdcb344038348f7947ca7bd0167ffa9f38605a4ca
-EBUILD terminus-font-4.28.ebuild 3288 RMD160 d272c286db0c28db7e29060cfc9f83c5ce691642 SHA1 cf731f85f5ed69ca859e9a39e7485af6beddf45b SHA256 b43456806098208844a695614b692c372b116ecd6e8bb053d934b686668a70b2
-MISC ChangeLog 9451 RMD160 95d49de3e3e4559b8ff851b26644f82c3aad3a3f SHA1 5b1ab7390a5cbb6bc563399697ae4e1ecf0b02d8 SHA256 498ceb0984ac86bdcf584bd8ff50cdaf648cfc83e27e492d337eb12803e508e4
-MISC metadata.xml 1199 RMD160 2722da09e53d59531b53a704dd618b5146bbb9f5 SHA1 2f334c73dae703c879b83f1bd4f6c4e6c8474c87 SHA256 b7f30ade029480c63b246444254439667e6aeb78c026ce64fb154ff2d18fd5d9
+EBUILD terminus-font-4.28.ebuild 3318 RMD160 07816f183c209f05ecd14ed272620ef7ebec5595 SHA1 2c782b167ca6d4277b73f530b94327829706fe6d SHA256 11d89a13cc6e5b7908b8a66f34874bff28de303afe75a55bb1428a0ec88affe5
+MISC ChangeLog 9678 RMD160 7e0d806595df407f9efd6ba5e5ca3dcc2dd7d46a SHA1 b01784425518784296a2564f0235c1167476221e SHA256 18f6dfb5d2f83039d26821207acf0c0329d8c393470d8e9e012ac57ee406882d
+MISC metadata.xml 1209 RMD160 648af213e6fb7cf5534a70321f9503880cf3c83c SHA1 080bfa0f77967db05f7a7e573def6ffcb54de3e4 SHA256 b1ca206f987ec5775072d0ae38430cd791b2a0aec156a56eeb9a6d7870220aa7
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