gentoo resync : 25.08.2020

6 files changed, 182 insertions, 2 deletions

diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index e8900ad41eb4..302cd843a97c 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,11 +1,17 @@
 AUX kitty-terminfo-setup-0.17.2.patch 1707 BLAKE2B 6670b86ac9ed5063d2d2bd855ecd274bc14953e0ad836d9a858d425fec4811a92590a551e56a861780d01bcc9152bdaaf0f7d57e5af92b640e14cf97b72feb76 SHA512 982860794a23aa7c97de0c45a462b16ad1f0d596b0f178a10ee304f4926bb8378639b2de4842c7f2a43a4a90a652e6934a8f6891f008547824efd273113d284f
+AUX kitty-terminfo-setup-0.18.3.patch 2018 BLAKE2B ecbd4c337f24166c1344932db0798f07671ad2867736e601036c6eda17652dd61a0ecce498516d1c266e5a305d145502beed7dbe644ed9bfd6f0c803bfc0663b SHA512 04080aa5b9d1b5ac358f4ee75351b490290270caed37c1fd94678c18a07d7474abad8d6638a287fdac010837d7873f7084f8eb7782021368d424ca9a65862c53
+AUX kitty-terminfo-setup-9999.patch 2054 BLAKE2B 542cad394ca0e05a075572a88519fa334e31f95736442fb151ae249aa0e550a9d5b34bf73c27dedd91fbb40cacf80953c42488e88553b193ffbcf34f5922fbe0 SHA512 ca45e263eb38557019065c699879f68259b7228d8570946c2a01a9a97475bed7f247c0fc8c9b835c1648fd712658230e4b7bd94e7712c35b4dbe33ec7da23cbc
 DIST kitty-0.17.2.tar.xz 3044140 BLAKE2B 12dcb8ddb7d90a22904f575301e8c2b1672c3212ee29a035fa5e8eec553dafb0e2c8c1cc3a491c8ac6854d619e979e518d83c5218f36647a032a4f847d068ef3 SHA512 bccf1c1d60d1149bc5f849b82db1af80a2d9a7a11c5f2df853daae5700550eef98da389a30f015d67be796f39deacb31f3ee245eb37ba1a41ba377c70cd26d61
 DIST kitty-0.17.3.tar.xz 3064216 BLAKE2B f5ab532d97c211ceed463c24758635a9e7168bf03990889a98ebdad7fc8c1c60f5f3726724007f00ac6a5f5e8db44ca54a4a43027dbf6ce1fdfcaa40c7b8e10c SHA512 dc14ba35e77e0ebd1978fde0731b00e726e75137f900952dfa6b06add1f46e3a3f42e8e886ce8c689e4e3500f2d2216a66225d5211522a41d09ef61265065e2d
 DIST kitty-0.17.4.tar.xz 3068456 BLAKE2B 7c3be1bd9e1be814ca2c98ac8bed5c8ac906021efee9e399bddb8d1f2d6faa4368f08741fd24666892272c5ffc68e62d490f3a3b20a4f1cb1025401741ace29f SHA512 4ea954a59f44b04a1540d814892b08c93e37c07d7dd32b5db3f50806fa6f39a8a89957c216e47b43bf7aa9571dd0200de7dc12266cc672c9e70e39b2133da0d7
 DIST kitty-0.18.1.tar.xz 3098940 BLAKE2B c54f9e7996e8e17182d5cdb3f915964b2626985992dc9f8bf2f11d086475fd7b13ee131aaf942f521cd6356ac13f7efdf436253237022532ffc68cb7923bc645 SHA512 d1870fa8c1c42c9a20251ba7819fb649760a98070653cff6bbc0ef86160d6b20070bbfe4e549b80d75d7a78b37cb3c1153e4be246709cf630129cd4d09a76604
