app-editors/kakoune: fix a linking bug

Fix a ncurses[tinfo] linking bug (see upstream mawww/kakoune#695): moved configuration of ncurses linker libs to ebuild, until upstream supports pkg-config bind to current ncurses slot
hanetzer · Jun 22, 2016 · f875a67 · f875a67
1 parent 008c8a1
commit f875a67
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git 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/...tors/kakoune/kakoune-0_pre20160515.ebuild → ...s/kakoune/kakoune-0_pre20160515-r1.ebuild b/...tors/kakoune/kakoune-0_pre20160515.ebuild → ...s/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-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
 }