From 9f7759b3b1be5a3bc7794010a8ebf9334f017d2f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Nov 2022 06:52:13 +0000 Subject: gentoo auto-resync : 15:11:2022 - 06:52:13 --- x11-terms/Manifest.gz | Bin 4360 -> 4360 bytes x11-terms/kitty/Manifest | 4 +- x11-terms/kitty/kitty-0.26.5-r1.ebuild | 127 +++++++++++++++++++++++++++++++ x11-terms/kitty/kitty-0.26.5.ebuild | 132 --------------------------------- x11-terms/kitty/kitty-9999.ebuild | 22 +++--- 5 files changed, 142 insertions(+), 143 deletions(-) create mode 100644 x11-terms/kitty/kitty-0.26.5-r1.ebuild delete mode 100644 x11-terms/kitty/kitty-0.26.5.ebuild (limited to 'x11-terms') diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz index c4747c9db033..de1f5c0a78ae 100644 Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 41aaa80e6bf4..4f5bcf692c12 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -3,6 +3,6 @@ DIST kitty-0.26.4.tar.xz.sig 566 BLAKE2B 8ac544b077cc30f811be665226e413e3074d349 DIST kitty-0.26.5.tar.xz 4749988 BLAKE2B 488969b4d7c6aed489a540a8e3bee183345fcfb7e05ae5604f4af40f0720ed931cff82cf389e2fa4015eed74762c0630481a99eeb9302c22c89c4f3e247170d4 SHA512 086ae03d0e382afbe3001e357ef51388c7a8e81fa5b4bf9ce8b123a7fc8bfff3bd68d074e926f540a1f2b83062baa831e44d29c017cabfe8221bebe49b64e808 DIST kitty-0.26.5.tar.xz.sig 566 BLAKE2B 377202d46e66854e0cf1998506e0fafca54b33d85264e47c13aa4b98d272c786809375f1e277ec169291e06809f11b5b061ec1243a708711fa2350243ad1eca2 SHA512 0c691d8becff2b0f24e09b941d7315efaac831beacfed6f66b9186bde9c502f2ae86289f4b0d8fa6a34624dce7a1e958ba2d0502fd87003ba08b07fa07c6ae17 EBUILD kitty-0.26.4.ebuild 3610 BLAKE2B 9e8b094a98eba2ecaf05d4e668548a1d739ae70549e4577390e9ae292416999952a6ddf91b8a59f9e400a41a64f3315d67e7c1a44a52fd9b1dedbbce4faa185f SHA512 93905872870522c7412f3ca884c8185f48804cf5f6b0f4b2ec595c5c62dede63251e453137c804113fd3f3cf51d6c21c41b6b2a68068e950ebbd293c354cbf05 -EBUILD kitty-0.26.5.ebuild 3589 BLAKE2B 4a67996563a555fab2342fa51f11ee06b13fd6f5865fa33ae01c7fdd2115f9bd9aeb9f4a61597fce6c7691f14cad7fd1ab713e8156120873edcb50e6267fbbf4 SHA512 ed4dca67b723ee4322109e665871deec66746941a692ca3b9cc69504563186082a13f5a8ef4e56f8c7728aa8bd0b76ee543de1b808610a222dcf042953b25a7e -EBUILD kitty-9999.ebuild 3589 BLAKE2B 4a67996563a555fab2342fa51f11ee06b13fd6f5865fa33ae01c7fdd2115f9bd9aeb9f4a61597fce6c7691f14cad7fd1ab713e8156120873edcb50e6267fbbf4 SHA512 ed4dca67b723ee4322109e665871deec66746941a692ca3b9cc69504563186082a13f5a8ef4e56f8c7728aa8bd0b76ee543de1b808610a222dcf042953b25a7e +EBUILD kitty-0.26.5-r1.ebuild 3433 BLAKE2B 3df2a27027ff83eebc975426c46cd246f63ff96b90a19d92adc9c1b420a9d87218ae606dd8c781c199b56cde50780de0969b56572c7639ef81f318d7200f1019 SHA512 490fa843fc24188d5accb44dd36b1919efedf5b26988b5d96af700f699e593a183d5370b566923814f2514c67baaed337a17a6d4efb98c7ed855e58b2ab81195 +EBUILD kitty-9999.ebuild 3568 BLAKE2B db1c476e0ad8e5353cea127cc0d69bb9fdab102ef100661b92697f535ae1d6c93fa2d438008ff42127472e80b5e55f2df74d6e6fbc6424d0fc7baeff66e656f3 SHA512 ea3d7dc9c39e7a6f1b151726adf52f2acfa8a5464f795ebf6075bf43b3a769f4f3d726f102e8e693c8905303cbf6a5d8f5a7f8f5ac66372d257643208fee82a7 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77 diff --git a/x11-terms/kitty/kitty-0.26.5-r1.ebuild b/x11-terms/kitty/kitty-0.26.5-r1.ebuild new file mode 100644 index 000000000000..b22f36ef47df --- /dev/null +++ b/x11-terms/kitty/kitty-0.26.5-r1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..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 + 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 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Fast, feature-rich, GPU-based terminal" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/" + +LICENSE="GPL-3" +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 )" +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} + 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 )" + +src_prepare() { + default + + # seds unfortunately feel easier on maintainenance than patches here + sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \ + -e "$(usev !X '/gl_libs =/s/=.*/= []/')" \ + -e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \ + -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \ + -i setup.py || die + + # test relies on 'who' command which doesn't detect users with pid-sandbox + rm kitty_tests/utmp.py || die + + # test may fail/hang depending on environment and shell initialization scripts + rm kitty_tests/{shell_integration,ssh}.py || die + + # skip docs for live version + [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die +} + +src_compile() { + tc-export CC + export 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[@]}" + + [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die + rm -r linux-package/share/terminfo || die +} + +src_test() { + KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty +} + +src_install() { + insinto /usr + doins -r linux-package/. + + fperms +x /usr/bin/kitty \ + /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty} +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick + 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.26.5.ebuild b/x11-terms/kitty/kitty-0.26.5.ebuild deleted file mode 100644 index 8fb28a0e4d6d..000000000000 --- a/x11-terms/kitty/kitty-0.26.5.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..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 - 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 ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Fast, feature-rich, GPU-based terminal" -HOMEPAGE="https://sw.kovidgoyal.net/kitty/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+X test transfer wayland" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( X wayland ) - test? ( X transfer 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:= - 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 ) - transfer? ( net-libs/librsync:= ) - wayland? ( dev-libs/wayland )" -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} - 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 )" - -src_prepare() { - default - - # seds unfortunately feel easier on maintainenance than patches here - sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \ - -e "$(usev !X '/gl_libs =/s/=.*/= []/')" \ - -e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \ - -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \ - -i setup.py || die - - if use !transfer; then - sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die - rm -r kittens/transfer || die - fi - - # test relies on 'who' command which doesn't detect users with pid-sandbox - rm kitty_tests/utmp.py || die - - # test may fail/hang depending on environment and shell initialization scripts - rm kitty_tests/{shell_integration,ssh}.py || die - - # skip docs for live version - [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die -} - -src_compile() { - tc-export CC - export 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[@]}" - - [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die - rm -r linux-package/share/terminfo || die -} - -src_test() { - KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty -} - -src_install() { - insinto /usr - doins -r linux-package/. - - fperms +x /usr/bin/kitty \ - /usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty} -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick - 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 8fb28a0e4d6d..40981a3c7d82 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg +inherit edo go-module optfeature multiprocessing python-single-r1 toolchain-funcs xdg if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -23,11 +23,11 @@ HOMEPAGE="https://sw.kovidgoyal.net/kitty/" LICENSE="GPL-3" SLOT="0" -IUSE="+X test transfer wayland" +IUSE="+X test wayland" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( X wayland ) - test? ( X transfer wayland )" + test? ( X wayland )" RESTRICT="!test? ( test )" # dlopen: fontconfig,libglvnd @@ -39,6 +39,7 @@ RDEPEND=" media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= + net-libs/librsync:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] @@ -46,7 +47,6 @@ RDEPEND=" ~x11-terms/kitty-shell-integration-${PV} ~x11-terms/kitty-terminfo-${PV} X? ( x11-libs/libX11 ) - transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland )" DEPEND=" ${RDEPEND} @@ -66,6 +66,15 @@ BDEPEND=" wayland? ( dev-util/wayland-scanner )" [[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + go-module_live_vendor + else + go-module_src_unpack + fi +} + src_prepare() { default @@ -76,11 +85,6 @@ src_prepare() { -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \ -i setup.py || die - if use !transfer; then - sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die - rm -r kittens/transfer || die - fi - # test relies on 'who' command which doesn't detect users with pid-sandbox rm kitty_tests/utmp.py || die -- cgit v1.2.3