Use FONT_S to make vapier happy.

Package-Manager: portage-2.1.2-r1

6 files changed, 27 insertions, 18 deletions

diff --git a/media-fonts/mikachan-font-otf/ChangeLog b/media-fonts/mikachan-font-otf/ChangeLog
index 8dd84083e279..b5bbf70513a7 100644
--- a/media-fonts/mikachan-font-otf/ChangeLog
+++ b/media-fonts/mikachan-font-otf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/mikachan-font-otf
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-otf/ChangeLog,v 1.15 2006/12/01 01:35:41 ranger Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-otf/ChangeLog,v 1.16 2007/01/22 20:57:09 flameeyes Exp $
+
+  22 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  mikachan-font-otf-9.1.ebuild:
+  Use FONT_S to make vapier happy.
 
   01 Dec 2006; Brent Baude <ranger@gentoo.org> mikachan-font-otf-9.1.ebuild:
   Marking mikachan-font-otf-9.1 ppc64 for bug 156357
diff --git a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1.ebuild b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1.ebuild
index a92981681a47..3e63b00bc450 100644
--- a/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1.ebuild
+++ b/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1.ebuild,v 1.15 2006/12/01 01:35:41 ranger Exp $
-
-S="${WORKDIR}/${P}"
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-otf/mikachan-font-otf-9.1.ebuild,v 1.16 2007/01/22 20:57:09 flameeyes Exp $
 
 inherit font
 
@@ -17,6 +15,7 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 FONT_SUFFIX="otf"
+FONT_S="${WORKDIR}/${P}"
 
 # Only installs fonts
 RESTRICT="strip binchecks"
diff --git a/media-fonts/mikachan-font-ttc/ChangeLog b/media-fonts/mikachan-font-ttc/ChangeLog
index 1100a3ff086d..e0d1e8e4c36c 100644
--- a/media-fonts/mikachan-font-ttc/ChangeLog
+++ b/media-fonts/mikachan-font-ttc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/mikachan-font-ttc
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-ttc/ChangeLog,v 1.14 2006/12/01 01:39:47 ranger Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-ttc/ChangeLog,v 1.15 2007/01/22 20:57:50 flameeyes Exp $
+
+  22 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  mikachan-font-ttc-9.1.ebuild:
+  Use FONT_S to make vapier happy.
 
   01 Dec 2006; Brent Baude <ranger@gentoo.org> mikachan-font-ttc-9.1.ebuild:
   Marking mikachan-font-ttc-9.1 ppc64 for bug 156357
diff --git a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
index 6c8ea520b315..bc8b0c723876 100644
--- a/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
+++ b/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild,v 1.14 2006/12/01 01:39:47 ranger Exp $
-
-S="${WORKDIR}/${P/-ttc}"
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-ttc/mikachan-font-ttc-9.1.ebuild,v 1.15 2007/01/22 20:57:50 flameeyes Exp $
 
 inherit font
 
@@ -19,6 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
+FONT_S="${WORKDIR}/${P/-ttc}"
 FONT_SUFFIX="ttc"
 
 # Only installs fonts
diff --git a/media-fonts/mikachan-font-ttf/ChangeLog b/media-fonts/mikachan-font-ttf/ChangeLog
index b11ab872c1b1..8c23e3f56acb 100644
--- a/media-fonts/mikachan-font-ttf/ChangeLog
+++ b/media-fonts/mikachan-font-ttf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/mikachan-font-ttf
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-ttf/ChangeLog,v 1.14 2006/12/01 01:38:07 ranger Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-ttf/ChangeLog,v 1.15 2007/01/22 20:58:15 flameeyes Exp $
+
+  22 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  mikachan-font-ttf-8.9-r1.ebuild:
+  Use FONT_S to make vapier happy.
 
   01 Dec 2006; Brent Baude <ranger@gentoo.org>
   mikachan-font-ttf-8.9-r1.ebuild:
diff --git a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r1.ebuild b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r1.ebuild
index 175b630116a4..fb814b1ed084 100644
--- a/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r1.ebuild
+++ b/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r1.ebuild,v 1.14 2006/12/01 01:38:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mikachan-font-ttf/mikachan-font-ttf-8.9-r1.ebuild,v 1.15 2007/01/22 20:58:15 flameeyes Exp $
 
 inherit font
 
@@ -18,8 +18,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
-S="${WORKDIR}"
-FONT_S="${S}"
+FONT_S="${WORKDIR}"
 FONT_SUFFIX="ttf"
 
 # Only installs fonts