Drop old

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

17 files changed, 10 insertions, 1293 deletions

diff --git a/dev-scheme/guile/ChangeLog b/dev-scheme/guile/ChangeLog
index 39361e4673ca..25e65e49dacd 100644
--- a/dev-scheme/guile/ChangeLog
+++ b/dev-scheme/guile/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-scheme/guile
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.99 2013/02/02 12:31:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/ChangeLog,v 1.100 2013/02/02 12:38:15 pacho Exp $
+
+  02 Feb 2013; Pacho Ramos <pacho@gentoo.org> -files/gcc-4.3.patch,
+  -files/guile-1.8.6-interix.patch, -files/guile-1.8.7-fix_tests.patch,
+  -files/guile-1.8.7-gcc45.patch, -files/slibtest.patch, -guile-1.6.8.ebuild,
+  -guile-1.8.4-r1.ebuild, -guile-1.8.4.ebuild, -guile-1.8.5-r1.ebuild,
+  -guile-1.8.5.ebuild, -guile-1.8.6.ebuild, -guile-1.8.7-r1.ebuild,
+  -guile-1.8.7-r2.ebuild, -guile-1.8.7.ebuild, -guile-1.8.8.ebuild,
+  metadata.xml:
+  Drop old
 
   02 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup up due #154183
