Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-fonts/noto-emoji/, media-fonts/noto-emoji/files/
Date: Sun, 19 Mar 2023 16:56:47
Message-Id: 1679244992.70234672c7fb2716c2284bb17f0798c5488d49ab.pacho@gentoo
1 commit: 70234672c7fb2716c2284bb17f0798c5488d49ab
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 19 16:34:39 2023 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 19 16:56:32 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70234672
7
8 media-fonts/noto-emoji: drop 20220912
9
10 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
11
12 .../files/noto-emoji-20180823-build-path.patch | 11 --
13 .../files/noto-emoji-20190328-use-gm.patch | 27 -----
14 .../files/noto-emoji-build-all-flags.patch | 11 --
15 .../files/noto-emoji-pngquant-verbose.patch | 11 --
16 media-fonts/noto-emoji/noto-emoji-20220912.ebuild | 116 ---------------------
17 5 files changed, 176 deletions(-)
18
19 diff --git a/media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch b/media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch
20 deleted file mode 100644
21 index 151f88251524..000000000000
22 --- a/media-fonts/noto-emoji/files/noto-emoji-20180823-build-path.patch
23 +++ /dev/null
24 @@ -1,11 +0,0 @@
25 ---- a/add_glyphs.py.old 2018-11-18 11:11:56.387323302 +0100
26 -+++ b/add_glyphs.py 2018-11-18 11:12:18.203529159 +0100
27 -@@ -22,7 +22,7 @@
28 - import add_emoji_gsub
29 - import add_aliases
30 -
31 --sys.path.append(
32 -+sys.path.insert(0,
33 - path.join(os.path.dirname(__file__), 'third_party', 'color_emoji'))
34 - from png import PNG
35 -
36
37 diff --git a/media-fonts/noto-emoji/files/noto-emoji-20190328-use-gm.patch b/media-fonts/noto-emoji/files/noto-emoji-20190328-use-gm.patch
38 deleted file mode 100644
39 index 6b51d0f52168..000000000000
40 --- a/media-fonts/noto-emoji/files/noto-emoji-20190328-use-gm.patch
41 +++ /dev/null
42 @@ -1,27 +0,0 @@
43 ---- a/Makefile~ 2019-03-28 17:45:53.000000000 +0100
44 -+++ b/Makefile 2019-06-02 10:36:55.587055453 +0200
45 -@@ -21,7 +21,7 @@
46 - PNGQUANT = pngquant
47 - PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
48 - BODY_DIMENSIONS = 136x128
49 --IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
50 -+IMOPS = -size 136x128 -background none -gravity center -extent 136x128 -compose copy
51 -
52 - # zopflipng is better (about 5-10%) but much slower. it will be used if
53 - # present. pass ZOPFLIPNG= as an arg to make to use optipng instead.
54 -@@ -165,13 +165,13 @@
55 - # imagemagick packaged with ubuntu trusty (6.7.7-10) by using -composite.
56 -
57 - $(EMOJI_DIR)/%.png: $(EMOJI_SRC_DIR)/%.png | $(EMOJI_DIR)
58 -- @convert $(IMOPS) "$<" -composite "PNG32:$@"
59 -+ @gm convert $(IMOPS) "$<" "PNG32:$@"
60 -
61 - $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag | $(FLAGS_DIR)
62 - @./waveflag $(FLAGS_DIR)/ "$<"
63 -
64 - $(RESIZED_FLAGS_DIR)/%.png: $(FLAGS_DIR)/%.png | $(RESIZED_FLAGS_DIR)
65 -- @convert $(IMOPS) "$<" -composite "PNG32:$@"
66 -+ @gm convert $(IMOPS) "$<" "PNG32:$@"
67 -
68 - flag-symlinks: $(RESIZED_FLAG_FILES) | $(RENAMED_FLAGS_DIR)
69 - @$(subst ^, , \
70
71 diff --git a/media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch b/media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch
72 deleted file mode 100644
73 index 564b08a59078..000000000000
74 --- a/media-fonts/noto-emoji/files/noto-emoji-build-all-flags.patch
75 +++ /dev/null
76 @@ -1,11 +0,0 @@
77 ---- old/Makefile 2018-05-03 20:32:14.000000000 +0200
78 -+++ new/Makefile 2018-05-08 11:48:20.811073447 +0200
79 -@@ -78,7 +78,7 @@
80 -
81 - ALL_FLAGS = $(basename $(notdir $(wildcard $(FLAGS_SRC_DIR)/*.png)))
82 -
83 --FLAGS = $(SELECTED_FLAGS)
84 -+FLAGS = $(ALL_FLAGS)
85 -
86 - FLAG_NAMES = $(FLAGS:%=%.png)
87 - FLAG_FILES = $(addprefix $(FLAGS_DIR)/, $(FLAG_NAMES))
88
89 diff --git a/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch b/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch
90 deleted file mode 100644
91 index 8a152bea23d9..000000000000
92 --- a/media-fonts/noto-emoji/files/noto-emoji-pngquant-verbose.patch
93 +++ /dev/null
94 @@ -1,11 +0,0 @@
95 ---- a/Makefile~ 2020-04-22 23:04:44.000000000 +0200
96 -+++ b/Makefile 2020-04-22 23:06:42.069275340 +0200
97 -@@ -20,7 +20,7 @@
98 -
99 - PNGQUANT = pngquant
100 - PYTHON = python3
101 --PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
102 -+PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force -v
103 - BODY_DIMENSIONS = 136x128
104 - IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
105 -
106
107 diff --git a/media-fonts/noto-emoji/noto-emoji-20220912.ebuild b/media-fonts/noto-emoji/noto-emoji-20220912.ebuild
108 deleted file mode 100644
109 index 2d31c4c23a4f..000000000000
110 --- a/media-fonts/noto-emoji/noto-emoji-20220912.ebuild
111 +++ /dev/null
112 @@ -1,116 +0,0 @@
113 -# Copyright 1999-2023 Gentoo Authors
114 -# Distributed under the terms of the GNU General Public License v2
115 -
116 -EAPI=8
117 -PYTHON_COMPAT=( python3_{9..10} )
118 -
119 -inherit font python-any-r1
120 -
121 -DESCRIPTION="Google Noto Emoji fonts"
122 -HOMEPAGE="https://www.google.com/get/noto/ https://github.com/googlefonts/noto-emoji"
123 -
124 -COMMIT="e8073ab740292f8d5f19b5de144087ac58044d06"
125 -SRC_URI="https://github.com/googlefonts/noto-emoji/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
126 -
127 -LICENSE="Apache-2.0 OFL-1.1"
128 -SLOT="0"
129 -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
130 -IUSE="buildfont"
131 -
132 -BDEPEND="
133 - buildfont? (
134 - ${PYTHON_DEPS}
135 - app-arch/zopfli
136 - $(python_gen_any_dep '
137 - >=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}]
138 - >=dev-python/nototools-0.2.13[${PYTHON_USEDEP}]
139 - ')
140 - media-gfx/pngquant
141 - x11-libs/cairo
142 - || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
143 - )
144 -"
145 -
146 -RESTRICT="binchecks strip"
147 -
148 -S="${WORKDIR}/${PN}-${COMMIT}"
149 -
150 -python_check_deps() {
151 - python_has_version ">=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}]" \
152 - ">=dev-python/nototools-0.2.13[${PYTHON_USEDEP}]"
153 -}
154 -
155 -pkg_setup() {
156 - font_pkg_setup
157 - use buildfont && python-any-r1_pkg_setup
158 -}
159 -
160 -src_prepare() {
161 - default
162 -
163 - # Drop font for Windows 10
164 - rm fonts/NotoColorEmoji_WindowsCompatible.ttf || die
165 -
166 - if use buildfont; then
167 - # From Fedora
168 - eapply "${FILESDIR}/${PN}-build-all-flags.patch"
169 -
170 - # https://github.com/googlei18n/noto-emoji/issues/240
171 - eapply "${FILESDIR}/${PN}-20180823-build-path.patch"
172 -
173 - # Be more verbose, bug #717654
174 - eapply "${FILESDIR}"/${PN}-pngquant-verbose.patch
175 - sed -i -e 's:@$(ZOPFLIPNG) -y "$<" "$@" 1> /dev/null 2>&1:@$(ZOPFLIPNG) -y "$<" "$@":g' Makefile || die
176 -
177 - # Based on Fedora patch to allow graphicsmagick usage
178 - if has_version -b media-gfx/graphicsmagick[png]; then
179 - eapply "${FILESDIR}/${PN}-20190328-use-gm.patch"
180 - fi
181 - fi
182 -}
183 -
184 -src_compile() {
185 - if ! use buildfont; then
186 - einfo "Installing pre-built fonts provided by upstream."
187 - einfo "They could be not fully updated or miss some items."
188 - einfo "To build fonts based on latest images enable 'buildfont'"
189 - einfo "USE (that will require more time and resources too)."
190 - else
191 - python_setup
192 - einfo "Building fonts..."
193 -
194 - # From Debian:
195 - # The build requires a VIRTUAL_ENV variable and sequence check isn't working
196 - VIRTUAL_ENV=true \
197 - BYPASS_SEQUENCE_CHECK=true \
198 - default
199 - fi
200 -}
201 -
202 -src_install() {
203 - if ! use buildfont; then
204 - FONT_S="${S}/fonts"
205 - # Drop non used fonts
206 - rm -f fonts/*COLR*.ttf || die
207 - else
208 - # Drop Windows compatible fonts and temporal files
209 - rm -f *tmpl.ttf *Windows*.ttf *COLR*.ttf || die
210 -
211 - # Built fonts
212 - FONT_S="${S}"
213 -
214 - # Don't lose fancy emoji icons
215 - for i in 32 72 128 512; do
216 - insinto "/usr/share/icons/${PN}/${i}/emotes/"
217 - doins png/"${i}"/*.png
218 - done
219 -
220 - insinto /usr/share/icons/"${PN}"/scalable/emotes/
221 - doins svg/*.svg
222 - fi
223 -
224 - FONT_SUFFIX="ttf"
225 - font_src_install
226 -
227 - dodoc README.md
228 -}