gentoo resync : 14.12.2020

4 files changed, 108 insertions, 159 deletions

diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 46dfc2bf4664..a468c2553091 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -3,9 +3,8 @@ AUX noto-emoji-20190328-use-gm.patch 1169 BLAKE2B 6659f1f80ec3f44942a7b96b23f5ae
 AUX noto-emoji-build-all-flags.patch 336 BLAKE2B b6c10010f9fe3b1e62ce436bbd0fae6ac85bd8feb2776d2d731a9b155818b828b7ecc1ec58861976b890eb1faf4db59bead3e86e7c39e44113b11152347cba29 SHA512 0d67afa05081da93cf05827dde54cbb6ce593e79874e823680d1c521c0953c49d4dcf12135da43b74bc72b4a79e8b7b0123ae2b2cd631f040c6797e04d3f008a
 AUX noto-emoji-pngquant-verbose.patch 407 BLAKE2B b737b10535b8a04ca2d17d6803fc7c6a36e733acf88a6089b56004f9d2a265851278cbb85b6a5d2c2ab18e46f12fcf84d7185e768cae2e3eafefeb3bc06869e5 SHA512 5bcb05c6b7a1e0970e1ff67707a1a5d49b22ada4ef4677d3bb9f9874e045d79f1d35419abc80b39bec81512f547360eb705dffeb421c48296a9646c618f75f61
 AUX noto-emoji-zopflipng-verbose.patch 299 BLAKE2B ba5f18515ae77b8c5228f2ecdc0488a221bd0e44e1b91368fdaadd3318937a593790aa597ce554758c7197e9e28f874cd5b16fbc0782a55d1ffcff84ec1ab3d5 SHA512 fe83ace875d980c9c04845e10cb405e73223f3464c50607002526793acd46f885ba8ffe4fba66e1f408f2fba365478052b01063ea56ffbca8e90c2073e3bf6b6
-DIST noto-emoji-20200311.tar.gz 58539077 BLAKE2B 837ae7ef6a571e40b4ed83a0aa1edfd13404c3ca65e671cdc86f650e63cf77179ef283e6dc032fb93f5107411565f980e594be8880626417fa89c67347e6fe62 SHA512 cfafe9c06ccbf888eb1309dc2090abef2f92c0592460693cb45db8ab147311fdd63655d8df182043f05cf503bdfbe16563bc8cea0bddcd830fe193ca86f7fcfb
 DIST noto-emoji-20200317.tar.gz 60841240 BLAKE2B aab99a5cbab6943b9e282b33dc113601489c7d02a3670db8675e6c90be615ceaf0f2900bdbc68ffaca6130f4e724b2ec1001cfccce80a181208ace0638492b7e SHA512 958a589ef7d7a0b9e4fa3eb1caa20284fa7463419a740d0ca05f850618324883c13498f92839476042cfd1daffa7eff925b2f22ec318c0726391f69c04911bfb
-EBUILD noto-emoji-20200311.ebuild 1637 BLAKE2B d8e8cb7457c2a69672195cd7f9f4138fcceed4ab20161231e1e891f351c7f689eaf2b92c1b795ffb668bd306ef0e2be98d40cac4649828c85607401aae72dada SHA512 dd6ab5a2550adba9f53d4e27c4ad8ba51343966c1b2648ce29e925556eff068a2f6f901a4232c977de0b55d722845330f459cc58e09cfa09e62c4370238b88b9
+DIST noto-emoji-20200916.tar.gz 60016327 BLAKE2B 980a4e960f200567e34c1314d9269029749e1d9cd29ab1c5da30418d8a016b894223adf8f263222512c513feab4de856a2f48b1695011ced0c49c30e7a487e47 SHA512 d497c4ecaf299ade23b1f6a3bc6e98d7dbbb619e51f067496d4a4dbf71693c96de26263af595c0aae86c63dcea8be190718f5477af645d4338989f25cc3ab848
 EBUILD noto-emoji-20200317-r1.ebuild 2363 BLAKE2B ab125a5718b0d6c5aad920799e2a2ac25e4863cfb9543744e0491e21e9c6bc7cbffe5e0b956a2d21b1aabd0aefe24d5fe8da9bd9a2503d0d29935d772126c5ce SHA512 c0150d0c5b726b3a2bf6e523529e67a82b75982b4892c3da94d4bd8bd366fe84037f2c2b168c70481b5fce01a8c4c3fa4f8edea034079963cdfc9c2d3d33dc88
