app-misc/clockywock: fix building with separate tinfo library

Also bump EAPI to 7

Closes: https://bugs.gentoo.org/690008
Reported-by: Toralf Förster <toralf@gentoo.org>
Signed-off-by: Sergey Popov <pinkbyte@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

diff --git a/app-misc/clockywock/clockywock-0.3.1a.ebuild b/app-misc/clockywock/clockywock-0.3.1a.ebuild
index 26f1be9445c7e2c3260ff1b9a3e104da07193bee..1477cdb488e81563d6b428cc358083c5cb6466e6 100644 (file)
--- a/app-misc/clockywock/clockywock-0.3.1a.ebuild
+++ b/app-misc/clockywock/clockywock-0.3.1a.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -14,7 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+"
 
 PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
 

diff --git a/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch b/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch
index e6f5bd510dc34d75717e653564dac6f3ac69f8c4..cb1521947a7c0ecad1691157a271edbb2f861258 100644 (file)
--- a/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch
+++ b/app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch
@@ -1,7 +1,8 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -1,5 +1,6 @@
-+LIBS += -lncurses -lpthread
+@@ -1,5 +1,7 @@
++PKGCONFIG ?= pkg-config
++LIBS += $(shell $(PKGCONFIG) --libs ncurses) -lpthread
  all:
 -      g++ -O3 -Wall -o clockywock clockywock.cpp -lncurses -lpthread
 +      $(CXX) $(CXXFLAGS) $(LDFLAGS) -o clockywock clockywock.cpp $(LIBS)