FONT_CONF now array, bug 201834.

Package-Manager: portage-2.1.3.19

7 files changed, 33 insertions, 23 deletions

diff --git a/media-fonts/dejavu/ChangeLog b/media-fonts/dejavu/ChangeLog
index d8d80add319b..ebe67f4286df 100644
--- a/media-fonts/dejavu/ChangeLog
+++ b/media-fonts/dejavu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/dejavu
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/ChangeLog,v 1.108 2007/12/21 13:03:52 pva Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/ChangeLog,v 1.109 2008/01/08 17:29:39 pva Exp $
+
+  08 Jan 2008; <pva@gentoo.org> dejavu-2.18-r1.ebuild, dejavu-2.20.ebuild,
+  dejavu-2.21.ebuild, dejavu-2.22.20071220.2156.ebuild:
+  FONT_CONF now array, bug 201834.
 
   21 Dec 2007; <pva@gentoo.org> -dejavu-2.22.ebuild:
   Cleaned broken version.
diff --git a/media-fonts/dejavu/dejavu-2.18-r1.ebuild b/media-fonts/dejavu/dejavu-2.18-r1.ebuild
index 483cfde98c1b..59a47c552bd0 100644
--- a/media-fonts/dejavu/dejavu-2.18-r1.ebuild
+++ b/media-fonts/dejavu/dejavu-2.18-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.18-r1.ebuild,v 1.8 2007/08/25 11:34:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.18-r1.ebuild,v 1.9 2008/01/08 17:29:39 pva Exp $
 
 inherit font
 
@@ -17,10 +17,10 @@ IUSE=""
 
 DOCS="AUTHORS BUGS NEWS README status.txt langcover.txt unicover.txt"
 FONT_SUFFIX="ttf"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 FONT_S="${S}"
 
 # Only installs fonts
 RESTRICT="strip binchecks"
 
-FONT_CONF="${FILESDIR}/59-dejavu.conf"
+FONT_CONF=( "${FILESDIR}/59-dejavu.conf" )
diff --git a/media-fonts/dejavu/dejavu-2.20.ebuild b/media-fonts/dejavu/dejavu-2.20.ebuild
index 374ff9838f7a..cd59c6987b43 100644
--- a/media-fonts/dejavu/dejavu-2.20.ebuild
+++ b/media-fonts/dejavu/dejavu-2.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.20.ebuild,v 1.8 2007/12/11 10:12:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.20.ebuild,v 1.9 2008/01/08 17:29:39 pva Exp $
 
 inherit font
 
@@ -23,4 +23,4 @@ FONT_S=${S}
 # Only installs fonts
 RESTRICT="strip binchecks"
 
-FONT_CONF=${FILESDIR}/59-dejavu.conf
+FONT_CONF=( "${FILESDIR}/59-dejavu.conf" )
diff --git a/media-fonts/dejavu/dejavu-2.21.ebuild b/media-fonts/dejavu/dejavu-2.21.ebuild
index b4205aed2a07..56e52a53af72 100644
--- a/media-fonts/dejavu/dejavu-2.21.ebuild
+++ b/media-fonts/dejavu/dejavu-2.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.21.ebuild,v 1.7 2007/12/15 07:50:20 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.21.ebuild,v 1.8 2008/01/08 17:29:39 pva Exp $
 
 inherit font
 
@@ -23,4 +23,4 @@ FONT_S=${S}
 # Only installs fonts
 RESTRICT="strip binchecks"
 
-FONT_CONF=${FILESDIR}/59-dejavu.conf
+FONT_CONF=( "${FILESDIR}/59-dejavu.conf" )
diff --git a/media-fonts/dejavu/dejavu-2.22.20071220.2156.ebuild b/media-fonts/dejavu/dejavu-2.22.20071220.2156.ebuild
index af85121e38db..5ccdb0a3af03 100644
--- a/media-fonts/dejavu/dejavu-2.22.20071220.2156.ebuild
+++ b/media-fonts/dejavu/dejavu-2.22.20071220.2156.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.22.20071220.2156.ebuild,v 1.1 2007/12/21 13:01:22 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.22.20071220.2156.ebuild,v 1.2 2008/01/08 17:29:39 pva Exp $
 
 inherit font versionator
 
@@ -34,4 +34,7 @@ FONT_S=${S}/ttf
 # Only installs fonts
 RESTRICT="strip binchecks"
 
-FONT_CONF="$(eval echo "${S}"/fontconfig/{20-unhint-small-dejavu.conf,20-unhint-small-dejavu-experimental.conf,57-dejavu.conf,61-dejavu-experimental.conf})"
+FONT_CONF=( "${S}/fontconfig/20-unhint-small-dejavu.conf"
+			"${S}/fontconfig/20-unhint-small-dejavu-experimental.conf"
+			"${S}/fontconfig/57-dejavu.conf"
+			"${S}/fontconfig/61-dejavu-experimental.conf" )
diff --git a/media-fonts/liberation-fonts-ttf/ChangeLog b/media-fonts/liberation-fonts-ttf/ChangeLog
index e89c065c3c3d..82b41d95cd35 100644
--- a/media-fonts/liberation-fonts-ttf/ChangeLog
+++ b/media-fonts/liberation-fonts-ttf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-fonts/liberation-fonts-ttf
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts-ttf/ChangeLog,v 1.21 2007/09/08 11:51:36 maekke Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts-ttf/ChangeLog,v 1.22 2008/01/08 17:32:54 pva Exp $
+
+  08 Jan 2008; <pva@gentoo.org> liberation-fonts-ttf-3-r1.ebuild:
+  FONT_CONF now array, bug 201834.
 
   08 Sep 2007; Markus Meier <maekke@gentoo.org>
   liberation-fonts-ttf-3-r1.ebuild:
diff --git a/media-fonts/liberation-fonts-ttf/liberation-fonts-ttf-3-r1.ebuild b/media-fonts/liberation-fonts-ttf/liberation-fonts-ttf-3-r1.ebuild
index 4c883190487f..346c02c256d8 100644
--- a/media-fonts/liberation-fonts-ttf/liberation-fonts-ttf-3-r1.ebuild
+++ b/media-fonts/liberation-fonts-ttf/liberation-fonts-ttf-3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts-ttf/liberation-fonts-ttf-3-r1.ebuild,v 1.9 2007/09/08 11:51:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts-ttf/liberation-fonts-ttf-3-r1.ebuild,v 1.10 2008/01/08 17:32:54 pva Exp $
 
 inherit font
 
@@ -14,14 +14,14 @@ SLOT="0"
 LICENSE="GPL-2-with-exceptions"
 IUSE="X"
 
-FONT_PN="${PN/-ttf/}"
-FONT_S="${WORKDIR}/${FONT_PN}-${MY_PV}"
-S="${FONT_S}"
+FONT_PN=${PN/-ttf/}
+FONT_S=${WORKDIR}/${FONT_PN}-${MY_PV}
+S=${FONT_S}
 
 FONT_SUFFIX="ttf"
 DOCS="License.txt"
 
-FONT_CONF="${FILESDIR}"/60-liberation.conf
+FONT_CONF=( "${FILESDIR}/60-liberation.conf" )
 
 pkg_postinst() {
 	font_pkg_postinst