From d414ffb5df5048bdde43642e01564650bc79f3d9 Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Sat, 23 Feb 2019 14:10:12 -0800
Subject: [PATCH] media-fonts/opendesktop-fonts: fix fontconfig warnings

Fixes: https://bugs.gentoo.org/671790
Thanks-To: <code@edoceo.com>
See-Also: https://cromwell-intl.com/open-source/font-config-warnings.html
See-Also: https://cixtor.com/blog/fontconfig-warning
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---
 .../opendesktop-fonts-1.4.2-multivalue.patch  | 190 ++++++++++++++++++
 .../opendesktop-fonts-1.4.2-r1.ebuild         |  27 +++
 2 files changed, 217 insertions(+)
 create mode 100644 media-fonts/opendesktop-fonts/files/opendesktop-fonts-1.4.2-multivalue.patch
 create mode 100644 media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild

diff --git a/media-fonts/opendesktop-fonts/files/opendesktop-fonts-1.4.2-multivalue.patch b/media-fonts/opendesktop-fonts/files/opendesktop-fonts-1.4.2-multivalue.patch
new file mode 100644
index 000000000000..8aa561cd1074
--- /dev/null
+++ b/media-fonts/opendesktop-fonts/files/opendesktop-fonts-1.4.2-multivalue.patch
@@ -0,0 +1,190 @@
+Fixup alias & test blocks in fontconfig definition.
+
+Fixes: https://bugs.gentoo.org/671790
+Partial-Credit: <code@edoceo.com>
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+See-Also: https://cromwell-intl.com/open-source/font-config-warnings.html
+See-Also: https://cixtor.com/blog/fontconfig-warning
+
+--- opendesktop-fonts-1.4.2/69-odofonts.conf	2007-09-10 02:09:37.000000000 -0700
++++ opendesktop-fonts-1.4.2/69-odofonts.conf	2019-02-23 14:03:02.280680514 -0800
+@@ -1,38 +1,104 @@
+ <?xml version="1.0"?>
+ <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+ <fontconfig>
++<!-- serif group -->
+ <alias>
+ 	<family>文鼎ＰＬ新宋</family>
++	<default><family>serif</family></default>
++</alias>
++<alias>
+ 	<family>AR PL New Sung</family>
++	<default><family>serif</family></default>
++</alias>
++<alias>
+ 	<family>新細明體</family>
++	<default><family>serif</family></default>
++</alias>
++<alias>
+ 	<family>PMingLiU</family>
++	<default><family>serif</family></default>
++</alias>
++<alias>
+ 	<family>宋体</family>
++	<default><family>serif</family></default>
++</alias>
++<alias>
+ 	<family>SimSun</family>
++	<default><family>serif</family></default>
++</alias>
++<alias>
+ 	<family>文鼎ＰＬ新宋 ExtB</family>
++	<default><family>serif</family></default>
++</alias>
++<alias>
+ 	<family>AR PL New Sung ExtB</family>
+ 	<default><family>serif</family></default>
+ </alias>
+ 
++<!-- sans-serif group -->
+ <alias>
+ 	<family>文鼎ＰＬ新宋</family>
++	<default><family>sans-serif</family></default>
++</alias>
++<alias>
+ 	<family>AR PL New Sung</family>
++	<default><family>sans-serif</family></default>
++</alias>
++<alias>
+ 	<family>新細明體</family>
++	<default><family>sans-serif</family></default>
++</alias>
++<alias>
+ 	<family>PMingLiU</family>
++	<default><family>sans-serif</family></default>
++</alias>
++<alias>
+ 	<family>宋体</family>
++	<default><family>sans-serif</family></default>
++</alias>
++<alias>
+ 	<family>SimSun</family>
++	<default><family>sans-serif</family></default>
++</alias>
++<alias>
+ 	<family>文鼎ＰＬ新宋 ExtB</family>
++	<default><family>sans-serif</family></default>
++</alias>
++<alias>
+ 	<family>AR PL New Sung ExtB</family>
+ 	<default><family>sans-serif</family></default>
+ </alias>
+ 
++<!-- monospace group -->
+ <alias>
+ 	<family>文鼎ＰＬ新宋 Mono</family>
++	<default><family>monospace</family></default>
++</alias>
++<alias>
+ 	<family>AR PL New Sung Mono</family>
++	<default><family>monospace</family></default>
++</alias>
++<alias>
+ 	<family>細明體</family>
++	<default><family>monospace</family></default>
++</alias>
++<alias>
+ 	<family>MingLiU</family>
++	<default><family>monospace</family></default>
++</alias>
++<alias>
+ 	<family>新宋体</family>
++	<default><family>monospace</family></default>
++</alias>
++<alias>
+ 	<family>NSimSun</family>
++	<default><family>monospace</family></default>
++</alias>
++<alias>
+ 	<family>文鼎ＰＬ新宋 ExtB</family>
++	<default><family>monospace</family></default>
++</alias>
++<alias>
+ 	<family>AR PL New Sung ExtB</family>
+ 	<default><family>monospace</family></default>
+ </alias>
+@@ -82,12 +148,26 @@
+ <match target="font">
+ 	<test name="family" compare="eq">
+ 		<string>文鼎ＰＬ新宋</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>AR PL New Sung</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>新細明體</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>PMingLiU</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>宋体</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>SimSun</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>文鼎ＰＬ新宋 ExtB</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>AR PL New Sung ExtB</string>
+ 	</test>
+ 	<edit name="embeddedbitmap">
+@@ -98,10 +178,20 @@
+ <match target="font">
+ 	<test name="family" compare="eq">
+ 		<string>文鼎ＰＬ新宋 Mono</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>AR PL New Sung Mono</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>細明體</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>MingLiU</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>新宋体</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>NSimSun</string>
+ 	</test>
+ 	<edit name="globaladvance">
+@@ -115,12 +205,26 @@
+ <match target="font">
+ 	<test name="family" compare="eq">
+ 		<string>文鼎ＰＬ新中楷</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>AR PL New Kai</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>標楷體</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>DFKai-SB</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>楷体</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>SimKai</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>文鼎ＰＬ新中楷 ExtB</string>
++	</test>
++	<test name="family" compare="eq">
+ 		<string>AR PL New Kai ExtB</string>
+ 	</test>
+ 	<edit name="globaladvance">
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..0c3aee0affb2
--- /dev/null
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit font
+
+DESCRIPTION="Chinese TrueType Fonts"
+#HOMEPAGE="http://www.opendesktop.org.tw/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="Arphic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+FONT_SUFFIX="ttf ttc"
+FONT_S="${S}"
+FONT_CONF=(
+	"69-odofonts.conf"
+	"80-odofonts-original.conf"
+	"80-odofonts-simulate-MS-simplified-chinese.conf"
+	"80-odofonts-simulate-MS-triditional-chinese.conf"
+)
+DOCS="AUTHORS Changelog*"
+PATCHES=( "${FILESDIR}"/opendesktop-fonts-1.4.2-multivalue.patch )
-- 
2.26.2