From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 09622158094 for ; Mon, 29 Aug 2022 05:10:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F086AE087E; Mon, 29 Aug 2022 05:10:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D86B6E0878 for ; Mon, 29 Aug 2022 05:10:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0131D340F37 for ; Mon, 29 Aug 2022 05:10:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C4485A2 for ; Mon, 29 Aug 2022 05:09:58 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1661749267.7e9e4f11b80dd818eda2ba760ecee7a2a13b4d9b.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty/Manifest x11-terms/kitty/kitty-0.26.0.ebuild X-VCS-Directories: x11-terms/kitty/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 7e9e4f11b80dd818eda2ba760ecee7a2a13b4d9b X-VCS-Branch: master Date: Mon, 29 Aug 2022 05:09:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8b8e2a06-f9d6-4c94-ad47-7e4af6aee94c X-Archives-Hash: df7697bfd27ed3533d38cd07a1bbbb14 commit: 7e9e4f11b80dd818eda2ba760ecee7a2a13b4d9b Author: Ionen Wolkens gentoo org> AuthorDate: Mon Aug 29 04:57:54 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Aug 29 05:01:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9e4f11 x11-terms/kitty: add 0.26.0 Still skipping py3.11 for now. Even if make it ignore deprecation warning failure, the prewarm tests still fail. Now using build-launcher for tests, PATH or symlink now confuses tests (test.py actually has a #!./kitty/launcher shebang rather than python), and build-launcher is only a single link command after linux-package. Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/Manifest | 2 + x11-terms/kitty/kitty-0.26.0.ebuild | 131 ++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 866620661c46..8fa744e12d5a 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,2 +1,4 @@ DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6 DIST kitty-0.25.2.tar.xz.sig 566 BLAKE2B 38435c7c418b421321ad29e1935f2280b1df215cb95b1025b3c85a0cc7e3279f1a0f79b05af9c698d4121a4f2e23a81774406a3ba77d0b5e669a36e1e58621b6 SHA512 cc16d4d22c043a30d9712cee211b4560873aa3e6ddc799881c791c72c6a4bfb7822a01683c62afcf67814889dfbc312d9f8b1f2200ab7f89a937addbf76c99b9 +DIST kitty-0.26.0.tar.xz 4719488 BLAKE2B 02e06ed8dd6bfdca789efe53211a27855582b2baa845558efd454a9ee8d2d6a71749f8baaad6ac6ba3f5b0878b2786302a26be190dec544488c3918de70ab581 SHA512 e8e041cb8cbe8560e35126d9f717111e0094ef9dd260ade07017f36d8e8e18fd4198cf186198b78089b8a05baa98a512d273b24b7f3f0d4f9f6d06107eb76c58 +DIST kitty-0.26.0.tar.xz.sig 566 BLAKE2B 9f05eb2083ea59f41284dcbf405be46f99fdc910167b522c4d281d8626e59d2e843f82f4526c17d7370e17bf72c3c372e490704702dc851fb3623fae7210db76 SHA512 c9057512767a6a93cd2ba1e621a10a1979aa4788a2fb16e5747df915647efe4a981cc1db772588a8f331d1988bb6f4918cc5e071bcd4dbbe86a7fc228d0856c3 diff --git a/x11-terms/kitty/kitty-0.26.0.ebuild b/x11-terms/kitty/kitty-0.26.0.ebuild new file mode 100644 index 000000000000..3ee9cbb30121 --- /dev/null +++ b/x11-terms/kitty/kitty-0.26.0.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit edo optfeature multiprocessing 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 test transfer wayland" +REQUIRED_USE=" + || ( X wayland ) + ${PYTHON_REQUIRED_USE}" +RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" + +# dlopen: fontconfig,libglvnd +RDEPEND=" + ${PYTHON_DEPS} + dev-libs/openssl:= + media-libs/fontconfig + 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 )" + +src_prepare() { + default + + # seds unfortunately feel easier on maintainenance than patches here + sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \ + -e "$(usev !X '/gl_libs =/s/=.*/= []/')" \ + -e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \ + -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \ + -i 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/{shell_integration,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 conf=( + --disable-link-time-optimization + --ignore-compiler-warnings + --libdir-name=$(get_libdir) + --shell-integration="enabled no-rc" + --update-check-interval=0 + --verbose + ) + + edo ${EPYTHON} setup.py linux-package "${conf[@]}" + use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}" + + [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die + rm -r linux-package/share/terminfo || die +} + +src_test() { + KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty +} + +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 +}