From 79abfd1e5cbbbfdb61a3a83045adee59cf2f3d14 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Mon, 14 Nov 2022 21:22:44 -0500 Subject: [PATCH] x11-terms/kitty: remove IUSE=transfer (default) Was formerly requested given transferring files over serial link is rarely needed. But this started being more intertwined with other features (e.g. ssh kitten), and is causing unexpected behavior. If you want more dependencies to be optional, please request flags to toggle them upstream. Signed-off-by: Ionen Wolkens --- .../{kitty-0.26.5.ebuild => kitty-0.26.5-r1.ebuild} | 11 +++-------- x11-terms/kitty/kitty-9999.ebuild | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) rename x11-terms/kitty/{kitty-0.26.5.ebuild => kitty-0.26.5-r1.ebuild} (93%) diff --git a/x11-terms/kitty/kitty-0.26.5.ebuild b/x11-terms/kitty/kitty-0.26.5-r1.ebuild similarity index 93% rename from x11-terms/kitty/kitty-0.26.5.ebuild rename to x11-terms/kitty/kitty-0.26.5-r1.ebuild index 8fb28a0e4d6d6..b22f36ef47dfd 100644 --- a/x11-terms/kitty/kitty-0.26.5.ebuild +++ b/x11-terms/kitty/kitty-0.26.5-r1.ebuild @@ -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} @@ -76,11 +76,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 diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index 8fb28a0e4d6d6..b22f36ef47dfd 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -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} @@ -76,11 +76,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