Fixed doc installation (bug #479526), added subslot, old files cleaned

Package-Manager: portage-2.2.0_alpha195/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

14 files changed, 43 insertions, 411 deletions

diff --git a/dev-lisp/clisp/ChangeLog b/dev-lisp/clisp/ChangeLog
index f92c8243a9fa..cdc3474d6488 100644
--- a/dev-lisp/clisp/ChangeLog
+++ b/dev-lisp/clisp/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-lisp/clisp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.108 2013/06/14 02:31:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/ChangeLog,v 1.109 2013/08/12 15:11:30 grozin Exp $
+
+*clisp-2.49-r8 (12 Aug 2013)
+
+  12 Aug 2013; Andrey Grozin <grozin@gentoo.org> -clisp-2.49-r7.ebuild,
+  +clisp-2.49-r8.ebuild, -files/2.38/README.Gentoo, -files/2.38/clisp.sh,
+  -files/2.38/fastcgi-Makefile-gentoo.patch, -files/2.38/install-clc.lisp,
+  -files/2.39/README.Gentoo, -files/2.39/clisp.sh,
+  -files/2.39/fastcgi-Makefile-gentoo.patch, -files/2.39/install-clc.lisp,
+  -files/2.41-fastcgi-Makefile-gentoo.patch, -files/2.41-fastcgi-build.patch,
+  -files/2.41-linux-headers.patch:
+  Fixed doc installation (bug #479526), added subslot, old files cleaned
 
   14 Jun 2013; Patrick Lauer <patrick@gentoo.org> clisp-2.49-r7.ebuild:
   Removing alpha and ia64 keywords until dependency dev-lisp/asdf catches up
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest
index c81b2e5fdde8..b4b749d6be55 100644
--- a/dev-lisp/clisp/Manifest
+++ b/dev-lisp/clisp/Manifest
@@ -1,14 +1,6 @@
-AUX 2.38/README.Gentoo 334 SHA256 336e4287ec4cfdbe8fda692bd217431adb4e303d3f5204bdf3df0ea711fbebd6 SHA512 5d0b25bbdfa8265263f3bb60d95e16d5a8727aff6edd6cc878ec4f65eeac574806dae3eb5949455315046fb6ed1a71e652d7b329472086421ce4b71f60b8078a WHIRLPOOL 3badd093cc43b8fb9f1e0c525a2644ed60a59e8cb214679ba90375deae3424cb40fe735fcf14e36230502e8912120d9687d049b6580331dec32cc071d7f985da
-AUX 2.38/clisp.sh 2792 SHA256 5ba7c78f3d99b9264c9cb8909135ccd0bca113d66d5a998acc520fb431dc75ad SHA512 bef64f9d18438d16dd84ee16eed6a1281bb7a992f0b4b2eab7e74d05620685c207de4468312794ff8356794645019c87b5a021f9a5c362df8fc6eeb80ef85229 WHIRLPOOL e972010b022e2f78daff135c66379d298434ad3bd3a0e70b1d027ccf3fb982097e0e94262a1e711d4b16b532d72ffdd1d77d02ee260961e559aa4bf934804f5c
-AUX 2.38/fastcgi-Makefile-gentoo.patch 681 SHA256 202fe32bc4e1d4cab9e77c2d147822bcdf75cd34cc6e3fe59c2a5c9cc71f40d1 SHA512 940d0e3f511de18ae1f02ff7ec50c89788373401a0ec9303056d121490f6aecadc3c87dc0d423f897238ad17e1b0b12c41c60b44d931757a712a366cdd6f74de WHIRLPOOL 27546184a2216c20b6b2d3027751abad4e38f58321c5aaf788ce56c71e9195dbb958b4795d6fcb98daae673f79c1c9ba8d1cd8cf6276dd5e1c1ed640f54bf8df
-AUX 2.38/install-clc.lisp 501 SHA256 93ff66189e490ae806c2d227e24295af0cf01e1bb0a1d7de2cf57ff59523f09e SHA512 59c5f55ccc58f6f7e472392eec8c38b96243bfd49127568da7b3b6b35b1b9fa3c313b187a89a06287bfc5926dbc22585f913ff0e19978e4f7006d62b4b3845bd WHIRLPOOL 66809b07cc9631cc9063efe33b76892b4f28427aabd9fe45d4dc695ec8ab16f685ba6908e02bb0da29eeaac64d82f20487ed2f8596fc6bd24da2e444237e0235
-AUX 2.39/README.Gentoo 334 SHA256 336e4287ec4cfdbe8fda692bd217431adb4e303d3f5204bdf3df0ea711fbebd6 SHA512 5d0b25bbdfa8265263f3bb60d95e16d5a8727aff6edd6cc878ec4f65eeac574806dae3eb5949455315046fb6ed1a71e652d7b329472086421ce4b71f60b8078a WHIRLPOOL 3badd093cc43b8fb9f1e0c525a2644ed60a59e8cb214679ba90375deae3424cb40fe735fcf14e36230502e8912120d9687d049b6580331dec32cc071d7f985da
-AUX 2.39/clisp.sh 2792 SHA256 5ba7c78f3d99b9264c9cb8909135ccd0bca113d66d5a998acc520fb431dc75ad SHA512 bef64f9d18438d16dd84ee16eed6a1281bb7a992f0b4b2eab7e74d05620685c207de4468312794ff8356794645019c87b5a021f9a5c362df8fc6eeb80ef85229 WHIRLPOOL e972010b022e2f78daff135c66379d298434ad3bd3a0e70b1d027ccf3fb982097e0e94262a1e711d4b16b532d72ffdd1d77d02ee260961e559aa4bf934804f5c
-AUX 2.39/fastcgi-Makefile-gentoo.patch 681 SHA256 14a91f53d5000ea2f9b47233c17e314afa13998a24791331ee75b7017b8a2f85 SHA512 4be03e25b57a728c2da8363d65791e61b32320426c2808758ac6d9c476970b731db734d9ce8253ce911153193d2bd0deccee2bb288a7bb1fd78adbab5881608d WHIRLPOOL 905fd1798a9223795babf17b1dc8f45df1ee52d528992d553596a8dc1773462a74ab6ac26c29a2202599c2c94723e867ba59532fafef97bd92d296971646ac75
-AUX 2.39/install-clc.lisp 501 SHA256 93ff66189e490ae806c2d227e24295af0cf01e1bb0a1d7de2cf57ff59523f09e SHA512 59c5f55ccc58f6f7e472392eec8c38b96243bfd49127568da7b3b6b35b1b9fa3c313b187a89a06287bfc5926dbc22585f913ff0e19978e4f7006d62b4b3845bd WHIRLPOOL 66809b07cc9631cc9063efe33b76892b4f28427aabd9fe45d4dc695ec8ab16f685ba6908e02bb0da29eeaac64d82f20487ed2f8596fc6bd24da2e444237e0235
-AUX 2.41-fastcgi-Makefile-gentoo.patch 681 SHA256 affc6b7687d035130ac7ac172d50096d21c06a7098379fe47de1dde659c6ad12 SHA512 01be2f7d5a5682c77dfab26db0e8135768e3ede18db572f6359f5154a84ee997782823d15e0a864e9745d97b26b4fffe8db8a327681f57ba22e74bf3cb80d0d8 WHIRLPOOL 2aed39699bad3274d2bdfb1f584980c150761c882decc911f52118eaee95088ec7f651a471e538a9d34639058692e0f740d898b16a4a61fb8ab015f137ddfb26
-AUX 2.41-fastcgi-build.patch 523 SHA256 fdab3b155eed12e39a727364293be1ef81d5af969c1f816117e879977b8042fe SHA512 9498ac5bcbcddc0b6d77d54792c7865a294d267f9ea467889f353ced4c84cb60159f52618830b099a9b354eb12d7059a395ce0784604c85f1e3e27ebfe5d084d WHIRLPOOL e8fea3f45843c5ede0ea8696ad89bfec2fc5c2a6a263a177e18f1256f0de43e7f2ec21fac48775c8f73919b2526f804412d5ed52c46e467f4e66696b6a205338
-AUX 2.41-linux-headers.patch 1444 SHA256 cbf3bd75cc5a9457f34e81c8071865af64310c4f664b1b64b3658cd22abe0e59 SHA512 bcc9813ac776b33c19ad7d9bf35c191172985364888870ca0332c20406613c1f9d62661899016ddf348a0087f5f8dd543af2c431979ae16c3ccd598e03c17cb7 WHIRLPOOL f24e0fe6efe8a69ea38e9bdf8c13820ba41cd3cae0a2982c3024c1be90ea60cf404f89f897afbd3ccdc318cc3d059a9d42ca016f1de0e884d89ee328a9e2471f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX clisp-2.48-bits_ipctypes_to_sys_ipc.patch 784 SHA256 ab6a22717b5139a24d3c4f810d18222d7fd314efb26aecc69fee2f70bbcc7cbe SHA512 7b48abf1a7c8a0bff7946f310c4a1f8ca5add5a6aef5b69379cb52b17b5ad279fa264a50b1017453a902dc3e7e1e4db09730cef1cb1abc20bf0694d674da33b0 WHIRLPOOL 63342c08d1e48762e53896798ecda18cad507765132570dff7ffb62e4b081e5185895c22f5d84a175e21a9e5685f6280a5607409783f69aeaa8ceee71932e776
 AUX clisp-2.49-bits_ipctypes_to_sys_ipc.patch 784 SHA256 3d52a7ebc7d2ca34654f6be33b2958e609f2a3a8fc0f9681fe4c2739d2358e08 SHA512 163d9e29135268272ae3316709c60a25408158dda6649b79bedd07bd0f2e216d8eef113418230e983ad1115ecd1870f9e6c52ce94f02c09eff484f709ed3cd3f WHIRLPOOL 0946405d3df92760c1011680a6acea7784c7f08c3959091d06fe531651b8b158c803569112bf0583bbb46f7fa3d54154befb875a0c03133729b830cdc5f52e2f
 AUX clisp-2.49-get_hostname.patch 2356 SHA256 1e45bd6aa7e520e12ca9d08c038f23de20cd249da8bfb1ddd0d307897bec7fa0 SHA512 5e9dfc70f017fef08c24ede15c2312a2a54a5c8433a5a952ad4e41113ee0ce01febc631818c4cb506883d9992ef4468c429752e4924b8d1ce00f21b33a209a9b WHIRLPOOL 57b03de1e5ef6828138808561a9118f0af1475b754eaa8c037a22cb2105c16b4c8582d23d7b5f74e63e7e6c766a7e7c76ea4e293138e7513c120e74653d7e179
@@ -19,6 +11,25 @@ DIST clisp-2.49.tar.bz2 8091011 SHA256 8132ff353afaa70e6b19367a25ae3d5a43627279c
 EBUILD clisp-2.47-r1.ebuild 4203 SHA256 8593f65e083a4ff46984a0be9202065136a201a186b2ae91480eb65baed9103b SHA512 489a25941fc35695ceae1e410937850665ae1940c4fa1118f487251960634752a25ceb80fb84a0d400259daac7816da30fec423aa2cb77f46d0274bd5485822c WHIRLPOOL ca78d3c0910fb9df00dba2e95ce65a24854ada19b1b65f4e453a351af5924146eada863b58258d1f22d22af46c251742dcfbb806c0a8c7fc3d6a285fccaee6ec
 EBUILD clisp-2.48-r1.ebuild 4912 SHA256 bf03a6557680ab09b9af3a8b8adbb032e3750b6a9fa9b149d4f103a2dd615ea9 SHA512 37ac8b35b6fad0598b67a7ed551d80ad1e864210c3836682560953f98838586e0ddafa0eaf597cfa51f0fb87b99bfab4b0cb45fd3b8217ea830bc3aaafdf9b72 WHIRLPOOL 96d470faed9526e48720c689df2717c487a696e95ffc6d77bdcadfcc4ab8214574d44e7d8e62d816a632b1cc3f3e76c9fbc98d647ac7eb5e47b4bc97a07c3839
 EBUILD clisp-2.48-r2.ebuild 4843 SHA256 022f48e9678bebf470b4f9aa5298ce56420dc7c85d7ff4fa9d9d82d182a63567 SHA512 5fefa83b27e42ffa85c7730ed5824a780b1b97599c273548920c9e15e2a6dfc2f34e2f342c95e75cb26483b9fe89de0b17ec761f7a263c7b0e4d7614d29280c7 WHIRLPOOL b103b6561d0a34ddc56be0bf76ab3a04b6467c31fa6bf8446199ecfd77c207915c3c30c4a0ff4b2cdfb204fae1742bd6f087229fb695f63ad16d2f5de430ad2e
-EBUILD clisp-2.49-r7.ebuild 4473 SHA256 06acab88e5abfc50879f563a2fd0c169797e8bba9992706875d88369238d1d61 SHA512 b419b5464a96f11d236afa59255824954863b39a566c989daaadd7f583c48a1d61e63fd27ff57fe17b95fcbaa984bb6a9a2cbf9d28d4d08462228b0f8a09cbbe WHIRLPOOL b1bab8f6edde4c2cffe253a821f2e68ac29610b4d2da7963d907f8bdf02a6ef7a5ce8dcf37af3868c66e7cbe1b0a35cd5f882e9275991425d23862d340092f48
-MISC ChangeLog 25270 SHA256 9939990ff80a080c06e76edb4942fbc2cdc58aa057ad2d992b0e01d5ff83bd02 SHA512 7fd419186d17d0d2f1bf9122cf6e12cf0e4c4436c7b90bbaeae6ed3a14a7fd6887fe3b8f510b0518baf6a914115f9fe361fb69848f1455f5ab24b654d2bbb35e WHIRLPOOL 934c17ea8b1fd5ab958fe33f59f3678df4271d9f7392b260a481f328c277aa419ee2d398493239737e1d603c7b60702acf5b151e741895bfd8c063d9acdbb20a
+EBUILD clisp-2.49-r8.ebuild 4449 SHA256 1f729267f665f8cdbf9844f02fd426d27464d1a8424d394487f502de92f2311a SHA512 5ff5ae60e9c97d5a8e14b528dc66de49049b964b1110b1462854a2472994999e5926ee4d3b0d9c8f805bd3d7379388b58f5e93abfa1d693d92687dd529470537 WHIRLPOOL a1e0c85ad2b193d037ea82e84d1b1888053b02bf4e18ba179c7ac2c71669e0b9b6f95bed0c9c74905c153c6ace941d85deb090f594fe826746a2e871f752ca02
+MISC ChangeLog 25833 SHA256 06e9345fe501c9f277cf0e42e5a3e00dc71b480db6ed724722474b85f72719a9 SHA512 d85f58d859a4a3d1a953e29a71df6ebbdd6e5f63f698cafdb98e7ccc4f93c43aa254e749aa15ab0e3541dc8454aa341b382e512eb9957a4b694b81180134c999 WHIRLPOOL 0ec7090cce0546c44afff6d61a12e36161b372d9b341a155a2137575397c18dd73fcbaec65f6050b27c1d01fba5e4c56e5e8a6dc27444ca3646ab95d6c378a2e
 MISC metadata.xml 1264 SHA256 971d7ef431c0a5fc95a4366c07220c32db56aa3d22960dc8acb77d7110db10dc SHA512 d764f4ea117e5694be4e1487edbeabd64b71e45feb680b5945631f0d6fce19c4d5d5aa961ff460ae1e8807fe817e166785055fc327639664d8229186187900ec WHIRLPOOL eaa3396c8f7b85569f9c40199db2c25bde22e4fd042ec344eb7ba3ca3d6fcdf37a1b8e35080681c827cd555f5f16b2f28355a1d1d780adbe3b75e62c89f63e23
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQJ8BAEBCABmBQJSCPrbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2M9SYP/2fTWdIvxEX5wdm/ibkF6jv1
+lBHggs23aClJpb9+aMrHk32cGCbVSN76ASO0ig0CDMToGukdelXkff+u85JlmHW5
+oV6tKOm+j16/TXC0fbcyCeVrkQe2FwK5QWpz5EMGVKUL8Ytz1fwp1WEns2Lijr5s
+EKGTO+hJJM2Omx0aZ4We4CuBO1gYW9HIAg5qGPBzQs+5MMBEACe+CIr1ZG8ouaK/
+n+Lp8KXtTuPG963oDDM3wBjNn06F/lLsdkIgW/hKAgHzaNVO6QiDWHcQzGGuZraX
+tWEkY2jdxCg/uW1t5U+iaW6wmNHcXaA5BzXQjetK162J7dWPDRe01R8LCRomilKo
+ojtygRFXGICwqBciv4PXxAhC2lGp6sB5ziiwOOA7+aeeqKwhc/EEb0kIYq2FOCLn
+FUqcJvcGv+6EfNSdUvI+2h9T0ZIYHLMxAjf6fgiNuijQ4wqWnnTf7PiGDUKsu63f
+GuZKt2lRKKIL4jkoBmP0EQoQxZPdoEcJ20q4v7OqdQNXLeT2xNHgGMIo3HMo39uR
+oGrW8OJUp7jzuGxNrhGkdYmAqDwKIrxoPKFbduaHN/9W5vcrDjlHpfZ6fM/o9LM6
+TvuwX/A5nJ7NdEguX/eS26wnqqorWRXHJ/4d4eXCdnIidZjXozcpCjuofAqF9TiM
+9U7c7Wrb16feB7IOgX31
+=5u5W
+-----END PGP SIGNATURE-----
diff --git a/dev-lisp/clisp/clisp-2.49-r7.ebuild b/dev-lisp/clisp/clisp-2.49-r8.ebuild
index 88d7a13c73e9..c2b033dace06 100644
--- a/dev-lisp/clisp/clisp-2.49-r7.ebuild
+++ b/dev-lisp/clisp/clisp-2.49-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.49-r7.ebuild,v 1.2 2013/06/14 02:31:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.49-r8.ebuild,v 1.1 2013/08/12 15:11:30 grozin Exp $
 
 EAPI=5
 inherit flag-o-matic eutils toolchain-funcs multilib
@@ -10,7 +10,7 @@ HOMEPAGE="http://clisp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="2"
+SLOT="2/${PV}"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib"
 # "jit" disabled ATM
@@ -127,18 +127,18 @@ src_compile() {
 	export VARTEXFONTS="${T}"/fonts
 	cd "${BUILDDIR}"
 	# parallel build fails
-	emake -j1 || die "emake failed"
+	emake -j1
 }
 
 src_install() {
 	pushd "${BUILDDIR}"
 	make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed"
-	doman clisp.1 || die
-	dodoc SUMMARY README* NEWS MAGIC.add ANNOUNCE || die
+	doman clisp.1
+	dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE
 	# stripping them removes common symbols (defined but uninitialised variables)
 	# which are then needed to build modules...
 	export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*"
 	popd
-	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png || die
-	dodoc doc/{CLOS-guide,LISP-tutorial}.txt || die
+	dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png
+	dodoc doc/{CLOS-guide,LISP-tutorial}.txt
 }
diff --git a/dev-lisp/clisp/files/2.38/README.Gentoo b/dev-lisp/clisp/files/2.38/README.Gentoo
deleted file mode 100644
index 6bec925fb0d3..000000000000
--- a/dev-lisp/clisp/files/2.38/README.Gentoo
+++ /dev/null
@@ -1,11 +0,0 @@
-                                                            -*-outline-*-
-
-* Gentoo Specific Notes
-
-The CLISP port for Gentoo uses Common Lisp Controller related code
-(install-clc.lisp and clisp.sh) from Debian.  This code contains the following
-copyright:
-
-    ;;;; Copyright (c) 2004 Kevin M. Rosenberg
-    ;;;; GNU GPL v2 license
-
diff --git a/dev-lisp/clisp/files/2.38/clisp.sh b/dev-lisp/clisp/files/2.38/clisp.sh
deleted file mode 100644
index f5ed6a1d8fce..000000000000
--- a/dev-lisp/clisp/files/2.38/clisp.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2002 Kevin M. Rosenberg
-# GNU GPL v2 license
- 
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  echo "*** Can't find common-lisp-controller.lisp ***" >&2
-  echo "Please report this as a bug" &>2
-  exit 1
-fi
-
-clisp_dir=/usr/lib/clisp
-clc_lib_dir=/usr/lib/common-lisp/clisp
-
-builder=/usr/bin/clisp
-old_mem=$clisp_dir/full/lispinit.mem
-new_mem=$clisp_dir/full/lispinit-new.mem
-clean_mem=$clisp_dir/full/lispinit-clean.mem
-
-lisp_error()
-{
-    echo "Error running $builder" >&2
-    exit 1
-}
-
-mem_error()
-{
-    echo "Error moving new lisp image $new_mem" >&2
-    exit 1
-}
-
-
-case $1 in
-    rebuild)
-	echo $0 Rebuilding packages...
-	shift
-	while [ -x $builder ] && [ ! -z "$1" ] ; do
-	    echo ...rebuilding $1
-	    $builder -norc -q -M $old_mem -x "
-(let ((*compile-print* nil)
-      (*compile-progress* nil)
-      (*compile-verbose*  nil)
-      (*require-verbose* nil)
-      (*load-verbose* nil) 
-      (mk::*load-source-if-no-binary* nil)
-      (mk::*bother-user-if-no-binary* nil)
-      (mk::*compile-during-load* t))
-   (handler-case
-      (progn
-         (c-l-c:compile-library (quote $1))
-         (ext:exit 0)
-       )
-    (error (e)
-      (ignore-errors (format t \"~&Build error: ~A~%\" e))
-      (finish-output)
-      (ext:exit 1))))"  || exit 1
-	    shift
-	done 
-	;;
-    remove)
-	echo $0 Removing packages...
-	shift
-	while [ ! -z "$1" ] ; do
-	    echo ...removing package $1
-	    rm -rf "${clc_lib_dir}/$1"
-	    shift
-	done
-	rmdir $clc_lib_dir 2> /dev/null 
-	;;
-    install-clc)
-	echo Installing clc...
-	if [ ! -f $clean_mem ]; then
-	    cp $old_mem $clean_mem
-	fi
-	if [ -x $clisp_dir/$lisp_builder ]; then
-	    $builder -norc -q -M $clean_mem \
-		-x "
-(handler-case
-  (progn 
-    (when (find-package :c-l-c) ; have to remove 
-      (delete-package :c-l-c))  ; for clisp workaround
-    (load \"$clisp_dir/install-clc.lisp\") 
-    (saveinitmem \"${new_mem}\")
-    (ext:exit 0))
-  (error (e)
-    (ignore-errors (format t \"~&install-clc error: ~A~%\" e))
-    (finish-output)
-    (ext:exit 1)))"   || lisp_error
-  	    mv $new_mem $old_mem || mem_error
-	fi
-	;;
-    remove-clc)
-	if [ -f $clean_mem ]; then
-	    cp $clean_mem $old_mem
-	else
-	    echo "Warning: Can't find original image file $clean_mem. Aborting." >& 2
-	fi
-	;;
-    make-user-image)
-	if [ ! -f $2 ] ; then 
-	    echo "Trying to make-user image, but can not find file $2" >&2
-	    exit 1
-	fi 
-	$builder -norc -q -M $old_mem \
-	    -x "(progn    
-  (load \"$2\") 
-  (saveinitmem \"${new_mem}\"))
-  (ext:exit 0)" || lisp_error
-	mv $new_mem $old_mem || mem_error
-	;;
-    *)
-	echo "`basename $0`: Unknown command $1" >&2
-	echo "Known commands are:" >&2 
-	echo "install-clc, remove-clc, rebuild, remove, and make-user-image" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/dev-lisp/clisp/files/2.38/fastcgi-Makefile-gentoo.patch b/dev-lisp/clisp/files/2.38/fastcgi-Makefile-gentoo.patch
deleted file mode 100644
index ffe24d237751..000000000000
--- a/dev-lisp/clisp/files/2.38/fastcgi-Makefile-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur clisp-2.38.orig/modules/fastcgi/Makefile.in clisp-2.38/modules/fastcgi/Makefile.in
---- clisp-2.38.orig/modules/fastcgi/Makefile.in	2004-08-12 09:38:36.000000000 -0500
-+++ clisp-2.38/modules/fastcgi/Makefile.in	2006-04-24 15:14:38.000000000 -0500
-@@ -23,10 +23,10 @@
- 	$(CLISP) -c fastcgi.lisp
- 
- fastcgi.o:       fastcgi.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi.c
- 
- fastcgi_wrappers.o:       fastcgi_wrappers.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi_wrappers.c
- 
- # Make a module
- clisp-module : all
diff --git a/dev-lisp/clisp/files/2.38/install-clc.lisp b/dev-lisp/clisp/files/2.38/install-clc.lisp
deleted file mode 100644
index 06cb217d32cf..000000000000
--- a/dev-lisp/clisp/files/2.38/install-clc.lisp
+++ /dev/null
@@ -1,15 +0,0 @@
-;;;; -*- Mode: Lisp; Package: CL-USER -*-
-;;;; Copyright (c) 2004 Kevin M. Rosenberg
-;;;; GNU GPL v2 license
-
-(in-package #:cl-user)
-
-(handler-case
-    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
-  (error (e)
-    (format t "Error during loading of common-lisp-controller.lisp: ~A~%" e)))
-
-(handler-case
-    (common-lisp-controller:init-common-lisp-controller-v4 "clisp")
-  (error (e)
-    (format t "Error during init-common-lisp-controller-v4: ~A~%" e)))
diff --git a/dev-lisp/clisp/files/2.39/README.Gentoo b/dev-lisp/clisp/files/2.39/README.Gentoo
deleted file mode 100644
index 6bec925fb0d3..000000000000
--- a/dev-lisp/clisp/files/2.39/README.Gentoo
+++ /dev/null
@@ -1,11 +0,0 @@
-                                                            -*-outline-*-
-
-* Gentoo Specific Notes
-
-The CLISP port for Gentoo uses Common Lisp Controller related code
-(install-clc.lisp and clisp.sh) from Debian.  This code contains the following
-copyright:
-
-    ;;;; Copyright (c) 2004 Kevin M. Rosenberg
-    ;;;; GNU GPL v2 license
-
diff --git a/dev-lisp/clisp/files/2.39/clisp.sh b/dev-lisp/clisp/files/2.39/clisp.sh
deleted file mode 100644
index f5ed6a1d8fce..000000000000
--- a/dev-lisp/clisp/files/2.39/clisp.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2002 Kevin M. Rosenberg
-# GNU GPL v2 license
- 
-if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then
-  echo "*** Can't find common-lisp-controller.lisp ***" >&2
-  echo "Please report this as a bug" &>2
-  exit 1
-fi
-
-clisp_dir=/usr/lib/clisp
-clc_lib_dir=/usr/lib/common-lisp/clisp
-
-builder=/usr/bin/clisp
-old_mem=$clisp_dir/full/lispinit.mem
-new_mem=$clisp_dir/full/lispinit-new.mem
-clean_mem=$clisp_dir/full/lispinit-clean.mem
-
-lisp_error()
-{
-    echo "Error running $builder" >&2
-    exit 1
-}
-
-mem_error()
-{
-    echo "Error moving new lisp image $new_mem" >&2
-    exit 1
-}
-
-
-case $1 in
-    rebuild)
-	echo $0 Rebuilding packages...
-	shift
-	while [ -x $builder ] && [ ! -z "$1" ] ; do
-	    echo ...rebuilding $1
-	    $builder -norc -q -M $old_mem -x "
-(let ((*compile-print* nil)
-      (*compile-progress* nil)
-      (*compile-verbose*  nil)
-      (*require-verbose* nil)
-      (*load-verbose* nil) 
-      (mk::*load-source-if-no-binary* nil)
-      (mk::*bother-user-if-no-binary* nil)
-      (mk::*compile-during-load* t))
-   (handler-case
-      (progn
-         (c-l-c:compile-library (quote $1))
-         (ext:exit 0)
-       )
-    (error (e)
-      (ignore-errors (format t \"~&Build error: ~A~%\" e))
-      (finish-output)
-      (ext:exit 1))))"  || exit 1
-	    shift
-	done 
-	;;
-    remove)
-	echo $0 Removing packages...
-	shift
-	while [ ! -z "$1" ] ; do
-	    echo ...removing package $1
-	    rm -rf "${clc_lib_dir}/$1"
-	    shift
-	done
-	rmdir $clc_lib_dir 2> /dev/null 
-	;;
-    install-clc)
-	echo Installing clc...
-	if [ ! -f $clean_mem ]; then
-	    cp $old_mem $clean_mem
-	fi
-	if [ -x $clisp_dir/$lisp_builder ]; then
-	    $builder -norc -q -M $clean_mem \
-		-x "
-(handler-case
-  (progn 
-    (when (find-package :c-l-c) ; have to remove 
-      (delete-package :c-l-c))  ; for clisp workaround
-    (load \"$clisp_dir/install-clc.lisp\") 
-    (saveinitmem \"${new_mem}\")
-    (ext:exit 0))
-  (error (e)
-    (ignore-errors (format t \"~&install-clc error: ~A~%\" e))
-    (finish-output)
-    (ext:exit 1)))"   || lisp_error
-  	    mv $new_mem $old_mem || mem_error
-	fi
-	;;
-    remove-clc)
-	if [ -f $clean_mem ]; then
-	    cp $clean_mem $old_mem
-	else
-	    echo "Warning: Can't find original image file $clean_mem. Aborting." >& 2
-	fi
-	;;
-    make-user-image)
-	if [ ! -f $2 ] ; then 
-	    echo "Trying to make-user image, but can not find file $2" >&2
-	    exit 1
-	fi 
-	$builder -norc -q -M $old_mem \
-	    -x "(progn    
-  (load \"$2\") 
-  (saveinitmem \"${new_mem}\"))
-  (ext:exit 0)" || lisp_error
-	mv $new_mem $old_mem || mem_error
-	;;
-    *)
-	echo "`basename $0`: Unknown command $1" >&2
-	echo "Known commands are:" >&2 
-	echo "install-clc, remove-clc, rebuild, remove, and make-user-image" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/dev-lisp/clisp/files/2.39/fastcgi-Makefile-gentoo.patch b/dev-lisp/clisp/files/2.39/fastcgi-Makefile-gentoo.patch
deleted file mode 100644
index 982ec67458ef..000000000000
--- a/dev-lisp/clisp/files/2.39/fastcgi-Makefile-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur clisp-2.39.orig/modules/fastcgi/Makefile.in clisp-2.39/modules/fastcgi/Makefile.in
---- clisp-2.39.orig/modules/fastcgi/Makefile.in	2004-08-12 09:38:36.000000000 -0500
-+++ clisp-2.39/modules/fastcgi/Makefile.in	2006-04-24 15:14:38.000000000 -0500
-@@ -23,10 +23,10 @@
- 	$(CLISP) -c fastcgi.lisp
- 
- fastcgi.o:       fastcgi.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi.c
- 
- fastcgi_wrappers.o:       fastcgi_wrappers.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi_wrappers.c
- 
- # Make a module
- clisp-module : all
diff --git a/dev-lisp/clisp/files/2.39/install-clc.lisp b/dev-lisp/clisp/files/2.39/install-clc.lisp
deleted file mode 100644
index 06cb217d32cf..000000000000
--- a/dev-lisp/clisp/files/2.39/install-clc.lisp
+++ /dev/null
@@ -1,15 +0,0 @@
-;;;; -*- Mode: Lisp; Package: CL-USER -*-
-;;;; Copyright (c) 2004 Kevin M. Rosenberg
-;;;; GNU GPL v2 license
-
-(in-package #:cl-user)
-
-(handler-case
-    (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")
-  (error (e)
-    (format t "Error during loading of common-lisp-controller.lisp: ~A~%" e)))
-
-(handler-case
-    (common-lisp-controller:init-common-lisp-controller-v4 "clisp")
-  (error (e)
-    (format t "Error during init-common-lisp-controller-v4: ~A~%" e)))
diff --git a/dev-lisp/clisp/files/2.41-fastcgi-Makefile-gentoo.patch b/dev-lisp/clisp/files/2.41-fastcgi-Makefile-gentoo.patch
deleted file mode 100644
index 9e8af6e11ca0..000000000000
--- a/dev-lisp/clisp/files/2.41-fastcgi-Makefile-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur clisp-2.41.orig/modules/fastcgi/Makefile.in clisp-2.41/modules/fastcgi/Makefile.in
---- clisp-2.41.orig/modules/fastcgi/Makefile.in	2004-08-12 09:38:36.000000000 -0500
-+++ clisp-2.41/modules/fastcgi/Makefile.in	2006-04-24 15:14:38.000000000 -0500
-@@ -23,10 +23,10 @@
- 	$(CLISP) -c fastcgi.lisp
- 
- fastcgi.o:       fastcgi.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi.c
- 
- fastcgi_wrappers.o:       fastcgi_wrappers.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDES) -I.. -c fastcgi_wrappers.c
- 
- # Make a module
- clisp-module : all
diff --git a/dev-lisp/clisp/files/2.41-fastcgi-build.patch b/dev-lisp/clisp/files/2.41-fastcgi-build.patch
deleted file mode 100644
index 05206f1acf9a..000000000000
--- a/dev-lisp/clisp/files/2.41-fastcgi-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- clisp-2.41.orig/modules/fastcgi/fastcgi.lisp	2006-10-13 05:02:24.000000000 +0200
-+++ clisp-2.41/modules/fastcgi/fastcgi.lisp	2007-09-08 11:58:49.000000000 +0200
-@@ -147,6 +147,9 @@
- 
- ; --------------   "C" functions
- ;(c-lines "#include \"fastcgi.h\"~%"); completely wrapped
-+(eval-when (compile)
-+  ;;NB this global affects further compilations in this session
-+  (setq ffi:*output-c-functions* t))
- 
- ; Our wrappers
- (def-call-out fcgi_getenv       (:arguments (var c-string))               (:return-type c-string))
diff --git a/dev-lisp/clisp/files/2.41-linux-headers.patch b/dev-lisp/clisp/files/2.41-linux-headers.patch
deleted file mode 100644
index 6da6eefafe88..000000000000
--- a/dev-lisp/clisp/files/2.41-linux-headers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-2007-05-20  Bruno Haible  <bruno@clisp.org>
-
-	* unix.d [UNIX_LINUX && UNIX_GNU]: Don't include <asm/page.h>.
-	* lispbibl.d (UNIX_GNU): Move definition down.
-	Reported by Ulrich Müller <ulm@gentoo.org>.
-
---- src/unix.d	2006/05/23 12:32:25	1.76
-+++ src/unix.d	2007/05/20 13:59:43	1.77
-@@ -174,7 +174,7 @@
-   #ifdef UNIX_AUX
-     #include <sys/mmu.h> /* for SHMLBA */
-   #endif
--  #ifdef UNIX_LINUX
-+  #if defined(UNIX_LINUX) && !defined(UNIX_GNU)
-     #include <asm/page.h> /* for SHMLBA on Linux 2.0 */
-   #endif
-   #if defined(UNIX_SUNOS4) || defined(UNIX_SUNOS5)
---- src/lispbibl.d	2007/04/05 01:56:47	1.718
-+++ src/lispbibl.d	2007/05/20 22:49:59	1.719
-@@ -376,9 +376,6 @@
- #if defined(UNIX_MACOSX) && defined(HAVE_MSYNC)
-   #define UNIX_DARWIN  # MacOS X, a.k.a. Darwin
- #endif
--#if (__GLIBC__ >= 2)
--  #define UNIX_GNU # glibc2 (may be UNIX_LINUX, UNIX_HURD or UNIX_FREEBSD)
--#endif
- 
- 
- # Choose the character set:
-@@ -1267,6 +1264,12 @@
- 
- #include <stdio.h>    /* libc i/o */
- 
-+# A more precise classification of the operating system:
-+# (This test works only after at least one system header has been included.)
-+#if (__GLIBC__ >= 2)
-+  #define UNIX_GNU # glibc2 (may be UNIX_LINUX, UNIX_HURD or UNIX_FREEBSD)
-+#endif
-+
- # Determine the offset of a component 'ident' in a struct of the type 'type':
- # See 0 as pointer to 'type', put a struct 'type' there and determine the
- # address of its component 'ident' and return it as number: