[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/, app-editors/kakoune/files/
commit: 75ea56ddb2052f91951e83b4d5e80ed1fc611f6f
Author: Ian Hixson sdf org>
AuthorDate: Wed May 18 18:10:13 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu May 19 01:57:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ea56dd
app-editors/kakoune: Bump to 2021.11.08-r1
Fix build with gcc-12.1.0 bug #840647
Patch taken from upstream and will no longer be needed once there is a
new release.
See https://github.com/mawww/kakoune/issues/4544
and https://github.com/mawww/kakoune/pull/4549
for additional details.
Closes: https://bugs.gentoo.org/840647
Signed-off-by: Ian Hixson sdf.org>
Closes: https://github.com/gentoo/gentoo/pull/25551
Signed-off-by: Sam James gentoo.org>
.../kakoune/files/kakoune-2021.11.08-gcc12.patch | 58 ++
app-editors/kakoune/kakoune-2021.11.08-r1.ebuild | 44
2 files changed, 102 insertions(+)
diff --git a/app-editors/kakoune/files/kakoune-2021.11.08-gcc12.patch
b/app-editors/kakoune/files/kakoune-2021.11.08-gcc12.patch
new file mode 100644
index ..7f1101cdbf49
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2021.11.08-gcc12.patch
@@ -0,0 +1,58 @@
+https://bugs.gentoo.org/840647
+https://github.com/mawww/kakoune/issues/4544
+https://github.com/mawww/kakoune/pull/4549
+https://github.com/mawww/kakoune/commit/d1ea2ffa600fd2a7b14e415b68ceedba3325c5db
+
+commit d1ea2ffa600fd2a7b14e415b68ceedba3325c5db
+Author: Tim Allen
+Date: Sat Feb 12 21:35:33 2022 +1100
+
+Make Color::validate_alpha() a constexpr function.
+
+We call it from a constexpr constructor, so it needs to be constexpr
itself.
+
+Fixes #4544.
+
+diff --git a/src/color.cc b/src/color.cc
+index b355b9cf..dfe2e955 100644
+--- a/src/color.cc
b/src/color.cc
+@@ -34,13 +34,6 @@ bool is_color_name(StringView color)
+ return contains(color_names, color);
+ }
+
+-void Color::validate_alpha()
+-{
+-static_assert(RGB == 17);
+-if (a < RGB)
+-throw runtime_error("Colors alpha must be > 16");
+-}
+-
+ Color str_to_color(StringView color)
+ {
+ auto it = find_if(color_names, [&](const char* c){ return color == c; });
+diff --git a/src/color.hh b/src/color.hh
+index 943678ed..85babd98 100644
+--- a/src/color.hh
b/src/color.hh
+@@ -1,6 +1,7 @@
+ #ifndef color_hh_INCLUDED
+ #define color_hh_INCLUDED
+
++#include "exception.hh"
+ #include "hash.hh"
+ #include "meta.hh"
+ #include "assert.hh"
+@@ -55,7 +56,11 @@ struct Color
+ }
+
+ private:
+-void validate_alpha();
++constexpr void validate_alpha() {
++static_assert(RGB == 17);
++if (a < RGB)
++throw runtime_error("Colors alpha must be > 16");
++}
+ };
+
+ constexpr bool operator==(Color lhs, Color rhs)
diff --git a/app-editors/kakoune/kakoune-2021.11.08-r1.ebuild
b/app-editors/kakoune/kakoune-2021.11.08-r1.ebuild
new file mode 100644
index ..37633ce21f75
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2021.11.08-r1.ebuild
@@ -0,0 +1,44 @@
+# 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}-gcc12.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/, app-editors/kakoune/files/
commit: a65151c85de2a90be215dd2e02aba7211dcd3f60
Author: Ian Hixson sdf org>
AuthorDate: Thu Sep 2 21:12:56 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Sep 3 04:57:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a65151c8
app-editors/kakoune: Drop old version
Signed-off-by: Ian Hixson sdf.org>
Closes: https://github.com/gentoo/gentoo/pull/22198
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 deletions(-)
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index e8101de9fa3..0e6d7aafad9 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,2 +1 @@
-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-2020.09.01-enable-ebuild-syntax-highlight.patch
b/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
deleted file mode 100644
index d7b9083a428..000
---
a/app-editors/kakoune/files/kakoune-2020.09.01-enable-ebuild-syntax-highlight.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index d558c49347c..000
--- a/app-editors/kakoune/files/kakoune-2020.09.01-gcc-11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index bf078a51afe..000
--- a/app-editors/kakoune/kakoune-2020.09.01.ebuild
+++ /dev/null
@@ -1,47 +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/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/, app-editors/kakoune/files/
commit: 47eb2099bed4b561f99c668736717bf06d396472
Author: Ian Hixson sdf org>
AuthorDate: Thu Sep 2 21:10:52 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Sep 3 04:57:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47eb2099
app-editors/kakoune: Bump to 2021.08.28
Signed-off-by: Ian Hixson sdf.org>
Signed-off-by: Joonas Niilola gentoo.org>
app-editors/kakoune/Manifest | 1 +
.../kakoune-2021.08.28-php-filetype-fix.patch | 13 ++
app-editors/kakoune/kakoune-2021.08.28.ebuild | 46 ++
3 files changed, 60 insertions(+)
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index fae8bafcada..e8101de9fa3 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 000..b4a7cc439f3
--- /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 [^/] 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.ebuild
b/app-editors/kakoune/kakoune-2021.08.28.ebuild
new file mode 100644
index 000..9e9e650aa32
--- /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
+}
[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/, app-editors/kakoune/files/
commit: a56555b9235c33a7a3475fdf070b3261c756ad4b
Author: Ian Hixson sdf org>
AuthorDate: Sat Aug 7 01:44:33 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon Aug 23 05:41:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56555b9
app-editors/kakoune: Drop old version
Signed-off-by: Ian Hixson sdf.org>
Closes: https://github.com/gentoo/gentoo/pull/21902
Signed-off-by: Joonas Niilola gentoo.org>
app-editors/kakoune/Manifest | 1 -
...2020.01.16-enable-ebuild-syntax-highlight.patch | 15 ---
.../kakoune/files/kakoune-2020.01.16-gcc-11.patch | 11 -
.../kakoune/kakoune-2020.01.16_p20200601-r1.ebuild | 49 --
4 files changed, 76 deletions(-)
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index d0b4c27c83d..fae8bafcada 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,2 +1 @@
-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.01.16-enable-ebuild-syntax-highlight.patch
b/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
deleted file mode 100644
index 726968e0e8c..000
---
a/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/rc/filetype/sh.kak b/rc/filetype/sh.kak
a/rc/filetype/sh.kak 2020-01-16 11:52:20.0 +0200
-+++ b/rc/filetype/sh.kak 2020-05-25 15:50:20.417809942 +0300
-@@ -2,6 +2,11 @@
- set-option buffer filetype sh
- }
-
-+hook global BufCreate .*\.ebuild %{
-+set-option buffer filetype sh
-+}
-+
-+
- hook global WinSetOption filetype=sh %{
- require-module sh
- set-option window static_words %opt{sh_static_words}
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
deleted file mode 100644
index d558c49347c..000
--- a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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-r1.ebuild
b/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild
deleted file mode 100644
index 21dafc2dd2c..000
--- a/app-editors/kakoune/kakoune-2020.01.16_p20200601-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch
- "${FILESDIR}"/${PN}-2020.01.16-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/, app-editors/kakoune/files/
commit: d4d2574f88857ef7e7e82d61fecdc9365d9aa4ce
Author: Joonas Niilola gentoo org>
AuthorDate: Mon May 25 13:06:58 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon May 25 13:06:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d2574f
app-editors/kakoune: bump to 2020-01-16 release
Closes: https://bugs.gentoo.org/674642
Closes: https://bugs.gentoo.org/722038
Closes: https://bugs.gentoo.org/723514
Signed-off-by: Joonas Niilola gentoo.org>
app-editors/kakoune/Manifest | 1 +
...2020.01.16-enable-ebuild-syntax-highlight.patch | 15 +
app-editors/kakoune/kakoune-2020.01.16.ebuild | 39 ++
3 files changed, 55 insertions(+)
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 22738c776b9..aa2eb431cdd 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1 +1,2 @@
DIST kakoune-0_pre20171120.tar.gz 460659 BLAKE2B
443583e5d766b227f678f9adec76f06a0dfe6a29e2d6f38896b20a911e08e933e1e631d1018e1510a49fbb71b4b0258029fd33ece8c478bd228ef67b6fae939a
SHA512
0208fd932dcf6cef3fac3338dfc15f0ba36ed4e3fa282cc5ffac5ad823f91b553a8c34747ff33ec4382257a1eb71f21181b63595031f9f237cba3bc8eeda3626
+DIST kakoune-2020.01.16.tar.gz 579837 BLAKE2B
46abfd7f2bf2db6f9755a5b4f547e63e72ac7eef46ad0903dac08d0f422774632ac5aa3dc1e6c69aa6f0527bdff0ea1792574933ceb35b2495927f747be94aaf
SHA512
81a0fb522fd7f289ede36f966e815d03550df389b05d27fa430474dd55a90cc0e1c5231e660328040f3bd79d155d37b7b135b52b93cee536c15d13fc9d06baa0
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
new file mode 100644
index 000..726968e0e8c
--- /dev/null
+++
b/app-editors/kakoune/files/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch
@@ -0,0 +1,15 @@
+diff -Naur a/rc/filetype/sh.kak b/rc/filetype/sh.kak
+--- a/rc/filetype/sh.kak 2020-01-16 11:52:20.0 +0200
b/rc/filetype/sh.kak 2020-05-25 15:50:20.417809942 +0300
+@@ -2,6 +2,11 @@
+ set-option buffer filetype sh
+ }
+
++hook global BufCreate .*\.ebuild %{
++set-option buffer filetype sh
++}
++
++
+ hook global WinSetOption filetype=sh %{
+ require-module sh
+ set-option window static_words %opt{sh_static_words}
diff --git a/app-editors/kakoune/kakoune-2020.01.16.ebuild
b/app-editors/kakoune/kakoune-2020.01.16.ebuild
new file mode 100644
index 000..476bbd2e937
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2020.01.16.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-libs/ncurses:0=[unicode]"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
"${FILESDIR}"/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch )
+
+src_configure() { :; }
+
+src_compile() {
+ cd src/ || die
+
+ emake static=$(usex static-libs yes no) all
+}
+
+src_test() {
+ cd src/ || die
+ emake test
+}
+
+src_install() {
+ emake PREFIX="${D}"/usr docdir="${D}/usr/share/doc/${PF}" install
+
+ rm "${D}/usr/share/man/man1/kak.1.gz" || die
+ doman doc/kak.1
+}
[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/, app-editors/kakoune/files/
commit: ecfcfd8e746ba83d767b2af5757bcf9838e4c28b
Author: Mykyta Holubakha gmail com>
AuthorDate: Sun Nov 19 23:50:58 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Nov 29 23:19:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecfcfd8e
app-editors/kakoune: drop old 0_pre20160620
app-editors/kakoune/Manifest | 1 -
app-editors/kakoune/files/kakoune-makefile.patch | 40 ---
app-editors/kakoune/kakoune-0_pre20160620.ebuild | 41
3 files changed, 82 deletions(-)
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index afcb832a7eb..0ef5c4bdd7b 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,2 +1 @@
-DIST kakoune-0_pre20160620.tar.gz 370523 SHA256
4344bc78a15942c01818c8e8a80f228249557f5d2d20c2fdc845faeef86abe2e SHA512
c186b9024db7956d9bcae925727c3f30dd2c2fb49995e97c56dbdf59c3f17989feb405086957818685a08530da0f2b58b5798687959267da7e9e2a25dd78003c
WHIRLPOOL
c555754e4fc3456ce7912d60adb72191349692d0465996893ceb1162cc5f7f61b08b0098f13a54d5d44c861aaf3b23eaea343813f055b8ca06f6ce1305a30f4d
DIST kakoune-0_pre20170523.tar.gz 420837 SHA256
3a083916729336dfd9e1e49cda62b5e3e881dbda7d6c7b5826377d5af15b1af9 SHA512
6d7d8f7afda75b824e4150512d9e0710cf22ef79af985c68b724a0f8e6949e5b0e7aab288f165a229f17706b30b51b462305538c7b56fd50689019118e913219
WHIRLPOOL
2e3a4c6b57944be46dbc8ddbc466fe3953453719146f4feabf8ae9688248a0d20ba2da3379fc7a503e7de7669df5f92d02e25dfc54c711a6ecdbee133b7a6ef8
diff --git a/app-editors/kakoune/files/kakoune-makefile.patch
b/app-editors/kakoune/files/kakoune-makefile.patch
deleted file mode 100644
index 54a22d5ac92..000
--- a/app-editors/kakoune/files/kakoune-makefile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
-+LIBS += -lboost_regex -ldbghelp
- else
--LIBS += -lncursesw -lboost_regex
-+LIBS += -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-0_pre20160620.ebuild
b/app-editors/kakoune/kakoune-0_pre20160620.ebuild
deleted file mode 100644
index 1dbd8389304..000
--- a/app-editors/kakoune/kakoune-0_pre20160620.ebuild
+++ /dev/null
@@ -1,41 +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
-
-REF="34c8e6a9cf15410a433c8a8c3901703708b85611"
-
-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)
- append-libs $(pkg-config --libs ncursesw)
- export CXX=$(tc-getCXX)
- export debug=$(usex debug)
- S="${WORKDIR}/${P}/src"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" docdir="${D}/usr/share/doc/${PF}"
install
-}
[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/, app-editors/kakoune/files/
commit: 8f1342901ae52f959614257b2dcb09abe739afd6
Author: Mykyta Holubakha gmail com>
AuthorDate: Tue May 23 18:16:06 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Tue May 23 19:58:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f134290
app-editors/kakoune: version bump to 0_pre20170523
update live ebuild
app-editors/kakoune/Manifest | 1 +
.../files/kakoune-0_pre20170523-makefile.patch | 31 ++
...ne-.ebuild => kakoune-0_pre20170523.ebuild} | 12 +
app-editors/kakoune/kakoune-.ebuild| 4 +--
4 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 41fde77edd8..499c1e64756 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,2 +1,3 @@
DIST kakoune-0_pre20160620.tar.gz 370523 SHA256
4344bc78a15942c01818c8e8a80f228249557f5d2d20c2fdc845faeef86abe2e SHA512
c186b9024db7956d9bcae925727c3f30dd2c2fb49995e97c56dbdf59c3f17989feb405086957818685a08530da0f2b58b5798687959267da7e9e2a25dd78003c
WHIRLPOOL
c555754e4fc3456ce7912d60adb72191349692d0465996893ceb1162cc5f7f61b08b0098f13a54d5d44c861aaf3b23eaea343813f055b8ca06f6ce1305a30f4d
DIST kakoune-0_pre2016.tar.gz 394608 SHA256
3c12a79360b83490429952ace10de1f80cff88ea8e8ffe7e27d1b6a00f2a63e7 SHA512
7d7893800519626f2eff2a4dccd8e0c36e374b67e419c4f7682b1e9c14817e2bdae30d6cbb49db22a9b2ffd5a5e5fa1558c3e731eea225c804bff3bf5027d18c
WHIRLPOOL
190c427f691c9cf903bf86390606ba71295ea2d21d91f739f71818ba15da01bf946c6c08fdfa912be773e95900a2a6203aaa17fdf8e74d98712bf45f7884f860
+DIST kakoune-0_pre20170523.tar.gz 420837 SHA256
3a083916729336dfd9e1e49cda62b5e3e881dbda7d6c7b5826377d5af15b1af9 SHA512
6d7d8f7afda75b824e4150512d9e0710cf22ef79af985c68b724a0f8e6949e5b0e7aab288f165a229f17706b30b51b462305538c7b56fd50689019118e913219
WHIRLPOOL
2e3a4c6b57944be46dbc8ddbc466fe3953453719146f4feabf8ae9688248a0d20ba2da3379fc7a503e7de7669df5f92d02e25dfc54c711a6ecdbee133b7a6ef8
diff --git a/app-editors/kakoune/files/kakoune-0_pre20170523-makefile.patch
b/app-editors/kakoune/files/kakoune-0_pre20170523-makefile.patch
new file mode 100644
index 000..b30238d6f94
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-0_pre20170523-makefile.patch
@@ -0,0 +1,31 @@
+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-.ebuild
b/app-editors/kakoune/kakoune-0_pre20170523.ebuild
similarity index 74%
copy from app-editors/kakoune/kakoune-.ebuild
copy to app-editors/kakoune/kakoune-0_pre20170523.ebuild
index 05d7edcbc32..c03979ababe 100644
--- a/app-editors/kakoune/kakoune-.ebuild
+++ b/app-editors/kakoune/kakoune-0_pre20170523.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit flag-o-matic toolchain-funcs git-r3 versionator
+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;
-EGIT_REPO_URI="https://github.com/mawww/kakoune.git;
+SRC_URI="https://github.com/mawww/${PN}/tarball/${REF} -> ${P}.tar.gz"
LICENSE="Unlicense"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="debug static"
RDEPEND="
@@ -24,7 +26,7 @@ DEPEND="
${RDEPEND}
"
-PATCHES=( "${FILESDIR}/${PN}-0_pre2016-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0_pre20170523-makefile.patch" )
pkg_setup() {
if [[ ${MERGE_TYPE} != binary ]]; then
diff --git a/app-editors/kakoune/kakoune-.ebuild
b/app-editors/kakoune/kakoune-.ebuild
index 05d7edcbc32..bd460c7c574 100644
--- a/app-editors/kakoune/kakoune-.ebuild
+++ b/app-editors/kakoune/kakoune-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,7 +24,7 @@ DEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/, app-editors/kakoune/files/
commit: 116fdf80a07114ae388984566d704ca50dcf484f
Author: Mykyta Holubakha gmail com>
AuthorDate: Tue May 23 18:16:56 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Tue May 23 19:58:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=116fdf80
app-editors/kakoune: drop old 0_pre2016
Closes: https://github.com/gentoo/gentoo/pull/4736
app-editors/kakoune/Manifest | 1 -
.../files/kakoune-0_pre2016-makefile.patch | 47 -
app-editors/kakoune/kakoune-0_pre2016.ebuild | 49 --
3 files changed, 97 deletions(-)
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 499c1e64756..afcb832a7eb 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,3 +1,2 @@
DIST kakoune-0_pre20160620.tar.gz 370523 SHA256
4344bc78a15942c01818c8e8a80f228249557f5d2d20c2fdc845faeef86abe2e SHA512
c186b9024db7956d9bcae925727c3f30dd2c2fb49995e97c56dbdf59c3f17989feb405086957818685a08530da0f2b58b5798687959267da7e9e2a25dd78003c
WHIRLPOOL
c555754e4fc3456ce7912d60adb72191349692d0465996893ceb1162cc5f7f61b08b0098f13a54d5d44c861aaf3b23eaea343813f055b8ca06f6ce1305a30f4d
-DIST kakoune-0_pre2016.tar.gz 394608 SHA256
3c12a79360b83490429952ace10de1f80cff88ea8e8ffe7e27d1b6a00f2a63e7 SHA512
7d7893800519626f2eff2a4dccd8e0c36e374b67e419c4f7682b1e9c14817e2bdae30d6cbb49db22a9b2ffd5a5e5fa1558c3e731eea225c804bff3bf5027d18c
WHIRLPOOL
190c427f691c9cf903bf86390606ba71295ea2d21d91f739f71818ba15da01bf946c6c08fdfa912be773e95900a2a6203aaa17fdf8e74d98712bf45f7884f860
DIST kakoune-0_pre20170523.tar.gz 420837 SHA256
3a083916729336dfd9e1e49cda62b5e3e881dbda7d6c7b5826377d5af15b1af9 SHA512
6d7d8f7afda75b824e4150512d9e0710cf22ef79af985c68b724a0f8e6949e5b0e7aab288f165a229f17706b30b51b462305538c7b56fd50689019118e913219
WHIRLPOOL
2e3a4c6b57944be46dbc8ddbc466fe3953453719146f4feabf8ae9688248a0d20ba2da3379fc7a503e7de7669df5f92d02e25dfc54c711a6ecdbee133b7a6ef8
diff --git a/app-editors/kakoune/files/kakoune-0_pre2016-makefile.patch
b/app-editors/kakoune/files/kakoune-0_pre2016-makefile.patch
deleted file mode 100644
index 1084ea6a9ca..000
--- a/app-editors/kakoune/files/kakoune-0_pre2016-makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 966582d..cdac6ba 100644
a/src/Makefile
-+++ b/src/Makefile
-@@ -4,10 +4,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)
-@@ -27,8 +27,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
-@@ -52,10 +50,9 @@ else ifeq ($(os),DragonFly)
- LDFLAGS += -L/usr/local/lib
- else ifneq (,$(findstring CYGWIN,$(os)))
- CPPFLAGS += -D_XOPEN_SOURCE=700
--LIBS += -lncursesw -lboost_regex -ldbghelp
-+LIBS += -lboost_regex -ldbghelp
- else
--LIBS += -lncursesw -lboost_regex
--CPPFLAGS += -I$(NCURSESW_INCLUDE)
-+LIBS += -lboost_regex
- LDFLAGS += -rdynamic
- endif
-
-@@ -64,7 +61,7 @@ ifeq ($(static),yes)
- LDFLAGS += -static -pthread
- 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
-
- all : kak
- kak : $(objects)
diff --git a/app-editors/kakoune/kakoune-0_pre2016.ebuild
b/app-editors/kakoune/kakoune-0_pre2016.ebuild
deleted file mode 100644
index 9b10ffd5233..000
--- a/app-editors/kakoune/kakoune-0_pre2016.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 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="85ce5db08a6461f5fef13cc4f6b090c858698d91"
-
-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_pre2016-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)
-
[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/, app-editors/kakoune/files/
commit: 75357f680cb57e4e31e130e042cfde2d9edbb994
Author: Mykyta Holubakha gmail com>
AuthorDate: Thu Nov 10 23:55:43 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 12 15:01:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75357f68
app-editors/kakoune: version bump to 0_pre2016
introduce static use flag
Closes: https://github.com/gentoo/gentoo/pull/2802
Signed-off-by: David Seifert gentoo.org>
app-editors/kakoune/Manifest | 1 +
.../files/kakoune-0_pre2016-makefile.patch | 47
app-editors/kakoune/kakoune-0_pre2016.ebuild | 50 ++
3 files changed, 98 insertions(+)
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index 15067d9..c9a77b3 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,2 +1,3 @@
DIST kakoune-0_pre20160620.tar.gz 370523 SHA256
4344bc78a15942c01818c8e8a80f228249557f5d2d20c2fdc845faeef86abe2e SHA512
c186b9024db7956d9bcae925727c3f30dd2c2fb49995e97c56dbdf59c3f17989feb405086957818685a08530da0f2b58b5798687959267da7e9e2a25dd78003c
WHIRLPOOL
c555754e4fc3456ce7912d60adb72191349692d0465996893ceb1162cc5f7f61b08b0098f13a54d5d44c861aaf3b23eaea343813f055b8ca06f6ce1305a30f4d
DIST kakoune-0_pre20160826.tar.gz 377788 SHA256
c54c7b7ed4cca371477bfa6bf9e17ef8fe343debd83c5ae165538899e968a05f SHA512
98a679a9ecf22cb5ea4648b766164c8fc72d818d6b839b35e8c66ca2b73c109e5dfadf6745ae25a9eda9e426b4775d2f3c677417217c31cdabe7919ef1bf0839
WHIRLPOOL
bd13b26bda0c1f92edd7c77f691ff5d2b576dc17dcba453272e5e4eac66edaabc9f0f7f4aaf626b5f2475e275eafa7bee38197d49033db85b11a5e7c87df75f0
+DIST kakoune-0_pre2016.tar.gz 394608 SHA256
3c12a79360b83490429952ace10de1f80cff88ea8e8ffe7e27d1b6a00f2a63e7 SHA512
7d7893800519626f2eff2a4dccd8e0c36e374b67e419c4f7682b1e9c14817e2bdae30d6cbb49db22a9b2ffd5a5e5fa1558c3e731eea225c804bff3bf5027d18c
WHIRLPOOL
190c427f691c9cf903bf86390606ba71295ea2d21d91f739f71818ba15da01bf946c6c08fdfa912be773e95900a2a6203aaa17fdf8e74d98712bf45f7884f860
diff --git a/app-editors/kakoune/files/kakoune-0_pre2016-makefile.patch
b/app-editors/kakoune/files/kakoune-0_pre2016-makefile.patch
new file mode 100644
index ..1084ea6
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-0_pre2016-makefile.patch
@@ -0,0 +1,47 @@
+diff --git a/src/Makefile b/src/Makefile
+index 966582d..cdac6ba 100644
+--- a/src/Makefile
b/src/Makefile
+@@ -4,10 +4,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)
+@@ -27,8 +27,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
+@@ -52,10 +50,9 @@ else ifeq ($(os),DragonFly)
+ LDFLAGS += -L/usr/local/lib
+ else ifneq (,$(findstring CYGWIN,$(os)))
+ CPPFLAGS += -D_XOPEN_SOURCE=700
+-LIBS += -lncursesw -lboost_regex -ldbghelp
++LIBS += -lboost_regex -ldbghelp
+ else
+-LIBS += -lncursesw -lboost_regex
+-CPPFLAGS += -I$(NCURSESW_INCLUDE)
++LIBS += -lboost_regex
+ LDFLAGS += -rdynamic
+ endif
+
+@@ -64,7 +61,7 @@ ifeq ($(static),yes)
+ LDFLAGS += -static -pthread
+ 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
+
+ all : kak
+ kak : $(objects)
diff --git a/app-editors/kakoune/kakoune-0_pre2016.ebuild
b/app-editors/kakoune/kakoune-0_pre2016.ebuild
new file mode 100644
index ..1e7e6df
--- /dev/null
+++ b/app-editors/kakoune/kakoune-0_pre2016.ebuild
@@ -0,0 +1,50 @@
+# 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 versionator
+
+REF="85ce5db08a6461f5fef13cc4f6b090c858698d91"
+
+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_pre2016-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
[gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/, app-editors/kakoune/files/
commit: f875a676f99c4efc9cd8ae01c58f01384a504b48
Author: Mykyta Holubakha gmail com>
AuthorDate: Tue Jun 14 11:17:11 2016 +
Commit: Göktürk Yüksek gentoo org>
CommitDate: Wed Jun 22 03:27:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f875a676
app-editors/kakoune: fix a linking bug
Fix a ncurses[tinfo] linking bug
(see upstream https://github.com/mawww/kakoune/issues/695):
moved configuration of ncurses linker libs to ebuild, until
upstream supports pkg-config
bind to current ncurses slot
app-editors/kakoune/files/kakoune-makefile.patch | 6 --
..._pre20160515.ebuild => kakoune-0_pre20160515-r1.ebuild} | 14 --
app-editors/kakoune/kakoune-.ebuild| 14 --
3 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/app-editors/kakoune/files/kakoune-makefile.patch
b/app-editors/kakoune/files/kakoune-makefile.patch
index 076c42f..54a22d5 100644
--- a/app-editors/kakoune/files/kakoune-makefile.patch
+++ b/app-editors/kakoune/files/kakoune-makefile.patch
@@ -24,9 +24,11 @@ index c79c270..9409a8c 100644
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
+-LIBS += -lncursesw -lboost_regex -ldbghelp
++LIBS += -lboost_regex -ldbghelp
else
- LIBS += -lncursesw -lboost_regex
+-LIBS += -lncursesw -lboost_regex
++LIBS += -lboost_regex
-CPPFLAGS += -I$(NCURSESW_INCLUDE)
LDFLAGS += -rdynamic
endif
diff --git a/app-editors/kakoune/kakoune-0_pre20160515.ebuild
b/app-editors/kakoune/kakoune-0_pre20160515-r1.ebuild
similarity index 83%
rename from app-editors/kakoune/kakoune-0_pre20160515.ebuild
rename to app-editors/kakoune/kakoune-0_pre20160515-r1.ebuild
index 524324d..42293c8 100644
--- a/app-editors/kakoune/kakoune-0_pre20160515.ebuild
+++ b/app-editors/kakoune/kakoune-0_pre20160515-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="debug"
RDEPEND="
- sys-libs/ncurses:*[unicode]
+ sys-libs/ncurses:=[unicode]
dev-libs/boost
"
DEPEND="
@@ -31,18 +31,12 @@ PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
src_configure() {
append-cppflags $(pkg-config --cflags ncursesw)
+ append-libs $(pkg-config --libs ncursesw)
export CXX=$(tc-getCXX)
export debug=$(usex debug)
-}
-
-src_compile() {
- emake -C src
-}
-
-src_test() {
- emake -C src test
+ S="${WORKDIR}/${P}/src"
}
src_install() {
- emake -C src DESTDIR="${D}" PREFIX="/usr" install
+ emake DESTDIR="${D}" PREFIX="/usr" install
}
diff --git a/app-editors/kakoune/kakoune-.ebuild
b/app-editors/kakoune/kakoune-.ebuild
index f448c1b..96ba498 100644
--- a/app-editors/kakoune/kakoune-.ebuild
+++ b/app-editors/kakoune/kakoune-.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
IUSE="debug"
RDEPEND="
- sys-libs/ncurses:*[unicode]
+ sys-libs/ncurses:=[unicode]
dev-libs/boost
"
DEPEND="
@@ -29,18 +29,12 @@ PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
src_configure() {
append-cppflags $(pkg-config --cflags ncursesw)
+ append-libs $(pkg-config --libs ncursesw)
export CXX=$(tc-getCXX)
export debug=$(usex debug)
-}
-
-src_compile() {
- emake -C src
-}
-
-src_test() {
- emake -C src test
+ S="${WORKDIR}/${P}/src"
}
src_install() {
- emake -C src DESTDIR="${D}" PREFIX="/usr" install
+ emake DESTDIR="${D}" PREFIX="/usr" install
}
