Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
Date: Fri, 01 May 2020 15:10:28
Message-Id: 1588345778.847c4510e5474d992463df111a6241f501353a95.juippis@gentoo
1 commit: 847c4510e5474d992463df111a6241f501353a95
2 Author: end222 <pabloorduna98 <AT> gmail <DOT> com>
3 AuthorDate: Thu Apr 30 15:07:39 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Fri May 1 15:09:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=847c4510
7
8 x11-terms/kitty: cleanup older versions
9
10 Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/15575
12 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
13
14 x11-terms/kitty/Manifest | 2 -
15 x11-terms/kitty/files/kitty-0.15.1-flags.patch | 49 ------------
16 x11-terms/kitty/kitty-0.15.1.ebuild | 101 ------------------------
17 x11-terms/kitty/kitty-0.16.0-r1.ebuild | 101 ------------------------
18 x11-terms/kitty/kitty-0.16.0-r2.ebuild | 103 -------------------------
19 x11-terms/kitty/kitty-0.16.0-r3.ebuild | 103 -------------------------
20 6 files changed, 459 deletions(-)
21
22 diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
23 index 5469a2cc936..bac5a972e96 100644
24 --- a/x11-terms/kitty/Manifest
25 +++ b/x11-terms/kitty/Manifest
26 @@ -1,4 +1,2 @@
27 -DIST kitty-0.15.1.tar.xz 2974348 BLAKE2B 63f7f6f6083df34420733e33e00e8483f476c1f191942075160d14f87c4052e08d4c9e1d1872d41dd1af6c0c23f3fc444efb22124e3fe1611fe01be593bc64b5 SHA512 e32fe719b4fc7c45b324e4372e0dca3e482f81b245b8bf4eb2b643dccc8541a8d1f93b0f73d5777a7b51cd62a720468036bcb848797e0cba2dad71bba005f9e1
28 -DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
29 DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
30 DIST kitty-0.17.3.tar.xz 3064216 BLAKE2B f5ab532d97c211ceed463c24758635a9e7168bf03990889a98ebdad7fc8c1c60f5f3726724007f00ac6a5f5e8db44ca54a4a43027dbf6ce1fdfcaa40c7b8e10c SHA512 dc14ba35e77e0ebd1978fde0731b00e726e75137f900952dfa6b06add1f46e3a3f42e8e886ce8c689e4e3500f2d2216a66225d5211522a41d09ef61265065e2d
31
32 diff --git a/x11-terms/kitty/files/kitty-0.15.1-flags.patch b/x11-terms/kitty/files/kitty-0.15.1-flags.patch
33 deleted file mode 100644
34 index cf09a4a5bab..00000000000
35 --- a/x11-terms/kitty/files/kitty-0.15.1-flags.patch
36 +++ /dev/null
37 @@ -1,49 +0,0 @@
38 -Respect user CFLAGS.
39 -
40 ---- a/setup.py
41 -+++ b/setup.py
42 -@@ -204,7 +204,7 @@
43 - if ccver >= (5, 0):
44 - df += ' -Og'
45 - float_conversion = '-Wfloat-conversion'
46 -- optimize = df if debug or sanitize else '-O3'
47 -+ optimize = ''
48 - sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
49 - cppflags = os.environ.get(
50 - 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'),
51 -@@ -217,7 +217,7 @@
52 - cflags = os.environ.get(
53 - 'OVERRIDE_CFLAGS', (
54 - '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
55 -- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
56 -+ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
57 - ).format(
58 - float_conversion, std,
59 - optimize,
60 -@@ -232,7 +232,7 @@
61 - )
62 - ldflags = os.environ.get(
63 - 'OVERRIDE_LDFLAGS',
64 -- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
65 -+ '-Wall ' + ' '.join(sanitize_args)
66 - )
67 - ldflags = shlex.split(ldflags)
68 - ldflags.append('-shared')
69 -@@ -614,7 +614,7 @@
70 -
71 -
72 - def build_launcher(args, launcher_dir='.', bundle_type='source'):
73 -- cflags = '-Wall -Werror -fpie'.split()
74 -+ cflags = '-Wall -fpie'.split()
75 - cppflags = []
76 - libs = []
77 - if args.profile or args.sanitize:
78 -@@ -626,8 +626,6 @@
79 - cflags.append('-g')
80 - if args.profile:
81 - libs.append('-lprofiler')
82 -- else:
83 -- cflags.append('-O3')
84 - if bundle_type.endswith('-freeze'):
85 - cppflags.append('-DFOR_BUNDLE')
86 - cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
87
88 diff --git a/x11-terms/kitty/kitty-0.15.1.ebuild b/x11-terms/kitty/kitty-0.15.1.ebuild
89 deleted file mode 100644
90 index b921dc1b6a7..00000000000
91 --- a/x11-terms/kitty/kitty-0.15.1.ebuild
92 +++ /dev/null
93 @@ -1,101 +0,0 @@
94 -# Copyright 1999-2020 Gentoo Authors
95 -# Distributed under the terms of the GNU General Public License v2
96 -
97 -EAPI=7
98 -
99 -PYTHON_COMPAT=( python3_{6,7,8} )
100 -
101 -inherit python-single-r1 toolchain-funcs xdg
102 -
103 -if [[ ${PV} == "9999" ]] ; then
104 - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
105 - inherit git-r3
106 -else
107 - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
108 - KEYWORDS="~amd64 ~x86"
109 -fi
110 -
111 -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
112 -HOMEPAGE="https://github.com/kovidgoyal/kitty"
113 -
114 -LICENSE="GPL-3"
115 -SLOT="0"
116 -IUSE="debug wayland"
117 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
118 -
119 -RDEPEND="
120 - ${PYTHON_DEPS}
121 - media-libs/fontconfig
122 - media-libs/freetype:2
123 - >=media-libs/harfbuzz-1.5.0:=
124 - media-libs/libcanberra
125 - media-libs/libpng:0=
126 - x11-libs/libxcb[xkb]
127 - x11-libs/libXcursor
128 - x11-libs/libXi
129 - x11-libs/libXinerama
130 - x11-libs/libxkbcommon[X]
131 - x11-libs/libXrandr
132 - sys-apps/dbus
133 - sys-libs/zlib
134 - virtual/imagemagick-tools
135 - wayland? (
136 - dev-libs/wayland
137 - >=dev-libs/wayland-protocols-1.17
138 - )
139 -"
140 -
141 -DEPEND="${RDEPEND}
142 - media-libs/mesa[X(+)]
143 - sys-libs/ncurses
144 -"
145 -
146 -BDEPEND="virtual/pkgconfig"
147 -
148 -[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
149 -
150 -PATCHES=(
151 - "${FILESDIR}"/${P}-flags.patch
152 - "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
153 -)
154 -
155 -src_prepare() {
156 - default
157 -
158 - # disable wayland as required
159 - if ! use wayland; then
160 - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
161 - fi
162 -
163 - # respect doc dir
164 - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
165 -
166 - tc-export CC
167 -}
168 -
169 -src_compile() {
170 - "${EPYTHON}" setup.py \
171 - --verbose $(usex debug --debug "") \
172 - --libdir-name $(get_libdir) \
173 - linux-package || die "Failed to compile kitty."
174 -}
175 -
176 -src_test() {
177 - export KITTY_CONFIG_DIRECTORY=${T}
178 - "${EPYTHON}" test.py || die
179 -}
180 -
181 -src_install() {
182 - insinto /usr
183 - doins -r linux-package/*
184 - dobin linux-package/bin/kitty
185 - python_fix_shebang "${ED}"
186 -}
187 -
188 -pkg_postinst() {
189 - xdg_icon_cache_update
190 -}
191 -
192 -pkg_postrm() {
193 - xdg_icon_cache_update
194 -}
195
196 diff --git a/x11-terms/kitty/kitty-0.16.0-r1.ebuild b/x11-terms/kitty/kitty-0.16.0-r1.ebuild
197 deleted file mode 100644
198 index 1dde4e4a996..00000000000
199 --- a/x11-terms/kitty/kitty-0.16.0-r1.ebuild
200 +++ /dev/null
201 @@ -1,101 +0,0 @@
202 -# Copyright 1999-2020 Gentoo Authors
203 -# Distributed under the terms of the GNU General Public License v2
204 -
205 -EAPI=7
206 -
207 -PYTHON_COMPAT=( python3_{6,7,8} )
208 -
209 -inherit eutils python-single-r1 toolchain-funcs xdg
210 -
211 -if [[ ${PV} == "9999" ]] ; then
212 - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
213 - inherit git-r3
214 -else
215 - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
216 - KEYWORDS="~amd64 ~x86"
217 -fi
218 -
219 -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
220 -HOMEPAGE="https://github.com/kovidgoyal/kitty"
221 -
222 -LICENSE="GPL-3"
223 -SLOT="0"
224 -IUSE="debug wayland"
225 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
226 -
227 -RDEPEND="
228 - ${PYTHON_DEPS}
229 - media-libs/fontconfig
230 - media-libs/freetype:2
231 - >=media-libs/harfbuzz-1.5.0:=
232 - media-libs/libcanberra
233 - media-libs/libpng:0=
234 - x11-libs/libxcb[xkb]
235 - x11-libs/libXcursor
236 - x11-libs/libXi
237 - x11-libs/libXinerama
238 - x11-libs/libxkbcommon[X]
239 - x11-libs/libXrandr
240 - sys-apps/dbus
241 - sys-libs/zlib
242 - wayland? (
243 - dev-libs/wayland
244 - >=dev-libs/wayland-protocols-1.17
245 - )
246 -"
247 -
248 -DEPEND="${RDEPEND}
249 - media-libs/mesa[X(+)]
250 - sys-libs/ncurses
251 -"
252 -
253 -BDEPEND="virtual/pkgconfig"
254 -
255 -[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
256 -
257 -PATCHES=(
258 - "${FILESDIR}"/kitty-0.15.1-flags.patch
259 - "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
260 -)
261 -
262 -src_prepare() {
263 - default
264 -
265 - # disable wayland as required
266 - if ! use wayland; then
267 - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
268 - fi
269 -
270 - # respect doc dir
271 - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
272 -
273 - tc-export CC
274 -}
275 -
276 -src_compile() {
277 - "${EPYTHON}" setup.py \
278 - --verbose $(usex debug --debug "") \
279 - --libdir-name $(get_libdir) \
280 - linux-package || die "Failed to compile kitty."
281 -}
282 -
283 -src_test() {
284 - export KITTY_CONFIG_DIRECTORY=${T}
285 - "${EPYTHON}" test.py || die
286 -}
287 -
288 -src_install() {
289 - insinto /usr
290 - doins -r linux-package/*
291 - dobin linux-package/bin/kitty
292 - python_fix_shebang "${ED}"
293 -}
294 -
295 -pkg_postinst() {
296 - xdg_icon_cache_update
297 - optfeature "Displaying images in the terminal" virtual/imagemagick-tools
298 -}
299 -
300 -pkg_postrm() {
301 - xdg_icon_cache_update
302 -}
303
304 diff --git a/x11-terms/kitty/kitty-0.16.0-r2.ebuild b/x11-terms/kitty/kitty-0.16.0-r2.ebuild
305 deleted file mode 100644
306 index fac39de6d70..00000000000
307 --- a/x11-terms/kitty/kitty-0.16.0-r2.ebuild
308 +++ /dev/null
309 @@ -1,103 +0,0 @@
310 -# Copyright 1999-2020 Gentoo Authors
311 -# Distributed under the terms of the GNU General Public License v2
312 -
313 -EAPI=7
314 -
315 -PYTHON_COMPAT=( python3_{6,7,8} )
316 -
317 -inherit eutils python-single-r1 toolchain-funcs xdg
318 -
319 -if [[ ${PV} == "9999" ]] ; then
320 - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
321 - inherit git-r3
322 -else
323 - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
324 - KEYWORDS="~amd64 ~x86"
325 -fi
326 -
327 -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
328 -HOMEPAGE="https://github.com/kovidgoyal/kitty"
329 -
330 -LICENSE="GPL-3"
331 -SLOT="0"
332 -IUSE="debug wayland"
333 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
334 -
335 -RDEPEND="
336 - ${PYTHON_DEPS}
337 - media-libs/fontconfig
338 - media-libs/freetype:2
339 - >=media-libs/harfbuzz-1.5.0:=
340 - media-libs/libcanberra
341 - media-libs/libpng:0=
342 - x11-libs/libxcb[xkb]
343 - x11-libs/libXcursor
344 - x11-libs/libXi
345 - x11-libs/libXinerama
346 - x11-libs/libxkbcommon[X]
347 - x11-libs/libXrandr
348 - sys-apps/dbus
349 - sys-libs/zlib
350 - wayland? (
351 - dev-libs/wayland
352 - >=dev-libs/wayland-protocols-1.17
353 - )
354 -"
355 -
356 -DEPEND="${RDEPEND}
357 - media-libs/mesa[X(+)]
358 - sys-libs/ncurses
359 -"
360 -
361 -BDEPEND="virtual/pkgconfig"
362 -
363 -[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
364 -
365 -PATCHES=(
366 - "${FILESDIR}"/${PN}-0.15.1-flags.patch
367 - "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
368 - "${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
369 -)
370 -
371 -src_prepare() {
372 - default
373 -
374 - # disable wayland as required
375 - if ! use wayland; then
376 - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
377 - fi
378 -
379 - # respect doc dir
380 - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
381 -
382 - tc-export CC
383 -}
384 -
385 -src_compile() {
386 - "${EPYTHON}" setup.py \
387 - --verbose $(usex debug --debug "") \
388 - --libdir-name $(get_libdir) \
389 - linux-package || die "Failed to compile kitty."
390 -}
391 -
392 -src_test() {
393 - export KITTY_CONFIG_DIRECTORY=${T}
394 - "${EPYTHON}" test.py || die
395 -}
396 -
397 -src_install() {
398 - insinto /usr
399 - doins -r linux-package/*
400 - dobin linux-package/bin/kitty
401 - python_fix_shebang "${ED}"
402 -}
403 -
404 -pkg_postinst() {
405 - xdg_icon_cache_update
406 - optfeature "Displaying images in the terminal" virtual/imagemagick-tools
407 - optfeature "Terminfo file for the kitty terminal emulator" x11-terms/kitty-terminfo
408 -}
409 -
410 -pkg_postrm() {
411 - xdg_icon_cache_update
412 -}
413
414 diff --git a/x11-terms/kitty/kitty-0.16.0-r3.ebuild b/x11-terms/kitty/kitty-0.16.0-r3.ebuild
415 deleted file mode 100644
416 index 39c54b5dc7d..00000000000
417 --- a/x11-terms/kitty/kitty-0.16.0-r3.ebuild
418 +++ /dev/null
419 @@ -1,103 +0,0 @@
420 -# Copyright 1999-2020 Gentoo Authors
421 -# Distributed under the terms of the GNU General Public License v2
422 -
423 -EAPI=7
424 -
425 -PYTHON_COMPAT=( python3_{6,7,8} )
426 -
427 -inherit eutils python-single-r1 toolchain-funcs xdg
428 -
429 -if [[ ${PV} == "9999" ]] ; then
430 - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
431 - inherit git-r3
432 -else
433 - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
434 - KEYWORDS="~amd64 ~x86"
435 -fi
436 -
437 -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
438 -HOMEPAGE="https://github.com/kovidgoyal/kitty"
439 -
440 -LICENSE="GPL-3"
441 -SLOT="0"
442 -IUSE="debug wayland"
443 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
444 -
445 -RDEPEND="
446 - ${PYTHON_DEPS}
447 - media-libs/fontconfig
448 - media-libs/freetype:2
449 - >=media-libs/harfbuzz-1.5.0:=
450 - media-libs/libcanberra
451 - media-libs/libpng:0=
452 - sys-apps/dbus
453 - sys-libs/zlib
454 - x11-libs/libxcb[xkb]
455 - x11-libs/libXcursor
456 - x11-libs/libXi
457 - x11-libs/libXinerama
458 - x11-libs/libxkbcommon[X]
459 - x11-libs/libXrandr
460 - x11-terms/kitty-terminfo
461 - wayland? (
462 - dev-libs/wayland
463 - >=dev-libs/wayland-protocols-1.17
464 - )
465 -"
466 -
467 -DEPEND="${RDEPEND}
468 - media-libs/mesa[X(+)]
469 - sys-libs/ncurses
470 -"
471 -
472 -BDEPEND="virtual/pkgconfig"
473 -
474 -[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
475 -
476 -PATCHES=(
477 - "${FILESDIR}"/${PN}-0.15.1-flags.patch
478 - "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
479 - "${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
480 -)
481 -
482 -src_prepare() {
483 - default
484 -
485 - # disable wayland as required
486 - if ! use wayland; then
487 - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
488 - fi
489 -
490 - # respect doc dir
491 - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
492 -
493 - tc-export CC
494 -}
495 -
496 -src_compile() {
497 - "${EPYTHON}" setup.py \
498 - --verbose $(usex debug --debug "") \
499 - --libdir-name $(get_libdir) \
500 - linux-package || die "Failed to compile kitty."
501 -}
502 -
503 -src_test() {
504 - export KITTY_CONFIG_DIRECTORY=${T}
505 - "${EPYTHON}" test.py || die
506 -}
507 -
508 -src_install() {
509 - insinto /usr
510 - doins -r linux-package/*
511 - dobin linux-package/bin/kitty
512 - python_fix_shebang "${ED}"
513 -}
514 -
515 -pkg_postinst() {
516 - xdg_icon_cache_update
517 - optfeature "Displaying images in the terminal" virtual/imagemagick-tools
518 -}
519 -
520 -pkg_postrm() {
521 - xdg_icon_cache_update
522 -}