dev-lisp/cmucl: Cleanup patches

5 files changed, 11 insertions, 28 deletions

diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index babf0a3c..2182f698 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -1,9 +1,8 @@
 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 21c-build.patch 733 BLAKE2B 51df14314e979b919ff307aa2b165106bf7d977cee7dee1002bc89cee9f8b175494ca2d9e7b1a87447b3c11e944a75ec58af661d54adeceef61a8a4c5435824b SHA512 ca4bab7ac344ef83064081252e30d4704fe5f3006f58e90024cd51a02ab82341c651ec4117e8b14912b071d730acee76e330e237e7942597bb73b94eb73fbdda
-AUX 21c-customize-lisp-implementation-version.patch 683 BLAKE2B 6b74ff9dc89c8adb1e039a7cc82492f2ea8500f52c7b99d845e45acfe9fad856baef8bdfe1e2e11f8ed9e28af0614eb16dd5c15a9b7852425a9c1a0686ddc27d SHA512 77acf6d31d8a932075b61e90b42b2c74648ad29ef3cf2f98e69a44f957672a935ea88a541815c19bf71ba5e64c587d27878288038178a7ad3d96144a26b1bb2b
-AUX 21c-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-21a-x86-linux.tar.bz2 10870693 BLAKE2B a4fb258cef17eaf281ffd1fdff7f5e953b650c45822ed94722e4df5065b41a53cd0a9f481fba9ac38824dab4952bbb6d45e432b37fe73142c2ead1c8a4b17141 SHA512 7f7d327e47b01dcee1cbb05aae826ef7c64d4d192d7d32d1aba51c8839a06d65942fff5d4c7dbccc955e1e233d2065d83d078266327caee07201e9dce59c39ee
@@ -11,5 +10,5 @@ DIST cmucl-21c-x86-linux.tar.bz2 11127872 BLAKE2B b9089a40b4a0738f9faccdfddb7b33
 DIST cmucl-src-21a.tar.bz2 8195492 BLAKE2B 5ca24e1ee258b52b805ab933e80915da6af022d47f8171327e318edb28d9f87c8901fe10ea48d54b6737a808cb03b08f8d3db41688b347971147b991570752cc SHA512 74b077732030dbc3681aadcf9c802fd5b399362c9653b972063e49eb0a2ad528d02d6dde74107210c94c94dc7e9664472c2d072a6ae6f75e7e8c4cf847987e3b
 DIST cmucl-src-21c.tar.bz2 6947775 BLAKE2B 828075c71ddf459d09076199af4a02f2294063bd9ef0beb6d4bcbb473dd0ff8cfdff7faa9416f640e125603301fa37c73a280db597bf4301c22fbe88c4cc2dbb SHA512 98ea0516b71af7c6f92b5f67f6c1545949fcd1dc95e1238a989c1c2858a75e2751e5eb765b29812ad5cc5de015333787dac2a63a9ddea9bb83cfd72fef6794f4
 EBUILD cmucl-21a.ebuild 2619 BLAKE2B 82f91e907e8dcfda188b091bedccdd37a039711be1dd0b5cde27e66d5d1d3ec1f83b5881c8c696bbb41c21dcd965f4aace46fee76f00e9940815420d5f501f39 SHA512 aca74badee7e617d1a0571bbfd45fea92896579eb956c022d985de3c93e1deecef4d5fe798fefc801dd49fef7a917b913f11caaeba9d886562780b0324381978
