From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Nov 2021 13:10:00 +0000 Subject: gentoo resync : 13.11.2021 --- x11-terms/kitty/Manifest | 20 +--- x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch | 16 --- x11-terms/kitty/files/kitty-0.20.1-flags.patch | 49 -------- .../kitty/files/kitty-0.20.1-remove-terminfo.patch | 16 --- x11-terms/kitty/files/kitty-0.20.1-tests.patch | 11 -- x11-terms/kitty/files/kitty-0.20.3-flags.patch | 53 --------- x11-terms/kitty/files/kitty-0.21.2-flags.patch | 54 --------- .../kitty/files/kitty-0.21.2-remove-terminfo.patch | 16 --- x11-terms/kitty/files/kitty-0.23.1-flags.patch | 17 +++ x11-terms/kitty/kitty-0.20.1.ebuild | 110 ----------------- x11-terms/kitty/kitty-0.20.3.ebuild | 109 ----------------- x11-terms/kitty/kitty-0.21.2.ebuild | 110 ----------------- x11-terms/kitty/kitty-0.23.1-r1.ebuild | 118 +++++++++++++++++++ x11-terms/kitty/kitty-0.23.1.ebuild | 109 ----------------- x11-terms/kitty/kitty-9999.ebuild | 130 +++++++++++---------- x11-terms/kitty/metadata.xml | 8 +- 16 files changed, 215 insertions(+), 731 deletions(-) delete mode 100644 x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch delete mode 100644 x11-terms/kitty/files/kitty-0.20.1-flags.patch delete mode 100644 x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch delete mode 100644 x11-terms/kitty/files/kitty-0.20.1-tests.patch delete mode 100644 x11-terms/kitty/files/kitty-0.20.3-flags.patch delete mode 100644 x11-terms/kitty/files/kitty-0.21.2-flags.patch delete mode 100644 x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch create mode 100644 x11-terms/kitty/files/kitty-0.23.1-flags.patch delete mode 100644 x11-terms/kitty/kitty-0.20.1.ebuild delete mode 100644 x11-terms/kitty/kitty-0.20.3.ebuild delete mode 100644 x11-terms/kitty/kitty-0.21.2.ebuild create mode 100644 x11-terms/kitty/kitty-0.23.1-r1.ebuild delete mode 100644 x11-terms/kitty/kitty-0.23.1.ebuild (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 27fbb54b6de5..51b21e7a004c 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,17 +1,5 @@ -AUX kitty-0.14.4-svg-icon.patch 616 BLAKE2B 2e362e1ea134f98839b8e21e337faa530de7a0613965c762589c1d85220fe2f89a17b4691dad7248669e29d511a5e9b5ded446bccc9a6d1cbdce56d715c137cb SHA512 3a60dbafc8567535a9eed422bd1ee0382ee2afa79b815dff7e8f68f090a67374741962206368ca7723e15b241556dc2ede3935b40fa67f4e6c20300b1a4850fa -AUX kitty-0.20.1-flags.patch 1995 BLAKE2B e563ab5c09d43e8701e6ec5df519c47ae952054da72fedf106809f1c3775f00e172de7146734e10186f75ab10b8b0d42faa2ac6402cac5d57fdd8d5e611d90b0 SHA512 cbc8660909c3e07e16f720528265384bef2152fc33e41fbbef057fcd436216071ebfc0b4956284bd0e8e745ba28ba41221da8fff8d7f9a704fba6b79ea021f6f -AUX kitty-0.20.1-remove-terminfo.patch 754 BLAKE2B 12fae3be4b6a9ae6a2c49671e95c24fb9c73e5d18261e4817e5abbbe4419804dc9ba3b387d77fd4fb296108f294c3a8a7f7285814edfa8d5d9e62b7b5cca36b1 SHA512 17101f03975210e183ee1a4370d65a5bd40812dbf253f66038c8f534085974369ee909302109a8315f1c982d00299aef5a7a52a98dadd7ff46f9431ead6f748b -AUX kitty-0.20.1-tests.patch 514 BLAKE2B 69c4277b4ffc257cc8320dbfc5be95d72bcb35b70a377f8ef24ecd9a20036313ce52f245efd5f620b47ddea6f688cb0d3b4154d8787a3908d5c255ca26143f80 SHA512 bb5dd23b0e83118fd33296e1ee8c6485e51f29518406e1e875b2f5ec8e7de4103c9ec2b4c99516a3d4fe6134ccf5bf0d54e4a37bee89e64f294da4b0350d337c -AUX kitty-0.20.3-flags.patch 2252 BLAKE2B 62743ee798196ec14ae3899e481271890507563b438ef87f8e7d19f2cfa79def5118aba39bdf402d6d505b208d1082af156c4feb4a113a5bd1fec481c1ffe20f SHA512 2480194e3f5dbee2fe2e70c5c54c69cb497d3dae9914508d3c0488de9227169cb8c023834627d0c55f863498d89890c31110fa3c3ee740b241b99bf299557007 -AUX kitty-0.21.2-flags.patch 2264 BLAKE2B f97139220f48a65fcb7da0cf166b27b9827d5e01f21bc0549f0bf3ce87287f787b167283cf05d82ca15bef7c996da4c512aa6e483900ea4a6c44015de362d11c SHA512 845bd40360730d498de16764423263014bd299c7a9072f12810e859ba851d88d7f1429d2844c7defd0b389694be7ea3dbc2d4e4a4718e35f090440b7d0ef0e84 -AUX kitty-0.21.2-remove-terminfo.patch 666 BLAKE2B e551e919d3a2ea31d53122e1bdd02e492e3ca0f6a0335b94d1e37585f82b2b0340743cd3536b43b9f26865917a01526e09379b02c9f2e55104bb8f4ec8b91b11 SHA512 2ca3ce3bdcbc1c0ec824d496d1682c800960f42289d75d2e92022873c8cf6a6a5095d97241fe5eb3b05949e18ae113719c7542643244d03521c01a857c59f48f -DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd -DIST kitty-0.20.3.tar.xz 3487500 BLAKE2B 49397ac2aef10e5fc41e351af65050ad510e58915392e6b1b8c022db31f2e5e81ac2cce645468ff213dafb609a30d43934b7388b93227fbbba5af7aa35be74e8 SHA512 9e9d81696bcb0d3894c04b08bc52ccf7aaf533125b3ecfb4c894b8d42dbf8511239c49f1c977d81872ce49fc6b3aa8e8c92b9c944bd31fe59fce6e3750295e58 -DIST kitty-0.21.2.tar.xz 4341440 BLAKE2B dd97d65ae6eb39b5676cc809d3b5ca48b0fcbbb4bb9cc1d212efeb1b5fb584f61decca9d286fdee6f4512aa4d56e08b3a19be70afa2f0155c8c1815e29fcd7ed SHA512 0ae41dfd61fc70746e8ec2d37c043dea7ceb70205aca056fd156348d4b9a2f6aac520c60de08fb5a3cd9bb908efdd2ad8129bbc01b69e5908f2976e5393269df +AUX kitty-0.23.1-flags.patch 583 BLAKE2B c95c469d73c67ec90a4c33bb416832bbc7ce4766cf65a9c216cc5afd16f5c71cfccf80e08983d7f0aaea27f29b30ce0746c32065104e8fd1f930be9301751eb3 SHA512 2280cbe367181468bcc2aa8071fcbc6d44e77e65d8261f915b1775ad27f0fd8d48b1387300ba67a2ad0964cb655b66885221785c0ea0f4766c37b827f2987cd0 DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94 -EBUILD kitty-0.20.1.ebuild 2437 BLAKE2B 8a4a8b12230e8bf949d8033f2625eaeac2c9b44cd650808610f7a5e898f8c4b7a0055f07e146fa665c668f606a3114e82f671acc8e851a1686e7f7068a6d943a SHA512 80dfe575df244ac936c2038513f263857b2175fcfed5f0c6b1baf01d080fa25941c6225a6d844ef59b2539822151a4253895bc36a797f5bd7e439cc9caee92a2 -EBUILD kitty-0.20.3.ebuild 2356 BLAKE2B 4c0cf0cda36e73e4127cc40c46a4ff3c56c63929538dd2077364cbfd2ea0e432df7e31528be1cc0600777295ede31e3369f0027a836663a0eff47737c76196dc SHA512 bb4a0e3ed5612ce5f0f7a8abc41b70925584a5d536d8210cae275bd94a16878f55fc8eeb2d91ca020e2974bf044f26b9a5fac6a434595fd6268bec5a9bcb3600 -EBUILD kitty-0.21.2.ebuild 2383 BLAKE2B 6f2831db949398f23a5402d91b6819c12e53c64f87ef2fdd7e855556d7b881a0f4fabc43b0f328025c3742920ca3702ed0c05825f3d9921700e6d14196e641c1 SHA512 4bf9028ca55a0e46b3aae6c35d01f1356fa8ecc3b02d53fe0865ffa69bc2629231243d187bc4a090941809bfb169fc98ec7f68ba7d6aecda72893a8c4fdda526 -EBUILD kitty-0.23.1.ebuild 2340 BLAKE2B d019c7cff4ec44662244feb40d88bae57828e61aac3910c450fc097e67fdaa96be2703b0ea835fd3ee04d08b9597f812277b7aeecd8e4dadb48db0ef3f5a7c04 SHA512 469a377957926542e03e55f03cdd48735754bc9a225dedad9e01749197e5c9d0110ef29ebc8cceed6e023a9a71cee7ba58378fa926025a674dedc9eec5255228 -EBUILD kitty-9999.ebuild 2185 BLAKE2B c710249d453b9a073b6def40869181f0f371d1355d6907ec2aff08d985eb43cf3df84f0f0410c72999d4e1f4ee4de93599e9ab1c63d2f7ecad0a2a1b9b70c089 SHA512 af0c18f20d11087989cbc40b2b10bfd275d1dfb2610e6c54d5a265e9bea03ac33e178bd16c57df9e9df47f9ddaced3e0f8aac79a7c86bd7282f3a2a94f5cbee5 -MISC metadata.xml 671 BLAKE2B 3a90a8ab7a84a5fd97022e367a0d54062cfa76c75c6dcab4b390edf79c694c74d4484dac104f839b689bf79cab23844825e11e8c6e972155e698105d23176fce SHA512 8f4daf9908dd9771b479442533a75074f0dfa76eb1442996bb2efe94fdc19466d77b316d8424879c817a9a86ecaa8de4a63eef7943c7b2b6c269c6beb5c652bb +EBUILD kitty-0.23.1-r1.ebuild 2760 BLAKE2B 08535d3ec775b9a7b0b6f1218ce03237545e9543554771f8a278ca42d18581b20992623c851f56f6d7828f178a5d540fd1d1b865739337075d5830ef10737860 SHA512 c664473228ef13da6f4712a868d27e929b8e50ee27c5546076a2f0eca0a2cfe41ed75fffa3774fe72248aa6b93bff13a36100bde3369b309723a253c345bac33 +EBUILD kitty-9999.ebuild 2745 BLAKE2B 973d4c54c13fb4959b7d65378c2c9ab1d84af0f1a0d5d06848c9f3c2e252dffd34c5a63a92150f881d3c8193a8043110442535c5a5aa2178637a14f0082cdc53 SHA512 a7c97983446c76d818c6fed057354fdbf52c182b42bb333d3851484ba11a0a014c4ac99fc1b92b75c7a083e06b28fd327faf14281b2addb8759f4a8e82d01d5f +MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003 diff --git a/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch b/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch deleted file mode 100644 index 13f874dd3c14..000000000000 --- a/x11-terms/kitty/files/kitty-0.14.4-svg-icon.patch +++ /dev/null @@ -1,16 +0,0 @@ -Use SVG icon instead of PNG. - ---- kitty-0.14.4/setup.py -+++ kitty-0.14.4/setup.py -@@ -710,9 +710,9 @@ - run_tool(['make', 'docs']) - copy_man_pages(ddir) - copy_html_docs(ddir) -- icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps') -+ icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', 'scalable', 'apps') - safe_makedirs(icdir) -- shutil.copy2('logo/kitty.png', icdir) -+ shutil.copy2('logo/kitty.svg', icdir) - deskdir = os.path.join(ddir, 'share', 'applications') - safe_makedirs(deskdir) - with open(os.path.join(deskdir, 'kitty.desktop'), 'w') as f: diff --git a/x11-terms/kitty/files/kitty-0.20.1-flags.patch b/x11-terms/kitty/files/kitty-0.20.1-flags.patch deleted file mode 100644 index 27a44f56794c..000000000000 --- a/x11-terms/kitty/files/kitty-0.20.1-flags.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/setup.py b/setup.py -index ce5309ee..9cb59461 100755 ---- a/setup.py -+++ b/setup.py -@@ -278,7 +278,7 @@ def init_env( - df += ' -Og' - float_conversion = '-Wfloat-conversion' - fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2' -- optimize = df if debug or sanitize else '-O3' -+ optimize = '' - sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() - cppflags_ = os.environ.get( - 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), -@@ -289,7 +289,7 @@ def init_env( - cflags_ = os.environ.get( - 'OVERRIDE_CFLAGS', ( - '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}' -- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}' -+ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden {}' - ).format( - float_conversion, - '' if is_openbsd else '-std=c11', -@@ -306,7 +306,7 @@ def init_env( - ) - ldflags_ = os.environ.get( - 'OVERRIDE_LDFLAGS', -- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') -+ '-Wall ' + ' '.join(sanitize_args) - ) - ldflags = shlex.split(ldflags_) - ldflags.append('-shared') -@@ -764,7 +764,7 @@ def safe_makedirs(path: str) -> None: - - - def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None: -- cflags = '-Wall -Werror -fpie'.split() -+ cflags = '-Wall -fpie'.split() - cppflags = [] - libs: List[str] = [] - if args.profile or args.sanitize: -@@ -776,8 +776,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's - cflags.append('-g') - if args.profile: - libs.append('-lprofiler') -- else: -- cflags.append('-O3') - if bundle_type.endswith('-freeze'): - cppflags.append('-DFOR_BUNDLE') - cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version())) diff --git a/x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch deleted file mode 100644 index aeb40e601185..000000000000 --- a/x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/setup.py b/setup.py -index ce5309ee..02f38c61 100755 ---- a/setup.py -+++ b/setup.py -@@ -1028,11 +1028,6 @@ def package(args: Options, bundle_type: str) -> None: - safe_makedirs(launcher_dir) - build_launcher(args, launcher_dir, bundle_type) - os.makedirs(os.path.join(libdir, 'logo')) -- build_terminfo = runpy.run_path('build-terminfo', run_name='import_build') # type: ignore -- for x in (libdir, os.path.join(ddir, 'share')): -- odir = os.path.join(x, 'terminfo') -- safe_makedirs(odir) -- build_terminfo['compile_terminfo'](odir) - shutil.copy2('__main__.py', libdir) - shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo')) - shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo')) diff --git a/x11-terms/kitty/files/kitty-0.20.1-tests.patch b/x11-terms/kitty/files/kitty-0.20.1-tests.patch deleted file mode 100644 index 210898b888d9..000000000000 --- a/x11-terms/kitty/files/kitty-0.20.1-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/kitty/constants.py -+++ b/kitty/constants.py -@@ -64,7 +64,7 @@ - def kitty_exe() -> str: - rpath = sys._xoptions.get('bundle_exe_dir') - if not rpath: -- items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_base_dir, 'kitty', 'launcher')] -+ items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_base_dir, '../linux-package/bin')] - seen: Set[str] = set() - for candidate in filter(None, items): - if candidate not in seen: diff --git a/x11-terms/kitty/files/kitty-0.20.3-flags.patch b/x11-terms/kitty/files/kitty-0.20.3-flags.patch deleted file mode 100644 index 131d6214b4c1..000000000000 --- a/x11-terms/kitty/files/kitty-0.20.3-flags.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/setup.py b/setup.py -index f751107f..69bf39d4 100755 ---- a/setup.py -+++ b/setup.py -@@ -293,7 +293,7 @@ def init_env( - df += ' -Og' - float_conversion = '-Wfloat-conversion' - fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2' -- optimize = df if debug or sanitize else '-O3' -+ optimize = '' - sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() - cppflags_ = os.environ.get( - 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), -@@ -308,8 +308,8 @@ def init_env( - cflags_ = os.environ.get( - 'OVERRIDE_CFLAGS', ( - f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}' -- f' -pedantic-errors {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' -- f' -pipe {march} -fvisibility=hidden {fortify_source}' -+ f' -pedantic-errors {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' -+ f' {march} -fvisibility=hidden {fortify_source}' - ) - ) - cflags = shlex.split(cflags_) + shlex.split( -@@ -317,7 +317,7 @@ def init_env( - ) - ldflags_ = os.environ.get( - 'OVERRIDE_LDFLAGS', -- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') -+ '-Wall ' + ' '.join(sanitize_args) - ) - ldflags = shlex.split(ldflags_) - ldflags.append('-shared') -@@ -789,9 +789,7 @@ def safe_makedirs(path: str) -> None: - - - def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None: -- cflags = '-Wall -Werror -fpie'.split() -- if args.build_universal_binary: -- cflags += '-arch x86_64 -arch arm64'.split() -+ cflags = '-Wall -fpie'.split() - cppflags = [] - libs: List[str] = [] - if args.profile or args.sanitize: -@@ -803,8 +801,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's - cflags.append('-g') - if args.profile: - libs.append('-lprofiler') -- else: -- cflags.append('-O3') - if bundle_type.endswith('-freeze'): - cppflags.append('-DFOR_BUNDLE') - cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version())) diff --git a/x11-terms/kitty/files/kitty-0.21.2-flags.patch b/x11-terms/kitty/files/kitty-0.21.2-flags.patch deleted file mode 100644 index 0e773c677650..000000000000 --- a/x11-terms/kitty/files/kitty-0.21.2-flags.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/setup.py b/setup.py -index f751107f..69bf39d4 100755 ---- a/setup.py -+++ b/setup.py -@@ -293,7 +293,7 @@ def init_env( - df += ' -Og' - float_conversion = '-Wfloat-conversion' - fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2' -- optimize = df if debug or sanitize else '-O3' -+ optimize = '' - sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() - cppflags_ = os.environ.get( - 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), -@@ -308,8 +308,8 @@ def init_env( - cflags_ = os.environ.get( - 'OVERRIDE_CFLAGS', ( - f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}' -- f' {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' -- f' -pipe {march} -fvisibility=hidden {fortify_source}' -+ f' {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' -+ f' {march} -fvisibility=hidden {fortify_source}' - ) - ) - cflags = shlex.split(cflags_) + shlex.split( -@@ -317,7 +317,7 @@ def init_env( - ) - ldflags_ = os.environ.get( - 'OVERRIDE_LDFLAGS', -- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') -+ '-Wall ' + ' '.join(sanitize_args) - ) - ldflags = shlex.split(ldflags_) - ldflags.append('-shared') -@@ -789,10 +789,7 @@ - - - def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None: -- werror = '' if args.ignore_compiler_warnings else '-pedantic-errors -Werror' -- cflags = f'-Wall {werror} -fpie'.split() -- if args.build_universal_binary: -- cflags += '-arch x86_64 -arch arm64'.split() -+ cflags = f'-Wall -fpie'.split() - cppflags = [] - libs: List[str] = [] - if args.profile or args.sanitize: -@@ -803,8 +801,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's - cflags.append('-g') - if args.profile: - libs.append('-lprofiler') -- else: -- cflags.append('-O3') - if bundle_type.endswith('-freeze'): - cppflags.append('-DFOR_BUNDLE') - cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version())) diff --git a/x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch deleted file mode 100644 index 39fe84b3b2a0..000000000000 --- a/x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/setup.py b/setup.py -index ce5309ee..02f38c61 100755 ---- a/setup.py -+++ a/setup.py -@@ -1082,11 +1082,6 @@ - else: - build_launcher(args, launcher_dir, bundle_type) - os.makedirs(os.path.join(libdir, 'logo')) -- 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) - shutil.copy2('__main__.py', libdir) - shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo')) - shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo')) diff --git a/x11-terms/kitty/files/kitty-0.23.1-flags.patch b/x11-terms/kitty/files/kitty-0.23.1-flags.patch new file mode 100644 index 000000000000..8f23393f8a0e --- /dev/null +++ b/x11-terms/kitty/files/kitty-0.23.1-flags.patch @@ -0,0 +1,17 @@ +--- a/setup.py ++++ b/setup.py +@@ -295,3 +295,3 @@ + fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2' +- optimize = df if debug or sanitize else '-O3' ++ optimize = '' + sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() +@@ -319,3 +319,3 @@ + 'OVERRIDE_LDFLAGS', +- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') ++ '-Wall ' + ' '.join(sanitize_args) + ) +@@ -807,4 +807,2 @@ + libs.append('-lprofiler') +- else: +- cflags.append('-O3') + if bundle_type.endswith('-freeze'): diff --git a/x11-terms/kitty/kitty-0.20.1.ebuild b/x11-terms/kitty/kitty-0.20.1.ebuild deleted file mode 100644 index ec22fd9a7763..000000000000 --- a/x11-terms/kitty/kitty-0.20.1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_8 ) - -inherit optfeature python-single-r1 toolchain-funcs xdg - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" - inherit git-r3 -else - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" -HOMEPAGE="https://github.com/kovidgoyal/kitty" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug wayland" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - media-libs/fontconfig - media-libs/freetype:2 - >=media-libs/harfbuzz-1.5.0:= - media-libs/lcms - media-libs/libcanberra - media-libs/libpng:0= - sys-apps/dbus - sys-libs/zlib - x11-libs/libxcb[xkb] - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libxkbcommon[X] - x11-libs/libXrandr - x11-terms/kitty-terminfo - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.17 - ) - $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6) -" - -DEPEND="${RDEPEND} - media-libs/mesa[X] - sys-libs/ncurses -" - -BDEPEND="virtual/pkgconfig" - -[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7" - -PATCHES=( - "${FILESDIR}"/${PN}-0.20.1-flags.patch - "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch - "${FILESDIR}"/${PN}-0.20.1-remove-terminfo.patch - "${FILESDIR}"/${PN}-0.20.1-tests.patch -) - -src_prepare() { - default - - # disable wayland as required - if ! use wayland; then - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die - # also disable wayland tests - sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die - sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die - fi - - # respect doc dir - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die - - tc-export CC -} - -src_compile() { - "${EPYTHON}" setup.py \ - --verbose $(usex debug --debug "") \ - --libdir-name $(get_libdir) \ - --update-check-interval=0 \ - linux-package || die "Failed to compile kitty." -} - -src_test() { - export KITTY_CONFIG_DIRECTORY=${T} - "${EPYTHON}" test.py || die -} - -src_install() { - insinto /usr - doins -r linux-package/* - dobin linux-package/bin/kitty - python_fix_shebang "${ED}" -} - -pkg_postinst() { - xdg_icon_cache_update - optfeature "Displaying images in the terminal" virtual/imagemagick-tools -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-terms/kitty/kitty-0.20.3.ebuild b/x11-terms/kitty/kitty-0.20.3.ebuild deleted file mode 100644 index 31b802b51d19..000000000000 --- a/x11-terms/kitty/kitty-0.20.3.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -inherit optfeature python-single-r1 toolchain-funcs xdg - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" - inherit git-r3 -else - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" -HOMEPAGE="https://github.com/kovidgoyal/kitty" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug wayland" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - media-libs/fontconfig - media-libs/freetype:2 - >=media-libs/harfbuzz-1.5.0:= - media-libs/lcms - media-libs/libcanberra - media-libs/libpng:0= - sys-apps/dbus - sys-libs/zlib - x11-libs/libxcb[xkb] - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libxkbcommon[X] - x11-libs/libXrandr - x11-terms/kitty-terminfo - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.17 - ) -" - -DEPEND="${RDEPEND} - media-libs/mesa[X] - sys-libs/ncurses -" - -BDEPEND="virtual/pkgconfig" - -[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7" - -PATCHES=( - "${FILESDIR}"/${PN}-0.20.3-flags.patch - "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch - "${FILESDIR}"/${PN}-0.20.1-remove-terminfo.patch - "${FILESDIR}"/${PN}-0.20.1-tests.patch -) - -src_prepare() { - default - - # disable wayland as required - if ! use wayland; then - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die - # also disable wayland tests - sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die - sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die - fi - - # respect doc dir - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die - - tc-export CC -} - -src_compile() { - "${EPYTHON}" setup.py \ - --verbose $(usex debug --debug "") \ - --libdir-name $(get_libdir) \ - --update-check-interval=0 \ - linux-package || die "Failed to compile kitty." -} - -src_test() { - export KITTY_CONFIG_DIRECTORY=${T} - "${EPYTHON}" test.py || die -} - -src_install() { - insinto /usr - doins -r linux-package/* - dobin linux-package/bin/kitty - python_fix_shebang "${ED}" -} - -pkg_postinst() { - xdg_icon_cache_update - optfeature "Displaying images in the terminal" virtual/imagemagick-tools -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-terms/kitty/kitty-0.21.2.ebuild b/x11-terms/kitty/kitty-0.21.2.ebuild deleted file mode 100644 index 38d21756bb24..000000000000 --- a/x11-terms/kitty/kitty-0.21.2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -inherit optfeature python-single-r1 toolchain-funcs xdg - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" - inherit git-r3 -else - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" -HOMEPAGE="https://github.com/kovidgoyal/kitty" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug wayland" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - media-libs/fontconfig - media-libs/freetype:2 - >=media-libs/harfbuzz-1.5.0:= - media-libs/lcms - media-libs/libcanberra - media-libs/libpng:0= - sys-apps/dbus - sys-libs/zlib - x11-libs/libxcb[xkb] - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libxkbcommon[X] - x11-libs/libXrandr - x11-misc/xkeyboard-config - x11-terms/kitty-terminfo - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.17 - ) -" - -DEPEND="${RDEPEND} - media-libs/mesa[X] - sys-libs/ncurses -" - -BDEPEND="virtual/pkgconfig" - -[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7" - -PATCHES=( - "${FILESDIR}"/${PN}-0.21.2-flags.patch - "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch - "${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch - "${FILESDIR}"/${PN}-0.20.1-tests.patch -) - -src_prepare() { - default - - # disable wayland as required - if ! use wayland; then - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die - # also disable wayland tests - sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die - sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die - fi - - # respect doc dir - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die - - tc-export CC -} - -src_compile() { - "${EPYTHON}" setup.py \ - --verbose $(usex debug --debug "") \ - --libdir-name $(get_libdir) \ - --update-check-interval=0 \ - linux-package || die "Failed to compile kitty." -} - -src_test() { - export KITTY_CONFIG_DIRECTORY=${T} - "${EPYTHON}" test.py || die -} - -src_install() { - insinto /usr - doins -r linux-package/* - dobin linux-package/bin/kitty - python_fix_shebang "${ED}" -} - -pkg_postinst() { - xdg_icon_cache_update - optfeature "Displaying images in the terminal" virtual/imagemagick-tools -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-terms/kitty/kitty-0.23.1-r1.ebuild b/x11-terms/kitty/kitty-0.23.1-r1.ebuild new file mode 100644 index 000000000000..ea4af33df1cd --- /dev/null +++ b/x11-terms/kitty/kitty-0.23.1-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +inherit optfeature python-single-r1 toolchain-funcs xdg + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" +else + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~x86" +fi + +DESCRIPTION="Fast, feature-rich, GPU-based terminal" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/" + +LICENSE="GPL-3" +SLOT="0" +IUSE="+X debug test wayland" +REQUIRED_USE=" + || ( X wayland ) + ${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + media-libs/fontconfig + media-libs/freetype:2 + media-libs/harfbuzz:= + media-libs/lcms:2 + media-libs/libglvnd[X?] + media-libs/libpng:= + sys-apps/dbus + sys-libs/zlib:= + x11-libs/libxkbcommon[X?] + x11-misc/xkeyboard-config + ~x11-terms/kitty-terminfo-${PV} + >x11-terms/kitty-terminfo-0.23.1-r0 + X? ( x11-libs/libX11 ) + wayland? ( dev-libs/wayland )" +DEPEND=" + ${RDEPEND} + X? ( + x11-base/xorg-proto + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + ) + wayland? ( dev-libs/wayland-protocols )" +BDEPEND=" + ${PYTHON_DEPS} + sys-libs/ncurses + virtual/pkgconfig + test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) + wayland? ( dev-util/wayland-scanner )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.23.1-flags.patch +) + +src_prepare() { + default + + sed "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" -i setup.py || die + sed "s/else linux_backends/else [$(usev X "'x11',")$(usev wayland "'wayland'")]/" \ + -i kitty_tests/check_build.py || die + use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.py || die + + # skip docs for live version + [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die +} + +src_compile() { + tc-export CC + export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) + + local setup=( + ${EPYTHON} setup.py + --disable-link-time-optimization + --ignore-compiler-warnings + --libdir-name=$(get_libdir) + --update-check-interval=0 + --verbose + $(usev debug --debug) + linux-package + ) + + echo "${setup[*]}" + "${setup[@]}" || die "setup.py failed to compile ${PN}" + + [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die + rm -r linux-package/share/terminfo || die +} + +src_test() { + PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ + ${EPYTHON} test.py || die +} + +src_install() { + insinto /usr + doins -r linux-package/. + + fperms +x /usr/bin/kitty +} + +pkg_postinst() { + xdg_icon_cache_update + + optfeature "displaying images in the terminal" \ + media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] + + optfeature "audio-based terminal bell support" media-libs/libcanberra +} diff --git a/x11-terms/kitty/kitty-0.23.1.ebuild b/x11-terms/kitty/kitty-0.23.1.ebuild deleted file mode 100644 index ee7d59c7435c..000000000000 --- a/x11-terms/kitty/kitty-0.23.1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -inherit optfeature python-single-r1 toolchain-funcs xdg - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" - inherit git-r3 -else - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" -HOMEPAGE="https://github.com/kovidgoyal/kitty" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug wayland" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - media-libs/fontconfig - media-libs/freetype:2 - >=media-libs/harfbuzz-1.5.0:= - media-libs/lcms - media-libs/libcanberra - media-libs/libpng:0= - sys-apps/dbus - sys-libs/zlib - x11-libs/libxcb[xkb] - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libxkbcommon[X] - x11-libs/libXrandr - x11-misc/xkeyboard-config - x11-terms/kitty-terminfo - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.17 - ) -" - -DEPEND="${RDEPEND} - media-libs/mesa[X] - sys-libs/ncurses -" - -BDEPEND="virtual/pkgconfig" - -[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7" - -PATCHES=( - "${FILESDIR}"/${PN}-0.21.2-flags.patch - "${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch - "${FILESDIR}"/${PN}-0.20.1-tests.patch -) - -src_prepare() { - default - - # disable wayland as required - if ! use wayland; then - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die - # also disable wayland tests - sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die - sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die - fi - - # respect doc dir - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die - - tc-export CC -} - -src_compile() { - "${EPYTHON}" setup.py \ - --verbose $(usex debug --debug "") \ - --libdir-name $(get_libdir) \ - --update-check-interval=0 \ - linux-package || die "Failed to compile kitty." -} - -src_test() { - export KITTY_CONFIG_DIRECTORY=${T} - "${EPYTHON}" test.py || die -} - -src_install() { - insinto /usr - doins -r linux-package/* - dobin linux-package/bin/kitty - python_fix_shebang "${ED}" -} - -pkg_postinst() { - xdg_icon_cache_update - optfeature "Displaying images in the terminal" virtual/imagemagick-tools -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index eaa36cc37bd5..45697c8607df 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -1,106 +1,118 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) inherit optfeature python-single-r1 toolchain-funcs xdg -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" +if [[ ${PV} == 9999 ]] ; then inherit git-r3 + EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" else SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~x86" fi -DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" -HOMEPAGE="https://github.com/kovidgoyal/kitty" +DESCRIPTION="Fast, feature-rich, GPU-based terminal" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/" LICENSE="GPL-3" SLOT="0" -IUSE="debug wayland" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +IUSE="+X debug test wayland" +REQUIRED_USE=" + || ( X wayland ) + ${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} media-libs/fontconfig media-libs/freetype:2 - >=media-libs/harfbuzz-1.5.0:= - media-libs/libcanberra - media-libs/libpng:0= - media-libs/lcms + media-libs/harfbuzz:= + media-libs/lcms:2 + media-libs/libglvnd[X?] + media-libs/libpng:= + net-libs/librsync:= sys-apps/dbus - sys-libs/zlib - x11-libs/libxcb[xkb] - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libxkbcommon[X] - x11-libs/libXrandr - x11-terms/kitty-terminfo - wayland? ( - dev-libs/wayland - >=dev-libs/wayland-protocols-1.17 + sys-libs/zlib:= + x11-libs/libxkbcommon[X?] + x11-misc/xkeyboard-config + ~x11-terms/kitty-terminfo-${PV} + X? ( x11-libs/libX11 ) + wayland? ( dev-libs/wayland )" +DEPEND=" + ${RDEPEND} + X? ( + x11-base/xorg-proto + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr ) -" - -DEPEND="${RDEPEND} - media-libs/mesa[X(+)] + wayland? ( dev-libs/wayland-protocols )" +BDEPEND=" + ${PYTHON_DEPS} sys-libs/ncurses -" - -BDEPEND="virtual/pkgconfig" - -[[ ${PV} == *9999 ]] && BDEPEND+=" - $(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_USEDEP}]')" + virtual/pkgconfig + test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) + wayland? ( dev-util/wayland-scanner )" PATCHES=( - "${FILESDIR}"/${PN}-0.21.2-flags.patch - "${FILESDIR}"/${PN}-0.21.2-remove-terminfo.patch - "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch + "${FILESDIR}"/${PN}-0.23.1-flags.patch ) src_prepare() { default - # disable wayland as required - if ! use wayland; then - sed -i "/'x11 wayland'/s/ wayland//" setup.py || die - fi + sed "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" -i setup.py || die + sed "s/else linux_backends/else [$(usev X "'x11',")$(usev wayland "'wayland'")]/" \ + -i kitty_tests/check_build.py || die + use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.py || die - # respect doc dir - sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die - - tc-export CC + # skip docs for live version + [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die } src_compile() { - "${EPYTHON}" setup.py \ - --verbose $(usex debug --debug "") \ - --libdir-name $(get_libdir) \ - --update-check-interval=0 \ - linux-package || die "Failed to compile kitty." + tc-export CC + export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) + + local setup=( + ${EPYTHON} setup.py + --disable-link-time-optimization + --ignore-compiler-warnings + --libdir-name=$(get_libdir) + --update-check-interval=0 + --verbose + $(usev debug --debug) + linux-package + ) + + echo "${setup[*]}" + "${setup[@]}" || die "setup.py failed to compile ${PN}" + + [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die + rm -r linux-package/share/terminfo || die } src_test() { - export KITTY_CONFIG_DIRECTORY=${T} - "${EPYTHON}" test.py || die + PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ + ${EPYTHON} test.py || die } src_install() { insinto /usr - doins -r linux-package/* - dobin linux-package/bin/kitty - python_fix_shebang "${ED}" + doins -r linux-package/. + + fperms +x /usr/bin/kitty } pkg_postinst() { xdg_icon_cache_update - optfeature "Displaying images in the terminal" virtual/imagemagick-tools -} -pkg_postrm() { - xdg_icon_cache_update + optfeature "displaying images in the terminal" \ + media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] + + optfeature "audio-based terminal bell support" media-libs/libcanberra } diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml index 5294b1beb486..c4f584c5169f 100644 --- a/x11-terms/kitty/metadata.xml +++ b/x11-terms/kitty/metadata.xml @@ -1,18 +1,20 @@ + + ionen@gentoo.org + Ionen Wolkens + pabloorduna98@gmail.com Pablo Orduna proxy-maint@gentoo.org - Gentoo Proxy Maintainers Project + Proxy Maintainers kovidgoyal/kitty - https://github.com/kovidgoyal/kitty/issues - https://sw.kovidgoyal.net/kitty https://sw.kovidgoyal.net/kitty/changelog -- cgit v1.2.3