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

[John Helmert III]

commit:     987e94f56ebd5543cfa92c977e0974b8eed66cbb
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 17 19:09:07 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 20:36:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=987e94f5

x11-terms/kitty: drop 0.19.3

Bug: https://bugs.gentoo.org/784608
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 x11-terms/kitty/Manifest                           |   1 -
 .../kitty/files/kitty-0.16.0-remove-terminfo.patch |  14 ---
 x11-terms/kitty/files/kitty-0.17.2-flags.patch     |  50 ----------
 x11-terms/kitty/files/kitty-0.19.1-tests.patch     |  11 ---
 x11-terms/kitty/kitty-0.19.3.ebuild                | 107 ---------------------
 5 files changed, 183 deletions(-)

diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 41c4a129750..f5db726d325 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,4 +1,3 @@
-DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4
 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

diff --git a/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch
deleted file mode 100644
index 4b7352aa73b..00000000000
--- a/x11-terms/kitty/files/kitty-0.16.0-remove-terminfo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -837,11 +837,6 @@
-     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')
--    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.rgba', os.path.join(libdir, 'logo'))
-     shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo'))

diff --git a/x11-terms/kitty/files/kitty-0.17.2-flags.patch b/x11-terms/kitty/files/kitty-0.17.2-flags.patch
deleted file mode 100644
index 5a247679dc8..00000000000
--- a/x11-terms/kitty/files/kitty-0.17.2-flags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Respect user CFLAGS.
-
---- a/setup.py
-+++ b/setup.py
-@@ -236,7 +236,7 @@
-     if ccver >= (5, 0):
-         df += ' -Og'
-         float_conversion = '-Wfloat-conversion'
-     fortify_source = '-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'),
-@@ -217,7 +217,7 @@
-     cflags = os.environ.get(
-         'OVERRIDE_CFLAGS', (
-             '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
--            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+            ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
-         ).format(
-             float_conversion, std,
-             optimize,
-@@ -232,7 +232,7 @@
-     )
-     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')
-@@ -614,7 +614,7 @@
- 
- 
- def build_launcher(args, launcher_dir='.', bundle_type='source'):
--    cflags = '-Wall -Werror -fpie'.split()
-+    cflags = '-Wall -fpie'.split()
-     cppflags = []
-     libs = []
-     if args.profile or args.sanitize:
-@@ -626,8 +626,6 @@
-             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.19.1-tests.patch b/x11-terms/kitty/files/kitty-0.19.1-tests.patch
deleted file mode 100644
index ee489b0dce3..00000000000
--- a/x11-terms/kitty/files/kitty-0.19.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(base, 'launcher')]
-+        items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(base, '../linux-package/bin')]
-         seen: Set[str] = set()
-         for candidate in filter(None, items):
-             if candidate not in seen:

diff --git a/x11-terms/kitty/kitty-0.19.3.ebuild b/x11-terms/kitty/kitty-0.19.3.ebuild
deleted file mode 100644
index af521efe1f6..00000000000
--- a/x11-terms/kitty/kitty-0.19.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 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.17.2-flags.patch
-	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
-	"${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
-	"${FILESDIR}"/${PN}-0.19.1-tests.patch
-)
-
-src_prepare() {
-	default
-
-	# disable wayland as required
-	if ! use wayland; then
-		sed -i "/'x11 wayland'/s/ wayland//" setup.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
-}