gentoo resync : 29.05.2018

9 files changed, 2 insertions, 492 deletions

diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index ac9582a6aa6b..20c6443cad1a 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -1,19 +1,8 @@
-AUX 20e-customize-lisp-implementation-version.patch 683 BLAKE2B 6b74ff9dc89c8adb1e039a7cc82492f2ea8500f52c7b99d845e45acfe9fad856baef8bdfe1e2e11f8ed9e28af0614eb16dd5c15a9b7852425a9c1a0686ddc27d SHA512 77acf6d31d8a932075b61e90b42b2c74648ad29ef3cf2f98e69a44f957672a935ea88a541815c19bf71ba5e64c587d27878288038178a7ad3d96144a26b1bb2b
-AUX 20e-execstack-fixes.patch 3990 BLAKE2B 962e4aa31d703128e871c39bafb1be7e42be56619c8c803e745a68a0b94faa43c392b78e96d4a10758dd564c3e1791bed103edcbf986717960c1129e7f019de9 SHA512 bb32dfffa6b737af8be924f194112863b64010b00b30caf92c023a16ac1d2884f51ee724b57cdeb2786f10aad6bd0054a835c94f03b911eca4648c2e5927ce3b
-AUX 21a-build.patch 733 BLAKE2B 23e1ea951e0cbf12d7886b42f403fc09d3686c7309f3553cc906bc2dede07188af31619ddbc17eafdb2c48d63aeb851de0f7a0f569411de5838cf32d7f61d414 SHA512 ca84e1e54ddbd0aa9e5e68da02be3d97c0746477f1dc3680503879cbfd3b875b23c2b96b77cf07c786de22f6a05d83afc7b267a1f30cfea4320f1c29c40bb1ef
-AUX 21a-customize-lisp-implementation-version.patch 683 BLAKE2B 6b74ff9dc89c8adb1e039a7cc82492f2ea8500f52c7b99d845e45acfe9fad856baef8bdfe1e2e11f8ed9e28af0614eb16dd5c15a9b7852425a9c1a0686ddc27d SHA512 77acf6d31d8a932075b61e90b42b2c74648ad29ef3cf2f98e69a44f957672a935ea88a541815c19bf71ba5e64c587d27878288038178a7ad3d96144a26b1bb2b
-AUX 21a-execstack-fixes.patch 3990 BLAKE2B 962e4aa31d703128e871c39bafb1be7e42be56619c8c803e745a68a0b94faa43c392b78e96d4a10758dd564c3e1791bed103edcbf986717960c1129e7f019de9 SHA512 bb32dfffa6b737af8be924f194112863b64010b00b30caf92c023a16ac1d2884f51ee724b57cdeb2786f10aad6bd0054a835c94f03b911eca4648c2e5927ce3b
 AUX cmucl-21c-build.patch 733 BLAKE2B 51df14314e979b919ff307aa2b165106bf7d977cee7dee1002bc89cee9f8b175494ca2d9e7b1a87447b3c11e944a75ec58af661d54adeceef61a8a4c5435824b SHA512 ca4bab7ac344ef83064081252e30d4704fe5f3006f58e90024cd51a02ab82341c651ec4117e8b14912b071d730acee76e330e237e7942597bb73b94eb73fbdda
 AUX cmucl-21c-execstack-fixes.patch 3990 BLAKE2B 962e4aa31d703128e871c39bafb1be7e42be56619c8c803e745a68a0b94faa43c392b78e96d4a10758dd564c3e1791bed103edcbf986717960c1129e7f019de9 SHA512 bb32dfffa6b737af8be924f194112863b64010b00b30caf92c023a16ac1d2884f51ee724b57cdeb2786f10aad6bd0054a835c94f03b911eca4648c2e5927ce3b
 AUX cmuclrc 305 BLAKE2B 1943c5ca8f43ce890e37949fa71cbeb24a5f849c827b3e05ec240ce22527b3bea550eaf9a74c1e98f2a9c7adda4f2caf84341cf1f42e6a26f17d784769ef1f62 SHA512 36ae348795f27a7aae2e1cf10376606b9a6898b4c4f0e6da692b3e60bed21e2825ac766a51fb648f1365b238046efd155e80d70421ff65ecffe5b68342895740
 AUX site-init.lisp.in 1839 BLAKE2B d4bd6da1c3d0902b96af4abac48f981f21d4494f3da6dab9d398c3af873c4fbf23a6c9cda878099a522787875e3882fc635859253769f56d6275721bea0a7853 SHA512 374e5acf970b1bd26d2318b678cba509296f2356a4672648f8522387c216288e8f43b514004b0d0c98da5d03a5db10435d5f42f57db88c916691eb4ae93f126a
