Gentoo Archives: gentoo-commits

From: gerion <gerion.entrup@×××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/gerislay:master commit in: x11-terms/kitty/files/, x11-terms/kitty/
Date: Mon, 10 Dec 2018 09:13:41
Message-Id: 1544433201.91c367feb107824b1c3bdc7412c6fe836e146597.gerion@gentoo
1 commit: 91c367feb107824b1c3bdc7412c6fe836e146597
2 Author: Gerion Entrup <gerion.entrup <AT> flump <DOT> de>
3 AuthorDate: Mon Dec 10 09:12:04 2018 +0000
4 Commit: gerion <gerion.entrup <AT> flump <DOT> de>
5 CommitDate: Mon Dec 10 09:13:21 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/user/gerislay.git/commit/?id=91c367fe
7
8 drop x11-terms/kitty: is in tree
9
10 Signed-off-by: Gerion Entrup <gerion.entrup <AT> flump.de>
11
12 x11-terms/kitty/Manifest | 5 --
13 x11-terms/kitty/files/kitty-0.11.0-flags.patch | 47 -----------
14 x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch | 16 ----
15 x11-terms/kitty/kitty-0.12.1.ebuild | 96 -----------------------
16 x11-terms/kitty/metadata.xml | 14 ----
17 5 files changed, 178 deletions(-)
18
19 diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
20 deleted file mode 100644
21 index 3ad4a93..0000000
22 --- a/x11-terms/kitty/Manifest
23 +++ /dev/null
24 @@ -1,5 +0,0 @@
25 -AUX kitty-0.11.0-flags.patch 1615 BLAKE2B 862ce366a8a2975b0fd40cf7579b9f5b7eb4de106005509c80d027719a8bef1a90d5c780a439c8c19bb126036e1bf00b46119a5db251c98b1f06b76a16f3f695 SHA512 472b057080800ef6d033f47255b25db0f4029ae0981a997ce057013c7dcce8829472e26810125612f89e0ea292623106eeabe1f4952aad3e9b7de06e97e427e5
26 -AUX kitty-0.11.0-svg-icon.patch 668 BLAKE2B 53fbe58492ebc9e78a9aab1f7ecd977c1daee9a097e34ebd0a98efefc2cf3625dc785e4c6e074f348cf24c9425734d3d521779d0c5fc5dd546f8322d35c3b11a SHA512 9b0aa40447d9ff137d45bdb3c2e4f5a8d9d68cdbc62c486a080107b02c6251d7075eaf212274c53f07977a370c8688cb3ace46828aac3b9467080d0334a05a21
27 -DIST kitty-0.12.1.tar.gz 3477416 BLAKE2B 4c8c99a16ec903498b17921093542d4389784c1d5bc8c8cbc2fb4c56aab7a0996f94c9442ca0ce403c2cb660c8a27e4f20165bb8dca6e9ce9eb6c9a06b03c1b9 SHA512 3efdc2ee9d41cddda7ff033fa69531ce48a163ef4b6efa7c5f10ca20511046c26313115383aec6bcef1b2a0fbbac19b2de9a43835130624aada48e12fe54b7df
28 -EBUILD kitty-0.12.1.ebuild 1893 BLAKE2B 93a866a598960c909955c7269e4f66b18ef59fe9ad4f12910ecc503bd9f494fbd2df454e22d1e34cda62d9c202f932fbb44eb0f981294da3db3e812cc3f2f368 SHA512 4cf663fda3be919848a90def27e1cba69252cbef5d05977c681a76c1c6c28630f39e3ca37dc7157ca0db91ffd6f2003c48a5192e872e144292c4069c29d20a88
29 -MISC metadata.xml 433 BLAKE2B a8f42e543f670090dab29943b39d87b2d6cd6ee17672c3255cdf0e5383efeca03b662d0e92b959bd49c09183d4da9836dc0fe32758f105aa406c3573d6f55ef8 SHA512 13d61d42ab56643456c51285f447a39fcba9224a36a310df4e7631c5d6751f146e4f7b2ebd04bf64c83d0f124eb15abb28c8ce37861597ab4f18297c4a52732c
30
31 diff --git a/x11-terms/kitty/files/kitty-0.11.0-flags.patch b/x11-terms/kitty/files/kitty-0.11.0-flags.patch
32 deleted file mode 100644
33 index 44abfb6..0000000
34 --- a/x11-terms/kitty/files/kitty-0.11.0-flags.patch
35 +++ /dev/null
36 @@ -1,47 +0,0 @@
37 ---- kitty-0.11.0/setup.py
38 -+++ kitty-0.11.0/setup.py
39 -@@ -177,7 +177,7 @@
40 - df = '-g3'
41 - if ccver >= (5, 0):
42 - df += ' -Og'
43 -- optimize = df if debug or sanitize else '-O3'
44 -+ optimize = ''
45 - sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
46 - cppflags = os.environ.get(
47 - 'OVERRIDE_CPPFLAGS', (
48 -@@ -190,7 +190,7 @@
49 - cflags = os.environ.get(
50 - 'OVERRIDE_CFLAGS', (
51 - '-Wextra -Wno-missing-field-initializers -Wall -std=c99'
52 -- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
53 -+ ' -pedantic {} {} -fwrapv {} {} {} -fvisibility=hidden'
54 - ).format(
55 - optimize,
56 - ' '.join(sanitize_args),
57 -@@ -204,7 +204,7 @@
58 - )
59 - ldflags = os.environ.get(
60 - 'OVERRIDE_LDFLAGS',
61 -- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
62 -+ '-Wall ' + ' '.join(sanitize_args)
63 - )
64 - ldflags = shlex.split(ldflags)
65 - ldflags.append('-shared')
66 -@@ -505,14 +505,14 @@
67 -
68 -
69 - def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False):
70 -- cflags = '-Wall -Werror -fpie'.split()
71 -+ cflags = '-Wall -fpie'.split()
72 - cppflags = []
73 - libs = []
74 - if args.profile:
75 - cppflags.append('-DWITH_PROFILER'), cflags.append('-g')
76 - libs.append('-lprofiler')
77 -- else:
78 -- cflags.append('-O3')
79 -+ #else:
80 -+ # cflags.append('-O3')
81 - if for_bundle or for_freeze:
82 - cppflags.append('-DFOR_BUNDLE')
83 - cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version()))
84
85 diff --git a/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch b/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
86 deleted file mode 100644
87 index 97e45c6..0000000
88 --- a/x11-terms/kitty/files/kitty-0.11.0-svg-icon.patch
89 +++ /dev/null
90 @@ -1,16 +0,0 @@
91 -Use SVG icon instead of PNG.
92 -
93 ---- kitty-0.11.0/setup.py
94 -+++ kitty-0.11.0/setup.py
95 -@@ -605,9 +605,9 @@
96 - if not is_macos: # {{{ linux desktop gunk
97 - copy_man_pages(ddir)
98 - copy_html_docs(ddir)
99 -- icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
100 -+ icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps')
101 - safe_makedirs(icdir)
102 -- shutil.copy2('logo/kitty.png', icdir)
103 -+ shutil.copy2('logo/kitty.svg', icdir)
104 - deskdir = os.path.join(ddir, 'share', 'applications')
105 - safe_makedirs(deskdir)
106 - with open(os.path.join(deskdir, 'kitty.desktop'), 'w') as f:
107
108 diff --git a/x11-terms/kitty/kitty-0.12.1.ebuild b/x11-terms/kitty/kitty-0.12.1.ebuild
109 deleted file mode 100644
110 index 8bef706..0000000
111 --- a/x11-terms/kitty/kitty-0.12.1.ebuild
112 +++ /dev/null
113 @@ -1,96 +0,0 @@
114 -# Copyright 1999-2018 Gentoo Foundation
115 -# Distributed under the terms of the GNU General Public License v2
116 -
117 -EAPI=6
118 -PYTHON_COMPAT=( python3_6 )
119 -
120 -inherit python-single-r1 toolchain-funcs gnome2-utils
121 -
122 -if [[ ${PV} == "9999" ]] ; then
123 - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
124 - inherit git-r3
125 -else
126 - SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
127 - KEYWORDS="~amd64 ~x86"
128 -fi
129 -
130 -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator"
131 -HOMEPAGE="https://github.com/kovidgoyal/kitty"
132 -
133 -LICENSE="GPL-3"
134 -SLOT="0"
135 -IUSE="debug imagemagick wayland"
136 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
137 -
138 -COMMON_DEPS="
139 - ${PYTHON_DEPS}
140 - >=media-libs/harfbuzz-1.5.0:=
141 - sys-libs/zlib
142 - media-libs/libpng:0=
143 - media-libs/freetype:2
144 - media-libs/fontconfig
145 - x11-libs/libXcursor
146 - x11-libs/libXrandr
147 - x11-libs/libXi
148 - x11-libs/libXinerama
149 - x11-libs/libxkbcommon[X]
150 - wayland? (
151 - dev-libs/wayland
152 - >=dev-libs/wayland-protocols-1.12
153 - )
154 -"
155 -RDEPEND="
156 - ${COMMON_DEPS}
157 - imagemagick? ( virtual/imagemagick-tools )
158 -"
159 -DEPEND="${RDEPEND}
160 - virtual/pkgconfig
161 - >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
162 -"
163 -
164 -PATCHES=(
165 - "${FILESDIR}"/${PN}-0.11.0-flags.patch
166 - "${FILESDIR}"/${PN}-0.11.0-svg-icon.patch
167 -)
168 -
169 -src_prepare() {
170 - default
171 -
172 - # disable wayland as required
173 - if ! use wayland; then
174 - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
175 - fi
176 -
177 - # respect doc dir
178 - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py
179 -
180 - tc-export CC
181 -}
182 -
183 -doecho() {
184 - echo "$@"
185 - "$@" || die
186 -}
187 -
188 -src_compile() {
189 - doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
190 -}
191 -
192 -src_test() {
193 - export KITTY_CONFIG_DIRECTORY=${T}
194 - "${EPYTHON}" test.py || die
195 -}
196 -
197 -src_install() {
198 - mkdir -p "${ED}"usr || die
199 - cp -r linux-package/* "${ED}usr" || die
200 - python_fix_shebang "${ED}"
201 -}
202 -
203 -pkg_postinst() {
204 - gnome2_icon_cache_update
205 -}
206 -
207 -pkg_postrm() {
208 - gnome2_icon_cache_update
209 -}
210
211 diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml
212 deleted file mode 100644
213 index 5954dd0..0000000
214 --- a/x11-terms/kitty/metadata.xml
215 +++ /dev/null
216 @@ -1,14 +0,0 @@
217 -<?xml version='1.0' encoding='UTF-8'?>
218 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
219 -<pkgmetadata>
220 - <maintainer type="person">
221 - <email>gerion.entrup@×××××.de</email>
222 - <name>Gerion Entrup</name>
223 - </maintainer>
224 - <use>
225 - <flag name="imagemagick">Support displaying images in the terminal with icat</flag>
226 - </use>
227 - <upstream>
228 - <remote-id type="github">kovidgoyal/kitty</remote-id>
229 - </upstream>
230 -</pkgmetadata>