gentoo Easter resync : 12.04.2020

5 files changed, 35 insertions, 115 deletions

diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest
index 47b6d07569ce..195fe6bbb9dc 100644
--- a/media-fonts/noto-emoji/Manifest
+++ b/media-fonts/noto-emoji/Manifest
@@ -1,10 +1,8 @@
 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-use-gm.patch 1488 BLAKE2B 08bb2fa62c79615992c25503093d9ee8296dd3d0103ae50e9376020730c48d8e3eb5da281f066242b25d8e5c6a293cdb013b9d276fb10350021479aade1e78ab SHA512 0719575b7d2c3f0cc15c7e7a314e4a528b0601e14b8a06f0304a784d3d5dcf27cf4f881e4b57bb4647ba0cb36ba7be842bea2df1529de55d6ca16b6326c930d8
-AUX noto-emoji-use-system-pngquant.patch 2118 BLAKE2B 55048756859ead78a013a6ff749500107d9fe02fcfe775582fade153f268c5daa6f074ea1e8ea260bd09af077cc19cd8121b570bac47649b669df196e43d2574 SHA512 6bd4dd9e45aa73d8677c671a5ee3d6f03b3e94004db9b9c715cf76402ab2a641ce79991ec583cfe3a15a6c9803de4bfa863bd30cf16e96e9cb8a4683d6c04807
-DIST noto-emoji-20180823.tar.gz 51710829 BLAKE2B 66983bdd3cb5e95727f0ddebca5d85c3f22bb9e7b9216eb1af41c4cba19f2020592be3feb7ac47f723985574b8d57070d9d07d0ce5e5870512aecc2a55b52995 SHA512 73233f3742faae4e37f8588bda097fe9f745f5cc7e6601301c1dc9e30d656c496e074c80bf4391708f6c0dbe32043e8558e4395cce5dbf735772b0e41642b9bf
-DIST noto-emoji-20190328.tar.gz 51710517 BLAKE2B ecedc52d3bdc49281942e7cb6b217928ee57412a420da251855c702e444c5d720464093c173f2878c09b4ef7123aedcfc3aa6aa517a625749d414e4c3b08bd19 SHA512 9e775a18a43edadb24fee498a8dff588949475ba27c2daddc1dfb6eacc18d1bf8810ec88e018398f18efe9ff0c414766f569eec7a714e119f3aabdfbe3ceec98
-EBUILD noto-emoji-20180823.ebuild 1433 BLAKE2B a4df6d3336659a33bc91ddcb21b6b786110fbee82250f56ae449ed9407f7257006be5d36603b5e04220f18bed146346a15ee1a9f1a67bc3b115f641796e6aa79 SHA512 dc11f315255040b361e3a861ff172522eb5b31860e5ffa7cdb2ccf733fd7f374e497c7ab5115efaf7a7f75d7fa2f0a9a311ba7dd7c412d96e298bc3a243c017b
-EBUILD noto-emoji-20190328.ebuild 1352 BLAKE2B 1373d589e510c430f5ae2163795d0a95e7cc33aeb2b83b160323295e3e192dddb4db6e395b27b17ea8866226df0a32668d4cac734aea43ef47c2974f6ab249eb SHA512 e473fa45303799b00129def4420ca5d3a5784b24477b691fddd61700c35f42e618c3ef6e8750e0f6716b4df73205a8ab635dbab75bfdb7fd5fd9edbb77a81d31
+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
diff --git a/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch b/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch
deleted file mode 100644
index 5710fd53dc5c..000000000000
--- a/media-fonts/noto-emoji/files/noto-emoji-use-gm.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf/Makefile
-===================================================================
---- noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf.orig/Makefile
-+++ noto-emoji-352632eb1935fd2b732f6f3ca0a24e9754c3eccf/Makefile
-@@ -20,7 +20,8 @@ LDFLAGS = -lm `pkg-config --libs cairo`
- PNGQUANT = pngquant
- PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
- BODY_DIMENSIONS = 136x128
--IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
-+#IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
-+IMOPS = -size 136x128 -background none -gravity center -extent 136x128 -compose copy
- 
- # zopflipng is better (about 5-10%) but much slower.  it will be used if
- # present.  pass ZOPFLIPNG= as an arg to make to use optipng instead.
-@@ -172,13 +173,13 @@ waveflag: waveflag.c
- # imagemagick packaged with ubuntu trusty (6.7.7-10) by using -composite.
- 
- $(EMOJI_DIR)/%.png: $(EMOJI_SRC_DIR)/%.png | $(EMOJI_DIR)
--	@convert $(IMOPS) "$<" -composite "PNG32:$@"
-+	@gm convert $(IMOPS) "$<" "PNG32:$@"
- 
- $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag $(PNGQUANT) | $(FLAGS_DIR)
- 	@./waveflag $(FLAGS_DIR)/ "$<"
- 
- $(RESIZED_FLAGS_DIR)/%.png: $(FLAGS_DIR)/%.png | $(RESIZED_FLAGS_DIR)
--	@convert $(IMOPS) "$<" -composite "PNG32:$@"
-+	@gm convert $(IMOPS) "$<" "PNG32:$@"
- 
- flag-symlinks: $(RESIZED_FLAG_FILES) | $(RENAMED_FLAGS_DIR)
- 	@$(subst ^, ,                                  \
diff --git a/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch b/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch
deleted file mode 100644
index ddc6ff881ce1..000000000000
--- a/media-fonts/noto-emoji/files/noto-emoji-use-system-pngquant.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ru noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5.orig/Makefile noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/Makefile
---- noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5.orig/Makefile	2018-03-07 09:22:49.670696985 +0100
-+++ noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/Makefile	2018-03-07 09:23:06.824506178 +0100
-@@ -15,10 +15,9 @@
- EMOJI = NotoColorEmoji
- font: $(EMOJI).ttf
- 
--CFLAGS = -std=c99 -Wall -Wextra `pkg-config --cflags --libs cairo`
-+CFLAGS = $(OPT_CFLAGS) `pkg-config --cflags --libs cairo`
- LDFLAGS = -lm `pkg-config --libs cairo`
--PNGQUANTDIR := third_party/pngquant
--PNGQUANT := $(PNGQUANTDIR)/pngquant
-+PNGQUANT = pngquant
- PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
- BODY_DIMENSIONS = 136x128
- IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
-@@ -97,6 +96,12 @@
- ALL_COMPRESSED_FILES = $(addprefix $(COMPRESSED_DIR)/, $(ALL_NAMES))
- 
- # tool checks
-+ifeq (,$(shell which $(PNGQUANT)))
-+  ifeq (,$(wildcard $(PNGQUANT)))
-+    MISSING_PNGQUANT = fail
-+  endif
-+endif
-+
- ifeq (,$(shell which $(ZOPFLIPNG)))
-   ifeq (,$(wildcard $(ZOPFLIPNG)))
-     MISSING_ZOPFLI = fail
-@@ -126,6 +131,11 @@
- 
- compressed: $(ALL_COMPRESSED_FILES)
- 
-+check_quantization_tool:
-+ifdef MISSING_PNGQUANT
-+	$(error "$(PNGQUANT) is not available")
-+endif
-+
- check_compress_tool:
- ifdef MISSING_ZOPFLI
-   ifdef MISSING_OPTIPNG
-@@ -146,8 +156,7 @@
- $(EMOJI_DIR) $(FLAGS_DIR) $(RESIZED_FLAGS_DIR) $(RENAMED_FLAGS_DIR) $(QUANTIZED_DIR) $(COMPRESSED_DIR):
- 	mkdir -p "$@"
- 
--$(PNGQUANT):
--	$(MAKE) -C $(PNGQUANTDIR)
-+$(PNGQUANT): check_quantization_tool
- 
- waveflag: waveflag.c
- 	$(CC) $< -o $@ $(CFLAGS) $(LDFLAGS)
-@@ -227,5 +236,5 @@
- .SECONDARY: $(EMOJI_FILES) $(FLAG_FILES) $(RESIZED_FLAG_FILES) $(RENAMED_FLAG_FILES) \
-   $(ALL_QUANTIZED_FILES) $(ALL_COMPRESSED_FILES)
- 
--.PHONY:	clean flags emoji renamed_flags quantized compressed check_compress_tool
-+.PHONY:	clean flags emoji renamed_flags quantized compressed check_compress_tool check_quantization_tool
- 
-noto-emoji-153e1d4c026c124fbac6ee93e559b5df375f24f5/ のみに存在: Makefile.orig
diff --git a/media-fonts/noto-emoji/noto-emoji-20190328.ebuild b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
index 994ee91ee97a..8c9d46ac17e5 100644
--- a/media-fonts/noto-emoji/noto-emoji-20190328.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20200311.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+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="e7490e1841094da518f4672398bdd74ee3c5fcac"
+COMMIT="4325631b45027a3d4da9a0f08f829e790f86ff4d"
 SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 OFL-1.1"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
 	app-arch/zopfli
-	dev-python/fonttools
-	dev-python/nototools
+	$(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] )
@@ -34,6 +36,11 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
+python_check_deps() {
+	has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \
+        has_version "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
 PATCHES=(
 	# From Fedora
 	"${FILESDIR}/${PN}-build-all-flags.patch"
diff --git a/media-fonts/noto-emoji/noto-emoji-20180823.ebuild b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
index c41d698b3996..4006861c9605 100644
--- a/media-fonts/noto-emoji/noto-emoji-20180823.ebuild
+++ b/media-fonts/noto-emoji/noto-emoji-20200317.ebuild
@@ -1,26 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+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="07ad7f0f4dc1bfb03221c2004c7cc60c6b79b25e"
+COMMIT="ac1703e9d7feebbf5443a986e08332b1e1c5afcf"
 SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
 	app-arch/zopfli
-	dev-python/fonttools
-	dev-python/nototools
+	$(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] )
@@ -34,9 +36,13 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 FONT_S="${S}"
 FONT_SUFFIX="ttf"
 
+python_check_deps() {
+	has_version "dev-python/fonttools[${PYTHON_USEDEP}]" && \
+        has_version "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
 PATCHES=(
 	# From Fedora
-	"${FILESDIR}/${PN}-use-system-pngquant.patch"
 	"${FILESDIR}/${PN}-build-all-flags.patch"
 
 	# https://github.com/googlei18n/noto-emoji/issues/240
@@ -45,12 +51,10 @@ PATCHES=(
 
 src_prepare() {
 	default
-	# Use system pngquant
-	rm -rf third_party/pngquant
 
-	# Fedora patch to allow graphicsmagick usage
+	# Based on Fedora patch to allow graphicsmagick usage
 	if has_version media-gfx/graphicsmagick; then
-		eapply "${FILESDIR}/${PN}-use-gm.patch"
+		eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
 	fi
 }