+DIST kitty-0.18.2.tar.xz 3100228 BLAKE2B ac7c1c6dc9ced4f8ca59c9a9a9ff2d0c6410bbed64efc8528a899b5b55ad008e65bed6ef1b1fdb74da6b4df2ccef63e1d64ffc375ad225243999bcbb2c1378ec SHA512 12b17f241884347e841b597cc86ac7dec9f509350af33de4e790f586b1cb8a5b89222f25f710f1f5ab82ea09cb1c7b0fa9ffee869cbae497e2a2ab0c6ef1b5a0
+DIST kitty-0.18.3.tar.xz 3107268 BLAKE2B 5a81552d59f5232253c0c23a9a4eb88950a5d6e9c3ca69412ca7d56d521cb69f424461df2718774489de42c78de8253d2336e4bf7f352b488364fe30f418b0c4 SHA512 77636c4d1c21157e86cae3a88bca8b161207c1f1112ce60d11d04e79cf6e8ed331085f99e0caa20b7b4f297d8bf193aeb7afa8679c871085cc9d328ed8da3ad7
 EBUILD kitty-terminfo-0.17.2.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
 EBUILD kitty-terminfo-0.17.3.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
 EBUILD kitty-terminfo-0.17.4.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
 EBUILD kitty-terminfo-0.18.1.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
-EBUILD kitty-terminfo-9999.ebuild 920 BLAKE2B 03f762c69be3ce63a340cd57678444a9960b3654d6ea676a583eca4ff629375f9924328702ed6006a38af2da60ae3220db56ea296171cd69f6ed0c3d5f99dd49 SHA512 bae84cdcdce2cf5dd8f5149cddfb30b79ebd21b00875d49ac7da5856614d8816ba0f8daed4d7197341a5df7660a4221acd037c09f6f52f4fd0bb3ac7b69239fb
+EBUILD kitty-terminfo-0.18.2.ebuild 997 BLAKE2B 2b0cb0ab2cae14ec8ffab109ee3e429f258b4e3e05c1d6ceed4deec1dcce47923151961ecba4f3c9caa4ea8d75beff9b3791de728c9cc40b34465382f5ae6aa2 SHA512 1a3389f67d6b19fee38385b5bafcf48be9e839761f883581fef433528d1cda5a86b48fc03a244572c0f33f0ef66d1f3d6ddc55140915adb19e5fdfee9c3f90bf
+EBUILD kitty-terminfo-0.18.3.ebuild 997 BLAKE2B a63a65aab78083a8d542d07ba2a42b3ed69463d9f558ae6a387406a3481c62b2a3b311c2d3d95f72f6cdb8972d5fe2fa9125989fe10814b2e0a9220aa51bd145 SHA512 59704762cbb644813876322756325bb20e4b33a2d2ac542af6deed9e39620951cb955d07e5f2bc8e88cd96ccedfb3737fb96ad612b724e07ba43b590553d980b
+EBUILD kitty-terminfo-9999.ebuild 918 BLAKE2B 29300237e87499176eb8e300beae5d7c42411d574f025316b9d887cd789d6470538a7e72469957d4b82a12324d84128e5faf988a748a570896ba0e3bb8c1c138 SHA512 3de87d729ab4e28cd0f41d2ba9e0ca843929510d2d358136102ba2e2bf7d113c11bacc120d992bf7aa8c258134f212831689c7b66ae36cd3b2dcd25f078c816c
 MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d
diff --git a/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.18.3.patch b/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.18.3.patch
new file mode 100644
index 000000000000..ae6f087069c7
--- /dev/null
+++ b/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.18.3.patch
@@ -0,0 +1,46 @@
+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'.split(),
++        choices='build test linux-package linux-terminfo kitty.app linux-freeze macos-freeze build-launcher clean'.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/files/kitty-terminfo-setup-9999.patch b/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-9999.patch
new file mode 100644
index 000000000000..865ac2b0331d
--- /dev/null
+++ b/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-9999.patch
@@ -0,0 +1,46 @@
+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.18.2.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.18.2.ebuild
new file mode 100644
index 000000000000..b37c1bba5c12
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.18.2.ebuild
@@ -0,0 +1,41 @@
+# 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-any-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"
+
+DEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/kitty-terminfo-setup-0.17.2.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.18.3.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.18.3.ebuild
new file mode 100644
index 000000000000..1f885cd3b8e1
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.18.3.ebuild
@@ -0,0 +1,41 @@
+# 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-any-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"
+
+DEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}"/kitty-terminfo-setup-0.18.3.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 b43704ce0df0..6e6b7a4abe73 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
@@ -18,7 +18,7 @@ IUSE="debug"
 DEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
-	"${FILESDIR}"/kitty-terminfo-setup-0.17.2.patch
+	"${FILESDIR}"/kitty-terminfo-setup-9999.patch
 )
 
 # kitty-terminfo is a split package from kitty that only installs the terminfo