--- ncurses-5.7-r3.ebuild	2009-11-22 00:37:23.000000000 -0800
+++ /usr/local/portage/sys-libs/ncurses/ncurses-5.7-r4.ebuild	2009-11-29 12:52:43.000000000 -0800
@@ -17,7 +17,8 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="ada +cxx debug doc gpm minimal profile trace unicode"
 
-DEPEND="gpm? ( sys-libs/gpm )"
+DEPEND="gpm? ( sys-libs/gpm )
+	ada? ( virtual/ada )"
 #	berkdb? ( sys-libs/db )"
 RDEPEND="!<x11-terms/rxvt-unicode-9.06-r3"
 
@@ -57,6 +58,7 @@
 	do_compile narrowc
 	use unicode && do_compile widec --enable-widec --includedir=/usr/include/ncursesw
 }
+
 do_compile() {
 	ECONF_SOURCE=${S}
 
@@ -78,12 +80,24 @@
 	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
 	# src_install() ...
 #		$(use_with berkdb hashed-db)
+
+	# need to configure Ada explicitly (bug #184700)
+	local ada_conf=""
+	if use ada ; then
+		ada_inc="--with-ada-include=/usr/$(get_libdir)/ada/adainclude"
+		ada_lib="--with-ada-objects=/usr/$(get_libdir)/ada/adalib"
+		ada_conf="${ada_inc} ${ada_lib} --disable-warnings"
+	else
+		ada_conf="--enable-warnings"
+	fi
+
 	econf \
 		--libdir="/$(get_libdir)" \
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--with-shared \
 		--without-hashed-db \
 		$(use_with ada) \
+		${ada_conf} \
 		$(use_with cxx) \
 		$(use_with cxx cxx-binding) \
 		$(use_with debug) \
@@ -96,7 +110,6 @@
 		--enable-const \
 		--enable-colorfgbg \
 		--enable-echo \
-		$(use_enable !ada warnings) \
 		$(use_with debug assertions) \
 		$(use_with !debug leaks) \
 		$(use_with debug expanded) \
@@ -166,6 +179,16 @@
 	# Because ncurses5-config --terminfo returns the directory we keep it
 	keepdir /usr/share/terminfo #245374
 
+	if use ada ; then
+		# install libAdaCurses.a (the narrow version only)
+		dolib.a "${WORKDIR}"/narrowc/Ada95/src/libAdaCurses.a \
+			|| die "lib install error"
+		# and the wide version:
+		use unicode && newlib.a \
+			"${WORKDIR}"/widec/Ada95/src/libAdaCurses.a \
+			libAdaCursesw.a || die "config install error"
+	fi
+
 	cd "${S}"
 	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
 	use doc && dohtml -r doc/html/