media-fonts/noto*: update, optimize

7 files changed, 58 insertions, 74 deletions

diff --git a/media-fonts/noto-cjk/Manifest b/media-fonts/noto-cjk/Manifest
index 3a78c49..586ea66 100644
--- a/media-fonts/noto-cjk/Manifest
+++ b/media-fonts/noto-cjk/Manifest
@@ -1,3 +1,3 @@
-DIST NotoSansCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 32682580 BLAKE2B c52d4edad19be495f48a7f7d5481a284645c3cd728fc810f945b49f630a24d41e442d4e1167519c35545c7ec29668d41e33a120d02b705cf220ef3029d2cf20c SHA512 b44200c0b8149004150cba40204af489b1275310f9b574727bebf13e4c3036a99447636a158af1b660a49049325cc1c803ea02b110fa1f58b666808b08dbfd52
-DIST NotoSansMonoCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 31908332 BLAKE2B 542face4ef7f0b9bfcd19ec637589c6a255a045d0fc19efebc84a567c561fa4c25c253bf4cf486cfb2db5c4e80bf69b196dff49a8fc2c20e80182aaef0cc7003 SHA512 840c83fd069c83f7475a12448dfb0bfc6689d5227a7e390e9b7de52b427632f5b1c85f53084d4bd2d53ec3e38d5629e0455242d89ac98fbaf3d0c24fe8ba723b
-DIST NotoSerifCJK-VF-473da44c32fec739db7e5458c81a833513cb4084.otf.ttc 56909616 BLAKE2B 3c5dd25b60e438dab597beaa620e80a04eb5cf18e5636741296d8b6c8f768dfdb81b54cf1210da01730895bbe0b4ea18410323bb9ac36a99868fe5b1cfee8ae9 SHA512 fa6c1ef94ed9d30b046d20eb360311b630e1f8d727288d3f1d73751f4f6d4731558fdce895d2235fc86bbda1b5e52c9c48a4f5fb604a0dbb3d93a71dde749f50
+DIST NotoSansCJK-VF-4efc595762d1f4b4fa504bccfe8e59de91fda063.otf.ttc 32682580 BLAKE2B c52d4edad19be495f48a7f7d5481a284645c3cd728fc810f945b49f630a24d41e442d4e1167519c35545c7ec29668d41e33a120d02b705cf220ef3029d2cf20c SHA512 b44200c0b8149004150cba40204af489b1275310f9b574727bebf13e4c3036a99447636a158af1b660a49049325cc1c803ea02b110fa1f58b666808b08dbfd52
+DIST NotoSansMonoCJK-VF-4efc595762d1f4b4fa504bccfe8e59de91fda063.otf.ttc 31908332 BLAKE2B 542face4ef7f0b9bfcd19ec637589c6a255a045d0fc19efebc84a567c561fa4c25c253bf4cf486cfb2db5c4e80bf69b196dff49a8fc2c20e80182aaef0cc7003 SHA512 840c83fd069c83f7475a12448dfb0bfc6689d5227a7e390e9b7de52b427632f5b1c85f53084d4bd2d53ec3e38d5629e0455242d89ac98fbaf3d0c24fe8ba723b
+DIST NotoSerifCJK-VF-4efc595762d1f4b4fa504bccfe8e59de91fda063.otf.ttc 56820256 BLAKE2B 06dfc91de4de8fe87c35aed2a258ba04529c01a13d3498c05648891d8b23515f4cefe6d3989b5fa1da4d751d29ac57ff524c0c04a065b2e06b17612bdd7f8496 SHA512 87533362980d2447ca798d453999f0e919833e09fe5090bf7915471c40fa82dd653eac6162657240e3c542a6d69be04747966a96c05c59b4ebebfa54cd9769a6
diff --git a/media-fonts/noto-cjk/noto-cjk-20220126.ebuild b/media-fonts/noto-cjk/noto-cjk-20230817.ebuild
index 56298d3..23c49ec 100644
--- a/media-fonts/noto-cjk/noto-cjk-20220126.ebuild
+++ b/media-fonts/noto-cjk/noto-cjk-20230817.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Google's CJK font family"
 HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-cjk"
 
