bug #4411

9 files changed, 29 insertions, 60 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index c67e357f9cb4..bfc8977ac428 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/readline
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.7 2002/10/20 08:18:28 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.8 2002/10/26 09:57:54 azarah Exp $
+
+*readline-4.1-r5 (26 Oct 2002)
+*readline-4.2a-r1 (26 Oct 2002)
+*readline-4.3-r3 (26 Oct 2002)
+
+  26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> readline*.ebuild :
+  Add linker scripts in /usr/lib to fix bug #4411.
 
 *readline-4.3-r2 (20 Oct 2002)
 
diff --git a/sys-libs/readline/files/digest-readline-4.1-r4 b/sys-libs/readline/files/digest-readline-4.1-r5
index 9872f692ea49..9872f692ea49 100644
--- a/sys-libs/readline/files/digest-readline-4.1-r4
+++ b/sys-libs/readline/files/digest-readline-4.1-r5
diff --git a/sys-libs/readline/files/digest-readline-4.2a b/sys-libs/readline/files/digest-readline-4.2a-r1
index 449580104606..449580104606 100644
--- a/sys-libs/readline/files/digest-readline-4.2a
+++ b/sys-libs/readline/files/digest-readline-4.2a-r1
diff --git a/sys-libs/readline/files/digest-readline-4.3-r1 b/sys-libs/readline/files/digest-readline-4.3-r1
deleted file mode 100644
index cf6a67a2379a..000000000000
--- a/sys-libs/readline/files/digest-readline-4.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f86f7cb717ab321fe15f1bbcb058c11e readline-4.3.tar.gz 961662
diff --git a/sys-libs/readline/files/digest-readline-4.3-r2 b/sys-libs/readline/files/digest-readline-4.3-r3
index 3ce983e2b2f1..3ce983e2b2f1 100644
--- a/sys-libs/readline/files/digest-readline-4.3-r2
+++ b/sys-libs/readline/files/digest-readline-4.3-r3
diff --git a/sys-libs/readline/readline-4.1-r4.ebuild b/sys-libs/readline/readline-4.1-r5.ebuild
index f524314e3968..0bf757aa3937 100644
--- a/sys-libs/readline/readline-4.1-r4.ebuild
+++ b/sys-libs/readline/readline-4.1-r5.ebuild
@@ -1,6 +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/readline/readline-4.1-r4.ebuild,v 1.8 2002/10/04 06:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.1-r5.ebuild,v 1.1 2002/10/26 09:57:54 azarah Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Another cute console display library"
@@ -45,6 +47,10 @@ src_install() {
 
         dodir /lib
 	mv ${D}/usr/lib/*.so* ${D}/lib
+	# bug #4411
+	gen_usr_ldscript libreadline.so
+	gen_usr_ldscript libhistory.so
+	# end bug #4411
 	dosym libhistory.so.${PV} /lib/libhistory.so
 	dosym libreadline.so.${PV} /lib/libreadline.so
 	# Needed because make install uses ${D} for the link
diff --git a/sys-libs/readline/readline-4.2a.ebuild b/sys-libs/readline/readline-4.2a-r1.ebuild
index df0e902bf341..403228f3cf46 100644
--- a/sys-libs/readline/readline-4.2a.ebuild
+++ b/sys-libs/readline/readline-4.2a-r1.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/readline/readline-4.2a.ebuild,v 1.12 2002/10/25 17:16:58 wwoods Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.2a-r1.ebuild,v 1.1 2002/10/26 09:57:54 azarah Exp $
 
-inherit gnuconfig
+inherit eutils gnuconfig
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Another cute console display library"
@@ -20,6 +20,7 @@ DEPEND="virtual/glibc
 
 src_unpack() {
 	unpack ${A}
+	
 	# config.sub doesn't recognize alphaev67+, update it
 	use alpha && gnuconfig_update
 }
@@ -48,6 +49,10 @@ src_install() {
 
 	dodir /lib
 	mv ${D}/usr/lib/*.so* ${D}/lib
+	# bug #4411
+	gen_usr_ldscript libreadline.so
+	gen_usr_ldscript libhistory.so
+	# end bug #4411
 	dosym libhistory.so.${PV/a/} /lib/libhistory.so
 	dosym libreadline.so.${PV/a/} /lib/libreadline.so
 	# Needed because make install uses ${D} for the link
diff --git a/sys-libs/readline/readline-4.3-r1.ebuild b/sys-libs/readline/readline-4.3-r1.ebuild
deleted file mode 100644
index 3a1971240a37..000000000000
--- a/sys-libs/readline/readline-4.3-r1.ebuild
+++ /dev/null
@@ -1,54 +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/readline/readline-4.3-r1.ebuild,v 1.4 2002/10/16 09:50:09 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Another cute console display library"
-SRC_URI="ftp://ftp.gnu.org/gnu/readline/${P}.tar.gz
-	 ftp://gatekeeper.dec.com/pub/GNU/readline/${P}.tar.gz"
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
-
-# We must be sertain that we have a bash that is linked
-# to its internal readline, else we may get problems.
-DEPEND=">=sys-apps/bash-2.05b-r2
-	>=sys-libs/ncurses-5.2-r2"
-
-src_compile() {
-
-	econf --with-curses || die
-	emake || die
-	cd shlib
-	emake || die
-
-}
-
-
-src_install() {
-
-	make prefix=${D}/usr mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info install || die
-	cd shlib
-	make prefix=${D}/usr mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info install || die
-
-	cd ..
-
-	dodir /lib
-	mv ${D}/usr/lib/*.so* ${D}/lib
-	dosym libhistory.so.${PV/a/} /lib/libhistory.so
-	dosym libreadline.so.${PV/a/} /lib/libreadline.so
-	# Needed because make install uses ${D} for the link
-	dosym libhistory.so.${PV/a/} /lib/libhistory.so.4
-	dosym libreadline.so.${PV/a/} /lib/libreadline.so.4
-	chmod 755 ${D}/lib/*.${PV/a/}
-
-	dodoc CHANGELOG CHANGES COPYING MANIFEST README USAGE
-	docinto ps
-	dodoc doc/*.ps
-	dohtml -r doc
-}
-
diff --git a/sys-libs/readline/readline-4.3-r2.ebuild b/sys-libs/readline/readline-4.3-r3.ebuild
index de590735156a..64a75630099b 100644
--- a/sys-libs/readline/readline-4.3-r2.ebuild
+++ b/sys-libs/readline/readline-4.3-r3.ebuild
@@ -1,6 +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/readline/readline-4.3-r2.ebuild,v 1.1 2002/10/20 08:18:28 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r3.ebuild,v 1.1 2002/10/26 09:57:54 azarah Exp $
+
+inherit eutils
 
 # Official patches
 PLEVEL="x001 x002"
@@ -55,6 +57,10 @@ src_install() {
 
 	dodir /lib
 	mv ${D}/usr/lib/*.so* ${D}/lib
+	# bug #4411
+	gen_usr_ldscript libreadline.so
+	gen_usr_ldscript libhistory.so
+	# end bug #4411
 	dosym libhistory.so.${PV/a/} /lib/libhistory.so
 	dosym libreadline.so.${PV/a/} /lib/libreadline.so
 	# Needed because make install uses ${D} for the link