Version bump, cleaning old

(Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)

13 files changed, 238 insertions, 742 deletions

diff --git a/dev-lisp/gcl/ChangeLog b/dev-lisp/gcl/ChangeLog
index d37458fb1a8d..d103ca1266b4 100644
--- a/dev-lisp/gcl/ChangeLog
+++ b/dev-lisp/gcl/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lisp/gcl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.61 2013/03/14 12:06:29 grozin Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/ChangeLog,v 1.62 2014/02/04 16:24:08 grozin Exp $
+
+*gcl-2.6.10 (04 Feb 2014)
+
+  04 Feb 2014; Andrey Grozin <grozin@gentoo.org> -gcl-2.6.7.ebuild,
+  -gcl-2.6.7-r1.ebuild, -gcl-2.6.7-r2.ebuild, -gcl-2.6.8_pre20120805.ebuild,
+  +gcl-2.6.10.ebuild, -files/2.6.7-fix-configure.in-gentoo.patch,
+  -files/gcl-2.6.8_pre20090419-configure.patch, +files/64gcl-gentoo.el,
+  -files/gcl-2.6.7-fix-configure.in-bfd.patch, -files/gcl-default-el.patch,
+  +files/tcl.patch, metadata.xml:
+  Version bump, cleaning old
 
 *gcl-2.6.8_pre20130314 (14 Mar 2013)
 