-DIST cmucl-20e-x86-linux.tar.bz2 18861880 BLAKE2B ed7b2dec86305ab2ad78ca5a84f0380044211e7cacf67f297c17c26d0a0a344d53c0404d82c86415dd923b92920cbd873436d925417f3590ac3a4c88d919b231 SHA512 1eee852b2a11733d0fac2c046137ccd099370bf208be71becc03710e832510b288768f557e326b1ce95cba16490413142e607fd71346e20e5f8592b51d86b0fe
-DIST cmucl-21a-x86-linux.tar.bz2 10870693 BLAKE2B a4fb258cef17eaf281ffd1fdff7f5e953b650c45822ed94722e4df5065b41a53cd0a9f481fba9ac38824dab4952bbb6d45e432b37fe73142c2ead1c8a4b17141 SHA512 7f7d327e47b01dcee1cbb05aae826ef7c64d4d192d7d32d1aba51c8839a06d65942fff5d4c7dbccc955e1e233d2065d83d078266327caee07201e9dce59c39ee
 DIST cmucl-21c-x86-linux.tar.bz2 11127872 BLAKE2B b9089a40b4a0738f9faccdfddb7b33256a561a07cedc3ef9b3ec7afddbbb9de493c2ffb9af4a8d6b6ce70ef857576870901a6b7a607f52bdaf8a0f53ddd2d07e SHA512 9097220aef612aa3d8367a86a86dc62d86d918190d2688f6e90d415c9f9d881f97f0829e9d310f700b014821d30bf5a15f7a05cdb9201c9deab10a7231e0bcb6
-DIST cmucl-src-20e.tar.bz2 6147575 BLAKE2B a9f31b9a34c513dc88d935e18b9a07854d024d236f1f0294f888c84fd4b781afcd99a3cceac148edd1d1fe6c2dc00c5c8de4069d84b227872e376422275b6984 SHA512 d04f6ac7335572198d37d5df00934edfc82495294446cc5420dada4f2df44009f0983b438d6f10ce5bb02e46fd89df985da5eee3e91a6a75d98e9f86240c0dcc
-DIST cmucl-src-21a.tar.bz2 8195492 BLAKE2B 5ca24e1ee258b52b805ab933e80915da6af022d47f8171327e318edb28d9f87c8901fe10ea48d54b6737a808cb03b08f8d3db41688b347971147b991570752cc SHA512 74b077732030dbc3681aadcf9c802fd5b399362c9653b972063e49eb0a2ad528d02d6dde74107210c94c94dc7e9664472c2d072a6ae6f75e7e8c4cf847987e3b
 DIST cmucl-src-21c.tar.bz2 6947775 BLAKE2B 828075c71ddf459d09076199af4a02f2294063bd9ef0beb6d4bcbb473dd0ff8cfdff7faa9416f640e125603301fa37c73a280db597bf4301c22fbe88c4cc2dbb SHA512 98ea0516b71af7c6f92b5f67f6c1545949fcd1dc95e1238a989c1c2858a75e2751e5eb765b29812ad5cc5de015333787dac2a63a9ddea9bb83cfd72fef6794f4
