Version bump from the lisp overlay (pmasked)

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

5 files changed, 263 insertions, 16 deletions

diff --git a/dev-lisp/cmucl/ChangeLog b/dev-lisp/cmucl/ChangeLog
index 796e0a55c8e9..b96054dcef48 100644
--- a/dev-lisp/cmucl/ChangeLog
+++ b/dev-lisp/cmucl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lisp/cmucl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.40 2012/10/24 19:07:00 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.41 2013/04/20 14:44:53 grozin Exp $
+
+*cmucl-20d-r3 (20 Apr 2013)
+
+  20 Apr 2013; Andrey Grozin <grozin@gentoo.org> +cmucl-20d-r3.ebuild,
+  +files/20d-customize-lisp-implementation-version.patch,
+  +files/20d-execstack-fixes.patch:
+  Version bump from the lisp overlay (pmasked)
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org> cmucl-19c.ebuild,
   cmucl-19d_p2.ebuild, cmucl-20a.ebuild, cmucl-20b_p001.ebuild:
diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest
index ef969a07c76d..89ba8a97d0b0 100644
--- a/dev-lisp/cmucl/Manifest
+++ b/dev-lisp/cmucl/Manifest
@@ -14,6 +14,8 @@ AUX 20b-customize-lisp-implementation-version.patch 697 SHA256 5bf77957f916508e3
 AUX 20b-execstack-fixes.patch 3990 SHA256 f507d48eef3ae55e9f38ef96964d2179a3a328837420e866be4509c5fdde9131 SHA512 bb32dfffa6b737af8be924f194112863b64010b00b30caf92c023a16ac1d2884f51ee724b57cdeb2786f10aad6bd0054a835c94f03b911eca4648c2e5927ce3b WHIRLPOOL aaf48fbbb369e7742e06a3bfb79d887e916e892d66a185edbffc23774d1e8c0f73d76fe784d2f36080e7e6fe9d5cd8fdd8c5b6c22b0143db6a10da2a642724f0
 AUX 20b-nositeinit-build.patch 772 SHA256 ab3a1bc613e390097dd08148b3d887aa8c92eab833e2413c1bf440dba082ff17 SHA512 a88743d6e38db25584f1ca0d57604ebd5edf57c1fcee518e2a5f1d181711d0a0bd4790f1616fab7bc7b4865071159e50d8633c0790bc9efbbe4b9ed66ef009e9 WHIRLPOOL 2a1959a8981452c1d196f00d9441a08615739af66f5568a9895891fc040cb46a95ed6e382874ba4f3d804cd3785a3b67d33380a1e676d612fc77ac863030353c
 AUX 20b-patch001.patch 3858 SHA256 d466a5bd4a4d961c9c161b356d647b2030c8f4ca8c672b958ed568214f196eae SHA512 1708ccedea8dcdea7c1ad0dfc09252b7ec5e863885d67401e2ae44ae74c32dfc3b99860016404e4ca44e4c5e0dbbcf71c9cf20b98554527797a45ca03e8fb6e1 WHIRLPOOL 1dd31ba99c854a8832b7c5699e70cf74fbf3de7d311e878b74c36b46205f08a7af19e2c76ab59372ce791f6d5a860a2d9fc63c3c128fc21f616535fe50e6abb0
