commit: 1c3f3c1a7fba575e6ec5c00b85bc9312b94621e3 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Mar 23 23:45:33 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat Mar 23 23:45:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3f3c1a
media-gfx/duhdraw: Fixed build with sys-libs/ncurses[tinfo] Closes: https://bugs.gentoo.org/647160 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild | 21 ++++++++++++--------- media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch | 4 ++-- .../duhdraw/files/duhdraw-2.8.13-prestrip.patch | 4 ++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild b/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild index 64e4f8d7f28..ead35424858 100644 --- a/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild +++ b/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit toolchain-funcs eutils +EAPI=7 +inherit toolchain-funcs DESCRIPTION="ASCII art editor" HOMEPAGE="http://www.cs.helsinki.fi/u/penberg/duhdraw"; @@ -12,16 +12,19 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -DEPEND="sys-libs/ncurses" +DEPEND="sys-libs/ncurses:0=" RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" -src_prepare() { - epatch "${FILESDIR}"/${P}-macos.patch - epatch "${FILESDIR}"/${P}-prestrip.patch -} +PATCHES=( + "${FILESDIR}"/${P}-macos.patch + "${FILESDIR}"/${P}-prestrip.patch +) src_compile() { - emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" + emake \ + CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \ + LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" } src_install() { diff --git a/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch b/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch index 30be358e46d..cdf18e48e41 100644 --- a/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch +++ b/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch @@ -1,5 +1,5 @@ ---- ./duhdraw-2.8.13/duhdraw.c.orig 2005-03-02 09:22:46.000000000 +0100 -+++ ./duhdraw-2.8.13/duhdraw.c 2006-11-16 09:56:21.000000000 +0100 +--- duhdraw-2.8.13/duhdraw.c ++++ duhdraw-2.8.13/duhdraw.c @@ -12,7 +12,9 @@ #include <stdio.h> #include <dirent.h> diff --git a/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch b/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch index 0162f39370a..3112a015748 100644 --- a/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch +++ b/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch @@ -1,5 +1,5 @@ ---- ./duhdraw-2.8.13/Makefile.orig 2005-03-02 09:22:46.000000000 +0100 -+++ ./duhdraw-2.8.13/Makefile 2006-11-16 09:58:29.000000000 +0100 +--- duhdraw-2.8.13/Makefile ++++ duhdraw-2.8.13/Makefile @@ -12,15 +12,12 @@ ansi: cleanansi
