Remove old versions. bug #348660

(Portage version: 2.2.0_alpha34/cvs/Linux x86_64)

8 files changed, 8 insertions, 399 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/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
-}