Mac OS X compatible readline

4 files changed, 100 insertions, 1 deletions

diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 75bebdb3277c..692cf509c39b 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -5,7 +5,9 @@ MD5 7423a26e72c7dc229f4acfe515f203df readline-4.2a-r1.ebuild 1728
 MD5 c02ba9a8a1afd2756ffdaacd1b800d95 readline-4.2a-r2.ebuild 1731
 MD5 ff67e423fdd9b7260185f88f2a2abc48 readline-4.3-r3.ebuild 1830
 MD5 d4ced46b66ec4e2f9d6947e718b01e9e readline-4.3-r4.ebuild 1988
-MD5 183773e502cbc3ba53c6a58a68e93758 readline-4.3-r5.ebuild 1928
+MD5 eee8ef0a1d1d4f05dfa8e4f4ece8693a readline-4.3-r5.ebuild 1934
+MD5 0c193b37b22dc75cde356a562eda2468 readline-4.3-r6.ebuild 1993
+MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
 MD5 f9e8af7cdcf7ac973c77fc6a712af5de files/digest-readline-4.1-r5 64
 MD5 ea89d08f5dd5239da0569ec2a56f8488 files/digest-readline-4.2a-r1 65
 MD5 ea89d08f5dd5239da0569ec2a56f8488 files/digest-readline-4.2a-r2 65
@@ -13,3 +15,4 @@ MD5 e9b856acd523c385a29d67cd3475885e files/digest-readline-4.3-r3 177
 MD5 e9b856acd523c385a29d67cd3475885e files/digest-readline-4.3-r4 177
 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
 MD5 d0d23a9f000344da88a00a248d0af60c files/readline4.3-mbutil.patch 1678
+MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
diff --git a/sys-libs/readline/files/digest-readline-4.3-r6 b/sys-libs/readline/files/digest-readline-4.3-r6
new file mode 100644
index 000000000000..64e09d9247d2
--- /dev/null
+++ b/sys-libs/readline/files/digest-readline-4.3-r6
@@ -0,0 +1,6 @@
+MD5 f86f7cb717ab321fe15f1bbcb058c11e readline-4.3.tar.gz 961662
+MD5 aacf1c41717f305ab5ce45e9d028821d readline43-001 1126
+MD5 8df4bf2c7e77e05c4ecd949b9b5dedf3 readline43-002 738
+MD5 946ed64a306afadb981b294747578e95 readline43-003 2202
+MD5 392705156b3054eaae2f2a28238592fb readline43-004 3140
+MD5 0e4affc42a7bfc70f0a50529e7901954 readline43-005 1056
diff --git a/sys-libs/readline/files/macos.patch b/sys-libs/readline/files/macos.patch
new file mode 100644
index 000000000000..e826a5a7e5df
--- /dev/null
+++ b/sys-libs/readline/files/macos.patch
@@ -0,0 +1,12 @@
+diff -urN readline-4.3.orig/support/shobj-conf readline-4.3/support/shobj-conf
+--- readline-4.3.orig/support/shobj-conf	Sun Jul 11 02:59:49 2004
++++ readline-4.3/support/shobj-conf	Sun Jul 11 03:00:16 2004
+@@ -148,7 +148,7 @@
+ 	SHOBJ_LDFLAGS='-dynamic'
+ 	SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ 
+-	SHLIB_LIBS='-lSystem'
++	SHLIB_LIBS='-lSystem -lncurses -lcc_dynamic'
+ 	;;
+ 
+ openbsd*)
diff --git a/sys-libs/readline/readline-4.3-r6.ebuild b/sys-libs/readline/readline-4.3-r6.ebuild
new file mode 100644
index 000000000000..745bad3f08bd
--- /dev/null
+++ b/sys-libs/readline/readline-4.3-r6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r6.ebuild,v 1.1 2004/07/11 02:32:29 pvdabeel Exp $
+
+inherit eutils gnuconfig
+
+# Official patches
+PLEVEL="x001 x002 x003 x004 x005"
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
+SRC_URI="ftp://ftp.gnu.org/gnu/readline/${P}.tar.gz
+	 ftp://gatekeeper.dec.com/pub/GNU/readline/${P}.tar.gz
+	 ${PLEVEL//x/ftp://ftp.gnu.org/gnu/${PN}/${PN}-${PV}-patches/${PN}${PV/\.}-}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="macos" # Only changed Darwin specific part, should work just fine on other archs.
+IUSE=""
+
+# We must be certain that we have a bash that is linked
+# to its internal readline, else we may get problems.
+DEPEND=">=app-shells/bash-2.05b-r2
+	>=sys-libs/ncurses-5.2-r2"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	cd ${S}
+	for x in ${PLEVEL//x}
+	do
+		epatch ${DISTDIR}/${PN}${PV/\.}-${x}
+	done
+	use macos && epatch ${FILESDIR}/macos.patch
+}
+
+src_compile() {
+	# Detect mips systems properly
+	use mips && gnuconfig_update
+
+	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 ${S}/shlib
+	make prefix=${D}/usr mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info install || die
+
+	cd ${S}
+
+	if ! use macos; then
+		dodir /lib
+		mv ${D}/usr/lib/*.so* ${D}/lib
+		rm -f ${D}/lib/*.old
+		# 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
+		dosym libhistory.so.${PV/a/} /lib/libhistory.so.4
+		dosym libreadline.so.${PV/a/} /lib/libreadline.so.4
+		chmod 755 ${D}/lib/*.${PV/a/}
+	fi
+
+	dodoc CHANGELOG CHANGES README USAGE
+	docinto ps
+	dodoc doc/*.ps
+	dohtml -r doc
+}