commit: bd7710aedf195b4eaf033386ffe2bbdb9a8b6444 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Fri Mar 20 15:08:28 2020 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Fri Mar 20 15:11:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7710ae
media-fonts/noto-emoji: Drop old Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> media-fonts/noto-emoji/Manifest | 2 - .../noto-emoji/files/noto-emoji-use-gm.patch | 30 ---------- .../files/noto-emoji-use-system-pngquant.patch | 59 ------------------- media-fonts/noto-emoji/noto-emoji-20180823.ebuild | 66 ---------------------- media-fonts/noto-emoji/noto-emoji-20190328.ebuild | 63 --------------------- 5 files changed, 220 deletions(-) diff --git a/media-fonts/noto-emoji/Manifest b/media-fonts/noto-emoji/Manifest index 29ec1902a9a..51b59084932 100644 --- a/media-fonts/noto-emoji/Manifest +++ b/media-fonts/noto-emoji/Manifest @@ -1,3 +1 @@ -DIST noto-emoji-20180823.tar.gz 51710829 BLAKE2B 66983bdd3cb5e95727f0ddebca5d85c3f22bb9e7b9216eb1af41c4cba19f2020592be3feb7ac47f723985574b8d57070d9d07d0ce5e5870512aecc2a55b52995 SHA512 73233f3742faae4e37f8588bda097fe9f745f5cc7e6601301c1dc9e30d656c496e074c80bf4391708f6c0dbe32043e8558e4395cce5dbf735772b0e41642b9bf -DIST noto-emoji-20190328.tar.gz 51710517 BLAKE2B ecedc52d3bdc49281942e7cb6b217928ee57412a420da251855c702e444c5d720464093c173f2878c09b4ef7123aedcfc3aa6aa517a625749d414e4c3b08bd19 SHA512 9e775a18a43edadb24fee498a8dff588949475ba27c2daddc1dfb6eacc18d1bf8810ec88e018398f18efe9ff0c414766f569eec7a714e119f3aabdfbe3ceec98 DIST noto-emoji-20200311.tar.gz 58539077 BLAKE2B 837ae7ef6a571e40b4ed83a0aa1edfd13404c3ca65e671cdc86f650e63cf77179ef283e6dc032fb93f5107411565f980e594be8880626417fa89c67347e6fe62 SHA512 cfafe9c06ccbf888eb1309dc2090abef2f92c0592460693cb45db8ab147311fdd63655d8df182043f05cf503bdfbe16563bc8cea0bddcd830fe193ca86f7fcfb 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 5710fd53dc5..00000000000 --- 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 ddc6ff881ce..00000000000 --- 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-20180823.ebuild b/media-fonts/noto-emoji/noto-emoji-20180823.ebuild deleted file mode 100644 index c41d698b399..00000000000 --- a/media-fonts/noto-emoji/noto-emoji-20180823.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_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" -SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -DEPEND="${PYTHON_DEPS} - app-arch/zopfli - dev-python/fonttools - dev-python/nototools - media-gfx/pngquant - x11-libs/cairo - || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) -" -RDEPEND="" - -RESTRICT="binchecks strip" - -S="${WORKDIR}/${PN}-${COMMIT}" - -FONT_S="${S}" -FONT_SUFFIX="ttf" - -PATCHES=( - # From Fedora - "${FILESDIR}/${PN}-use-system-pngquant.patch" - "${FILESDIR}/${PN}-build-all-flags.patch" - - # https://github.com/googlei18n/noto-emoji/issues/240 - "${FILESDIR}/${PN}-20180823-build-path.patch" -) - -src_prepare() { - default - # Use system pngquant - rm -rf third_party/pngquant - - # Fedora patch to allow graphicsmagick usage - if has_version media-gfx/graphicsmagick; then - eapply "${FILESDIR}/${PN}-use-gm.patch" - fi -} - -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-20190328.ebuild b/media-fonts/noto-emoji/noto-emoji-20190328.ebuild deleted file mode 100644 index 994ee91ee97..00000000000 --- a/media-fonts/noto-emoji/noto-emoji-20190328.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_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" -SRC_URI="https://github.com/googlei18n/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -DEPEND="${PYTHON_DEPS} - app-arch/zopfli - dev-python/fonttools - dev-python/nototools - media-gfx/pngquant - x11-libs/cairo - || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) -" -RDEPEND="" - -RESTRICT="binchecks strip" - -S="${WORKDIR}/${PN}-${COMMIT}" - -FONT_S="${S}" -FONT_SUFFIX="ttf" - -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_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 -}
