gentoo auto-resync : 04:12:2022 - 21:03:51

4 files changed, 9 insertions, 120 deletions

diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 1cb65b9e82c8..6012ac2a0797 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -2,8 +2,6 @@ AUX noto-emoji-20180823-build-path.patch 313 BLAKE2B c7a6a67639444329f033da14b58
 AUX noto-emoji-20190328-use-gm.patch 1169 BLAKE2B 6659f1f80ec3f44942a7b96b23f5ae90ad9167cd30812e6fc71abe3df3179184b2be389ee8f277a4ce696269ffba2e25e8c024677b73c925b7ad06cdebc5846b SHA512 e3c1d68bd887c8e9dd7e752f946cff8265c996cbfafe27652ca90e67bb555433787edd45a5805bbca5b73b15377c5102593f594bbe2777d2c07452143b164c5e
 AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a
 AUX noto-emoji-pngquant-verbose.patch 407 BLAKE2B b737b10535b8a04ca2d17d6803fc7c6a36e733acf88a6089b56004f9d2a265851278cbb85b6a5d2c2ab18e46f12fcf84d7185e768cae2e3eafefeb3bc06869e5 SHA512 5bcb05c6b7a1e0970e1ff67707a1a5d49b22ada4ef4677d3bb9f9874e045d79f1d35419abc80b39bec81512f547360eb705dffeb421c48296a9646c618f75f61
-DIST noto-emoji-20211101.tar.gz 170403395 BLAKE2B d37ef3b11c339d2d2f2a8c1b6370551c14fbe3d902a51a956b6cb89592001a751656a2050f6501619f770d53fefbdf6b1223725967206c9f13072928ebacbfe0 SHA512 b80d3ca838e0cc66b6b6af9b368164da3f40bd22cfbb1d923a172bd51e87f1db9b7722494f220e4e912160664bb1c5318bbd9253981c1262ce563482d6cad7a4
 DIST noto-emoji-20220912.tar.gz 178768907 BLAKE2B b998a74903e0a559e6c2d87f6d05649054728d5359659882c89b99fc41ec80f9dbafba6f418500059acef7bb85b9d60b189abea286c9c4cb5491f501095ca425 SHA512 4e9b01be1ac7853d840379f84350f2709212401ccebb221308eb83982a8673af9a8ef166952aba4d6f8d9939efc4989f38a7db69e022eb055f265ccba78884a6
