From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- x11-terms/kitty/Manifest | 12 +-- x11-terms/kitty/files/kitty-0.15.0-flags.patch | 49 +++++++++++ x11-terms/kitty/files/kitty-9999-flags.patch | 26 +++--- x11-terms/kitty/files/kitty-9999-svg-icon.patch | 14 --- x11-terms/kitty/kitty-0.14.6-r1.ebuild | 108 ++++++++++++++++++++++++ x11-terms/kitty/kitty-0.14.6.ebuild | 108 ------------------------ x11-terms/kitty/kitty-0.15.0.ebuild | 101 ++++++++++++++++++++++ x11-terms/kitty/kitty-9999.ebuild | 59 ++++++------- x11-terms/kitty/metadata.xml | 8 +- 9 files changed, 309 insertions(+), 176 deletions(-) create mode 100644 x11-terms/kitty/files/kitty-0.15.0-flags.patch delete mode 100644 x11-terms/kitty/files/kitty-9999-svg-icon.patch create mode 100644 x11-terms/kitty/kitty-0.14.6-r1.ebuild delete mode 100644 x11-terms/kitty/kitty-0.14.6.ebuild create mode 100644 x11-terms/kitty/kitty-0.15.0.ebuild (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 395289b2a95a..9ca86ac36b79 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,8 +1,10 @@ AUX kitty-0.14.4-flags.patch 1662 BLAKE2B a936f445ad9d0ab7eb23ef9d50b94d52e49233e4890bbcde1de873c2d094687870b97261f3c0b01e059ce5debf67ae3dd1829835f2c4c06713996547f345dead SHA512 f8c2c2b9888d644e3f43b2893d9719b50fbd8627976ac81dcfd26e4409b2644c544fb610e39a84e8b4b7bf0851224f247716c5358c02e053ec571361b694d00e AUX kitty-0.14.4-svg-icon.patch 616 BLAKE2B 2e362e1ea134f98839b8e21e337faa530de7a0613965c762589c1d85220fe2f89a17b4691dad7248669e29d511a5e9b5ded446bccc9a6d1cbdce56d715c137cb SHA512 3a60dbafc8567535a9eed422bd1ee0382ee2afa79b815dff7e8f68f090a67374741962206368ca7723e15b241556dc2ede3935b40fa67f4e6c20300b1a4850fa -AUX kitty-9999-flags.patch 1907 BLAKE2B 1c859ed7ee8f789b9c00b80b45972d889085640a1c13c45026310fa1ac33727760c47e229f80ce849bfdc9e33dd96bac13cd77d1f6e4097091381ac436c75a40 SHA512 863e0fa216df0424b0b92f7ee0909e7d7914681312fda9bae5343769ee8c660cf71800682f6e9c5ad03ec78b943f049413bc874a0610e315d87ab953e5577c53 -AUX kitty-9999-svg-icon.patch 659 BLAKE2B ad6e085984784344cf4d92b5d66ea63e384290d7de3ac63af29ac6906b535ec8d7cf8549fb8b03f28dac775b5154f6e69185dc2c03b3b4760d348d11112810b4 SHA512 7d0a5c26cb16efe2de79a0055ba8d8be1c348e86712f6bae8280d0582e406c3e2f21e2e0ca40f21a57e8f19e1aed78e87cdc120e10338965d104190922a601f8 +AUX kitty-0.15.0-flags.patch 1697 BLAKE2B 0a92e8e8c6f9fe8e49f315d0cfb40f383d12bfb94c5d1aae7ccc10d5a74611a18d3fe0ff7be8cfbf07a440973dbc5ec63c50a7c74f744198c1ff5b8ade49421f SHA512 5207adcca12836fe2ec803a5809a02e5ce531e1ba1559d70e11156df367ad038c76180b8cfa6171a0448f98705bdb3ec62fb98138f9b41e802116066474eb6e5 +AUX kitty-9999-flags.patch 1722 BLAKE2B 89d46281572bac8a628385db845c78c83820dd9602e05d296467e32b92e16d8668ae2e798f3b061bbca4c370f58512f912dfeea87bfbe8754061076d67666b34 SHA512 afc135b7431d08b808683208f0b1c2e68f7e96d884d787cacb3f66d9eccdda7c0ad8d2ea072f3999b112dd2a103984fb372ce64084e55752bece0e9cdfb3cea3 DIST kitty-0.14.6.tar.xz 2970008 BLAKE2B e4f64051aebcc5d5aa1956351acb5564815e65c7c8435cac3c7960c5096fbeb5f0e98e3bdf92e750e8d70d6b0124b081bbb5d38a589c3dc5cf74642c3eaf83c9 SHA512 889bfce732f2a36d338c9c41b28e0770d98c15530b56a9f037cef610593b50453f1bde60e89560472035fc250dec0431a9776de1449f77e4c6988aca157eea12 -EBUILD kitty-0.14.6.ebuild 2108 BLAKE2B bab3fb480cee99c0a3a53ae697784d1203cbdeb85dce37aac9958eeee3b787eaf6b0bbd0475d2f6e3ae71017d00d600583f2fd063328a9125f08074d1199d819 SHA512 effa3b97cc8f7f4ce312e455d6096fdc0229f7950b96af27426e6c1700e411250c2516478ffc10a35f6375ee9733a9dbd0348ebac5ccbe1291b7e45dfd27ef8e -EBUILD kitty-9999.ebuild 2092 BLAKE2B aaf4bd9d7bd759ae28746a3d4a44e32f0a05b55d9174592ff663e1f45bd6bf62e361506f6e9bda5041c7f513e34a173c2153d2b3cf093164b8a494a644a01a66 SHA512 b8c9b792204a5e9ef8182a9364c965cdf90c6567158d0057eee6097801813fbdedeadc8fb1494f47d7f4a816dff2d880184e3c956028887319a25af5baf5a099 -MISC metadata.xml 428 BLAKE2B 961cd7fc3036c8f5a641cb97de57765c423f157430bf1fd68ce7febf24713ab1b15080e03f568d20f6360da467044ea4ed1d3ee7bfb132250951b4239df58980 SHA512 49ffa8dee6be29ab8adacbc0717dc574ad15f690fa1e0726b2a9de439f90867d3770e3628734d9a7457aa45896334d96f15a51e217ad248c766271aa62d85061 +DIST kitty-0.15.0.tar.xz 2978152 BLAKE2B 49f6e5051392c9ad0a91151ccc9f62dbc8ce0031680c66f4b08291c5b5cf43ccb1f096aecfcc69f7980997397d326d6b164f5f189fb89608ed9c8c22f313ebda SHA512 4e546fb9ad0cf34df8aa5ef3787224e8dd820fadb474faddc5f47b987bbc46fb62350a64bcacbdccd7e7cd287df22045ed742b89f613e402f033dc8bb73d8688 +EBUILD kitty-0.14.6-r1.ebuild 2104 BLAKE2B d0d8942e23268eb5c03e8ba3cbc1e4c134221675c3f572d6cb54242c47e5332fc41cdab4c40b82e31922b773a9ddcbc09e52b987cb503f2604ef6bd9a1fd0ab4 SHA512 1db004153abcb2c2691a2ee64ad6c200a0541a3ac03d79a9b4f47b91b7d4b6e19e114bb1fa50dc7faa588a30c2e283c9618bd6c4265687e4020392b180c2fa80 +EBUILD kitty-0.15.0.ebuild 1981 BLAKE2B 292538aadcd73130bac9c995c6a4e69ff6603de699016a5c55a2a7531264678b42d61314cf82648952dd0d18047ed084f25060342fb5818bd9400cdbdc744575 SHA512 5779182be177f68d2230e077ab9a6a91aa1a9ff19e67b81af454d4f802bfddaa0f67c57bb6919d2d177c669040005caea303fe3881d1a1824cf1e49a11aa783a +EBUILD kitty-9999.ebuild 1981 BLAKE2B 292538aadcd73130bac9c995c6a4e69ff6603de699016a5c55a2a7531264678b42d61314cf82648952dd0d18047ed084f25060342fb5818bd9400cdbdc744575 SHA512 5779182be177f68d2230e077ab9a6a91aa1a9ff19e67b81af454d4f802bfddaa0f67c57bb6919d2d177c669040005caea303fe3881d1a1824cf1e49a11aa783a +MISC metadata.xml 565 BLAKE2B 3b1a6c00d6f1f1281b1c861cc9d6b6e0b62a0cd82ae6e81f11917855138a85e6b3687857b7bd0f9c8709baf8414fa9ef3c2a49c79751d4bc98d949c6f39b9169 SHA512 10fd20fe44a6503fc49c2f88ab6affcc2d00376cb4edb3144fe0ab81bbb6e3930fc02f87372ca171de67f7aa86e341cdaf344eb3d872dc450b5df8d087a37b7c diff --git a/x11-terms/kitty/files/kitty-0.15.0-flags.patch b/x11-terms/kitty/files/kitty-0.15.0-flags.patch new file mode 100644 index 000000000000..921104e95f3f --- /dev/null +++ b/x11-terms/kitty/files/kitty-0.15.0-flags.patch @@ -0,0 +1,49 @@ +Respect user CFLAGS. + +--- kitty-0.15.0/setup.py ++++ kitty-0.15.0/setup.py +@@ -204,7 +204,7 @@ + if ccver >= (5, 0): + df += ' -Og' + float_conversion = '-Wfloat-conversion' +- optimize = df if debug or sanitize else '-O3' ++ optimize = '' + sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() + cppflags = os.environ.get( + 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), +@@ -217,7 +217,7 @@ + cflags = os.environ.get( + 'OVERRIDE_CFLAGS', ( + '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std={}11' +- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' ++ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden' + ).format( + float_conversion, std, + optimize, +@@ -232,7 +232,7 @@ + ) + ldflags = os.environ.get( + 'OVERRIDE_LDFLAGS', +- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') ++ '-Wall ' + ' '.join(sanitize_args) + ) + ldflags = shlex.split(ldflags) + ldflags.append('-shared') +@@ -611,7 +611,7 @@ + + + def build_launcher(args, launcher_dir='.', bundle_type='source'): +- cflags = '-Wall -Werror -fpie'.split() ++ cflags = '-Wall -fpie'.split() + cppflags = [] + libs = [] + if args.profile or args.sanitize: +@@ -623,8 +623,6 @@ + cflags.append('-g') + if args.profile: + libs.append('-lprofiler') +- else: +- cflags.append('-O3') + if bundle_type.endswith('-freeze'): + cppflags.append('-DFOR_BUNDLE') + cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version())) diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch index 0593cfd706dc..0b60ae190fcb 100644 --- a/x11-terms/kitty/files/kitty-9999-flags.patch +++ b/x11-terms/kitty/files/kitty-9999-flags.patch @@ -1,24 +1,26 @@ ---- kitty-9999/setup.py 2019-07-16 18:04:24.052780940 -0500 -+++ kitty-9999/setup.py 2019-07-16 18:05:54.564383192 -0500 -@@ -202,7 +202,7 @@ - df = '-g3' +Respect user CFLAGS. + +--- kitty-0.15.0/setup.py ++++ kitty-0.15.0/setup.py +@@ -204,7 +204,7 @@ if ccver >= (5, 0): df += ' -Og' + float_conversion = '-Wfloat-conversion' - optimize = df if debug or sanitize else '-O3' + optimize = '' sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() cppflags = os.environ.get( 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), -@@ -213,7 +213,7 @@ +@@ -217,7 +217,7 @@ cflags = os.environ.get( 'OVERRIDE_CFLAGS', ( - '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' + '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -D_POSIX_C_SOURCE=200809L -std=c11' - ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' + ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden' ).format( + float_conversion, std, optimize, - ' '.join(sanitize_args), -@@ -227,7 +227,7 @@ +@@ -232,7 +232,7 @@ ) ldflags = os.environ.get( 'OVERRIDE_LDFLAGS', @@ -27,7 +29,7 @@ ) ldflags = shlex.split(ldflags) ldflags.append('-shared') -@@ -606,20 +606,17 @@ +@@ -611,7 +611,7 @@ def build_launcher(args, launcher_dir='.', bundle_type='source'): @@ -36,11 +38,7 @@ cppflags = [] libs = [] if args.profile or args.sanitize: - if args.sanitize: -- cflags.append('-g3') - cflags.extend(get_sanitize_args(env.cc, env.ccver)) - libs += ['-lasan'] if env.cc == 'gcc' and not is_macos else [] - else: +@@ -623,8 +623,6 @@ cflags.append('-g') if args.profile: libs.append('-lprofiler') diff --git a/x11-terms/kitty/files/kitty-9999-svg-icon.patch b/x11-terms/kitty/files/kitty-9999-svg-icon.patch deleted file mode 100644 index ff9e00eb67c9..000000000000 --- a/x11-terms/kitty/files/kitty-9999-svg-icon.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- kitty-9999/setup.py.orig 2019-07-16 18:13:07.072868752 -0500 -+++ kitty-9999/setup.py 2019-07-16 18:13:40.082039929 -0500 -@@ -705,9 +705,9 @@ - run_tool(['make', 'docs']) - copy_man_pages(ddir) - copy_html_docs(ddir) -- icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps') -+ icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps') - safe_makedirs(icdir) -- shutil.copy2('logo/kitty.png', icdir) -+ shutil.copy2('logo/kitty.svg', icdir) - deskdir = os.path.join(ddir, 'share', 'applications') - safe_makedirs(deskdir) - with open(os.path.join(deskdir, 'kitty.desktop'), 'w') as f: diff --git a/x11-terms/kitty/kitty-0.14.6-r1.ebuild b/x11-terms/kitty/kitty-0.14.6-r1.ebuild new file mode 100644 index 000000000000..8fa3a58dc70c --- /dev/null +++ b/x11-terms/kitty/kitty-0.14.6-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7} ) + +inherit python-single-r1 toolchain-funcs xdg + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" + inherit git-r3 +else + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" +HOMEPAGE="https://github.com/kovidgoyal/kitty" + +LICENSE="GPL-3" +SLOT="0" +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/libcanberra + media-libs/libpng:0= + media-libs/freetype:2 + media-libs/fontconfig + x11-libs/libXcursor + x11-libs/libXrandr + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libxkbcommon[X] + x11-libs/libxcb[xkb] + wayland? ( + dev-libs/wayland + >=dev-libs/wayland-protocols-1.17 + ) +" +RDEPEND=" + ${COMMON_DEPS} + imagemagick? ( virtual/imagemagick-tools ) +" +DEPEND="${RDEPEND} + media-libs/mesa[X(+)] + sys-libs/ncurses +" +[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.14.4-flags.patch + "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch +) + +src_prepare() { + default + + # disable wayland as required + if ! use wayland; then + sed -i "/'x11 wayland'/s/ wayland//" setup.py || die + fi + + # respect doc dir + sed -i "/htmldir =/s/appname/'${PF}'/" setup.py + + tc-export CC +} + +doecho() { + echo "$@" + "$@" || die +} + +src_compile() { + doecho "${EPYTHON}" setup.py \ + --verbose $(usex debug --debug "") \ + --libdir-name $(get_libdir) \ + linux-package +} + +src_test() { + export KITTY_CONFIG_DIRECTORY=${T} + "${EPYTHON}" test.py || die +} + +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() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-terms/kitty/kitty-0.14.6.ebuild b/x11-terms/kitty/kitty-0.14.6.ebuild deleted file mode 100644 index 85c9ba13dfc8..000000000000 --- a/x11-terms/kitty/kitty-0.14.6.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) - -inherit python-single-r1 toolchain-funcs gnome2-utils - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" - inherit git-r3 -else - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" -HOMEPAGE="https://github.com/kovidgoyal/kitty" - -LICENSE="GPL-3" -SLOT="0" -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/libcanberra - media-libs/libpng:0= - media-libs/freetype:2 - media-libs/fontconfig - x11-libs/libXcursor - x11-libs/libXrandr - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libxkbcommon[X] - x11-libs/libxcb[xkb] - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.17 - ) -" -RDEPEND=" - ${COMMON_DEPS} - imagemagick? ( virtual/imagemagick-tools ) -" -DEPEND="${RDEPEND} - media-libs/mesa[X(+)] - sys-libs/ncurses - virtual/pkgconfig -" -[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}"/${PN}-0.14.4-flags.patch - "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch -) - -src_prepare() { - default - - # disable wayland as required - if ! use wayland; then - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die - fi - - # respect doc dir - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py - - tc-export CC -} - -doecho() { - echo "$@" - "$@" || die -} - -src_compile() { - doecho "${EPYTHON}" setup.py \ - --verbose $(usex debug --debug "") \ - --libdir-name $(get_libdir) \ - linux-package -} - -src_test() { - export KITTY_CONFIG_DIRECTORY=${T} - "${EPYTHON}" test.py || die -} - -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() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-terms/kitty/kitty-0.15.0.ebuild b/x11-terms/kitty/kitty-0.15.0.ebuild new file mode 100644 index 000000000000..6cf7eb8c9ee3 --- /dev/null +++ b/x11-terms/kitty/kitty-0.15.0.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit python-single-r1 toolchain-funcs xdg + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" + inherit git-r3 +else + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" +HOMEPAGE="https://github.com/kovidgoyal/kitty" + +LICENSE="GPL-3" +SLOT="0" +IUSE="debug imagemagick wayland" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + media-libs/fontconfig + media-libs/freetype:2 + >=media-libs/harfbuzz-1.5.0:= + media-libs/libcanberra + media-libs/libpng:0= + x11-libs/libxcb[xkb] + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libxkbcommon[X] + x11-libs/libXrandr + sys-apps/dbus + sys-libs/zlib + imagemagick? ( virtual/imagemagick-tools ) + wayland? ( + dev-libs/wayland + >=dev-libs/wayland-protocols-1.17 + ) +" + +DEPEND="${RDEPEND} + media-libs/mesa[X(+)] + sys-libs/ncurses +" + +BDEPEND="virtual/pkgconfig" + +[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7" + +PATCHES=( + "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch +) + +src_prepare() { + default + + # disable wayland as required + if ! use wayland; then + sed -i "/'x11 wayland'/s/ wayland//" setup.py || die + fi + + # respect doc dir + sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die + + tc-export CC +} + +src_compile() { + "${EPYTHON}" setup.py \ + --verbose $(usex debug --debug "") \ + --libdir-name $(get_libdir) \ + linux-package || die "Failed to compile kitty." +} + +src_test() { + export KITTY_CONFIG_DIRECTORY=${T} + "${EPYTHON}" test.py || die +} + +src_install() { + insinto /usr + doins -r linux-package/* + dobin linux-package/bin/kitty + python_fix_shebang "${ED}" +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index c51e3ffd52d4..6cf7eb8c9ee3 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + PYTHON_COMPAT=( python3_{6,7} ) -inherit python-single-r1 toolchain-funcs gnome2-utils +inherit python-single-r1 toolchain-funcs xdg if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" @@ -19,43 +20,43 @@ HOMEPAGE="https://github.com/kovidgoyal/kitty" LICENSE="GPL-3" SLOT="0" -IUSE="debug doc imagemagick wayland" +IUSE="debug imagemagick wayland" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -COMMON_DEPS=" +RDEPEND=" ${PYTHON_DEPS} + media-libs/fontconfig + media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= - sys-apps/dbus - sys-libs/zlib media-libs/libcanberra media-libs/libpng:0= - media-libs/freetype:2 - media-libs/fontconfig + x11-libs/libxcb[xkb] x11-libs/libXcursor - x11-libs/libXrandr x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] - x11-libs/libxcb[xkb] + x11-libs/libXrandr + sys-apps/dbus + sys-libs/zlib + imagemagick? ( virtual/imagemagick-tools ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 ) " -RDEPEND=" - ${COMMON_DEPS} - imagemagick? ( virtual/imagemagick-tools ) -" + DEPEND="${RDEPEND} media-libs/mesa[X(+)] sys-libs/ncurses - virtual/pkgconfig " -[[ ${PV} == *9999 ]] && DEPEND+=" >=dev-python/sphinx-1.7[${PYTHON_USEDEP}]" + +BDEPEND="virtual/pkgconfig" + +[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7" PATCHES=( "${FILESDIR}"/${P}-flags.patch - "${FILESDIR}"/${P}-svg-icon.patch + "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch ) src_prepare() { @@ -67,21 +68,16 @@ src_prepare() { fi # respect doc dir - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py + sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die tc-export CC } -doecho() { - echo "$@" - "$@" || die -} - src_compile() { - doecho "${EPYTHON}" setup.py \ + "${EPYTHON}" setup.py \ --verbose $(usex debug --debug "") \ --libdir-name $(get_libdir) \ - linux-package + linux-package || die "Failed to compile kitty." } src_test() { @@ -90,19 +86,16 @@ src_test() { } src_install() { - mkdir -p "${ED}"usr || die - cp -r linux-package/* "${ED}usr" || die + insinto /usr + doins -r linux-package/* + dobin linux-package/bin/kitty python_fix_shebang "${ED}" - - if ! use doc; then - rm -r "${ED}"/usr/share/doc || die - fi } pkg_postinst() { - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml index 9289a6187287..99074a0caa85 100644 --- a/x11-terms/kitty/metadata.xml +++ b/x11-terms/kitty/metadata.xml @@ -2,8 +2,12 @@ - radhermit@gentoo.org - Tim Harder + pabloorduna98@gmail.com + Pablo Orduna + + + proxy-maint@gentoo.org + Gentoo Proxy Maintainers Project Support displaying images in the terminal with icat -- cgit v1.2.3