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@gentoo.org>

diff --git a/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild b/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild
index 64e4f8d7f285a5578f5a84ffd87f5238df61a1f2..ead354248580e2c37ff40918c6e4bed6df479665 100644 (file)
--- 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 30be358e46d33de77cbce5b590952d5d96c6f98b..cdf18e48e41d6d954786ea276d8a1b6be5b6454b 100644 (file)
--- 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 0162f39370aa8a3c02c28e5593e7e5343dd2632f..3112a015748d1464f0fa6a153e04e035834af9b0 100644 (file)
--- 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