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/files/, x11-terms/kitty/
Date: Wed, 14 Jul 2021 06:25:33
Message-Id: 1626243919.50476b6bfc29ac4ccb5ac6ee3806b17ae5c2f5e7.juippis@gentoo
1 commit: 50476b6bfc29ac4ccb5ac6ee3806b17ae5c2f5e7
2 Author: end222 <pabloorduna98 <AT> gmail <DOT> com>
3 AuthorDate: Thu Jul 1 21:03:46 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 14 06:25:19 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50476b6b
7
8 x11-terms/kitty: bump to 0.21.2
9
10 Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
11 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
12
13 x11-terms/kitty/Manifest | 1 +
14 .../{kitty-9999-flags.patch => kitty-0.21.2-flags.patch} | 0
15 ...-terminfo.patch => kitty-0.21.2-remove-terminfo.patch} | 0
16 .../kitty/{kitty-9999.ebuild => kitty-0.21.2.ebuild} | 15 +++++++++------
17 x11-terms/kitty/kitty-9999.ebuild | 4 ++--
18 5 files changed, 12 insertions(+), 8 deletions(-)
19
20 diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
21 index 8a8bf738a61..e1a1774bb2a 100644
22 --- a/x11-terms/kitty/Manifest
23 +++ b/x11-terms/kitty/Manifest
24 @@ -1,3 +1,4 @@
25 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
26 DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd
27 DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58
28 +DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
29
30 diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-0.21.2-flags.patch
31 similarity index 100%
32 rename from x11-terms/kitty/files/kitty-9999-flags.patch
33 rename to x11-terms/kitty/files/kitty-0.21.2-flags.patch
34
35 diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch
36 similarity index 100%
37 rename from x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
38 rename to x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch
39
40 diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-0.21.2.ebuild
41 similarity index 83%
42 copy from x11-terms/kitty/kitty-9999.ebuild
43 copy to x11-terms/kitty/kitty-0.21.2.ebuild
44 index e67ade73823..d08fd64a821 100644
45 --- a/x11-terms/kitty/kitty-9999.ebuild
46 +++ b/x11-terms/kitty/kitty-0.21.2.ebuild
47 @@ -28,9 +28,9 @@ RDEPEND="
48 media-libs/fontconfig
49 media-libs/freetype:2
50 >=media-libs/harfbuzz-1.5.0:=
51 + media-libs/lcms
52 media-libs/libcanberra
53 media-libs/libpng:0=
54 - media-libs/lcms
55 sys-apps/dbus
56 sys-libs/zlib
57 x11-libs/libxcb[xkb]
58 @@ -47,19 +47,19 @@ RDEPEND="
59 "
60
61 DEPEND="${RDEPEND}
62 - media-libs/mesa[X(+)]
63 + media-libs/mesa[X]
64 sys-libs/ncurses
65 "
66
67 BDEPEND="virtual/pkgconfig"
68
69 -[[ ${PV} == *9999 ]] && BDEPEND+="
70 - $(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')"
71 +[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
72
73 PATCHES=(
74 - "${FILESDIR}"/${P}-flags.patch
75 - "${FILESDIR}"/${P}-remove-terminfo.patch
76 + "${FILESDIR}"/${PN}-0.21.2-flags.patch
77 "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
78 + "${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch
79 + "${FILESDIR}"/${PN}-0.20.1-tests.patch
80 )
81
82 src_prepare() {
83 @@ -68,6 +68,9 @@ src_prepare() {
84 # disable wayland as required
85 if ! use wayland; then
86 sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
87 + # also disable wayland tests
88 + sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die
89 + sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die
90 fi
91
92 # respect doc dir
93
94 diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
95 index e67ade73823..eee99356183 100644
96 --- a/x11-terms/kitty/kitty-9999.ebuild
97 +++ b/x11-terms/kitty/kitty-9999.ebuild
98 @@ -57,8 +57,8 @@ BDEPEND="virtual/pkgconfig"
99 $(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')"
100
101 PATCHES=(
102 - "${FILESDIR}"/${P}-flags.patch
103 - "${FILESDIR}"/${P}-remove-terminfo.patch
104 + "${FILESDIR}"/${PN}-0.21.2-flags.patch
105 + "${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch
106 "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
107 )