gentoo auto-resync : 26:03:2024 - 01:01:01

3 files changed, 12 insertions, 70 deletions

diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 0270b4f81ac9..570843639f49 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -1,8 +1,5 @@
 AUX 75-noto-emoji-fallback.conf 1307 BLAKE2B c26f8efcc88bdf4865c54c52a538c3f87552344a42fedca61e227524275cf736b5c456eec4dfb6bb747209f4540eec79904ad9df062bfcf213b2f665408975bd SHA512 a67043984032f5f65e361289c316c2d9b9c04975d2d305df85b5d4b22a036c7791714daf9950be2f7c7e252c0f93925002db699d68c7d803cdbd532d98385b64
-DIST noto-emoji-20220912.tar.gz 178768907 BLAKE2B b998a74903e0a559e6c2d87f6d05649054728d5359659882c89b99fc41ec80f9dbafba6f418500059acef7bb85b9d60b189abea286c9c4cb5491f501095ca425 SHA512 4e9b01be1ac7853d840379f84350f2709212401ccebb221308eb83982a8673af9a8ef166952aba4d6f8d9939efc4989f38a7db69e022eb055f265ccba78884a6
-DIST noto-emoji-20231117.tar.gz 201500964 BLAKE2B 0c40c1e2dbe83166e45b279018e70d6adce379b26de2bd1bc1a067d5b788ac40c9ad33279a589d014fbbb47b9dbf955726ea03326d180a3d4d010b70dc2f5903 SHA512 f9bb2735919c26c646ae0dd9712da071cae109db6e75952d85a4d456aba39809d0cb2619207d55b8ce0d274c6676f72f8a5d2606b1c7b9e52ac497fad5134cae
 DIST noto-emoji-20231130.tar.gz 201447944 BLAKE2B da80f3b7b3a99cefa18cf34c6f55a3bb0e407d7f8df9927ae747ddc74625f9d08a5ba3118a908ffd7fe90edd90c45b4f9d23d44e6d0cd92779b2f5322346ae20 SHA512 310fac7eb9aa35065cbc030276ead6d1f9111059b0142143cfab2c9c48dd1106b1cce135a745681f57df95c0510cb04249532ed765edf881ed7ab31a38bd538a
-EBUILD noto-emoji-20220912-r2.ebuild 1183 BLAKE2B d26f350ff217d02a8d7ffbbfe5622b0663334d0aa34ec6d807ece5fd0f7cb8039b493e4d15ef542f204bfa2a457ea888775ce6cd06ae63de0772bdbe3152fda6 SHA512 a8cbc28d0d41cc1e63bd9045f4ef511d0c54daeeaa4b6138e6bcd98b0098f7a0674124d1f6d7606df00e30c2f369fea2f68ef2fef52fe943aeffa97678b02c9e
-EBUILD noto-emoji-20231117.ebuild 1209 BLAKE2B ae89822d84e291de0b2ca98684d9c6758b439a1927ebe52e61ff1d8eeb846f02989d4f982cadb868d9429ae62be29b86adc6f64b98cf0eb1e22d021160fff6b7 SHA512 fd84772de1f5e2d99f63e721a9fed17975cf98ffd91278b417333425a4a3498d93911b993abac29a30e46fd035de96f795c2de465e7b8b29b7a0cd0b565377d6
+EBUILD noto-emoji-20231130-r1.ebuild 1385 BLAKE2B 6fafbaf01d38570cf4b61de1bdd94e4750af77ae3daa4d63dc619ad40a7c7b29943c7bc5411b9c2e618ac1fa8472616cfbfc07475ae601ff8111f81bbc660d05 SHA512 0b82f73a236a7060d2b915d04f8a0bebc53c626438c2e53e25ecc46157f352dc53cafac08f7d0310063234344d6be2291fae3dcd899c2c6337988a31b908b3d4
 EBUILD noto-emoji-20231130.ebuild 1205 BLAKE2B bad5c0b8d52e542c769175a0afb211bc21100792a930a68e5d1bc0e23ae5147ba60efb245cdae8782dc78ea6650371666075b1545792aae45ef2d1df312c3a90 SHA512 c2b6ea8572221610a439fb3ac7923084e45a9b67947b6f57baf8e29ded60fe32f27e2259ec5aaed854405a72912b554670c77b763892a379c857dd56c2c9775d
 MISC metadata.xml 404 BLAKE2B 22cf87041f4f6f5c051fd1d65b9f3355ed1bef0b30f85f9fe16e6857a00e0a4b6fe5e87558a4f5c170f5fd4247d045116d65a3a2d4d14d9767785946a14dbd21 SHA512 2bf090e6377ca15a0ee429d8541e3731d3deb0ea06120bb5ee77cb26f346eb5a0d9d9a05a6af31e940cd8470099bc5d3507f72b98fbf0a9dc0273073acfa6eed
