Version bump (bug #311557).

(Portage version: 2.2_rc83/cvs/Linux x86_64)

3 files changed, 29 insertions, 53 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/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
 }