ncurses/xterm/nano home/end fix

9 files changed, 133 insertions, 222 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 6f42f42f557f..840948f7c181 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.27 2003/03/28 16:45:30 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.28 2003/06/11 23:01:33 seemant Exp $
+
+*ncurses-5.3-r2 (11 Jun 2003)
+
+  11 Jun 2003; Seemant Kulleen <seemant@gentoo.org> ncurses-5.2-r7.ebuild,
+  ncurses-5.2.20020511-r3.ebuild, ncurses-5.3-r2.ebuild,
+  files/ncurses-5.3-xterm.patch:
+  bartron <bartron@gmx.net> submitted a patch which allows home and end keys to
+  work in things like nano. Thanks to him in bug #21356
 
   13 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> ncurses-5.3-r1.ebuild :
   Marked ppc stable
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index bf530b340582..146ddbafbc48 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,5 +1,6 @@
-MD5 dd3c6a395724d9c86160d72535f36e6b ChangeLog 5022
-MD5 d1aa6dfe8d08649f3916cd8c87f216c3 ncurses-5.3-r2.ebuild 2435
+MD5 3cc8f140bc28afb41267ed5cdfe1dd5b ncurses-5.3-r1.ebuild 2348
+MD5 967145e62c25d103d89c72ad6db36dc2 ChangeLog 5357
+MD5 4fc493b7537ed43e73fbcb7ad43c7f12 ncurses-5.3-r2.ebuild 2436
 MD5 f96d1b4b0bf94f1d38ce950df0efb37e files/ncurses-5.3-xterm.patch 1002
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r1 64
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r2 64
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.2-r7 b/sys-libs/ncurses/files/digest-ncurses-5.2-r7
deleted file mode 100644
index 68b5ff89fe92..000000000000
--- a/sys-libs/ncurses/files/digest-ncurses-5.2-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 464d6a49010cf2a6eb9ce59a264d4d47 ncurses-5.2.tar.gz 1743818
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.2.20020511-r3 b/sys-libs/ncurses/files/digest-ncurses-5.2.20020511-r3
deleted file mode 100644
index 54cb37a390cb..000000000000
--- a/sys-libs/ncurses/files/digest-ncurses-5.2.20020511-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 464d6a49010cf2a6eb9ce59a264d4d47 ncurses-5.2.tar.gz 1743818
-MD5 09ddc8b2eee779d2ddd8504547da5822 ncurses-5.2.20020511.diff.bz2 650642
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.3-r2 b/sys-libs/ncurses/files/digest-ncurses-5.3-r2
new file mode 100644
index 000000000000..e8f327278e5b
--- /dev/null
+++ b/sys-libs/ncurses/files/digest-ncurses-5.3-r2
@@ -0,0 +1 @@
+MD5 5dcc9faa93157eafa572494bffed131a ncurses-5.3.tar.gz 2067718
diff --git a/sys-libs/ncurses/files/ncurses-5.3-xterm.patch b/sys-libs/ncurses/files/ncurses-5.3-xterm.patch
new file mode 100644
index 000000000000..d774fc66b0a9
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.3-xterm.patch
@@ -0,0 +1,24 @@
+--- ncurses-5.3/misc/terminfo.src.orig	2002-10-05 20:40:53.000000000 +0200
++++ ncurses-5.3/misc/terminfo.src	2003-05-23 15:50:57.000000000 +0200
+@@ -2752,8 +2752,8 @@
+ 
+ xterm-xfree86|xterm-new|xterm terminal emulator (XFree86 4.0 Window System), 
+ 	npc, 
+-	kDC=\E[3;2~, kEND=\EO2F, kHOM=\EO2H, kIC=\E[2;2~, 
+-	kLFT=\EO2D, kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\EO2C, 
++	kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, 
++	kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, 
+ 	kb2=\EOE, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, 
+ 	kcuu1=\EOA, kend=\EOF, kent=\EOM, kf1=\EOP, kf10=\E[21~, 
+ 	kf11=\E[23~, kf12=\E[24~, kf13=\EO2P, kf14=\EO2Q, 
+@@ -2922,8 +2922,8 @@
+ 
+ # This is xterm for ncurses.
+ xterm|xterm terminal emulator (X Window System), 
+-	use=xterm-r6, 
+-#	use=xterm-xfree86, 
++#	use=xterm-r6, 
++	use=xterm-xfree86, 
+ 
+ # These entries allow access to the X titlebar and icon name as a status line. 
+ # Note that twm (and possibly window managers descended from it such as tvtwm, 
diff --git a/sys-libs/ncurses/ncurses-5.2-r7.ebuild b/sys-libs/ncurses/ncurses-5.2-r7.ebuild
deleted file mode 100644
index 9f3e8fb6e0c3..000000000000
--- a/sys-libs/ncurses/ncurses-5.2-r7.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2-r7.ebuild,v 1.3 2003/02/13 16:50:45 vapier Exp $
-
-inherit eutils flag-o-matic
-
-filter-flags "-fno-exceptions"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Linux console display libarary"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
-
-KEYWORDS="x86 sparc "
-LICENSE="MIT"
-SLOT="5"
-
-DEPEND="virtual/glibc"
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Do not compile tests
-	rm -rf test/*
-	echo "all:" > test/Makefile.in
-	echo "install:" >> test/Makefile.in
-}
-
-src_compile() {
-
-	[ -z "${DEBUG}" ] && myconf="${myconf} --without-debug"
-	
-	econf --libdir=/lib \
-		--enable-symlinks \
-		--disable-termcap \
-		--with-shared \
-		--with-rcs-ids \
-		${myconf} || die
-	
-	#emake still doesn't work circa 25 Mar 2002
-	make || die
-}
-
-src_install() {
-
-	dodir /usr/lib
-	make DESTDIR=${D} install || die
-
-	cd ${D}/lib
-	dosym libncurses.a /lib/libcurses.a
-	chmod 755 ${D}/lib/*.${PV}
-	mv libform* libmenu* libpanel* ../usr/lib
-	mv *.a ../usr/lib
-	# bug #4411
-	gen_usr_ldscript libncurses.so
-
-	#with this fix, the default xterm has color as it should
-	cd ${D}/usr/share/terminfo/x
-	mv xterm xterm.orig
-	dosym xterm-color /usr/share/terminfo/x/xterm
-
-	if [ "`use build`" ]
-	then
-		cd ${D}
-		rm -rf usr/share/man
-		cd usr/share/terminfo
-		cp -a l/linux n/nxterm v/vt100 ${T}
-		rm -rf *
-		mkdir l x v
-		cp -a ${T}/linux l
-		cp -a ${T}/nxterm x/xterm
-		cp -a ${T}/vt100 v
-		cd ${D}/usr/lib
-		#bash compilation requires static libncurses libraries, so
-		#this breaks the "build a new build image" system.  We now
-		#need to remove libncurses.a from the build image manually.	
-		#rm *.a
-	else
-		cd ${S}
-		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO
-		dodoc doc/*.doc
-		dohtml -r doc/html/
-#		docinto html/ada
-#		dodoc doc/html/ada/*.htm
-#		docinto html/ada/files
-#		dodoc doc/html/ada/files/*.htm
-#		docinto html/ada/funcs
-#		dodoc doc/html/ada/funcs/*.htm
-#		docinto html/man
-#		dodoc doc/html/man/*.html
-	fi
-}
-
diff --git a/sys-libs/ncurses/ncurses-5.2.20020511-r3.ebuild b/sys-libs/ncurses/ncurses-5.2.20020511-r3.ebuild
deleted file mode 100644
index ec856457ef3a..000000000000
--- a/sys-libs/ncurses/ncurses-5.2.20020511-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2.20020511-r3.ebuild,v 1.5 2003/02/13 16:50:51 vapier Exp $
-
-inherit eutils flag-o-matic
-
-filter-flags "-fno-exceptions"
-
-MY_PV=${PV%.*}
-
-S=${WORKDIR}/${PN}-${MY_PV}
-DESCRIPTION="Linux console display libarary"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${PN}-${MY_PV}.tar.gz
-	http://www.ibiblio.org/gentoo/distfiles/${PN}-${PV}.diff.bz2"
-	#ftp://dickey.his.com/${PN}/${PV}/patch-${MY_PV}-20020427.sh.gz
-	#ftp://dickey.his.com/${PN}/${PV}/${PN}-${MY_PV}-20020429.patch.gz
-	#ftp://dickey.his.com/${PN}/${PV}/${PN}-${MY_PV}-20020511.patch.gz"
-HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
-# bzip2 is needed to apply the patch. added 20020609 danarmak.
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="x86 ppc sparc alpha mips"
-
-DEPEND="virtual/glibc
-	sys-apps/bzip2"
-
-RDEPEND="virtual/glibc"
-
-
-src_unpack() {
-
-	unpack ${PN}-${MY_PV}.tar.gz
-	
-	#this is how the gentoo patch was created.  avoids a dependency
-	#on sharutils for uudecode :/
-	#( zcat ${DISTDIR}/patch-${MY_PV}-20020427.sh.gz | sh ) || die
-	#( zcat ${DISTDIR}/${PN}-${MY_PV}-20020429.patch.gz | patch -p1 ) || die
-	#( zcat ${DISTDIR}/${PN}-${MY_PV}-20020511.patch.gz | patch -p1 ) || die
-	#this is the generated patch..
-	# bzcat doesn't always exist (i.e. making stage1), bunzip2 is safer
-	# Gerk - June 26 2002
-	( cd ${S}; bunzip2 -c ${DISTDIR}/${PN}-${PV}.diff.bz2 | patch -p1 ) || die
-
-	cd ${S}
-	# Do not compile tests
-	rm -rf test/*
-	echo "all:" > test/Makefile.in
-	echo "install:" >> test/Makefile.in
-}
-
-src_compile() {
-
-	[ -z "$DEBUGBUILD" ] && myconf="${myconf} --without-debug"
-
-	econf --libdir=/lib \
-		--enable-symlinks \
-		--disable-termcap \
-		--with-shared \
-		--with-rcs-ids \
-		${myconf} || die
-
-	# this patch is completely invalid.  whoever was responsible for
-	# generating it for the previous snapshots, please investigate with
-	# regards to this current snapshot.
-	#	patch -p1 <${FILESDIR}/ncurses-5.2.20020511-gcc31.patch
-
-	#emake still doesn't work circa 25 Mar 2002
-	make || die
-}
-
-src_install() {
-
-	dodir /usr/lib
-	make DESTDIR=${D} install || die
-
-	cd ${D}/lib
-	dosym libncurses.a /lib/libcurses.a
-	chmod 755 ${D}/lib/*.${MY_PV}
-	mv libform* libmenu* libpanel* ../usr/lib
-	mv *.a ../usr/lib
-	# bug #4411
-	gen_usr_ldscript libncurses.so
-
-	#with this fix, the default xterm has color as it should
-	cd ${D}/usr/share/terminfo/x
-	mv xterm xterm.orig
-	dosym xterm-color /usr/share/terminfo/x/xterm
-
-	if [ -n "`use build`" ]
-	then
-		cd ${D}
-		rm -rf usr/share/man
-		cd usr/share/terminfo
-		cp -a l/linux n/nxterm v/vt100 ${T}
-		rm -rf *
-		mkdir l x v
-		cp -a ${T}/linux l
-		cp -a ${T}/nxterm x/xterm
-		cp -a ${T}/vt100 v
-		cd ${D}/usr/lib
-		#bash compilation requires static libncurses libraries, so
-		#this breaks the "build a new build image" system.  We now
-		#need to remove libncurses.a from the build image manually.
-		#rm *.a
-	else
-		cd ${S}
-		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO
-		dodoc doc/*.doc
-		dohtml -r doc/html/
-#		docinto html/ada
-#		dodoc doc/html/ada/*.htm
-#		docinto html/ada/files
-#		dodoc doc/html/ada/files/*.htm
-#		docinto html/ada/funcs
-#		dodoc doc/html/ada/funcs/*.htm
-#		docinto html/man
-#		dodoc doc/html/man/*.html
-	fi
-}
-
diff --git a/sys-libs/ncurses/ncurses-5.3-r2.ebuild b/sys-libs/ncurses/ncurses-5.3-r2.ebuild
new file mode 100644
index 000000000000..f5713e1d6b62
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.3-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.3-r2.ebuild,v 1.1 2003/06/11 23:01:33 seemant Exp $
+
+IUSE=""
+
+inherit eutils flag-o-matic
+filter-flags "-fno-exceptions"
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Linux console display library"
+HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html"
+SRC_URI="mirror://gnu/ncurses/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	
+	unpack ${A}
+	epatch ${FILESDIR}/ncurses-5.3-xterm.patch
+}
+
+src_compile() {
+
+	[ -z "${DEBUGBUILD}" ] && myconf="${myconf} --without-debug"
+
+	# From version 5.3, ncurses also build c++ bindings, and as
+	# we do not have a c++ compiler during bootstrap, disable
+	# building it.  We will rebuild ncurses after gcc's second
+	# build in bootstrap.sh.
+	# <azarah@gentoo.org> (23 Oct 2002)
+	( use build || use bootstrap ) \
+		&& myconf="${myconf} --without-cxx --without-cxx-binding --without-ada"
+
+	econf \
+		--libdir=/lib \
+		--disable-termcap \
+		--with-shared \
+		--with-rcs-ids \
+		--without-ada \
+		${myconf} || die "configure failed"
+
+	# do not work with -j2 on P4 - <azarah@gentoo.org> (23 Oct 2002)
+	make || die "parallel make failed"
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die "make install failed"
+
+	# Move static and extraneous ncurses libraries out of /lib
+	cd ${D}/lib
+	dodir /usr/lib
+	mv libform* libmenu* libpanel* ${D}/usr/lib
+	mv *.a ${D}/usr/lib
+	# bug #4411
+	gen_usr_ldscript libncurses.so
+
+	# With this fix, the default xterm has color as it should
+	#cd ${D}/usr/share/terminfo/x
+	#mv xterm xterm.orig
+	#dosym xterm-color /usr/share/terminfo/x/xterm
+
+	if [ -n "`use build`" ]
+	then
+		cd ${D}
+		rm -rf usr/share/man
+		cd usr/share/terminfo
+		cp -a l/linux n/nxterm v/vt100 ${T}
+		rm -rf *
+		mkdir l x v
+		cp -a ${T}/linux l
+		cp -a ${T}/nxterm x/xterm
+		cp -a ${T}/vt100 v
+		#bash compilation requires static libncurses libraries, so
+		#this breaks the "build a new build image" system.  We now
+		#need to remove libncurses.a from the build image manually.
+		#rm *.a
+	else
+		cd ${S}
+		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO
+		dodoc doc/*.doc
+		dohtml -r doc/html/
+	fi
+}
+
+pkg_postinst() {
+
+	# Old ncurses may still be around from old build tbz2's.
+	rm -f /lib/libncurses.so.5.2
+	rm -f /usr/lib/lib{form,menu,panel}.so.5.2
+}