-EBUILD noto-emoji-20200317.ebuild 1640 BLAKE2B 78b9d5d5584064dbbff464681239b6068ab4a85b1264e7c230b8de916b5adcb1ae78dc4b3f6cb43f68ae4947f8c6339358a9a505777e4cd6fbf599a639a89b74 SHA512 8d0ae747a252b107ea8196e9061ad2b680be4582492335285d33421b4fb95136c5996fb86fd8b8de33d02560e051033e99e9b30fe6c75a32ede8dcb6cd5f34b7
+EBUILD noto-emoji-20200916.ebuild 2584 BLAKE2B a3ab2d12d587d9970e63f01ff48d84acf59298d6d393c42aecd0382b8afde4458c346265a1ecf9d7c80ed82c2635337ea80474a2e574ccef11edfb826d15c23d SHA512 7828b9ba25794de5af53299b289c13d9ce3dd18b78ab9b296800d269afa144adc86d0b9b26076256127769d17615ebfc9e763588f7d8da930b655af3629f1397
 MISC metadata.xml 331 BLAKE2B 66a5d106e581cd60216e1f288d6a7431610e92ae605ffecc3e97a3bb381cf1c29671610412d6c5c69970cac946c9653a91998d53785489d630cf9837e11a8d8c SHA512 746b080cb25302ab0d7130e666ce9b8e7682dee919affe70d18fe65e62bc878a6f30174844c9df8918eab14ecf22cc4450050d292747da032eca9ce83637943c
diff --git a/media-fonts/noto-emoji/noto-emoji-20200311.ebuild b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
deleted file mode 100644
index 96e7679fa644..000000000000
--- a/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit font python-any-r1
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-emoji"
-
-COMMIT="4325631b45027a3d4da9a0f08f829e790f86ff4d"
-SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/zopfli
-	$(python_gen_any_dep '
-		dev-python/fonttools[${PYTHON_USEDEP}]
-		dev-python/nototools[${PYTHON_USEDEP}]
-	')
-	media-gfx/pngquant
-	x11-libs/cairo
-	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
-"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-
-python_check_deps() {
-	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	font_pkg_setup
-}
-
-PATCHES=(
-	# From Fedora
-	"${FILESDIR}/${PN}-build-all-flags.patch"
-
-	# https://github.com/googlei18n/noto-emoji/issues/240
-	"${FILESDIR}/${PN}-20180823-build-path.patch"
-)
-
-src_prepare() {
-	default
-
-	# Based on Fedora patch to allow graphicsmagick usage
-	if has_version media-gfx/graphicsmagick; then
-		eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
-	fi
-}
-
-src_compile() {
-	python_setup
-	default
-}
-
-src_install() {
-	font_src_install
-
-	# Don't lose fancy emoji icons
-	insinto /usr/share/icons/"${PN}"/128x128/emotes/
-	doins png/128/*.png
-
-	insinto /usr/share/icons/"${PN}"/scalable/emotes/
-	doins svg/*.svg
-}
diff --git a/media-fonts/noto-emoji/noto-emoji-20200317.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
deleted file mode 100644
index b4230796aef1..000000000000
--- a/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit font python-any-r1
-
-DESCRIPTION="Google Noto Emoji fonts"
-HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlei18n/noto-emoji"
-
-COMMIT="ac1703e9d7feebbf5443a986e08332b1e1c5afcf"
-SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/zopfli
-	$(python_gen_any_dep '
-		dev-python/fonttools[${PYTHON_USEDEP}]
-		dev-python/nototools[${PYTHON_USEDEP}]
-	')
-	media-gfx/pngquant
-	x11-libs/cairo
-	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
-"
-
-RESTRICT="binchecks strip"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-
-python_check_deps() {
-	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
-	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	font_pkg_setup
-}
-
-PATCHES=(
-	# From Fedora
-	"${FILESDIR}/${PN}-build-all-flags.patch"
-
-	# https://github.com/googlei18n/noto-emoji/issues/240
-	"${FILESDIR}/${PN}-20180823-build-path.patch"
-)
-
-src_prepare() {
-	default
-
-	# Based on Fedora patch to allow graphicsmagick usage
-	if has_version media-gfx/graphicsmagick; then
-		eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
-	fi
-}
-
-src_compile() {
-	python_setup
-	default
-}
-
-src_install() {
-	font_src_install
-
-	# Don't lose fancy emoji icons
-	insinto /usr/share/icons/"${PN}"/128x128/emotes/
-	doins png/128/*.png
-
-	insinto /usr/share/icons/"${PN}"/scalable/emotes/
-	doins svg/*.svg
-}
diff --git a/media-fonts/noto-emoji/noto-emoji-20200916.ebuild b/media-fonts/noto-emoji/noto-emoji-20200916.ebuild
new file mode 100644
index 000000000000..1fc1015e2b9a
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20200916.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit font python-any-r1
+
+DESCRIPTION="Google Noto Emoji fonts"
+HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
+
+COMMIT="aac7ccaa4d1dea4543453b96f7d6fc47066a57ff"
+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 ~ppc64 ~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() {
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	font_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	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
+		insinto /usr/share/icons/"${PN}"/128x128/emotes/
+		doins png/128/*.png
+
+		insinto /usr/share/icons/"${PN}"/scalable/emotes/
+		doins svg/*.svg
+	fi
+
+	FONT_SUFFIX="ttf"
+	font_src_install
+
+	dodoc README.md
+}