gentoo Easter resync : 12.04.2020

4 files changed, 48 insertions, 65 deletions

diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index f4975f166fbd..653b579f3058 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,10 +1,8 @@
 AUX 66-noto-mono.conf 326 BLAKE2B 5bf5d20d31635e0b84f34d9a619df0de842431d319c283d120bdc060766ee4f2073b485c267206905c4e8095c40a176237c17c315c9a1af5771591ea636c1673 SHA512 91b71d5ee435bf1ee534be6b4461d93b1f57693137d929dc2ca98f4074754ace4ae6e8f05e627af903332c8a63449ab40eebea7a385ec27580fa2a782a3a8fc7
 AUX 66-noto-sans.conf 318 BLAKE2B 42a6036c93c982b2b0eb04a530dafe6d8eceeac0e770411d8dedda2e6ae62a921642f23db1f0849d6d08295ebe44f1b204fd93a27661e3f5ca52e5c6f8bd76cc SHA512 80c15846c014c723830aefb84c6d3069f9addffd1ca227a8a7b17023c64a949254152541f7e81b4afeca690ddeab959f35f390366f7e697e3b7715d692ea7c98
 AUX 66-noto-serif.conf 310 BLAKE2B 804753d2e703ce309e74da15aefdac6d510f52396a312a143c1a9e0e499f0301e5a154f6df48cf4a71834c637b1545953354d0c3518d67a429850135ed2db4da SHA512 c0ade988e2560191098c539de4341dfee29bc67d177f5916c7eb3346586c19c791c32842016db334c3d3689d89a1437220544f2c45934a9c0d74d2f6064aaa69
-DIST noto-20170403.tar.xz 11083152 BLAKE2B 8281cc19a100d1cbf7f57fba9cba077bb0005f7296f58d48247bef6c804b53597ff359dfab7b7d851e42c0294c757f311979b98dc9f1c22e2d3f3fabe4db77e7 SHA512 f8f1414b5b6f793e86ef3cc6a6320c4545f079b337c7672cb8cccc3c50d21d353d81557da4a555cdb6524c79be3e4c167f7d5aac102c38d64926f3b1887ca7f3
-DIST noto-20181024.tar.gz 726721580 BLAKE2B d19d32d98419395df1bb3ca360bd67a50487d499aa3ea1612355b2f0fef09fe8236583fedc6d528668048ccbeee7139df704fc8e125c5eec7215708838aa09f4 SHA512 5df8266fab59a9ad5e6de6971c69d2761864c29e8d0e79e16a44177327b73527a37a9d148b63c862bfb5f7507793aab5c4319603f3b8b80e18eb9f203d7a7334
 DIST noto-20190524.tar.gz 740252290 BLAKE2B e169ee60c9a83c13656ebd5dbce32aad183bbebc057035c69723788725a1c14a016c37bea7ccf30fc9d776e421515c2fa03f929b5f7bf95d9e3abb1abbeccbbf SHA512 668f7d015da420b3c32f8c0313037bab731bd915875f476beb47e6c3e8d33a30cd608d2f351194607afbf28f8f3efc1eb5f8470c03fd88a83df33b478fa78147
-EBUILD noto-20170403.ebuild 817 BLAKE2B 835f9f1e7dbaa79267896798513072b7900787116ef5b483bcfb4183fe65dd741c20ecb25eb8de7c65ce96fec28c2b74825ca570973456dac749b228be9dbc38 SHA512 76d2a1859732900dc699b37414a7f1b7b8460b33d6de0bc22d4e901a9fee490008972271f5d19bba1ade1571bdbe5d22fa59e6da341cc229392b184862576fb9
-EBUILD noto-20181024.ebuild 929 BLAKE2B 9b333d7c56c5d7d150eccca5c9cf3ab0dab9bab730028471c5735d9ea6d3c083cf402bbfe74f0bdc59fe9c5c3a3092f2706a7eea996411152db0b22d7bb0fe86 SHA512 ce8b50fdfa0d22949d749db66cc78fe9cd98dded617565299e8ea73608bac98984fff2b13749234cd3f92f9586fb99a5950435dd1bf5d1eca0f2fc7ef3f16e80
+DIST noto-20200308.tar.gz 853685953 BLAKE2B 1f25bf1b763161fc246b0a1ed532d4755e4ef441055d92a8a17a05331bbbe47b4f604492e0403088d5aac9a86e42b27354eb7d4c9bc6286853ce1562b7940344 SHA512 9afec0c150beeb2bb27af58b9118da4bf86a21f25b573be3a01186c0295b9d5f51918d9237fafc76a0388c87a2b8fd780ba450fb8b4c3e65addad729e8f56a9f
 EBUILD noto-20190524.ebuild 1274 BLAKE2B c5b3e243a4200f8904b79670e61fa6b867bc17da95930b12b9b7cb5e52207a40828267772abd7ce1f128d8283cce59f4c2b7e0adc6f286b380390e8fcad74bc3 SHA512 1fbb07f9edacd6d6bf70df4d949068a780c2a51db2434ed0797e70e3516bdc8c82c6aa41fba2f2dfb57aab8e91f231e2f50868f27dd4e15d95044746280e73c3
