6 files changed, 53 insertions, 46 deletions
diff --git a/media-fonts/wqy-bitmapfont/ChangeLog b/media-fonts/wqy-bitmapfont/ChangeLog
index 9e6eed8d2456..d69dab4a7122 100644
--- a/media-fonts/wqy-bitmapfont/ChangeLog
+++ b/media-fonts/wqy-bitmapfont/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-fonts/wqy-bitmapfont
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-bitmapfont/ChangeLog,v 1.6 2006/11/26 23:19:00 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-bitmapfont/ChangeLog,v 1.7 2007/07/29 22:24:03 dirtyepic Exp $
+
+*wqy-bitmapfont-0.8.1 (29 Jul 2007)
+
+  29 Jul 2007; Ryan Hill <dirtyepic@gentoo.org>
+  -wqy-bitmapfont-0.6.0.ebuild, +wqy-bitmapfont-0.8.1.ebuild:
+  Version bump, install fontconfig conf file.
 
 *wqy-bitmapfont-0.7.0-r1 (26 Nov 2006)
 
diff --git a/media-fonts/wqy-bitmapfont/Manifest b/media-fonts/wqy-bitmapfont/Manifest
index 0c5b6b77d829..808b60dd1f66 100644
--- a/media-fonts/wqy-bitmapfont/Manifest
+++ b/media-fonts/wqy-bitmapfont/Manifest
@@ -1,12 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST wqy-bitmapfont-pcf-0.6.0.tar.gz 5368797 RMD160 71ae4e82557d81f678f19d7a749a97684e22fb92 SHA1 795e9580a119ce939ffbf6216108b375cc273672 SHA256 0bb9b413dde752ab931297b779d50ab57f6fce5ebdbd643fcc1fa19a42b30ca3
 DIST wqy-bitmapfont-pcf-0.7.0-4.tar.gz 5428710 RMD160 dfe482678fcf09663aec44bd9a3ac4b4fd802ed7 SHA1 10dbba2cd8e167d37d2d8f16ac63073498fd965f SHA256 e3b7c858d13f359fadce659eeb5ee6d1351451d7e3a340ee95feb4fa6bd82b56
-EBUILD wqy-bitmapfont-0.6.0.ebuild 609 RMD160 d29a475f725bfb250b2636721fd9b420a05d774b SHA1 5bc10733c0a0f0e10703cd9cda24c3aa5649e4b4 SHA256 4a478de5cd87aa1f9294f433d3d21b9d1b004c02842c58e6aaf130f88d0f4183
-MD5 b76eb957df83dcb49e7fdbe8bf6632d7 wqy-bitmapfont-0.6.0.ebuild 609
-RMD160 d29a475f725bfb250b2636721fd9b420a05d774b wqy-bitmapfont-0.6.0.ebuild 609
-SHA256 4a478de5cd87aa1f9294f433d3d21b9d1b004c02842c58e6aaf130f88d0f4183 wqy-bitmapfont-0.6.0.ebuild 609
+DIST wqy-bitmapfont-pcf-0.8.1-7.tar.gz 5340556 RMD160 cd6b2f3f4ee2751516ab737f74dc7544e285dac9 SHA1 bb1c48fd2cf7a3f63cbcbac9158461f0b9133806 SHA256 436acd6da8c42117aa7aca9367042125721b0fd911923970880023c0f65ab270
 EBUILD wqy-bitmapfont-0.7.0-r1.ebuild 787 RMD160 70f9a91ba984046f0a6a9f3d34605b62865677fd SHA1 b44adc29e4981b0260ee742d7102652e8f6d2a41 SHA256 5a355b5322470059f716ebe0391198179016c6343741d42d212c0a00b9f05cbd
 MD5 de9beaf1cd6413f92ad53258efcca919 wqy-bitmapfont-0.7.0-r1.ebuild 787
 RMD160 70f9a91ba984046f0a6a9f3d34605b62865677fd wqy-bitmapfont-0.7.0-r1.ebuild 787
