5 files changed, 183 insertions, 3 deletions
diff --git a/dev-libs/libedit/ChangeLog b/dev-libs/libedit/ChangeLog
index 410297b73e84..cbb3b58e93ea 100644
--- a/dev-libs/libedit/ChangeLog
+++ b/dev-libs/libedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libedit
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.12 2005/01/19 00:41:25 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.13 2005/06/01 02:03:08 vapier Exp $
+
+*libedit-20050531 (01 Jun 2005)
+
+  01 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/libedit-20050531-debian-to-gentoo.patch, +libedit-20050531.ebuild:
+  Update CVS snapshot.
 
 *libedit-20050118 (18 Jan 2005)
 
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index d591885e1925..bc2f0b7fd988 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -1,5 +1,8 @@
 MD5 dd9909c8d431d328b7f97b210f957592 metadata.xml 620
+MD5 1fdcf875a96b6ebb08666c3f4a06115e ChangeLog 965
+MD5 e2aec8967245cce0cc4ae6c20deeb55b libedit-20050531.ebuild 928
 MD5 4f68042dd97089c5ec448e768284ce4e libedit-20050118.ebuild 910
-MD5 b5193ad6de54511071ca1c5be3c17615 ChangeLog 782
 MD5 401cdb89b8eca21b61aa796a41972c31 files/digest-libedit-20050118 68
+MD5 3120bd80aea917ed605c08a23b3c3639 files/digest-libedit-20050531 68
+MD5 ca146d57f9718d6eecafceff1ce75993 files/libedit-20050531-debian-to-gentoo.patch 3819
 MD5 199385b4798d47bf1bc38042281105df files/20031222-debian-to-gentoo.patch 3892
