From 9e75041bf59babd5beb00277ffd7425a5f881a9b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 3 Nov 2006 07:11:31 +0000 Subject: Version bump and include readline.h #153675 by Ming-Wei. Package-Manager: portage-2.1.2_rc1-r2 --- dev-libs/libedit/ChangeLog | 8 +- dev-libs/libedit/Manifest | 26 ++-- dev-libs/libedit/files/digest-libedit-20061103 | 3 + .../files/libedit-20061103-debian-to-gentoo.patch | 133 +++++++++++++++++++++ dev-libs/libedit/libedit-20061103.ebuild | 40 +++++++ 5 files changed, 202 insertions(+), 8 deletions(-) create mode 100644 dev-libs/libedit/files/digest-libedit-20061103 create mode 100644 dev-libs/libedit/files/libedit-20061103-debian-to-gentoo.patch create mode 100644 dev-libs/libedit/libedit-20061103.ebuild diff --git a/dev-libs/libedit/ChangeLog b/dev-libs/libedit/ChangeLog index 5b26f25b5d48..bf225e303f82 100644 --- a/dev-libs/libedit/ChangeLog +++ b/dev-libs/libedit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libedit # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.17 2006/09/16 15:35:48 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.18 2006/11/03 07:11:31 vapier Exp $ + +*libedit-20061103 (03 Nov 2006) + + 03 Nov 2006; Mike Frysinger + +files/libedit-20061103-debian-to-gentoo.patch, +libedit-20061103.ebuild: + Version bump and include readline.h #153675 by Ming-Wei. 16 Sep 2006; Tobias Scherbaum libedit-20050930.ebuild: diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest index 11a17e22b307..b18f2b32249c 100644 --- a/dev-libs/libedit/Manifest +++ b/dev-libs/libedit/Manifest @@ -5,15 +5,24 @@ AUX libedit-20050531-debian-to-gentoo.patch 3869 RMD160 e4e601d310972aa3d245bbd3 MD5 758704551b5bed630ac9f19193f4921e files/libedit-20050531-debian-to-gentoo.patch 3869 RMD160 e4e601d310972aa3d245bbd30ce47ac1db1c65ac files/libedit-20050531-debian-to-gentoo.patch 3869 SHA256 219c635305e0d490fd925b03d299637558f9aea2b8dbba057018481eea67aa4f files/libedit-20050531-debian-to-gentoo.patch 3869 +AUX libedit-20061103-debian-to-gentoo.patch 3864 RMD160 d422d603899e851abb915dbbb7c0d01d35f9de5f SHA1 70ffa4f3b4d7321a7278a6abb1cf2bba58db62b2 SHA256 afc66f92e4e5c6404c5cb4a85c90335a3d372d9456589fc309535ee05c95d6d8 +MD5 7cffa70f59ca345f94010ceb3d7cad2c files/libedit-20061103-debian-to-gentoo.patch 3864 +RMD160 d422d603899e851abb915dbbb7c0d01d35f9de5f files/libedit-20061103-debian-to-gentoo.patch 3864 +SHA256 afc66f92e4e5c6404c5cb4a85c90335a3d372d9456589fc309535ee05c95d6d8 files/libedit-20061103-debian-to-gentoo.patch 3864 DIST libedit-20050930.tar.bz2 96696 RMD160 0f7711c1d7128d97383aecedd31730783b5abf61 SHA1 c0d00695ff0f65489acc9a435ff82dec70975d3e SHA256 a1dd32b6732f15b125b33de29ec5f50b0f464d23ad3432755ab3b7498b77ddf6 +DIST libedit-20061103.tar.bz2 97032 RMD160 8c15895dedd69d979c8d911803246808c12ea198 SHA1 1057422d38ff226f8bb6cc392efc9c0c36a1d208 SHA256 11542988eeed1fbe23b8b421389dbd37fb0cedb1d7c76b49399163be27eacf3f EBUILD libedit-20050930.ebuild 916 RMD160 990273ce59ec8efeade89989c298bcd2649da4bd SHA1 b11e3c1d6c36602b4a24dbafc4609abcc07c027e SHA256 eaf306582f52e93381d033e35beba9018f365732619d40a7c25aadd82bd5f357 MD5 ad4fe11d6e29ce709fcd85745cb575d2 libedit-20050930.ebuild 916 RMD160 990273ce59ec8efeade89989c298bcd2649da4bd libedit-20050930.ebuild 916 SHA256 eaf306582f52e93381d033e35beba9018f365732619d40a7c25aadd82bd5f357 libedit-20050930.ebuild 916 -MISC ChangeLog 1400 RMD160 bbc55ea3739a2e7883e5938f322c7593c057a865 SHA1 a78f7637e85e1d3000e4e1e0dd909cf85bf9b89b SHA256 550c73930fddfece5828332d4c31cd422f51bdebbd8a40f08ebc4000f04ab394 -MD5 c4c7a1e4a2014d846fc8eecfd5e3b5f0 ChangeLog 1400 -RMD160 bbc55ea3739a2e7883e5938f322c7593c057a865 ChangeLog 1400 -SHA256 550c73930fddfece5828332d4c31cd422f51bdebbd8a40f08ebc4000f04ab394 ChangeLog 1400 +EBUILD libedit-20061103.ebuild 1018 RMD160 a03e1aa2763e57284380c148c2a027a1581e09a0 SHA1 ded409d713a52dfa453d24e49b93dd28cf270985 SHA256 9d10825dbd80b06c5fd033bdc51ff1535770b407c9493fe4a7acd5db9825a8a6 +MD5 58d520c1fa3db80d6c58515563fddeaa libedit-20061103.ebuild 1018 +RMD160 a03e1aa2763e57284380c148c2a027a1581e09a0 libedit-20061103.ebuild 1018 +SHA256 9d10825dbd80b06c5fd033bdc51ff1535770b407c9493fe4a7acd5db9825a8a6 libedit-20061103.ebuild 1018 +MISC ChangeLog 1615 RMD160 98332910384d7327d51108e31f1fb866a5222bdf SHA1 38256257669550fe7c90069273e549ea3753162b SHA256 5ad859bf67aaa90731996a5f34cf520e679c071b15080a72a4e4f22df2421183 +MD5 8dc154c60d64fe6846b0a667b2a42074 ChangeLog 1615 +RMD160 98332910384d7327d51108e31f1fb866a5222bdf ChangeLog 1615 +SHA256 5ad859bf67aaa90731996a5f34cf520e679c071b15080a72a4e4f22df2421183 ChangeLog 1615 MISC metadata.xml 620 RMD160 185de826ddbcf0ac5f56b5807e15c9db5a9b6ecf SHA1 ca4dbed5f026bcd680b4532694b567bf435e8e4a SHA256 854e5b5f73775072518392a556d0f43ea0f4932bed80db7efc6a921d6e354ce1 MD5 dd9909c8d431d328b7f97b210f957592 metadata.xml 620 RMD160 185de826ddbcf0ac5f56b5807e15c9db5a9b6ecf metadata.xml 620 @@ -21,10 +30,13 @@ SHA256 854e5b5f73775072518392a556d0f43ea0f4932bed80db7efc6a921d6e354ce1 metadata MD5 931ffa544f4b32475b6dba74b82801c1 files/digest-libedit-20050930 250 RMD160 8cefbd4802907844c64235011455b9351c23a5a8 files/digest-libedit-20050930 250 SHA256 9cc67f4e36abc5774cbf8e23d40f79a89ddfafc9de58954c191841288b1bd1b9 files/digest-libedit-20050930 250 +MD5 516cad497ba5c3a5d23ea3bf25f2d6d6 files/digest-libedit-20061103 250 +RMD160 450d39f599024f0902b68d12c5255120d28cc3d7 files/digest-libedit-20061103 250 +SHA256 e728639d59bc42c99887fa4d8ef36fb3eead6d5e33aad39bca885012568a7e09 files/digest-libedit-20061103 250 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFSuj0amhnQswr0vIRAswRAJ9g82DDA39LZU8mIvBAC/zaNrVeKgCfeUkP -BjRkvYu0UV20FqpHX77jMl4= -=axkH +iD8DBQFFSuu4amhnQswr0vIRAgftAJ9hwtH9o7KWM/vw/zp0WKF2xJYK6wCfcL+/ +55y5SY3KkgAnxobrR+PJxRU= +=sNXq -----END PGP SIGNATURE----- diff --git a/dev-libs/libedit/files/digest-libedit-20061103 b/dev-libs/libedit/files/digest-libedit-20061103 new file mode 100644 index 000000000000..cc5a3bd4a954 --- /dev/null +++ b/dev-libs/libedit/files/digest-libedit-20061103 @@ -0,0 +1,3 @@ +MD5 54f47c091e20563c3281684f4719a106 libedit-20061103.tar.bz2 97032 +RMD160 8c15895dedd69d979c8d911803246808c12ea198 libedit-20061103.tar.bz2 97032 +SHA256 11542988eeed1fbe23b8b421389dbd37fb0cedb1d7c76b49399163be27eacf3f libedit-20061103.tar.bz2 97032 diff --git a/dev-libs/libedit/files/libedit-20061103-debian-to-gentoo.patch b/dev-libs/libedit/files/libedit-20061103-debian-to-gentoo.patch new file mode 100644 index 000000000000..686c3aa96da1 --- /dev/null +++ b/dev-libs/libedit/files/libedit-20061103-debian-to-gentoo.patch @@ -0,0 +1,133 @@ +--- 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 $@ + + tc1.o: ${LIBEDITDIR}/TEST/tc1.c + +-tc1: libedit.a tc1.o ++tc1: + ${_MKTARGET_LINK} +- ${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -ltermcap ++ ${CC} ${CFLAGS} ${LDFLAGS} ${.ALLSRC} -o $@ TEST/test.c libedit.a ${LDADD} ${LIBS} + +-.include +-.include ++.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) -Wl,-soname,libedit.so +--- 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-20061103.ebuild b/dev-libs/libedit/libedit-20061103.ebuild new file mode 100644 index 000000000000..e6b32033fcd1 --- /dev/null +++ b/dev-libs/libedit/libedit-20061103.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20061103.ebuild,v 1.1 2006/11/03 07:11:31 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}-20061103-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 histedit.h" + insinto /usr/include/libedit + doins readline/readline.h || die "doins readline.h" + doman *.[35] +} -- cgit v1.2.3-65-gdbad