fix bug 25887: inherit eutils

4 files changed, 105 insertions, 3 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 7dac9b1d6291..5808eaff0ef3 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # 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.30 2003/08/01 13:17:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.31 2003/08/04 19:15:15 agriffis Exp $
+
+*ncurses-5.3-r4 (04 Aug 2003)
+
+  04 Aug 2003; Aron Griffis <agriffis@gentoo.org> ncurses-5.3-r4.ebuild:
+  Need to inherit eutils for gen_usr_ldscript
 
 *ncurses-5.3-r3 (01 Aug 2003)
 
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 9aca917fb00d..1181501f60b6 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,7 +1,8 @@
-MD5 c31202cab51ed62d24614047484fc9f1 ChangeLog 5781
+MD5 dafb2e1907b211b719e29cc874858bab ChangeLog 5781
 MD5 f9e92c4fca3b351fddafebfccf7d52a1 ncurses-5.3-r2.ebuild 2402
 MD5 b06e35faedb791d50068c15bf87bb069 ncurses-5.3-r1.ebuild 2321
-MD5 410acd9bc9f29ffa87d5b4d0a748a9ab ncurses-5.3-r4.ebuild 2655
+MD5 260b9a6f2ef54347a4202a2b0023dbb1 ncurses-5.3-r3.ebuild 2615
+MD5 3736b7279429f86206d82ff27d3848d6 ncurses-5.3-r4.ebuild 2657
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r2 64
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r1 64
 MD5 fdef42c6fdd01e99c3e36b443e8a25c2 files/ncurses-5.2.20020511-gcc31.patch 703
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.3-r4 b/sys-libs/ncurses/files/digest-ncurses-5.3-r4
new file mode 100644
index 000000000000..e8f327278e5b
--- /dev/null
+++ b/sys-libs/ncurses/files/digest-ncurses-5.3-r4
@@ -0,0 +1 @@
+MD5 5dcc9faa93157eafa572494bffed131a ncurses-5.3.tar.gz 2067718
diff --git a/sys-libs/ncurses/ncurses-5.3-r4.ebuild b/sys-libs/ncurses/ncurses-5.3-r4.ebuild
new file mode 100644
index 000000000000..689aca1e0b7a
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.3-r4.ebuild
@@ -0,0 +1,95 @@
+# 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-r4.ebuild,v 1.1 2003/08/04 19:15:15 agriffis Exp $
+
+inherit flag-o-matic eutils
+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"
+IUSE="debug"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/ncurses-5.3-xterm.patch
+}
+
+src_compile() {
+	[ `use debug` ] && 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 || die "gen_usr_ldscript failed"
+
+	# 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
+		# 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
+}