@@ -15,27 +8,24 @@ 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
-MISC ChangeLog 1169 RMD160 652f7d09d75e707eac9324d5d91fb360cbf88951 SHA1 2b4e03d3b9a11dd77a6e4bfc081a851c94a98ec0 SHA256 cdcd9bdefddc9f148a242bd76468ca3b759532e3fd7b20ebc01ea42ac7e24072
-MD5 0fd30c6706cad5b1f5ebdf5b73d247f9 ChangeLog 1169
-RMD160 652f7d09d75e707eac9324d5d91fb360cbf88951 ChangeLog 1169
-SHA256 cdcd9bdefddc9f148a242bd76468ca3b759532e3fd7b20ebc01ea42ac7e24072 ChangeLog 1169
+EBUILD wqy-bitmapfont-0.8.1.ebuild 819 RMD160 d9ca2c4410fdf8d2efd3302c339135519905fa8d SHA1 4b1f0c948784b99b5e9dd85efba8228edd44a15c SHA256 059f27c85024fcde6c5a565469a550a7ebfcd0a50570e973ddadf42ead65f0e2
+MD5 f663cabe38ee759fe32fa1dc0a47faf4 wqy-bitmapfont-0.8.1.ebuild 819
+RMD160 d9ca2c4410fdf8d2efd3302c339135519905fa8d wqy-bitmapfont-0.8.1.ebuild 819
+SHA256 059f27c85024fcde6c5a565469a550a7ebfcd0a50570e973ddadf42ead65f0e2 wqy-bitmapfont-0.8.1.ebuild 819
+MISC ChangeLog 1363 RMD160 f9883a467a166b8d2874aa1962569016ccf155f8 SHA1 b0e2b2a5ab9acd49015eb78a764b8145d5271648 SHA256 9d8a37ebad52d633584a615b7ab2919ac01b7510ca696608a837de012e6b6263
+MD5 658679deeadff19d7ff6b0d26a1eda57 ChangeLog 1363
+RMD160 f9883a467a166b8d2874aa1962569016ccf155f8 ChangeLog 1363
+SHA256 9d8a37ebad52d633584a615b7ab2919ac01b7510ca696608a837de012e6b6263 ChangeLog 1363
 MISC metadata.xml 597 RMD160 5c556aa67bf30ea6e5327f78e2ae70dfe4758508 SHA1 4d123346c0654d851282a14598e6467900a9bc91 SHA256 dd9d1a7b47b3542fc2d824775ea6b61206072a62dda1c15b82d374ce33ee8df4
 MD5 90a11f67a6a85b76934c2164717f8d24 metadata.xml 597
 RMD160 5c556aa67bf30ea6e5327f78e2ae70dfe4758508 metadata.xml 597
 SHA256 dd9d1a7b47b3542fc2d824775ea6b61206072a62dda1c15b82d374ce33ee8df4 metadata.xml 597
