diff options
author | Naohiro Aota <naota@gentoo.org> | 2011-05-26 17:50:45 +0000 |
---|---|---|
committer | Naohiro Aota <naota@gentoo.org> | 2011-05-26 17:50:45 +0000 |
commit | 9a3b14e09033d94bc674c525ce3c28daf583ae51 (patch) | |
tree | 234ad98a7f385f73849a399169a4706c35008f58 /dev-libs | |
parent | New package dev-ruby/pkg-config. Dependency for bug #345721 (diff) | |
download | historical-9a3b14e09033d94bc674c525ce3c28daf583ae51.tar.gz historical-9a3b14e09033d94bc674c525ce3c28daf583ae51.tar.bz2 historical-9a3b14e09033d94bc674c525ce3c28daf583ae51.zip |
Remove old versions. bug #348660
Package-Manager: portage-2.2.0_alpha34/cvs/Linux x86_64
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/libedit/ChangeLog | 9 | ||||
-rw-r--r-- | dev-libs/libedit/Manifest | 17 | ||||
-rw-r--r-- | dev-libs/libedit/files/libedit-20050531-debian-to-gentoo.patch | 133 | ||||
-rw-r--r-- | dev-libs/libedit/files/libedit-20061103-debian-to-gentoo.patch | 125 | ||||
-rw-r--r-- | dev-libs/libedit/files/libedit-20061103-freebsd.patch | 21 | ||||
-rw-r--r-- | dev-libs/libedit/files/libedit-20061103-glibc.patch | 17 | ||||
-rw-r--r-- | dev-libs/libedit/files/libedit-20061103-ldflags.patch | 8 | ||||
-rw-r--r-- | dev-libs/libedit/libedit-20050930.ebuild | 39 | ||||
-rw-r--r-- | dev-libs/libedit/libedit-20061103-r2.ebuild | 55 |
9 files changed, 12 insertions, 412 deletions
diff --git a/dev-libs/libedit/ChangeLog b/dev-libs/libedit/ChangeLog index 17b82189ddad..24ef5ac94eb7 100644 --- a/dev-libs/libedit/ChangeLog +++ b/dev-libs/libedit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/libedit # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.50 2011/05/22 03:03:22 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.51 2011/05/26 17:50:45 naota Exp $ + + 26 May 2011; Naohiro Aota <naota@gentoo.org> + -files/libedit-20050531-debian-to-gentoo.patch, -libedit-20050930.ebuild, + -libedit-20061103-r2.ebuild, -files/libedit-20061103-debian-to-gentoo.patch, + -files/libedit-20061103-freebsd.patch, -files/libedit-20061103-glibc.patch, + -files/libedit-20061103-ldflags.patch: + Remove old versions. bug #348660 22 May 2011; Naohiro Aota <naota@gentoo.org> libedit-20100424.3.0.ebuild, +files/libedit-20100424.3.0-bsd.patch, diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest index 98df53fd6243..012092aa6eeb 100644 --- a/dev-libs/libedit/Manifest +++ b/dev-libs/libedit/Manifest @@ -1,28 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX libedit-20050531-debian-to-gentoo.patch 3869 RMD160 e4e601d310972aa3d245bbd30ce47ac1db1c65ac SHA1 fe34a6a1a77b43c59d2f3e27ac05ff082346d38b SHA256 219c635305e0d490fd925b03d299637558f9aea2b8dbba057018481eea67aa4f -AUX libedit-20061103-debian-to-gentoo.patch 3472 RMD160 01d9d2f2c59831ff283f496e4c15090caab2c396 SHA1 1c1b62b39454f273e1822499cf6945a7e65f7919 SHA256 8e80db89d128d5d3230274e9b9e58f37a94c2342b208c2b1324b2a17da9e8299 -AUX libedit-20061103-freebsd.patch 721 RMD160 c708103475f280e0e4c4c5a34f6657302de57f55 SHA1 d51489395be36821668e46aa7e0443e3045d872c SHA256 b8b42ae5bd9422a4f431a511d1e055505f7fa274491d098823037e17b0a10866 -AUX libedit-20061103-glibc.patch 653 RMD160 63dccbe75ecb0882fdad9c8678c5e857fd28ac2b SHA1 c8f29040ea91e62c82af20f4c727484a4e202153 SHA256 6fbd3940dae33c0ee9308baa5093ef0894c6f0e0efe991f89f6db5820130696d -AUX libedit-20061103-ldflags.patch 338 RMD160 d2ebcd91f1d22141421eede681e726d6ea234813 SHA1 df0b908ff1765124b52aa2a215584a104110ec73 SHA256 5b5d113db289e4c2c10da71360001df6e441cea1e85a906bc06410111adaf0f0 AUX libedit-20090111-3.0-weak_reference.patch 659 RMD160 1d1b5c990bccf27b8467c4f79464421638e68d41 SHA1 d32cf200a73f65533043e36df85baf6b8c78a19e SHA256 be8578b19adc0003d3593e944624ebaa5f87bbc890620e2e8f45b4a42c1e5523 AUX libedit-20100424.3.0-bsd.patch 724 RMD160 89be9d63791d0d1bdfd8d5faade9fe47fef86884 SHA1 ff63f51dbd9d7c72545c5f4359631aee190f4ead SHA256 2226e17f65b2486c45964867a1ed4a699c1861089b7a1501bccc83d28bca6c45 AUX libedit-20100424.3.0-weak-reference.patch 622 RMD160 8b5a2eab56bd7bbc4cefbc4c7a86093b22b02b95 SHA1 6eb7c8bf1ded99098b642b3f0e6632f7d610d672 SHA256 17c70fce91ee7a77bb3b4259091435e33aafc35c7c6f25eae522e41915f319e0 -DIST libedit-20050930.tar.bz2 96696 RMD160 0f7711c1d7128d97383aecedd31730783b5abf61 SHA1 c0d00695ff0f65489acc9a435ff82dec70975d3e SHA256 a1dd32b6732f15b125b33de29ec5f50b0f464d23ad3432755ab3b7498b77ddf6 -DIST libedit-20061103.tar.bz2 97032 RMD160 8c15895dedd69d979c8d911803246808c12ea198 SHA1 1057422d38ff226f8bb6cc392efc9c0c36a1d208 SHA256 11542988eeed1fbe23b8b421389dbd37fb0cedb1d7c76b49399163be27eacf3f DIST libedit-20090923-3.0.tar.gz 466724 RMD160 c8b05abbb5743a3c709d981c131cb6d11b6e83fd SHA1 25b4f63103f2098fc06dc9c2f455d2a937507bb5 SHA256 6aca4e63d27148514a40be5bd59305914836a1fe0d2d79e1733cb1d01636460a DIST libedit-20100424-3.0.tar.gz 442438 RMD160 daa0bace15c0eb063c151f1fad26677a7673c248 SHA1 bbc9b77daf95c2482bf406e07d69cdbe0fa29db7 SHA256 602b385906b6057f52922afc42cafbceadd8bae4be43c9189ea7fa870a561d86 -EBUILD libedit-20050930.ebuild 931 RMD160 2eaf9e6dcdb6e9170dde54e0636d32abd0bccc83 SHA1 0415506c09f9f63cfb095282f86d115f25fce44c SHA256 f6958bb3a7709617fb9323db42c9ef112f2014f275f0272625b00c92d637d96a -EBUILD libedit-20061103-r2.ebuild 1387 RMD160 979b4749669f9a0aa26b0fa70915a8e40e130002 SHA1 9065068549d10f7ecac86f71e041759b6268217e SHA256 93e18f2b1ed78227bdb7e674152d1a5eef1dbd0d3711e680e7af76e962bd275d EBUILD libedit-20090923.3.0.ebuild 978 RMD160 04a0e91bce0ac4dfb23b594e6bf009a776bce5f8 SHA1 1e63d2487470609878d3628a275b27edae734764 SHA256 064a714b8d61a84ea7def15351d90fd767755994133e4446efb5104d1cc9e12d EBUILD libedit-20100424.3.0.ebuild 1263 RMD160 f84d385e2681e6e7d1694ee6b199b747b1bec48e SHA1 22b7751c46536687a06cc0b85b5abdbf686727bf SHA256 513f371ac17c22e3db210d3f1ed0acf456aab58a22fa0626f32471dcfe8b97b4 -MISC ChangeLog 6272 RMD160 a7f9befcc9d8f049ee40aca392d087e9b076aeea SHA1 d789596d7b46b25e3a78d60832953b58bd9241db SHA256 ef24138eff3aff8ec7191c800b8e80cc3b9073a09d0a2b7b4378e152530f78a3 +MISC ChangeLog 6629 RMD160 c65e63f51c002ab0b8dee4361eedac48b7260662 SHA1 81928da8c126b0321775086e86bc8d79943abda7 SHA256 cab3a3d8b9e112a61272e2831f71f3148ba80582b66e93211d57cbbcea95349e MISC metadata.xml 554 RMD160 35a9c1672f8234e632d132cb027b49dfafde7088 SHA1 8c587cc015553e0679099d1e924ed27edcef4b62 SHA256 31620c2c90ee411f950c9ccf31ec24c3734bcb4a9cc13c083a3214c05e62cdbd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3YfN4ACgkQGpDnPLSHuMAYEACgt2fvRoQyxyNPhxgLWWWO0Gp5 -Nb4An06bb1gN80A8ua4yltHYQY2H++XM -=n2RA +iEYEARECAAYFAk3ektIACgkQGpDnPLSHuMAzSwCfahZ9GSD9pDuqPvyrvRZMxzxM +6NoAoIXurUJaQtJxaHR157QvOwKSf9Va +=/lSK -----END PGP SIGNATURE----- diff --git a/dev-libs/libedit/files/libedit-20050531-debian-to-gentoo.patch b/dev-libs/libedit/files/libedit-20050531-debian-to-gentoo.patch deleted file mode 100644 index 73de1de0d02c..000000000000 --- a/dev-libs/libedit/files/libedit-20050531-debian-to-gentoo.patch +++ /dev/null @@ -1,133 +0,0 @@ ---- 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 -+test: - ${_MKTARGET_LINK} -- ${CC} ${LDFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD} -ltermcap -+ ${CC} ${CFLAGS} ${LDFLAGS} ${.ALLSRC} -o $@ TEST/test.c libedit.a ${LDADD} ${LIBS} - --.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) -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/files/libedit-20061103-debian-to-gentoo.patch b/dev-libs/libedit/files/libedit-20061103-debian-to-gentoo.patch deleted file mode 100644 index 5d011d92de70..000000000000 --- a/dev-libs/libedit/files/libedit-20061103-debian-to-gentoo.patch +++ /dev/null @@ -1,125 +0,0 @@ ---- 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 - # 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} - -@@ -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 <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) -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/files/libedit-20061103-freebsd.patch b/dev-libs/libedit/files/libedit-20061103-freebsd.patch deleted file mode 100644 index f9e3aba77141..000000000000 --- a/dev-libs/libedit/files/libedit-20061103-freebsd.patch +++ /dev/null @@ -1,21 +0,0 @@ -OK, FreeBSD sh does not define get_alias_text and until it does we need -to NOT define the __weak_reference for it here. -According to bug #157407 this will break heimdal and thunderbird. -Tough, as our /bin/sh is more important at this time. - -Index: work/netbsd-cvs/sys.h -=================================================================== ---- work.orig/netbsd-cvs/sys.h -+++ work/netbsd-cvs/sys.h -@@ -44,6 +44,11 @@ - #include <sys/cdefs.h> - #endif - -+#ifdef __FreeBSD__ -+# undef __weak_reference -+/* # define __weak_reference(x) __attribute__((__weakref__)) */ -+#endif -+ - #if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__) || __GNUC__ == 2 && __GNUC_MINOR__ < 8) - # define __attribute__(A) - #endif diff --git a/dev-libs/libedit/files/libedit-20061103-glibc.patch b/dev-libs/libedit/files/libedit-20061103-glibc.patch deleted file mode 100644 index fdf15570428c..000000000000 --- a/dev-libs/libedit/files/libedit-20061103-glibc.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- netbsd-cvs/Makefile -+++ libedit-uNF/Makefile -@@ -25,5 +26,5 @@ - 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 -@@ -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 diff --git a/dev-libs/libedit/files/libedit-20061103-ldflags.patch b/dev-libs/libedit/files/libedit-20061103-ldflags.patch deleted file mode 100644 index 7e9d4085f4da..000000000000 --- a/dev-libs/libedit/files/libedit-20061103-ldflags.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- netbsd-cvs/Makefile.orig 2009-01-04 23:09:48.705130795 +0100 -+++ netbsd-cvs/Makefile 2009-01-04 23:09:55.836326665 +0100 -@@ -118,4 +118,4 @@ - libedit.a: $(OOBJS) - $(AR) -r $@ .a/* - libedit.so: $(OOBJS) -- $(CC) --shared -o $@ .so/* $(LIBS) -Wl,-soname,libedit.so -+ $(CC) $(LDFLAGS) --shared -o $@ .so/* $(LIBS) -Wl,-soname,libedit.so diff --git a/dev-libs/libedit/libedit-20050930.ebuild b/dev-libs/libedit/libedit-20050930.ebuild deleted file mode 100644 index 69cc68f32fa8..000000000000 --- a/dev-libs/libedit/libedit-20050930.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20050930.ebuild,v 1.7 2011/02/06 12:37:00 leio 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="" -RESTRICT="test" - -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] -} diff --git a/dev-libs/libedit/libedit-20061103-r2.ebuild b/dev-libs/libedit/libedit-20061103-r2.ebuild deleted file mode 100644 index 649a2cd67b04..000000000000 --- a/dev-libs/libedit/libedit-20061103-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20061103-r2.ebuild,v 1.2 2009/01/04 22:15:44 angelos Exp $ - -inherit eutils toolchain-funcs - -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 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="elibc_glibc" - -DEPEND="sys-libs/ncurses - !<=sys-freebsd/freebsd-lib-6.2_rc1" - -S=${WORKDIR}/netbsd-cvs - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-20061103-debian-to-gentoo.patch - - if use elibc_glibc; then - mv "${WORKDIR}"/glibc-*/*.c . - epatch "${FILESDIR}/${P}-glibc.patch" - fi - - # FreeBSD's __weak_reference macro differs from NetBSD's - epatch "${FILESDIR}/${P}-freebsd.patch" \ - "${FILESDIR}"/${P}-ldflags.patch -} - -src_compile() { - tc-export CC - emake -j1 .depend || die "depend" - emake || die "make" -} - -src_install() { - into / - dolib.so libedit.so || die "dolib.so" - into /usr - 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] - - gen_usr_ldscript libedit.so -} |