Drop old

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

18 files changed, 15 insertions, 1318 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/Manifest b/dev-scheme/guile/Manifest
index e82665e7587e..9b1ccfc0427f 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -2,38 +2,18 @@
 Hash: SHA256
 
 AUX 50guile-gentoo.el 38 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115 SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5 WHIRLPOOL cc5e2fd5081f5fb0018e1fa461c0802c7c90891accc55c02c2935dd3d413c5f8941e918af9341040526b037be4c34dab26008dfca91c153c11fca41338f77c14
-AUX gcc-4.3.patch 2097 SHA256 3702a63fef213535d2df8dfa093f73d5642640537a4ae3a1f1bc7f9ada5333b4 SHA512 18d5ab93e2d9b76c02ff70cb3c8035fd1fb29a93b38857672b72a2b2b0095d72fd2655414b753afefc252a885d6ff4f60a9be4f123c956c11385c8bab3e01a50 WHIRLPOOL 0612b6fa4bb07df9b26a5bb88b40a1c6157129f08bf150ecad30a8d02b3c8e297f6ff26b11040b28cdf50b85269afafbbd351c2a276bda41d89ae66ae7494553
-AUX guile-1.8.6-interix.patch 618 SHA256 8982880cefdc8c346402c99a781871b978a5cb1be12cd63e78f7ea50934b1197 SHA512 29515cf486e4a68219dbf476a7d3c785f5d8c02eeb2f4cc30afb0cf7af6c67eb92c08a61ed93c02336eed0f154c62f0e2a68bff10c80346871f43e492311b42f WHIRLPOOL cac21e97d2c831297435a03ed73a4cee1e9ffab432ba8736de3adb009238563bbb1fb4990fda2d88bb39b126987220d85e8c844594a2d272181ddb0827766ce9
-AUX guile-1.8.7-fix_tests.patch 888 SHA256 077829a887549f9c65a6c366a5e2c709dfbab07bc81f46a60f2557dcc5c34adb SHA512 be16624f7386d14092555a63705b40d1656b7a92f3624fec2949c8615d08a5d5e666e5f4c1fa0d2849c0a6596b370fb25f50951852f09e564f0f2b97b93fc3f9 WHIRLPOOL 78b6d8410fa171a51bc4b2f7138d44c7cc74a117bd8b547548b1f80ad2c3909a834a5228bfed18fa0126c8ba585c75bb551f68d6187b9674b4908ab3a26b84a9
-AUX guile-1.8.7-gcc45.patch 410 SHA256 0b9f7b11a70e131384836e76b5013fd30096a4dbbf09f404e4022c1d274799eb SHA512 8d076732f0bfde41e4b555dc251178ae9611847a68a5afd3dc1cf350bf6e30e567d025bf8cef8cf1bf46cc853fe7ac4d17cc47f3559ef3198ca7b69601e75ce7 WHIRLPOOL 87d3f6428f1f204bbf24796b6984abef9320456a3d340a70fd26ad670efda35d903fb17bc329513fd469a9819aab6302e8bbbca69f3849cc8959ad6f20d5544e
 AUX guile-1.8.8-fix_guile-config.patch 494 SHA256 08e4d837a663fc27b037e64f8dd89d89ababb3ed13f1e7845109a0f901f3b0c4 SHA512 3ef2bcb31d5b80dfa2f23b8802b98af713230e59aafe773ca3fd847fbdc7759ebb2d19cead1b6b362a6fa504dfff0c2036d5359aa82b601d664eb2a49a98c970 WHIRLPOOL f6ccd01b09a7aab46fab36464ab49539c9dddb954cc2d1ed709074175273df306d8527bae0d3d83f212903693af00fdf087533611ea416036b1c557ebc0fd283
 AUX guile-1.8.8-gcc46.patch 1004 SHA256 9f11b3095ed4aa622a58e3a0805e49f56c258e81c9813c5053cea980cd93948b SHA512 0ace93548dde387c344e13f083d79227cd09506e0cf58ac0892f25c43bfcefe9071e83912b921fba120262884fa92aaabe4d07f8337d89b6da73f0f2c077dcfa WHIRLPOOL cf2ff22da564656387c7a42985d8c4fd004ff411739e1a081f71931c458287bf1166079f5a39b842f7e8b988e62e24e04d541e125340f0256c62b23de602d80b
