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 7D0D9158003 for ; Wed, 10 Nov 2021 10:59:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DD012BC06A; Wed, 10 Nov 2021 10:59:54 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 921E52BC057 for ; Wed, 10 Nov 2021 10:59:53 +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 0BFF434300A for ; Wed, 10 Nov 2021 10:59:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DD37175 for ; Wed, 10 Nov 2021 10:59:50 +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: <1636541527.ef29aedf32bde32e4cb8cf15eaf65a56f9332ff2.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty-terminfo/files/, x11-terms/kitty-terminfo/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.20.1.patch x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild X-VCS-Directories: x11-terms/kitty-terminfo/ x11-terms/kitty-terminfo/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: ef29aedf32bde32e4cb8cf15eaf65a56f9332ff2 X-VCS-Branch: master Date: Wed, 10 Nov 2021 10:59:50 +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: b9301f1a-6025-401d-b7eb-ace8306072e8 X-Archives-Hash: 7ff16dfa590d0d4d9ad66f477160e316 commit: ef29aedf32bde32e4cb8cf15eaf65a56f9332ff2 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Nov 10 08:49:01 2021 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Nov 10 10:52:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef29aedf x11-terms/kitty-terminfo: drop 0.23.1 Signed-off-by: Ionen Wolkens gentoo.org> .../files/kitty-terminfo-setup-0.20.1.patch | 46 ---------------------- .../kitty-terminfo/kitty-terminfo-0.23.1.ebuild | 41 ------------------- 2 files changed, 87 deletions(-) diff --git a/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.20.1.patch b/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.20.1.patch deleted file mode 100644 index 67772bfae03..00000000000 --- a/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.20.1.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/setup.py b/setup.py -index 115739fc..b933165c 100755 ---- a/setup.py -+++ b/setup.py -@@ -906,6 +906,14 @@ def create_linux_bundle_gunk(ddir: str, libdir_name: str) -> None: - os.makedirs(os.path.dirname(in_src_launcher), exist_ok=True) - os.symlink(os.path.relpath(launcher, os.path.dirname(in_src_launcher)), in_src_launcher) - -+def terminfo(args): -+ ddir = args.prefix -+ libdir = os.path.join(ddir, args.libdir_name.strip('/'), 'kitty') -+ build_terminfo = runpy.run_path('build-terminfo', run_name='import_build') -+ for x in (libdir, os.path.join(ddir, 'share')): -+ odir = os.path.join(x, 'terminfo') -+ safe_makedirs(odir) -+ build_terminfo['compile_terminfo'](odir) - - def macos_info_plist() -> bytes: - import plistlib -@@ -1093,7 +1101,7 @@ def safe_remove(*entries: str) -> None: - - safe_remove( - 'build', 'compile_commands.json', 'link_commands.json', -- 'linux-package', 'kitty.app', 'asan-launcher', -+ 'linux-package', 'linux-terminfo', 'kitty.app', 'asan-launcher', - 'kitty-profile', 'kitty/launcher') - exclude = ('.git',) - for root, dirs, files in os.walk('.', topdown=True): -@@ -1116,7 +1124,7 @@ def option_parser() -> argparse.ArgumentParser: # {{{ - 'action', - nargs='?', - default=Options.action, -- choices='build test linux-package kitty.app linux-freeze macos-freeze build-launcher build-frozen-launcher clean export-ci-bundles'.split(), -+ choices='build test linux-package linux-terminfo kitty.app linux-freeze macos-freeze build-launcher build-frozen-launcher clean export-ci-bundles'.split(), - help='Action to perform (default is build)' - ) - p.add_argument( -@@ -1246,6 +1254,8 @@ def main() -> None: - elif args.action == 'linux-package': - build(args, native_optimizations=False) - package(args, bundle_type='linux-package') -+ elif args.action == 'linux-terminfo': -+ terminfo(args) - elif args.action == 'linux-freeze': - build(args, native_optimizations=False) - package(args, bundle_type='linux-freeze') diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild deleted file mode 100644 index 0887b4ffa41..00000000000 --- a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit python-any-r1 xdg - -DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator" -HOMEPAGE="https://github.com/kovidgoyal/kitty" -SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz" -S="${WORKDIR}/kitty-${PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -DEPEND="${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}"/kitty-terminfo-setup-0.20.1.patch -) - -# kitty-terminfo is a split package from kitty that only installs the terminfo -# file. As tests are designed to be run with the whole package compiled they -# would fail in this case. -RESTRICT="test" - -src_compile() { - "${EPYTHON}" setup.py \ - --verbose $(usex debug --debug "") \ - --libdir-name $(get_libdir) \ - linux-terminfo || die "Failed to compile kitty." -} - -src_install() { - insinto /usr - doins -r linux-package/* -}