commit: 22c5f55bb4d2653d2bfac7f2f20429e8e6d22430 Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Sun Sep 30 23:35:18 2018 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Sun Sep 30 23:45:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c5f55b
x11-terms/kitty: version bump to 0.12.3 Closes: https://bugs.gentoo.org/667264 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> x11-terms/kitty/Manifest | 1 + .../kitty/{kitty-9999.ebuild => kitty-0.12.3.ebuild} | 18 ++++++++++++++---- x11-terms/kitty/kitty-9999.ebuild | 18 ++++++++++++++---- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 198991d9b35..92fa7d894ac 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,3 +1,4 @@ DIST kitty-0.11.1.tar.gz 3924068 BLAKE2B a71535cfffe863ee06f699eba3a06c1665c851673bee0d1134fe992fe0335cc13d9a89cebf5814082a155166aaa0939b0e6296ad567564c608bf72eedce5cce3 SHA512 79a3ed4ffbc58e34e6c907646dc33168a8dcb58db859549549e2983186521dc69990e2d2e3eb120fcd31af03187d9a8233a60b75c205ac4e59bb7b575836cceb DIST kitty-0.11.2.tar.gz 3442111 BLAKE2B ebd5f11e57dd77a4336dfee51e2cf8c6c218d88957fe8988edcab9ecef73b7934b28e761733e9d8ca7842efb8a53fb30e785ed16fe73ac8c01b04a138d0e17a3 SHA512 28c4f7e8b87479cae47a00ea39ef31171ebeebf4888da4f9eaec250b4ed36ae6076b40e1a3b7ef88da2c9c860ba4d9af279a8b1d0d6e721f9fa3febee89bc151 DIST kitty-0.12.1.tar.gz 3477416 BLAKE2B 4c8c99a16ec903498b17921093542d4389784c1d5bc8c8cbc2fb4c56aab7a0996f94c9442ca0ce403c2cb660c8a27e4f20165bb8dca6e9ce9eb6c9a06b03c1b9 SHA512 3efdc2ee9d41cddda7ff033fa69531ce48a163ef4b6efa7c5f10ca20511046c26313115383aec6bcef1b2a0fbbac19b2de9a43835130624aada48e12fe54b7df +DIST kitty-0.12.3.tar.xz 2832760 BLAKE2B dcf338d6d66bd33c5d1bc164964f344d458fd0bf4869536681ba72c5e2920dc84b18187f0c343b68fe954396a351b887bff0034993966e9feade69593f35272d SHA512 6e4ac5f6a44ae1cdade71f0e3fee7cfbdde15f5770d960904b2d762abef9814f9bcef2b32d4a630de8a0c88d7a7945b7cbb7fef05d62625650c2eea9932c93db diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-0.12.3.ebuild similarity index 78% copy from x11-terms/kitty/kitty-9999.ebuild copy to x11-terms/kitty/kitty-0.12.3.ebuild index a97e7a7a8c5..b265ed95339 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-0.12.3.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"; inherit git-r3 else - SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"; KEYWORDS="~amd64 ~x86" fi @@ -19,12 +19,13 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty"; LICENSE="GPL-3" SLOT="0" -IUSE="debug imagemagick wayland" +IUSE="debug doc imagemagick wayland" REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPS=" ${PYTHON_DEPS} >=media-libs/harfbuzz-1.5.0:= + sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 @@ -34,6 +35,7 @@ COMMON_DEPS=" x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] + x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 @@ -44,9 +46,10 @@ RDEPEND=" imagemagick? ( virtual/imagemagick-tools ) " DEPEND="${RDEPEND} + sys-libs/ncurses virtual/pkgconfig - >=dev-python/sphinx-1.7[${PYTHON_USEDEP}] " +[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" PATCHES=( "${FILESDIR}"/${PN}-0.11.0-flags.patch @@ -73,7 +76,10 @@ doecho() { } src_compile() { - doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package + doecho "${EPYTHON}" setup.py \ + --verbose $(usex debug --debug "") \ + --libdir-name $(get_libdir) \ + linux-package } src_test() { @@ -85,6 +91,10 @@ src_install() { mkdir -p "${ED}"usr || die cp -r linux-package/* "${ED}usr" || die python_fix_shebang "${ED}" + + if ! use doc; then + rm -r "${ED}"/usr/share/doc || die + fi } pkg_postinst() { diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index a97e7a7a8c5..b265ed95339 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"; inherit git-r3 else - SRC_URI="https://github.com/kovidgoyal/kitty/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz"; KEYWORDS="~amd64 ~x86" fi @@ -19,12 +19,13 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty"; LICENSE="GPL-3" SLOT="0" -IUSE="debug imagemagick wayland" +IUSE="debug doc imagemagick wayland" REQUIRED_USE="${PYTHON_REQUIRED_USE}" COMMON_DEPS=" ${PYTHON_DEPS} >=media-libs/harfbuzz-1.5.0:= + sys-apps/dbus sys-libs/zlib media-libs/libpng:0= media-libs/freetype:2 @@ -34,6 +35,7 @@ COMMON_DEPS=" x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] + x11-libs/libxcb[xkb] wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 @@ -44,9 +46,10 @@ RDEPEND=" imagemagick? ( virtual/imagemagick-tools ) " DEPEND="${RDEPEND} + sys-libs/ncurses virtual/pkgconfig - >=dev-python/sphinx-1.7[${PYTHON_USEDEP}] " +[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" PATCHES=( "${FILESDIR}"/${PN}-0.11.0-flags.patch @@ -73,7 +76,10 @@ doecho() { } src_compile() { - doecho "${EPYTHON}" setup.py --verbose $(usex debug --debug "") --libdir-name $(get_libdir) linux-package + doecho "${EPYTHON}" setup.py \ + --verbose $(usex debug --debug "") \ + --libdir-name $(get_libdir) \ + linux-package } src_test() { @@ -85,6 +91,10 @@ src_install() { mkdir -p "${ED}"usr || die cp -r linux-package/* "${ED}usr" || die python_fix_shebang "${ED}" + + if ! use doc; then + rm -r "${ED}"/usr/share/doc || die + fi } pkg_postinst() {
