FONT_CONF now array, bug 201834.

Package-Manager: portage-2.1.3.19

4 files changed, 28 insertions, 34 deletions

diff --git a/media-fonts/wqy-bitmapfont/ChangeLog b/media-fonts/wqy-bitmapfont/ChangeLog
index b50561a60793..edbe6095427e 100644
--- a/media-fonts/wqy-bitmapfont/ChangeLog
+++ b/media-fonts/wqy-bitmapfont/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/wqy-bitmapfont
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-bitmapfont/ChangeLog,v 1.14 2007/12/16 20:29:01 dirtyepic Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-bitmapfont/ChangeLog,v 1.15 2008/01/08 17:19:24 pva Exp $
+
+  08 Jan 2008; <pva@gentoo.org> wqy-bitmapfont-0.8.1-r1.ebuild,
+  wqy-bitmapfont-0.9.9_p0.ebuild:
+  FONT_CONF now array, bug 201834.
 
   16 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
   wqy-bitmapfont-0.8.1-r1.ebuild:
diff --git a/media-fonts/wqy-bitmapfont/Manifest b/media-fonts/wqy-bitmapfont/Manifest
index a7df4f5baeec..a680beb71a14 100644
--- a/media-fonts/wqy-bitmapfont/Manifest
+++ b/media-fonts/wqy-bitmapfont/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST wqy-bitmapfont-pcf-0.7.0-4.tar.gz 5428710 RMD160 dfe482678fcf09663aec44bd9a3ac4b4fd802ed7 SHA1 10dbba2cd8e167d37d2d8f16ac63073498fd965f SHA256 e3b7c858d13f359fadce659eeb5ee6d1351451d7e3a340ee95feb4fa6bd82b56
 DIST wqy-bitmapfont-pcf-0.8.1-7.tar.gz 5340556 RMD160 cd6b2f3f4ee2751516ab737f74dc7544e285dac9 SHA1 bb1c48fd2cf7a3f63cbcbac9158461f0b9133806 SHA256 436acd6da8c42117aa7aca9367042125721b0fd911923970880023c0f65ab270
 DIST wqy-bitmapfont-pcf-0.9.9-0.tar.gz 6539821 RMD160 639598acd14d037350cf91c1ea3969d27111c474 SHA1 b97fbf1998bdf893619fc74b4c7577b437a1cd18 SHA256 8c51a5286863b44a24dcc68074c65b1a25ce42893da01edcbe4db3b8eca9e143
@@ -12,18 +9,18 @@ EBUILD wqy-bitmapfont-0.7.0.ebuild 674 RMD160 4c1b3b213c0c703fe9ad196369eb1f81f4
 MD5 e9ae10902e0ce1a1018b0ca9fdfca8ef wqy-bitmapfont-0.7.0.ebuild 674
 RMD160 4c1b3b213c0c703fe9ad196369eb1f81f43baab4 wqy-bitmapfont-0.7.0.ebuild 674
 SHA256 ce77647c812ca1502165102d357e2743f629728c7bfccb3d61187148f7fe0041 wqy-bitmapfont-0.7.0.ebuild 674