diff --git a/media-fonts/noto-emoji/noto-emoji-20220912-r2.ebuild b/media-fonts/noto-emoji/noto-emoji-20220912-r2.ebuild
deleted file mode 100644
index 58e0a72c24a2..000000000000
--- a/media-fonts/noto-emoji/noto-emoji-20220912-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit font
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
-
-COMMIT="e8073ab740292f8d5f19b5de144087ac58044d06"
-SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="icons"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-# https://github.com/gentoo/gentoo/pull/32203
-FONT_CONF=( "${FILESDIR}"/75-noto-emoji-fallback.conf )
-
-src_prepare() {
-	default
-
-	# Drop font for Windows 10
-	rm fonts/NotoColorEmoji_WindowsCompatible.ttf || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	FONT_S="${S}/fonts"
-	# Drop non used fonts
-	rm -f fonts/*COLR*.ttf || die
-
-	# Don't lose fancy emoji icons
-	if use icons; then
-		for i in 32 72 128 512; do
-			insinto "/usr/share/icons/${PN}/${i}/emotes/"
-			doins png/"${i}"/*.png
-		done
-
-		insinto /usr/share/icons/"${PN}"/scalable/emotes/
-		doins svg/*.svg
-	fi
-
-	FONT_SUFFIX="ttf"
-	font_src_install
-
-	dodoc README.md
-}
diff --git a/media-fonts/noto-emoji/noto-emoji-20231117.ebuild b/media-fonts/noto-emoji/noto-emoji-20231130-r1.ebuild
index 4d2fc830183c..1fa09419c4e6 100644
--- a/media-fonts/noto-emoji/noto-emoji-20231117.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20231130-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit font
 DESCRIPTION="Google Noto Emoji fonts"
 HOMEPAGE="https://fonts.google.com/noto/specimen/Noto+Color+Emoji https://github.com/googlefonts/noto-emoji"
 
-COMMIT="144e84dbc2b49f164279bfce230569116ac98bfd"
+COMMIT="d79d23e6822e0f6e5731b114cbfb26b2a4e380da"
 SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 OFL-1.1"
@@ -22,19 +22,12 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 # https://github.com/gentoo/gentoo/pull/32203
 FONT_CONF=( "${FILESDIR}"/75-noto-emoji-fallback.conf )
 
-src_prepare() {
-	default
-
-	# Drop font for Windows 10
-	rm fonts/NotoColorEmoji_WindowsCompatible.ttf || die
-}
-
 src_compile() { :; }
 
 src_install() {
-	FONT_S="${S}/fonts"
-	# Drop non used fonts
-	rm -f fonts/*COLR*.ttf || die
+	# Ensure we install only the desired font (the same other distros
+	# supply), https://bugs.gentoo.org/927294
+	FONT_S="${S}/fonts-install"
 
 	# Don't lose fancy emoji icons
 	if use icons; then
@@ -47,6 +40,12 @@ src_install() {
 		doins svg/*.svg
 	fi
 
+	# Ensure we install only the desired font (the same other distros
+	# supply), https://bugs.gentoo.org/927294
+	mkdir fonts-install || die
+	FONT_S="${S}/fonts-install"
+	cp -p fonts/NotoColorEmoji.ttf fonts-install/. || die
+
 	FONT_SUFFIX="ttf"
 	font_src_install