-AUX slibtest.patch 2916 SHA256 df098410fd7a27b66e2d5f28763d048484635ddf3010b54739d58deb7803b9ff SHA512 a3f6f3dd9d7b97d563690c63bf0481e9c7310586cdb873e287aa608dcf64ff1513517cd151fab6f2a5d472e40a166de53b6de3ebd415853af638a2a86f6c1aba WHIRLPOOL 193b60bb826f97b1d9434ec52634b788adb315592f112b83cbae0b88675fbe0c1ee52485e8ae9329fe89d2fea431f176ab437d69165f73d3260420a88cef3bfb
-DIST guile-1.6.8.tar.gz 3114052 SHA256 3d4ab874f90f5c2003229be29488ba2aa6fe1f0317774283360530d5d9236011 SHA512 bcefc91b91366f0bd79a20875b05111a6f63dfee3bf94dfef9fa94eef2690954cfbc90cd6bad5f895c326622b2c589d9d731b01f56f2fe6bebbec26123a86233 WHIRLPOOL 0f4bddead84769cfe33af682f34bb20de48429cb18e1bdafaf5fc4d36533e7fc07964d53798e6bb9370c504d944920965518516452ce3c89456a08299979cbd4
-DIST guile-1.8.4.tar.gz 3821388 SHA256 ca03762565291708b6fbcda4224570e59889795651d3bbb5a380ff6d2c69e1b3 SHA512 775570c75a115beb6142a58dee8f91e69faadfc63302baca79a40cbc6f23b67ede8ee3d5ef52ac1c1376f22f2762440751b1d3d9b74c8be88bd3b09a3d947808 WHIRLPOOL a9166f8fbe48efb0562b49ee34e46407c800bdb2df122ff92fd1f1b32724461b32d5334f13043633cf48c00580ff8ed1ec2c3426a9732047541d218dbd9544a3
-DIST guile-1.8.5.tar.gz 3933369 SHA256 e2f63d2d445ffeb072638eab885b1a629e372d1db711c8afb26a62bc56096289 SHA512 5da346e4fad33a97fc22f533e3196e11339717b88d81b1cbd21ea52a02bc35b0a2851ea4ddaa1ccf77aa1208f2a66fb806d2e21af14d5bd27336181181284367 WHIRLPOOL 40fa4dcaafecb0e34f5495c2ad08a147a3e305eeac76a531b93644d55466dc9a95b922d0e8f162ec857f0bf2d190c4553b4aa4ddea3a12211635e3b561e70d4f
-DIST guile-1.8.6.tar.gz 3960608 SHA256 69a2f9491480ff756d1cc4c8ea2bdc13d40ea8ddc8f93f26957bade8219a1d86 SHA512 62b43a6152bdee198285068dc12a0a57e90793180c4f98a41a36fab11612160955a56a2790dd2195a8f9944d0d72f6a698cdbd788766a9ac69b3f84e80d72688 WHIRLPOOL 7c8940e8c0d764bc487306f69febd89eb39f1c9febb48bb1e09d80905c98f4d4979960f978546514d478749b0aa1a66ea61fd24754858e5bb9c89f943fb226d4
-DIST guile-1.8.7.tar.gz 4026804 SHA256 bfee6339d91955a637e7f541d96f5b1d53271b42bb4a37b8867d186a6c66f0b3 SHA512 3b06583e90b7e370a6d3a70327b142c4ec9524c7cfb6d2158d5405e4f8b7917278fcd86270a0d828ed3b3d7d93f4823af5bf3f2f4b3685ef526d97aaf8eecb31 WHIRLPOOL 321a187781d2879d999dcb9106933637aaeb1afb05c03de2b69dbb3df4ddea098312a5b86a7fcb7bb0f493820316660999b8250a3e1a37faf98abb5842d9c6d9
 DIST guile-1.8.8.tar.gz 3956654 SHA256 c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0 WHIRLPOOL 104810030b5dae16805595a5b398e5a7e600771b64b08d5ff686036e2f273dcec3829a16e4cdb1dbb9db5813f2e225476f83e0535a789bc570fc2fc15a76dbe2
 DIST guile-2.0.0.tar.gz 5564966 SHA256 7ba4ebd54d5b16840424172a14b2d10c76821bda9336fab5055b29fc288ec67b
