Convert into split package with TTF and OTF variants

As per user request, split the package in TTF and OTF variants, so it is
possible to choose which font format to install. While at it, make yet
one more split package containing the Fontconfig configuration file,
with both packages depending on it. This is a first step towards adding
more format variants.

2 files changed, 36 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74b5bf941797..a52b24a881b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = alibaba-puhuiti
 	pkgdesc = Alibaba PuHuiTi fonts
 	pkgver = 2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://ics.alibaba.com/font/alibaba-sans
 	arch = any
 	license = custom
@@ -13,5 +13,16 @@ pkgbase = alibaba-puhuiti
 	sha512sums = b4b9514375dd1a7717c675e87caaa87a8a9ebc549ba1275822cb0a7e3a8d0f62d3a793777467fffe1c98738a11f317c4cad2678703a74301dda0dd31892d3f47
 	sha512sums = f05f3014ae38f4fb59d3bb06f52e05b8e122e5ba124bd166474231877346a7aeb107860a4b8304493197d43101b03a1bff6c1d79c7dc495377bb63a94cbb0be6
 
-pkgname = alibaba-puhuiti
+pkgname = otf-alibaba-puhuiti
+	pkgdesc = Alibaba PuHuiTi fonts - OTF format
+	depends = alibaba-puhuiti-fontconfig
 
+pkgname = ttf-alibaba-puhuiti
+	pkgdesc = Alibaba PuHuiTi fonts - TTF format
+	depends = alibaba-puhuiti-fontconfig
+	provides = alibaba-sans
+	provides = alibaba-puhuiti
+	replaces = alibaba-puhuiti
+
+pkgname = alibaba-puhuiti-fontconfig
+	pkgdesc = Alibaba PuHuiTi fonts - Fontconfig configuration
diff --git a/PKGBUILD b/PKGBUILD
index 900b436e7fb9..dc9cdf859859 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Yangtse Su <yangtsesu@gmail.com>
 
-pkgname=alibaba-puhuiti
+pkgbase=alibaba-puhuiti
+pkgname=({otf,ttf}-alibaba-puhuiti alibaba-puhuiti-fontconfig)
 pkgver=2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Alibaba PuHuiTi fonts"
 arch=(any)
 license=(custom)
@@ -10,7 +11,7 @@ url=https://ics.alibaba.com/font/alibaba-sans
 makedepends=(unzip)
 provides=(alibaba-sans)
 conflicts=(alibaba-sans)
-source=("$pkgname-$pkgver.zip::https://ics-static.oss-cn-hangzhou.aliyuncs.com/static/ucan/alibaba_font${pkgver}.zip"
+source=("alibaba-puhuiti-$pkgver.zip::https://ics-static.oss-cn-hangzhou.aliyuncs.com/static/ucan/alibaba_font${pkgver}.zip"
          75-alibaba.conf)
 sha512sums=('b4b9514375dd1a7717c675e87caaa87a8a9ebc549ba1275822cb0a7e3a8d0f62d3a793777467fffe1c98738a11f317c4cad2678703a74301dda0dd31892d3f47'
             'f05f3014ae38f4fb59d3bb06f52e05b8e122e5ba124bd166474231877346a7aeb107860a4b8304493197d43101b03a1bff6c1d79c7dc495377bb63a94cbb0be6')
@@ -19,20 +20,35 @@ prepare () {
 	local winzipfile='阿里巴巴普惠体2(1).0字体包/PuHuiTi2.0 for Win 压缩.zip'
 	local maczipfile='阿里巴巴普惠体2(1).0字体包/PuHuiTi2.0 for Mac 压缩.zip'
 	unzip -q -C -o -j "$winzipfile" '*.ttf' -d ttf
+	unzip -q -C -o -j "$winzipfile" '*.otf' -d otf
 	unzip -q -C -o -j "$maczipfile" '*.pdf' -d pdf
 	mv 'pdf/阿里巴巴普惠体2.0版法律声明.pdf' pdf/license.pdf
 }
 
-package () {
+_package_common () {
 	install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
 	install -Dm644 pdf/license.pdf "${pkgdir}/usr/share/licenses/${pkgname}"
 
 	install -dm755 "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
-	install -Dm644 ttf/*.ttf "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
+	install -Dm644 "$@" "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
+}
+
+package_otf-alibaba-puhuiti () {
+	pkgdesc="$pkgdesc - OTF format"
+	depends+=(alibaba-puhuiti-fontconfig)
+	_package_common otf/*.otf
+}
 
-	install -dm755 "${pkgdir}/usr/share/fontconfig/conf.avail"
-	install -Dm644 75-alibaba.conf "${pkgdir}/usr/share/fontconfig/conf.avail"
+package_ttf-alibaba-puhuiti () {
+	pkgdesc="$pkgdesc - TTF format"
+	provides+=(alibaba-puhuiti)
+	replaces+=(alibaba-puhuiti)
+	depends+=(alibaba-puhuiti-fontconfig)
+	_package_common ttf/*.ttf
+}
 
+package_alibaba-puhuiti-fontconfig () {
+	pkgdesc="$pkgdesc - Fontconfig configuration"
 	install -dm755 "${pkgdir}/usr/share/fontconfig/conf.default"
 	ln -nsf ../conf.avail/75-alibaba.conf \
 		"${pkgdir}/usr/share/fontconfig/conf.default/75-alibaba.conf"