From d4c2a5e36d0c4c1d9235c030a053d9cd84d2f99c Mon Sep 17 00:00:00 2001
From: Martin Schlemmer <azarah@gentoo.org>
Date: Sat, 31 Aug 2002 23:13:03 +0000
Subject: depend on bash that link against internal readline

---
 sys-libs/readline/ChangeLog                    |  8 +++-
 sys-libs/readline/files/digest-readline-4.3    |  1 -
 sys-libs/readline/files/digest-readline-4.3-r1 |  1 +
 sys-libs/readline/readline-4.3-r1.ebuild       | 54 ++++++++++++++++++++++++++
 sys-libs/readline/readline-4.3.ebuild          | 50 ------------------------
 5 files changed, 62 insertions(+), 52 deletions(-)
 delete mode 100644 sys-libs/readline/files/digest-readline-4.3
 create mode 100644 sys-libs/readline/files/digest-readline-4.3-r1
 create mode 100644 sys-libs/readline/readline-4.3-r1.ebuild
 delete mode 100644 sys-libs/readline/readline-4.3.ebuild

(limited to 'sys-libs/readline')

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index b3c2e70c4af9..4997999dce68 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2002/08/30 16:08:41 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.6 2002/08/31 23:13:03 azarah Exp $
+
+*readline-4.3-r1 (1 Sep 2002)
+
+  1 Sep 2002; Martin Schlemmer <azarah@gentoo.org> readline-4.3-r1.ebuild :
+  Depend on bash that always link against internal readline, else bash
+  may break on readline update.
 
 *readline-4.3 (30 Aug 2002)
 
diff --git a/sys-libs/readline/files/digest-readline-4.3 b/sys-libs/readline/files/digest-readline-4.3
deleted file mode 100644
index cf6a67a2379a..000000000000
--- a/sys-libs/readline/files/digest-readline-4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f86f7cb717ab321fe15f1bbcb058c11e readline-4.3.tar.gz 961662
diff --git a/sys-libs/readline/files/digest-readline-4.3-r1 b/sys-libs/readline/files/digest-readline-4.3-r1
new file mode 100644
index 000000000000..cf6a67a2379a
--- /dev/null
+++ b/sys-libs/readline/files/digest-readline-4.3-r1
@@ -0,0 +1 @@
+MD5 f86f7cb717ab321fe15f1bbcb058c11e readline-4.3.tar.gz 961662
diff --git a/sys-libs/readline/readline-4.3-r1.ebuild b/sys-libs/readline/readline-4.3-r1.ebuild
new file mode 100644
index 000000000000..a6f6a38eaf8b
--- /dev/null
+++ b/sys-libs/readline/readline-4.3-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r1.ebuild,v 1.1 2002/08/31 23:13:03 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"
+
+# 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 ${MAKEOPTS} || die
+	cd shlib
+	emake ${MAKEOPTS} || 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.ebuild b/sys-libs/readline/readline-4.3.ebuild
deleted file mode 100644
index f851f1d8b1d9..000000000000
--- a/sys-libs/readline/readline-4.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3.ebuild,v 1.2 2002/08/30 16:08:41 gerk 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"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2"
-
-src_compile() {
-
-	econf --with-curses || die
-	emake ${MAKEOPTS} || die
-	cd shlib
-	emake ${MAKEOPTS} || 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
-}
-- 
cgit v1.2.3-65-gdbad