--- a/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild	2017-02-28 14:50:50.000000000 -0500
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild	2018-03-06 14:29:45.706165632 -0500
@@ -1,7 +1,7 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit flag-o-matic toolchain-funcs
 
@@ -17,20 +17,25 @@
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="sys-apps/ed
+RDEPEND="sys-libs/ncurses:0"
+DEPEND="$RDEPEND
+	sys-apps/ed
 	sys-libs/zlib[static-libs]"
-RDEPEND=""
 
 S="${WORKDIR}/heirloom-${PV}"
 
 src_compile() {
 	append-cppflags -D_GNU_SOURCE
-	emake -j1 ||die
+
+	local curses=-lncurses
+	has_version 'sys-libs/ncurses:0[tinfo]' && curses+=' -ltinfo'
+
+	emake -j1 LCURS="$curses"
 }
 
 src_install() {
 	# we don't want to strip here, so use "true" as noop
-	emake STRIP="true" ROOT="${D}" -j1 install || die
+	emake STRIP="true" ROOT="${D}" -j1 install
 }
 
 pkg_postinst() {