From 05644e4ce4886d97a712fcdca7d4144a7ced4191 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 12 Dec 2023 23:32:21 +0000 Subject: gentoo auto-resync : 12:12:2023 - 23:32:21 --- x11-terms/kitty/Manifest | 5 - x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch | 21 --- x11-terms/kitty/kitty-0.30.1.ebuild | 174 ----------------------- 3 files changed, 200 deletions(-) delete mode 100644 x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch delete mode 100644 x11-terms/kitty/kitty-0.30.1.ebuild (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index a871edb9af17..5e3560df8308 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,11 +1,6 @@ -AUX kitty-0.30.1-no-sudo.patch 943 BLAKE2B 9e043ff036d98cb85f841fbeaff1ea586c285534f984dde72d9035a7b0ab00cf7ef4cc792b7346a6d76d4d89a36c3ce8f573c0521ba8a8c42010ec1cfcbdc5f1 SHA512 8d3d3aefe1999e4b80be7f5bd7432a6203f20b953f0afe7c602abd2a02e9a5e207edf22591229ee51da66073a5f2e091474944cca5ea72082a6f71185df85359 -DIST kitty-0.30.1-vendor.tar.xz 1425096 BLAKE2B dcf65787badf2439b5e7dc9ff1fb2073d0d8b124a7c39e017aee70a9c5c8f9b5f75b9c7942748cdd7327c75e506d667736eb13d91d8c42f46dfff12ffb9ae4d9 SHA512 4cabb39c82b4dfde96390bfd739d24af3abc6a48f2f6013fb51a1d95d31b04c545f8dbf0d3fc89bcb692c26955bdefe196e95d41eed7222eb815b3f05688a362 -DIST kitty-0.30.1.tar.xz 7799076 BLAKE2B 99ada03fa957819e716d3225fbee20af62135ff8861d3a6ce8aaf442b4526a69f34dae0ec126db48a4336fcbd2dfde5583e2ff8f16140e938fada6c0a8854a60 SHA512 e5fd68b8acf3eae8f53a2c27101d998eb0d8eff1571de1b03ab431bceafcab0efae821590684ec48b5ed6e3d86fb984d9e04784022ba50c0378d37a68598f9ed -DIST kitty-0.30.1.tar.xz.sig 566 BLAKE2B 18ad4df3ef3e161d8382f635f371b0100ff812d3eb2d5d1a2af1df2e04d1c15a344e4dd86d6a8faaf663a6a9d579521cdacdf6c5b1852d2120d94c43cd765826 SHA512 8c90733cb1683f6cb7c57fcf1efdbd0a99b16c4e1edca9b7e99820e5108694fcee521fecd7adaecc331a744b04d2041594adbf058d6218cd82099550f04b961e DIST kitty-0.31.0-vendor.tar.xz 1397172 BLAKE2B 0c3bf3cece86cec651ec6dd4a97923464636885e5c9ef44b0e094d34ea66ca1b8176cc7d2647eda0030f857faf5e87e506ec9af6465487ef9a61efd634492d86 SHA512 41699cbd112f429d78dbf5b7716b3b017d5decd3649a13913e273a5b1ab6177ab7d93c5d2e3cb9b927846f41ada91f8cf95e7148e52d6a3bf914e7b116b7b072 DIST kitty-0.31.0.tar.xz 7929620 BLAKE2B 74ccd0e14803ee3991d895c8ec0099567b6a087110eda03d5b35a45d1e684916d63846f1bd1184b2f5fe7a88431983602899cfd6392c28de78d020b8c98c89b2 SHA512 3868431003f9f1a3907415124c1d8282b077985a9d104615d48f9d309f6fbf1a11119546674508649aa35f2b6e66aa5638024e8127f92ae7b043da367c7b3363 DIST kitty-0.31.0.tar.xz.sig 566 BLAKE2B 5013b35dd7119b5bed3e4fefee70009f6fe6ba8c3215a35e82fdd3929063ef32c58c77f12c246374693801936ac362c3d432da95c91b632fdb848d98b3cf0bf9 SHA512 cc8583bbdd9e23a005cecb87f5d7d72ada5db1a1a8cdf59a67a103fc0c11df403df2673434d373216415903b6967a1638bf3f51ff7474368d618685a542d4280 -EBUILD kitty-0.30.1.ebuild 4559 BLAKE2B b7628ae051546aa9bc30d0d510648c7b6c6932bb31c0b243ae988919390fcbfaf7c294759255405a7a7fa4e80d68bffad967f95cec274a188b644267ab7bdc7f SHA512 dbd747a50c53fe4ac830789e905cacf8bec1c26ef880fb4378dd3b4151b349e703450ad2f949fc3f6d28f9bd87ccac06f419ad0848a8627a29f7a2a500911d94 EBUILD kitty-0.31.0.ebuild 4554 BLAKE2B 5058e8a11e9f65ab7dc97e046c9e9e0b59df3944ae0d732ad09c98cdbe557a8f56894501802a8be449363b1ee12cdf57b39d81b9392ca0a92b0e529751bbca2c SHA512 551396479eff6bc7bbd1e34b70aba6a086b95f0993bc5e4b47242c36227deb3c896038e040ac18764d6034ce3238af23f8d28d4e0b4c9efb7f02a1c9e6823e25 EBUILD kitty-9999.ebuild 4556 BLAKE2B 9b3e7c0bdb220a4665e92e8341bef15c793f819cbadcd1ab4a7e45cabb77691587338b132c89437bfe35aa07b405b0c57f8e9503d8eac6aa0a6b8cdfcc52af1e SHA512 109f67d6c16a0a58b013c633072b4d72158451163486f6b7d3600535b84b3f6adb02c78935ed3b1e0782e1f25b47b96f3604058ccd44c5dd53a16e8ed81c8a44 MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003 diff --git a/x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch b/x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch deleted file mode 100644 index d22bca5de0b5..000000000000 --- a/x11-terms/kitty/files/kitty-0.30.1-no-sudo.patch +++ /dev/null @@ -1,21 +0,0 @@ -Ensure no sudo wrapper given may easily result in an error with no permission -to set TERMINFO. Normally disabled by "no-sudo" but depending on load ordering -or user configs overwriting that without disabling it as well, it could give -poor surprises. - -Not needed on Gentoo given have a kitty-terminfo package installed in standard -paths without needing TERMINFO set. ---- a/shell-integration/bash/kitty.bash -+++ b/shell-integration/bash/kitty.bash -@@ -215,4 +214,0 @@ -- if [[ "${_ksi_prompt[sudo]}" == "y" ]]; then -- # Ensure terminfo is available in sudo -- [[ -n "$TERMINFO" ]] && builtin alias sudo="sudo TERMINFO=\"$TERMINFO\"" -- fi ---- a/shell-integration/zsh/kitty-integration -+++ b/shell-integration/zsh/kitty-integration -@@ -391,4 +390,0 @@ -- if (( ! opt[(Ie)no-sudo] )); then -- # Ensure terminfo is available in sudo -- [[ -n "$TERMINFO" ]] && builtin alias sudo="sudo TERMINFO=\"$TERMINFO\"" -- fi diff --git a/x11-terms/kitty/kitty-0.30.1.ebuild b/x11-terms/kitty/kitty-0.30.1.ebuild deleted file mode 100644 index aa40b2f334ac..000000000000 --- a/x11-terms/kitty/kitty-0.30.1.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -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 - https://dev.gentoo.org/~ionen/distfiles/${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 ~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 MPL-2.0 " # go -SLOT="0" -IUSE="+X test wayland" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( X wayland ) - test? ( X wayland ) -" -RESTRICT="!test? ( test )" - -# dlopen: fontconfig,libglvnd -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/openssl:= - dev-libs/xxhash - media-libs/fontconfig - media-libs/harfbuzz:=[truetype] - 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 ) - wayland? ( dev-libs/wayland ) - !sci-mathematics/kissat -" -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} - >=dev-lang/go-1.21 - 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 )" - -QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go - -PATCHES=( - "${FILESDIR}"/${PN}-0.30.1-no-sudo.patch -) - -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/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 - - local skiptests=( - # 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 GOFLAGS="-p=$(makeopts_jobs) -v -x" - use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie" - local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG) - - local conf=( - --disable-link-time-optimization - --ignore-compiler-warnings - --libdir-name=$(get_libdir) - --shell-integration="enabled no-rc 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 - - # generate default config as reference, command taken from docs/conf.rst - if ! tc-is-cross-compiler; then - linux-package/bin/kitty +runpy \ - 'from kitty.config import *; print(commented_out_default_config())' \ - > linux-package/share/doc/${PF}/kitty.conf || die - fi -} - -src_test() { - KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty -} - -src_install() { - edo mv linux-package "${ED}"/usr -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "audio-based terminal bell support" media-libs/libcanberra - optfeature "opening links from the terminal" x11-misc/xdg-utils -} -- cgit v1.2.3