+AUX 20d-customize-lisp-implementation-version.patch 683 SHA256 81c421f80c06c567d2ae0812c8e0e66ad86631662adfd8891ae36152328eae63 SHA512 77acf6d31d8a932075b61e90b42b2c74648ad29ef3cf2f98e69a44f957672a935ea88a541815c19bf71ba5e64c587d27878288038178a7ad3d96144a26b1bb2b WHIRLPOOL 54cbca06348c4a0b4d8efe7b502e3834102640aa3cf9a0817a39a2d9dfac5e1234ff22260c9cd29864acd1a7bdf156b64f9feb2e87fad9205ce7164c697e5ab9
+AUX 20d-execstack-fixes.patch 3990 SHA256 f507d48eef3ae55e9f38ef96964d2179a3a328837420e866be4509c5fdde9131 SHA512 bb32dfffa6b737af8be924f194112863b64010b00b30caf92c023a16ac1d2884f51ee724b57cdeb2786f10aad6bd0054a835c94f03b911eca4648c2e5927ce3b WHIRLPOOL aaf48fbbb369e7742e06a3bfb79d887e916e892d66a185edbffc23774d1e8c0f73d76fe784d2f36080e7e6fe9d5cd8fdd8c5b6c22b0143db6a10da2a642724f0
 AUX cmuclrc 305 SHA256 4f1f050f8dcbf261c9ee33075d5546a43fd14f7f0cd0ad486b175081bd4b27d2 SHA512 36ae348795f27a7aae2e1cf10376606b9a6898b4c4f0e6da692b3e60bed21e2825ac766a51fb648f1365b238046efd155e80d70421ff65ecffe5b68342895740 WHIRLPOOL ffeea73a1a69dfd43a3d4cc86e8e6b63f447fec0c6fd6f6f80ae2b6feee2bb1683b67f18b7364a311bfbac9056c73cf3813e455a1eb459884bda0794daff57be
 AUX fix-man-and-doc-installation.patch 1671 SHA256 77b9844670345e4c79510969b2676db1b0a366ed0f1e5c07ac74c477cdf65819 SHA512 d8998ad6ccb9899bb5e08270ed7508c42e81348f91d3eebff81ff9fa2c05adad9dc2a63fbc76dba916efffdb04912d56b75d807e62158246385090919f44bc54 WHIRLPOOL 400212676ea4ada6cff3b3be9a01d309345819be5c29c36ce5c593446a1948299491710ffc4b6cffd70b846252b8437c31cf7f6032a3729143e7714b58db15bf
 AUX site-init.lisp.in 1839 SHA256 6164e40b50a0a0e7175089f0b55d549b8f24ef602c1c0c41f9433f5c61c512e7 SHA512 374e5acf970b1bd26d2318b678cba509296f2356a4672648f8522387c216288e8f43b514004b0d0c98da5d03a5db10435d5f42f57db88c916691eb4ae93f126a WHIRLPOOL 4c4fb508d7546dea9d75dcff3239c56f8c3b3ed249f3f7fd71f9a2a60dbafc57f0b172d2cd2c6efdca5441e8c30ee3f49c829b3db64bf9ab9db5d4526726f8cc
@@ -21,31 +23,36 @@ DIST cmucl-19c-x86-linux.tar.bz2 7305922 SHA256 4f8e1a819e69be176dd03efbd7cc2822
 DIST cmucl-19d-x86-linux.tar.bz2 7600189 SHA256 5d459213f37dac8f633377d1c64901d1e9fe9c5774a7b1d5f914c306fb48dadc SHA512 184fb249f17a5ae38a4a3059046709eb1ee0e45f5804b038609a21f02fa2edef541e070d62a41d099ba97e90bd9c03fbd4b4bcfc3fb9ff852c0aec79fea11a29 WHIRLPOOL e23ec88d8770bb3590a83ea95463672e8b3b984a7f64c684ad79ad935d23853f9f7c156f05d7f49215fc0d8e4dcbcbadc46c24fd89092b582d1129bbd726e817
 DIST cmucl-20a-x86-linux.tar.bz2 16390027 SHA256 920db6d07427fae919b1b936fea88d242bb664d5e1fbbce3b8ee6bbe98744d1a SHA512 a8cab981eac1b490a164aa9eafc804aaec0c4fbbe454c3d9e7d974d951213023692340c7e6a3cc25878e179bc61a809471ebc80178a5fe44649ebcc9a44a1c9f WHIRLPOOL 81aed3ebccdca5fea5e8acfe5fb5467bfa2fb00a374883ca6f2d6cbaf8199236f611bc9d1af70fd8acf5394d8fdea791e1b5998c96e14822b3c349b3a2673597
 DIST cmucl-20b-x86-linux.tar.bz2 17612706 SHA256 b6c9e1c25abb69fbe08892e3e58e7dc24accb8c0e5a37a7685bfccaf67c800e8 SHA512 367957f99f1191b1b41e93c7a01263c8a9711a0b3404f82024322301b9599f1ae5635c3f6f96b25dc03b993cf7fe27bff48adc5ecdff6ef427b91cb3fbe795df WHIRLPOOL 039974764cf9140451d844729f61259563e58a6a6f430c58db3da0b2b80a0d88a0d5359dee33ff79b8f4095f35006da319a303d721238eace6daa957f73c49d4
