Version bump (from the lisp overlay); obsolete dependency on app-text/texi2html removed

(Portage version: 2.2_rc62/cvs/Linux i686)

15 files changed, 41 insertions, 613 deletions

diff --git a/dev-lisp/ecls/ChangeLog b/dev-lisp/ecls/ChangeLog
index 6d17b9a31d27..e91bf4e23924 100644
--- a/dev-lisp/ecls/ChangeLog
+++ b/dev-lisp/ecls/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-lisp/ecls
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ChangeLog,v 1.33 2010/02/16 22:27:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ChangeLog,v 1.34 2010/02/19 16:36:18 grozin Exp $
+
+*ecls-10.2.1 (19 Feb 2010)
+
+  19 Feb 2010; Andrey Grozin <grozin@gentoo.org>
+  -files/0.9g-headers-gentoo.patch, -ecls-0.9h.ebuild,
+  -files/0.9h-headers-gentoo.patch, -ecls-0.9h-r1.ebuild,
+  -files/0.9h-sockets-c++-gentoo.patch, -ecls-0.9i.ebuild,
+  -files/0.9i-headers-gentoo.patch, -ecls-0.9j_p1.ebuild,
+  +files/10.2.1-headers-gentoo.patch, -ecls-0.9g.ebuild, -ecls-9.8.4.ebuild,
+  -files/9.8.4-headers-gentoo.patch, ecls-9.12.3.ebuild,
+  +ecls-10.2.1.ebuild, -files/clc-lite.lisp:
+  Version bump (from the lisp overlay); obsolete dependency on
+  app-text/texi2html removed
 
   16 Feb 2010; Christian Faulhammer <fauli@gentoo.org> ecls-9.12.3.ebuild:
   stable x86, bug 303699
