From 0c100b7dd2b30e75b799d806df4ef899fd98e1ea Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Apr 2022 13:07:24 +0100 Subject: gentoo resync : 16.04.2022 --- x11-terms/kitty/Manifest | 7 +- x11-terms/kitty/kitty-0.23.1-r1.ebuild | 116 ----------------------------- x11-terms/kitty/kitty-0.25.0.ebuild | 132 +++++++++++++++++++++++++++++++++ x11-terms/kitty/kitty-9999.ebuild | 6 +- 4 files changed, 141 insertions(+), 120 deletions(-) delete mode 100644 x11-terms/kitty/kitty-0.23.1-r1.ebuild create mode 100644 x11-terms/kitty/kitty-0.25.0.ebuild (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 9c85154628ee..502885a1ecdd 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,8 +1,9 @@ AUX kitty-0.23.1-flags.patch 583 BLAKE2B c95c469d73c67ec90a4c33bb416832bbc7ce4766cf65a9c216cc5afd16f5c71cfccf80e08983d7f0aaea27f29b30ce0746c32065104e8fd1f930be9301751eb3 SHA512 2280cbe367181468bcc2aa8071fcbc6d44e77e65d8261f915b1775ad27f0fd8d48b1387300ba67a2ad0964cb655b66885221785c0ea0f4766c37b827f2987cd0 -DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94 DIST kitty-0.24.4.tar.xz 4613232 BLAKE2B 3bcb957a2d1b43cbf222207fbd12e5d098e0b9616370761d9f9629e8b39419405fb146d91281912f55b35611cf01d4e33232224cc3b710044d8423300c9b53c8 SHA512 28b1e2415b5c73ad8922d4ed17a63638c497a91c9aedba71c2f53e77fc89ed49951a2e873bba5bbe85c8eda22107d9ff4e4321010ac33a2d289c2fbd5d3a5b8f DIST kitty-0.24.4.tar.xz.sig 566 BLAKE2B 7a6513e6296b8c4a1781cef6bcea865b8187fcd8d2abd822627a401f943b1fb1d1432935fdbdc348c3062b07c91a85adcec280be64676782492f6245c72ed89b SHA512 34d24eebf08e19a96f715afb4a570746e1b7bcace6b6226dd596b2886b7bf3bc34b9842d0686c07a655b6b870da77cf25adf6d577dac811a01a70db8c477723a -EBUILD kitty-0.23.1-r1.ebuild 2720 BLAKE2B 04a7963c18f5d480e9abbda815231e146baf383cf59de0ed1a7bab6687ab1cc2357fc5219a9ad6cd9a83f24b8fd47dcfeafc648359f5826879703a97645b440f SHA512 36b5c852e1b966186c4b8b8aa57dc53f0477ed177f9eba30a3cc073364510656a1699156c702a4b1e4c2ebea437981401c4ffac3084dd569034b9125754da865 +DIST kitty-0.25.0.tar.xz 4640360 BLAKE2B 2f982ecb2d13c49a6971d4a863f2215f22ccae2cc50fd7b6c6b5c2facf781ac23ec627edcbec8ebaa538c5d67b0b62ad4cc05aedf90fd722d9d886c2f62d5b42 SHA512 fed8d66a9f7f2117f4b495305db0d56d8b85ef03bf7ef24a7dca31e63e16fc90e026aa8022237ad45678efb026f11fdd8aa377eb53917fd8ec885f2ccea721f8 +DIST kitty-0.25.0.tar.xz.sig 566 BLAKE2B 94d082c4520d1a25c9ea104df94876e342cc84fcc049ebc0b6061fe71206e98c5b5f8aa841ed636988b33f72f122b2d84f39e10d319c1d56c9cbf37d1b6fc064 SHA512 827546ea38af4babf431031184203bd11853469f87826a6b86f45b0b7d087e7523eee935908ca5a5e4a7a87e01d75114ed348ff39a9a0f6329d372fac15841af EBUILD kitty-0.24.4.ebuild 3237 BLAKE2B 58bca75ddc8182f6ecfab14bd23173357e4b2709f76a7208f5e7262568ec041da78e1d37dcd504c80b3e0c2a164ffff63486c03e28ea95f19d36488883902b95 SHA512 dbc6576673b3af2839ebecf915d708eb48ad98335a8506f1c56f8e89912c40d346d19afa3c45deff99deaa6fc763cb2ac036792f17bf710d8dde0a8315686c3c -EBUILD kitty-9999.ebuild 3239 BLAKE2B cb3ce1e0120cba89dca4180a62d30cc1fbb39efc2c3a349c49897071d6e34a2be369596b4de70a08f72ff92c0ae0951c169d55bdab53ca077b04e0f77c9d4afb SHA512 f8c6ea0dbef4508652c4def65e108312b432ebcabf9bcb2ae5b9bdd6e43125e23077a72b23a2ab3d14b00a20dda3e2a0fc1ecd19b45eb722e4f68e4c118e1636 +EBUILD kitty-0.25.0.ebuild 3420 BLAKE2B 60f7d4366201c91c2224cb188dab60955b9b7fdacbdd98c8ccaf31343f74ee2904b9a8ed048c65169f1579c40b918f115d032cefcab7d8f7c309ea7719c9fa1b SHA512 770098db045569ffe16e827f0a3d05feacbbffb36549a855aeb79e48dae3cd06f588df05f8f502a58fb671e649486a52232a1a61b71009c90b78ae20025cc9bc +EBUILD kitty-9999.ebuild 3420 BLAKE2B 60f7d4366201c91c2224cb188dab60955b9b7fdacbdd98c8ccaf31343f74ee2904b9a8ed048c65169f1579c40b918f115d032cefcab7d8f7c309ea7719c9fa1b SHA512 770098db045569ffe16e827f0a3d05feacbbffb36549a855aeb79e48dae3cd06f588df05f8f502a58fb671e649486a52232a1a61b71009c90b78ae20025cc9bc MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77 diff --git a/x11-terms/kitty/kitty-0.23.1-r1.ebuild b/x11-terms/kitty/kitty-0.23.1-r1.ebuild deleted file mode 100644 index 67420a5f1402..000000000000 --- a/x11-terms/kitty/kitty-0.23.1-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit optfeature python-single-r1 toolchain-funcs xdg - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" -else - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~x86" -fi - -DESCRIPTION="Fast, feature-rich, GPU-based terminal" -HOMEPAGE="https://sw.kovidgoyal.net/kitty/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+X debug test wayland" -REQUIRED_USE=" - || ( X wayland ) - ${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libglvnd[X?] - media-libs/libpng:= - sys-apps/dbus - sys-libs/zlib:= - x11-libs/libxkbcommon[X?] - x11-misc/xkeyboard-config - ~x11-terms/kitty-terminfo-${PV} - >x11-terms/kitty-terminfo-0.23.1-r0 - X? ( x11-libs/libX11 ) - wayland? ( dev-libs/wayland )" -DEPEND=" - ${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - ) - wayland? ( dev-libs/wayland-protocols )" -BDEPEND=" - ${PYTHON_DEPS} - sys-libs/ncurses - virtual/pkgconfig - test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) - wayland? ( dev-util/wayland-scanner )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.23.1-flags.patch -) - -src_prepare() { - default - - sed "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" -i setup.py || die - sed "s/else linux_backends/else [$(usev X "'x11',")$(usev wayland "'wayland'")]/" \ - -i kitty_tests/check_build.py || die - use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.py || die - - # skip docs for live version - [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die -} - -src_compile() { - tc-export CC - export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) - - local setup=( - ${EPYTHON} setup.py - --disable-link-time-optimization - --ignore-compiler-warnings - --libdir-name=$(get_libdir) - --update-check-interval=0 - --verbose - $(usev debug --debug) - linux-package - ) - - echo "${setup[*]}" - "${setup[@]}" || die "setup.py failed to compile ${PN}" - - [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die - rm -r linux-package/share/terminfo || die -} - -src_test() { - PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ - ${EPYTHON} test.py || die -} - -src_install() { - insinto /usr - doins -r linux-package/. - - fperms +x /usr/bin/kitty -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick - optfeature "audio-based terminal bell support" media-libs/libcanberra -} diff --git a/x11-terms/kitty/kitty-0.25.0.ebuild b/x11-terms/kitty/kitty-0.25.0.ebuild new file mode 100644 index 000000000000..16dd62bce059 --- /dev/null +++ b/x11-terms/kitty/kitty-0.25.0.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit optfeature python-single-r1 toolchain-funcs xdg + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" +else + inherit verify-sig + SRC_URI=" + https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz + verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )" + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg" + KEYWORDS="~amd64 ~ppc64 ~x86" +fi + +DESCRIPTION="Fast, feature-rich, GPU-based terminal" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+X debug test transfer wayland" +REQUIRED_USE=" + || ( X wayland ) + ${PYTHON_REQUIRED_USE}" +RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + media-libs/fontconfig + media-libs/freetype:2 + media-libs/harfbuzz:= + media-libs/lcms:2 + media-libs/libglvnd[X?] + media-libs/libpng:= + sys-apps/dbus + sys-libs/zlib:= + x11-libs/libxkbcommon[X?] + x11-misc/xkeyboard-config + ~x11-terms/kitty-shell-integration-${PV} + ~x11-terms/kitty-terminfo-${PV} + X? ( x11-libs/libX11 ) + transfer? ( net-libs/librsync:= ) + wayland? ( dev-libs/wayland )" +DEPEND=" + ${RDEPEND} + X? ( + x11-base/xorg-proto + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + ) + wayland? ( dev-libs/wayland-protocols )" +BDEPEND=" + ${PYTHON_DEPS} + sys-libs/ncurses + virtual/pkgconfig + test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) + wayland? ( dev-util/wayland-scanner )" +[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.23.1-flags.patch +) + +src_prepare() { + default + + sed -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" setup.py || die + + if use !transfer; then + sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die + rm -r kittens/transfer || die + fi + + # test relies on 'who' command which doesn't detect users with pid-sandbox + rm kitty_tests/utmp.py || die + + # test may fail/hang depending on environment and shell initialization scripts + rm kitty_tests/ssh.py || die + + # skip docs for live version + [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die +} + +src_compile() { + tc-export CC + export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) + + local setup=( + ${EPYTHON} setup.py linux-package + --disable-link-time-optimization + --ignore-compiler-warnings + --libdir-name=$(get_libdir) + --shell-integration="enabled no-rc" + --update-check-interval=0 + --verbose + $(usev debug --debug) + ) + + echo "${setup[*]}" + "${setup[@]}" || die "setup.py failed to compile ${PN}" + + [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die + rm -r linux-package/share/terminfo || die +} + +src_test() { + PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ + ${EPYTHON} test.py || die +} + +src_install() { + insinto /usr + doins -r linux-package/. + + fperms +x /usr/bin/kitty \ + /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty} +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick + optfeature "audio-based terminal bell support" media-libs/libcanberra + optfeature "opening links from the terminal" x11-misc/xdg-utils +} diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index 22dc6f82a916..16dd62bce059 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -81,6 +81,9 @@ src_prepare() { # test relies on 'who' command which doesn't detect users with pid-sandbox rm kitty_tests/utmp.py || die + # test may fail/hang depending on environment and shell initialization scripts + rm kitty_tests/ssh.py || die + # skip docs for live version [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die } @@ -116,7 +119,8 @@ src_install() { insinto /usr doins -r linux-package/. - fperms +x /usr/bin/kitty + fperms +x /usr/bin/kitty \ + /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty} } pkg_postinst() { -- cgit v1.2.3