From 7e2b5bc2c2e2e045de6095d46c24ee857453adf2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 Aug 2023 09:34:39 +0100 Subject: gentoo auto-resync : 11:08:2023 - 09:34:39 --- x11-terms/kitty/Manifest | 11 +- .../kitty/files/kitty-0.29.0-musl-1.2.4.patch | 20 --- x11-terms/kitty/kitty-0.27.1.ebuild | 169 --------------------- x11-terms/kitty/kitty-0.29.1.ebuild | 165 -------------------- x11-terms/kitty/kitty-9999.ebuild | 2 +- 5 files changed, 2 insertions(+), 365 deletions(-) delete mode 100644 x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch delete mode 100644 x11-terms/kitty/kitty-0.27.1.ebuild delete mode 100644 x11-terms/kitty/kitty-0.29.1.ebuild (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index b27a36bf5498..962575aeffbb 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,15 +1,6 @@ -AUX kitty-0.29.0-musl-1.2.4.patch 810 BLAKE2B bf19b1641c5306bfa76ba94a4daf977abf0cc5dca57e2f815ffe025f2c47315e3ea41f37cb79aa43795bc51ae74cf2055b9f25106cc2b79c9faa84255ccf69d5 SHA512 0a4204b4a8668d2d4c1f7c98bb81fcd96c48cccd362472a18e2cf185f598140845f41736054b4afd593d0fbaff68e5bd16886008b3049777c115dffc9b9edf32 -DIST kitty-0.27.1-vendor.tar.xz 695432 BLAKE2B 86c9a316351432e0ff14bf139158816ddabe7e16d91768694a8560a500765b518ba42db26ad24349c05caece5771c5db4fdf7077f06631d1e81ea9ddb52e0391 SHA512 f96366b7896a34202110c98a9f2177482a01102fb822bd33c46eeb6ffe096fce927213950bab658a6649e1874e936c479ea7884d3518a0d054e2f598d6402bdf -DIST kitty-0.27.1.tar.xz 5045588 BLAKE2B 2381b3e9af26bb8a4c4358318289e9ef49ba1e38678ef192fd815ced962644671433a80f124579fb593257351cd8e0a61f845975d61d0d33f42b9d470ef130f0 SHA512 484d451b418defc7256319730d623224e3744d6200989d92839c40c951fdb213fe2ef472ddf968f695e499aa6c35d994ad76bb0eb28bca80ec8644b2ead40d56 -DIST kitty-0.27.1.tar.xz.sig 566 BLAKE2B 49cb96d99c48cfe74a50191687fac269cdc33146b5879acbb298c3c9bc7760eda1b2b08839f531d6fe4cf46287d671a1f6a6a24ffe6d6408939d113ba40545db SHA512 b4d24f24ea49c342756d0e458c22e856c4117f07f197ee5294b07ac0a8b5e9d992446b86effb5a7aa1683582cf9ee59bcf651ae4f3952df7783f0a4438042799 -DIST kitty-0.29.1-vendor.tar.xz 1376632 BLAKE2B 7ac778f1687f3fcf0803ae5b993306c72797b900203609bc1f96a3a624d1b8ea3d4f8a63b4930d64e4c720b3da932daf19d03928f7233402ac3fe63576abfeab SHA512 f4bc8a3e9d23824e428beb02a09e34565d89cda4d277b0599a08a2491bc4960d4fe5fd6a4d70e3360ea88c28b786699381404629b0bf27a6190b4ef0cae81a74 -DIST kitty-0.29.1.tar.xz 7809084 BLAKE2B eba6bbe0fc69184a2b73088fff2859d49d06f030128306e761c16142872ceb280b3f034e86190614e68dd0703e8e0506ad5a1d4c4dd9fa64f22c9274d45952e2 SHA512 ce09342ed3cbb0a518dde8d33606468ee5a2a164f18ff4c8addbd33b05459407d4a935b93acb0e98df8d618aa832c93f91e9ac060e7f87c1e4567484adc46c9c -DIST kitty-0.29.1.tar.xz.sig 566 BLAKE2B e7430db16603233faff10f92599962fd095ca8d5bbcf573e3fa600ec73cce7f23b9f12a299228ea53c1a04fd2f430ebc546b088f7e1b0504c44021f9fbe0ad0d SHA512 e661c1c0aba0bc0c4cde2458b27fe8aa591bd6f5510ba4fbbe881d3ea6e60c2f94bf3b2974f4f385b96d31668850eca274aadc98e96690b51e41ceddf3acad50 DIST kitty-0.29.2-vendor.tar.xz 1377044 BLAKE2B f342c7be9bec556b9b16b0e2032ac1ec80296f791a0c55d8b0831d8e148f05e2a7e1ae7c30090c70e7da7e6ca489e5b9b013f59d35af708eff073899f345b7ac SHA512 c0e2c55b0c7ca6ad435092c1267ed1164e042cc61ebf80b298477703607ac7611170cac1918d3703669e2363756e2d805d490018e66cc5b97efecbd0e516298e DIST kitty-0.29.2.tar.xz 7809388 BLAKE2B 6928d79a6cc0eaac4d92ce3babbeb0a42bf1dbc92b775386b521c8399352ba77ab9828f8cfd9f40c3e4f29ae98852b6f3cb9ee1f412474ba2ef655c18d2c294d SHA512 a34d8b5bc817dd9d27f1afa190856d916576f52458ede2253655b294358b6b89b1f103acb90d8d66a494b346420ddedc9fcf1a3399f561268ded82e7b1954b06 DIST kitty-0.29.2.tar.xz.sig 566 BLAKE2B 52fe246f3c4a74dfb62ed34b12b639858eb91aef02c872e472e1a1272268f6da2027b325dc29e260346c76bfbaa206486c6ce2f44f259d33f1ca3a0fd82150ff SHA512 ffcc63904a09148ddbf2eb761686942d1de3ce2c8c7c93b8a1c59ef704e0886bce972dd162e88de65912682233b21398970685cebbda785f7c4215f02ddbf9fd -EBUILD kitty-0.27.1.ebuild 4536 BLAKE2B 55cd67816883fcbfc98e3d0b729c0859079f4b9c81120d8887cadd31283a90435826db2a5f12ad8c189f90d1723c8715b03aedc796de5222100ddfb0d8bbffff SHA512 30e7eadc7a3a06186e9adc016e4a100c1d58b8ec03fb0d61e9bb1a225aea4c73854fa4292c24c324659a17ff024cb445e2655eff86284bfcad51b1b66a48d0d5 -EBUILD kitty-0.29.1.ebuild 4487 BLAKE2B 7f71031be81a968f03d39fd68fecf20bf52329047f5f03b521a200c3a7e34f045dac66e6727fcf8629f720c98dcff3e4b6cba802c4d4f2dc5d9b8e07f407637d SHA512 aa3b7198fec5aac72f982e85c5189e285bed0fc9ceb8ef2caf28af99e334c21e26c49df9b4b92a8afa9411b7e6d1414b1ee9b9f4477eff2b034ae3ad8d28dc25 EBUILD kitty-0.29.2.ebuild 4487 BLAKE2B 7f71031be81a968f03d39fd68fecf20bf52329047f5f03b521a200c3a7e34f045dac66e6727fcf8629f720c98dcff3e4b6cba802c4d4f2dc5d9b8e07f407637d SHA512 aa3b7198fec5aac72f982e85c5189e285bed0fc9ceb8ef2caf28af99e334c21e26c49df9b4b92a8afa9411b7e6d1414b1ee9b9f4477eff2b034ae3ad8d28dc25 -EBUILD kitty-9999.ebuild 4491 BLAKE2B 102574f5640f5f777f4e889016177bd455800e05b7f87a580e961dd8481e7f348797e078cb53bc0b8227ea97979a3ff1da6d1ff29aa8e70cd4936d26f65d6b45 SHA512 6f7ebd651fc0f6b7fc3bb54afc0b2ccef78314d9d56024b66b55407e855c2dbbaf14cd7e52f0d17c0b47b90b50594790dc0b9e87d45174bb4a843695abd40280 +EBUILD kitty-9999.ebuild 4491 BLAKE2B 60f0541e1d03faa2b221c52536a181630f410e33d830e32b478d5746199d3b8ca26c940551a04e98f5a6c240f630761dd91417a3ea4e7500385f690a8ee6af72 SHA512 670ae86c6c5d03c5331e71366ac9fb746aa4ced69418d37147855b05fede4ad53aa8a1ac0106391d09046d0abcd903ba8370fc21075717280e93125a3930847b MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003 diff --git a/x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch b/x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch deleted file mode 100644 index f02f425d0d66..000000000000 --- a/x11-terms/kitty/files/kitty-0.29.0-musl-1.2.4.patch +++ /dev/null @@ -1,20 +0,0 @@ -From https://github.com/kovidgoyal/kitty/commit/90223b5d146828c65179da49c75ce31b304fa1b8 Mon Sep 17 00:00:00 2001 -From: Kovid Goyal -Date: Tue, 11 Jul 2023 09:22:40 +0530 -Subject: [PATCH] Fix compilation against musl - -As usual in C stdlib world. Ill thought out break the world changes. -Sigh. musl no longer defines off64_t. - -Fixes #6441 ---- a/kitty/fast-file-copy.c -+++ b/kitty/fast-file-copy.c -@@ -83,7 +83,7 @@ copy_with_file_range(int infd, int outfd, off_t in_pos, size_t len, FastFileCopy - #ifdef HAS_COPY_FILE_RANGE - unsigned num_of_consecutive_zero_returns = 128; - while (len) { -- off64_t r = in_pos; -+ int64_t r = in_pos; - ssize_t n = copy_file_range(infd, &r, outfd, NULL, len, 0); - if (n < 0) { - if (errno == EAGAIN) continue; diff --git a/x11-terms/kitty/kitty-0.27.1.ebuild b/x11-terms/kitty/kitty-0.27.1.ebuild deleted file mode 100644 index f0f229436c3f..000000000000 --- a/x11-terms/kitty/kitty-0.27.1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -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="${BROOT}/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 MIT" # 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:= - media-libs/fontconfig - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libglvnd[X?] - media-libs/libpng:= - net-libs/librsync:= - 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.20 - 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.29.0-musl-1.2.4.patch" -) - -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 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" - --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 -} diff --git a/x11-terms/kitty/kitty-0.29.1.ebuild b/x11-terms/kitty/kitty-0.29.1.ebuild deleted file mode 100644 index c38a800fedd4..000000000000 --- a/x11-terms/kitty/kitty-0.29.1.ebuild +++ /dev/null @@ -1,165 +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="${BROOT}/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 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:= - media-libs/fontconfig - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libglvnd[X?] - media-libs/libpng:= - net-libs/librsync:= - 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.20 - 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 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" - --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 -} diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index 999ca947c819..12d45972cd6c 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -67,7 +67,7 @@ DEPEND=" " BDEPEND=" ${PYTHON_DEPS} - >=dev-lang/go-1.20 + >=dev-lang/go-1.21 sys-libs/ncurses virtual/pkgconfig test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) -- cgit v1.2.3