From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EF518158003 for ; Wed, 10 Nov 2021 10:59:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45D5A2BC069; Wed, 10 Nov 2021 10:59:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47BCA2BC057 for ; Wed, 10 Nov 2021 10:59:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE110342B8E for ; Wed, 10 Nov 2021 10:59:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A0D44A for ; Wed, 10 Nov 2021 10:59:50 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1636541527.e88eeadfd2a4e605cbfe9ecb5c9ec425423fb35f.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/, x11-terms/kitty/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty/files/kitty-0.20.1-tests.patch x11-terms/kitty/files/kitty-0.21.2-flags.patch x11-terms/kitty/files/kitty-0.21.2-remove-terminfo.patch x11-terms/kitty/kitty-0.23.1.ebuild X-VCS-Directories: x11-terms/kitty/files/ x11-terms/kitty/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: e88eeadfd2a4e605cbfe9ecb5c9ec425423fb35f X-VCS-Branch: master Date: Wed, 10 Nov 2021 10:59:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 015dd744-939b-435d-a16f-bcb10d3f98ed X-Archives-Hash: 650d362b0cc140447fddaf37997ee0aa commit: e88eeadfd2a4e605cbfe9ecb5c9ec425423fb35f Author: Ionen Wolkens gentoo org> AuthorDate: Wed Nov 10 08:48:37 2021 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Nov 10 10:52:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88eeadf x11-terms/kitty: drop 0.23.1 Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/files/kitty-0.20.1-tests.patch | 11 --- x11-terms/kitty/files/kitty-0.21.2-flags.patch | 54 ---------- .../kitty/files/kitty-0.21.2-remove-terminfo.patch | 16 --- x11-terms/kitty/kitty-0.23.1.ebuild | 109 --------------------- 4 files changed, 190 deletions(-) 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 210898b888d..00000000000 --- 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.21.2-flags.patch b/x11-terms/kitty/files/kitty-0.21.2-flags.patch deleted file mode 100644 index 0e773c67765..00000000000 --- 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 39fe84b3b2a..00000000000 --- 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/kitty-0.23.1.ebuild b/x11-terms/kitty/kitty-0.23.1.ebuild deleted file mode 100644 index ee7d59c7435..00000000000 --- 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 -}