-EBUILD wqy-bitmapfont-0.8.1-r1.ebuild 708 RMD160 c39cb85d15525378cf90e31a5f7457cc5e4e1753 SHA1 064deb66aa01f02eacb5e836ad34b8e754a96d83 SHA256 e22e232cd7d7e18c2881a87db6753b91e0363448a0a56dc4501980642f5fbbb7
-MD5 b68767ddd464521389c0faf5503e5305 wqy-bitmapfont-0.8.1-r1.ebuild 708
-RMD160 c39cb85d15525378cf90e31a5f7457cc5e4e1753 wqy-bitmapfont-0.8.1-r1.ebuild 708
-SHA256 e22e232cd7d7e18c2881a87db6753b91e0363448a0a56dc4501980642f5fbbb7 wqy-bitmapfont-0.8.1-r1.ebuild 708
-EBUILD wqy-bitmapfont-0.9.9_p0.ebuild 695 RMD160 b172066173748b0ee5693d38748961d30cd93f4d SHA1 1b9841bbe4cd1772222ff9a2faad43547b7d49fb SHA256 feb9f93d13b413aee461ae81222d1f8842bf6a31f2ccac5ea5a81c358a19e7e5
-MD5 5b39f82d85a00850566437a1abedc75b wqy-bitmapfont-0.9.9_p0.ebuild 695
-RMD160 b172066173748b0ee5693d38748961d30cd93f4d wqy-bitmapfont-0.9.9_p0.ebuild 695
-SHA256 feb9f93d13b413aee461ae81222d1f8842bf6a31f2ccac5ea5a81c358a19e7e5 wqy-bitmapfont-0.9.9_p0.ebuild 695
-MISC ChangeLog 2329 RMD160 df0d6dac09d303b58ecf0a0c05a3affffd38ae3e SHA1 16b0d826056c015b6bc815a50f66ff65c1e41c01 SHA256 4a5d5bb61efff80d17ce18ef779cf0f72e177bb0ad85bbccbb7b1ce3194d2af6
-MD5 16a7ebc06dc4b3bf9707fd72c146e184 ChangeLog 2329
-RMD160 df0d6dac09d303b58ecf0a0c05a3affffd38ae3e ChangeLog 2329
-SHA256 4a5d5bb61efff80d17ce18ef779cf0f72e177bb0ad85bbccbb7b1ce3194d2af6 ChangeLog 2329
+EBUILD wqy-bitmapfont-0.8.1-r1.ebuild 702 RMD160 2619c26b16718cb90c6f2ed408477f8650f66a0b SHA1 3bf10a883b255d2b57ad1f8727ac59d14b63e45f SHA256 59b2bd90119be943a46bba9d6b6ca745fcdb327955dcaeb143531ccafc1306c7
+MD5 99b77200fb04da9720a338473e415f73 wqy-bitmapfont-0.8.1-r1.ebuild 702
+RMD160 2619c26b16718cb90c6f2ed408477f8650f66a0b wqy-bitmapfont-0.8.1-r1.ebuild 702
+SHA256 59b2bd90119be943a46bba9d6b6ca745fcdb327955dcaeb143531ccafc1306c7 wqy-bitmapfont-0.8.1-r1.ebuild 702
+EBUILD wqy-bitmapfont-0.9.9_p0.ebuild 692 RMD160 cd5f75196d1d1f6a7c13e4e5388dd6bb220f921b SHA1 d6cb84ba3016911a64b96ed95421fcf063b4e69d SHA256 4fc1bfea11c3b92ba55681e31fbcf54799f98a137a5afe2b860755f6a018b7a4
+MD5 a7b29a32d65be39343522a93d9436b46 wqy-bitmapfont-0.9.9_p0.ebuild 692
+RMD160 cd5f75196d1d1f6a7c13e4e5388dd6bb220f921b wqy-bitmapfont-0.9.9_p0.ebuild 692
+SHA256 4fc1bfea11c3b92ba55681e31fbcf54799f98a137a5afe2b860755f6a018b7a4 wqy-bitmapfont-0.9.9_p0.ebuild 692
+MISC ChangeLog 2457 RMD160 c482e7cdf717926cdfe074faa5fe8fd8f2f057d2 SHA1 423ea2b6078e8bdc2a0ac2a31484f0edc750e227 SHA256 26048c034091dece832506bf76787cd2fb93c58d687762d19c2f4eec42c8e1a1
+MD5 3aae6dc8ba7a34d25fc665d0d0bbbe70 ChangeLog 2457
+RMD160 c482e7cdf717926cdfe074faa5fe8fd8f2f057d2 ChangeLog 2457
+SHA256 26048c034091dece832506bf76787cd2fb93c58d687762d19c2f4eec42c8e1a1 ChangeLog 2457
 MISC metadata.xml 597 RMD160 5c556aa67bf30ea6e5327f78e2ae70dfe4758508 SHA1 4d123346c0654d851282a14598e6467900a9bc91 SHA256 dd9d1a7b47b3542fc2d824775ea6b61206072a62dda1c15b82d374ce33ee8df4
 MD5 90a11f67a6a85b76934c2164717f8d24 metadata.xml 597
 RMD160 5c556aa67bf30ea6e5327f78e2ae70dfe4758508 metadata.xml 597
@@ -40,10 +37,3 @@ SHA256 8b682bd0378953c710e2bf280c3d0c505e362241e06ea69a373e6b47973f4c39 files/di
 MD5 e6d44994abff89f9e470faf02c7e6374 files/digest-wqy-bitmapfont-0.9.9_p0 283
 RMD160 53026df69ae1fc97cb71018c2744125a9708f906 files/digest-wqy-bitmapfont-0.9.9_p0 283
 SHA256 1ac60697bfe84720bb1190fb5bc9daf76f29aba6f057fa9005bfeaea59948463 files/digest-wqy-bitmapfont-0.9.9_p0 283
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHZYqaiqiDRvmkBmIRAsI+AKDIBK4mX01loPJsp2zyJmnZD156QgCgqKdQ
-8498ac8LO+t6v1BHe9A0e08=
-=J03I
------END PGP SIGNATURE-----
diff --git a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.8.1-r1.ebuild b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.8.1-r1.ebuild
index 475d3035fbd6..ae0d34df7401 100644
--- a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.8.1-r1.ebuild
+++ b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.8.1-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/wqy-bitmapfont/wqy-bitmapfont-0.8.1-r1.ebuild,v 1.7 2007/12/16 20:29:01 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.8.1-r1.ebuild,v 1.8 2008/01/08 17:19:24 pva Exp $
 
 inherit font
 
@@ -12,9 +12,9 @@ SLOT="0"
 KEYWORDS="amd64 arm hppa ia64 ppc s390 sh x86 ~x86-fbsd"
 IUSE=""
 DEPEND=""
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_CONF="85-wqy-bitmapsong.conf"
+S=${WORKDIR}/${PN}
+FONT_S=${S}
+FONT_CONF=( "85-wqy-bitmapsong.conf" )
 
 FONT_SUFFIX="pcf"
 DOCS="INSTALL* LATEST-IS* STAT README LOGO.PNG CREDIT ChangeLog"
diff --git a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.9.9_p0.ebuild b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.9.9_p0.ebuild
index ba54a3a4254a..5a221d6bfa40 100644
--- a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.9.9_p0.ebuild
+++ b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.9.9_p0.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/wqy-bitmapfont/wqy-bitmapfont-0.9.9_p0.ebuild,v 1.1 2007/12/01 16:57:51 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.9.9_p0.ebuild,v 1.2 2008/01/08 17:19:24 pva Exp $
 
 inherit font
 
@@ -15,9 +15,9 @@ IUSE=""
 
 DEPEND=""
 
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_CONF="85-wqy-bitmapsong.conf"
+S=${WORKDIR}/${PN}
+FONT_S=${S}
+FONT_CONF=( "85-wqy-bitmapsong.conf" )
 
 FONT_SUFFIX="pcf"
 DOCS="AUTHORS ChangeLog Logo.PNG README"