From c3bc61051d7f12b4c682efa7a5460bbc8815649e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 Jan 2022 22:48:01 +0000 Subject: gentoo resync : 07.01.2022 --- x11-terms/kitty/Manifest | 9 ++- x11-terms/kitty/kitty-0.24.0-r1.ebuild | 126 ++++++++++++++++++++++++++++++++ x11-terms/kitty/kitty-0.24.1.ebuild | 127 +++++++++++++++++++++++++++++++++ x11-terms/kitty/kitty-9999.ebuild | 33 ++++++--- x11-terms/kitty/metadata.xml | 3 + 5 files changed, 285 insertions(+), 13 deletions(-) create mode 100644 x11-terms/kitty/kitty-0.24.0-r1.ebuild create mode 100644 x11-terms/kitty/kitty-0.24.1.ebuild (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index a9277dc5a76d..a45a46a9264f 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,5 +1,10 @@ AUX kitty-0.23.1-flags.patch 583 BLAKE2B c95c469d73c67ec90a4c33bb416832bbc7ce4766cf65a9c216cc5afd16f5c71cfccf80e08983d7f0aaea27f29b30ce0746c32065104e8fd1f930be9301751eb3 SHA512 2280cbe367181468bcc2aa8071fcbc6d44e77e65d8261f915b1775ad27f0fd8d48b1387300ba67a2ad0964cb655b66885221785c0ea0f4766c37b827f2987cd0 DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94 +DIST kitty-0.24.0.tar.xz 4503616 BLAKE2B 5a42b4815d25ff9e3a1f9fb6673e4e58ec3b59b5f81dc4098ef24408580d070e92a181e84167f5a343ffc3a9af33556823153d463eaa8e406f31c032ed8bab37 SHA512 b851ed56d16f9a39d47810bf27c2bc8cbb52d476376c4090045db90c1ad0bc7db6fd9e97edd6ce50a6d69e716671e1e909aab889ecac368857ad5c07f68a76af +DIST kitty-0.24.1.tar.xz 4512652 BLAKE2B ea1bf4911a744fb5aaa5fe3d9fc4821880e78c60a0a89ecba12c73623b9b537c2d9d4e494da125669f2fc36f273f49a00cc5825f56184c1b0c69f4c570b2226d SHA512 e590a3abd4ed38ce956ee1e1b9d3679150c83b80df5ed9daf9773d7a278f63dc8a3a563058906d322f9186bece7d479036a502864fd80f45593c4970c056f389 +DIST kitty-0.24.1.tar.xz.sig 566 BLAKE2B efff022baff8b16a4b576c1eb1aba83a7a931857850ae2815f54c06d7e9e7110c8bc27f89bec6ba679a4d1df133e1ec13e061cd880dbef02680a2d8021beadf8 SHA512 a2943d1fe20f6c36015db8b9cb8ddef9461fe6503110eb2dce6646afb141b3a3ceb7ab62ec2cbc027d2e2dc2a25c16a207dfc45f619b6464c0ce1995bae54144 EBUILD kitty-0.23.1-r1.ebuild 2725 BLAKE2B d298ad931465ca1d0c84754c7a4cbb48ab7a821389bec388ee761ebc0fa80214bba3df3f4b0802a92df68a6c9ee55a2d034f81f554c1712387dfb498d57f2354 SHA512 04c9b83b5cb893847fc2b8cc2025217ed068db1cb075cf8e10f450c782f6e1818ac5734cbbaf10103ae16918a767799b21935908dc015c78f6703f635638dc14 -EBUILD kitty-9999.ebuild 2710 BLAKE2B 5f90d2d2b433511460c5aeb31b93b2ec9e3e74b3b2105d4b5eb1d6cf06ade4bfc94604590a47408b6ee1284d27a2a221f15875a2cad8e57d32ad12390272d505 SHA512 c0bbea334adfc09327e65e4660f0ecc89f125da36a798a75903f38b67f7aef203c84982af96f15f2b9547d5070c7fa2f7a7a560f81d8f0ed50439346e1a2050a -MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003 +EBUILD kitty-0.24.0-r1.ebuild 3116 BLAKE2B ae8e06241817db16dca22f7b61a883414bff9c9f22c87fc98c01133bbb266fc38bd804f8235ccb3d2b47151d411c21fb0228f258cf05d616d5f0df8c5e6491f1 SHA512 4e8f4bea7a07d014d031048229a79c2151ac28aeffba6c6880b87c04ec014308dc50c0242921aa9c27328d9f15fad35c3f721700a9ea470177a7c44ca7b87f21 +EBUILD kitty-0.24.1.ebuild 3172 BLAKE2B b696a19fabc55b258fa78d5018537c8d17ca8a59e8dbdc09684d4006bcad20b4192bbfa2cd3945d5ffbcc9bfecad139a95a7cb02ce328a145a74f5e04b0331bb SHA512 5c42874d368037618eff6d400aeb2b2adbddc80057583bba7eb3af9845fdb043dc645801136f085d69a79f8cee03ecb5464f5bfec29a41e7edca1db8f3fdb1b6 +EBUILD kitty-9999.ebuild 3172 BLAKE2B b696a19fabc55b258fa78d5018537c8d17ca8a59e8dbdc09684d4006bcad20b4192bbfa2cd3945d5ffbcc9bfecad139a95a7cb02ce328a145a74f5e04b0331bb SHA512 5c42874d368037618eff6d400aeb2b2adbddc80057583bba7eb3af9845fdb043dc645801136f085d69a79f8cee03ecb5464f5bfec29a41e7edca1db8f3fdb1b6 +MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77 diff --git a/x11-terms/kitty/kitty-0.24.0-r1.ebuild b/x11-terms/kitty/kitty-0.24.0-r1.ebuild new file mode 100644 index 000000000000..f94b4bb5d66b --- /dev/null +++ b/x11-terms/kitty/kitty-0.24.0-r1.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit optfeature python-single-r1 toolchain-funcs xdg + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" +else + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Fast, feature-rich, GPU-based terminal" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+X debug test transfer wayland" +REQUIRED_USE=" + || ( X wayland ) + ${PYTHON_REQUIRED_USE}" +RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + media-libs/fontconfig + media-libs/freetype:2 + 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 )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.23.1-flags.patch +) + +src_prepare() { + default + + sed -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" setup.py || die + + if use !transfer; then + sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die + rm -r kittens/transfer || die + fi + + # --shell-integration="enabled no-rc" is the intended way to set + # no-rc by default, but setup.py's replacer currently fails + # https://github.com/kovidgoyal/kitty/issues/4434 + sed -i "/shell_integration:/s/'enabled'/&,'no-rc'/" kitty/options/types.py || die + + # test relies on 'who' command which doesn't detect users with pid-sandbox + rm kitty_tests/utmp.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 setup=( + ${EPYTHON} setup.py linux-package + --disable-link-time-optimization + --ignore-compiler-warnings + --libdir-name=$(get_libdir) + --update-check-interval=0 + --verbose + $(usev debug --debug) + ) + + echo "${setup[*]}" + "${setup[@]}" || die "setup.py failed to compile ${PN}" + + [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die + rm -r linux-package/share/terminfo || die +} + +src_test() { + PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ + ${EPYTHON} test.py || die +} + +src_install() { + insinto /usr + doins -r linux-package/. + + fperms +x /usr/bin/kitty +} + +pkg_postinst() { + xdg_icon_cache_update + + optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick + optfeature "audio-based terminal bell support" media-libs/libcanberra +} diff --git a/x11-terms/kitty/kitty-0.24.1.ebuild b/x11-terms/kitty/kitty-0.24.1.ebuild new file mode 100644 index 000000000000..ae77780523a3 --- /dev/null +++ b/x11-terms/kitty/kitty-0.24.1.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..10} ) +inherit optfeature 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 ~x86" +fi + +DESCRIPTION="Fast, feature-rich, GPU-based terminal" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+X debug test transfer wayland" +REQUIRED_USE=" + || ( X wayland ) + ${PYTHON_REQUIRED_USE}" +RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + media-libs/fontconfig + media-libs/freetype:2 + 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 )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.23.1-flags.patch +) + +src_prepare() { + default + + sed -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" 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 + + # 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 setup=( + ${EPYTHON} setup.py linux-package + --disable-link-time-optimization + --ignore-compiler-warnings + --libdir-name=$(get_libdir) + --shell-integration="enabled no-rc" + --update-check-interval=0 + --verbose + $(usev debug --debug) + ) + + echo "${setup[*]}" + "${setup[@]}" || die "setup.py failed to compile ${PN}" + + [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die + rm -r linux-package/share/terminfo || die +} + +src_test() { + PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ + ${EPYTHON} test.py || die +} + +src_install() { + insinto /usr + doins -r linux-package/. + + fperms +x /usr/bin/kitty +} + +pkg_postinst() { + xdg_icon_cache_update + + optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick + optfeature "audio-based terminal bell support" media-libs/libcanberra +} diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index f47b4d2c18f8..ae77780523a3 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,11 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" else - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" + 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 ~x86" fi @@ -19,11 +23,11 @@ HOMEPAGE="https://sw.kovidgoyal.net/kitty/" LICENSE="GPL-3" SLOT="0" -IUSE="+X debug test wayland" +IUSE="+X debug test transfer wayland" REQUIRED_USE=" || ( X wayland ) ${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" +RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" RDEPEND=" ${PYTHON_DEPS} @@ -33,13 +37,14 @@ 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?] 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} @@ -57,6 +62,7 @@ BDEPEND=" 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.23.1-flags.patch @@ -65,10 +71,15 @@ PATCHES=( src_prepare() { default - sed "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" -i setup.py || die - sed "s/else linux_backends/else [$(usev X "'x11',")$(usev wayland "'wayland'")]/" \ - -i kitty_tests/check_build.py || die - use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.py || die + sed -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" 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 # skip docs for live version [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die @@ -79,14 +90,14 @@ src_compile() { export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) local setup=( - ${EPYTHON} setup.py + ${EPYTHON} setup.py linux-package --disable-link-time-optimization --ignore-compiler-warnings --libdir-name=$(get_libdir) + --shell-integration="enabled no-rc" --update-check-interval=0 --verbose $(usev debug --debug) - linux-package ) echo "${setup[*]}" diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml index c4f584c5169f..6bb38d37be8c 100644 --- a/x11-terms/kitty/metadata.xml +++ b/x11-terms/kitty/metadata.xml @@ -13,6 +13,9 @@ proxy-maint@gentoo.org Proxy Maintainers + + Enable transfer kitten using net-libs/librsync + kovidgoyal/kitty https://sw.kovidgoyal.net/kitty/changelog -- cgit v1.2.3