-EBUILD noto-emoji-20211101.ebuild 2765 BLAKE2B 1c968b6963bc53d3bfc14260381b7bc1e0f0890b2c02ee37d1ca11154670a8e6fc0604c07769e02b15df393e0bca00a0906c5e2a665dba66a6874f79e0375d84 SHA512 fed9a61d752d7ae100e7050f4623cfefa5185d610931b78ecf5c99e43f1edccb006e4e482b929d412202248d5858242b6751227ba4bfa925beda4d1084c3ddbd
-EBUILD noto-emoji-20220912.ebuild 2859 BLAKE2B d88e851e66e32532635e8c9b4b257866702305c82135cfcabb4b0a755a0388a24f6a38cebb01058eeb5728ec63421eded88054b7c9b49993d5169ead666fa27d SHA512 c9ab99e67f107d43ff2a49bd387cb10bc6e2f496eed6aa623badbb2843fef83830d6bbb7206755ff244916edc4f36f943d013201e0f69858632dca2737cf7855
-MISC metadata.xml 332 BLAKE2B 70f041e88305198971fae1b6dde29c425677c8a378fff9de17be7ef9d70289a6b10b41eb87bb661fef13855b01833b0cd86a430432ffeddcef7b33e0368b4e31 SHA512 25b86186d6c968cf80a1493d079da26f5821ec9426e9566b2d02f5e0db0a629b1b176c6cccad43a679607d53aeb49293aa298da9aaa90616e60115e1fd6214aa
+EBUILD noto-emoji-20220912.ebuild 2864 BLAKE2B 693f71bb449d26348e70f0297cb077e3508e0deb077cf7eecd9928e436535d98fef33a8fd7b8a12c8f7339c294e865b3c1b64de0637dcf1b6a78f8daddcf8768 SHA512 9f05f2db6417021dded95ede8c1f592ebed1edeef96213f42356d17c8dd9fdd718b6ecde1f673ea0bd3ca02b62636c8f544d3d9d8810f7f56806c5c827606f46
+MISC metadata.xml 421 BLAKE2B b78c0443456d46d6cd93c57a585f47532b3464fdcc2d93f6e863045285818fe0ce1f4af88b7d68de2a15f7a858853c7fca7bd9488d3f21dbb32783f54ce6c109 SHA512 03faa98eb4e0d51a2e367171814f7d2a49e2a3a07900dec191ee6addbe8535b8f25c0da88d35f60083ace8b05125e25bada706510759c321ee5f48a8801eb546
diff --git a/media-fonts/noto-emoji/metadata.xml b/media-fonts/noto-emoji/metadata.xml
index 764112401caf..1f615adf787d 100644
--- a/media-fonts/noto-emoji/metadata.xml
+++ b/media-fonts/noto-emoji/metadata.xml
@@ -5,7 +5,10 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
-<use>
-	<flag name="buildfont">Build Noto Emoji font with supplied images.</flag>
-</use>
+	<use>
+		<flag name="buildfont">Build Noto Emoji font with supplied images</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">googlefonts/noto-emoji</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/noto-emoji/noto-emoji-20211101.ebuild b/media-fonts/noto-emoji/noto-emoji-20211101.ebuild
deleted file mode 100644
index 8d4899112c42..000000000000
--- a/media-fonts/noto-emoji/noto-emoji-20211101.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit font python-any-r1
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
-
-COMMIT="9a5261d871451f9b5183c93483cbd68ed916b1e9"
-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="buildfont"
-
-BDEPEND="
-	buildfont? (
-		${PYTHON_DEPS}
-		app-arch/zopfli
-		$(python_gen_any_dep '
-			>=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}]
-			>=dev-python/nototools-0.2.13[${PYTHON_USEDEP}]
-		')
-		media-gfx/pngquant
-		x11-libs/cairo
-		|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
-	)
-"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-python_check_deps() {
-	python_has_version ">=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}]" \
-		">=dev-python/nototools-0.2.13[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	font_pkg_setup
-	use buildfont && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Drop font for Windows 10
-	rm fonts/NotoColorEmoji_WindowsCompatible.ttf || die
-
-	if use buildfont; then
-		# From Fedora
-		eapply "${FILESDIR}/${PN}-build-all-flags.patch"
-
-		# https://github.com/googlei18n/noto-emoji/issues/240
-		eapply "${FILESDIR}/${PN}-20180823-build-path.patch"
-
-		# Be more verbose, bug #717654
-		eapply "${FILESDIR}"/${PN}-pngquant-verbose.patch
-		sed -i -e 's:@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1:@$(ZOPFLIPNG) -y "$<" "$@":g' Makefile || die
-
-		# Based on Fedora patch to allow graphicsmagick usage
-		if has_version -b media-gfx/graphicsmagick; then
-			eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
-		fi
-	fi
-}
-
-src_compile() {
-	if ! use buildfont; then
-		einfo "Installing pre-built fonts provided by upstream."
-		einfo "They could be not fully updated or miss some items."
-		einfo "To build fonts based on latest images enable 'buildfont'"
-		einfo "USE (that will require more time and resources too)."
-	else
-		python_setup
-		einfo "Building fonts..."
-
-		# From Debian:
-		# The build requires a VIRTUAL_ENV variable and sequence check isn't working
-		VIRTUAL_ENV=true \
-		BYPASS_SEQUENCE_CHECK=true \
-		default
-	fi
-}
-
-src_install() {
-	if ! use buildfont; then
-		FONT_S="${S}/fonts"
-	else
-		mv -i fonts/NotoEmoji-Regular.ttf "${S}" || die
-		# Built font and Regular font
-		FONT_S="${S}"
-
-		# Don't lose fancy emoji icons
-		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-20220912.ebuild b/media-fonts/noto-emoji/noto-emoji-20220912.ebuild
index bef014fb3e22..506358038e73 100644
--- a/media-fonts/noto-emoji/noto-emoji-20220912.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20220912.ebuild
@@ -63,7 +63,7 @@ src_prepare() {
 		sed -i -e 's:@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1:@$(ZOPFLIPNG) -y "$<" "$@":g' Makefile || die
 
 		# Based on Fedora patch to allow graphicsmagick usage
-		if has_version -b media-gfx/graphicsmagick; then
+		if has_version -b media-gfx/graphicsmagick[png]; then
 			eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
 		fi
 	fi