-EBUILD cmucl-20e.ebuild 2752 BLAKE2B f0d23811dc58cddcade06c9d1c9a33547545b3a945ebf481d14655004746597c605b5139bd3e94203937176e12bbc78069f88f02b6854c0212cd4e6228e745ce SHA512 0034c000d0001a3820efa94613c7f4eb2be373a251b0c4de1b1d9e8f4a469f407af9ad6b65fc39cba7b3332b7492b8dc46dee9d74ad59d0b9d930fd9e0dedcf1
-EBUILD cmucl-21a.ebuild 2619 BLAKE2B 82f91e907e8dcfda188b091bedccdd37a039711be1dd0b5cde27e66d5d1d3ec1f83b5881c8c696bbb41c21dcd965f4aace46fee76f00e9940815420d5f501f39 SHA512 aca74badee7e617d1a0571bbfd45fea92896579eb956c022d985de3c93e1deecef4d5fe798fefc801dd49fef7a917b913f11caaeba9d886562780b0324381978
-EBUILD cmucl-21c.ebuild 3011 BLAKE2B 87a43c5e6972b5e46f488475678f8b05ef0374c88822296ae8df93546ecb3cb6bb6cf2d2aeff833d7054f480a2d85b7007730572923f4d9558a22710d0afbabb SHA512 186470dfa6328e3b4050f0c46cf374b3a9833d704e9e3ecc2780ee87ebae053a0d5feb6afca63bc60a23c9cd4a317f01414cda3a977c00ad638c202d4b8641e4
+EBUILD cmucl-21c.ebuild 3010 BLAKE2B 531d2db1b0f1b1c96eb2a43c49e76ae75c2fa6c3a611b558c539f5d136484683e0c50e22305820786b14963144531ede1a98a6dd62aba29f9f8395b05ac77447 SHA512 946baf5f68faf88410816aca55859b69256c12b4a9524c8736a773429e240febfae906c98e11a0ab0444c0358d67da85d14e4fea41a51a6960134d133e12d35b
 MISC metadata.xml 1392 BLAKE2B b301abf6448e0cd35a3dfc4c500666daabddc0d76c5b9f544963f19e8296e8a194cbc8bcdc542279ee120ab3b68d01af6626c76bb631cb12aaf41cbfc97c3759 SHA512 7e5316859890925b1e197d93339ea13067dd72a3e8d450163ea23d73656c9d203ccbbb731e762fa9def713f1debf610377620a1a2f9939e38d067b2f8e960551
