From 0184387f6a748c74c5d29cddf20289dc94f05ddc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jan 2024 08:07:42 +0000 Subject: gentoo auto-resync : 19:01:2024 - 08:07:41 --- x11-terms/Manifest.gz | Bin 4551 -> 4551 bytes x11-terms/kitty-shell-integration/Manifest | 2 + .../kitty-shell-integration-0.32.0.ebuild | 37 +++++ x11-terms/kitty-terminfo/Manifest | 2 + .../kitty-terminfo/kitty-terminfo-0.32.0.ebuild | 23 +++ x11-terms/kitty/Manifest | 4 + x11-terms/kitty/kitty-0.32.0.ebuild | 176 +++++++++++++++++++++ 7 files changed, 244 insertions(+) create mode 100644 x11-terms/kitty-shell-integration/kitty-shell-integration-0.32.0.ebuild create mode 100644 x11-terms/kitty-terminfo/kitty-terminfo-0.32.0.ebuild create mode 100644 x11-terms/kitty/kitty-0.32.0.ebuild (limited to 'x11-terms') diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz index c9f7a34741f6..aec2d9bdb92e 100644 Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest index 6be69b327eb4..96334f2b343a 100644 --- a/x11-terms/kitty-shell-integration/Manifest +++ b/x11-terms/kitty-shell-integration/Manifest @@ -1,4 +1,6 @@ DIST kitty-0.31.0.tar.xz 7929620 BLAKE2B 74ccd0e14803ee3991d895c8ec0099567b6a087110eda03d5b35a45d1e684916d63846f1bd1184b2f5fe7a88431983602899cfd6392c28de78d020b8c98c89b2 SHA512 3868431003f9f1a3907415124c1d8282b077985a9d104615d48f9d309f6fbf1a11119546674508649aa35f2b6e66aa5638024e8127f92ae7b043da367c7b3363 +DIST kitty-0.32.0.tar.xz 8122660 BLAKE2B 8f2fccb8f233612331b860e0b25aa5a028c2e4d39b5795132351c4a2dff51478b8e42fd3a15bec5f616b4cdb47ad0cc7f636d1961a7f9fad8ede91475e82c29e SHA512 d64f36c20d484724b0215a2ffc9044b83ddaa476926377e6c79226d7d6bd5deffda9964291a99c0df174640fb2fa7df0464435d2cef19304eab7b1d135cc1847 EBUILD kitty-shell-integration-0.31.0.ebuild 1495 BLAKE2B bc45a20de5feb70d9b28c1dd8213e6534c63a92a773977624b99519d3241fd6a88e9ef077bbcbd7085d017f13cfbe4493dfd0465ee7534939e3d57075d04ac32 SHA512 bfd89b4cc1ed6a4140e0c69167d8a60dabef6f9138f8aae5938971ef91510684a6535a5c1d526e11a896a446a54dd6c987ac0bbeaee184ba3884ecfad21bced1 +EBUILD kitty-shell-integration-0.32.0.ebuild 1497 BLAKE2B 945f2dc0f841bc3570f6d9c5a01a70c60f826fe8c1cf4ba402bf5478ca956e4578dbf356a98198eef51d90e403a98478feb20cddd91cb94ccbe3c2b51d39b2a4 SHA512 fa959b05abd969e137baccf58b0465cd2ce0b150abf2d377d54b9b86615cf93c4dd0691688fb62f59c619b14577a015b28897da435ee088ec26a41c97b9f2bfd EBUILD kitty-shell-integration-9999.ebuild 1408 BLAKE2B f3310f49863e8dbd3c4e1ea27ac5c2ed7ae9f4840262a9fa155b24bc8545e99bcd7931f86bcec51a2c161a6e59e4bce24c26e7a028a96a6f7c9fbdcc0d02d791 SHA512 572a4946fb8511fc70c0fb461763c63dffe69c0985458e8234688796bba908bb7c84d24516556dd500bc9dd3c31d12a440c0a8dddc5300ea96ae2156c9a10a4e MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892 diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.32.0.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.32.0.ebuild new file mode 100644 index 000000000000..c3b309c79626 --- /dev/null +++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.32.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/" +SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz" +S="${WORKDIR}/kitty-${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +RESTRICT="test" # intended to be ran on the full kitty package + +src_compile() { :; } + +src_install() { + # install the whole directory in the upstream suggested location + # for consistency (i.e. less variation between distros if someone + # ssh into Gentoo), then set symlinks to autoload where possible + # (these exit immediately if KITTY_SHELL_INTEGRATION is unset) + insinto /usr/share/kitty + doins -r shell-integration + + dosym -r {/usr/share/kitty/shell-integration/bash,/etc/bash/bashrc.d}/kitty.bash + + dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish + dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish + + dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty + # zsh integration is handled automatically without needing to modify rc files, + # but may require user intervention depending on zsh invocation or if remote + + # this is used internally by the ssh kitten and is not useful there + rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die +} diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest index 371a39354987..ccf8bf4bc811 100644 --- a/x11-terms/kitty-terminfo/Manifest +++ b/x11-terms/kitty-terminfo/Manifest @@ -1,4 +1,6 @@ DIST kitty-0.31.0.tar.xz 7929620 BLAKE2B 74ccd0e14803ee3991d895c8ec0099567b6a087110eda03d5b35a45d1e684916d63846f1bd1184b2f5fe7a88431983602899cfd6392c28de78d020b8c98c89b2 SHA512 3868431003f9f1a3907415124c1d8282b077985a9d104615d48f9d309f6fbf1a11119546674508649aa35f2b6e66aa5638024e8127f92ae7b043da367c7b3363 +DIST kitty-0.32.0.tar.xz 8122660 BLAKE2B 8f2fccb8f233612331b860e0b25aa5a028c2e4d39b5795132351c4a2dff51478b8e42fd3a15bec5f616b4cdb47ad0cc7f636d1961a7f9fad8ede91475e82c29e SHA512 d64f36c20d484724b0215a2ffc9044b83ddaa476926377e6c79226d7d6bd5deffda9964291a99c0df174640fb2fa7df0464435d2cef19304eab7b1d135cc1847 EBUILD kitty-terminfo-0.31.0.ebuild 632 BLAKE2B 080ce8fe07e719f2ae6d70e5d06225e1d24b3eeeea624f7c185a2b0f22956bb77557699e68cf810a2ea4ce28dcc5fe45431a72545db8736656a9b05dbdcefd69 SHA512 7a6cf4fef1f58cfdbed17cf8998d0c2d3571958bd002b4acf933d443048a9b4969c94bab2e98230216a8f0820caa8a29accf03e6ca59a2a10e5f83fca24be5a1 +EBUILD kitty-terminfo-0.32.0.ebuild 634 BLAKE2B 99a8ac0e32d93d02675d0c674d6e8df2780631ae33b45d27ee0817cfc8b37739e07e5d06efb6ba5d16ad7858d75534e0cdc317dbac23ee3e4faf457bfdea615b SHA512 265602d0b5b326609e04ab8b060333289bfb80a11ca20a82971cac1d0cf5f0f7310914cd4730de49597585650a70a4288f9783b82e2e683d0d135a820f58d9a6 EBUILD kitty-terminfo-9999.ebuild 545 BLAKE2B 50bf783694580b016f3291640d6c4ab3e8ee335f78d13b75cb7ebe6628ddd2f244fab2e7c465a3964ed6b5e0ebbdb144c739a01ffa7239c8518503ea107a52f2 SHA512 267b8b4a526ee22159f7c1c0d9a089e183308e1e7f61d775834e4ed5d4f25be7aac8cc3db4afa3c3f1e933159f27abff25c31989dd6478c1727eec590bf0a3c8 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892 diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.32.0.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.32.0.ebuild new file mode 100644 index 000000000000..b5c7cbc40759 --- /dev/null +++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.32.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/" +SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz" +S="${WORKDIR}/kitty-${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +RESTRICT="test" # intended to be ran on the full kitty package + +BDEPEND="sys-libs/ncurses" + +src_compile() { :; } + +src_install() { + dodir /usr/share/terminfo + tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die +} diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 690f7c59e381..1c3b7905ed9f 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,6 +1,10 @@ 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 +DIST kitty-0.32.0-vendor.tar.xz 1404384 BLAKE2B 5b7d2af146429354e25d9b4f5c43a769535ad9a3b31b5a2944b8d8e7f045630734bd8e92c3f40c5dd7111d5014b9b356972896c0ba005392fbb740bc4bb30b20 SHA512 00b94033ea8b6ae3bbe509fdc2443aa7405a59ff9c04d86b96bd4dfe002367517b5b1fa99f27b8e2424917bb6b2eaa5959e8f470cd524de6388760870779af89 +DIST kitty-0.32.0.tar.xz 8122660 BLAKE2B 8f2fccb8f233612331b860e0b25aa5a028c2e4d39b5795132351c4a2dff51478b8e42fd3a15bec5f616b4cdb47ad0cc7f636d1961a7f9fad8ede91475e82c29e SHA512 d64f36c20d484724b0215a2ffc9044b83ddaa476926377e6c79226d7d6bd5deffda9964291a99c0df174640fb2fa7df0464435d2cef19304eab7b1d135cc1847 +DIST kitty-0.32.0.tar.xz.sig 566 BLAKE2B e925423321ec88fd0e7cc4f356c92b9ca9d992dce4c480c383368eff81f97bae4ac5a1d2cc2a7a2f3603f32448aa5d817c2319681dd1e2c24150834e137f55fa SHA512 fe7ce2dceb22ee477d6a9e3b308f4ef54287d1656f949511e80a6c9ee1d921bab5599675e354e6dd8b35719b0ff5373a9cca73b255da3c03aaed239e7355c897 EBUILD kitty-0.31.0.ebuild 4585 BLAKE2B cd67aab9831868bb7e5e7a4af299bb909dbec21622f47329862a19d41296fa9a5e044ff6b87909a9b66e847fbfd3754c2211cf41f06f934f079eef2da171f885 SHA512 66486fced135641d0cf8afe97f3608e35d269e86cfb952b2561cbcd6b884762014033551080a32ea4c1075ba08409c7972b9027b33c7484101cf174e9d6dfd75 +EBUILD kitty-0.32.0.ebuild 4587 BLAKE2B f489ac5ec83ac37e51422a684ff7349eb441438db29f7adf150338b2d2b208ee6fdfe38d0ceaaa1b748e250e65d4c8e4d83ada962c526ae73f807fa33ae458b6 SHA512 59e14a183da791325dfd1ce421a6e22fd21a6e0766145ea6510640dbc604f5a5d77f0c567483ad2cdf5778ac586ad7207b2529017ebf7d29384c53584496c03e EBUILD kitty-9999.ebuild 4587 BLAKE2B f489ac5ec83ac37e51422a684ff7349eb441438db29f7adf150338b2d2b208ee6fdfe38d0ceaaa1b748e250e65d4c8e4d83ada962c526ae73f807fa33ae458b6 SHA512 59e14a183da791325dfd1ce421a6e22fd21a6e0766145ea6510640dbc604f5a5d77f0c567483ad2cdf5778ac586ad7207b2529017ebf7d29384c53584496c03e MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003 diff --git a/x11-terms/kitty/kitty-0.32.0.ebuild b/x11-terms/kitty/kitty-0.32.0.ebuild new file mode 100644 index 000000000000..ad738d565f30 --- /dev/null +++ b/x11-terms/kitty/kitty-0.32.0.ebuild @@ -0,0 +1,176 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit edo go-env optfeature multiprocessing +inherit 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 + x11-libs/libXcursor + ) + wayland? ( dev-libs/wayland ) + !sci-mathematics/kissat +" +DEPEND=" + ${RDEPEND} + 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.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 + +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 PKGCONFIG_EXE=$(tc-getPKG_CONFIG) + + go-env_set_compile_environment + local -x GOFLAGS="-p=$(makeopts_jobs) -v -x" + use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie" + + 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