gentoo resync : 02.06.2019

4 files changed, 51 insertions, 3 deletions

diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 20128a7f603b..f19745b7eebe 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -3,6 +3,8 @@ AUX 66-noto-sans.conf 318 BLAKE2B 42a6036c93c982b2b0eb04a530dafe6d8eceeac0e77041
 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 819 BLAKE2B 3bf921503660437c91da43ac3e7e9e05fff70ff95e9842b1c5d884d005a28286a929cc66772afa8f9c74d919045f9e45218ce8f2bfa0eb9539b1ceea26c8762e SHA512 728276eef93954d03eb649f2772d4cde19b3080e7bdff2da344d70026d992f5dd1d521f6786c50f32f38c1780988288463705fdd522cec298ba4c8d51bd6b8d7
-EBUILD noto-20181024.ebuild 929 BLAKE2B c1c076c450a25f1372f2a6b4b85d8df2c94b9276a9c333bc1d7f34683c0d8c97dcbee73650361b74e79ee746a721f5102bf7fd39716e6e6d4313e20795ac7f60 SHA512 883a1dc34d6eadca8ad4fd12f7c73fce90a0172be146fd03b339ac381d70caba16435464c8772a0d8cbe840000983ac49649e270faef6f2262bc17976f1e0670
-MISC metadata.xml 449 BLAKE2B f30d4df6c9ddc672a839eeb6433bd9583fa4af65c32190b09bca261e1a53e0c9bb396808811a3591c8b90337002fba8433d8eb816af4475f57339c299b8eaa06 SHA512 04d7f718df7e4d83823b778f09f1cb4e78ffceb154030dc1f8980cd9ca9cf8ed0140d0354b44e6523952e6ddae3e4879a467a1855092cfb7052ea97e099c98d4
+EBUILD noto-20181024.ebuild 928 BLAKE2B 394b9decc5153dad3d77a2ef0078ca4be32ecdd3c7048a80a5e4566994fa9cef0d5059f092649341014737c877cafbd0f791937ba2350ebf7440ecabc06d38df SHA512 eae13a5c8ed1e8cfc7dbc63cb1eb4ea6398f1c0cc4a25b3babe0f93c9dfb2f0d0a1a200519490e562a1b25f05f7c2273ebe42f4290feef7617421777fb173809
+EBUILD noto-20190524.ebuild 1281 BLAKE2B ec8fd536d5b50004161f8dc45744fc7c53a8e1134936106392f8561afbd92f5b566b37587e400ccb9df499eede6803d735c921af73efb3e0cb71e864bec373b6 SHA512 8f7708b4d0c8006eb139bea43dcdbdadb0bf595bf8022f2bb6a39589b8c1392b0c40d2b0164bedcc0759c4f977004ba45c6ea60c23cbd55bdb8b297dbd017cca
+MISC metadata.xml 530 BLAKE2B 68b0a3b988e81eb974ad2585c20ee030d187e54f5cc8b870be03a373d6520bcca6639c0c6356f3c0922dc8cc64380ed2e442d49b6030e4350e0702c198dbe79b SHA512 41ffbb23b7067dc9b7482480ba579679514dae3f8d2452f88cc747fe443051362f1cb548086550d142323df5931e83c537e533753433579af9b7362efc0d9acd
diff --git a/media-fonts/noto/metadata.xml b/media-fonts/noto/metadata.xml
index 4915e3a96577..0f42cde68837 100644
--- a/media-fonts/noto/metadata.xml
+++ b/media-fonts/noto/metadata.xml
@@ -13,4 +13,7 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<use>
+        	<flag name="extra">Install full upstream font set</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-fonts/noto/noto-20181024.ebuild b/media-fonts/noto/noto-20181024.ebuild
index c4654adbcb27..f21e05349fe0 100644
--- a/media-fonts/noto/noto-20181024.ebuild
+++ b/media-fonts/noto/noto-20181024.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/googlei18n/noto-fonts/archive/${COMMIT}.tar.gz -> ${
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~mips ppc ppc64 sparc x86"
 IUSE="cjk"
 
 RDEPEND="cjk? ( media-fonts/noto-cjk )"
diff --git a/media-fonts/noto/noto-20190524.ebuild b/media-fonts/noto/noto-20190524.ebuild
new file mode 100644
index 000000000000..e845a0f67467
--- /dev/null
+++ b/media-fonts/noto/noto-20190524.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 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="34e98229863e627d0f841e124a8657d5d0348b04"
+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() {
+	# Don't install in separate subdirs
+	FONT_S="${S}/unhinted/" font_src_install
+	FONT_S="${S}/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
+}