We need the basic terminfo files in /etc, bug #37026. We will

add '--with-terminfo-dirs=/etc/terminfo:... to ./configure and
then populate /etc/terminfo in src_install() ...

5 files changed, 183 insertions, 4 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 340d46336afc..5a1e89e6c0c3 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.42 2003/12/29 04:09:25 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.43 2004/01/11 14:46:00 azarah Exp $
+
+*ncurses-5.3-r5 (11 Jan 2004)
+
+  11 Jan 2004; Martin Schlemmer <azarah@gentoo.org> ncurses-5.3-r5.ebuild,
+  files/ncurses-5.3-coretutils.patch, files/ncurses-5.3-coreutils.patch:
+  We need the basic terminfo files in /etc, bug #37026.  We will
+  add '--with-terminfo-dirs="/etc/terminfo:..." to ./configure and
+  then populate /etc/terminfo in src_install() ...
 
   28 Dec 2003; Joshua Kinard <kumba@gentoo.org> ncurses-5.3-r2.ebuild:
   Move to mips stable (~mips -> mips)
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index cce42f5c2c10..69e18b333dc1 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,15 +1,15 @@
 MD5 346c7b6fc33eb7500774fdc2a74afed1 ncurses-5.3-r2.ebuild 2396
-MD5 735c641c217223965a5084b5ae43bc6d ChangeLog 6910
+MD5 cbf1b96ccd02b4230bf25e4b7e1b583c ChangeLog 7274
 MD5 84416ce1d0742a77b65da8499a15d79c ncurses-5.3-r1.ebuild 2314
 MD5 91a6200252ff9ebfdbb852533b5180a3 ncurses-5.3-r3.ebuild 2615
 MD5 e840a56aeba3e6f82d4a48b34915b8f4 ncurses-5.3-r4.ebuild 2785
-MD5 1c62d4660d677d90cd5f8664d6fab999 ncurses-5.3-r5.ebuild 3344
+MD5 49dcb432af1a0c03267108a9068f3797 ncurses-5.3-r5.ebuild 3716
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 0f6e8684c5436175bf859cc6d609195f .ncurses-5.3-r5.ebuild.swp 12288
 MD5 fdef42c6fdd01e99c3e36b443e8a25c2 files/ncurses-5.2.20020511-gcc31.patch 703
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r1 64
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r4 64
 MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
+MD5 143b9126206485a5faeb817fd94b1054 files/ncurses-5.3-coreutils.patch 1581
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r2 64
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r5 64
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r3 64
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.3-r5 b/sys-libs/ncurses/files/digest-ncurses-5.3-r5
new file mode 100644
index 000000000000..e8f327278e5b
--- /dev/null
+++ b/sys-libs/ncurses/files/digest-ncurses-5.3-r5
@@ -0,0 +1 @@
+MD5 5dcc9faa93157eafa572494bffed131a ncurses-5.3.tar.gz 2067718
diff --git a/sys-libs/ncurses/files/ncurses-5.3-coreutils.patch b/sys-libs/ncurses/files/ncurses-5.3-coreutils.patch
new file mode 100644
index 000000000000..94e9e5623542
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.3-coreutils.patch
@@ -0,0 +1,42 @@
+diff -urN ncurses-5.3/configure ncurses-5.3.coretutils/configure
+--- ncurses-5.3/configure	2002-09-22 02:49:14.000000000 +0200
++++ ncurses-5.3.coretutils/configure	2004-01-11 16:40:25.690883976 +0200
+@@ -1963,7 +1963,7 @@
+ if test "$GCC" = yes ; then
+ 	echo "$as_me:1964: checking version of gcc" >&5
+ echo $ECHO_N "checking version of gcc... $ECHO_C" >&6
+-	GCC_VERSION="`${CC} --version|head -1`"
++	GCC_VERSION="`${CC} --version|head -n 1`"
+ 	echo "$as_me:1967: result: $GCC_VERSION" >&5
+ echo "${ECHO_T}$GCC_VERSION" >&6
+ fi
+@@ -2850,7 +2850,7 @@
+ if test "$GXX" = yes; then
+ 	echo "$as_me:2851: checking version of g++" >&5
+ echo $ECHO_N "checking version of g++... $ECHO_C" >&6
+-	GXX_VERSION="`${CXX-g++} --version|head -1`"
++	GXX_VERSION="`${CXX-g++} --version|head -n 1`"
+ 	echo "$as_me:2854: result: $GXX_VERSION" >&5
+ echo "${ECHO_T}$GXX_VERSION" >&6
+ 	case $GXX_VERSION in
+diff -urN ncurses-5.3/configure.in ncurses-5.3.coretutils/configure.in
+--- ncurses-5.3/configure.in	2002-09-15 02:11:28.000000000 +0200
++++ ncurses-5.3.coretutils/configure.in	2004-01-11 16:40:25.733877440 +0200
+@@ -83,7 +83,7 @@
+ GCC_VERSION=none
+ if test "$GCC" = yes ; then
+ 	AC_MSG_CHECKING(version of gcc)
+-	GCC_VERSION="`${CC} --version|head -1`"
++	GCC_VERSION="`${CC} --version|head -n 1`"
+ 	AC_MSG_RESULT($GCC_VERSION)
+ fi
+ 
+@@ -158,7 +158,7 @@
+ GXX_VERSION=none
+ if test "$GXX" = yes; then
+ 	AC_MSG_CHECKING(version of g++)
+-	GXX_VERSION="`${CXX-g++} --version|head -1`"
++	GXX_VERSION="`${CXX-g++} --version|head -n 1`"
+ 	AC_MSG_RESULT($GXX_VERSION)
+ 	case $GXX_VERSION in
+ 	1*|2.[[0-6]]*)
diff --git a/sys-libs/ncurses/ncurses-5.3-r5.ebuild b/sys-libs/ncurses/ncurses-5.3-r5.ebuild
new file mode 100644
index 000000000000..f64a690c9acd
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.3-r5.ebuild
@@ -0,0 +1,128 @@
+# 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-r5.ebuild,v 1.1 2004/01/11 14:46:00 azarah Exp $
+
+inherit eutils flag-o-matic 64-bit
+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="~amd64 ~x86 ppc ~sparc ~alpha hppa ~arm ~mips ~ia64 ~ppc64"
+IUSE="debug"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-xterm.patch
+	epatch ${FILESDIR}/${P}-coreutils.patch
+}
+
+src_compile() {
+	[ `use debug` ] && myconf="${myconf} --without-debug"
+
+	# Shared objects are compiled properly with -fPIC, but
+	# standard libs also require this.
+	64-bit && append-flags -fPIC
+
+	# 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"
+
+# Breaks ncurses-5.3-xterm.patch
+#	# 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
+
+	# 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
+
+	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_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
+}