+DIST cmucl-20d-x86-linux.tar.bz2 18081545 SHA256 de33346953241946283e8bb9ac5447f288a01b0d205c911eb001dac8675e6860 SHA512 7e2136764f00e6a2f1929fb21902254a96eb890e77ad8da55c0e20ff252899088267936cf47be1711a055e840eaf18889c63a246ba61541fc6fac027481b6a85 WHIRLPOOL 8f9e5bfeb1598077b383ed9c4adbbc3ab48fe634d126e21ba1f9e8dd5850e09d9a835da7b1727ef951b95cac5de40e095536bc276f8368a9246becb4559cd5bb
 DIST cmucl-src-19d.tar.bz2 3780254 SHA256 027a86d3e2729e14cb8101d088716a61fb62b5197af66a4f80457f13134514bf SHA512 d2b156d8d3761300e03d92e5e308d02021ed82763f8efe7f9cfd01ba9ce67f4be192d637bdbdd87a3986ca4077c7dad09f062e58a473016302553604624488ec WHIRLPOOL 5b307b6eea3b5c286ccdb905bf58ae602dd3cb08984355729789595ef0995144d44dd1b0ce500b448b720a5d9956e0728a6f9e0d12b5ecb290986efca3fcd661
 DIST cmucl-src-20a.tar.bz2 6203135 SHA256 a1821808fb2906a3f6fc7229fd7bc558b0896a08d2a227d1b9e726db09c3777d SHA512 a209762f612f0a34a3189d72cfdaaa2c3a395dd4b28b136b5cf59def4e90c3afbe1c4ef50413eae3dde1577c02833faa632d434c088d880a5a4bdc8fc259f375 WHIRLPOOL eb30df377e07110cd794ee5e804f6459a28c73eb67f3621992c7796a52b01e4b224c511b777591fb00fb3ee52d3d17075b719bec05a169c72549112baf492834
 DIST cmucl-src-20b.tar.bz2 5834128 SHA256 42dcb9851e692b18d1f544bcdcb3ae18704cc9726ba42780c9677bac700cf5ab SHA512 c2ea1ebe075a61748d921559e9cfc6cb0effb857fbcbf17b5769f04426cecb76da54bedb5ab25a9bc55d26423952b9d337f2f008cdccba1c451847888203c8f9 WHIRLPOOL 51199883878e486b38d06a3ca0fc4a41935610979c905536db1ec8eca8eb276a61e5aacd874903587afaa82c8d431c66a4d4234400f12911b1d4522b9967d069
+DIST cmucl-src-20d.tar.bz2 6080407 SHA256 68ec1cdd03ce8b2d805ae935a9973400a49bdd39ad360908dcd0ff794d318aae SHA512 44caf37f76078f0f1594125eaa98605f61c53995509883e4c13e97dc20252ca420afb719d279598ce517ee15d8e410583c8ebe612fa2a6ac825448a149a96c75 WHIRLPOOL e8633b9ebce06c1d9a7c62a365153abc0220c210555f1221b94302d8cb7ce91190b43f64b00fb5c39a08bf31566e3fe2131d197c046d48cea480a079982540cb
 DIST cmucl_19c-release-20051115-1.diff.gz 1506111 SHA256 65ef4018294b6fed388c39643782e6e611ee87bdb944c639da648522a4c2d336 SHA512 2c90eecd1f7cef7b0f6abd0081543e4994139f45337985adfff7ac8863171359d7052e20140aaf4b7bc82675ea4a40b28027c09518ee90f48f11c2bf4eaa732c WHIRLPOOL 847d53c3886a1d1420fe7762dfa753981544a9857678f09326ea163debd0e9ae92e7158f930e21501da7c30618103c3199212fbc468c8bdd28fbd97b1f1d82b7
 DIST cmucl_19c-release-20051115.orig.tar.gz 4654304 SHA256 4eebac35decc23449f4cf79996c31ea674df7136e08b829210d352c5d20d2407 SHA512 ab228806e692671caeca66fd1a96c3650b3645693889c421352e919ff4df09f4a288cb384daee150a9eae30add7f86acff0fac3bebd651fea328cd34af476659 WHIRLPOOL 577ab1aaecf9d2adda04d501c2fa2ebe21274da7f037fed253d484032c3f5ffce05d722e768742667ae0feb898580e5e42f3d35ec6caf7c7449383a5cacca43a
 EBUILD cmucl-19c.ebuild 4639 SHA256 2af213fce271a3363605859ef32600d9d8eaad45ed089cecdf997845c9dda78a SHA512 834969290fffbcc5301dbd0e5e690d4425a3274eb921d9a4bc98a4ef0410be16a121a3f7cd80541665ac57d6a834d322c3159cb80819bd5ef56005f675d55029 WHIRLPOOL fc6737dbc513e6bad577d9bdceb89c24f8fb16b67a02d538c87989646d9859c2bf935f53f7451f9477310faf9de94f9a6d54da4871b204f0d2fd0c2ea497cca2
 EBUILD cmucl-19d_p2.ebuild 1824 SHA256 1e8abae1a959fbae88ea7451df34eb53b84d4f8019811ebad8968d826a70e7b3 SHA512 e5f3ae9817689b1522a1ff4d198e75ad1e4be4ab8a6f9313857a641825ca62407928844fe53071f3e20563c474c01a2254624580d6e484384892f3c0cfa5516c WHIRLPOOL b8560befede97b41a9ff20c9199905865426db639aab70cb19ef721ef966cd7abbd2933dc36ec4085b88e46467451c1811559a72d45e9654f5540fbcee9f9d16
 EBUILD cmucl-20a.ebuild 2251 SHA256 25656df47ac8f04229cf54ccbe6ee365bc965db7cd604b54b894e81b3e2699e0 SHA512 a8684437676d3bd7c8cc43dfeecdc141ec5406281efc07efaf2ccede864712ac5b2670bb9f577019611a8e496c9e76b28a4678c340b2b3d93b829ca4aef34441 WHIRLPOOL 6a0934405b724f5146d063ca049c9101256648f84c4d19b29492ccb63dcb8a762cf83fcf43f74e468d172faf0e2c33332a97d8b227b2f8de3050bbe3ac4cfd7f
 EBUILD cmucl-20b_p001.ebuild 2902 SHA256 ff1f19f0b907b1238cf67f57b5c37e055a9dd30c664f41f73b03dcbbfb004cff SHA512 91952e9c9a89864c27ec87dbefa286d538fb28c5ae08fe8ba30bc4c2564ff54623a89f1b82edbb24745df11c413871839372bfded5a358203a0e90f25f732dca WHIRLPOOL 1e021c5f7e86bd73cefdbfd8087a4d8484de79dc23b9ee5a5dfe50d6919207cacbc4780c91b3a20a87876b3c3b2cd7abed9c66925d159e98ec26b5e677d010ea
