Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/, app-editors/kakoune/files/
Date: Mon, 23 Aug 2021 05:41:52
Message-Id: 1629697300.a56555b9235c33a7a3475fdf070b3261c756ad4b.juippis@gentoo
1 commit: a56555b9235c33a7a3475fdf070b3261c756ad4b
2 Author: Ian Hixson <mujo <AT> sdf <DOT> org>
3 AuthorDate: Sat Aug 7 01:44:33 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 23 05:41:40 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56555b9
7
8 app-editors/kakoune: Drop old version
9
10 Signed-off-by: Ian Hixson <mujo <AT> sdf.org>
11 Closes: https://github.com/gentoo/gentoo/pull/21902
12 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
13
14 app-editors/kakoune/Manifest | 1 -
15 ...2020.01.16-enable-ebuild-syntax-highlight.patch | 15 -------
16 .../kakoune/files/kakoune-2020.01.16-gcc-11.patch | 11 -----
17 .../kakoune/kakoune-2020.01.16_p20200601-r1.ebuild | 49 ----------------------
18 4 files changed, 76 deletions(-)
19
20 diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
21 index d0b4c27c83d..fae8bafcada 100644
22 --- a/app-editors/kakoune/Manifest
23 +++ b/app-editors/kakoune/Manifest
24 @@ -1,2 +1 @@
25 -DIST kakoune-2020.01.16_p20200601.tar.gz 597946 BLAKE2B c3d831132e29ea46c4c92a942eae1b9eeaa30c68e17e7178b00277f45fdf76784386801627125c653b50507ebebcad282512446c0cff94f7234013aa8a17efd1 SHA512 b137fa71a151e80da50bfd980a264d1d0aa98d48e585794eb1429196a6c81ef51277cc15d5db015ce8550c1cf0d6fa29f5cdeefd3930e90e2a0480dd7bbe5bf8
26 DIST kakoune-2020.09.01.tar.gz 612970 BLAKE2B 64084c2a4ff1ccf348caad8db04df9425828378bda28d163ffa6d198b3bd80d6d078ac0095dfc5adbae505e4d4259cd86185718a8012740417056db531ea72ec SHA512 acd9edd6b2a68219a4b5f68aaf4d785aa8c430abfdf5ccc994764f5ece8acb655adf64334027525115d3cbe819591de8496c3e54e2d806ce40c494443789e126
27
28 diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch b/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
29 deleted file mode 100644
30 index 726968e0e8c..00000000000
31 --- a/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
32 +++ /dev/null
33 @@ -1,15 +0,0 @@
34 -diff -Naur a/rc/filetype/sh.kak b/rc/filetype/sh.kak
35 ---- a/rc/filetype/sh.kak 2020-01-16 11:52:20.000000000 +0200
36 -+++ b/rc/filetype/sh.kak 2020-05-25 15:50:20.417809942 +0300
37 -@@ -2,6 +2,11 @@
38 - set-option buffer filetype sh
39 - }
40 -
41 -+hook global BufCreate .*\.ebuild %{
42 -+ set-option buffer filetype sh
43 -+}
44 -+
45 -+
46 - hook global WinSetOption filetype=sh %{
47 - require-module sh
48 - set-option window static_words %opt{sh_static_words}
49
50 diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch b/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
51 deleted file mode 100644
52 index d558c49347c..00000000000
53 --- a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
54 +++ /dev/null
55 @@ -1,11 +0,0 @@
56 -https://bugs.gentoo.org/787029
57 ---- a/src/regex_impl.cc
58 -+++ b/src/regex_impl.cc
59 -@@ -12,6 +12,7 @@
60 -
61 - #include <cstdio>
62 - #include <cstring>
63 -+#include <limits>
64 -
65 - namespace Kakoune
66 - {
67
68 diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild b/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild
69 deleted file mode 100644
70 index 21dafc2dd2c..00000000000
71 --- a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild
72 +++ /dev/null
73 @@ -1,49 +0,0 @@
74 -# Copyright 2020-2021 Gentoo Authors
75 -# Distributed under the terms of the GNU General Public License v2
76 -
77 -EAPI=7
78 -
79 -inherit toolchain-funcs
80 -
81 -MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
82 -DESCRIPTION="Modal editor inspired by vim"
83 -HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
84 -SRC_URI="https://github.com/mawww/kakoune/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
85 -S="${WORKDIR}/kakoune-${MY_COMMIT}"
86 -
87 -LICENSE="Unlicense"
88 -SLOT="0"
89 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
90 -
91 -DEPEND="sys-libs/ncurses:=[unicode(+)]"
92 -RDEPEND="${DEPEND}"
93 -BDEPEND="virtual/pkgconfig"
94 -
95 -PATCHES=(
96 - "${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch
97 - "${FILESDIR}"/${PN}-2020.01.16-gcc-11.patch
98 -)
99 -
100 -src_prepare() {
101 - sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
102 - default
103 -}
104 -
105 -src_configure() {
106 - tc-export CXX
107 -}
108 -
109 -src_compile() {
110 - emake -C src all
111 -}
112 -
113 -src_test() {
114 - emake -C src test
115 -}
116 -
117 -src_install() {
118 - emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
119 -
120 - rm "${ED}/usr/share/man/man1/kak.1.gz" || die
121 - doman doc/kak.1
122 -}