From debcc528ce99a30a360ea69a8a7e1a1d6aa0e1df Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Sat, 18 Jul 2026 08:43:47 -0400 Subject: [PATCH] x11-terms/kitty: drop 0.46.2-r1 Signed-off-by: Ionen Wolkens --- x11-terms/kitty/Manifest | 3 - .../kitty-0.46.2-vectorcall-assert.patch | 9 - x11-terms/kitty/kitty-0.46.2-r1.ebuild | 208 ------------------ 3 files changed, 220 deletions(-) delete mode 100644 x11-terms/kitty/files/kitty-0.46.2-vectorcall-assert.patch delete mode 100644 x11-terms/kitty/kitty-0.46.2-r1.ebuild diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index d9bed1c3cbde5..4689e5be392a6 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,6 +1,3 @@ -DIST kitty-0.46.2-vendor.tar.xz 2292516 BLAKE2B 0c3365f216fea242aec5c70acea88d36b8ec8763ad3abda6e6f045db9ed0f5f57f4b4ed07b5a4e460c64d0e9959f74c8480b02f5f00ff5747db79d8f4fa5bd85 SHA512 f5cbbbe5f8e23104ed83d0e0ef4efbf4fd3805407e7ba46a6b989a4dfaaf5c9e6768ebafadea8d295029bc08d627ab7999333a1fad8aad1fe9379a262aaebd3a -DIST kitty-0.46.2.tar.xz 10352720 BLAKE2B b5e162436e92b19d36cb72a5a625efeec21be0377c7b9ce9788980a380fabc115ee07dd9917f7b4d767bfc3416dd99b34f57cdbf183eaac60ae14a9731a82a58 SHA512 e14ef4d7e522ac67dc3e485082ec0d13c3662bde6ba086aa41ed333cc23abb5cc1df0eeb325a72d2206fb06601b6092fe4d8b613222e8de819de856e6fcfe445 -DIST kitty-0.46.2.tar.xz.sig 566 BLAKE2B a08212c37355578df9d6e3ca99a2a3126d11bc86a8f6a2ab16a90095d15386954744442c9f6e5f79450b2fc1b342da5171115290d6c41607278d3e1f81c97fc0 SHA512 bd85ea80eb7ae52e26922cf55bf35ede53f6ef1fbead69e8db53416ea1f7867b351263a2522cf885e878e9f337dd8beff38dce4eef83853b6eb1a7b8fd826ae4 DIST kitty-0.47.4-vendor.tar.xz 2417552 BLAKE2B 70e3a5ffb3ec978ef203bb13914f380ecf91a9a1396dad4b05ec1eb3acc05bb6b918c51ff02a9f1d2288f9ba4e0240e6698cbc0aef46016605d4fb59b8c4e4d1 SHA512 4fd142efc5151d7ad80d726796c70da902431efa8ea37db39baaff794239ef045138ecd87941be2ff98df0c27bc54df828681bfbc28007d03939eeb63a8894d4 DIST kitty-0.47.4.tar.xz 11886344 BLAKE2B ff39cd66a222e8a7c51ff4d5d127b291ac32192d940e587915763af2a24273f7ae2d2c471cf077d0bd0a9742353cfab16b3fe085dd4afcf94051201059daac49 SHA512 a6832836c305a2407a6f9622b5ded4cf3ad97fdb118a14a1986c68d58a14a4910ef7078ed2fc0fe21a18a3aba082b8a901d8dd57e46724fed8dbd70608d1f832 DIST kitty-0.47.4.tar.xz.sig 566 BLAKE2B 66795f9532e51e4a071e46c009b362d26a1583c8591a49979e2865cf2df8a35c1f53d3e65917cf54ff23185f4ba94926b3ad31732664480d0c703597642771d4 SHA512 4081b804842048ca79589ed51557f811774af2edf8e98ab2c82cfb45ab13ba2dffc10677e2988322c591055e97e5bf0be03fe8d325237dc110dc49451d32646c diff --git a/x11-terms/kitty/files/kitty-0.46.2-vectorcall-assert.patch b/x11-terms/kitty/files/kitty-0.46.2-vectorcall-assert.patch deleted file mode 100644 index 09182bd2cf0a2..0000000000000 --- a/x11-terms/kitty/files/kitty-0.46.2-vectorcall-assert.patch +++ /dev/null @@ -1,9 +0,0 @@ -https://bugs.gentoo.org/973466 -https://github.com/kovidgoyal/kitty/commit/eaec66fdc628786dd7d8ce5533ff4cdcf71c4f82 ---- a/kitty/colors.c -+++ b/kitty/colors.c -@@ -1181,3 +1181,3 @@ - .tp_basicsize = sizeof(Color), -- .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_VECTORCALL, -+ .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_doc = "Color", diff --git a/x11-terms/kitty/kitty-0.46.2-r1.ebuild b/x11-terms/kitty/kitty-0.46.2-r1.ebuild deleted file mode 100644 index 81a97b8f9d0a7..0000000000000 --- a/x11-terms/kitty/kitty-0.46.2-r1.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{11..14} ) -inherit edo go-env optfeature multiprocessing python-single-r1 -inherit shell-completion 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 - https://distfiles.gentoo.org/pub/dev/ionen@gentoo.org/${P}-vendor.tar.xz - verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig ) - " - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg - KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" -fi - -DESCRIPTION="Fast, feature-rich, GPU-based terminal" -HOMEPAGE="https://sw.kovidgoyal.net/kitty/" - -LICENSE="GPL-3 ZLIB" -LICENSE+=" Apache-2.0 BSD BSD-2 MIT" # go -SLOT="0" -IUSE="+X test wayland" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( X wayland ) - test? ( X wayland ) -" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${P}-vectorcall-assert.patch -) - -# dlopen: fontconfig,libglvnd -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/openssl:= - dev-libs/xxhash - media-fonts/symbols-nerd-font - media-libs/freetype - media-libs/harfbuzz:=[truetype] - media-libs/lcms:2 - media-libs/libglvnd[X?] - media-libs/libpng:= - sys-apps/dbus - virtual/zlib:= - x11-libs/cairo - x11-libs/libxkbcommon[X?] - x11-misc/xkeyboard-config - ~x11-terms/kitty-shell-integration-${PV} - ~x11-terms/kitty-terminfo-${PV} - X? ( - x11-libs/libX11 - x11-libs/libXcursor - ) - wayland? ( dev-libs/wayland ) - !sci-mathematics/kissat -" -DEPEND=" - ${RDEPEND} - amd64? ( >=dev-libs/simde-0.8.0-r1 ) - arm64? ( dev-libs/simde ) - x86? ( dev-libs/simde ) - X? ( - x11-base/xorg-proto - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - ) - wayland? ( dev-libs/wayland-protocols ) -" -# bug #919751 wrt go subslot -BDEPEND=" - ${PYTHON_DEPS} - >=dev-lang/go-1.26:= - sys-libs/ncurses - virtual/pkgconfig - test? ( $(python_gen_cond_dep 'dev-python/pillow[zlib,${PYTHON_USEDEP}]') ) - wayland? ( dev-util/wayland-scanner ) -" -[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" - -QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - cd "${S}" || die - edo go mod vendor - else - use verify-sig && - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} - default - fi -} - -src_prepare() { - default - - # sed unfortunately feels easier on maintenance than patches here - local sedargs=( - -e "/num_workers =/s/=.*/= $(makeopts_jobs)/" - -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' - -e "s/cflags.append(fortify_source)/pass/" # use toolchain's _f_s - -e "s/ld_flags.append('-[sw]')/pass/" - ) - - # kitty is often popular on wayland-only setups, try to allow this - use !X && sedargs+=( -e '/gl_libs =/s/=.*/= []/' ) #857918 - use !X || use !wayland && - sedargs+=( -e "s/'x11 wayland'/'$(usex X x11 wayland)'/" ) - - # skip docs for live version, missing dependencies - [[ ${PV} == 9999 ]] && sedargs+=( -e '/exists.*_build/,/docs(ddir)/d' ) - - sed -i setup.py "${sedargs[@]}" || die - - # skip flaky font search, file is replaced in src_install (bug #971276) - mkdir fonts || die - :> fonts/SymbolsNerdFontMono-Regular.ttf || die - - local skiptests=( - # broken with nspawn defaults, skip for convenience (bug #954176) - kitty_tests/crypto.py - # relies on 'who' command which doesn't detect users with pid-sandbox - kitty_tests/utmp.py - # may fail/hang depending on environment and shell initialization - kitty_tests/{shell_integration,ssh}.py - # relies on /proc/self/fd and gets confused when ran from here - tools/utils/tpmfile_test.go - ) - use !test || rm "${skiptests[@]}" || die -} - -src_compile() { - tc-export CC - local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG) - go-env_set_compile_environment - - local conf=( - --disable-link-time-optimization - --ignore-compiler-warnings - --libdir-name="$(get_libdir)" - --shell-integration="enabled no-sudo" - --update-check-interval=0 - --verbose - ) - - edo "${EPYTHON}" setup.py linux-package "${conf[@]}" - use test && edo "${EPYTHON}" setup.py build-launcher "${conf[@]}" - - rm -r linux-package/share/terminfo || die # provided by kitty-terminfo - - if [[ ${PV} == 9999 ]]; then - mkdir -p linux-package/share/doc/${PF} || die - else - mv linux-package/share/doc/{${PN},${PF}} || die - fi - - if ! tc-is-cross-compiler; then - # generate default config reference, command taken from docs/conf.rst - linux-package/bin/kitty +runpy \ - 'from kitty.config import *; print(commented_out_default_config())' \ - > linux-package/share/doc/${PF}/kitty.conf || die - - # generate shell completions, shell-integration/ has some "old" pre-gen - # ones that currently miss things (no bash, no kitten for zsh, etc...) - linux-package/bin/kitten __complete__ setup bash > "${T}"/kitty || die - linux-package/bin/kitten __complete__ setup fish > "${T}"/kitty.fish || die - linux-package/bin/kitten __complete__ setup zsh > "${T}"/_kitty || die - fi -} - -src_test() { - KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty -} - -src_install() { - edo mv linux-package "${ED}"/usr - - # kitty currently detects and copies the system's nerd font at build - # time, then uses that rather than the system's at runtime - dosym -r /usr/share/fonts/symbols-nerd-font/SymbolsNerdFontMono-Regular.ttf \ - /usr/"$(get_libdir)"/kitty/fonts/SymbolsNerdFontMono-Regular.ttf - - if ! tc-is-cross-compiler; then - dobashcomp "${T}"/kitty - bashcomp_alias kitty edit-in-kitty clone-in-kitty kitten - dofishcomp "${T}"/kitty.fish - dozshcomp "${T}"/_kitty - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "audio-based terminal bell support" media-libs/libcanberra - use X && optfeature "X11 startup notification support" x11-libs/startup-notification - optfeature "opening links from the terminal" x11-misc/xdg-utils -}