From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2CE75158020 for ; Tue, 15 Nov 2022 03:12:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28654E09C6; Tue, 15 Nov 2022 03:12:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0C8E2E09C6 for ; Tue, 15 Nov 2022 03:12:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8177340D8C for ; Tue, 15 Nov 2022 03:12:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 302A1599 for ; Tue, 15 Nov 2022 03:12:23 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1668481809.79abfd1e5cbbbfdb61a3a83045adee59cf2f3d14.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty/kitty-0.26.5-r1.ebuild x11-terms/kitty/kitty-0.26.5.ebuild x11-terms/kitty/kitty-9999.ebuild X-VCS-Directories: x11-terms/kitty/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 79abfd1e5cbbbfdb61a3a83045adee59cf2f3d14 X-VCS-Branch: master Date: Tue, 15 Nov 2022 03:12:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a010112c-ab2e-4a5c-8ebc-3ea0f3285e31 X-Archives-Hash: 23c2921a0592ff7a6467daf362e5275f commit: 79abfd1e5cbbbfdb61a3a83045adee59cf2f3d14 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Nov 15 02:22:44 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Nov 15 03:10:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79abfd1e 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 gentoo.org> .../kitty/{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(-) 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 8fb28a0e4d6d..b22f36ef47df 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 8fb28a0e4d6d..b22f36ef47df 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