--- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild	2014-08-05 12:31:18.000000000 -0400
+++ a/sys-libs/ncurses/ncurses-5.9-r3.ebuild	2015-07-05 19:17:34.000000000 -0400
@@ -69,6 +69,7 @@ 
 do_configure() {
 	ECONF_SOURCE=${S}
 
+	tinfodir="${BUILD_DIR}"-$1-tinfo
 	mkdir "${BUILD_DIR}"-$1
 	cd "${BUILD_DIR}"-$1 || die
 	shift
@@ -113,7 +114,6 @@ 
 		$(use_with debug expanded)
 		$(use_with !debug macros)
 		$(use_with trace)
-		$(use_with tinfo termlib)
 
 		# The chtype/mmask-t settings below are to retain ABI compat
 		# with ncurses-5.4 so dont change em !
@@ -126,6 +126,12 @@ 
 	)
 
 	econf "${conf[@]}" "$@"
+	if use tinfo; then
+		mkdir "${tinfodir}"
+		cd "$tinfodir" || die
+		conf+=($(use_with tinfo termlib))
+		econf "${conf[@]}" "$@"
+	fi
 }
 
 src_compile() {
@@ -162,6 +168,12 @@ 
 	# create the .pc files we want.
 	rm -f misc/pc-files
 	emake ${make_flags}
+	if use tinfo; then
+		cd "${BUILD_DIR}"-$1-tinfo || die
+		emake -j1 sources
+		rm -f misc/pc-files
+		emake ${make_flags}
+	fi
 }
 
 multilib_src_install() {
@@ -172,9 +184,27 @@ 
 	# support both wide and narrow
 	cd "${BUILD_DIR}"-narrowc || die
 	emake DESTDIR="${D}" install
+	if use tinfo; then
+		cd "${BUILD_DIR}-narrowc-tinfo/misc" || die
+		chmod +x gen-pkgconfig || die
+		./gen-pkgconfig || die
+		find "${BUILD_DIR}-narrowc-tinfo/lib/." -name 'libtinfo*' \
+			-exec mv '{}' "${ED}/usr/$(get_libdir)/" \; || die
+		find "${BUILD_DIR}-narrowc-tinfo/misc/." -name 'tinfo*' \
+			-exec mv '{}' "${ED}/usr/$(get_libdir)/pkgconfig/" \; || die
+	fi
 	if use unicode ; then
 		cd "${BUILD_DIR}"-widec || die
 		emake DESTDIR="${D}" install
+		if use tinfo; then
+			cd "${BUILD_DIR}-widec-tinfo/misc" || die
+			chmod +x gen-pkgconfig || die
+			./gen-pkgconfig || die
+			find "${BUILD_DIR}-widec-tinfo/lib/." -name 'libtinfo*' \
+				-exec mv '{}' "${ED}/usr/$(get_libdir)/" \; || die
+			find "${BUILD_DIR}-widec-tinfo/misc/." -name 'tinfo*' \
+				-exec mv '{}' "${ED}/usr/$(get_libdir)/pkgconfig/" \; || die
+		fi
 	fi
 
 	# Move libncurses{,w} into /lib