From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 21 Feb 2007 17:32:08 +0000 (+0000)
Subject: install wide second so /usr/bin binaries are the wide version
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9cde2132e17554e787e76ab6e7362cca1aa8830;p=gentoo.git

install wide second so /usr/bin binaries are the wide version
Package-Manager: portage-2.1.2-r10
---

diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 5f0b380fc5f5..b95a39509f91 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -36,10 +36,10 @@ EBUILD ncurses-5.5-r3.ebuild 4863 RMD160 75f6f79cc7f299f7bb7960108437b1698286d06
 MD5 508732d8c2625adc50c62c9a9b59bd44 ncurses-5.5-r3.ebuild 4863
 RMD160 75f6f79cc7f299f7bb7960108437b1698286d061 ncurses-5.5-r3.ebuild 4863
 SHA256 070029894fc3117ea12f89f63f8ea42b36c95484593b1bde9f646e7aea286dd3 ncurses-5.5-r3.ebuild 4863
-EBUILD ncurses-5.6.ebuild 4828 RMD160 0cf160c782fa86bafdcf1c1463b4bc03f9e1d26c SHA1 a4eb07656447520ce1fda69769f7c6eaf4cdc72d SHA256 dfa5ed2be54aa87d22e7f47ab57ec193c2833521dcdd25d93813949a523e5f71
-MD5 026317a31bb9b7e96b35a94569011307 ncurses-5.6.ebuild 4828
-RMD160 0cf160c782fa86bafdcf1c1463b4bc03f9e1d26c ncurses-5.6.ebuild 4828
-SHA256 dfa5ed2be54aa87d22e7f47ab57ec193c2833521dcdd25d93813949a523e5f71 ncurses-5.6.ebuild 4828
+EBUILD ncurses-5.6.ebuild 4589 RMD160 d6db6a52ae467b82a880295ead1418adeb95467f SHA1 73d207fddf930a72e00f2411d9501c6805490fad SHA256 048b2a095a546c8d3dae4b836a0d8b6892363218f1efe01e4faae68bfdc7e1d7
+MD5 1474c37f0bbd160c8974589ecf975653 ncurses-5.6.ebuild 4589
+RMD160 d6db6a52ae467b82a880295ead1418adeb95467f ncurses-5.6.ebuild 4589
+SHA256 048b2a095a546c8d3dae4b836a0d8b6892363218f1efe01e4faae68bfdc7e1d7 ncurses-5.6.ebuild 4589
 MISC ChangeLog 19572 RMD160 4cdf2275e55a305a104911a3e6d35b7f4ce31b2c SHA1 b5b863dd0b5dc309cc60767a9749de3e36df92da SHA256 eefc17978971543df894f06373815b6f0b6652bf6a3e526121f150bb863a9cca
 MD5 0cd67f4928165c1a0a7c6aea0fabe3a9 ChangeLog 19572
 RMD160 4cdf2275e55a305a104911a3e6d35b7f4ce31b2c ChangeLog 19572
@@ -60,7 +60,7 @@ SHA256 aeae266804b5463f9acb8a7ece8f88dfcb520a6b7705011e727b1c0cbe83632d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF3IDy8bi6rjpTunYRAhHpAKDelB9wGCHQgek5bXymoLhpqzNrawCcC1VB
-Hlb8cmEea6DeKrCJFTEhSQQ=
-=Btje
+iD8DBQFF3IJX8bi6rjpTunYRAh6sAKClnycjRPxiYphMuqBOwhiKCkeqJACgtJqS
+52ziy/2icsnpYOa3z/ZYQqI=
+=wPQs
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/ncurses-5.6.ebuild b/sys-libs/ncurses/ncurses-5.6.ebuild
index 6b28ebba871e..ddc5e42c15f7 100644
--- a/sys-libs/ncurses/ncurses-5.6.ebuild
+++ b/sys-libs/ncurses/ncurses-5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6.ebuild,v 1.3 2007/02/21 17:26:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6.ebuild,v 1.4 2007/02/21 17:32:08 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -93,14 +93,14 @@ do_compile() {
 }
 
 src_install() {
-	# install unicode version first so that the non-unicode
-	# files overwrite the unicode versions
+	# install unicode version second so that the binaries in /usr/bin
+	# support both wide and narrow
+	cd "${WORKDIR}"/narrowc
+	emake DESTDIR="${D}" install || die "make narrowc install failed"
 	if use unicode ; then
 		cd "${WORKDIR}"/widec
-		make DESTDIR="${D}" install || die "make widec install failed"
+		emake DESTDIR="${D}" install || die "make widec install failed"
 	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
@@ -136,22 +136,10 @@ src_install() {
 	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
 	doenvd "${T}"/50ncurses
 
-	if use build ; then
-		cd "${D}"
-		rm -rf usr/share/man
-		cd usr/share/terminfo
-		cp -pPR l/linux n/nxterm v/vt100 "${T}"
-		rm -rf *
-		mkdir l x v
-		cp -pPR "${T}"/linux l
-		cp -pPR "${T}"/nxterm x/xterm
-		cp -pPR "${T}"/vt100 v
-	else
-		use minimal && rm -r "${D}"/usr/share/terminfo
-		cd "${S}"
-		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
-		use doc && dohtml -r doc/html/
-	fi
+	use minimal && rm -r "${D}"/usr/share/terminfo
+	cd "${S}"
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	use doc && dohtml -r doc/html/
 }
 
 pkg_preinst() {