gentoo resync : 25.04.2020

7 files changed, 157 insertions, 12 deletions

diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 195fe6bbb9dc..66ed3d023149 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -1,8 +1,11 @@
 AUX noto-emoji-20180823-build-path.patch 313 BLAKE2B c7a6a67639444329f033da14b58759d9ac265a3dfd7854fc6ba0466ace3c5ce9794c9c6493d08a89d29d4e9a5fa99d1553be13c49fc9f09fb82a82b6b61531f6 SHA512 544acdfd0f2dc0dcfc75b4081f7e1518ab914d02801bf7b38f31af9a0d55ed516a2f53e963606232a8742819b3005f8e9660c8a61257d0583bfee8f095d4e341
 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
+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 1575 BLAKE2B 4cee9e26fd338b995de949adaa03cfa8a8faea83f072f37c1347e9e3b913a57d5ce55787ee88e6cfed6dbaf13a47fdcf954c98cebd3673cdce7c629f2674482c SHA512 7d02c408f9066446612b8e608e8d6c11310cad63d952daf5269f5dc7bb4a0359adca233380861ffba54d528fd4dc997adc993bc20893e9cb97a826c2eb2cf270
-EBUILD noto-emoji-20200317.ebuild 1576 BLAKE2B 5da2fc4108966de298c3efc792f5dc7135f098b31a2dff8c95690257e135f30c96a1ff122ea6d575d2444844f32f67c6a058b61ed23096820e0880d189d12554 SHA512 7b68bc1f0b32c94150b96f709ca592a9e21c9308341c1b25ec483827b5778602a0cf51e8abaa4244eb766e3423968f07f310970117099edcda06e21aec91ed09
-MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
+EBUILD noto-emoji-20200311.ebuild 1637 BLAKE2B d8e8cb7457c2a69672195cd7f9f4138fcceed4ab20161231e1e891f351c7f689eaf2b92c1b795ffb668bd306ef0e2be98d40cac4649828c85607401aae72dada SHA512 dd6ab5a2550adba9f53d4e27c4ad8ba51343966c1b2648ce29e925556eff068a2f6f901a4232c977de0b55d722845330f459cc58e09cfa09e62c4370238b88b9
+EBUILD noto-emoji-20200317-r1.ebuild 2342 BLAKE2B 1d934fff190f3413bbd1834cd28bbc58ae96451c396082a4969c41e90e2df6875a88160b23b0f800d97ebc0a020ef6ab7ea66acba4c08da38e7b70bf9ec197be SHA512 8de27c360a7871e655de9f279a9dce83b91bb7c8467cecb176a07fc4705fb59eafeab5fddeeafa4472b3e9ac01d598e47d6c677953279a31fca1a87b856eceef
+EBUILD noto-emoji-20200317.ebuild 1640 BLAKE2B 78b9d5d5584064dbbff464681239b6068ab4a85b1264e7c230b8de916b5adcb1ae78dc4b3f6cb43f68ae4947f8c6339358a9a505777e4cd6fbf599a639a89b74 SHA512 8d0ae747a252b107ea8196e9061ad2b680be4582492335285d33421b4fb95136c5996fb86fd8b8de33d02560e051033e99e9b30fe6c75a32ede8dcb6cd5f34b7
+MISC metadata.xml 331 BLAKE2B 66a5d106e581cd60216e1f288d6a7431610e92ae605ffecc3e97a3bb381cf1c29671610412d6c5c69970cac946c9653a91998d53785489d630cf9837e11a8d8c SHA512 746b080cb25302ab0d7130e666ce9b8e7682dee919affe70d18fe65e62bc878a6f30174844c9df8918eab14ecf22cc4450050d292747da032eca9ce83637943c
diff --git a/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch b/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch
new file mode 100644
index 000000000000..8a152bea23d9
--- /dev/null
+++ b/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch
@@ -0,0 +1,11 @@
+--- a/Makefile~	2020-04-22 23:04:44.000000000 +0200
++++ b/Makefile	2020-04-22 23:06:42.069275340 +0200
+@@ -20,7 +20,7 @@
+ 
+ PNGQUANT = pngquant
+ PYTHON = python3
+-PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
++PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force -v
+ BODY_DIMENSIONS = 136x128
+ IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
+ 
diff --git a/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch b/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch
new file mode 100644
index 000000000000..0cb272994aa2
--- /dev/null
+++ b/media-fonts/noto-emoji/files/noto-emoji-zopflipng-verbose.patch
@@ -0,0 +1,11 @@
+--- a/Makefile~	2020-04-22 23:07:33.000000000 +0200
++++ b/Makefile	2020-04-22 23:11:46.356767595 +0200
+@@ -194,7 +194,7 @@
+ ifdef MISSING_ZOPFLI
+ 	@$(OPTIPNG) -quiet -o7 -clobber -force -out "$@" "$<"
+ else
+-	@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1
++	@$(ZOPFLIPNG) -y "$<" "$@" 2>&1
+ endif
+ 
+ 
diff --git a/media-fonts/noto-emoji/metadata.xml b/media-fonts/noto-emoji/metadata.xml
index 3da97a9953cc..18a049a172d7 100644
--- a/media-fonts/noto-emoji/metadata.xml
+++ b/media-fonts/noto-emoji/metadata.xml
@@ -5,4 +5,7 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+<use>
+	<flag name="buildfont">Build Noto Emoji font with supplied images.</flag>
+</use>
 </pkgmetadata>
