gentoo resync : 27.10.2021

5 files changed, 6 insertions, 53 deletions

diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 0f3103430950..ae6b3f64046d 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,8 +1,7 @@
-AUX kitty-terminfo-setup-0.19.1.patch 2054 BLAKE2B 542cad394ca0e05a075572a88519fa334e31f95736442fb151ae249aa0e550a9d5b34bf73c27dedd91fbb40cacf80953c42488e88553b193ffbcf34f5922fbe0 SHA512 ca45e263eb38557019065c699879f68259b7228d8570946c2a01a9a97475bed7f247c0fc8c9b835c1648fd712658230e4b7bd94e7712c35b4dbe33ec7da23cbc
 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 997 BLAKE2B 7ea814c3fe8ddfb828ae8f3a2cb1c9b284153c6055889344808a1f4b5be8c71b312ef759b243eda4dfcc5981b1311c18a6abb089c1f04ee3c92d3d8cda1dcda0 SHA512 017794236bf42ce2c6a49983f99229894211769d6b9ac0bc19bf21766fcc9b34e988dd1d7b5cff1bef4b9840af79381aac21e736bba3187fe48565ac40b5bdaa
-EBUILD kitty-terminfo-0.23.1.ebuild 997 BLAKE2B 8fdd142b7c2a1afe010cd09da61097169401ba2a5af2626b7a5ed456e76a6c764fec8520678de488631ec779f307341920fad1aadccf91298b688342ecf49e56 SHA512 fe9114cacb8b3f30d44d05ef0575803a49afe410bd803580c489e7075b0ddc8bce9835f3e6e8cb661551452a5ae5fd68164c4f8c492835e55a8ac9194c03e44c
-EBUILD kitty-terminfo-9999.ebuild 920 BLAKE2B 04c2ef92eba28fe3a3fda238a8c0e9fae6b142da0446789543c8a8a4872dbab2f859627c47a620c6d679ff4b8f10288b6c21ed95a1fa7b72789c22936baa2331 SHA512 9b86523ac2eabd25194fccd6918912da9d0e10a52226dc8024eea3af890cb4aff056d2255b6a3cb9149be2b5a46a9e8ff88cc9ba5407e38fd9c1d30abc10eb15
+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
diff --git a/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.19.1.patch b/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.19.1.patch
deleted file mode 100644
index 865ac2b0331d..000000000000
--- a/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.19.1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 7c4295bd..8d31e2d1 100755
---- a/setup.py
-+++ b/setup.py
-@@ -856,6 +856,14 @@ Categories=System;TerminalEmulator;
-     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
-@@ -1022,7 +1030,7 @@ def clean() -> 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):
-@@ -1045,7 +1053,7 @@ def option_parser() -> argparse.ArgumentParser:  # {{{
-         'action',
-         nargs='?',
-         default=Options.action,
--        choices='build test linux-package kitty.app linux-freeze macos-freeze build-launcher clean export-ci-bundles'.split(),
-+        choices='build test linux-package linux-terminfo kitty.app linux-freeze macos-freeze build-launcher clean export-ci-bundles'.split(),
-         help='Action to perform (default is build)'
-     )
-     p.add_argument(
-@@ -1166,6 +1174,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
index be10def6c282..981c09fdc481 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.21.2.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.21.2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit python-any-r1 toolchain-funcs xdg
+inherit python-any-r1 xdg
 
 DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
 HOMEPAGE="https://github.com/kovidgoyal/kitty"
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
index 200f0cd96ff7..0887b4ffa410 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.23.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit python-any-r1 toolchain-funcs xdg
+inherit python-any-r1 xdg
 
 DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
 HOMEPAGE="https://github.com/kovidgoyal/kitty"
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
index c060f3f8b166..5166ea870a2d 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit python-any-r1 toolchain-funcs xdg git-r3
+inherit python-any-r1 xdg git-r3
 
 DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
 HOMEPAGE="https://github.com/kovidgoyal/kitty"