diff --git a/dev-lisp/gcl/files/2.6.7-fix-configure.in-gentoo.patch b/dev-lisp/gcl/files/2.6.7-fix-configure.in-gentoo.patch
deleted file mode 100644
index 10eeaeca8320..000000000000
--- a/dev-lisp/gcl/files/2.6.7-fix-configure.in-gentoo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur gcl-2.6.7.orig/configure.in gcl-2.6.7/configure.in
---- gcl-2.6.7.orig/configure.in	2005-01-15 13:17:17.000000000 -0600
-+++ gcl-2.6.7/configure.in	2006-01-12 15:10:46.000000000 -0600
-@@ -526,26 +526,26 @@
- AC_CHECK_PROGS(MAKEINFO,makeinfo,"false")
- AC_SUBST(MAKEINFO)
- 
--if test -f /usr/lib/NextStep/software_version; then
--    system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
--else
-+dnl if test -f /usr/lib/NextStep/software_version; then
-+dnl     system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
-+dnl else
-     system=`uname -s`-`uname -r`
-     if test "$?" -ne 0 ; then
- 	AC_MSG_RESULT([unknown (can't find uname command)])
- 	system=unknown
-     else
--	# Special check for weird MP-RAS system (uname returns weird
--	# results, and the version is kept in special file).
-+dnl 	# Special check for weird MP-RAS system (uname returns weird
-+dnl 	# results, and the version is kept in special file).
-     
--	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--	    system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
--	fi
--	if test "`uname -s`" = "AIX" ; then
--	    system=AIX-`uname -v`.`uname -r`
--	fi
-+dnl 	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-+dnl 	    system=MP-RAS-`${AWK} '{print $3}' /etc/.relid'`
-+dnl 	fi
-+dnl 	if test "`uname -s`" = "AIX" ; then
-+dnl 	    system=AIX-`uname -v`.`uname -r`
-+dnl 	fi
- 	AC_MSG_RESULT($system)
-     fi
--fi
-+dnl fi
- 
- # sysconf
- 
diff --git a/dev-lisp/gcl/files/64gcl-gentoo.el b/dev-lisp/gcl/files/64gcl-gentoo.el
new file mode 100644
index 000000000000..7b7cee00bac8
--- /dev/null
+++ b/dev-lisp/gcl/files/64gcl-gentoo.el
@@ -0,0 +1,5 @@
+;; site-init for dev-lisp/gcl
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'run "gcl" "Run GCL." t)
+(autoload 'gcl-mode "gcl" "GCL mode." t)
+(autoload 'dbl "dbl" "GCL debugger." t)
diff --git a/dev-lisp/gcl/files/gcl-2.6.7-fix-configure.in-bfd.patch b/dev-lisp/gcl/files/gcl-2.6.7-fix-configure.in-bfd.patch
deleted file mode 100644
index a47f279f487e..000000000000
--- a/dev-lisp/gcl/files/gcl-2.6.7-fix-configure.in-bfd.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naur gcl-2.6.7.orig/configure.in gcl-2.6.7/configure.in
---- gcl-2.6.7.orig/configure.in	2005-01-15 20:17:17.000000000 +0100
-+++ gcl-2.6.7/configure.in	2007-02-13 20:40:40.000000000 +0100
-@@ -788,9 +788,9 @@
- 					    int main() {symbol_info t; return 0;}],
- 					AC_MSG_RESULT(yes) 
- 					AC_DEFINE(NEED_CONST),
--					AC_MSG_RESULT(cannot use bfd) exit 1;,
--					AC_MSG_RESULT(cannot use bfd) exit 1;),
--				AC_MSG_RESULT(cannot use bfd) exit 1;)
-+					AC_MSG_RESULT(cannot use bfd); exit 1;,
-+					AC_MSG_RESULT(cannot use bfd); exit 1;),
-+				AC_MSG_RESULT(cannot use bfd); exit 1;)
- 			,,-liberty))
- 
- 	AC_DEFINE(HAVE_LIBBFD)
-@@ -1252,8 +1252,14 @@
- 				return fpclass(f)>=FP_NZERO || fpclass(f)<FP_NZERO ? 0 : 1;
- 				}],
- 		AC_DEFINE(HAVE_IEEEFP) AC_MSG_RESULT(yes),
--		HAVE_IEEEFP=0 AC_MSG_RESULT(no),HAVE_IEEEFP=0 AC_MSG_RESULT(no))
--	,HAVE_ISNORMAL=0 AC_MSG_RESULT(no),HAVE_ISNORMAL=0 AC_MSG_RESULT(no))
-+		HAVE_IEEEFP=0
-+		AC_MSG_RESULT(no),
-+		HAVE_IEEEFP=0
-+		AC_MSG_RESULT(no)),
-+		HAVE_ISNORMAL=0
-+		AC_MSG_RESULT(no),
-+		HAVE_ISNORMAL=0
-+		AC_MSG_RESULT(no))
- 
- AC_MSG_CHECKING([for isfinite])
- AC_TRY_RUN([#define _GNU_SOURCE
-@@ -1271,8 +1277,14 @@
- 				return finite(f) || !finite(f) ? 0 : 1;
- 				}],
- 		AC_DEFINE(HAVE_FINITE) AC_MSG_RESULT(yes),
--		HAVE_FINITE=0 AC_MSG_RESULT(no),HAVE_FINITE=0 AC_MSG_RESULT(no))
--	,HAVE_ISFINITE=0 AC_MSG_RESULT(no),HAVE_ISFINITE=0 AC_MSG_RESULT(no))
-+		HAVE_FINITE=0
-+		AC_MSG_RESULT(no),
-+		HAVE_FINITE=0
-+		AC_MSG_RESULT(no))
-+	,HAVE_ISFINITE=0
-+	AC_MSG_RESULT(no),
-+	HAVE_ISFINITE=0
-+	AC_MSG_RESULT(no))
- 
- 
- 
diff --git a/dev-lisp/gcl/files/gcl-2.6.8_pre20090419-configure.patch b/dev-lisp/gcl/files/gcl-2.6.8_pre20090419-configure.patch
deleted file mode 100644
index f086500974bd..000000000000
--- a/dev-lisp/gcl/files/gcl-2.6.8_pre20090419-configure.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -r -U2 gcl-2.6.8_pre20090419.orig/configure gcl-2.6.8_pre20090419/configure
---- gcl-2.6.8_pre20090419.orig/configure	2009-02-24 04:12:22.000000000 +0100
-+++ gcl-2.6.8_pre20090419/configure	2009-04-20 01:26:40.000000000 +0200
-@@ -118,4 +118,14 @@
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
-@@ -506,14 +516,4 @@
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
diff --git a/dev-lisp/gcl/files/gcl-default-el.patch b/dev-lisp/gcl/files/gcl-default-el.patch
deleted file mode 100644
index 6b98e9d6797f..000000000000
--- a/dev-lisp/gcl/files/gcl-default-el.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure~	2011-06-20 22:41:48.000000000 +0700
-+++ configure	2011-12-21 16:15:49.000000000 +0700
-@@ -7359,8 +7359,2 @@
- $as_echo_n "checking emacs default.el... " >&6; }
--if [ "$EMACS" != "" ] ; then
--	EMACS_DEFAULT_EL=`$EMACS -q -batch --no-site-file -l conftest.el 2>&1 | sed -e /Loading/d | sed -e /load/d `
--else
--	EMACS_DEFAULT_EL=""
--fi
--if  test -f "${EMACS_DEFAULT_EL}"  ; then true;else
-   if test -d $EMACS_SITE_LISP ; then
-@@ -7368,3 +7362,2 @@
-   fi
--fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EMACS_DEFAULT_EL" >&5
diff --git a/dev-lisp/gcl/files/tcl.patch b/dev-lisp/gcl/files/tcl.patch
new file mode 100644
index 000000000000..1f3972500861
--- /dev/null
+++ b/dev-lisp/gcl/files/tcl.patch
@@ -0,0 +1,68 @@
+diff -r -U2 gcl.orig/gcl-tk/tkMain.c gcl/gcl-tk/tkMain.c
+--- gcl.orig/gcl-tk/tkMain.c	2013-11-11 21:55:48.000000000 +0700
++++ gcl/gcl-tk/tkMain.c	2014-02-05 00:09:38.821981358 +0700
+@@ -122,5 +122,5 @@
+      char *x;
+ {char buf[300] ;
+- sprintf("error %s",x);
++ snprintf(buf,300,"error %s",x);
+  Tcl_Eval(interp,buf);
+  dfprintf(stderr,x);
+@@ -207,5 +207,5 @@
+     if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, (const char **)argv, argTable, 0)
+ 	    != TCL_OK) {
+-	fprintf(stderr, "%s\n", interp->result);
++	fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
+ 	exit(1);
+     }
+@@ -291,5 +291,5 @@
+ 
+     if (Tcl_AppInit(interp) != TCL_OK) {
+-	fprintf(stderr, "Tcl_AppInit failed: %s\n", interp->result);
++	fprintf(stderr, "Tcl_AppInit failed: %s\n", Tcl_GetStringResult(interp));
+     }
+ 
+@@ -301,5 +301,5 @@
+ 	code = Tcl_VarEval(interp, "wm geometry . ", geometry, (char *) NULL);
+ 	if (code != TCL_OK) {
+-	    fprintf(stderr, "%s\n", interp->result);
++	    fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
+ 	}
+     }
+@@ -331,5 +331,5 @@
+ 	    fullName = Tcl_TildeSubst(interp, tcl_RcFileName, &buffer);
+ 	    if (fullName == NULL) {
+-		fprintf(stderr, "%s\n", interp->result);
++		fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
+ 	    } else {
+ 		f = fopen(fullName, "r");
+@@ -337,5 +337,5 @@
+ 		    code = Tcl_EvalFile(interp, fullName);
+ 		    if (code != TCL_OK) {
+-			fprintf(stderr, "%s\n", interp->result);
++			fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
+ 		    }
+ 		    fclose(f);
+@@ -372,5 +372,5 @@
+     msg = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
+     if (msg == NULL) {
+-	msg = interp->result;
++	msg = Tcl_GetStringResult(interp);
+     }
+     dfprintf(stderr, "%s\n", msg);
+@@ -497,12 +497,11 @@
+ 	    {
+ 	      char buf[4];
+-	      char *p = buf;
++	      char *p = buf, *string;
+ 	      /*header */
+ 	      *p++ = (code ? '1' : '0');
+ 	      bcopy(msg->msg_id,p,3);
+ 	      /* end header */
+-	      if(sock_write_str2(dsfd, m_reply, buf, 4 ,
+-				 interp->result, strlen(interp->result))
+-		 < 0)
++	      string = Tcl_GetStringResult(interp);
++	      if(sock_write_str2(dsfd, m_reply, buf, 4, string, strlen(string)) < 0)
+ 		{		/* what do we want to do if the write failed */}
+ 	      
diff --git a/dev-lisp/gcl/gcl-2.6.10.ebuild b/dev-lisp/gcl/gcl-2.6.10.ebuild
new file mode 100644
index 000000000000..44a48d9b8e09
--- /dev/null
+++ b/dev-lisp/gcl/gcl-2.6.10.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.10.ebuild,v 1.1 2014/02/04 16:24:08 grozin Exp $
+
+EAPI=5
+inherit elisp-common eutils flag-o-matic
+
+DESCRIPTION="GNU Common Lisp"
+HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
+SRC_URI="ftp://ftp.gnu.org/gnu/gcl/${P}.tar.gz http://dev.gentoo.org/~grozin/${P}-fedora.tar.bz2"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ansi athena emacs +readline tk X"
+
+# See bug #205803
+RESTRICT="strip"
+
+RDEPEND="emacs? ( virtual/emacs )
+	readline? ( sys-libs/readline )
+	athena? ( x11-libs/libXaw )
+	>=dev-libs/gmp-4.1
+	tk? ( dev-lang/tk )
+	X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
+	virtual/latex-base"
+DEPEND="${RDEPEND}
+	virtual/texi2dvi
+	>=app-text/texi2html-1.64
+	>=sys-devel/autoconf-2.52"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	mv "${WORKDIR}"/fedora/info/* info/
+	cp -p /usr/share/texmf-dist/tex/texinfo/texinfo.tex info/
+	find . -type f -perm /0111 | xargs chmod a-x
+	chmod a+x add-defs add-defs1 config.guess config.sub configure install.sh
+	chmod a+x bin/info bin/info1 gcl-tk/gcltksrv.in gcl-tk/ngcltksrv mp/gcclab
+	chmod a+x o/egrep-def utils/replace xbin/*
+
+	# fedora patches
+	epatch "${WORKDIR}"/fedora/fd-leak.patch
+	epatch "${WORKDIR}"/fedora/latex.patch
+	epatch "${WORKDIR}"/fedora/texinfo.patch
+	epatch "${WORKDIR}"/fedora/elisp.patch
+	epatch "${WORKDIR}"/fedora/rename.patch
+	epatch "${WORKDIR}"/fedora/getcwd.patch
+	epatch "${WORKDIR}"/fedora/infrastructure.patch
+	epatch "${WORKDIR}"/fedora/extension.patch
+	epatch "${WORKDIR}"/fedora/unrandomize.patch
+	epatch "${WORKDIR}"/fedora/asm-signal-h.patch
+	epatch "${WORKDIR}"/fedora/plt.patch
+	epatch "${WORKDIR}"/fedora/ellipsis.patch
+	epatch "${WORKDIR}"/fedora/man.patch
+	epatch "${WORKDIR}"/fedora/reloc-type.patch
+	epatch "${WORKDIR}"/fedora/largefile.patch
+
+	epatch "${FILESDIR}"/tcl.patch
+
+	sed -e 's|"-fomit-frame-pointer"|""|' -i configure
+	sed -e 's|@EXT@||g' debian/in.gcl.1 > gcl.1
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -fstack-protector -fstack-protector-all
+
+	local tcl=""
+	if use tk; then
+		tcl="--enable-tclconfig=/usr/lib --enable-tkconfig=/usr/lib"
+	fi
+
+	econf --enable-dynsysgmp \
+		--disable-xdr \
+		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl \
+		--enable-infodir=/usr/share/info \
+		$(use_enable readline) \
+		$(use_enable ansi) \
+		$(use_enable athena xgcl) \
+		$(use_with X x) \
+		${tcl}
+}
+
+src_compile() {
+	emake -j1
+	emake -C info gcl.info
+	if use athena; then
+		pushd xgcl-2 > /dev/null
+		pdflatex dwdoc.tex
+		popd > /dev/null
+	fi
+}
+
+src_test() {
+	local make_ansi_tests_clean="rm -f test.out *.fasl *.o *.so *~ *.fn *.x86f *.fasl *.ufsl"
+	if use ansi; then
+		cd ansi-tests
+
+		( make clean && make test-unixport ) \
+			|| die "make ansi-tests failed!"
+
+		cat "${FILESDIR}/bootstrap-gcl" \
+			| ../unixport/saved_ansi_gcl
+
+		cat "${FILESDIR}/bootstrap-gcl" \
+			|sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \
+			| ./bootstrapped_ansi_gcl
+
+		( ${make_ansi_tests_clean} && \
+			echo "(load \"gclload.lsp\")" \
+			| ./bootstrapped_r_ansi_gcl ) \
+			|| die "Phase 2, bootstraped compiler failed in tests"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	mv "${D}"usr/share/doc/*.dvi .
+	rm -rf "${D}"usr/share/doc
+	rm -rf "${D}"usr/share/emacs
+	rm -rf "${D}"usr/lib/gcl-*/info
+
+	rm doc/makefile elisp/add-defaults.el
+	dodoc readme* RELEASE* ChangeLog* doc/*
+	doman gcl.1
+	doinfo info/*.info*
+	dohtml -r info/gcl-si info/gcl-tk
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
+		elisp-install ${PN} elisp/*.el
+	fi
+
+	insinto /usr/share/doc/${PF}
+	doins *.dvi
+	if use athena; then
+		pushd xgcl-2 > /dev/null
+		insinto /usr/share/doc/${PF}
+		doins *.pdf
+		popd > /dev/null
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lisp/gcl/gcl-2.6.7-r1.ebuild b/dev-lisp/gcl/gcl-2.6.7-r1.ebuild
deleted file mode 100644
index 4e60ac484f3c..000000000000
--- a/dev-lisp/gcl/gcl-2.6.7-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.7-r1.ebuild,v 1.8 2012/06/07 18:59:25 zmedico Exp $
-
-inherit elisp-common eutils flag-o-matic autotools
-
-DESCRIPTION="GNU Common Lisp"
-HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
-SRC_URI="ftp://ftp.gnu.org/gnu/gcl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE="emacs readline debug X tk custreloc dlopen gprof doc ansi"
-
-RDEPEND="emacs? ( virtual/emacs )
-	readline? ( sys-libs/readline )
-	>=dev-libs/gmp-4.1
-	tk? ( dev-lang/tk )
-	X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )"
-
-DEPEND="$RDEPEND
-	doc? ( virtual/texi2dvi )
-	>=app-text/texi2html-1.64
-	>=sys-devel/autoconf-2.52"
-
-src_unpack() {
-	unpack ${A}
-	sed -e "s/gcl-doc/${PF}/g" "${S}"/info/makefile > "${T}"/makefile
-	mv "${T}"/makefile "${S}"/info/makefile
-	epatch "${FILESDIR}"/${PV}-fix-configure.in-gentoo.patch
-
-	eautoconf || die
-	epatch "${FILESDIR}"/flex-configure-LANG.patch # see Bug #122583
-}
-
-src_compile() {
-	export SANDBOX_ON=0
-	local myconfig=""
-
-	# Hardened gcc may automatically use PIE building, which does not
-	# work for this package so far
-
-	filter-flags "-fPIC"
-
-	# -fomit-frame-pointer cannot be used with gprof
-
-	if use gprof; then
-		filter-flags "-fomit-frame-pointer"
-	fi
-
-	# Unfortunately, we need to override any relocation choices below
-	# while upstream doesn't work with system BFD.	SuSE has the same
-	# problem apparently.
-
-	if false; then
-
-	# Linking options are enumerated at
-	# http://www.gnu.org/software/gcl/RELEASE-2.6.2.html
-
-	local dlopen_config="
-		--disable-custreloc
-		--enable-dlopen
-		--disable-dynsysbfd
-		--disable-statsysbfd";
-
-	local bfd_config="
-		--disable-custreloc
-		--disable-dlopen
-		--enable-dynsysbfd
-		--disable-statsysbfd";
-
-	local custreloc_config="
-		--enable-custreloc
-		--disable-dlopen
-		--disable-dynsysbfd
-		--disable-statsysbfd";
-
-	if use custreloc; then
-		case "${ARCH}" in
-			x86 | sparc)
-				myconfig="${myconfig} ${custreloc_config}";;
-			*)
-				ewarn "--enable-custreloc is not supported on your architecture (${ARCH})."
-				ewarn "Using --enable-dlopen instead."
-				myconfig="${myconfig} ${dlopen_config}"
-
-		esac
-	elif use dlopen; then
-		myconfig="${myconfig} ${dlopen_config}"
-	else
-		case "${ARCH}" in
-			x86 | sparc | ppc | amd64 | s390)
-				myconfig="${myconfig} ${bfd_config}";;
-			*)
-				ewarn "BFD is not supported on your architecture (${ARCH})."
-				ewarn "Using --enable-dlopen instead."
-				myconfig="${myconfig} ${dlopen_config}";;
-		esac
-	fi
-
-	else
-		myconfig="${myconfig} --enable-locbfd --disable-dynsysbfd --disable-statsysbfd"
-	fi
-
-	if use tk; then
-		myconfig="${myconfig}
-		--enable-tkconfig=/usr/lib
-		--enable-tclconfig=/usr/lib"
-	fi
-
-	myconfig="${myconfig}
-		--enable-dynsysgmp
-		`use_enable readline readline`
-		`use_with X x`
-		`use_enable debug debug`
-		`use_enable gprof gprof`
-		`use_enable ansi ansi`
-		--enable-xdr=no
-		--enable-infodir=/usr/share/info
-		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl"
-
-	einfo "Configuring with the following:
-${myconfig}"
-	econf ${myconfig} || die
-	make || die
-
-	sed -e 's,@EXT@,,g' debian/in.gcl.1 >gcl.1
-}
-
-src_install() {
-	export SANDBOX_ON=0
-	make DESTDIR="${D}" install || die
-
-	rm -rf "${D}"/usr/lib/${P}/info
-	mv "${D}"/default.el elisp/
-
-	if use emacs; then
-		mv elisp/add-default.el "${T}"/50gcl-gentoo.el
-		elisp-site-file-install "${T}"/50gcl-gentoo.el
-		elisp-install ${PN} elisp/*
-		fperms 0644 /usr/share/emacs/site-lisp/gcl/*
-	else
-		rm -rf "${D}"/usr/share/emacs
-	fi
-
-	dosed /usr/bin/gcl
-	fperms 0755 /usr/bin/gcl
-
-	# fix the GCL_TK_DIR=/var/tmp/portage/${P}/image//
-	dosed /usr/lib/${P}/gcl-tk/gcltksrv
-	fperms 0755 /usr/lib/${P}/gcl-tk/gcltksrv
-
-	#repair gcl.exe symlink
-	#rm ${D}/usr/bin/gcl.exe
-	dosym ../lib/${P}/unixport/saved_gcl /usr/bin/gcl.exe
-
-	dodoc readme* RELEASE* ChangeLog* doc/*
-
-	for i in "${D}"/usr/share/doc/gcl-{tk,si}; do
-		mv $i "${D}"/usr/share/doc/${PF}
-	done
-
-	doman gcl.1
-
-	find "${D}"/usr/lib/gcl-${PV}/ -type f \( -perm 640 -o -perm 750 \) -exec chmod 0644 '{}' \;
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lisp/gcl/gcl-2.6.7-r2.ebuild b/dev-lisp/gcl/gcl-2.6.7-r2.ebuild
deleted file mode 100644
index 2c6c2c9dbb48..000000000000
--- a/dev-lisp/gcl/gcl-2.6.7-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.7-r2.ebuild,v 1.11 2012/06/07 18:59:25 zmedico Exp $
-
-inherit elisp-common eutils flag-o-matic
-
-DEB_PV=32
-
-DESCRIPTION="GNU Common Lisp"
-HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
-SRC_URI="mirror://debian/pool/main/g/gcl/gcl_${PV}.orig.tar.gz
-	mirror://debian/pool/main/g/gcl/gcl_${PV}-${DEB_PV}.diff.gz
-	mirror://gnu/gcl/${PN}.info.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE="emacs readline debug X tk doc ansi"
-
-RDEPEND="emacs? ( virtual/emacs )
-	readline? ( sys-libs/readline )
-	>=dev-libs/gmp-4.1
-	tk? ( dev-lang/tk )
-	X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
-	virtual/latex-base"				# pdflatex (see Bug # 157903)
-DEPEND="${RDEPEND}
-	doc? ( virtual/texi2dvi )
-	>=app-text/texi2html-1.64
-	>=sys-devel/autoconf-2.52"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch ../gcl_${PV}-${DEB_PV}.diff
-	epatch "${FILESDIR}"/flex-configure-LANG.patch
-	sed -ie "s/gcl-doc/${PF}/g" "${S}"/info/makefile
-}
-
-src_compile() {
-	export SANDBOX_ON=0
-	local myconfig=""
-	# Hardened gcc may automatically use PIE building, which does not
-	# work for this package so far
-	filter-flags "-fPIC"
-	if use tk; then
-		myconfig="${myconfig} --enable-tkconfig=/usr/lib --enable-tclconfig=/usr/lib"
-	fi
-	myconfig="${myconfig}
-		--enable-locbfd
-		--disable-dynsysbfd
-		--disable-statsysbfd
-		--enable-dynsysgmp
-		$(use_enable readline readline)
-		$(use_with X x)
-		$(use_enable debug debug)
-		$(use_enable ansi ansi)
-		--enable-xdr=no
-		--enable-infodir=/usr/share/info
-		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl"
-	einfo "Configuring with the following:
-${myconfig}"
-	econf ${myconfig}
-	make || die "make failed"
-	sed -e 's,@EXT@,,g' debian/in.gcl.1 >gcl.1
-}
-
-src_install() {
-	export SANDBOX_ON=0
-	make DESTDIR="${D}" install || die "make install failed"
-
-	rm -rf "${D}"/usr/lib/${P}/info
-	mv "${D}"/default.el elisp/
-
-	if use emacs; then
-		mv elisp/add-default.el "${T}"/50gcl-gentoo.el
-		elisp-site-file-install "${T}"/50gcl-gentoo.el
-		elisp-install ${PN} elisp/*
-		fperms 0644 /usr/share/emacs/site-lisp/gcl/*
-	else
-		rm -rf "${D}"/usr/share/emacs
-	fi
-
-	dosed /usr/bin/gcl
-	fperms 0755 /usr/bin/gcl
-
-	# fix the GCL_TK_DIR=/var/tmp/portage/${P}/image//
-	dosed /usr/lib/${P}/gcl-tk/gcltksrv
-	fperms 0755 /usr/lib/${P}/gcl-tk/gcltksrv
-
-	#repair gcl.exe symlink
-	#rm ${D}/usr/bin/gcl.exe
-	dosym ../lib/${P}/unixport/saved_gcl /usr/bin/gcl.exe
-
-	dodoc readme* RELEASE* ChangeLog* doc/*
-
-	for i in "${D}"/usr/share/doc/gcl-{tk,si}; do
-		mv $i "${D}"/usr/share/doc/${PF}
-	done
-
-	doman gcl.1
-	doinfo info/*.info*
-
-	find "${D}"/usr/lib/gcl-${PV}/ -type f \( -perm 640 -o -perm 750 \) -exec chmod 0644 '{}' \;
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lisp/gcl/gcl-2.6.7.ebuild b/dev-lisp/gcl/gcl-2.6.7.ebuild
deleted file mode 100644
index 9ca555b795dc..000000000000
--- a/dev-lisp/gcl/gcl-2.6.7.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.7.ebuild,v 1.13 2012/06/07 18:59:25 zmedico Exp $
-
-inherit elisp-common eutils flag-o-matic autotools
-
-DESCRIPTION="GNU Common Lisp"
-HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
-SRC_URI="ftp://ftp.gnu.org/gnu/gcl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc amd64 sparc"
-IUSE="emacs readline debug X tk custreloc dlopen gprof doc ansi"
-
-RDEPEND="emacs? ( virtual/emacs )
-	X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
-	readline? ( sys-libs/readline )
-	>=dev-libs/gmp-4.1
-	tk? ( dev-lang/tk )"
-
-DEPEND="$RDEPEND
-	doc? ( virtual/texi2dvi )
-	>=app-text/texi2html-1.64
-	>=sys-devel/autoconf-2.52"
-
-src_unpack() {
-	unpack ${A}
-	sed -e "s/gcl-doc/${PF}/g" "${S}"/info/makefile > "${T}"/makefile
-	mv "${T}"/makefile "${S}"/info/makefile
-	epatch "${FILESDIR}"/${PV}-fix-configure.in-gentoo.patch
-	epatch "${FILESDIR}"/${P}-fix-configure.in-bfd.patch
-
-	eautoconf || die
-}
-
-src_compile() {
-	export SANDBOX_ON=0
-	local myconfig=""
-
-	# Hardened gcc may automatically use PIE building, which does not
-	# work for this package so far
-
-	filter-flags "-fPIC"
-
-	# -fomit-frame-pointer cannot be used with gprof
-
-	if use gprof; then
-		filter-flags "-fomit-frame-pointer"
-	fi
-
-	# Unfortunately, we need to override any relocation choices below
-	# while upstream doesn't work with system BFD.	SuSE has the same
-	# problem apparently.
-
-	if false; then
-
-	# Linking options are enumerated at
-	# http://www.gnu.org/software/gcl/RELEASE-2.6.2.html
-
-	local dlopen_config="
-		--disable-custreloc
-		--enable-dlopen
-		--disable-dynsysbfd
-		--disable-statsysbfd";
-
-	local bfd_config="
-		--disable-custreloc
-		--disable-dlopen
-		--enable-dynsysbfd
-		--disable-statsysbfd";
-
-	local custreloc_config="
-		--enable-custreloc
-		--disable-dlopen
-		--disable-dynsysbfd
-		--disable-statsysbfd";
-
-	if use custreloc; then
-		case "${ARCH}" in
-			x86 | sparc)
-				myconfig="${myconfig} ${custreloc_config}";;
-			*)
-				ewarn "--enable-custreloc is not supported on your architecture (${ARCH})."
-				ewarn "Using --enable-dlopen instead."
-				myconfig="${myconfig} ${dlopen_config}"
-
-		esac
-	elif use dlopen; then
-		myconfig="${myconfig} ${dlopen_config}"
-	else
-		case "${ARCH}" in
-			x86 | sparc | ppc | amd64 | s390)
-				myconfig="${myconfig} ${bfd_config}";;
-			*)
-				ewarn "BFD is not supported on your architecture (${ARCH})."
-				ewarn "Using --enable-dlopen instead."
-				myconfig="${myconfig} ${dlopen_config}";;
-		esac
-	fi
-
-	else
-		myconfig="${myconfig} --enable-locbfd --disable-dynsysbfd --disable-statsysbfd"
-	fi
-
-	if use tk; then
-		myconfig="${myconfig}
-		--enable-tkconfig=/usr/lib
-		--enable-tclconfig=/usr/lib"
-	fi
-
-	myconfig="${myconfig}
-		--enable-dynsysgmp
-		`use_enable readline readline`
-		`use_with X x`
-		`use_enable debug debug`
-		`use_enable gprof gprof`
-		`use_enable ansi ansi`
-		--enable-xdr=no
-		--enable-infodir=/usr/share/info
-		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl"
-
-	einfo "Configuring with the following:
-${myconfig}"
-	econf ${myconfig} || die
-	make || die
-}
-
-src_install() {
-	export SANDBOX_ON=0
-	make DESTDIR="${D}" install || die
-
-	rm -rf "${D}"/usr/lib/${P}/info
-	mv "${D}"/default.el elisp/
-
-	if use emacs; then
-		mv elisp/add-default.el "${T}"/50gcl-gentoo.el
-		elisp-site-file-install "${T}"/50gcl-gentoo.el
-		elisp-install ${PN} elisp/*
-		fperms 0644 /usr/share/emacs/site-lisp/gcl/*
-	else
-		rm -rf "${D}"/usr/share/emacs
-	fi
-
-	dosed /usr/bin/gcl
-	fperms 0755 /usr/bin/gcl
-
-	# fix the GCL_TK_DIR=/var/tmp/portage/${P}/image//
-	dosed /usr/lib/${P}/gcl-tk/gcltksrv
-	fperms 0755 /usr/lib/${P}/gcl-tk/gcltksrv
-
-	#repair gcl.exe symlink
-	#rm ${D}/usr/bin/gcl.exe
-	dosym ../lib/${P}/unixport/saved_gcl /usr/bin/gcl.exe
-
-	dodoc readme* RELEASE* ChangeLog* doc/*
-
-	for i in "${D}"/usr/share/doc/gcl-{tk,si}; do
-		mv $i "${D}"/usr/share/doc/${PF}
-	done
-
-	find "${D}"/usr/lib/gcl-${PV}/ -type f \( -perm 640 -o -perm 750 \) -exec chmod 0644 '{}' \;
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lisp/gcl/gcl-2.6.8_pre20120805.ebuild b/dev-lisp/gcl/gcl-2.6.8_pre20120805.ebuild
deleted file mode 100644
index ba80dccde929..000000000000
--- a/dev-lisp/gcl/gcl-2.6.8_pre20120805.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gcl/gcl-2.6.8_pre20120805.ebuild,v 1.2 2012/11/09 07:09:31 grozin Exp $
-
-EAPI=3
-
-#removing flag-o-matic results in make install failing due to a segfault
-inherit elisp-common eutils flag-o-matic
-
-DESCRIPTION="GNU Common Lisp"
-HOMEPAGE="http://www.gnu.org/software/gcl/gcl.html"
-SRC_URI="http://dev.gentoo.org/~grozin/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ansi debug doc emacs +readline tk X"
-
-# See bug #205803
-RESTRICT="strip"
-
-RDEPEND="emacs? ( virtual/emacs )
-	readline? ( sys-libs/readline )
-	>=dev-libs/gmp-4.1
-	tk? ( dev-lang/tk )
-	X? ( x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXaw )
-	virtual/latex-base"
-DEPEND="${RDEPEND}
-	doc? ( virtual/texi2dvi )
-	>=app-text/texi2html-1.64
-	>=sys-devel/autoconf-2.52"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-default-el.patch
-}
-
-src_configure() {
-	local myconfig=""
-	if use tk; then
-		myconfig="${myconfig} --enable-tkconfig=/usr/lib --enable-tclconfig=/usr/lib"
-	fi
-	myconfig="${myconfig} \
-		--enable-emacsdir=/usr/share/emacs/site-lisp/gcl \
-		--enable-dynsysgmp \
-		--disable-xdr
-		$(use_enable readline) \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable ansi)"
-
-	einfo "Configuring with the following:
-${myconfig}"
-	econf ${myconfig}
-}
-
-src_compile() {
-	make || die "make failed"
-	sed -e 's,@EXT@,,g' debian/in.gcl.1 >gcl.1
-}
-
-src_test() {
-	local make_ansi_tests_clean="rm -f test.out *.fasl *.o \
-	*.so *~ *.fn *.x86f *.fasl *.ufsl"
-	if use ansi; then
-		cd ansi-tests
-
-		( make clean && make test-unixport ) \
-		|| die "make ansi-tests failed!"
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		| ../unixport/saved_ansi_gcl
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		|sed s/bootstrapped_ansi_gcl/bootstrapped_r_ansi_gcl/g \
-		| ./bootstrapped_ansi_gcl
-
-		( ${make_ansi_tests_clean} && \
-		echo "(load \"gclload.lsp\")" \
-		| ./bootstrapped_r_ansi_gcl ) \
-		|| die "Phase 2, bootstraped compiler failed in tests"
-
-	else
-
-		ewarn "Upstream provides tests only for ansi-gcl."
-		ewarn "Please emerge with ansi USE flag enabled"
-		ewarn "if you wnat to run the ansi tests."
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		| sed s/bootstrapped_ansi_gcl/bootstrapped_gcl/g \
-		| unixport/saved_gcl
-
-		cat "${FILESDIR}/bootstrap-gcl" \
-		| sed s/bootstrapped_ansi_gcl/bootstrapped_r_gcl/g \
-		| ./bootstrapped_gcl
-
-		for x in "./bootstrapped_r_gcl" "unixport/saved_gcl" ; do
-			echo "(compiler::emit-fn t)" \
-				| ${x} \
-				|| die "Phase 2, bootstraped compiler failed in tests"
-		done
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	rm -rf "${D}"usr/share/doc/${PN}-si "${D}"usr/share/doc/${PN}-tk
-
-	dosed /usr/bin/gcl
-	fperms 0755 /usr/bin/gcl
-
-	dodoc readme* RELEASE* ChangeLog* doc/*
-	doman gcl.1
-	doinfo info/*.info*
-
-	if use emacs; then
-		mv "${D}"usr/share/emacs/site-lisp/${PN}/add-default.el "${T}"/50${PN}-gentoo.el
-		elisp-site-file-install "${T}"/50${PN}-gentoo.el
-		elisp-install ${PN} elisp/*
-		fperms 0644 /usr/share/emacs/site-lisp/gcl/*
-	else
-		rm -rf "${D}"usr/share/emacs
-	fi
-
-	if use doc; then
-		mv "${D}"usr/share/doc/*.dvi "${D}"usr/share/doc/dwdoc* "${D}"usr/share/doc/${PF}/
-	else
-		rm -rf "${D}"usr/share/doc/*.dvi "${D}"usr/share/doc/dwdoc*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lisp/gcl/metadata.xml b/dev-lisp/gcl/metadata.xml
index 4635d40bd95b..3e77021af943 100644
--- a/dev-lisp/gcl/metadata.xml
+++ b/dev-lisp/gcl/metadata.xml
@@ -8,10 +8,7 @@
     code, providing for both good performance and facile portability.
   </longdescription>
   <use>
-  <flag name='ansi'>Build a GCL with ANSI support (else build a traditional
-  CLtL1 image)</flag>
-  <flag name='custreloc'>Build a GCL which uses custom GCL code for linking</flag>
-  <flag name='dlopen'>Build a GCL which uses dlopen for linking</flag>
-  <flag name='gprof'>Build a GCL with profiling support</flag>
+    <flag name='ansi'>Build a GCL with ANSI support (else build a traditional CLtL1 image)</flag>
+    <flag name='athena'>Build xgcl - an interface to <pkg>x11-libs/libXaw</pkg></flag>
   </use>
 </pkgmetadata>