diff --git a/media-fonts/noto-emoji/noto-emoji-20200311.ebuild b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
index 8c9d46ac17e5..96e7679fa644 100644
--- a/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE=""
 
-DEPEND="${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	app-arch/zopfli
 	$(python_gen_any_dep '
 		dev-python/fonttools[${PYTHON_USEDEP}]
@@ -27,7 +27,6 @@ DEPEND="${PYTHON_DEPS}
 	x11-libs/cairo
 	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
 "
-RDEPEND=""
 
 RESTRICT="binchecks strip"
 
@@ -37,8 +36,12 @@ FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
 python_check_deps() {
-	has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \
-        has_version "dev-python/nototools[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	font_pkg_setup
 }
 
 PATCHES=(
@@ -58,6 +61,11 @@ src_prepare() {
 	fi
 }
 
+src_compile() {
+	python_setup
+	default
+}
+
 src_install() {
 	font_src_install
 
diff --git a/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
new file mode 100644
index 000000000000..c676a419e557
--- /dev/null
+++ b/media-fonts/noto-emoji/noto-emoji-20200317-r1.ebuild
@@ -0,0 +1,101 @@
+# 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/googlefonts/noto-emoji"
+
+COMMIT="ac1703e9d7feebbf5443a986e08332b1e1c5afcf"
+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"
+IUSE="buildfont"
+
+BDEPEND="
+	buildfont? (
+		${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}"
+
+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
+		eapply "${FILESDIR}"/${PN}-zopflipng-verbose.patch
+
+		# 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..."
+		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
+}
diff --git a/media-fonts/noto-emoji/noto-emoji-20200317.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
index 4006861c9605..b4230796aef1 100644
--- a/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit font python-any-r1
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	app-arch/zopfli
 	$(python_gen_any_dep '
 		dev-python/fonttools[${PYTHON_USEDEP}]
@@ -27,7 +27,6 @@ DEPEND="${PYTHON_DEPS}
 	x11-libs/cairo
 	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
 "
-RDEPEND=""
 
 RESTRICT="binchecks strip"
 
@@ -37,8 +36,12 @@ FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
 python_check_deps() {
-	has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \
-        has_version "dev-python/nototools[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	font_pkg_setup
 }
 
 PATCHES=(
@@ -58,6 +61,11 @@ src_prepare() {
 	fi
 }
 
+src_compile() {
+	python_setup
+	default
+}
+
 src_install() {
 	font_src_install