Version bump. Fix fontconfig warning with patch contributed by Kévin Bernard-Allies in bug #490412.

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

3 files changed, 102 insertions, 2 deletions

diff --git a/media-fonts/wqy-zenhei/ChangeLog b/media-fonts/wqy-zenhei/ChangeLog
index 726d4756091a..d82bc0c1cb70 100644
--- a/media-fonts/wqy-zenhei/ChangeLog
+++ b/media-fonts/wqy-zenhei/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-fonts/wqy-zenhei
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-zenhei/ChangeLog,v 1.12 2013/02/05 00:53:54 heroxbd Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/wqy-zenhei/ChangeLog,v 1.13 2015/02/21 06:39:36 yngwin Exp $
+
+*wqy-zenhei-0.9.46 (21 Feb 2015)
+
+  21 Feb 2015; Ben de Groot <yngwin@gentoo.org> +files/44-wqy-zenhei.conf.patch,
+  +wqy-zenhei-0.9.46.ebuild:
+  Version bump. Fix fontconfig warning with patch contributed by Kévin Bernard-
+  Allies in bug #490412.
 
   05 Feb 2013; Benda Xu <heroxbd@gentoo.org> wqy-zenhei-0.9.45.ebuild:
   keyword ~arm
diff --git a/media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch b/media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch
new file mode 100644
index 000000000000..6c90475d9e4f
--- /dev/null
+++ b/media-fonts/wqy-zenhei/files/44-wqy-zenhei.conf.patch
@@ -0,0 +1,39 @@
+--- 44-wqy-zenhei.conf.old	2014-02-14 00:41:31.277115976 +0100
++++ 44-wqy-zenhei.conf	2014-02-14 00:43:18.985123207 +0100
+@@ -4,9 +4,35 @@
+ <fontconfig>
+   <!-- modified by Madsen@SMTH -->
+   <match target="font">
+-        <test qual="any" name="family">
++        <test name="family">
+                 <string>WenQuanYi Zen Hei</string>
++        </test> 
++        <edit name="globaladvance"><bool>false</bool></edit>
++        <edit name="spacing"><int>0</int></edit>
++        <edit name="antialias" mode="assign"><bool>true</bool></edit>
++        <edit name="hinting" mode="assign"><bool>true</bool></edit>
++        <edit name="hintstyle" mode="assign"><const>hintnone</const></edit>
++        <edit name="autohint" mode="assign"><bool>false</bool></edit>
++        <edit name="rh_prefer_bitmaps" mode="assign"><bool>false</bool></edit>
++        <edit name="rgba" mode="assign"><const>none</const></edit>
++        <edit name="embeddedbitmap"><bool>false</bool></edit>
++  </match>
++  <match target="font">
++        <test name="family">
+                 <string>文泉驿正黑</string>
++        </test> 
++        <edit name="globaladvance"><bool>false</bool></edit>
++        <edit name="spacing"><int>0</int></edit>
++        <edit name="antialias" mode="assign"><bool>true</bool></edit>
++        <edit name="hinting" mode="assign"><bool>true</bool></edit>
++        <edit name="hintstyle" mode="assign"><const>hintnone</const></edit>
++        <edit name="autohint" mode="assign"><bool>false</bool></edit>
++        <edit name="rh_prefer_bitmaps" mode="assign"><bool>false</bool></edit>
++        <edit name="rgba" mode="assign"><const>none</const></edit>
++        <edit name="embeddedbitmap"><bool>false</bool></edit>
++  </match>
++  <match target="font">
++        <test name="family">
+                 <string>文泉驛正黑</string>
+         </test> 
+         <edit name="globaladvance"><bool>false</bool></edit>
diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
new file mode 100644
index 000000000000..c0dd88111522
--- /dev/null
+++ b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 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.9.46.ebuild,v 1.1 2015/02/21 06:39:36 yngwin Exp $
+
+EAPI=5
+DISABLE_AUTOFORMATTING=true
+inherit font readme.gentoo
+
+DESCRIPTION="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font"
+HOMEPAGE="http://wenq.org/wqy2/index.cgi?ZenHei"
+SRC_URI="mirror://sourceforge/project/wqy/${PN}-snapshot/${PV}-May/${P}-May.tar.bz2"
+
+LICENSE="GPL-2-with-font-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+FONT_S="${S}"
+FONT_SUFFIX="ttc"
+FONT_CONF=(
+	43-wqy-zenhei-sharp.conf
+	44-wqy-zenhei.conf
+)
+
+# Only installs fonts
+RESTRICT="binchecks strip test"
+
+DOC_CONTENTS="This font installs two fontconfig configuration files.
+
+To activate preferred rendering, run:
+	eselect fontconfig enable 44-wqy-zenhei.conf
+
+To make the font only use embedded bitmap fonts when available, run:
+	eselect fontconfig enable 43-wqy-zenhei-sharp.conf"
+
+src_prepare() {
+	epatch "${FILESDIR}/44-wqy-zenhei.conf.patch"
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	font_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	unset FONT_CONF # override default message
+	font_pkg_postinst
+	readme.gentoo_pkg_postinst
+}