-EBUILD guile-1.6.8.ebuild 2299 SHA256 99771a9e37a1cdba5c196ce76a05582e4324318bf492faedfd290ad8e5abb2e3 SHA512 75fbeaefbf0ff90c356b6d1d81f2cf071abffbda058c846913d8ecd9b0fef3756689aba2bf69ae614395c0a0201d230a9c656185ae58cd59f3224e543b73536d WHIRLPOOL b1d6bb973945e5777c38b99ee779a5c050909af94d908e61b90f2be63ea41ecea14106ea85b07c9bdf086c44dde52b3af3a588955d1e5a2827a155dfd99fc054
-EBUILD guile-1.8.4-r1.ebuild 2515 SHA256 98bab0d432a7f370adfef58265f28ade4c0e11bdcb4064006371d442cb8104e2 SHA512 1c8c1ebd33be991b03be8915a15a66af02004b98577ee88307185fbe3228ef6c9d819a1a45c276d5b47fc92ed905a08cc6c16e2941f49aee095fd565da5815d9 WHIRLPOOL 6bd1983b96fb5c341a46db5bbff8d5c0b923d4ea518033ed3b3965e5ace85b8b380281605189755710660425006840e3923d1a31da02074d904f20330a369420
-EBUILD guile-1.8.4.ebuild 2226 SHA256 034b566d3eb615a02777ee18822c5ed7e24c525f967ced0700e1050558a5af07 SHA512 28daecc6238b3fa62b887129228173b180ed3cc286d0c5446531ae8d5b080809e43f8317f086fa973ad146f403cb6c343fbcc8047f93403f98d0461dfb0242f4 WHIRLPOOL 4ee291786e9dc71138ff28c2ee3a0eac127acef0e5b1c262465218994652275990d19398a9a38b38b06e6507a6214f31abc543e4c0ba764a976a5c1a347b2df4
-EBUILD guile-1.8.5-r1.ebuild 2984 SHA256 1cf061dd378cbe8841a6c9ab6e42c6e5a1453e3a5bc55013bc5664caa181a9fa SHA512 130bbd628a29270406e358355d216cfa4d997d943fb1109efd7f49289304e1debc4af1535d469364408f6fef4f808701c639abb8939597ccc262ae3b3fd1d6ca WHIRLPOOL b1d5a1817d78ad664d3a195dfe4adc0a4ee827aa005026f22ae6280bc47381c1cafffe0029f9d249d3430847a933105f4ea5ab077fdf856702e5a0e4940d2913
-EBUILD guile-1.8.5.ebuild 2445 SHA256 b4d3d5d07381850ebc00ca0d82250f0a6dc5c9af2509b40d4e3fc1a043b8dcd9 SHA512 5da283c6d4a5e31b13e3c7282fdb66345cd1b73db6eeb8c624752d35ceb0f30944f83be63f7e75e4364659f1f957b8bdd1753cee879b43c21f72c5c865b01ad0 WHIRLPOOL dffbebbac5c80470e7f2ae5e23e5cd5925b8a94aaf3045d07288098a3f0e91931b0c1a9a4cbafd2e726dc44b2f5c4c1bfbf76bf3cce7ab578dd3aed7d9d58c3f
-EBUILD guile-1.8.6.ebuild 2971 SHA256 b12e0f1eeeb80424c0c680efb484e1241afe3ed4fb0227dafeb2a7e44a11ff53 SHA512 04f504f6ad7f2a465d6b414418f266ea869509265b970420c9b9707562932c0235fb699f8d40f426a067fca994f999d2a5da93e53485003ebd493792860ff600 WHIRLPOOL 8ebeba170a98c0e26b2e4132a97541aab1220a3dbd91f911adc17668eae62eda976d23679fa5eb799e930ae99303b18c19d0e7d54f34e5321cf9c9556e8e862f
-EBUILD guile-1.8.7-r1.ebuild 3041 SHA256 560663d883f2d1f3c63f2c1d4f98f8e6fcd85ddf7deeafadecb6d13d0d5e312d SHA512 f96828c523e2941d2f10f9bf914e65b14d988547d6c2dad1e03911d7311ae6dfaa374027c78e3923bb0c5a41afc0a943b15802db631bf0026d930a68a02d534b WHIRLPOOL d0639cc33072f31c2085dc46eaef8a24c4f2fd95a9eda0f97fe8ab24db7cca4a6c57fce1399a2ee8c02348e037c1b8ef37e2e14ed9096b9deb2bf8cb7a1749c1
-EBUILD guile-1.8.7-r2.ebuild 3125 SHA256 10760d28e93ee8d783ef1930fd147b8d2a42b853d6e8de5bc80d2d11fd984135 SHA512 313e77c1eedf325b6139d83ae29579281ffb5a3a5e7e32f2ecd5f966201f4219f2314261071207afa717167ecf0c64594400e9ec7bf061460e1c45794dd26117 WHIRLPOOL 01f6c034059e2aef1c288cef00e1658b9ea8f1d9a0f1c78cdaefd50e16871c4890152f4646137804b98d46bbbab2b36f56ed2e19255f0212734c3ddd8012c188
-EBUILD guile-1.8.7.ebuild 2997 SHA256 340c04e7ca83f269c8e118a683f9d7798ab356286fed5b05a5c248f57813bbc3 SHA512 8948255b0b0b7c6c9cb1de5bbdc0e2ceff9606d7b881716d3bb4cece806d40d97fc1c1462f7be35f6b7c2c64c0ef5560d9170744de20b163780b21fc8656274b WHIRLPOOL fdb31935cdde8066ef6ceba19f0054ec7368083c3897624a96d684c57cb43d218d5446102351a041e9773fc2352e1f8a895378b30c2a50b18fdb3ebc7b966a02
 EBUILD guile-1.8.8-r1.ebuild 2826 SHA256 de0a0592203b928529177427f3b2fc12bb633276d4c83c22e994569d88fb0c94 SHA512 df5e263ed828d13a2bc23854580d840d6c228ff7724cfadd19e26b6ee94558d0ad9a582b27e27ba53f88b90c60204419af095bb4e2450e7aae34a92851661833 WHIRLPOOL 190f83f9cf1c02da1e2479fe9d33b2f32e4f8ca0f44d0d2f946d3568ce9d72dd032d2eff828272e38a4399ee69f344ff04f9481d0d346393b63d8c6fdfc78f44
