gentoo resync : 13.11.2021

7 files changed, 41 insertions, 160 deletions

diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index ae6b3f64046d..a90400c3fca7 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,7 +1,4 @@
-AUX kitty-terminfo-setup-0.20.1.patch 2148 BLAKE2B 820a445fb3b803164efb01c0ecc5ed12d173a484d702a890b7c673015e59026429e12b7254bb3b1819e972b853fbd07b098fa1459ea0241c3380c1b25eb8e043 SHA512 f45aba42732d01d577f09143cf867b983743b94cff72d07785398e2ebdd2bdaffff4b04a817e0381cb5cfdb505ed7b7fbbf090d1241d3d718b3148a5e76efa90
-DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df
 DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94
-EBUILD kitty-terminfo-0.21.2.ebuild 981 BLAKE2B 51ab367725467fae57f20d6ebb0bd8916ff4cf3e87d3eb0d647c02ccfd00d0aac15d56f50c089fc3c6eef31dd2609e7220e15e3fcfb9e239168dca227428a4c6 SHA512 531d5b9134c0bcac4e6e7252c2b88e3e7bb4352e7ea66694038830aa81c21e1d4e2c1f5f5d378c34f369a56e74af296342ce0d178fcd226bbc86b59f7aa28da0
-EBUILD kitty-terminfo-0.23.1.ebuild 981 BLAKE2B 02bd2583f5ade2c7705e6c4cfb16aa6c3675f34e9c56d2f6662338c99bc664f2a9a7e81e92602a87a0f8115d8a71e35a89b1e23ca0c2849d11af81c7f1498c78 SHA512 6a4009a805b5dac1a4822d3d6157493cd3cc981272079d55ae8be0f9ff140f64f6afab816eafef8bfddc293095783b9d91dca4bd498cf9a6ab4443d0180aa358
-EBUILD kitty-terminfo-9999.ebuild 904 BLAKE2B 3725417c95e05f0c1936e8e55c996d849a6cc5f782e0475aee0d54ffcc04ddc3d1fc86c47196b97fc08c656afee70179ae8f282f693500c0ba92c674cfae8286 SHA512 466e4d26abee7c3f56f82e693a6033e1dc71e6744d81906262df0a2cd514d0c0aab63b1410ce1b9d7142b701ec61c4308bd330b243751065664f00a9cbe48961
-MISC metadata.xml 495 BLAKE2B f560d10edb2038d05893c8aa9ad5ee186b30f4bf48450df73a85b11db53e0949ee85964679c18f406b86273ca7b6d7ac4b7fd6de5bc8e197a68bb0d85f6368ca SHA512 5d43de9620940c971f8d11961bdac83906998625e44f0fe022e5daf7b7d8962c705c93817ef2991d233c15f4c62e344accc0ef52c0aa2bc6207f0763cb3e6b4a
+EBUILD kitty-terminfo-0.23.1-r1.ebuild 612 BLAKE2B 14c01d616c309893e6a21e862861df66729eb4c7b68801515fc7bd8508ba85c033d262ae9c20cfe5fc3d175a3b3f7ae6844abd72992141be42fb69f96c08e1a0 SHA512 df25aaaf8c08cc35d91ee5678bf37767f4d17687d50d543b0ef59cd1da04dbf2a07d85d664951b373e600a81cf30cb0ae9ca9fab51df9b4097781100854e306f
+EBUILD kitty-terminfo-9999.ebuild 545 BLAKE2B 50bf783694580b016f3291640d6c4ab3e8ee335f78d13b75cb7ebe6628ddd2f244fab2e7c465a3964ed6b5e0ebbdb144c739a01ffa7239c8518503ea107a52f2 SHA512 267b8b4a526ee22159f7c1c0d9a089e183308e1e7f61d775834e4ed5d4f25be7aac8cc3db4afa3c3f1e933159f27abff25c31989dd6478c1727eec590bf0a3c8
+MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
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 67772bfae03d..000000000000
--- 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.21.2.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.21.2.ebuild
deleted file mode 100644
index 981c09fdc481..000000000000
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.21.2.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_{7,8,9} )
-
-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/*
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1-r1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1-r1.ebuild
new file mode 100644
index 000000000000..651df9c89ca3
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
+HOMEPAGE="https://sw.kovidgoyal.net/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"
+RESTRICT="test" # intended to be ran on the full kitty package
+
+BDEPEND="sys-libs/ncurses"
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/terminfo
+	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
+}
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 0887b4ffa410..000000000000
--- 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/*
-}
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
index 5166ea870a2d..af803f4eecd4 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
@@ -1,39 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+inherit git-r3
 
-inherit python-any-r1 xdg git-r3
-
-DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
-HOMEPAGE="https://github.com/kovidgoyal/kitty"
+DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
 EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug"
-
-DEPEND="${PYTHON_DEPS}"
+RESTRICT="test" # intended to be ran on the full kitty package
 
-PATCHES=(
-	"${FILESDIR}"/kitty-terminfo-setup-0.20.1.patch
-)
+BDEPEND="sys-libs/ncurses"
 
-# 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_compile() { :; }
 
 src_install() {
-	insinto /usr
-	doins -r linux-package/*
+	dodir /usr/share/terminfo
+	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
 }
diff --git a/x11-terms/kitty-terminfo/metadata.xml b/x11-terms/kitty-terminfo/metadata.xml
index cb13d08790b7..60597e252fe3 100644
--- a/x11-terms/kitty-terminfo/metadata.xml
+++ b/x11-terms/kitty-terminfo/metadata.xml
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ionen@gentoo.org</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>pabloorduna98@gmail.com</email>
 		<name>Pablo Orduna</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
+		<name>Proxy Maintainers</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">kovidgoyal/kitty</remote-id>
 	</upstream>