diff --git a/dev-lisp/cmucl/cmucl-20e.ebuild b/dev-lisp/cmucl/cmucl-20e.ebuild
deleted file mode 100644
index 9e122b9a2c9f..000000000000
--- a/dev-lisp/cmucl/cmucl-20e.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs multilib
-
-MY_PV=${PV:0:3}
-
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://www.cons.org/cmucl/"
-SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
-	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="X source cpu_flags_x86_sse2"
-
-CDEPEND=">=dev-lisp/asdf-2.33-r3:=
-		 x11-libs/motif:0"
-DEPEND="${CDEPEND}
-		sys-devel/bc"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"
-
-TARGET=linux-4
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
-	epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
-
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die
-}
-
-src_compile() {
-	local cmufpu cmuopts
-
-	if use cpu_flags_x86_sse2; then
-		cmufpu=sse2
-	else
-		cmufpu=x87
-	fi
-
-	if use X; then
-		cmuopts="-f ${cmufpu}"
-	else
-		cmuopts="-u -f ${cmufpu}"
-	fi
-
-	local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cmufpu}.core -noinit -nositeinit -batch"
-
-	env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler"
-
-	# Compile up the asdf and defsystem modules
-	${TARGET}/lisp/lisp -noinit -nositeinit -batch << EOF || die
-(in-package :cl-user)
-(setf (ext:search-list "target:")
-	  '("$TARGET/" "src/"))
-(setf (ext:search-list "modules:")
-	  '("target:contrib/"))
-
-(compile-file "modules:asdf/asdf")
-(compile-file "modules:defsystem/defsystem")
-EOF
-}
-
-src_install() {
-	env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \
-		bin/make-dist.sh -S -g -G root -O root ${TARGET} ${MY_PV} x86 linux \
-		|| die "Cannot build installation archive"
-	# Necessary otherwise tar will fail
-	dodir /usr
-	pushd "${D}"/usr > /dev/null
-	tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \
-		|| die "Cannot install main system"
-	if use X ; then
-		tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \
-			|| die "Cannot install extra files"
-	fi
-	if use source; then
-		# Necessary otherwise tar will fail
-		dodir /usr/share/common-lisp/source/${PN}
-		cd "${D}"/usr/share/common-lisp/source/${PN}
-		tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
-			|| die "Cannot install sources"
-	fi
-	popd > /dev/null
-
-	# Install site config file
-	sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
-		< "${FILESDIR}"/site-init.lisp.in \
-		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
-		|| die "Cannot fix site-init.lisp"
-	insinto /etc/common-lisp
-	doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
-}
diff --git a/dev-lisp/cmucl/cmucl-21a.ebuild b/dev-lisp/cmucl/cmucl-21a.ebuild
deleted file mode 100644
index f3f9b830b735..000000000000
--- a/dev-lisp/cmucl/cmucl-21a.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs multilib
-
-MY_PV=${PV:0:3}
-
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://www.cons.org/cmucl/"
-SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
-	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="X source"
-
-CDEPEND=">=dev-lisp/asdf-2.33-r3:=
-		 x11-libs/motif:0"
-DEPEND="${CDEPEND}
-		sys-devel/bc"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"
-
-TARGET=linux-4
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
-	epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
-	epatch "${FILESDIR}"/${MY_PV}-build.patch
-
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die
-}
-
-src_compile() {
-	local cmuopts buildimage
-
-	if use X; then
-		cmuopts=""
-	else
-		cmuopts="-u"
-	fi
-
-	buildimage="bin/lisp -batch"
-
-	env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler"
-
-	# Compile up the asdf and defsystem modules
-	${TARGET}/lisp/lisp -noinit -nositeinit -batch << EOF || die
-(in-package :cl-user)
-(setf (ext:search-list "target:")
-	  '("$TARGET/" "src/"))
-(setf (ext:search-list "modules:")
-	  '("target:contrib/"))
-
-(compile-file "modules:asdf/asdf")
-(compile-file "modules:defsystem/defsystem")
-EOF
-}
-
-src_install() {
-	env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \
-		bin/make-dist.sh -S -g -G root -O root ${TARGET} ${MY_PV} x86 linux \
-		|| die "Cannot build installation archive"
-	# Necessary otherwise tar will fail
-	dodir /usr
-	pushd "${D}"/usr > /dev/null
-	tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \
-		|| die "Cannot install main system"
-	if use X ; then
-		tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \
-			|| die "Cannot install extra files"
-	fi
-	if use source; then
-		# Necessary otherwise tar will fail
-		dodir /usr/share/common-lisp/source/${PN}
-		cd "${D}"/usr/share/common-lisp/source/${PN}
-		tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
-			|| die "Cannot install sources"
-	fi
-	popd > /dev/null
-
-	# Install site config file
-	sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
-		< "${FILESDIR}"/site-init.lisp.in \
-		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
-		|| die "Cannot fix site-init.lisp"
-	insinto /etc/common-lisp
-	doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
-}
diff --git a/dev-lisp/cmucl/cmucl-21c.ebuild b/dev-lisp/cmucl/cmucl-21c.ebuild
index e2175b108c1d..1970e290a1c6 100644
--- a/dev-lisp/cmucl/cmucl-21c.ebuild
+++ b/dev-lisp/cmucl/cmucl-21c.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-s
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="X doc source"
 
 CDEPEND=">=dev-lisp/asdf-2.33-r3:=
diff --git a/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch
deleted file mode 100644
index 8fc9278af87d..000000000000
--- a/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
---- cmucl.orig/src/code/misc.lisp	2011-10-25 05:31:39.000000000 +0200
-+++ cmucl/src/code/misc.lisp	2012-01-31 21:46:49.441273068 +0100
-@@ -187,8 +187,10 @@
- 
- (defun lisp-implementation-version ()
-   "Returns a string describing the implementation version."
--  (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
--	  #+unicode _" Unicode" #-unicode ""))
-+  (format nil "~X~A~A"
-+          c:byte-fasl-file-version
-+          #+unicode "-unicode" #-unicode ""
-+          *lisp-implementation-version*))
- 
- (defun machine-instance ()
-   "Returns a string giving the name of the local machine."
diff --git a/dev-lisp/cmucl/files/20e-execstack-fixes.patch b/dev-lisp/cmucl/files/20e-execstack-fixes.patch
deleted file mode 100644
index 034848d64a26..000000000000
--- a/dev-lisp/cmucl/files/20e-execstack-fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
---- work.old/src/lisp/alpha-assem.S	2003-03-06 11:13:09.000000000 -0300
-+++ work/src/lisp/alpha-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -297,3 +297,7 @@
- function_end_breakpoint_end:
- 
- 
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
---- work.old/src/lisp/amd64-assem.S	2004-07-27 19:03:53.000000000 -0300
-+++ work/src/lisp/amd64-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -1051,3 +1051,7 @@
- 	.end
- 
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
---- work.old/src/lisp/backtrace.c	2009-06-11 13:04:01.000000000 -0300
-+++ work/src/lisp/backtrace.c	2010-05-10 00:06:22.000000000 -0300
-@@ -3,6 +3,8 @@
-  * Simple backtrace facility.  More or less from Rob's lisp version.
-  */
- 
-+#include "os-common.h"
-+
- #include <stdio.h>
- #include <signal.h>
- #include "lisp.h"
-diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
---- work.old/src/lisp/hppa-assem.S	2002-08-23 14:05:35.000000000 -0300
-+++ work/src/lisp/hppa-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -460,3 +460,7 @@
- 
- 	.export	function_end_breakpoint_end
- function_end_breakpoint_end
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
---- work.old/src/lisp/linux-stubs.S	2005-08-17 00:40:16.000000000 -0300
-+++ work/src/lisp/linux-stubs.S	2010-05-10 00:06:34.000000000 -0300
-@@ -995,3 +995,7 @@
- /*  doe(yperr_string) */
- /*  doe(ypprot_err) */
- #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
---- work.old/src/lisp/lisp.c	2009-07-13 16:41:54.000000000 -0300
-+++ work/src/lisp/lisp.c	2010-05-10 00:05:55.000000000 -0300
-@@ -5,6 +5,9 @@
-  *
-  */
- 
-+#include "os-common.h"
-+#include <time.h>
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <limits.h>
-diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
---- work.old/src/lisp/mips-assem.S	2002-08-23 14:01:02.000000000 -0300
-+++ work/src/lisp/mips-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -402,3 +402,7 @@
- 	move	v0, a1
- 	j	_restore_state
- 	.end	save_state
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
---- work.old/src/lisp/os-common.h	1969-12-31 21:00:00.000000000 -0300
-+++ work/src/lisp/os-common.h	2010-05-10 00:06:22.000000000 -0300
-@@ -0,0 +1 @@
-+char* convert_lisp_string(char *c_string, void *lisp_string, int len);
-diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
---- work.old/src/lisp/ppc-assem.S	2006-02-25 01:35:58.000000000 -0300
-+++ work/src/lisp/ppc-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -721,3 +721,7 @@
- 	SET_SIZE(fpu_restore)
- 	
- #endif
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
---- work.old/src/lisp/sparc-assem.S	2003-10-23 23:57:00.000000000 -0300
-+++ work/src/lisp/sparc-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -837,3 +837,7 @@
-  * End:
-  */						
- 		
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
---- work.old/src/lisp/x86-assem.S	2008-12-24 02:36:40.000000000 -0200
-+++ work/src/lisp/x86-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -798,3 +798,7 @@
- ENDFUNC(undefined_foreign_symbol_trap)
- 
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/dev-lisp/cmucl/files/21a-build.patch b/dev-lisp/cmucl/files/21a-build.patch
deleted file mode 100644
index 464234109b32..000000000000
--- a/dev-lisp/cmucl/files/21a-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -r -U2 21a.orig/bin/build.sh 21a/bin/build.sh
---- 21a.orig/bin/build.sh	2015-05-19 07:42:40.000000000 +0600
-+++ 21a/bin/build.sh	2016-04-03 20:54:08.597016537 +0600
-@@ -40,5 +40,5 @@
- ENABLE4="yes"
- 
--version=20f
-+version=21a
- SRCDIR=src
- BINDIR=bin
-@@ -145,10 +145,9 @@
- 	$TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; }
- 
--	$TARGET/lisp/lisp -batch -noinit -nositeinit $FPU_MODE < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; }
-+	$TARGET/lisp/lisp -batch -noinit -nositeinit < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit"; exit 1; }
- 	return 0;
-     fi
- }
- 
--FPU_MODE=
- BUILDWORLD="$TOOLDIR/build-world.sh"
- BUILD_POT="yes"
diff --git a/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch
deleted file mode 100644
index 8fc9278af87d..000000000000
--- a/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
---- cmucl.orig/src/code/misc.lisp	2011-10-25 05:31:39.000000000 +0200
-+++ cmucl/src/code/misc.lisp	2012-01-31 21:46:49.441273068 +0100
-@@ -187,8 +187,10 @@
- 
- (defun lisp-implementation-version ()
-   "Returns a string describing the implementation version."
--  (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
--	  #+unicode _" Unicode" #-unicode ""))
-+  (format nil "~X~A~A"
-+          c:byte-fasl-file-version
-+          #+unicode "-unicode" #-unicode ""
-+          *lisp-implementation-version*))
- 
- (defun machine-instance ()
-   "Returns a string giving the name of the local machine."
diff --git a/dev-lisp/cmucl/files/21a-execstack-fixes.patch b/dev-lisp/cmucl/files/21a-execstack-fixes.patch
deleted file mode 100644
index 034848d64a26..000000000000
--- a/dev-lisp/cmucl/files/21a-execstack-fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
---- work.old/src/lisp/alpha-assem.S	2003-03-06 11:13:09.000000000 -0300
-+++ work/src/lisp/alpha-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -297,3 +297,7 @@
- function_end_breakpoint_end:
- 
- 
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
---- work.old/src/lisp/amd64-assem.S	2004-07-27 19:03:53.000000000 -0300
-+++ work/src/lisp/amd64-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -1051,3 +1051,7 @@
- 	.end
- 
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
---- work.old/src/lisp/backtrace.c	2009-06-11 13:04:01.000000000 -0300
-+++ work/src/lisp/backtrace.c	2010-05-10 00:06:22.000000000 -0300
-@@ -3,6 +3,8 @@
-  * Simple backtrace facility.  More or less from Rob's lisp version.
-  */
- 
-+#include "os-common.h"
-+
- #include <stdio.h>
- #include <signal.h>
- #include "lisp.h"
-diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
---- work.old/src/lisp/hppa-assem.S	2002-08-23 14:05:35.000000000 -0300
-+++ work/src/lisp/hppa-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -460,3 +460,7 @@
- 
- 	.export	function_end_breakpoint_end
- function_end_breakpoint_end
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
---- work.old/src/lisp/linux-stubs.S	2005-08-17 00:40:16.000000000 -0300
-+++ work/src/lisp/linux-stubs.S	2010-05-10 00:06:34.000000000 -0300
-@@ -995,3 +995,7 @@
- /*  doe(yperr_string) */
- /*  doe(ypprot_err) */
- #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
---- work.old/src/lisp/lisp.c	2009-07-13 16:41:54.000000000 -0300
-+++ work/src/lisp/lisp.c	2010-05-10 00:05:55.000000000 -0300
-@@ -5,6 +5,9 @@
-  *
-  */
- 
-+#include "os-common.h"
-+#include <time.h>
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <limits.h>
-diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
---- work.old/src/lisp/mips-assem.S	2002-08-23 14:01:02.000000000 -0300
-+++ work/src/lisp/mips-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -402,3 +402,7 @@
- 	move	v0, a1
- 	j	_restore_state
- 	.end	save_state
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
---- work.old/src/lisp/os-common.h	1969-12-31 21:00:00.000000000 -0300
-+++ work/src/lisp/os-common.h	2010-05-10 00:06:22.000000000 -0300
-@@ -0,0 +1 @@
-+char* convert_lisp_string(char *c_string, void *lisp_string, int len);
-diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
---- work.old/src/lisp/ppc-assem.S	2006-02-25 01:35:58.000000000 -0300
-+++ work/src/lisp/ppc-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -721,3 +721,7 @@
- 	SET_SIZE(fpu_restore)
- 	
- #endif
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
---- work.old/src/lisp/sparc-assem.S	2003-10-23 23:57:00.000000000 -0300
-+++ work/src/lisp/sparc-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -837,3 +837,7 @@
-  * End:
-  */						
- 		
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
---- work.old/src/lisp/x86-assem.S	2008-12-24 02:36:40.000000000 -0200
-+++ work/src/lisp/x86-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -798,3 +798,7 @@
- ENDFUNC(undefined_foreign_symbol_trap)
- 
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif