[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/files/, app-editors/kakoune/
commit: 677c2f992c31a0b3e36a8c4c9647092ab2adcf02
Author: Ian Hixson sdf org>
AuthorDate: Wed Mar 1 03:40:27 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 19 03:10:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677c2f99
app-editors/kakoune: Fix gcc13 build bug #895264
Closes: https://bugs.gentoo.org/895264
Signed-off-by: Ian Hixson sdf.org>
Closes: https://github.com/gentoo/gentoo/pull/29867
Signed-off-by: Sam James gentoo.org>
.../kakoune/files/kakoune-2022.10.31-gcc13.patch | 29 ++
app-editors/kakoune/kakoune-2022.10.31.ebuild | 6 -
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/app-editors/kakoune/files/kakoune-2022.10.31-gcc13.patch
b/app-editors/kakoune/files/kakoune-2022.10.31-gcc13.patch
new file mode 100644
index ..6c093bcdb2eb
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2022.10.31-gcc13.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/895264
+https://github.com/mawww/kakoune/issues/4854
+
+diff --git a/src/keys.hh b/src/keys.hh
+index 0af1a5a8..ccafe336 100644
+--- a/src/keys.hh
b/src/keys.hh
+@@ -9,6 +9,8 @@
+ #include "unicode.hh"
+ #include "vector.hh"
+
++#include
++
+ namespace Kakoune
+ {
+
+diff --git a/src/ranked_match.hh b/src/ranked_match.hh
+index ec7fe626..62d6b8f0 100644
+--- a/src/ranked_match.hh
b/src/ranked_match.hh
+@@ -4,6 +4,8 @@
+ #include "string.hh"
+ #include "meta.hh"
+
++#include
++
+ namespace Kakoune
+ {
+
diff --git a/app-editors/kakoune/kakoune-2022.10.31.ebuild
b/app-editors/kakoune/kakoune-2022.10.31.ebuild
index 2e6ad9d352ed..9293c946c84a 100644
--- a/app-editors/kakoune/kakoune-2022.10.31.ebuild
+++ b/app-editors/kakoune/kakoune-2022.10.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,6 +15,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc13.patch
+)
+
src_prepare() {
sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
default
[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/files/, app-editors/kakoune/
commit: 18a70a0ee653b4426dcbbae9d789660572b1e25f
Author: Ian Hixson sdf org>
AuthorDate: Thu Oct 28 05:18:44 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 12 01:24:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a70a0e
app-editors/kakoune: Drop old version
Signed-off-by: Ian Hixson sdf.org>
Closes: https://github.com/gentoo/gentoo/pull/22736
Signed-off-by: Sam James gentoo.org>
app-editors/kakoune/Manifest | 1 -
.../kakoune-2021.08.28-php-filetype-fix.patch | 13 ---
app-editors/kakoune/kakoune-2021.08.28-r1.ebuild | 44 --
3 files changed, 58 deletions(-)
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 4af90d57da9..aeba3b8a0a5 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,2 +1 @@
-DIST kakoune-2021.08.28.tar.bz2 535791 BLAKE2B
b04f23b29def72659925b104a203033cd547ec9483225e35a216276716b2d31da76e1c4a239b60a1e72f3e3f4777997bc59560f6ccd4a0e3eaf509e537ed85ad
SHA512
a304f1ce3295196468784e27f019d155b5aa0305d90adf5ae65c74a9be4ee740df400ebeb819eb059bb42efee503daa988a2ea929fa6d60ec63ad408be9b575a
DIST kakoune-2021.10.28.tar.bz2 537860 BLAKE2B
b7a5bf27505af99e40b65eef1e6c34c2c7fb43b9e0a1b0be5f307cf658f830646f5289bb52c70456e2ba585247528df829de3825edffc40f525b218b0237396c
SHA512
60adf3d56006b5fde0b0acd8990501a858df6ed850201b603e2722fc893a873f2bb74f4be9caa35b6aa088ba7cd7aef86c0ca952168de92557c03b208461e0d2
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
deleted file mode 100644
index b4a7cc439f3..000
--- a/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 [^/] k s
^\h*\K(?://|[*][^/])\h* y gh j P
-+try %{ execute-keys -draft s [^/] k s
^\h*\K(?://|[*][^/])\h* y gh j P }
- # append " * " on lines starting a multiline /** or /* comment
- try %{ execute-keys -draft k s ^\h*/[*][* ]? j gi i
* }
- >
diff --git a/app-editors/kakoune/kakoune-2021.08.28-r1.ebuild
b/app-editors/kakoune/kakoune-2021.08.28-r1.ebuild
deleted file mode 100644
index 66fdc47a76c..000
--- a/app-editors/kakoune/kakoune-2021.08.28-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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/releases/download/v${PV}/${P}.tar.bz2;
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-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
-}
[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/files/, app-editors/kakoune/
commit: 7ccf31f2495eef82d25225a2bfa7fd25a6e8dce1
Author: Ian Hixson sdf org>
AuthorDate: Sat Aug 7 01:37:53 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Aug 23 05:41:40 2021 +
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 sdf.org>
Signed-off-by: Joonas Niilola 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 000..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 ..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 000..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
+ #include
++#include
+
+ 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 000..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
+}
[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/files/, app-editors/kakoune/
commit: 60d821c5d1cb49b5dca0e4869240dfa742b08209
Author: Jakov Smolic sartura hr>
AuthorDate: Fri Apr 30 16:08:13 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue May 4 22:17:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d821c5
app-editors/kakoune: Respect CFLAGS, fix gcc-11 compilation
Closes: https://bugs.gentoo.org/727558
Closes: https://bugs.gentoo.org/787029
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: Sam James gentoo.org>
.../kakoune/files/kakoune-2020.01.16-gcc-11.patch | 11 +
.../kakoune/kakoune-2020.01.16_p20200601.ebuild| 28 ++
2 files changed, 29 insertions(+), 10 deletions(-)
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
new file mode 100644
index 000..d558c49347c
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2020.01.16-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
+ #include
++#include
+
+ namespace Kakoune
+ {
diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
b/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
index bcbba488281..66bf600f407 100644
--- a/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
+++ b/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild
@@ -3,11 +3,13 @@
EAPI=7
-MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
+inherit toolchain-funcs
+MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883"
DESCRIPTION="Modal editor inspired by vim"
HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune;
SRC_URI="https://github.com/mawww/kakoune/archive/${MY_COMMIT}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/kakoune-${MY_COMMIT}"
LICENSE="Unlicense"
SLOT="0"
@@ -17,25 +19,31 @@ DEPEND="sys-libs/ncurses:0=[unicode]"
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
-PATCHES=(
"${FILESDIR}"/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch
+ "${FILESDIR}"/${PN}-2020.01.16-gcc-11.patch
+)
-S="${WORKDIR}/kakoune-${MY_COMMIT}"
+src_prepare() {
+ sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
+ default
+}
-src_configure() { :; }
+src_configure() {
+ tc-export CXX
+}
src_compile() {
- cd src/ || die
- emake all
+ emake -C src all
}
src_test() {
- cd src/ || die
- emake test
+ emake -C src test
}
src_install() {
- emake PREFIX="${D}"/usr docdir="${D}/usr/share/doc/${PF}" install
+ emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
- rm "${D}/usr/share/man/man1/kak.1.gz" || die
+ rm "${ED}/usr/share/man/man1/kak.1.gz" || die
doman doc/kak.1
}
[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/files/, app-editors/kakoune/
commit: 61657b913f9940794c93d2a80d8a6bdf5a65bee4
Author: Mykyta Holubakha gmail com>
AuthorDate: Mon Nov 20 00:04:24 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Nov 29 23:19:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61657b91
app-editors/kakoune: drop old 0_pre20170523
app-editors/kakoune/Manifest | 1 -
.../files/kakoune-0_pre20170523-makefile.patch | 31 --
app-editors/kakoune/kakoune-0_pre20170523.ebuild | 49 --
3 files changed, 81 deletions(-)
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index d4876ffa11d..ac6713aa550 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,2 +1 @@
-DIST kakoune-0_pre20170523.tar.gz 420837 SHA256
3a083916729336dfd9e1e49cda62b5e3e881dbda7d6c7b5826377d5af15b1af9 SHA512
6d7d8f7afda75b824e4150512d9e0710cf22ef79af985c68b724a0f8e6949e5b0e7aab288f165a229f17706b30b51b462305538c7b56fd50689019118e913219
WHIRLPOOL
2e3a4c6b57944be46dbc8ddbc466fe3953453719146f4feabf8ae9688248a0d20ba2da3379fc7a503e7de7669df5f92d02e25dfc54c711a6ecdbee133b7a6ef8
DIST kakoune-0_pre20171120.tar.gz 460659 SHA256
10aea28840e2b58ce224fbf54c899797852bb0361e8c6363f0cc6af451d30b65 SHA512
0208fd932dcf6cef3fac3338dfc15f0ba36ed4e3fa282cc5ffac5ad823f91b553a8c34747ff33ec4382257a1eb71f21181b63595031f9f237cba3bc8eeda3626
WHIRLPOOL
d611723d726f52ba08ef1580a7d286b853d78722374897ad78743eba3946e995aa89da7ca2cbb61472d3245101ef1bef9aa62b113b949494cead061fa7a961c9
diff --git a/app-editors/kakoune/files/kakoune-0_pre20170523-makefile.patch
b/app-editors/kakoune/files/kakoune-0_pre20170523-makefile.patch
deleted file mode 100644
index b30238d6f94..000
--- a/app-editors/kakoune/files/kakoune-0_pre20170523-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index dbef95d9..70f16b32 100644
a/src/Makefile
-+++ b/src/Makefile
-@@ -6,7 +6,6 @@ ifeq ($(debug),yes)
- suffix := .debug
- else
- ifeq ($(debug),no)
--CXXFLAGS += -O3
- suffix := .opt
- else
- $(error debug should be either yes or no)
-@@ -22,8 +21,6 @@ mandocs := $(docs:.asciidoc=.gz)
- PREFIX ?= /usr/local
- DESTDIR ?= # root dir
-
--NCURSESW_INCLUDE ?= /usr/include/ncursesw
--
- bindir := $(DESTDIR)$(PREFIX)/bin
- sharedir := $(DESTDIR)$(PREFIX)/share/kak
- docdir := $(DESTDIR)$(PREFIX)/share/doc/kak
-@@ -49,8 +46,7 @@ else ifneq (,$(findstring CYGWIN,$(os)))
- CPPFLAGS += -D_XOPEN_SOURCE=700
- LIBS += -lncursesw -lboost_regex -ldbghelp
- else
--LIBS += -lncursesw -lboost_regex
--CPPFLAGS += -I$(NCURSESW_INCLUDE)
-+LIBS += -lboost_regex
- LDFLAGS += -rdynamic
- endif
-
diff --git a/app-editors/kakoune/kakoune-0_pre20170523.ebuild
b/app-editors/kakoune/kakoune-0_pre20170523.ebuild
deleted file mode 100644
index c03979ababe..000
--- a/app-editors/kakoune/kakoune-0_pre20170523.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs vcs-snapshot versionator
-
-REF="55d1d1020d215730737554045537cf3a8877c46a"
-
-DESCRIPTION="Selection-oriented code editor inspired by vim"
-HOMEPAGE="https://github.com/mawww/kakoune;
-SRC_URI="https://github.com/mawww/${PN}/tarball/${REF} -> ${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static"
-
-RDEPEND="
- sys-libs/ncurses:0=[unicode]
- dev-libs/boost:=
-"
-DEPEND="
- app-text/asciidoc
- virtual/pkgconfig
- ${RDEPEND}
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0_pre20170523-makefile.patch" )
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if tc-is-gcc && ! version_is_at_least 5.0 $(gcc-version); then
- die "Clang or GCC >=5.0 is required to build this
version"
- fi
- fi
-}
-
-src_configure() {
- append-cppflags $($(tc-getPKG_CONFIG) --cflags ncursesw)
- append-libs $($(tc-getPKG_CONFIG) --libs ncursesw)
- tc-export CXX
- export debug=$(usex debug)
- export static=$(usex static)
-}
-
-src_install() {
- emake -C src DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
docdir="${ED%/}/usr/share/doc/${PF}" install
-}
[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/files/, app-editors/kakoune/
commit: fbffc0e8d920f3492b682511ed24435388693c7e
Author: Mykyta Holubakha gmail com>
AuthorDate: Thu May 5 18:14:19 2016 +
Commit: Ian Delaney gentoo org>
CommitDate: Fri May 6 10:54:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbffc0e8
app-editors/kakoune: new ebuild
initial vns.; a snapshot 2016.05.05ebuild, and a live ebuild
Closes: https://github.com/gentoo/gentoo/pull/1414
Signed-off-by: Ian Delaney gentoo.org>
app-editors/kakoune/Manifest | 1 +
app-editors/kakoune/files/kakoune-makefile.patch | 38 +++
app-editors/kakoune/kakoune-2016.05.05.ebuild| 48
app-editors/kakoune/kakoune-.ebuild | 46 +++
app-editors/kakoune/metadata.xml | 15
5 files changed, 148 insertions(+)
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
new file mode 100644
index 000..f74622d
--- /dev/null
+++ b/app-editors/kakoune/Manifest
@@ -0,0 +1 @@
+DIST kakoune-2016.05.05.tar.gz 367575 SHA256
e79655b89d6138547d7158e715b520c98316b0358ced6c356496b361c9ea0049 SHA512
9b6cc2c9c6c356a27f5a42a226ba2fb2ce32e21e795423a6354127f9dce7edd423e61a9356a0582d609efc4c28dd012788556cc32ba3f8f791a901f07a36bbc8
WHIRLPOOL
e71748f69bca77dd9cd6c02c92f032123d322861bf86ab63bd5561b1f7957ec68c6b7ce0e1f8dd493166cf22aceae7cd49e6ffd42816c7c265712e554b224fe0
diff --git a/app-editors/kakoune/files/kakoune-makefile.patch
b/app-editors/kakoune/files/kakoune-makefile.patch
new file mode 100644
index 000..076c42f
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-makefile.patch
@@ -0,0 +1,38 @@
+diff --git a/src/Makefile b/src/Makefile
+index c79c270..9409a8c 100644
+--- a/src/Makefile
b/src/Makefile
+@@ -3,10 +3,10 @@ pedantic ?= yes
+
+ ifeq ($(debug),yes)
+ CPPFLAGS += -DKAK_DEBUG
++CXXFLAGS += -g
+ suffix := .debug
+ else
+ ifeq ($(debug),no)
+-CXXFLAGS += -O3
+ suffix := .opt
+ else
+ $(error debug should be either yes or no)
+@@ -26,8 +26,6 @@ mandocs := $(docs:.asciidoc=.gz)
+ PREFIX ?= /usr/local
+ DESTDIR ?= # root dir
+
+-NCURSESW_INCLUDE ?= /usr/include/ncursesw
+-
+ bindir := $(DESTDIR)$(PREFIX)/bin
+ sharedir := $(DESTDIR)$(PREFIX)/share/kak
+ docdir := $(DESTDIR)$(PREFIX)/share/doc/kak
+@@ -53,11 +51,10 @@ else ifneq (,$(findstring CYGWIN,$(os)))
+ LIBS += -lncursesw -lboost_regex -ldbghelp
+ else
+ LIBS += -lncursesw -lboost_regex
+-CPPFLAGS += -I$(NCURSESW_INCLUDE)
+ LDFLAGS += -rdynamic
+ endif
+
+-CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare -Wno-address
++CXXFLAGS += -std=gnu++11 -Wall -Wno-reorder -Wno-sign-compare -Wno-address
+
+ kak : $(objects)
+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(objects) $(LIBS) -o $@
diff --git a/app-editors/kakoune/kakoune-2016.05.05.ebuild
b/app-editors/kakoune/kakoune-2016.05.05.ebuild
new file mode 100644
index 000..da48501
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2016.05.05.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs vcs-snapshot
+
+REF="9298efd19bd024f96df3eab0cef92d03581969ba"
+
+DESCRIPTION="Selection-oriented code editor inspired by vim"
+HOMEPAGE="https://github.com/mawww/kakoune;
+SRC_URI="https://github.com/mawww/${PN}/tarball/${REF} -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ sys-libs/ncurses:*[unicode]
+ dev-libs/boost
+"
+DEPEND="
+ app-text/asciidoc
+ virtual/pkgconfig
+ ${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
+
+src_configure() {
+ append-cppflags $(pkg-config --cflags ncursesw)
+ export CXX=$(tc-getCXX)
+ export debug=$(usex debug)
+}
+
+src_compile() {
+ emake -C src
+}
+
+src_test() {
+ emake -C src test
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" PREFIX="/usr" install
+}
diff --git a/app-editors/kakoune/kakoune-.ebuild
b/app-editors/kakoune/kakoune-.ebuild
new file mode 100644
index 000..f448c1b
--- /dev/null
+++ b/app-editors/kakoune/kakoune-.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs git-r3
+
+DESCRIPTION="Selection-oriented code editor inspired by vim"
+HOMEPAGE="https://github.com/mawww/kakoune;
+EGIT_REPO_URI="https://github.com/mawww/kakoune.git;
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug"
+
+RDEPEND="
+ sys-libs/ncurses:*[unicode]
+ dev-libs/boost
+"
+DEPEND="
+ app-text/asciidoc
+ virtual/pkgconfig
+ ${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
+
+src_configure() {
+ append-cppflags $(pkg-config --cflags ncursesw)
+ export