-MD5 e4f92c8eda887a327428a990ce6a8e67 files/digest-wqy-bitmapfont-0.6.0 277
-RMD160 f8c6932eb58268729489c512b0bb3c7f68de3bbf files/digest-wqy-bitmapfont-0.6.0 277
-SHA256 27e68cb70b221380f024827d03cd4ec0b8bad53b4cc8f6a5bad14292f2996f55 files/digest-wqy-bitmapfont-0.6.0 277
 MD5 2128a427d9c23242599628c4a452f8b4 files/digest-wqy-bitmapfont-0.7.0 283
 RMD160 84058e5b1a3424ba6e32c8a2aa3a7ea02aec603d files/digest-wqy-bitmapfont-0.7.0 283
 SHA256 e1e42c4eaee32204c0e36b6ee509345247efc6042bbfd7127caa4921c4967ff6 files/digest-wqy-bitmapfont-0.7.0 283
 MD5 2128a427d9c23242599628c4a452f8b4 files/digest-wqy-bitmapfont-0.7.0-r1 283
 RMD160 84058e5b1a3424ba6e32c8a2aa3a7ea02aec603d files/digest-wqy-bitmapfont-0.7.0-r1 283
 SHA256 e1e42c4eaee32204c0e36b6ee509345247efc6042bbfd7127caa4921c4967ff6 files/digest-wqy-bitmapfont-0.7.0-r1 283
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFaiDrAiZjviIA2XgRAvMtAJwLSV23Y+dy2oyjgbfrRw83nkCkaQCeLLH8
-XygMK6sE33P3hagLb5qdyU8=
-=ejCi
------END PGP SIGNATURE-----
+MD5 8c44a7c35cedfcf673957450215f5a1e files/digest-wqy-bitmapfont-0.8.1 283
+RMD160 be1dbf2727acd825ca64bb77fd5ed6b463a0d236 files/digest-wqy-bitmapfont-0.8.1 283
+SHA256 8b682bd0378953c710e2bf280c3d0c505e362241e06ea69a373e6b47973f4c39 files/digest-wqy-bitmapfont-0.8.1 283
diff --git a/media-fonts/wqy-bitmapfont/files/digest-wqy-bitmapfont-0.6.0 b/media-fonts/wqy-bitmapfont/files/digest-wqy-bitmapfont-0.6.0
deleted file mode 100644
index 568108a44c09..000000000000
--- a/media-fonts/wqy-bitmapfont/files/digest-wqy-bitmapfont-0.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5daa79c48cc0e30713134c28ba5d9911 wqy-bitmapfont-pcf-0.6.0.tar.gz 5368797
-RMD160 71ae4e82557d81f678f19d7a749a97684e22fb92 wqy-bitmapfont-pcf-0.6.0.tar.gz 5368797
-SHA256 0bb9b413dde752ab931297b779d50ab57f6fce5ebdbd643fcc1fa19a42b30ca3 wqy-bitmapfont-pcf-0.6.0.tar.gz 5368797
diff --git a/media-fonts/wqy-bitmapfont/files/digest-wqy-bitmapfont-0.8.1 b/media-fonts/wqy-bitmapfont/files/digest-wqy-bitmapfont-0.8.1
new file mode 100644
index 000000000000..c2465c0cf1b7
--- /dev/null
+++ b/media-fonts/wqy-bitmapfont/files/digest-wqy-bitmapfont-0.8.1
@@ -0,0 +1,3 @@
+MD5 4015f08a30a164920001cf76ec022703 wqy-bitmapfont-pcf-0.8.1-7.tar.gz 5340556
+RMD160 cd6b2f3f4ee2751516ab737f74dc7544e285dac9 wqy-bitmapfont-pcf-0.8.1-7.tar.gz 5340556
+SHA256 436acd6da8c42117aa7aca9367042125721b0fd911923970880023c0f65ab270 wqy-bitmapfont-pcf-0.8.1-7.tar.gz 5340556
diff --git a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.6.0.ebuild b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.6.0.ebuild
deleted file mode 100644
index 4feb7a868c92..000000000000
--- a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.6.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2006 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.6.0.ebuild,v 1.6 2006/09/03 06:48:45 vapier Exp $
-
-inherit font
-
-DESCRIPTION="WenQuanYi Bitmap Song CJK font"
-HOMEPAGE="http://wqy.sourceforge.net/en/"
-SRC_URI="mirror://sourceforge/wqy/${PN}-pcf-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 arm ~hppa ia64 ~ppc s390 sh ~x86"
-IUSE=""
-DEPEND=""
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-
-FONT_SUFFIX="pcf"
-DOCS="INSTALL* LATEST-IS* STAT README LOGO.PNG CREDIT ChangeLog"
diff --git a/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.8.1.ebuild b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.8.1.ebuild
new file mode 100644
index 000000000000..fb4dd81b3244
--- /dev/null
+++ b/media-fonts/wqy-bitmapfont/wqy-bitmapfont-0.8.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 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.ebuild,v 1.1 2007/07/29 22:24:03 dirtyepic Exp $
+
+inherit font
+
+DESCRIPTION="WenQuanYi Bitmap Song CJK font"
+HOMEPAGE="http://wqy.sourceforge.net/en/"
+SRC_URI="mirror://sourceforge/wqy/${PN}-pcf-${PV}-7.tar.gz"
+LICENSE="GPL-2"
+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"
+
+FONT_SUFFIX="pcf.gz"
+DOCS="INSTALL* LATEST-IS* STAT README LOGO.PNG CREDIT ChangeLog"
+
+# Only installs fonts
+RESTRICT="strip binchecks"
+
+src_compile() {
+	cd "${FONT_S}"
+	for file in *.pcf; do
+		gzip -9 ${file} || die "gzip failed"
+	done
+}