-COMMIT="473da44c32fec739db7e5458c81a833513cb4084"
+COMMIT="4efc595762d1f4b4fa504bccfe8e59de91fda063"
 SRC_URI="
 	https://github.com/googlefonts/noto-cjk/raw/${COMMIT}/Sans/Variable/OTC/NotoSansCJK-VF.otf.ttc -> NotoSansCJK-VF-${COMMIT}.otf.ttc
 	https://github.com/googlefonts/noto-cjk/raw/${COMMIT}/Sans/Variable/OTC/NotoSansMonoCJK-VF.otf.ttc -> NotoSansMonoCJK-VF-${COMMIT}.otf.ttc
diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
new file mode 100644
index 0000000..7cf18a2
--- /dev/null
+++ b/media-fonts/noto-emoji/Manifest
@@ -0,0 +1 @@
+DIST Noto-COLRv1-d79d23e6822e0f6e5731b114cbfb26b2a4e380da.ttf 4760384 BLAKE2B 7a3190ed3c5f46cd6b15027792d203fef8b863f6bd93cafc3f4a6d043263c58aeb0976ed2be03da227a8f9e308d033322b830734126b27da0fc33656f66d88c1 SHA512 b7fc0e7e4a4c68a02635f3efd0e88e2292a7e85d871e28efc7596da7a11ed1413703a38e7a7bc9c94d0d34a79a22db587547876e633a8391b00500bfc020dae6
diff --git a/media-fonts/noto-emoji/noto-emoji-20231130.ebuild b/media-fonts/noto-emoji/noto-emoji-20231130.ebuild
new file mode 100644
index 0000000..f42b3b9
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20231130.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit font
+
+DESCRIPTION="Google Noto Emoji fonts"
+HOMEPAGE="https://fonts.google.com/noto/specimen/Noto+Emoji"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~*"
+IUSE=""
+
+COMMIT="d79d23e6822e0f6e5731b114cbfb26b2a4e380da"
+SRC_URI="https://github.com/googlefonts/noto-emoji/raw/${COMMIT}/fonts/Noto-COLRv1.ttf -> Noto-COLRv1-${COMMIT}.ttf"
+
+S="${WORKDIR}"
+
+FONT_SUFFIX="ttf"
+
+src_compile() {
+	for f in "${DISTDIR}"/*.ttf; do
+		fn=${f##*/}
+		cp "$f" "${fn/-$COMMIT}"
+	done
+}
diff --git a/media-fonts/noto-emoji/noto-emoji-99999999.ebuild b/media-fonts/noto-emoji/noto-emoji-99999999.ebuild
deleted file mode 100644
index ecdbbf0..0000000
--- a/media-fonts/noto-emoji/noto-emoji-99999999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://fonts.google.com/noto/specimen/Noto+Emoji"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~*"
-IUSE=""
-
-PROPERTIES="live"
-
-BDEPEND="
-	app-arch/unzip
-	|| (
-		net-misc/curl
-		net-misc/wget
-	)
-"
-
-S="${WORKDIR}"
-
-get() {
-	if hash curl 2>/dev/null; then
-		curl -Lf --retry 3 --connect-timeout 60 --speed-limit 300 --speed-time 10 "$@"
-	elif hash wget 2>/dev/null; then
-		wget -O- "$@"
-	else
-		die
-	fi
-}
-
-src_unpack() {
-	get https://fonts.google.com/download?family=Noto%20Emoji > Noto_Emoji.zip || die
-	get https://fonts.google.com/download?family=Noto%20Color%20Emoji > Noto_Color_Emoji.zip || die
-	unzip Noto_Emoji.zip NotoEmoji-VariableFont_wght.ttf || die
-	unzip Noto_Color_Emoji.zip NotoColorEmoji-Regular.ttf || die
-}
-
-src_install() {
-	insinto /usr/share/fonts/${PN}
-	doins NotoEmoji-VariableFont_wght.ttf
-	doins NotoColorEmoji-Regular.ttf
-}
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 6133dda..a7bbadb 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,4 +1,4 @@
-DIST NotoSans%5Bwdth%2Cwght%5D.ttf 2370304 BLAKE2B ddf2e7922a6c3670da55eea3bf65fb20aeed331713017374a3ace2d20df6ec183fe3b71e14c5b98f60b1233e1510e440981431ad0eb95be5b12527692320a28b SHA512 838abbf9158c91a559d04f1d3a471d6e5bc631b46dec04ef54eed5b1f148fc1119e9f154dcd87f48912f320c5903dbef54b74a45ae41ef5cca64d7a93fe547b5
-DIST NotoSans-Italic%5Bwdth%2Cwght%5D.ttf 2541752 BLAKE2B d8335ac4cc70dee748f4d389eec1d6e43cdfe88a2744540e9d7c81b83976e8bc5375643f517888adfb0007c110337dc4e8158973245bbe3f6e3c49f791b6e05e SHA512 31ae013b6175e87c68b1248d92626f66668527b6139c226da96d490f9b99d51002fac646662ea2613d5629d7d9aea67be229afa7f8c071f61ba9acca66e9f742
-DIST NotoSerif%5Bwdth%2Cwght%5D.ttf 2278204 BLAKE2B b7eff19e590956ffef243366d7244c2bec720b21be150f1dac08ffe423243bb2e7c7b45d2dfaa8cc4d849b08979b2e13b17f5bbab099e25bfbcae98dd6a794e8 SHA512 b0b507fbd1108aa62b896b414285a7f615050bb62cd7dd9a3a282016631c1efcfbdd3ed0f762836a7d351e2e0bdd56614eeeee591a2fc0f748cab890b74a3c0f
-DIST NotoSerif-Italic%5Bwdth%2Cwght%5D.ttf 2294324 BLAKE2B 599a8796729222381f98101cff9cd723093956fe0ddd653d346f913145b23f420ac9fe590ec5d607583f7caa64a791966183e85428525c23ea2dfd747e27a7cc SHA512 c18908217dde40d78684111562b094fb57f6b15c3753de27f24bb56c1c4ff2f6bbd5b867606dd600d597eacfdc8ecea7b3d24c185353b6c740818a25a5afecd2
+DIST NotoSans-Italic[wdth,wght]-15866b860084edd7163ec170d3c462ceada3de5b.ttf 2640676 BLAKE2B 76463afc2d0b9c5b5261a4645dbb53cd1c8062e232fa31f65529d5fc8e80bcb99117468ff10e297169c1471f459c2294c491d57cb67dce55bb50ca7da83d53f2 SHA512 2c86b3576ec529e8f0650a0920ec18372d8f8235ea945a1dca17870a963e8a848f03e80e76e9dc43b7c1c53d1b5c1b40b2b2e7354f36f8adc10a0965d08d8d64
+DIST NotoSans[wdth,wght]-15866b860084edd7163ec170d3c462ceada3de5b.ttf 2455936 BLAKE2B 05614a3d86c169e4f34983d924b0bcfab74937efe4d9bc5d3f85503c883c14edcc634c06085580104627468c9ae97accd398877fa6d086108ec6d07391fd1d91 SHA512 71857000db1909d22cc3220f01b63c314bd63bf1859f216277c8959b9ecdf3ec6d556c7fa54965b6d0ccb4aac464468530c86e08bc6bc0f6571728f7f4f89c50
+DIST NotoSerif-Italic[wdth,wght]-15866b860084edd7163ec170d3c462ceada3de5b.ttf 2421324 BLAKE2B 5a7b0e2de83cbbbc252fc2d05373568a1c45b5db6c93313add628dd71fb0d44e5959f50ca5c7ced744ac17b400addca606914baf3f383f3eb4764209e8c88bff SHA512 821ccbb240e1206e4469b1d5e70ba631d820c96c3b6c3d376b9b167dbf9f73aea0f50ceabffd4fc80ac46b67dc596e790aa8d5f4f477dc6811e5cde351b68d67
+DIST NotoSerif[wdth,wght]-15866b860084edd7163ec170d3c462ceada3de5b.ttf 2409016 BLAKE2B 39e31fedaada47daea337a39330b127efe1c1dca13011eac4230ba639e1573275fe4a20931c02e13528344dce618aa919bb0fb611f8bf29ce1136428dad0d9ac SHA512 167c8794e555f1be99dd4ad4ef32aa84923404a91b76c6cab087bb2d95e55670b075023f89d629c40ae493ca9c096672ce4a514a1b79d3997c30df1da7050417
diff --git a/media-fonts/noto/noto-20230117.ebuild b/media-fonts/noto/noto-20231128.ebuild
index d0503aa..11f26ab 100644
--- a/media-fonts/noto/noto-20230117.ebuild
+++ b/media-fonts/noto/noto-20231128.ebuild
@@ -1,12 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+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/googlefonts/noto-fonts"
+HOMEPAGE="https://fonts.google.com/noto https://github.com/notofonts/notofonts.github.io"
 
