Do not use current capabilities for xterm terminfo, but rather those of older

xfree 4.3 (matches ncurses 5.3 behaviour ...).

5 files changed, 167 insertions, 17 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 2dffbda2e473..39568f270edf 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.51 2004/02/29 21:57:39 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.52 2004/03/03 18:34:55 azarah Exp $
+
+*ncurses-5.4-r1 (03 Mar 2004)
+
+  03 Mar 2004; Martin Schlemmer <azarah@gentoo.org> ncurses-5.4-r1.ebuild,
+  files/ncurses-5.4-xterm.patch:
+  Do not use current capabilities for xterm terminfo, but rather those of older
+  xfree 4.3 (matches ncurses 5.3 behaviour ...).
 
 *ncurses-5.4 (29 Feb 2004)
 
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 08764dd1310c..26bd06147542 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,21 +1,23 @@
-MD5 71fefc7e77ff301e94fcc52df510a52b ChangeLog 8503
-MD5 6eadb93d736e38cee7262e64629d0003 ncurses-5.3-r1.ebuild 2311
 MD5 6c106fbeea1c453e10d37667cefd35ae ncurses-5.3-r2.ebuild 2459
+MD5 11ce80e140055ce9202ab1a6fd386d7d ChangeLog 8772
+MD5 6eadb93d736e38cee7262e64629d0003 ncurses-5.3-r1.ebuild 2311
 MD5 af7a0de2f75ba90257759319bfdda6fc ncurses-5.3-r3.ebuild 2675
+MD5 dbd28b686a336e3976ab28e01c1b0767 ncurses-5.4-r1.ebuild 3898
 MD5 ac5ab557d506a10a6781d80a16a91408 ncurses-5.3-r4.ebuild 2847
+MD5 c682b76b963fa371aa0b8513c7f2a9ef ncurses-5.3-r5.ebuild 3829
+MD5 2d5a0286c82c08c8771497db0c5ff405 ncurses-5.4.ebuild 3708
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 dfd7e9bf2ec22e70cc7b4dfad51516ea ncurses-5.3-r5.ebuild 3826
-MD5 938ace201666f4557890e56704353132 ncurses-5.4.ebuild 3708
+MD5 fdef42c6fdd01e99c3e36b443e8a25c2 files/ncurses-5.2.20020511-gcc31.patch 703
+MD5 c5b265c81eb2dea26b66cd656c61e99c files/ncurses-5.3-share-sed.patch 686
+MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r1 64
-MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r2 64
-MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r3 64
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r4 64
-MD5 fdef42c6fdd01e99c3e36b443e8a25c2 files/ncurses-5.2.20020511-gcc31.patch 703
-MD5 f96d1b4b0bf94f1d38ce950df0efb37e files/ncurses-5.3-xterm.patch 1002
+MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4 64
 MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
-MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r5 64
 MD5 143b9126206485a5faeb817fd94b1054 files/ncurses-5.3-coreutils.patch 1581
-MD5 c5b265c81eb2dea26b66cd656c61e99c files/ncurses-5.3-share-sed.patch 686
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4 64
-MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
-MD5 9d402725dd9ba337f2b4d9d0869ef59e files/ncurses-5.4-xterm.patch 494
+MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r2 64
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r1 64
+MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r5 64
+MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r3 64
+MD5 f96d1b4b0bf94f1d38ce950df0efb37e files/ncurses-5.3-xterm.patch 1002
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.4-r1 b/sys-libs/ncurses/files/digest-ncurses-5.4-r1
new file mode 100644
index 000000000000..fdf84beb38f9
--- /dev/null
+++ b/sys-libs/ncurses/files/digest-ncurses-5.4-r1
@@ -0,0 +1 @@
+MD5 069c8880072060373290a4fefff43520 ncurses-5.4.tar.gz 2154022
diff --git a/sys-libs/ncurses/files/ncurses-5.4-xterm.patch b/sys-libs/ncurses/files/ncurses-5.4-xterm.patch
index b50fc0ab7867..a2515e48de5a 100644
--- a/sys-libs/ncurses/files/ncurses-5.4-xterm.patch
+++ b/sys-libs/ncurses/files/ncurses-5.4-xterm.patch
@@ -1,13 +1,13 @@
 --- 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
-@@ -2922,8 +2922,8 @@
+@@ -2922,8 +2922,9 @@
  
  # This is xterm for ncurses.
  xterm|xterm terminal emulator (X Window System), 
 -	use=xterm-r6, 
--#	use=xterm-xfree86, 
 +#	use=xterm-r6, 
-+	use=xterm-xfree86, 
+ #	use=xterm-xfree86, 
++	use=xterm-xf86-v43, 
  
  # 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.4-r1.ebuild b/sys-libs/ncurses/ncurses-5.4-r1.ebuild
new file mode 100644
index 000000000000..affcca8b8d87
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.4-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r1.ebuild,v 1.1 2004/03/03 18:34:55 azarah Exp $
+
+inherit eutils flag-o-matic 64-bit gnuconfig
+filter-flags -fno-exceptions
+
+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 ~mips amd64 ia64 ppc64 s390"
+IUSE="debug"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-xterm.patch
+	# Bug #42336.
+	epatch ${FILESDIR}/${P}-share-sed.patch
+}
+
+src_compile() {
+	local myconf=
+
+	[ -n "`use debug`" ] || myconf="${myconf} --without-debug"
+
+	# Shared objects are compiled properly with -fPIC, but
+	# standard libs also require this.
+	64-bit && append-flags -fPIC
+
+	# Detect mips systems
+	use mips && gnuconfig_update
+
+	# 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"
+
+	# We need the basic terminfo files in /etc, bug #37026.  We will
+	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+	# src_install() ...
+	econf \
+		--libdir=/lib \
+		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
+		--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 "make failed"
+}
+
+src_install() {
+	local x=
+
+	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 || die "gen_usr_ldscript failed"
+
+	# We need the basic terminfo files in /etc, bug #37026
+	einfo "Installing basic terminfo files in /etc..."
+	for x in dumb linux rxvt screen sun vt{52,100,102,220} xterm
+	do
+		local termfile="$(find "${D}/usr/share/terminfo/" -name "${x}" 2>/dev/null)"
+		local basedir="$(basename $(dirname "${termfile}"))"
+
+		if [ -n "${termfile}" ]
+		then
+			dodir /etc/terminfo/${basedir}
+			mv ${termfile} ${D}/etc/terminfo/${basedir}/
+			dosym ../../../../etc/terminfo/${basedir}/${x} \
+				/usr/share/terminfo/${basedir}/${x}
+		fi
+	done
+
+	# Build fails to create this ...
+	dosym ../share/terminfo /usr/lib/terminfo
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/50ncurses
+
+	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.
+		# cd ${D}/usr/lib; rm *.a
+	else
+		# Install xterm-debian terminfo entry to satisfy bug #18486
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/lib:${D}/lib \
+			TERMINFO=${D}/usr/share/terminfo \
+			${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti
+
+		cd ${S}
+		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO
+		dodoc doc/*.doc
+		dohtml -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	if [ ! -f "${ROOT}/etc/env.d/50ncurses" ]
+	then
+		mkdir -p "${ROOT}/etc/env.d"
+		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
+			${ROOT}/etc/env.d/50ncurses
+	fi
+}
+
+pkg_postinst() {
+	# Old ncurses may still be around from old build tbz2's.
+	rm -f /lib/libncurses.so.5.[23]
+	rm -f /usr/lib/lib{form,menu,panel}.so.5.[23]
+}