From d71aca7673826d5f5fa93b43c7c8af3c1e023dc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 12 Mar 2024 18:46:38 +0000 Subject: gentoo auto-resync : 12:03:2024 - 18:46:38 --- x11-terms/kitty/Manifest | 10 +- x11-terms/kitty/kitty-0.32.1.ebuild | 186 ----------------------------------- x11-terms/kitty/kitty-0.32.2.ebuild | 2 +- x11-terms/kitty/kitty-0.33.0.ebuild | 189 ++++++++++++++++++++++++++++++++++++ 4 files changed, 195 insertions(+), 192 deletions(-) delete mode 100644 x11-terms/kitty/kitty-0.32.1.ebuild create mode 100644 x11-terms/kitty/kitty-0.33.0.ebuild (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 3d4690ef6fff..b4a49673725a 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,10 +1,10 @@ -DIST kitty-0.32.1-vendor.tar.xz 1404632 BLAKE2B 660bd55dbcc5816af36aa8d918170805d0b06fb17b0f7fc4048fb55cdf9bf131e8d28f3d14cf912ddebc598b6749d66b9bd89fc087dfd0564c28e170fb0b2156 SHA512 6bd272fe73fd3a0307c7a0d3cec0ff5831133977ed02948ace1f0a1cc69b59409aa450d75fd107a56f8e64ee1b59750b6350dc70afd029f412c8d7c4f53e991d -DIST kitty-0.32.1.tar.xz 8115412 BLAKE2B 493b250c3b456e895646175602997d902f457f8935be2b2cc21e41f6efbc963865eff6157d31427a65e9d0976e87965a646ef77cfdee28d96aeb710e6a905c4c SHA512 4be50093b2da7a6536548f8bf36ea86ab47238a1f346e10d4384a90d2d0d0e02f8d98dc6a463ffa7c7a93268202b5a4109f28e2b7ece1d9593f590691e5e1af8 -DIST kitty-0.32.1.tar.xz.sig 566 BLAKE2B 6eee10a20448a1ed35a8f2b29b143af7787eafe55f05786cecbe9d775c88f1da4e5ca969ee434a76817eb6f22eb57d8a8ffa95ed8c7d9a102cadb0cc9952f782 SHA512 3dd6e10f2db91c989b15c9007e6bab8db4aea77530f43c753fa91e98cc9084110f46ad1a71eb5105618ff3145b2f9ca2da0ace6c4edb2c1ea15aa7ad82ab328f DIST kitty-0.32.2-vendor.tar.xz 1406008 BLAKE2B 9fb14c55385abe2a50c45a392d14a2524d24ae3d054862f1f73c4813424ae8f7dacffccafd947fc59024430b930a8407482732c4962a6413cb9afd6e878e2cbc SHA512 0e7446b1f62564a2f4c2f40ef7ac05d0f0b9340ef3ba21b7c5f12795c062ab2552299c987319bafe14aa45524dce231d9f6b1539d6e9cc4fc43248fd4d50e915 DIST kitty-0.32.2.tar.xz 8103024 BLAKE2B 637449eb655973700493f725846263bfba193729725b6f14490fc44872e191c5e47b272bc3955b5ca47d400a497931be0749d338354ae8a5402fd867f7b941d3 SHA512 245d399366c0b2174bb80d557c08edf49e96a034a3cf33d2027180ef418581cc9bea2566d9ead9f96094bdc01655aeddd251b07b1bc444e7af59c864eb2bcd01 DIST kitty-0.32.2.tar.xz.sig 566 BLAKE2B 42ac9788a4dc63fdbae22667e301decb195f8f852f1f08c486993c0cc6284adc11860778fbef976026c0e3fa87b47a8cf69894657324b860b98bb0bedaf51f97 SHA512 e18368b917f3617be76a23e2ec278d418f19ec25b3a4ee84d08190fbeaea009dd16ffb3639c644da009429005344e4d1245f3c9c45d39aecd2cb3b44d4f0d132 -EBUILD kitty-0.32.1.ebuild 4843 BLAKE2B c20abe05bcac52c5d41e154dfa8275a32f5d44d48645bfce6ce42842d560e9bd8eb55acf9cfd4778dc609c222e807cadfe24d74323f89563c825177f356b46a8 SHA512 6151b5dee561154741f0de1d892964d472d126d973b99880dd8b7deb9a8808177c445d716c1efc341cacedd9e3263d30d3214953c66bd7214537eb6b4b18a385 -EBUILD kitty-0.32.2.ebuild 4844 BLAKE2B 364689a696a41b61bacd884eff9cea3ff7394ce53b36fa11f005e73b3ade1a376c5246801f341e3d23e6159bf3c5d8e88fed23e512263c0be3c231fc8dd7021e SHA512 7b48660f7ebc9fdd821ac2ed7916550a92777dea3b4a3c4bc3e091c2c634f7cd028b4db596668aeb29929142685b7ba8be58dba2e81dcaa80ea0dd2da0671f5b +DIST kitty-0.33.0-vendor.tar.xz 1418544 BLAKE2B 0cb3879637e4c1bf14332252aaec55de720e706fde36606bd4fd3e438e7431e86e95fffbf297d84f60ea028b72ed2f147bbab999022f785402832f3f615e137a SHA512 fa3c996addf4067971a63f70069c9ab41a6655fe107f88eaa97440e7a45a9a9fb609f30acb2f205d9967a48cbb33787969770c1e387b0c6a3bf2d0aea24d2624 +DIST kitty-0.33.0.tar.xz 8170952 BLAKE2B d98c1070d53b43dacc0aeefa6b0fc46a51528b196b09e875406f30eceddd65256090b6efb2b1b24f485b32db6d36483a9dc725934ad0327412e789e2f01a3574 SHA512 5dad29e7ff0f83dd14138fd32ee3d556214251a5617ef9bd0c8a8b4032e26cf8973752d0b4221e06afd745ae4a12967fc1194f3d053b0e8451cb7ca97360fa35 +DIST kitty-0.33.0.tar.xz.sig 566 BLAKE2B 218cb43b6dcbc8bdf172e9ff99034ec5f8ced0be2cab3c9cf382801b4cbab28b20c26ab6e0a4d4e981372ee6f1800a257babc73196182c7b7a2d1d66d7b73fc9 SHA512 7bdda8c6fbd3ce65fea7e40cb3063776ef0556755c5755b47d1b0b2673e7212aacb3469e3992d6c65c16ffd83e453f2ffa967c94abae5588123f21086575580b +EBUILD kitty-0.32.2.ebuild 4843 BLAKE2B c20abe05bcac52c5d41e154dfa8275a32f5d44d48645bfce6ce42842d560e9bd8eb55acf9cfd4778dc609c222e807cadfe24d74323f89563c825177f356b46a8 SHA512 6151b5dee561154741f0de1d892964d472d126d973b99880dd8b7deb9a8808177c445d716c1efc341cacedd9e3263d30d3214953c66bd7214537eb6b4b18a385 +EBUILD kitty-0.33.0.ebuild 4925 BLAKE2B 79b4a7a282c9f8671c50a496b75da59743480871e705ed70bf032391c7f7ab92b11c2368d11d17d7db329a0c639542795c0e39c274a8c773b11543be9da2b7d9 SHA512 890010a29e3d9dabde7d0002c4714b2ebb8d045761999186ec44181add6016cb535a2c824abac19784e88fdbeaefc1460525c0fd90d4e5354df66b0087ac4567 EBUILD kitty-9999.ebuild 4925 BLAKE2B 79b4a7a282c9f8671c50a496b75da59743480871e705ed70bf032391c7f7ab92b11c2368d11d17d7db329a0c639542795c0e39c274a8c773b11543be9da2b7d9 SHA512 890010a29e3d9dabde7d0002c4714b2ebb8d045761999186ec44181add6016cb535a2c824abac19784e88fdbeaefc1460525c0fd90d4e5354df66b0087ac4567 MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003 diff --git a/x11-terms/kitty/kitty-0.32.1.ebuild b/x11-terms/kitty/kitty-0.32.1.ebuild deleted file mode 100644 index e30b44b1757a..000000000000 --- a/x11-terms/kitty/kitty-0.32.1.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# 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 flag-o-matic 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" - - # workaround link errors with Go + gcc + -g3 (bug #924436), - # retry now and then to see if can be dropped - tc-is-gcc && - CGO_CFLAGS=$( - CFLAGS=${CGO_CFLAGS} - replace-flags -g3 -g - replace-flags -ggdb3 -ggdb - printf %s "${CFLAGS}" - ) - - 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 -} diff --git a/x11-terms/kitty/kitty-0.32.2.ebuild b/x11-terms/kitty/kitty-0.32.2.ebuild index de8a2affadb5..e30b44b1757a 100644 --- a/x11-terms/kitty/kitty-0.32.2.ebuild +++ b/x11-terms/kitty/kitty-0.32.2.ebuild @@ -18,7 +18,7 @@ else 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" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" fi DESCRIPTION="Fast, feature-rich, GPU-based terminal" diff --git a/x11-terms/kitty/kitty-0.33.0.ebuild b/x11-terms/kitty/kitty-0.33.0.ebuild new file mode 100644 index 000000000000..72d581ffd389 --- /dev/null +++ b/x11-terms/kitty/kitty-0.33.0.ebuild @@ -0,0 +1,189 @@ +# 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 flag-o-matic 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} + amd64? ( dev-libs/simde ) + 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.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" + + # workaround link errors with Go + gcc + -g3 (bug #924436), + # retry now and then to see if can be dropped + tc-is-gcc && + CGO_CFLAGS=$( + CFLAGS=${CGO_CFLAGS} + replace-flags -g3 -g + replace-flags -ggdb3 -ggdb + printf %s "${CFLAGS}" + ) + + 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