-EBUILD cmucl-21c.ebuild 3085 BLAKE2B f307052f1c4de8cccacc20144a178e06e2fb0365954ee62f3f1da2a697ef9479bef88ae8b9bb3518a7bb174a59d78f38b992429e08c935d1b0666303aa9fc5c2 SHA512 99c9c30db41360cbca6c701e4585e23fca87cac41da01c6261560b2ba05e49d90a9a1cf122df3b26f818fd754e0d4bf0516e18fdd4740cd5e67df39e4b802f83
+EBUILD cmucl-21c.ebuild 3011 BLAKE2B 87a43c5e6972b5e46f488475678f8b05ef0374c88822296ae8df93546ecb3cb6bb6cf2d2aeff833d7054f480a2d85b7007730572923f4d9558a22710d0afbabb SHA512 186470dfa6328e3b4050f0c46cf374b3a9833d704e9e3ecc2780ee87ebae053a0d5feb6afca63bc60a23c9cd4a317f01414cda3a977c00ad638c202d4b8641e4
 MISC metadata.xml 1389 BLAKE2B 10ade798d71184491a4bf8547cfb0c7d3a5457c1c58a4edf80f887118f35e9f2393825c89e561d7aca6f1ed8f3f9b6733e56bc129cbde8c75b58a72fe849aeb9 SHA512 5c6ded0a26b6f1a5705d122f0c2e463f61aa673c5a302cd4676418e12216ca0f3cde81b3ebc0848d879caeae87ca786e01c2f2d61b6f89fedd564d2c739a5fb0
diff --git a/dev-lisp/cmucl/cmucl-21c.ebuild b/dev-lisp/cmucl/cmucl-21c.ebuild
index 15054747..e2175b10 100644
--- a/dev-lisp/cmucl/cmucl-21c.ebuild
+++ b/dev-lisp/cmucl/cmucl-21c.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit eutils toolchain-funcs multilib
 
 MY_PV=${PV:0:3}
@@ -28,9 +29,8 @@ S="${WORKDIR}"
 TARGET=linux-4
 
 src_prepare() {
-	eapply "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
-	eapply "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
-	eapply "${FILESDIR}"/${MY_PV}-build.patch
+	eapply "${FILESDIR}"/${P}-execstack-fixes.patch
+	eapply "${FILESDIR}"/${P}-build.patch
 	eapply_user
 	#cp "${FILESDIR}"/os-common.h src/lisp/ || die
 	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die
@@ -39,7 +39,7 @@ src_prepare() {
 src_compile() {
 	local cmuopts buildimage
 
-	if use X; then
+	if use X ; then
 		cmuopts=""
 	else
 		cmuopts="-u"
@@ -61,7 +61,7 @@ src_compile() {
 (compile-file "modules:defsystem/defsystem")
 EOF
 
-	# documentation
+	# Documentation
 	if use doc; then
 		pushd src/docs/cmu-user > /dev/null || die "directory src/docs/cmu-user does not exist"
 		emake
@@ -86,7 +86,7 @@ src_install() {
 	if use source; then
 		# Necessary otherwise tar will fail
 		dodir /usr/share/common-lisp/source/${PN}
-		cd "${D}"/usr/share/common-lisp/source/${PN}
+		cd "${D}"/usr/share/common-lisp/source/${PN} || die
 		tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
 			|| die "Cannot install sources"
 	fi
@@ -100,7 +100,7 @@ src_install() {
 	insinto /etc/common-lisp
 	doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
 
-	# documentation
+	# Documentation
 	dodoc doc/cmucl/README
 	if use doc; then
 		insinto /usr/share/doc/${PF}
diff --git a/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch
deleted file mode 100644
index 8fc9278a..00000000
--- a/dev-lisp/cmucl/files/21c-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/21c-build.patch b/dev-lisp/cmucl/files/cmucl-21c-build.patch
index 4d7e4061..4d7e4061 100644
--- a/dev-lisp/cmucl/files/21c-build.patch
+++ b/dev-lisp/cmucl/files/cmucl-21c-build.patch
diff --git a/dev-lisp/cmucl/files/21c-execstack-fixes.patch b/dev-lisp/cmucl/files/cmucl-21c-execstack-fixes.patch
index 034848d6..034848d6 100644
--- a/dev-lisp/cmucl/files/21c-execstack-fixes.patch
+++ b/dev-lisp/cmucl/files/cmucl-21c-execstack-fixes.patch