11 files changed, 21 insertions, 198 deletions
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index cf14bf067ae6..687829210e69 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.15 2002/10/23 18:00:57 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.16 2002/10/26 09:45:02 azarah Exp $
+
+*ncurses-5.2-r7 (26 Oct 2002)
+*ncurses-5.2.20020511-r3 (26 Oct 2002)
+*ncurses-5.3-r1 (26 Oct 2002)
+
+  26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> ncurses*.ebuild :
+
+  Add linker scripts in /usr/lib to fix bug #4411.
 
 *ncurses-5.3 (17 Oct 2002)
 
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.2-r6 b/sys-libs/ncurses/files/digest-ncurses-5.2-r6
deleted file mode 100644
index 68b5ff89fe92..000000000000
--- a/sys-libs/ncurses/files/digest-ncurses-5.2-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 464d6a49010cf2a6eb9ce59a264d4d47 ncurses-5.2.tar.gz 1743818
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.2-r5 b/sys-libs/ncurses/files/digest-ncurses-5.2-r7
index 68b5ff89fe92..68b5ff89fe92 100644
--- a/sys-libs/ncurses/files/digest-ncurses-5.2-r5
+++ b/sys-libs/ncurses/files/digest-ncurses-5.2-r7
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.2.20020511-r2 b/sys-libs/ncurses/files/digest-ncurses-5.2.20020511-r2
deleted file mode 100644
index 54cb37a390cb..000000000000
--- a/sys-libs/ncurses/files/digest-ncurses-5.2.20020511-r2
+++ /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.2.20020511-r1 b/sys-libs/ncurses/files/digest-ncurses-5.2.20020511-r3
index 54cb37a390cb..54cb37a390cb 100644
--- a/sys-libs/ncurses/files/digest-ncurses-5.2.20020511-r1
+++ b/sys-libs/ncurses/files/digest-ncurses-5.2.20020511-r3
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.3 b/sys-libs/ncurses/files/digest-ncurses-5.3-r1
index e8f327278e5b..e8f327278e5b 100644
--- a/sys-libs/ncurses/files/digest-ncurses-5.3
+++ b/sys-libs/ncurses/files/digest-ncurses-5.3-r1
diff --git a/sys-libs/ncurses/ncurses-5.2-r5.ebuild b/sys-libs/ncurses/ncurses-5.2-r5.ebuild
deleted file mode 100644
index dd17d2213f27..000000000000
--- a/sys-libs/ncurses/ncurses-5.2-r5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2002 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-r5.ebuild,v 1.7 2002/10/04 06:37:16 vapier Exp $
-
-inherit flag-o-matic
-
-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"
-DEPEND="virtual/glibc"
-KEYWORDS="x86 sparc sparc64"
-LICENSE="MIT"
-SLOT="5"
-
-filter-flags -fno-exceptions
-
-src_compile() {
-	if [ -z "$DEBUG" ]
-	then
-		myconf="${myconf} --without-debug"
-	fi
-	rm -rf test
-	./configure --prefix=/usr --libdir=/lib --mandir=/usr/share/man --enable-symlinks --enable-termcap --with-shared --with-rcs-ids --host=${CHOST}  ${myconf} || die
-	echo "all:" > test/Makefile
-	#emake still doesn't work circa 25 Mar 2002
-	make || die
-}
-
-src_install() {
-	dodir /usr/lib
-	echo "install:" >> ${S}/test/Makefile
-	make DESTDIR=${D} install || die
-
-	cd ${D}/lib
-	ln -s libncurses.a libcurses.a
-	chmod 755 ${D}/lib/*.${PV}
-	dodir /usr/lib
-	mv libform* libmenu* libpanel* ../usr/lib
-	mv *.a ../usr/lib
-
-	#with this fix, the default xterm has color as it should
-	cd ${D}/usr/share/terminfo/x
-	mv xterm xterm.orig
-	ln -s xterm-color 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-r6.ebuild b/sys-libs/ncurses/ncurses-5.2-r7.ebuild
index 1072ad511960..9cf6ed610613 100644
--- a/sys-libs/ncurses/ncurses-5.2-r6.ebuild
+++ b/sys-libs/ncurses/ncurses-5.2-r7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2002 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-r6.ebuild,v 1.2 2002/10/04 06:37:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2-r7.ebuild,v 1.1 2002/10/26 09:45:02 azarah Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 filter-flags "-fno-exceptions"
 
@@ -53,6 +53,8 @@ src_install() {
 	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
diff --git a/sys-libs/ncurses/ncurses-5.2.20020511-r1.ebuild b/sys-libs/ncurses/ncurses-5.2.20020511-r1.ebuild
deleted file mode 100644
index def7678c1359..000000000000
--- a/sys-libs/ncurses/ncurses-5.2.20020511-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2002 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-r1.ebuild,v 1.9 2002/10/04 06:37:21 vapier Exp $
-
-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.
-DEPEND="virtual/glibc sys-apps/bzip2"
-RDEPEND="virtual/glibc"
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="x86 ppc sparc sparc64"
-CXXFLAGS=${CXXFLAGS/-fno-exceptions/-fexceptions}
-
-src_unpack() {
-	unpack ${PN}-${MY_PV}.tar.gz ; cd ${S}
-	#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
-	( bunzip2 -c ${DISTDIR}/${PN}-${PV}.diff.bz2 | patch -p1 ) || die
-}
-
-src_compile() {
-	[ -z "$DEBUGBUILD" ] && myconf="${myconf} --without-debug"
-
-	rm -rf test
-	./configure \
-		--prefix=/usr \
-		--libdir=/lib \
-		--mandir=/usr/share/man \
-		--enable-symlinks \
-		--enable-termcap \
-		--with-shared \
-		--with-rcs-ids \
-		--host=${CHOST} ${myconf} || die
-
-	echo "all:" > test/Makefile
-
-	# 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
-	echo "install:" >> ${S}/test/Makefile
-	make DESTDIR=${D} install || die
-
-	cd ${D}/lib
-	ln -s libncurses.a libcurses.a
-	chmod 755 ${D}/lib/*.${MY_PV}
-	dodir /usr/lib
-	mv libform* libmenu* libpanel* ../usr/lib
-	mv *.a ../usr/lib
-
-	#with this fix, the default xterm has color as it should
-	cd ${D}/usr/share/terminfo/x
-	mv xterm xterm.orig
-	ln -s xterm-color 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.2.20020511-r2.ebuild b/sys-libs/ncurses/ncurses-5.2.20020511-r3.ebuild
index d085eb985b08..233c46cf0d6c 100644
--- a/sys-libs/ncurses/ncurses-5.2.20020511-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-5.2.20020511-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2002 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-r2.ebuild,v 1.3 2002/10/04 06:37:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.2.20020511-r3.ebuild,v 1.1 2002/10/26 09:45:02 azarah Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 filter-flags "-fno-exceptions"
 
@@ -79,6 +79,8 @@ src_install() {
 	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
diff --git a/sys-libs/ncurses/ncurses-5.3.ebuild b/sys-libs/ncurses/ncurses-5.3-r1.ebuild
index 45a5cd134550..438793f6ff1d 100644
--- a/sys-libs/ncurses/ncurses-5.3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2002 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.ebuild,v 1.3 2002/10/23 18:00:57 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.3-r1.ebuild,v 1.1 2002/10/26 09:45:02 azarah Exp $
 
 IUSE=""
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 filter-flags "-fno-exceptions"
 
 S="${WORKDIR}/${P}"
@@ -50,6 +50,8 @@ src_install() {
 	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