3 files changed, 60 insertions, 0 deletions
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index fae8bafcada7..e8101de9fa35 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1 +1,2 @@
 DIST kakoune-2020.09.01.tar.gz 612970 BLAKE2B 64084c2a4ff1ccf348caad8db04df9425828378bda28d163ffa6d198b3bd80d6d078ac0095dfc5adbae505e4d4259cd86185718a8012740417056db531ea72ec SHA512 acd9edd6b2a68219a4b5f68aaf4d785aa8c430abfdf5ccc994764f5ece8acb655adf64334027525115d3cbe819591de8496c3e54e2d806ce40c494443789e126
+DIST kakoune-2021.08.28.tar.gz 654429 BLAKE2B 8cf769d2dea74fd8bab8261e4d79276af089d73753052fdd3776bff0adc72bc20c43f840350076e675c633de2175ad83960fa2ccf85fc852c7c81bd4888ced2b SHA512 1f4f0648959e94e45eb00f2398aa6897595457ef3ee4d1c6e18d494f3e68f8d3a0c4d0dbed88b6588fda61137a060c648ff635972731c0f29faef4cdc03c829f
diff --git a/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch b/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch
new file mode 100644
index 000000000000..b4a7cc439f36
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/rc/filetype/php.kak b/rc/filetype/php.kak
+index be03de9e..97bdbfe3 100644
+--- a/rc/filetype/php.kak
++++ b/rc/filetype/php.kak
+@@ -85,7 +85,7 @@ define-command -hidden php-indent-on-char %<
+ define-command -hidden php-insert-on-new-line %<
+     evaluate-commands -draft -itersel %<
+         # copy // comments or docblock * prefix and following white spaces
+-        try %{ execute-keys -draft s [^/] <ret> k <a-x> s ^\h*\K(?://|[*][^/])\h* <ret> y gh j P
++        try %{ execute-keys -draft s [^/] <ret> k <a-x> s ^\h*\K(?://|[*][^/])\h* <ret> y gh j P }
+         # append " * " on lines starting a multiline /** or /* comment
+         try %{ execute-keys -draft k <a-x> s ^\h*/[*][* ]? <ret> j gi i <space>*<space> }
+     >
diff --git a/app-editors/kakoune/kakoune-2021.08.28.ebuild b/app-editors/kakoune/kakoune-2021.08.28.ebuild
new file mode 100644
index 000000000000..9e9e650aa32c
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2021.08.28.ebuild
@@ -0,0 +1,46 @@
+# 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=""
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-php-filetype-fix.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
+}