Index: ncurses-5.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6.ebuild,v
retrieving revision 1.1
diff -u -u -r1.1 ncurses-5.6.ebuild
--- ncurses-5.6.ebuild	17 Jan 2007 20:25:59 -0000	1.1
+++ ncurses-5.6.ebuild	18 Feb 2007 13:27:29 -0000
@@ -51,7 +51,7 @@
 	if use unicode ; then
 		mkdir "${WORKDIR}"/widec
 		cd "${WORKDIR}"/widec
-		do_compile ${myconf} --enable-widec --includedir=/usr/include/ncursesw
+		do_compile ${myconf} --enable-widec
 	fi
 }
 do_compile() {
@@ -93,14 +93,25 @@
 }
 
 src_install() {
-	# install unicode version first so that the non-unicode
-	# files overwrite the unicode versions
+	cd "${WORKDIR}"/narrowc
+	make DESTDIR="${D}" install || die "make narrowc install failed"
+
+	# install wide version last so that the wide
+	# files overwrite the narrow versions
 	if use unicode ; then
 		cd "${WORKDIR}"/widec
 		make DESTDIR="${D}" install || die "make widec install failed"
+
+		# use wide versions for new programs, but don't break binary
+		# compatibility for old programs
+		cd "${D}"lib || die "cd ${D}lib failed"
+		for lib in *w.a ; do
+			ln -nsfv ${lib} ${lib%w.a}.a
+		done
+		for lib in *w.so ; do
+			ln -nsfv ${lib} ${lib%w.so}.so
+		done
 	fi
-	cd "${WORKDIR}"/narrowc
-	make DESTDIR="${D}" install || die "make narrowc install failed"
 
 	if [[ ${CHOST} != *-darwin* ]] ; then
 		# Move static and extraneous ncurses libraries out of /lib