-COMMIT="6bff404f9a23cd603190277422d043a0afd7908e"
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~*"
+IUSE=""
+
+COMMIT="15866b860084edd7163ec170d3c462ceada3de5b"
 SRC_URI="
 	https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable-ttf/NotoSans%5Bwdth%2Cwght%5D.ttf -> NotoSans[wdth,wght]-${COMMIT}.ttf
 	https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSans/googlefonts/variable-ttf/NotoSans-Italic%5Bwdth%2Cwght%5D.ttf -> NotoSans-Italic[wdth,wght]-${COMMIT}.ttf
@@ -14,22 +20,19 @@ SRC_URI="
 	https://github.com/notofonts/notofonts.github.io/raw/${COMMIT}/fonts/NotoSerif/googlefonts/variable-ttf/NotoSerif-Italic%5Bwdth%2Cwght%5D.ttf -> NotoSerif-Italic[wdth,wght]-${COMMIT}.ttf
 	"
 
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="~*"
-IUSE=""
+S="${WORKDIR}"
 
-S="${DISTDIR}"
+FONT_SUFFIX="ttf"
+FONT_CONF=(
+    # From ArchLinux
+    "${FILESDIR}/66-noto-serif.conf"
+    "${FILESDIR}/66-noto-mono.conf"
+    "${FILESDIR}/66-noto-sans.conf"
+)
 
-src_install() {
-	insinto /usr/share/fonts/${PN}
-	newins "NotoSans[wdth,wght]-${COMMIT}.ttf" "NotoSans[wdth,wght].ttf"
-	newins "NotoSans-Italic[wdth,wght]-${COMMIT}.ttf" "NotoSans-Italic[wdth,wght].ttf"
-	newins "NotoSerif[wdth,wght]-${COMMIT}.ttf" "NotoSerif[wdth,wght].ttf"
-	newins "NotoSerif-Italic[wdth,wght]-${COMMIT}.ttf" "NotoSerif-Italic[wdth,wght].ttf"
-	insinto /etc/fonts/conf.avail
-	# From ArchLinux
-	doins "${FILESDIR}/66-noto-serif.conf"
-	doins "${FILESDIR}/66-noto-mono.conf"
-	doins "${FILESDIR}/66-noto-sans.conf"
+src_compile() {
+	for f in "${DISTDIR}"/*.ttf; do
+		fn=${f##*/}
+		cp "$f" "${fn/-$COMMIT}"
+	done
 }