Version bump (bug #311557).

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

4 files changed, 42 insertions, 58 deletions

diff --git a/media-fonts/wqy-zenhei/ChangeLog b/media-fonts/wqy-zenhei/ChangeLog
index e4c38019a28b..6db28c6d913a 100644
--- a/media-fonts/wqy-zenhei/ChangeLog
+++ b/media-fonts/wqy-zenhei/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-fonts/wqy-zenhei
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-zenhei/ChangeLog,v 1.10 2009/09/27 10:22:00 volkmar Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-zenhei/ChangeLog,v 1.11 2010/09/19 06:24:16 dirtyepic Exp $
+
+*wqy-zenhei-0.9.45 (19 Sep 2010)
+
+  19 Sep 2010; Ryan Hill <dirtyepic@gentoo.org> -wqy-zenhei-0.6.26.ebuild,
+  -wqy-zenhei-0.8.34_p20081027.ebuild, +wqy-zenhei-0.9.45.ebuild:
+  Version bump (bug #311557).
 
   27 Sep 2009; Mounir Lamouri <volkmar@gentoo.org> wqy-zenhei-0.8.38-r1.ebuild:
   Stable for ppc. Bug 284010
diff --git a/media-fonts/wqy-zenhei/Manifest b/media-fonts/wqy-zenhei/Manifest
index a3b225067aec..f57a0bef2cb9 100644
--- a/media-fonts/wqy-zenhei/Manifest
+++ b/media-fonts/wqy-zenhei/Manifest
@@ -1,8 +1,16 @@
-DIST wqy-zenhei-0.6.26-0.tar.gz 6780681 RMD160 2761d3f7c994df215eacc9601437f35f200048e0 SHA1 6478151e90d2c521aa0c7aa930d060ca5b5d1076 SHA256 47355b6ec84bb309614b6d657ddfda993b96ed0be569264f82e523b254f945b2
-DIST wqy-zenhei-0.8.34-cvs20081027.tar.gz 6570970 RMD160 be1ea094a777a3808931dc1cd97bd7bd7219a5cc SHA1 e862a8d266e37c8dadc669ddc350bba589535aa7 SHA256 e05260cdbb9766d40f367e99e47eee9059681ecdf8f4da234bbd2b1b8b764172
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST wqy-zenhei-0.8.38-1.tar.gz 7173844 RMD160 f135065dc59d42041db44575df5a2b95d21a6211 SHA1 5faf0993c33c48e7e6353e1b52921d8b39f9852d SHA256 6018eb54243eddc41e9cbe0b71feefa5cb2570ecbaccd39daa025961235dea22
-EBUILD wqy-zenhei-0.6.26.ebuild 1017 RMD160 56722798b492406d3fb018fe4e11c5ed1d7a8dcd SHA1 ca6a6e1efa21c9c6d6f6643e2d41ca12cbc70bd0 SHA256 2222a107a57a0cbc98fe6cde6ac6b4b75cbb06b1e295ee350915f622df697b81
-EBUILD wqy-zenhei-0.8.34_p20081027.ebuild 1089 RMD160 22b7a48a13caf72d4aa72e7fdec32665d8ce75cc SHA1 e5bb69b80de190c1df73de7f2565a23b26f3db97 SHA256 e3277d12dbe28a6a0f72619869a540b6ac8e3cbabd11feb302cd0a6121a0c9e4
+DIST wqy-zenhei-0.9.45.tar.gz 9247393 RMD160 d364c8544665b651a6425b312a857e6bc2e3b2da SHA1 b86b65d3048ade868fcc89229cfac6baf80a3e54 SHA256 e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6
 EBUILD wqy-zenhei-0.8.38-r1.ebuild 1127 RMD160 fd82f8e57504d0f4df6a73b4245b12ae1e7a4405 SHA1 b85197f0ba59f43b2e1b647f8905790d7fbc485f SHA256 7b8edc674ceed8e2ea240661bb105b7209b2becc2eec938e58713221c33e0235
-MISC ChangeLog 1776 RMD160 7ad5f8d056ed76fa7007a0b2ad16827ba698924f SHA1 29ab752087cefc7404fe1a9bcbd7689b9ba965cd SHA256 d609a27d17713bc289562beb47cdb3e07d5d8245c3374f201dc1631c167e972e
+EBUILD wqy-zenhei-0.9.45.ebuild 1178 RMD160 69842f71d854cd7a93a87998ee7bd8ae95a51221 SHA1 bb7cc54191fa2d3ae9bf656aacbb9d7fe1ea9e0b SHA256 7edfea16378a61b3ea504faf7195f12e38d06100e2eb55e142b646bc06b40f7c
+MISC ChangeLog 1984 RMD160 164786ee3331dbe4204d9104b611d5a8de3585e6 SHA1 54b772f37b84e31b85da75f09f4498addd3af8a7 SHA256 bd0bf624f777e602a5246672f59e2f2e4daef0d2ac4574f8f2b367bb8863993a
 MISC metadata.xml 159 RMD160 e9d6dae6266cd59331aaa78481fd5a67fc2ed725 SHA1 152e7ea08489d788f3f1c4c59be552a5f94b2d02 SHA256 952d89bc3335f3d2f69460945016b173913db58759fe7d906f3927909120c890
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyVraMACgkQiqiDRvmkBmLFnACfV7BjrX7kxCNM1PBbTBD21KeA
+mycAnirLafS3Q+LIC9nnc4xp/1dFu3/W
+=H8Ow
+-----END PGP SIGNATURE-----
diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.6.26.ebuild b/media-fonts/wqy-zenhei/wqy-zenhei-0.6.26.ebuild
deleted file mode 100644
index e3e0a2532614..000000000000
--- a/media-fonts/wqy-zenhei/wqy-zenhei-0.6.26.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-zenhei/wqy-zenhei-0.6.26.ebuild,v 1.3 2009/01/14 00:39:13 josejx Exp $
-
-inherit font
-
-DESCRIPTION="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font"
-HOMEPAGE="http://wqy.sourceforge.net/cgi-bin/enindex.cgi?ZenHei(en)"
-SRC_URI="mirror://sourceforge/wqy/${P}-0.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-FONT_S=${S}
-FONT_CONF=(	"44-wqy-zenhei.conf"
-		"66-wqy-zenhei-sharp.conf"	)
-
-FONT_SUFFIX="ttf"
-DOCS="AUTHORS"
-
-pkg_postinst() {
-	font_pkg_postinst
-	echo
-	elog "This font installs two fontconfig configuration files."
-	elog ""
-	elog "To activate preferred rendering, run:"
-	elog "eselect fontconfig enable 44-wqy-zenhei.conf"
-	elog
-	elog "To make the font only use embedded bitmap fonts when available, run:"
-	elog "eselect fontconfig enable 66-wqy-zenhei-sharp.conf"
-	echo
-}
diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.8.34_p20081027.ebuild b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.ebuild
index 92f02a572ecc..7d0afe87d0ea 100644
--- a/media-fonts/wqy-zenhei/wqy-zenhei-0.8.34_p20081027.ebuild
+++ b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.ebuild
@@ -1,43 +1,50 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-zenhei/wqy-zenhei-0.8.34_p20081027.ebuild,v 1.2 2009/01/14 00:39:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.ebuild,v 1.1 2010/09/19 06:24:16 dirtyepic Exp $
+
+EAPI="3"
 
 inherit font
 
-MY_P="${P/_p/-cvs}"
 DESCRIPTION="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font"
-HOMEPAGE="http://wenq.org/enindex.cgi"
-SRC_URI="mirror://sourceforge/wqy/${MY_P}.tar.gz"
+HOMEPAGE="http://wqy.sourceforge.net/cgi-bin/enindex.cgi?ZenHei(en)"
+SRC_URI="mirror://sourceforge/wqy/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
-# Only installs fonts
-RESTRICT="strip binchecks"
-
 DEPEND=""
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
 FONT_S="${S}"
+FONT_SUFFIX="ttc"
+DOCS="AUTHORS ChangeLog README"
+
 FONT_CONF=(
-	"44-wqy-zenhei.conf"
-	"66-wqy-zenhei-sharp.conf"
+	43-wqy-zenhei-sharp.conf
+	44-wqy-zenhei.conf
 )
 
-FONT_SUFFIX="ttc"
-DOCS="AUTHORS ChangeLog README"
+# Only installs fonts
+RESTRICT="strip binchecks"
+
+src_compile() {
+	:
+}
 
 pkg_postinst() {
+	unset FONT_CONF # override default message
 	font_pkg_postinst
 	elog
 	elog "This font installs two fontconfig configuration files."
-	elog ""
+	elog
 	elog "To activate preferred rendering, run:"
 	elog "eselect fontconfig enable 44-wqy-zenhei.conf"
 	elog
 	elog "To make the font only use embedded bitmap fonts when available, run:"
-	elog "eselect fontconfig enable 66-wqy-zenhei-sharp.conf"
+	elog "eselect fontconfig enable 43-wqy-zenhei-sharp.conf"
 	elog
 }