gentoo resync : 15.05.2018

4 files changed, 152 insertions, 10 deletions

diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index 50ad64fd9306..ac9582a6aa6b 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -3,6 +3,8 @@ AUX 20e-execstack-fixes.patch 3990 BLAKE2B 962e4aa31d703128e871c39bafb1be7e42be5
 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
@@ -13,5 +15,5 @@ DIST cmucl-src-21a.tar.bz2 8195492 BLAKE2B 5ca24e1ee258b52b805ab933e80915da6af02
 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 3084 BLAKE2B ef16dab2ad5a581340dc98ead5d6965829d3eab7a54fa5af57e3441af387dd71d6eddba0bf2291ac8d065cb1f7b1b2db6bfa8e58f3f0993acdf3de316c81e792 SHA512 ae521cf03f99719a0a589dc5188335c80f28ac01b235283435fc5861c1667350053556f24625e86089d8e59f8cdbad00172604f75e0488a7e78b35023c369ed5
+EBUILD cmucl-21c.ebuild 3011 BLAKE2B 87a43c5e6972b5e46f488475678f8b05ef0374c88822296ae8df93546ecb3cb6bb6cf2d2aeff833d7054f480a2d85b7007730572923f4d9558a22710d0afbabb SHA512 186470dfa6328e3b4050f0c46cf374b3a9833d704e9e3ecc2780ee87ebae053a0d5feb6afca63bc60a23c9cd4a317f01414cda3a977c00ad638c202d4b8641e4
 MISC metadata.xml 1392 BLAKE2B b301abf6448e0cd35a3dfc4c500666daabddc0d76c5b9f544963f19e8296e8a194cbc8bcdc542279ee120ab3b68d01af6626c76bb631cb12aaf41cbfc97c3759 SHA512 7e5316859890925b1e197d93339ea13067dd72a3e8d450163ea23d73656c9d203ccbbb731e762fa9def713f1debf610377620a1a2f9939e38d067b2f8e960551
diff --git a/dev-lisp/cmucl/cmucl-21c.ebuild b/dev-lisp/cmucl/cmucl-21c.ebuild
index d626b8677e9b..e2175b108c1d 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,18 +29,17 @@ 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 "${FILESDIR}"/os-common.h src/lisp/ || die
 	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die
 }
 
 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/cmucl-21c-build.patch b/dev-lisp/cmucl/files/cmucl-21c-build.patch
new file mode 100644
index 000000000000..4d7e4061c924
--- /dev/null
+++ b/dev-lisp/cmucl/files/cmucl-21c-build.patch
@@ -0,0 +1,22 @@
+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=21b
++version=21c
+ 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/cmucl-21c-execstack-fixes.patch b/dev-lisp/cmucl/files/cmucl-21c-execstack-fixes.patch
new file mode 100644
index 000000000000..034848d64a26
--- /dev/null
+++ b/dev-lisp/cmucl/files/cmucl-21c-execstack-fixes.patch
@@ -0,0 +1,118 @@
+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