[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty-terminfo/files/, x11-terms/kitty-terminfo/

[Joonas Niilola]

commit:     d35225df7332714036403dcab6b9335d4e54a97d
Author:     end222 <pabloorduna98 <AT> gmail <DOT> com>
AuthorDate: Thu Apr 30 15:05:51 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May  1 15:09:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d35225df

x11-terms/kitty-terminfo: cleanup older versions

Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15576
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 x11-terms/kitty-terminfo/Manifest                  |  1 -
 .../files/kitty-terminfo-setup.patch               | 44 ---------------------
 .../kitty-terminfo/kitty-terminfo-0.16.0.ebuild    | 45 ----------------------
 3 files changed, 90 deletions(-)

diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index e958c1af17e..bac5a972e96 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,3 +1,2 @@
-DIST kitty-0.16.0.tar.xz 2974592 BLAKE2B 971e279cd24369a454495fc7a236356e6a4ee69a0953563a9283a16e21bd67ddea5ab8f795c75be6cd31d05c5f1b39b1525e957b9bcd59d12ea3e701b21aa59c SHA512 24dedfc58c5d33aa18da85f904952129f39cd54afb70282c7572b57514b1deebfb532414913e0efc3a5c0352a81406cd7ddef99490dbd9186dc61eab7af3975b
 DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
 DIST kitty-0.17.3.tar.xz 3064216 BLAKE2B f5ab532d97c211ceed463c24758635a9e7168bf03990889a98ebdad7fc8c1c60f5f3726724007f00ac6a5f5e8db44ca54a4a43027dbf6ce1fdfcaa40c7b8e10c SHA512 dc14ba35e77e0ebd1978fde0731b00e726e75137f900952dfa6b06add1f46e3a3f42e8e886ce8c689e4e3500f2d2216a66225d5211522a41d09ef61265065e2d

diff --git a/x11-terms/kitty-terminfo/files/kitty-terminfo-setup.patch b/x11-terms/kitty-terminfo/files/kitty-terminfo-setup.patch
deleted file mode 100644
index 5ff1fa2d77d..00000000000
--- a/x11-terms/kitty-terminfo/files/kitty-terminfo-setup.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/setup.py	2020-03-12 00:28:46.725956882 +0100
-+++ b/setup.py	2020-03-12 00:38:55.557945979 +0100
-@@ -876,6 +876,14 @@
-         create_macos_bundle_gunk(ddir)
- # }}}
- 
-+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 clean():
- 
-@@ -889,7 +897,7 @@
- 
-     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):
-@@ -910,7 +918,7 @@
-         'action',
-         nargs='?',
-         default='build',
--        choices='build test linux-package kitty.app linux-freeze macos-freeze clean'.split(),
-+        choices='build test linux-package linux-terminfo kitty.app linux-freeze macos-freeze clean'.split(),
-         help='Action to perform (default is build)'
-     )
-     p.add_argument(
-@@ -1007,6 +1015,8 @@
-         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.16.0.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.16.0.ebuild
deleted file mode 100644
index 6ceb2f1ead7..00000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.16.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-single-r1 toolchain-funcs 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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/kitty-terminfo-setup.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/*
-}