diff --git a/dev-scheme/guile/files/gcc-4.3.patch b/dev-scheme/guile/files/gcc-4.3.patch
deleted file mode 100644
index 35ac8b149339..000000000000
--- a/dev-scheme/guile/files/gcc-4.3.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -urN guile-1.8-1.8.3+1.old/libguile/c-tokenize.c guile-1.8-1.8.3+1/libguile/c-tokenize.c
---- guile-1.8-1.8.3+1.old/libguile/c-tokenize.c	2007-06-13 22:00:56.000000000 +0000
-+++ guile-1.8-1.8.3+1/libguile/c-tokenize.c	2008-02-23 01:40:11.000000000 +0000
-@@ -579,6 +579,8 @@
- #include <stdlib.h>
- #include <string.h>
-   
-+#define YY_NO_INPUT
-+
- int yylex(void);
- 
- int yyget_lineno (void);
-diff -urN guile-1.8-1.8.3+1.old/libguile/c-tokenize.lex guile-1.8-1.8.3+1/libguile/c-tokenize.lex
---- guile-1.8-1.8.3+1.old/libguile/c-tokenize.lex	2007-05-09 20:22:03.000000000 +0000
-+++ guile-1.8-1.8.3+1/libguile/c-tokenize.lex	2008-02-23 01:39:42.000000000 +0000
-@@ -18,7 +18,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--  
-+ 
-+#define YY_NO_INPUT
-+ 
- int yylex(void);
- 
- int yyget_lineno (void);
-diff -urN guile-1.8-1.8.3+1.old/libguile/inline.h guile-1.8-1.8.3+1/libguile/inline.h
---- guile-1.8-1.8.3+1.old/libguile/inline.h	2007-05-09 20:22:03.000000000 +0000
-+++ guile-1.8-1.8.3+1/libguile/inline.h	2008-02-23 01:43:22.000000000 +0000
-@@ -55,6 +55,12 @@
- extern unsigned scm_newcell2_count;
- extern unsigned scm_newcell_count;
- 
-+#ifdef __GNUC_STDC_INLINE__
-+#define SCM_C_GNU_INLINE SCM_C_INLINE __attribute__((__gnu_inline__))
-+#else
-+#define SCM_C_GNU_INLINE SCM_C_INLINE
-+#endif
-+
- #if defined SCM_C_INLINE && ! defined SCM_INLINE_C_INCLUDING_INLINE_H
- /* definitely inlining */
- #ifdef __GNUC__
-@@ -62,7 +68,7 @@
- #else
- static
- #endif
--SCM_C_INLINE
-+SCM_C_GNU_INLINE
- #endif
- SCM
- scm_cell (scm_t_bits car, scm_t_bits cdr)
-@@ -138,7 +144,7 @@
- #else
- static
- #endif
--SCM_C_INLINE
-+SCM_C_GNU_INLINE
- #endif
- SCM
- scm_double_cell (scm_t_bits car, scm_t_bits cbr,
-@@ -213,7 +219,7 @@
- #else
- static
- #endif
--SCM_C_INLINE
-+SCM_C_GNU_INLINE
- #endif
- SCM
- scm_array_handle_ref (scm_t_array_handle *h, ssize_t p)
-@@ -228,7 +234,7 @@
- #else
- static
- #endif
--SCM_C_INLINE
-+SCM_C_GNU_INLINE
- #endif
- void
- scm_array_handle_set (scm_t_array_handle *h, ssize_t p, SCM v)
-@@ -243,7 +249,7 @@
- #else
- static
- #endif
--SCM_C_INLINE
-+SCM_C_GNU_INLINE
- #endif
- int
- scm_is_pair (SCM x)
diff --git a/dev-scheme/guile/files/guile-1.8.6-interix.patch b/dev-scheme/guile/files/guile-1.8.6-interix.patch
deleted file mode 100644
index 08777b3a84e9..000000000000
--- a/dev-scheme/guile/files/guile-1.8.6-interix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru guile-1.8.6.orig/libguile/iselect.h guile-1.8.6/libguile/iselect.h
---- guile-1.8.6.orig/libguile/iselect.h	2009-09-25 13:44:23 +0200
-+++ guile-1.8.6/libguile/iselect.h	2009-09-25 13:45:36 +0200
-@@ -38,7 +38,16 @@
- #ifdef FD_SET
- 
- #define SELECT_TYPE fd_set
-+#ifdef __INTERIX
-+// interix' FD_SETSIZE should be == OPEN_MAX, but it seems
-+// that there is an error in the headers, which makes it
-+// four times as big, and thus causes errno 22 on select
-+// (invalid argument).
-+#include <limits.h>
-+#define SELECT_SET_SIZE OPEN_MAX
-+#else
- #define SELECT_SET_SIZE FD_SETSIZE
-+#endif
- 
- #else /* no FD_SET */
- 
diff --git a/dev-scheme/guile/files/guile-1.8.7-fix_tests.patch b/dev-scheme/guile/files/guile-1.8.7-fix_tests.patch
deleted file mode 100644
index dc67f3acb7d7..000000000000
--- a/dev-scheme/guile/files/guile-1.8.7-fix_tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/295093
-
---- guile-1.8.7.orig/test-suite/standalone/Makefile.am
-+++ guile-1.8.7/test-suite/standalone/Makefile.am
-@@ -28,7 +28,9 @@
- BUILT_SOURCES =
- EXTRA_DIST =
- 
--TESTS_ENVIRONMENT = "${top_builddir}/pre-inst-guile-env"
-+TESTS_ENVIRONMENT =					\
-+builddir="$(builddir)"					\
-+GUILE_AUTO_COMPILE=0 "${top_builddir}/pre-inst-guile-env"
- 
- test_cflags =					\
-   -I$(top_srcdir)/test-suite/standalone		\
---- guile-1.8.7.orig/test-suite/standalone/test-asmobs
-+++ guile-1.8.7/test-suite/standalone/test-asmobs
-@@ -2,7 +2,8 @@
- exec guile -q -s "$0" "$@"
- !#
- 
--(load-extension "libtest-asmobs" "libtest_asmobs_init")
-+(load-extension (string-append (getenv "builddir") "/libtest-asmobs")
-+                "libtest_asmobs_init")
- 
- (define (test x v)
-   (if v
-@@ -114,4 +115,4 @@
- 
- ;; Local Variables:
- ;; mode: scheme
--;; End:
-\ No newline at end of file
-+;; End:
diff --git a/dev-scheme/guile/files/guile-1.8.7-gcc45.patch b/dev-scheme/guile/files/guile-1.8.7-gcc45.patch
deleted file mode 100644
index 18e28b1326b1..000000000000
--- a/dev-scheme/guile/files/guile-1.8.7-gcc45.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixing docs build with gcc-4.5
-
-http://bugs.gentoo.org/317175
-
-Patch scavenged from
-http://lists.gnu.org/archive/html/guile-devel/2009-11/msg00078.html
-
---- libguile/guile-snarf-docs.in
-+++ libguile/guile-snarf-docs.in
-@@ -23,4 +23,4 @@
- ## Let the user override the preprocessor autoconf found.
- test -n "${CPP+set}" || CPP="@CPP@"
- 
--${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
-+${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@"
diff --git a/dev-scheme/guile/files/slibtest.patch b/dev-scheme/guile/files/slibtest.patch
deleted file mode 100644
index bf3df0cbd887..000000000000
--- a/dev-scheme/guile/files/slibtest.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- slib.test.old	2007-05-17 14:11:37.000000000 +0200
-+++ slib.test	2007-05-17 14:14:28.000000000 +0200
-@@ -127,12 +127,12 @@
- 	;;
- 
- 	;; in guile 1.6.4 and earlier delete-file didn't match the slib spec
--	(with-test-prefix "delete-file"
--	  (pass-if "non existant file"
--	    (eq? #f (delete-file "nosuchfile")))
--	  (pass-if "existing file"
--	    (call-with-output-file "slibtest.tmp" noop)
--	    (eq? #t (delete-file "slibtest.tmp"))))
-+;	(with-test-prefix "delete-file"
-+;	  (pass-if "non existant file"
-+;	    (eq? #f (delete-file "nosuchfile")))
-+;	  (pass-if "existing file"
-+;	    (call-with-output-file "slibtest.tmp" noop)
-+;	    (eq? #t (delete-file "slibtest.tmp"))))
- 
- 	;;
- 	;; output-port-height
-@@ -156,11 +156,12 @@
- 
- 	;; this style open-file is only a requirement in slib 3a1 and up, but
- 	;; we provide it always
--	(with-test-prefix "open-file"
--	  (pass-if "r"  (port? (open-file "/dev/null" 'r)))
--	  (pass-if "rb" (port? (open-file "/dev/null" 'rb)))
--	  (pass-if "w"  (port? (open-file "/dev/null" 'w)))
--	  (pass-if "wb" (port? (open-file "/dev/null" 'wb)))))
-+;	(with-test-prefix "open-file"
-+;	  (pass-if "r"  (port? (open-file "/dev/null" 'r)))
-+;	  (pass-if "rb" (port? (open-file "/dev/null" 'rb)))
-+;	  (pass-if "w"  (port? (open-file "/dev/null" 'w)))
-+;	  (pass-if "wb" (port? (open-file "/dev/null" 'wb))))
-+)
- 
- 
-       (with-test-prefix "System stuff"
-@@ -245,7 +245,7 @@
- 
- 	  ;; in guile 1.6.4 and earlier this was missing
- 	  (with-test-prefix "nil"
--	    (pass-if "value" (eq? #f nil)))
-+	    (pass-if "value" (not (eq? #f nil))))
- 
- 	  ;;
- 	  ;; t
-@@ -253,7 +253,7 @@
- 
- 	  ;; in guile 1.6.4 and earlier this was missing
- 	  (with-test-prefix "t"
--	    (pass-if "value" (eq? #t t)))))
-+	    (pass-if "value" (not (eq? #t t))))))
- 
- 
-       ;;
-@@ -262,14 +262,14 @@
- 
-       ;; in guile 1.6.4 the 'rev2-procedures feature we defined claimed
-       ;; these existed, but they didn't
--      (with-test-prefix "rev2-procedures"
--	(require 'rev2-procedures)
--	(pass-if "-1+" (procedure? -1+))
--	(pass-if "<?"  (procedure? <?))
--	(pass-if "<=?" (procedure? <=?))
--	(pass-if "=?"  (procedure? =?))
--	(pass-if ">?"  (procedure? >?))
--	(pass-if ">=?" (procedure? >=?)))
-+;      (with-test-prefix "rev2-procedures"
-+;	(require 'rev2-procedures)
-+;	(pass-if "-1+" (procedure? -1+))
-+;	(pass-if "<?"  (procedure? <?))
-+;	(pass-if "<=?" (procedure? <=?))
-+;	(pass-if "=?"  (procedure? =?))
-+;	(pass-if ">?"  (procedure? >?))
-+;	(pass-if ">=?" (procedure? >=?)))
- 
- 
-       ;;
-@@ -279,8 +279,9 @@
-       ;; in guile 1.6.4 and earlier system didn't match the slib spec
-       (with-test-prefix "system"
- 	(pass-if "exit 0"  (= 0  (system "exit 0")))
--	(pass-if "exit 1"  (= 1  (system "exit 1")))
--	(pass-if "exit 99" (= 99 (system "exit 99"))))
-+;	(pass-if "exit 1"  (= 1  (system "exit 1")))
-+;	(pass-if "exit 99" (= 99 (system "exit 99")))
-+        )
- 
- 
-       (with-test-prefix "Time"
diff --git a/dev-scheme/guile/guile-1.6.8.ebuild b/dev-scheme/guile/guile-1.6.8.ebuild
deleted file mode 100644
index 465ff76ee6b0..000000000000
--- a/dev-scheme/guile/guile-1.6.8.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.6.8.ebuild,v 1.16 2010/11/14 16:05:58 jlec Exp $
-
-inherit flag-o-matic eutils libtool
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-# bug 179738
-MAKEOPTS="${MAKEOPTS} -j1"
-
-DEPEND="
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/readline-4.1"
-RDEPEND="${DEPEND}"
-
-# NOTE: in README-PACKAGERS, guile recommends different versions be installed
-#		in parallel. They're talking about LIBRARY MAJOR versions and not
-#		the actual guile version that was used in the past.
-#
-#		So I'm slotting this as 12 beacuse of the library major version
-SLOT="12"
-MAJOR="1.6"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/test-suite/tests/
-	epatch "${FILESDIR}"/slibtest.patch
-	sed 's_sleep 999_sleep 1_' -i popen.test
-}
-
-src_compile() {
-	use ppc && replace-flags -O3 -O2
-
-	# Fix for bug 26484: This package fails to build when built with
-	# -g3, at least on some architectures.	(19 Aug 2003 agriffis)
-	filter-flags -g3
-
-	econf \
-		--with-threads \
-		--with-modules \
-		--enable-deprecation=no
-
-	# Please keep --enable-deprecation=no in future bumps.
-	# Danny van Dyk <kugelfang@gentoo.org 2004/09/19
-
-	emake || die "make failed"
-#	./pre-inst-guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README SNAPSHOTS THANKS || die
-
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-
-	# We don't slot the env.d entry because /usr/bin/guile-config is
-	# there anyway, and will only match the last guile installed.
-	# so the GUILE_LOAD_PATH will match the data available from guile-config.
-	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > "${D}"/etc/env.d/50guile
-
-#	# install a symlink to slib; probably not worth it to test for slib use flag
-#	dosym /usr/lib/slib/ /usr/share/guile/slib
-}
-
-# keeping this in slib for now
-#pkg_postinst() {
-#	if use slib; then
-#		einfo "Installing slib for guile..."
-#		guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
-#	fi
-#}
diff --git a/dev-scheme/guile/guile-1.8.4-r1.ebuild b/dev-scheme/guile/guile-1.8.4-r1.ebuild
deleted file mode 100644
index 4631838fa3cb..000000000000
--- a/dev-scheme/guile/guile-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.4-r1.ebuild,v 1.4 2010/11/14 16:05:58 jlec Exp $
-
-EAPI=1
-inherit eutils autotools flag-o-matic
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
-	>=dev-libs/gmp-4.1
-	>=sys-devel/libtool-1.5.6
-	sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-IUSE="networking +regex discouraged +deprecated elisp nls debug-freelist debug-malloc debug +threads"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
-
-	#bug 214787
-	epatch "${FILESDIR}"/gcc-4.3.patch
-
-#	cp configure.in configure.in.old
-
-	#for libtool-2.2*, bug 212723
-	sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-config\])/' -i configure.in
-
-#	diff -u configure.in.old configure.in
-
-	eautoreconf
-}
-
-src_compile() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules
-
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README SNAPSHOTS THANKS || die
-
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > "${D}"/etc/env.d/50guile
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && pkg_config
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${ROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/guile-1.8.4.ebuild b/dev-scheme/guile/guile-1.8.4.ebuild
deleted file mode 100644
index 5c5d9e4e5ded..000000000000
--- a/dev-scheme/guile/guile-1.8.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.4.ebuild,v 1.11 2010/11/14 16:05:58 jlec Exp $
-
-EAPI=1
-inherit eutils flag-o-matic
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
-	>=dev-libs/gmp-4.1
-	>=sys-devel/libtool-1.5.6
-	sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-IUSE="networking +regex discouraged +deprecated elisp nls debug-freelist debug-malloc debug +threads"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
-}
-
-src_compile() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules
-
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README SNAPSHOTS THANKS || die
-
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > "${D}"/etc/env.d/50guile
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && pkg_config
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${ROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/guile-1.8.5-r1.ebuild b/dev-scheme/guile/guile-1.8.5-r1.ebuild
deleted file mode 100644
index 0e1a9c8b67ed..000000000000
--- a/dev-scheme/guile/guile-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.5-r1.ebuild,v 1.12 2010/11/14 16:05:58 jlec Exp $
-
-EAPI=1
-inherit eutils autotools flag-o-matic elisp-common
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
-	>=dev-libs/gmp-4.1
-	>=sys-devel/libtool-1.5.6
-	sys-devel/gettext
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-IUSE="networking +regex discouraged +deprecated elisp emacs nls debug-freelist debug-malloc debug +threads"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
-
-#	cp configure.in configure.in.old
-
-	#for libtool-2.2*, bug 212723
-	sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-config\])/' -i configure.in
-
-#	diff -u configure.in.old configure.in
-
-	eautoreconf
-}
-
-src_compile() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-	#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules \
-		EMACS=no
-
-	emake || die "make failed"
-
-	# Above we have disabled the build system's Emacs support;
-	# for USE=emacs we compile (and install) the files manually
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	einstall || die "install failed"
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS
-
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > "${D}"/etc/env.d/50guile
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-
-	if use emacs; then
-		elisp-install ${PN} emacs/*.{el,elc} || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" \
-			|| die "elisp-site-file-install failed"
-	fi
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && pkg_config
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${ROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/guile-1.8.5.ebuild b/dev-scheme/guile/guile-1.8.5.ebuild
deleted file mode 100644
index b23d2e8565db..000000000000
--- a/dev-scheme/guile/guile-1.8.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.5.ebuild,v 1.4 2010/11/14 16:05:58 jlec Exp $
-
-EAPI=1
-inherit eutils autotools flag-o-matic
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
-	>=dev-libs/gmp-4.1
-	>=sys-devel/libtool-1.5.6
-	sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-IUSE="networking +regex discouraged +deprecated elisp nls debug-freelist debug-malloc debug +threads"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
-
-#	cp configure.in configure.in.old
-
-	#for libtool-2.2*, bug 212723
-	sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-config\])/' -i configure.in
-
-#	diff -u configure.in.old configure.in
-
-	eautoreconf
-}
-
-src_compile() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules
-
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die "install failed"
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS
-
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > "${D}"/etc/env.d/50guile
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && pkg_config
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${ROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/guile-1.8.6.ebuild b/dev-scheme/guile/guile-1.8.6.ebuild
deleted file mode 100644
index e739e799075d..000000000000
--- a/dev-scheme/guile/guile-1.8.6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.6.ebuild,v 1.5 2010/11/14 16:05:58 jlec Exp $
-
-EAPI=1
-inherit flag-o-matic elisp-common
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
-	>=dev-libs/gmp-4.1
-	>=sys-devel/libtool-1.5.6
-	sys-devel/gettext
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-IUSE="networking +regex discouraged +deprecated elisp emacs nls debug-freelist debug-malloc debug +threads"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
-
-#	cp configure.in configure.in.old
-
-	#for libtool-2.2*, bug 212723
-#	sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-config\])/' -i configure.in
-
-#	diff -u configure.in.old configure.in
-
-#	eautoreconf
-}
-
-src_compile() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-	#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules \
-		EMACS=no
-
-	emake || die "make failed"
-
-	# Above we have disabled the build system's Emacs support;
-	# for USE=emacs we compile (and install) the files manually
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	einstall || die "install failed"
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS
-
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > "${D}"/etc/env.d/50guile
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-
-	if use emacs; then
-		elisp-install ${PN} emacs/*.{el,elc} || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" \
-			|| die "elisp-site-file-install failed"
-	fi
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && pkg_config
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${ROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/guile-1.8.7-r1.ebuild b/dev-scheme/guile/guile-1.8.7-r1.ebuild
deleted file mode 100644
index 3fc797163a65..000000000000
--- a/dev-scheme/guile/guile-1.8.7-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.7-r1.ebuild,v 1.1 2010/09/24 12:36:15 jlec Exp $
-
-EAPI=3
-inherit eutils autotools flag-o-matic elisp-common
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="networking +regex discouraged +deprecated elisp emacs nls debug-freelist debug-malloc debug +threads"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
-	>=dev-libs/gmp-4.1
-	>=sys-devel/libtool-1.5.6
-	sys-devel/gettext
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-src_prepare() {
-	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
-	epatch "${FILESDIR}/${P}-fix_tests.patch"
-	epatch "${FILESDIR}"/${P}-gcc45.patch  # 317175
-
-#	cp configure.in configure.in.old
-
-	#for libtool-2.2*, bug 212723
-#	sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-config\])/' -i configure.in
-
-#	diff -u configure.in.old configure.in
-
-	eautoreconf
-}
-
-src_configure() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-	#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules \
-		EMACS=no
-}
-
-src_compile()  {
-	emake || die "make failed"
-
-	# Above we have disabled the build system's Emacs support;
-	# for USE=emacs we compile (and install) the files manually
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	einstall || die "install failed"
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
-
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-
-	if use emacs; then
-		elisp-install ${PN} emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
-	fi
-}
-
-pkg_postinst() {
-	[ "${EROOT}" == "/" ] && pkg_config
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${EROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/guile-1.8.7-r2.ebuild b/dev-scheme/guile/guile-1.8.7-r2.ebuild
deleted file mode 100644
index c17edc8c3829..000000000000
--- a/dev-scheme/guile/guile-1.8.7-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.7-r2.ebuild,v 1.1 2010/11/14 15:53:58 jlec Exp $
-
-EAPI=3
-inherit eutils autotools flag-o-matic elisp-common
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="networking +regex discouraged +deprecated elisp emacs nls debug-freelist debug-malloc debug +threads"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
-	>=dev-libs/gmp-4.1
-	>=sys-devel/libtool-1.5.6
-	sys-devel/gettext
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.6-interix.patch
-
-	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
-	epatch "${FILESDIR}/${P}-fix_tests.patch"
-	epatch "${FILESDIR}"/${P}-gcc45.patch  # 317175
-
-#	cp configure.in configure.in.old
-
-	#for libtool-2.2*, bug 212723
-#	sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-config\])/' -i configure.in
-
-#	diff -u configure.in.old configure.in
-
-	eautoreconf
-}
-
-src_configure() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-	#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules \
-		EMACS=no
-}
-
-src_compile()  {
-	emake || die "make failed"
-
-	# Above we have disabled the build system's Emacs support;
-	# for USE=emacs we compile (and install) the files manually
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	einstall || die "install failed"
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
-
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-
-	if use emacs; then
-		elisp-install ${PN} emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
-	fi
-}
-
-pkg_postinst() {
-	[ "${EROOT}" == "/" ] && pkg_config
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${EROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/guile-1.8.7.ebuild b/dev-scheme/guile/guile-1.8.7.ebuild
deleted file mode 100644
index 90259ec6d528..000000000000
--- a/dev-scheme/guile/guile-1.8.7.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.7.ebuild,v 1.4 2010/11/14 16:05:58 jlec Exp $
-
-EAPI=1
-inherit eutils autotools flag-o-matic elisp-common
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="networking +regex discouraged +deprecated elisp emacs nls debug-freelist debug-malloc debug +threads"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
-	>=dev-libs/gmp-4.1
-	>=sys-devel/libtool-1.5.6
-	sys-devel/gettext
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-
-	sed "s_sleep 999_sleep 1_" -i test-suite/tests/popen.test
-	epatch "${FILESDIR}/${P}-fix_tests.patch"
-	epatch "${FILESDIR}"/${P}-gcc45.patch  # 317175
-
-#	cp configure.in configure.in.old
-
-	#for libtool-2.2*, bug 212723
-#	sed 's/AC_CONFIG_MACRO_DIR(\[m4\])/AC_CONFIG_MACRO_DIR(\[guile-config\])/' -i configure.in
-
-#	diff -u configure.in.old configure.in
-
-	eautoreconf
-}
-
-src_compile() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-	#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules \
-		EMACS=no
-
-	emake || die "make failed"
-
-	# Above we have disabled the build system's Emacs support;
-	# for USE=emacs we compile (and install) the files manually
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	einstall || die "install failed"
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS
-
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"/usr/share/guile/${MAJOR}\"" > "${D}"/etc/env.d/50guile
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-
-	if use emacs; then
-		elisp-install ${PN} emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
-	fi
-}
-
-pkg_postinst() {
-	[ "${ROOT}" == "/" ] && pkg_config
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${ROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/guile-1.8.8.ebuild b/dev-scheme/guile/guile-1.8.8.ebuild
deleted file mode 100644
index cedd99734bc8..000000000000
--- a/dev-scheme/guile/guile-1.8.8.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.8.ebuild,v 1.2 2011/04/29 09:44:07 pchrist Exp $
-
-EAPI=3
-inherit eutils flag-o-matic elisp-common
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
-	>=dev-libs/gmp-4.1
-	>=sys-devel/libtool-1.5.6
-	sys-devel/gettext
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-src_configure() {
-	# see bug #178499
-	filter-flags -ftree-vectorize
-
-	#will fail for me if posix is disabled or without modules -- hkBst
-	econf \
-		--disable-error-on-warning \
-		--disable-static \
-		--enable-posix \
-		$(use_enable networking) \
-		$(use_enable regex) \
-		$(use deprecated || use_enable discouraged) \
-		$(use_enable deprecated) \
-		$(use_enable emacs elisp) \
-		$(use_enable nls) \
-		--disable-rpath \
-		$(use_enable debug-freelist) \
-		$(use_enable debug-malloc) \
-		$(use_enable debug guile-debug) \
-		$(use_with threads) \
-		--with-modules \
-		EMACS=no
-}
-
-src_compile()  {
-	emake || die "make failed"
-
-	# Above we have disabled the build system's Emacs support;
-	# for USE=emacs we compile (and install) the files manually
-	if use emacs; then
-		cd emacs
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	einstall || die "install failed"
-
-	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
-
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
-
-	# necessary for registering slib, see bug 206896
-	keepdir /usr/share/guile/site
-
-	if use emacs; then
-		elisp-install ${PN} emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
-	fi
-}
-
-pkg_postinst() {
-	[ "${EROOT}" == "/" ] && pkg_config
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
-
-pkg_config() {
-	if has_version dev-scheme/slib; then
-		einfo "Registering slib with guile"
-		install_slib_for_guile
-	fi
-}
-
-_pkg_prerm() {
-	rm -f "${EROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/metadata.xml b/dev-scheme/guile/metadata.xml
index 4b6cfb3d5ed4..a3d993de70de 100644
--- a/dev-scheme/guile/metadata.xml
+++ b/dev-scheme/guile/metadata.xml
@@ -12,7 +12,6 @@ Guile is a library designed to help programmers create flexible applications. Us
 	<flag name='deprecated'>Enable deprecated features</flag>
 	<flag name='discouraged'> (implied by deprecated) enable merely discouraged
 	features</flag>
-	<flag name='elisp'>Enable Emacs Lisp support</flag>
 	<flag name='networking'>Include networking interfaces</flag>
 	<flag name='regex'> Include regular expression interfaces</flag>
 	</use>