[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/files/, app-editors/kakoune/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     7ccf31f2495eef82d25225a2bfa7fd25a6e8dce1
Author:     Ian Hixson <mujo <AT> sdf <DOT> org>
AuthorDate: Sat Aug  7 01:37:53 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Aug 23 05:41:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ccf31f2

app-editors/kakoune: Bump to 2020.09.01

Closes: https://bugs.gentoo.org/804912
Signed-off-by: Ian Hixson <mujo <AT> sdf.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-editors/kakoune/Manifest                       |  1 +
 ...2020.09.01-enable-ebuild-syntax-highlight.patch | 10 +++++
 .../kakoune/files/kakoune-2020.09.01-gcc-11.patch  | 11 +++++
 app-editors/kakoune/kakoune-2020.09.01.ebuild      | 47 ++++++++++++++++++++++
 4 files changed, 69 insertions(+)

diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index a71f3b22cf1..d0b4c27c83d 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1 +1,2 @@
 DIST kakoune-2020.01.16_p20200601.tar.gz 597946 BLAKE2B c3d831132e29ea46c4c92a942eae1b9eeaa30c68e17e7178b00277f45fdf76784386801627125c653b50507ebebcad282512446c0cff94f7234013aa8a17efd1 SHA512 b137fa71a151e80da50bfd980a264d1d0aa98d48e585794eb1429196a6c81ef51277cc15d5db015ce8550c1cf0d6fa29f5cdeefd3930e90e2a0480dd7bbe5bf8
+DIST kakoune-2020.09.01.tar.gz 612970 BLAKE2B 64084c2a4ff1ccf348caad8db04df9425828378bda28d163ffa6d198b3bd80d6d078ac0095dfc5adbae505e4d4259cd86185718a8012740417056db531ea72ec SHA512 acd9edd6b2a68219a4b5f68aaf4d785aa8c430abfdf5ccc994764f5ece8acb655adf64334027525115d3cbe819591de8496c3e54e2d806ce40c494443789e126

diff --git a/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch b/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
new file mode 100644
index 00000000000..d7b9083a428
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
@@ -0,0 +1,10 @@
+diff --git a/rc/filetype/gentoo-linux.kak b/rc/filetype/gentoo-linux.kak
+new file mode 100644
+index 00000000..251dad16
+--- /dev/null
++++ b/rc/filetype/gentoo-linux.kak
+@@ -0,0 +1,4 @@
++# portage ebuild file
++hook global BufCreate .*\.ebuild %{
++    set-option buffer filetype sh
++}

diff --git a/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch b/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
new file mode 100644
index 00000000000..d558c49347c
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/787029
+--- a/src/regex_impl.cc
++++ b/src/regex_impl.cc
+@@ -12,6 +12,7 @@
+ 
+ #include <cstdio>
+ #include <cstring>
++#include <limits>
+ 
+ namespace Kakoune
+ {

diff --git a/app-editors/kakoune/kakoune-2020.09.01.ebuild b/app-editors/kakoune/kakoune-2020.09.01.ebuild
new file mode 100644
index 00000000000..bf078a51afe
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2020.09.01.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Modal editor inspired by vim"
+HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"
+SRC_URI="https://github.com/mawww/kakoune/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:=[unicode(+)]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.09.01-enable-ebuild-syntax-highlight.patch
+	"${FILESDIR}"/${PN}-2020.09.01-gcc-11.patch
+)
+
+src_prepare() {
+	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	emake -C src all
+}
+
+src_test() {
+	emake -C src test
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
+
+	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
+	doman doc/kak.1
+}