Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/
Date: Sun, 30 Sep 2018 23:47:17
Message-Id: 1538351157.22c5f55bb4d2653d2bfac7f2f20429e8e6d22430.radhermit@gentoo
1 commit: 22c5f55bb4d2653d2bfac7f2f20429e8e6d22430
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 30 23:35:18 2018 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 30 23:45:57 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c5f55b
7
8 x11-terms/kitty: version bump to 0.12.3
9
10 Closes: https://bugs.gentoo.org/667264
11 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
12
13 x11-terms/kitty/Manifest | 1 +
14 .../kitty/{kitty-9999.ebuild => kitty-0.12.3.ebuild} | 18 ++++++++++++++----
15 x11-terms/kitty/kitty-9999.ebuild | 18 ++++++++++++++----
16 3 files changed, 29 insertions(+), 8 deletions(-)
17
18 diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
19 index 198991d9b35..92fa7d894ac 100644
20 --- a/x11-terms/kitty/Manifest
21 +++ b/x11-terms/kitty/Manifest
22 @@ -1,3 +1,4 @@
23 DIST kitty-0.11.1.tar.gz 3924068 BLAKE2B a71535cfffe863ee06f699eba3a06c1665c851673bee0d1134fe992fe0335cc13d9a89cebf5814082a155166aaa0939b0e6296ad567564c608bf72eedce5cce3 SHA512 79a3ed4ffbc58e34e6c907646dc33168a8dcb58db859549549e2983186521dc69990e2d2e3eb120fcd31af03187d9a8233a60b75c205ac4e59bb7b575836cceb
24 DIST kitty-0.11.2.tar.gz 3442111 BLAKE2B ebd5f11e57dd77a4336dfee51e2cf8c6c218d88957fe8988edcab9ecef73b7934b28e761733e9d8ca7842efb8a53fb30e785ed16fe73ac8c01b04a138d0e17a3 SHA512 28c4f7e8b87479cae47a00ea39ef31171ebeebf4888da4f9eaec250b4ed36ae6076b40e1a3b7ef88da2c9c860ba4d9af279a8b1d0d6e721f9fa3febee89bc151
25 DIST kitty-0.12.1.tar.gz 3477416 BLAKE2B 4c8c99a16ec903498b17921093542d4389784c1d5bc8c8cbc2fb4c56aab7a0996f94c9442ca0ce403c2cb660c8a27e4f20165bb8dca6e9ce9eb6c9a06b03c1b9 SHA512 3efdc2ee9d41cddda7ff033fa69531ce48a163ef4b6efa7c5f10ca20511046c26313115383aec6bcef1b2a0fbbac19b2de9a43835130624aada48e12fe54b7df
26 +DIST kitty-0.12.3.tar.xz 2832760 BLAKE2B dcf338d6d66bd33c5d1bc164964f344d458fd0bf4869536681ba72c5e2920dc84b18187f0c343b68fe954396a351b887bff0034993966e9feade69593f35272d SHA512 6e4ac5f6a44ae1cdade71f0e3fee7cfbdde15f5770d960904b2d762abef9814f9bcef2b32d4a630de8a0c88d7a7945b7cbb7fef05d62625650c2eea9932c93db
27
28 diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-0.12.3.ebuild
29 similarity index 78%
30 copy from x11-terms/kitty/kitty-9999.ebuild
31 copy to x11-terms/kitty/kitty-0.12.3.ebuild
32 index a97e7a7a8c5..b265ed95339 100644
33 --- a/x11-terms/kitty/kitty-9999.ebuild
34 +++ b/x11-terms/kitty/kitty-0.12.3.ebuild
35 @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
36 EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
37 inherit git-r3
38 else
39 - SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
40 + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
41 KEYWORDS="~amd64 ~x86"
42 fi
43
44 @@ -19,12 +19,13 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty"
45
46 LICENSE="GPL-3"
47 SLOT="0"
48 -IUSE="debug imagemagick wayland"
49 +IUSE="debug doc imagemagick wayland"
50 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
51
52 COMMON_DEPS="
53 ${PYTHON_DEPS}
54 >=media-libs/harfbuzz-1.5.0:=
55 + sys-apps/dbus
56 sys-libs/zlib
57 media-libs/libpng:0=
58 media-libs/freetype:2
59 @@ -34,6 +35,7 @@ COMMON_DEPS="
60 x11-libs/libXi
61 x11-libs/libXinerama
62 x11-libs/libxkbcommon[X]
63 + x11-libs/libxcb[xkb]
64 wayland? (
65 dev-libs/wayland
66 >=dev-libs/wayland-protocols-1.12
67 @@ -44,9 +46,10 @@ RDEPEND="
68 imagemagick? ( virtual/imagemagick-tools )
69 "
70 DEPEND="${RDEPEND}
71 + sys-libs/ncurses
72 virtual/pkgconfig
73 - >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
74 "
75 +[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
76
77 PATCHES=(
78 "${FILESDIR}"/${PN}-0.11.0-flags.patch
79 @@ -73,7 +76,10 @@ doecho() {
80 }
81
82 src_compile() {
83 - doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
84 + doecho "${EPYTHON}" setup.py \
85 + --verbose $(usex debug --debug "") \
86 + --libdir-name $(get_libdir) \
87 + linux-package
88 }
89
90 src_test() {
91 @@ -85,6 +91,10 @@ src_install() {
92 mkdir -p "${ED}"usr || die
93 cp -r linux-package/* "${ED}usr" || die
94 python_fix_shebang "${ED}"
95 +
96 + if ! use doc; then
97 + rm -r "${ED}"/usr/share/doc || die
98 + fi
99 }
100
101 pkg_postinst() {
102
103 diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
104 index a97e7a7a8c5..b265ed95339 100644
105 --- a/x11-terms/kitty/kitty-9999.ebuild
106 +++ b/x11-terms/kitty/kitty-9999.ebuild
107 @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
108 EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
109 inherit git-r3
110 else
111 - SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
112 + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"
113 KEYWORDS="~amd64 ~x86"
114 fi
115
116 @@ -19,12 +19,13 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty"
117
118 LICENSE="GPL-3"
119 SLOT="0"
120 -IUSE="debug imagemagick wayland"
121 +IUSE="debug doc imagemagick wayland"
122 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
123
124 COMMON_DEPS="
125 ${PYTHON_DEPS}
126 >=media-libs/harfbuzz-1.5.0:=
127 + sys-apps/dbus
128 sys-libs/zlib
129 media-libs/libpng:0=
130 media-libs/freetype:2
131 @@ -34,6 +35,7 @@ COMMON_DEPS="
132 x11-libs/libXi
133 x11-libs/libXinerama
134 x11-libs/libxkbcommon[X]
135 + x11-libs/libxcb[xkb]
136 wayland? (
137 dev-libs/wayland
138 >=dev-libs/wayland-protocols-1.12
139 @@ -44,9 +46,10 @@ RDEPEND="
140 imagemagick? ( virtual/imagemagick-tools )
141 "
142 DEPEND="${RDEPEND}
143 + sys-libs/ncurses
144 virtual/pkgconfig
145 - >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]
146 "
147 +[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]"
148
149 PATCHES=(
150 "${FILESDIR}"/${PN}-0.11.0-flags.patch
151 @@ -73,7 +76,10 @@ doecho() {
152 }
153
154 src_compile() {
155 - doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package
156 + doecho "${EPYTHON}" setup.py \
157 + --verbose $(usex debug --debug "") \
158 + --libdir-name $(get_libdir) \
159 + linux-package
160 }
161
162 src_test() {
163 @@ -85,6 +91,10 @@ src_install() {
164 mkdir -p "${ED}"usr || die
165 cp -r linux-package/* "${ED}usr" || die
166 python_fix_shebang "${ED}"
167 +
168 + if ! use doc; then
169 + rm -r "${ED}"/usr/share/doc || die
170 + fi
171 }
172
173 pkg_postinst() {