-MISC ChangeLog 8023 SHA256 26eb48e964883a1ca22fde2c75d20d6bddc94bc40a0240b556750c5f8d77fa12 SHA512 a0e0837ad5aef9cf3044d2485bd23b0ec8987563b5cd81eef47292652876f9b2982b5ab176031567d5f17da43927e1272da72469cb483b55309fc3bdcf7e86a1 WHIRLPOOL ab84440076b78275945994d8a37c76ccf0b70df351cee6624588f8af0fa05b6f608b9eae6891462f164c12e44f1c2eabbe77fe7f8d825323a26879bb69749f26
+EBUILD cmucl-20d-r3.ebuild 2824 SHA256 43e11c175f82360659735ee897f6b3b392de3f72c8cb3e451d969d062830d982 SHA512 637edbcb613a341f155816b81ab3fb9def2192992113910570d9860a200989630272ee4f05f3a0c71d2379c706e2675ee6a76eb48ffe908eaafc78258ae4c01b WHIRLPOOL 18183ab9b7e7d4024c5f5e332add518eed5d59497eb7913894593be08a0c7208b8859b965976dc5d8389d3194a35e7ddc82bbb75b56228b5fd62d95cdfccd0e6
+MISC ChangeLog 8268 SHA256 090090e0a2d5e461db6685e42608689c604169def2de63af770bc0670a4d3557 SHA512 c1a281564c0ae49cb4be0bcb9ce00e74206c2c7abb64ef6e625c31e2baffc6a92706379e92fb511cc98d7aa40a9ee911cbc184a8483273c24accb65c01cbbc40 WHIRLPOOL 645b5eb56a306503a6e4628570e17257856a34bb875f9dd916839f8dd55e292c6a5974ea42343a7b2b4f500b0f944fca17d1984dad1bb7403c253f82a67e6948
 MISC metadata.xml 1361 SHA256 f4b7f1014988c330913565e96209b71c5a765e28237c66f72cc0fb5d93b06b68 SHA512 bf5584cf3bc4f5057a7eddb34650372fbe5125520f8318c11078bcd1cec545b69fc7a6f4fa7b2f3bd0d58872b7a8793103b2348d9f0dcc02b331f4cc29086713 WHIRLPOOL a6e766d0b50ba219a3bc7d2fa6e72919eb2d259b9485f4c13df1170e10d15e1f5046e19ae1dfb54a3ba1403644c72667bb1917ac2f558ed32d4d1f99610130a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQiDxgAAoJEDxpGckxwJCBSIoP/RL7Vc2lNLSknUMKRBbGBBxs
