commit: 8f1342901ae52f959614257b2dcb09abe739afd6 Author: Mykyta Holubakha <hilobakho <AT> gmail <DOT> com> AuthorDate: Tue May 23 18:16:06 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue May 23 19:58:32 2017 +0000 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-9999.ebuild => kakoune-0_pre20170523.ebuild} | 12 +++++---- app-editors/kakoune/kakoune-9999.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_pre20161111.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 00000000000..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-9999.ebuild b/app-editors/kakoune/kakoune-0_pre20170523.ebuild similarity index 74% copy from app-editors/kakoune/kakoune-9999.ebuild copy to app-editors/kakoune/kakoune-0_pre20170523.ebuild index 05d7edcbc32..c03979ababe 100644 --- a/app-editors/kakoune/kakoune-9999.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_pre20161111-makefile.patch" ) +PATCHES=( "${FILESDIR}/${PN}-0_pre20170523-makefile.patch" ) pkg_setup() { if [[ ${MERGE_TYPE} != binary ]]; then diff --git a/app-editors/kakoune/kakoune-9999.ebuild b/app-editors/kakoune/kakoune-9999.ebuild index 05d7edcbc32..bd460c7c574 100644 --- a/app-editors/kakoune/kakoune-9999.ebuild +++ b/app-editors/kakoune/kakoune-9999.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=" ${RDEPEND} " -PATCHES=( "${FILESDIR}/${PN}-0_pre20161111-makefile.patch" ) +PATCHES=( "${FILESDIR}/${PN}-0_pre20170523-makefile.patch" ) pkg_setup() { if [[ ${MERGE_TYPE} != binary ]]; then
