app-cdr/cdw: Fix building against sys-libs/ncurses[tinfo]

Fixes: https://bugs.gentoo.org/672394
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/app-cdr/cdw/cdw-0.8.0.ebuild b/app-cdr/cdw/cdw-0.8.0.ebuild
index 2bcc1069a8b04f9c1dcf6127e74c2fe45e76eede..5a20e7099a105767b597630a9f807d3dbe84d6c8 100644 (file)
--- a/app-cdr/cdw/cdw-0.8.0.ebuild
+++ b/app-cdr/cdw/cdw-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=6
+inherit toolchain-funcs
 
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
 HOMEPAGE="http://cdw.sourceforge.net"
@@ -11,17 +11,24 @@ SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
-DEPEND="virtual/cdrtools
+RDEPEND="
+       virtual/cdrtools
        app-cdr/dvd+rw-tools
        dev-libs/libburn
        dev-libs/libcdio[-minimal]
-       sys-libs/ncurses[unicode]"
-RDEPEND=${DEPEND}
+       sys-libs/ncurses[unicode]
+"
+DEPEND="
+       ${RDEPEND}
+       virtual/pkgconfig
+"
+PATCHES=(
+       "${FILESDIR}"/${P}-uclibc.patch
+)
 
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-uclibc.patch
+src_configure() {
+       econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
 }
 
 src_install() {

diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index 68ab7c086d5982f6a0e77a1a5beaeade1100f541..2072bb68651b715a3fd6e9f38b4fe2f580b5672f 100644 (file)
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw"
 ECVS_MODULE="cdw"
 ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
 
-inherit autotools eutils cvs
+inherit autotools cvs toolchain-funcs
 
 MY_P=${PN}_${PV}
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
@@ -15,21 +15,29 @@ HOMEPAGE="http://cdw.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
-DEPEND="virtual/cdrtools
+RDEPEND="
+       virtual/cdrtools
        app-cdr/dvd+rw-tools
        dev-libs/libburn
        dev-libs/libcdio[-minimal]
-       sys-libs/ncurses[unicode]"
-RDEPEND=${DEPEND}
-
+       sys-libs/ncurses[unicode]
+"
+DEPEND="
+       ${RDEPEND}
+       virtual/pkgconfig
+"
 S=${WORKDIR}/${ECVS_MODULE}
 
 src_prepare() {
+       default
        eautoreconf
 }
 
+src_configure() {
+       econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
+
 src_install() {
        DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
                default