-1bxdTzdZqW+R3lb7feBLkKejpNP2MJgZsDsfdwHNARxKTTlpmSFAmQ7EjM6aH6IL
-F5rvLRQmmFkYTIuKLxuvGT213WmomqBennFmJvgYKxVZrmFkmQ7KLEJt+3ca5c/F
-GKNJvw72L7o8VjaSuCBdtptFa5DfZK9WgwWDXvAOfTKSmZgsyHS/6+/AfKVSCMhR
-5a3w8RuMm1iTs+V43lDWIqzbnnwkm4sB1keQHRVpYTc8akYRld0aA/oVxOid5USp
-Zmdi0UY6Q+Bqp+3XTZ12djY1kkZUMmFmEM2UlY/PimZsC1UEsD11lBR2upqjCfD9
-pjUguGVCKyNI/OhrD5SCj75//a1shPhKOf5zl3kv1dP9dTXsRbDKi3QD+lG4riTB
-al+MInmOTNKjRFq8O0uDHQtgtLSLfDsDpxWnjIjjtOTIx8XE1iL0b/vd+2unwnmb
-B7bY8w5joKLWGpWf+vzS3rEotIIxe9vOZN1WEifZIf7VunSlGZRBpbtOuqXSzsB/
-T0MUeluuAey/a0flvlaHTzJntef/WpdAWoFdgsI+KobEdS4td0oulwnUvHBoI68+
-mHFR8EWycXcaMsPe25JLojDAZ7MKDgTNW6IQPS8hK0xH8/qMZTVM6XumrEccvDvX
-fDYHGV4v2fT5SkjXijXa
-=pqwy
+iQJ8BAEBCABmBQJRcqnHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MTFMQAKgz3qgu5VzKjIHY1hapLqj8
+NQeurWf8zM2isI79/mYkwT009KyuaQf1cbx6pAroxOv8fsHnHIWpqmFNebDP0MIw
+S+zj7xh8dTT6OCDOrIM63ER8zd3R8hTV0sxswB5xj8TQFMf8Uocje79qbdklAfp3
+iw12zBOfVtNw9q8p42BA+E9+qI1Utw+cwtKPmvA3yrAZA64Q1bQwLJ9aS0bEy1Ff
++xMclrVVIz9w8lbzdY76HNYVhIi01ksqsW03msdtsv4i1ljqHwdzMM9TcK0KBd5a
+pJRYxy3lZ4uJWAREVIvueDzN9zyiMnfr/bCUln9Gxkd3VdUV9Bn8eyBaONBBRk0E
+kegHzv2l/eIwRKZDSWTmSm9gOL0hV/Lhp38wS0eZfPOvpDRwf+rjLNNeRXU/rzIh
+1iYk5IzQmo78Y/hHBgYwZvxPNVsZ87IUBMl+hl7aTNIoAl/HvWIMcGlX9dloZDuC
+zzFDBb4IcK4Kr2EwWUoWzphBFHArISUOdKhgA4Md59lWomEMdO/ZHVKn9+ZwEcQY
+2Ghdw0xE6wSDYYBsN18hY54Bz4r2zVkxMQNJQHt9OvTAeR7nDz/9fPh5oCCFPiow
+BCnMbFmMcUzyR1QeBeapM8O2QMT4qPtrzowClJ03xSRRF+Bmsq1rpwFr+ZoIfBuf
+iU1ZRLrg2ATpMkNeT3hH
+=9Khy
 -----END PGP SIGNATURE-----
diff --git a/dev-lisp/cmucl/cmucl-20d-r3.ebuild b/dev-lisp/cmucl/cmucl-20d-r3.ebuild
new file mode 100644
index 000000000000..a27402121b13
--- /dev/null
+++ b/dev-lisp/cmucl/cmucl-20d-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20d-r3.ebuild,v 1.1 2013/04/20 14:44:53 grozin Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+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"
+RESTRICT="mirror"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="X source 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 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
+	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
+
+	# 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/files/20d-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/20d-customize-lisp-implementation-version.patch
new file mode 100644
index 000000000000..8fc9278af87d
--- /dev/null
+++ b/dev-lisp/cmucl/files/20d-customize-lisp-implementation-version.patch
@@ -0,0 +1,16 @@
+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/20d-execstack-fixes.patch b/dev-lisp/cmucl/files/20d-execstack-fixes.patch
new file mode 100644
index 000000000000..034848d64a26
--- /dev/null
+++ b/dev-lisp/cmucl/files/20d-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