From f875a676f99c4efc9cd8ae01c58f01384a504b48 Mon Sep 17 00:00:00 2001
From: Mykyta Holubakha <hilobakho@gmail.com>
Date: Tue, 14 Jun 2016 14:17:11 +0300
Subject: 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 ++-
 .../kakoune/kakoune-0_pre20160515-r1.ebuild        | 42 +++++++++++++++++++
 app-editors/kakoune/kakoune-0_pre20160515.ebuild   | 48 ----------------------
 app-editors/kakoune/kakoune-9999.ebuild            | 14 ++-----
 4 files changed, 50 insertions(+), 60 deletions(-)
 create mode 100644 app-editors/kakoune/kakoune-0_pre20160515-r1.ebuild
 delete mode 100644 app-editors/kakoune/kakoune-0_pre20160515.ebuild

(limited to 'app-editors/kakoune')

diff --git a/app-editors/kakoune/files/kakoune-makefile.patch b/app-editors/kakoune/files/kakoune-makefile.patch
index 076c42f92ea..54a22d5ac92 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-r1.ebuild b/app-editors/kakoune/kakoune-0_pre20160515-r1.ebuild
new file mode 100644
index 00000000000..42293c86054
--- /dev/null
+++ b/app-editors/kakoune/kakoune-0_pre20160515-r1.ebuild
@@ -0,0 +1,42 @@
+# 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="1788126f385c0d656b6addb0731f6205cc4856e5"
+
+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" install
+}
diff --git a/app-editors/kakoune/kakoune-0_pre20160515.ebuild b/app-editors/kakoune/kakoune-0_pre20160515.ebuild
deleted file mode 100644
index 524324d6dd5..00000000000
--- a/app-editors/kakoune/kakoune-0_pre20160515.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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="1788126f385c0d656b6addb0731f6205cc4856e5"
-
-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-9999.ebuild b/app-editors/kakoune/kakoune-9999.ebuild
index f448c1b5403..96ba4987975 100644
--- a/app-editors/kakoune/kakoune-9999.ebuild
+++ b/app-editors/kakoune/kakoune-9999.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
 }
-- 
cgit v1.2.1