-EBUILD guile-1.8.8.ebuild 2680 SHA256 79af7c36e3912137c1a815f5026020a7cc40e1e5541bff15794797a40cdfd5d6 SHA512 55f6eb5442d638611d004a5448596a72f1e28dd6766e5db18bd43919c4606bc558bf2eeb5aac66e0086167ae49b36e1b2b2cb157d5f1ab632db6ac1bd7cad625 WHIRLPOOL 03341ccf9b0bb08a281768b42123dfc7dc6f556d6ab2257c99cb3c2a4e1bb4845a0531f6433659f6f7564353851db24187abb3e9af123102a8f1f7b46bc9b6a5
 EBUILD guile-2.0.0.ebuild 2359 SHA256 a805e62c1b2a604925a4eaa35070575053f553a7045533366cf4708dce73f9ce SHA512 11fd2937ef77ea45a8606a3b0629bca558b0ef0a9ef43c85269e3ec83838ce4ed5a6259c2ba6ce12b8b3077d5259aa43ba21e7542ceb9987e62866aa0eb7a55b WHIRLPOOL bf8c90e831a92b38271043f5f697b00c73a2d510521b19963dd7d157cd4e0883d4abe4147498af8ef9a6f57acde8ac9f964d09909c0cff3384da0d9c816b4794
-MISC ChangeLog 24787 SHA256 9d347c9275419fb2290f2ee948c09531c7193cc823b166ad2c8540a7520e4513 SHA512 88f71d450d6ee5409b7225c53eface441473c6f2075127035cfa0cc7264b38b00013b0762e588b699495271d5140a1705866cdd712e74a1273b1d4efc6019a6d WHIRLPOOL a1c8f21f6136462282427b329afe952d71978cb750b70b2000b846df51bf1c64df890d5d2dd08d74fd98c15295caee996e2ea45b053b57d99d978f0408f8efe7
-MISC metadata.xml 992 SHA256 4f2a2c34d211ea75f2aaa07095cf190140e67862d4d1d52a2cf638a6251068e3 SHA512 cb334e7d720216c536c719441eb3e0345484642e549d9441412cc708eee632df02fde8c8f9e20d7187ef6b76319a97aba9ac2cddbba7ec5efe1a0ca421b72238 WHIRLPOOL f8749991b77f50c119e650649a04ad54075b8298b420a47edc09b1c919aab3c9577941d52b88f0e50117523c70669ca059a5d1c46919f3cfff6052890d2ca109
+MISC ChangeLog 25241 SHA256 809293429204f64a55b01c18c4bd08afe8cace343516fd9dfafa879681918d8e SHA512 886f0e696fdc5593419ba65d6f00f33438e5995e6c5ea135d9c01388cc5757e137460a224ab9c3f53b268864dad82e3702a9d9334d554df83dbd56db77613bdd WHIRLPOOL bffc70f7f8336847b1514095a5acd673e85373031fa3fc6813540c1023e8eb0e21d54613e597aeb27b3b8259dd6eec531d708c3a5e9663657ed638d764403b3b
+MISC metadata.xml 939 SHA256 bec92c2558ecc371364a598a582a19b43dff9a809fe732d150e9b209b76f17ca SHA512 ca2dd2db48025f250b4ddaeea40a6119c00bdbc7c6d8167f274fffa9155ae64083a3ccb1cff272abd3cdfc108f555f9f04beb10532ce7174db50ce96d0a4f1eb WHIRLPOOL 75f94d8db3b573829322c06a6a388775cb9b6302624c345f492a650b6ac644d2a48021b16b436786e138eb8753f9ed3354df4e5944bd92f2a3b7b4819ff91155
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlENBx4ACgkQCaWpQKGI+9SyvwCfRaU/2VTuNqF6FJzK7rV0t2GN
-mjQAn0YOjpczTA3YEymi8AgeKu6fsUkP
-=RKA6
+iEYEAREIAAYFAlENCLgACgkQCaWpQKGI+9TVZgCfWVfG/+I3E2NKQzbqIUy3nxLf
+NkMAn2WH2H8Txu9HuCsSmO2UfR96puE6
+=CFhb
 -----END PGP SIGNATURE-----
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>