commit: 14cef62fae592faa1c943157d235410d361f586a Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Mon Aug 26 09:22:05 2019 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Mon Aug 26 09:22:16 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14cef62f
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 <AT> gentoo.org> Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 app-misc/clockywock/clockywock-0.3.1a.ebuild | 8 +++++--- app-misc/clockywock/files/clockywock-0.3.1a-makefile.patch | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app-misc/clockywock/clockywock-0.3.1a.ebuild b/app-misc/clockywock/clockywock-0.3.1a.ebuild index 26f1be9445c..1477cdb488e 100644 --- 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 e6f5bd510dc..cb1521947a7 100644 --- 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)