diff --git a/dev-lisp/ecls/ecls-0.9g.ebuild b/dev-lisp/ecls/ecls-0.9g.ebuild
deleted file mode 100644
index a5d128c690d4..000000000000
--- a/dev-lisp/ecls/ecls-0.9g.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-0.9g.ebuild,v 1.2 2006/02/13 19:52:59 mkennedy Exp $
-
-inherit eutils
-
-DESCRIPTION="ECL is an embeddable Common Lisp implementation."
-SRC_URI="mirror://sourceforge/ecls/ecl-${PV}.tar.gz"
-HOMEPAGE="http://ecls.sourceforge.net/"
-SLOT="0"
-LICENSE="BSD LGPL-2"
-KEYWORDS="x86 ~ppc ~amd64 ~sparc"
-
-DEPEND="=dev-libs/gmp-4*
-	app-text/texi2html"
-
-# ECL fails to build with a system-installed Boehm GC (which apparently is a
-# rare configuration since most distributions neglect to install the useful
-# private headers). Until this is properly isolated, we use the Boehm GC
-# included with ECL.
-
-#	dev-libs/boehm-gc
-
-IUSE="X"
-
-PROVIDE="virtual/commonlisp"
-
-S=${WORKDIR}/ecl-${PV:0:4}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-headers-gentoo.patch || die
-}
-
-src_compile() {
-	local myconf="--with-system-gmp
-		--enable-boehm=included
-		--with-tcp
-		--with-ffi
-		--with-clos-streams
-		--with-cmuformat
-		--with-asdf
-		`use_with X x`
-		`use_with X clx`"
-	einfo "Configuring with: $myconf"
-	econf ${myconf} || die
-	make || die
-}
-
-src_install () {
-	make bindir=${D}/usr/bin \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/lib/ecl \
-		docdir=${D}/usr/share/doc/${PF} install || true
-	dohtml doc/*.html
-	dodoc ANNOUNCEMENT Copyright LGPL
-
-	insinto /usr/share/doc/${PF}/
-	doins ${FILESDIR}/{clc-lite.lisp,README.Gentoo}
-}
diff --git a/dev-lisp/ecls/ecls-0.9h-r1.ebuild b/dev-lisp/ecls/ecls-0.9h-r1.ebuild
deleted file mode 100644
index 92abca25fa5d..000000000000
--- a/dev-lisp/ecls/ecls-0.9h-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-0.9h-r1.ebuild,v 1.2 2006/02/14 23:15:02 mkennedy Exp $
-
-inherit eutils
-
-DESCRIPTION="ECL is an embeddable Common Lisp implementation."
-SRC_URI="mirror://sourceforge/ecls/ecl-${PV}.tgz"
-HOMEPAGE="http://ecls.sourceforge.net/"
-SLOT="0"
-LICENSE="BSD LGPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-
-DEPEND="=dev-libs/gmp-4*
-	app-text/texi2html"
-
-# ECL fails to build with a system-installed Boehm GC (which apparently is a
-# rare configuration since most distributions neglect to install the useful
-# private headers). Until this is properly isolated, we use the Boehm GC
-# included with ECL.
-
-#	dev-libs/boehm-gc
-
-IUSE="X c++"
-
-PROVIDE="virtual/commonlisp"
-
-S=${WORKDIR}/ecl-${PV:0:4}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-headers-gentoo.patch || die
-	epatch ${FILESDIR}/${PV}-sockets-c++-gentoo.patch || die
-}
-
-src_compile() {
-	local myconf="--with-system-gmp
-		--enable-boehm=included
-		--with-tcp
-		--with-ffi
-		--with-clos-streams
-		--with-cmuformat
-		--with-asdf
-		`use_with c++ cxx`
-		`use_with X x`
-		`use_with X clx`"
-	einfo "Configuring with: $myconf"
-	econf ${myconf} || die
-	make || die
-}
-
-src_install () {
-	make bindir=${D}/usr/bin \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/lib/ecl \
-		docdir=${D}/usr/share/doc/${PF} install || true
-	dohtml doc/*.html
-	dodoc ANNOUNCEMENT Copyright LGPL
-
-	insinto /usr/share/doc/${PF}/
-	doins ${FILESDIR}/{clc-lite.lisp,README.Gentoo}
-}
diff --git a/dev-lisp/ecls/ecls-0.9h.ebuild b/dev-lisp/ecls/ecls-0.9h.ebuild
deleted file mode 100644
index e7cae9229922..000000000000
--- a/dev-lisp/ecls/ecls-0.9h.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-0.9h.ebuild,v 1.2 2006/02/13 19:52:59 mkennedy Exp $
-
-inherit eutils
-
-DESCRIPTION="ECL is an embeddable Common Lisp implementation."
-SRC_URI="mirror://sourceforge/ecls/ecl-${PV}.tgz"
-HOMEPAGE="http://ecls.sourceforge.net/"
-SLOT="0"
-LICENSE="BSD LGPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-
-DEPEND="=dev-libs/gmp-4*
-	app-text/texi2html"
-
-# ECL fails to build with a system-installed Boehm GC (which apparently is a
-# rare configuration since most distributions neglect to install the useful
-# private headers). Until this is properly isolated, we use the Boehm GC
-# included with ECL.
-
-#	dev-libs/boehm-gc
-
-IUSE="X"
-
-PROVIDE="virtual/commonlisp"
-
-S=${WORKDIR}/ecl-${PV:0:4}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-headers-gentoo.patch || die
-}
-
-src_compile() {
-	local myconf="--with-system-gmp
-		--enable-boehm=included
-		--with-tcp
-		--with-ffi
-		--with-clos-streams
-		--with-cmuformat
-		--with-asdf
-		`use_with X x`
-		`use_with X clx`"
-	einfo "Configuring with: $myconf"
-	econf ${myconf} || die
-	make || die
-}
-
-src_install () {
-	make bindir=${D}/usr/bin \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/lib/ecl \
-		docdir=${D}/usr/share/doc/${PF} install || true
-	dohtml doc/*.html
-	dodoc ANNOUNCEMENT Copyright LGPL
-
-	insinto /usr/share/doc/${PF}/
-	doins ${FILESDIR}/{clc-lite.lisp,README.Gentoo}
-}
diff --git a/dev-lisp/ecls/ecls-0.9i.ebuild b/dev-lisp/ecls/ecls-0.9i.ebuild
deleted file mode 100644
index 621ecd958be4..000000000000
--- a/dev-lisp/ecls/ecls-0.9i.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-0.9i.ebuild,v 1.2 2008/07/13 18:51:40 pchrist Exp $
-
-inherit eutils
-
-DESCRIPTION="ECL is an embeddable Common Lisp implementation."
-SRC_URI="mirror://sourceforge/ecls/ecl-${PV}.tgz"
-HOMEPAGE="http://ecls.sourceforge.net/"
-SLOT="0"
-LICENSE="BSD LGPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-DEPEND="=dev-libs/gmp-4*
-	app-text/texi2html"
-IUSE="X"
-PROVIDE="virtual/commonlisp"
-S=${WORKDIR}/ecl-${PV:0:4}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-headers-gentoo.patch"
-}
-
-src_compile() {
-	econf --with-system-gmp \
-		--enable-boehm=included \
-		--with-tcp \
-		--with-ffi \
-		--with-clos-streams \
-		--with-cmuformat \
-		--with-asdf \
-		$(use_with X x) \
-		$(use_with X clx) \
-		|| die "econf failed"
-	emake -j1 || die "emake died"
-}
-
-src_install () {
-	local libso="libecl.so"
-
-	emake DESTDIR="${D}" install \
-	|| die "emake install failed."
-
-	rm -v "${D}/usr/lib/ecl/${libso}"
-	rm -v "${D}/usr/share/doc/ecl"
-	dolib.so "build/${libso}"
-
-	dohtml doc/*.html
-	dodoc ANNOUNCEMENT Copyright LGPL "${FILESDIR}/README.Gentoo"
-}
diff --git a/dev-lisp/ecls/ecls-0.9j_p1.ebuild b/dev-lisp/ecls/ecls-0.9j_p1.ebuild
deleted file mode 100644
index a0a85163aace..000000000000
--- a/dev-lisp/ecls/ecls-0.9j_p1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-0.9j_p1.ebuild,v 1.1 2008/01/11 14:50:18 hkbst Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="ECL is an embeddable Common Lisp implementation."
-SRC_URI="mirror://sourceforge/${PN}/ecl-${PV/_/-}.tgz"
-HOMEPAGE="http://ecls.sourceforge.net/"
-SLOT="0"
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="=dev-libs/gmp-4*
-		app-text/texi2html
-		>=dev-libs/boehm-gc-6.8"
-
-IUSE="X threads unicode"
-
-PROVIDE="virtual/commonlisp"
-
-S="${WORKDIR}"/ecl-${PV:0:4}
-
-_src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
-}
-
-src_compile() {
-	econf \
-		--with-system-gmp \
-		--enable-boehm=system \
-		--enable-longdouble \
-		--enable-c99-complex \
-		$(use_with threads) \
-		$(use_with threads __thread) \
-		$(use_with unicode) \
-		$(use_with X x) \
-		$(use_with X clx) \
-		|| die "econf failed"
-	#parallel fails
-	emake -j1 || die "make failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	dohtml doc/*.html
-	dodoc ANNOUNCEMENT Copyright
-
-#	dodoc "${FILESDIR}"/README.Gentoo
-}
diff --git a/dev-lisp/ecls/ecls-9.8.4.ebuild b/dev-lisp/ecls/ecls-10.2.1.ebuild
index 0e0113ed5a57..ba30ac9521d6 100644
--- a/dev-lisp/ecls/ecls-9.8.4.ebuild
+++ b/dev-lisp/ecls/ecls-10.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-9.8.4.ebuild,v 1.2 2010/01/31 17:33:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-10.2.1.ebuild,v 1.1 2010/02/19 16:36:18 grozin Exp $
 
-EAPI=2
+EAPI=3
 inherit eutils multilib
 
 MY_P=ecl-${PV}
@@ -10,24 +10,21 @@ MY_P=ecl-${PV}
 DESCRIPTION="ECL is an embeddable Common Lisp implementation."
 HOMEPAGE="http://common-lisp.net/project/ecl/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-RESTRICT="mirror"
 
 LICENSE="BSD LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="X c++ +threads +unicode"
+IUSE="debug doc precisegc +threads +unicode X"
 
 RDEPEND="dev-libs/gmp
 		virtual/libffi
-		>=dev-libs/boehm-gc-7.1[threads?]
-		c++? ( dev-libs/boehm-gc[-nocxx] )"
-DEPEND="${RDEPEND}
-		app-text/texi2html"
+		>=dev-libs/boehm-gc-7.1[threads?]"
+DEPEND="${RDEPEND}"
 PDEPEND="dev-lisp/gentoo-init"
 
 PROVIDE="virtual/commonlisp"
 
-S="${WORKDIR}"/ecl-${PV}
+S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-headers-gentoo.patch
@@ -37,26 +34,37 @@ src_configure() {
 	econf \
 		--with-system-gmp \
 		--enable-boehm=system \
-		--enable-gengc \
 		--enable-longdouble \
-		$(use_with c++ cxx) \
+		--enable-gengc \
+		$(use_enable precisegc) \
+		$(use_with debug debug-cflags) \
 		$(use_enable threads) \
 		$(use_with threads __thread) \
 		$(use_enable unicode) \
 		$(use_with X x) \
-		$(use_with X clx) \
-		|| die "econf failed"
+		$(use_with X clx)
 }
 
 src_compile() {
 	#parallel fails
-	emake -j1 || die "make failed"
+	emake -j1 || die "Compilation failed"
+	if use doc; then
+		pushd build/doc
+		emake || die "Building docs failed"
+		popd
+	fi
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "Could not build ECL"
+	emake DESTDIR="${D}" install || die "Installation failed"
 
-	dohtml doc/*.html
 	dodoc ANNOUNCEMENT Copyright
 	dodoc "${FILESDIR}"/README.Gentoo
+	pushd build/doc
+	newman ecl.man ecl.1
+	newman ecl-config.man ecl-config.1
+	if use doc; then
+		doinfo ecl{,dev}.info || die "Installing info docs failed"
+	fi
+	popd
 }
diff --git a/dev-lisp/ecls/ecls-9.12.3.ebuild b/dev-lisp/ecls/ecls-9.12.3.ebuild
index b61d4018bcd5..7aa388d5ce7d 100644
--- a/dev-lisp/ecls/ecls-9.12.3.ebuild
+++ b/dev-lisp/ecls/ecls-9.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-9.12.3.ebuild,v 1.4 2010/02/16 22:27:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-9.12.3.ebuild,v 1.5 2010/02/19 16:36:18 grozin Exp $
 
 EAPI=2
 inherit eutils multilib
@@ -19,8 +19,7 @@ IUSE="X doc +threads +unicode"
 RDEPEND="dev-libs/gmp
 		virtual/libffi
 		>=dev-libs/boehm-gc-7.1[threads?]"
-DEPEND="${RDEPEND}
-		app-text/texi2html"
+DEPEND="${RDEPEND}"
 PDEPEND="dev-lisp/gentoo-init"
 
 PROVIDE="virtual/commonlisp"
diff --git a/dev-lisp/ecls/files/0.9g-headers-gentoo.patch b/dev-lisp/ecls/files/0.9g-headers-gentoo.patch
deleted file mode 100644
index e691d51e5c5f..000000000000
--- a/dev-lisp/ecls/files/0.9g-headers-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur ecl-0.9g.orig/src/h/ecl.h ecl-0.9g/src/h/ecl.h
---- ecl-0.9g.orig/src/h/ecl.h	2005-08-12 11:26:42.000000000 -0500
-+++ ecl-0.9g/src/h/ecl.h	2005-08-13 13:10:59.000000000 -0500
-@@ -13,6 +13,9 @@
-     See file '../Copyright' for full details.
- */
- 
-+#ifndef __ECL_H__
-+#define __ECL_H__
-+
- #ifndef _MSC_VER
- #include <sys/param.h>		/* includes <sys/signal.h> and <sys/types.h> */
- #else
-@@ -69,3 +72,5 @@
- #endif
- 
- typedef void (*ecl_init_function_t)(cl_object block);
-+
-+#endif
-diff -ur ecl-0.9g.orig/src/h/object.h ecl-0.9g/src/h/object.h
---- ecl-0.9g.orig/src/h/object.h	2005-08-12 11:26:42.000000000 -0500
-+++ ecl-0.9g/src/h/object.h	2005-08-13 13:18:03.000000000 -0500
-@@ -22,8 +22,13 @@
- 	Integer and boolean types (see config.h)
- */
- 
-+#ifndef TRUE
- #define	TRUE		1	/*  boolean true value  */
-+#endif
-+
-+#ifndef FALSE
- #define	FALSE		0	/*  boolean false value  */
-+#endif
- 
- #define	CHAR_CODE_LIMIT	256	/*  ASCII character code limit  */
- 
diff --git a/dev-lisp/ecls/files/0.9h-headers-gentoo.patch b/dev-lisp/ecls/files/0.9h-headers-gentoo.patch
deleted file mode 100644
index 0e08ec9e1040..000000000000
--- a/dev-lisp/ecls/files/0.9h-headers-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur ecl-0.9h.orig/src/h/ecl.h ecl-0.9h/src/h/ecl.h
---- ecl-0.9h.orig/src/h/ecl.h	2005-08-12 11:26:42.000000000 -0500
-+++ ecl-0.9h/src/h/ecl.h	2005-08-13 13:10:59.000000000 -0500
-@@ -13,6 +13,9 @@
-     See file '../Copyright' for full details.
- */
- 
-+#ifndef __ECL_H__
-+#define __ECL_H__
-+
- #ifndef _MSC_VER
- #include <sys/param.h>		/* includes <sys/signal.h> and <sys/types.h> */
- #else
-@@ -69,3 +72,5 @@
- #endif
- 
- typedef void (*ecl_init_function_t)(cl_object block);
-+
-+#endif
-diff -ur ecl-0.9h.orig/src/h/object.h ecl-0.9h/src/h/object.h
---- ecl-0.9h.orig/src/h/object.h	2005-08-12 11:26:42.000000000 -0500
-+++ ecl-0.9h/src/h/object.h	2005-08-13 13:18:03.000000000 -0500
-@@ -22,8 +22,13 @@
- 	Integer and boolean types (see config.h)
- */
- 
-+#ifndef TRUE
- #define	TRUE		1	/*  boolean true value  */
-+#endif
-+
-+#ifndef FALSE
- #define	FALSE		0	/*  boolean false value  */
-+#endif
- 
- #define	CHAR_CODE_LIMIT	256	/*  ASCII character code limit  */
- 
diff --git a/dev-lisp/ecls/files/0.9h-sockets-c++-gentoo.patch b/dev-lisp/ecls/files/0.9h-sockets-c++-gentoo.patch
deleted file mode 100644
index f73a1fff0469..000000000000
--- a/dev-lisp/ecls/files/0.9h-sockets-c++-gentoo.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur ecl-0.9h.orig/contrib/sockets/sockets.lisp ecl-0.9h/contrib/sockets/sockets.lisp
---- ecl-0.9h.orig/contrib/sockets/sockets.lisp	2005-11-16 04:13:26.000000000 -0600
-+++ ecl-0.9h/contrib/sockets/sockets.lisp	2006-02-14 12:06:10.000000000 -0600
-@@ -518,7 +518,7 @@
- "{
-         struct sockaddr_in sockaddr;
-         int addr_len = sizeof(struct sockaddr_in);
--        int new_fd = accept(#0, (struct sockaddr*)&sockaddr, &addr_len);
-+        int new_fd = accept(#0, (struct sockaddr*)&sockaddr, (socklen_t *) &addr_len);
- 
- 	@(return 0) = new_fd;
- 	@(return 1) = Cnil;
-@@ -651,10 +651,10 @@
-         sockaddr.sun_len = sizeof(struct sockaddr_un);
- #endif
-         sockaddr.sun_family = #2;
--        strncpy(&sockaddr.sun_path,#1,sizeof(sockaddr.sun_path));
-+        strncpy((char *) &sockaddr.sun_path,#1,sizeof(sockaddr.sun_path));
- 	sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
- 
--        @(return) = bind(#0,&sockaddr, sizeof(struct sockaddr_un));
-+        @(return) = bind(#0,(struct sockaddr *) &sockaddr, sizeof(struct sockaddr_un));
- }"))
- 	(socket-error "bind"))))
- 
-@@ -664,9 +664,9 @@
- "{
-         struct sockaddr_un sockaddr;
-         int addr_len = sizeof(struct sockaddr_un);
--        int new_fd = accept(#0, &sockaddr, &addr_len);
-+        int new_fd = accept(#0, (struct sockaddr *) &sockaddr, (socklen_t *) &addr_len);
- 	@(return 0) = new_fd;
--	@(return 1) = (new_fd == -1) ? Cnil : make_string_copy(&sockaddr.sun_path);
-+	@(return 1) = (new_fd == -1) ? Cnil : make_string_copy((char *) &sockaddr.sun_path);
- }")
-     (cond
-       ((= fd -1)
-@@ -694,10 +694,10 @@
-         sockaddr.sun_len = sizeof(struct sockaddr_un);
- #endif
-         sockaddr.sun_family = #1;
--        strncpy(&sockaddr.sun_path,#2,sizeof(sockaddr.sun_path));
-+        strncpy((char *) &sockaddr.sun_path,#2,sizeof(sockaddr.sun_path));
- 	sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
- 
--        @(return) = connect(#0,&sockaddr, sizeof(struct sockaddr_un));
-+        @(return) = connect(#0,(struct sockaddr *) &sockaddr, sizeof(struct sockaddr_un));
- }"))
- 	(socket-error "connect"))))
- 
-@@ -708,10 +708,10 @@
- {
-         struct sockaddr_un name;
-         socklen_t len = sizeof(struct sockaddr_un);
--        int ret = getpeername(#0,&name,&len);
-+        int ret = getpeername(#0,(struct sockaddr *) &name,&len);
- 
-         if (ret == 0) {
--                @(return) = make_string_copy(&name.sun_path);
-+                @(return) = make_string_copy((char *) &name.sun_path);
-         } else {
-                 @(return) = Cnil;
-         }
-@@ -985,7 +985,7 @@
- 		       ))
- 	    (t :int :int)
- 	    t
--	    "ecl_make_stream_from_fd(#0,#1,#2)"
-+	    "ecl_make_stream_from_fd(#0,#1,(enum ecl_smmode) #2)"
- 	    :one-liner t))
- 
- (defgeneric socket-make-stream (socket  &rest args)
-@@ -1017,7 +1017,7 @@
- 	cl_object in_strm, out_strm;
- 	in_strm = ecl_make_stream_from_fd(make_simple_string(\"FD-STREAM\"), #0, smm_input);
- 	out_strm = ecl_make_stream_from_fd(make_simple_string(\"FD-STREAM\"), #0, smm_output);
--	@(return) = make_two_way_stream(in_strm, out_strm);
-+	@(return) = cl_make_two_way_stream(in_strm, out_strm);
- }"
-                                :one-liner nil)))
-       (setf (slot-value socket 'stream) stream)
diff --git a/dev-lisp/ecls/files/0.9i-headers-gentoo.patch b/dev-lisp/ecls/files/0.9i-headers-gentoo.patch
deleted file mode 100644
index e95adfa18360..000000000000
--- a/dev-lisp/ecls/files/0.9i-headers-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur ecl-0.9i.orig/src/h/ecl.h ecl-0.9i/src/h/ecl.h
---- ecl-0.9i.orig/src/h/ecl.h	2005-08-12 11:26:42.000000000 -0500
-+++ ecl-0.9i/src/h/ecl.h	2005-08-13 13:10:59.000000000 -0500
-@@ -13,6 +13,9 @@
-     See file '../Copyright' for full details.
- */
- 
-+#ifndef __ECL_H__
-+#define __ECL_H__
-+
- #ifndef _MSC_VER
- #include <sys/param.h>		/* includes <sys/signal.h> and <sys/types.h> */
- #else
-@@ -69,3 +72,5 @@
- #endif
- 
- typedef void (*ecl_init_function_t)(cl_object block);
-+
-+#endif
-diff -ur ecl-0.9i.orig/src/h/object.h ecl-0.9i/src/h/object.h
---- ecl-0.9i.orig/src/h/object.h	2005-08-12 11:26:42.000000000 -0500
-+++ ecl-0.9i/src/h/object.h	2005-08-13 13:18:03.000000000 -0500
-@@ -22,8 +22,13 @@
- 	Integer and boolean types (see config.h)
- */
- 
-+#ifndef TRUE
- #define	TRUE		1	/*  boolean true value  */
-+#endif
-+
-+#ifndef FALSE
- #define	FALSE		0	/*  boolean false value  */
-+#endif
- 
- #define	CHAR_CODE_LIMIT	256	/*  ASCII character code limit  */
- 
diff --git a/dev-lisp/ecls/files/9.8.4-headers-gentoo.patch b/dev-lisp/ecls/files/10.2.1-headers-gentoo.patch
index 635fc5d4afde..635fc5d4afde 100644
--- a/dev-lisp/ecls/files/9.8.4-headers-gentoo.patch
+++ b/dev-lisp/ecls/files/10.2.1-headers-gentoo.patch
diff --git a/dev-lisp/ecls/files/clc-lite.lisp b/dev-lisp/ecls/files/clc-lite.lisp
deleted file mode 100644
index 80d0a2f161d6..000000000000
--- a/dev-lisp/ecls/files/clc-lite.lisp
+++ /dev/null
@@ -1,112 +0,0 @@
-;;;; -*- mode: common-lisp; indent-tabs-mode: nil; package: common-lisp-controller -*-
-
-(defpackage #:common-lisp-controller
-  (:use #:common-lisp))
-
-(in-package #:common-lisp-controller)
-
-(defvar *source-root* #p"/usr/share/common-lisp/source/")
-
-(defvar *fasl-root* nil)
-
-(defvar *implementation-name* "ecl")
-
-(eval-when (:load-toplevel :compile-toplevel :execute)
-  (unless (member :asdf *features*)
-    (require 'asdf)))
-
-
-;; I cut this out of CMUCL
-
-(defun %enough-namestring (pathname &optional (defaults *default-pathname-defaults*))
-  (let* ((path-dir (pathname-directory pathname))
-	 (def-dir (pathname-directory defaults))
-	 (enough-dir
-	  ;; Go down the directory lists to see what matches.  What's
-	  ;; left is what we want, more or less.
-	  (cond ((and (eq (first path-dir) (first def-dir))
-		      (eq (first path-dir) :absolute))
-		 ;; Both paths are :absolute, so find where the common
-		 ;; parts end and return what's left
-		 (do* ((p (rest path-dir) (rest p))
-		       (d (rest def-dir) (rest d)))
-		      ((or (endp p) (endp d)
-			   (not (equal (first p) (first d))))
-		       `(:relative ,@p))))
-		(t
-		 ;; At least one path is :relative, so just return the
-		 ;; original path.  If the original path is :relative,
-		 ;; then that's the right one.  If PATH-DIR is
-		 ;; :absolute, we want to return that except when
-		 ;; DEF-DIR is :absolute, as handled above. so return
-		 ;; the original directory.
-		 path-dir))))
-    (make-pathname :host (pathname-host pathname)
-		   :directory enough-dir
-		   :name (pathname-name pathname)
-		   :type (pathname-type pathname)
-		   :version (pathname-version pathname))))
-
-;; I cut this out of the original Common Lisp Controller v4 from Debian
-
-(defun calculate-fasl-root  ()
-  "Inits common-lisp controller for this user"
-  (unless *fasl-root*
-    (setf *fasl-root*
-	  ;; set it to the username of the user:
-	  (let* (#-cmu
-		 (homedir (pathname-directory
-			   (user-homedir-pathname)))
-		 ;; cmucl has searchlist home (!)
-		 #+cmu
-		 (homedirs (extensions:search-list "home:"))
-		 #+cmu
-		 (homedir (when homedirs
-			    (pathname-directory
-			     (first homedirs)))))
-	    ;; strip off :re or :abs
-	    (when (or (eq (first homedir)
-			  :relative)
-		      (eq (first homedir)
-			  :absolute))
-	      (setf homedir (rest homedir)))
-	    ;; if it starts with home, nuke it
-	    (when (string= (first homedir)
-			   "home")
-	      (setf homedir (rest homedir)))
-	    ;; now append *implementation-name*
-	    (setf homedir (append homedir
-				  (list *implementation-name*)))
-	    ;; this should be able to cope with
-	    ;; homedirs like /home/p/pv/pvaneynd ...
-	    (merge-pathnames
-	     (make-pathname
-	      :directory `(:relative ,@homedir))
-	     #p"/var/cache/common-lisp-controller/")))))
-
-(defun source-root-path-to-fasl-path (source)
-  "Converts a path in the source root into the equivalent path in the fasl root"
-  (calculate-fasl-root)
-  (merge-pathnames 
-   (%enough-namestring source (asdf::resolve-symlinks *source-root*))
-   *fasl-root*))
-
-(defmethod asdf:output-files :around ((op asdf:operation) (c asdf:component))
-  (let ((orig (call-next-method)))
-    (mapcar #'source-root-path-to-fasl-path orig)))
-
-(pushnew #p"/usr/share/common-lisp/systems/" asdf:*central-registry*)
-
-;;;; Some notes on ENOUGH-NAMESTRING on ECL
-
-;; NOTE enough-namestring might be broken on ECL
-;;
-;; > (enough-namestring #P"/usr/share/common-lisp/source/cl-ppcre/"  
-;;                      #P"/usr/share/common-lisp/source/")
-;; "/usr/share/common-lisp/source/cl-ppcre/"
-
-:					; SBCL:
-;;
-;; CL-USER> (enough-namestring #P"/usr/share/common-lisp/source/cl-ppcre/"
-;;                             #P"/usr/share/common-lisp/source/")
-;; "cl-ppcre/"
diff --git a/dev-lisp/ecls/metadata.xml b/dev-lisp/ecls/metadata.xml
index 7dae47b79215..8fbb9faa273b 100644
--- a/dev-lisp/ecls/metadata.xml
+++ b/dev-lisp/ecls/metadata.xml
@@ -9,8 +9,6 @@ System), conditions, loops, etc, plus a translator to C, which can produce
 standalone executables.
 </longdescription>
 <use>
-<flag name='c++'>Build ECL with a C++ compiler</flag>
-<flag name='threads'>Support for native threads</flag>
-<flag name='unicode'>Support for unicode</flag>
+<flag name='precisegc'>Use type information during garbage collection</flag>
 </use>
 </pkgmetadata>