diff --git a/dev-libs/libedit/files/digest-libedit-20050531 b/dev-libs/libedit/files/digest-libedit-20050531
new file mode 100644
index 000000000000..6cb62e4bb0f4
--- /dev/null
+++ b/dev-libs/libedit/files/digest-libedit-20050531
@@ -0,0 +1 @@
+MD5 9ae9d3da65e8215a58f07c934f643c9c libedit-20050531.tar.bz2 96393
diff --git a/dev-libs/libedit/files/libedit-20050531-debian-to-gentoo.patch b/dev-libs/libedit/files/libedit-20050531-debian-to-gentoo.patch
new file mode 100644
index 000000000000..c20e473a1488
--- /dev/null
+++ b/dev-libs/libedit/files/libedit-20050531-debian-to-gentoo.patch
@@ -0,0 +1,132 @@
+--- netbsd-cvs/Makefile
++++ libedit-uNF/Makefile
+@@ -5,6 +5,7 @@
+ 
+ WARNS=	3
+ LIB=	edit
++LIBS=-lncurses
+ 
+ LIBDPLIBS=     termcap ${.CURDIR}/../libterm
+ 
+@@ -25,9 +26,10 @@
+ 	editline.3 tok_line.3 editline.3 tok_str.3
+ 
+ # For speed and debugging
+-#SRCS=   ${OSRCS} tokenizer.c history.c readline.c
++SRCS=   ${OSRCS} tokenizer.c history.c readline.c vis.c unvis.c fgetln.c strlcat.c strlcpy.c
+ # For protection
+-SRCS=	editline.c tokenizer.c history.c readline.c
++#SRCS=	editline.c tokenizer.c history.c readline.c
++OOBJS= $(patsubst %.c,%.o,$(SRCS))
+ 
+ LIBEDITDIR?=${.CURDIR}
+ 
+@@ -42,6 +44,7 @@
+ CPPFLAGS+=-I. -I${.CURDIR}
+ CPPFLAGS+=#-DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG -DDEBUG_REFRESH
+ CPPFLAGS+=#-DDEBUG_PASTE -DDEBUG_EDIT
++CFLAGS+=-I. -include ../glibc-bsd-glue/bsdcompat.h -I../glibc-compat -I../glibc-bsd-glue
+ 
+ AHDR=vi.h emacs.h common.h 
+ ASRC=${LIBEDITDIR}/vi.c ${LIBEDITDIR}/emacs.c ${LIBEDITDIR}/common.c
+@@ -51,54 +51,68 @@
+ 
+ SUBDIR=	readline
+ 
++HOST_SH=sh
++AR=ar
++LIBEDITDIR=.
++_MKTARGET_CREATE=true
++_MKTARGET_LINK=true
++all: .depend libedit.a libedit.so
++
+ vi.h: vi.c makelist Makefile
+ 	${_MKTARGET_CREATE}
+ 	${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/vi.c \
+-	    > ${.TARGET}.tmp && \
+-	    mv ${.TARGET}.tmp ${.TARGET}
++	    > $@.tmp && \
++	    mv $@.tmp $@
+ 
+ emacs.h: emacs.c makelist Makefile
+ 	${_MKTARGET_CREATE}
+ 	${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/emacs.c \
+-	    > ${.TARGET}.tmp && \
+-	    mv ${.TARGET}.tmp ${.TARGET}
++	    > $@.tmp && \
++	    mv $@.tmp $@
+ 
+ common.h: common.c makelist Makefile
+ 	${_MKTARGET_CREATE}
+ 	${HOST_SH} ${LIBEDITDIR}/makelist -h ${LIBEDITDIR}/common.c \
+-	    > ${.TARGET}.tmp && \
+-	    mv ${.TARGET}.tmp ${.TARGET}
++	    > $@.tmp && \
++	    mv $@.tmp $@
+ 
+ fcns.h: ${AHDR} makelist Makefile
+ 	${_MKTARGET_CREATE}
+-	${HOST_SH} ${LIBEDITDIR}/makelist -fh ${AHDR} > ${.TARGET}.tmp && \
+-	    mv ${.TARGET}.tmp ${.TARGET}
++	${HOST_SH} ${LIBEDITDIR}/makelist -fh ${AHDR} > $@.tmp && \
++	    mv $@.tmp $@
+ 
+ fcns.c: ${AHDR} fcns.h help.h makelist Makefile
+ 	${_MKTARGET_CREATE}
+-	${HOST_SH} ${LIBEDITDIR}/makelist -fc ${AHDR} > ${.TARGET}.tmp && \
+-	    mv ${.TARGET}.tmp ${.TARGET}
++	${HOST_SH} ${LIBEDITDIR}/makelist -fc ${AHDR} > $@.tmp && \
++	    mv $@.tmp $@
+ 
+ help.c: ${ASRC} makelist Makefile
+ 	${_MKTARGET_CREATE}
+-	${HOST_SH} ${LIBEDITDIR}/makelist -bc ${ASRC} > ${.TARGET}.tmp && \
+-	    mv ${.TARGET}.tmp ${.TARGET}
++	${HOST_SH} ${LIBEDITDIR}/makelist -bc ${ASRC} > $@.tmp && \
++	    mv $@.tmp $@
+ 
+ help.h: ${ASRC} makelist Makefile
+ 	${_MKTARGET_CREATE}
+-	${HOST_SH} ${LIBEDITDIR}/makelist -bh ${ASRC} > ${.TARGET}.tmp && \
+-	    mv ${.TARGET}.tmp ${.TARGET}
++	${HOST_SH} ${LIBEDITDIR}/makelist -bh ${ASRC} > $@.tmp && \
++	    mv $@.tmp $@
+ 
+ editline.c: ${OSRCS} makelist Makefile
+ 	${_MKTARGET_CREATE}
+-	${HOST_SH} ${LIBEDITDIR}/makelist -e ${OSRCS:T} > ${.TARGET}.tmp && \
+-	    mv ${.TARGET}.tmp ${.TARGET}
++	${HOST_SH} ${LIBEDITDIR}/makelist -e ${OSRCS:T} > $@.tmp && \
++	    mv $@.tmp $@
+ 
+ test.o:	${LIBEDITDIR}/TEST/test.c
+ 	
+ test:	libedit.a test.o 
+ 	${_MKTARGET_LINK}
+-	${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -ltermcap
++	${CC} ${LDFLAGS} ${.ALLSRC} -o $@ libedit.a ${LDADD} -ltermcap
+ 
+-.include <bsd.lib.mk>
+-.include <bsd.subdir.mk>
++.depend: vi.h emacs.h common.h fcns.h help.h help.c
++	-mkdir .a .so
++.c.o:
++	${CC} ${CFLAGS} -c $< -o .a/$*
++	${CC} ${CFLAGS} -fPIC -c $< -o .so/$*
++libedit.a: ${OOBJS}
++	${AR} -r $@ .a/*
++libedit.so: ${OOBJS}
++	${CC} --shared -o $@ .so/* ${LIBS}
+--- netbsd-cvs/el.c
++++ libedit-uNF/el.c
+@@ -439,8 +439,10 @@
+ 		static const char elpath[] = "/.editrc";
+ 		char path[MAXPATHLEN];
+ 
++#if 0
+ 		if (issetugid())
+ 			return (-1);
++#endif
+ 		if ((ptr = getenv("HOME")) == NULL)
+ 			return (-1);
+ 		if (strlcpy(path, ptr, sizeof(path)) >= sizeof(path))
diff --git a/dev-libs/libedit/libedit-20050531.ebuild b/dev-libs/libedit/libedit-20050531.ebuild
new file mode 100644
index 000000000000..140756807816
--- /dev/null
+++ b/dev-libs/libedit/libedit-20050531.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20050531.ebuild,v 1.1 2005/06/01 02:03:08 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="BSD replacement for libreadline"
+HOMEPAGE="http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses"
+
+S=${WORKDIR}/netbsd-cvs
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mv "${WORKDIR}"/glibc-*/*.c .
+	epatch "${FILESDIR}"/${PN}-20050531-debian-to-gentoo.patch
+}
+
+src_compile() {
+	emake -j1 .depend || die "depend"
+	emake || die "make"
+}
+
+src_install() {
+	dolib.so libedit.so || die "dolib.so"
+	dolib.a libedit.a || die "dolib.a"
+	insinto /usr/include
+	doins histedit.h || die "doins *.h"
+	doman *.[35]
+}