+EBUILD noto-20200308.ebuild 1390 BLAKE2B 6ca78a4d10745bd033ba6bcd0a1dac2d0f31b0cc49b67200645be7831992aa75b89202911466e4c9644973b19e8aad1e0f42625e22a39708185c055c4d026ca8 SHA512 01853ea7224c78bf3bba6b19236fa4c072064dab1f4cc8b9fa9e1f24274ad1e2c286b56b5828aad65886b322826ed09056b6ec509b8c3fc454cb853a49a6c1a5
 MISC metadata.xml 416 BLAKE2B 28cd8161f664af29200d53d74d4d6c63c5d6921861750282317cf57c4654e66f72a69404f2ba2255739a325ec395da5d1483fe2b230ed3084431cd376ec94b38 SHA512 aa7174f866d3b68832c9915a2b14e3fd1731aca07a2aaf7b26d7b20f439c19f498ded395126a0ca50352694b5a2920cd370304fa45a7135704de8c4b9651e0eb
diff --git a/media-fonts/noto/noto-20170403.ebuild b/media-fonts/noto/noto-20170403.ebuild
deleted file mode 100644
index 0e10bdbab90f..000000000000
--- a/media-fonts/noto/noto-20170403.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit font
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/"
-
-# https://noto-website.storage.googleapis.com/pkgs/Noto-hinted.zip
-# Version number based on the timestamp of most recently updated font in the zip.
-# When bumping, remove *CJK* and create a tarball (xz -9 gives the most
-# compressed tarball)
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-
-LICENSE="OFL-1.1" # https://github.com/googlei18n/noto-fonts/blob/master/NEWS
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
-IUSE="cjk"
-
-RDEPEND="cjk? ( media-fonts/noto-cjk )"
-RESTRICT="binchecks strip"
-
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/noto/noto-20181024.ebuild b/media-fonts/noto/noto-20181024.ebuild
deleted file mode 100644
index 9be721fb5390..000000000000
--- a/media-fonts/noto/noto-20181024.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit font
-
-DESCRIPTION="Google's font family that aims to support all the world's languages"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts"
-
-COMMIT="d7af81e614086435102cca95961b141b3530a027"
-SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
-IUSE="cjk"
-
-RDEPEND="cjk? ( media-fonts/noto-cjk )"
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-fonts-${COMMIT}"
-
-FONT_SUFFIX="ttf"
-FONT_CONF=(
-	# From ArchLinux
-	"${FILESDIR}/66-noto-serif.conf"
-	"${FILESDIR}/66-noto-mono.conf"
-	"${FILESDIR}/66-noto-sans.conf"
-)
-
-src_install() {
-	# Don't install in separate subdirs
-	FONT_S="${S}/unhinted/" font_src_install
-	FONT_S="${S}/hinted/" font_src_install
-}
diff --git a/media-fonts/noto/noto-20200308.ebuild b/media-fonts/noto/noto-20200308.ebuild
new file mode 100644
index 000000000000..4100a27916bc
--- /dev/null
+++ b/media-fonts/noto/noto-20200308.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit font
+
+DESCRIPTION="Google's font family that aims to support all the world's languages"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-fonts"
+
+COMMIT="1c9f53362889d4468fd1193b76c397c208d81da8"
+SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+# Extra allows to optionally reduce disk usage even returning to tofu
+# issue as described in https://www.google.com/get/noto/
+IUSE="cjk +extra"
+
+RDEPEND="cjk? ( media-fonts/noto-cjk )"
+DEPEND=""
+
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${PN}-fonts-${COMMIT}"
+
+FONT_SUFFIX="ttf"
+FONT_CONF=(
+	# From ArchLinux
+	"${FILESDIR}/66-noto-serif.conf"
+	"${FILESDIR}/66-noto-mono.conf"
+	"${FILESDIR}/66-noto-sans.conf"
+)
+
+src_install() {
+	mkdir install-unhinted install-hinted || die
+	mv unhinted/*/* install-unhinted/. ||  die
+	mv hinted/*/* install-hinted/. || die
+
+	FONT_S="${S}/install-unhinted/" font_src_install
+	FONT_S="${S}/install-hinted/" font_src_install
+
+	# Allow to drop some fonts optionally for people that want to save
+	# disk space. Following ArchLinux options.
+	use extra || rm -rf "${ED}"/usr/share/fonts/noto/Noto*{Condensed,SemiBold,Extra}*.ttf
+}