Ugly workaround for broken sbcl in the main tree, closing #423267

Package-Manager: portage-2.2.0_alpha120/cvs/Linux i686

4 files changed, 33 insertions, 11 deletions

diff --git a/sci-mathematics/fricas/ChangeLog b/sci-mathematics/fricas/ChangeLog
index 5d38dca7d92d..a56f37af03f0 100644
--- a/sci-mathematics/fricas/ChangeLog
+++ b/sci-mathematics/fricas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/fricas
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fricas/ChangeLog,v 1.15 2012/06/22 07:35:14 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fricas/ChangeLog,v 1.16 2012/08/05 05:28:50 grozin Exp $
+
+  05 Aug 2012; Andrey Grozin <grozin@gentoo.org> fricas-1.1.7-r1.ebuild,
+  +files/fricas-sbcl.patch:
+  Ugly workaround for broken sbcl in the main tree, closing #423267
 
 *fricas-1.1.7-r1 (22 Jun 2012)
 
diff --git a/sci-mathematics/fricas/Manifest b/sci-mathematics/fricas/Manifest
index 86f3e80aafd6..bb12a38c4c6f 100644
--- a/sci-mathematics/fricas/Manifest
+++ b/sci-mathematics/fricas/Manifest
@@ -1,8 +1,9 @@
-AUX 64fricas-gentoo.el 101 RMD160 67342002028207ab3fcf4ce119469332a6b39697 SHA1 7a27ebc202b4bf0c2f0f7d5903c71dd2683286c5 SHA256 b41c5e5323b2e2f38f04856fdff293c110bbc6016cab84f7af29772ef3366b2a
-AUX fricas-1.1.7.patch 490 RMD160 ad2c9a5cdf17104def6d917538186bf2efee226a SHA1 e987669275ac4cd2e06c278d8417b3c664b61a17 SHA256 27c76300781ed3f4ae1d93f171aa7c7dedf4d500b742c9b02085040cacd7512e
-DIST fricas-1.1.6-full.tar.bz2 9719719 RMD160 91811a7a602fc362b6dc7904626e783a6f3c4eff SHA1 427062af43367374c5c2f1fa706b194bd7c47df2 SHA256 064b47c74306148f19ebe5dfee2ce0ab823e0c1f163956a7c708df133fcb1b1a
-DIST fricas-1.1.7-full.tar.bz2 9810023 RMD160 f578980668d36f65b0b0007ee5a48da4cb6569ab SHA1 be92d2c8bbecc4ae62977b80e0741ae02246c07a SHA256 43163e02733b6630c8cf5112eed9d26f2de9241b1a6826ba9762cb4d971b9cea
-EBUILD fricas-1.1.6.ebuild 2453 RMD160 33d3386d5f10f94c8792b86557bf3eb5df5bbeb0 SHA1 4e39651eee1a720a2d3e37ce60267bfbb8c46708 SHA256 09e316b4d8a3721e29ea094a53d1a372288c74e1bdd06935b4dce01eeef33168
-EBUILD fricas-1.1.7-r1.ebuild 2490 RMD160 273eebe5fa760d874648e17df6fb98cf72968dcc SHA1 4d185eb95e801313861b7c0dc84f6ea0d215a18f SHA256 82faef721f4ebca5aaa9dffc528eb548e3e75f82c44117f742a10fcccea5b142
-MISC ChangeLog 2375 RMD160 9dc03dac5bf1ced0d9035944243727344e32391e SHA1 39fd994ea69ae5d6eb730a68c8c3e4bd45a57b3d SHA256 aae368dd28802261bff4795f6ba4a625689e023ffcd2505f53c65667c5975303
-MISC metadata.xml 933 RMD160 56216e081a01cbdd6a9db7096afc0af3a8ec6861 SHA1 89f3ed16f42d324177025ca2116a79413e06b1b4 SHA256 b97ab549155d90db3996450671ad96928bc262ccd9f288061db3e4533b77401d
+AUX 64fricas-gentoo.el 101 SHA256 b41c5e5323b2e2f38f04856fdff293c110bbc6016cab84f7af29772ef3366b2a SHA512 be36ef5bfb525aa054cd3881ece83d47ee3a9cb7ef1b0c26215d449ddcad8f9f57045b29ab9063a62f43caa764abb251e5fcd04cf1d15bcc423e40d9e69239ef WHIRLPOOL 8c45eb3935184310180ba2f03bc3c182d57d373063daa8094d3737d82828e50d87222a17f2a880450b9aeec6d0be2763b0f0cdc5dfab26fb01d92a2833ece505
+AUX fricas-1.1.7.patch 490 SHA256 27c76300781ed3f4ae1d93f171aa7c7dedf4d500b742c9b02085040cacd7512e SHA512 c386667aa72d0150366305565553e18eae9cd04f580d234363956f38ebcdd4477e166e9e8e0c82661e2311431c7065ffaebaf63da315915d5cf8fa8e60cdf154 WHIRLPOOL 26b6a2594ad7bb0908d4a9155958c4e3f087b53014c4c7eaaba87dbaea3e855192805926f1356282bee981dd16c43dc2ee077eab9c3344ef0706a35639dfd3f6
+AUX fricas-sbcl.patch 470 SHA256 1e045f484ef4e40435d6789b66aa2d1b105eed8f0c454e7aa2df504e18f23c55 SHA512 56416c20903a9aa39bc00e0cf93c9c39c590553f6d11b7a72fed7f968d7fae3ceb2d21f0547eded9f1da6fc6518488ced8d343b16eb8a905b5876a5f05f19f0d WHIRLPOOL 07f9a1b9fbe8981bbc2d58b2c45407b91bad6453099eee336c6c2cc047f39455cccfd730c4c58ec0d3878ccbc492554ee9a7403a570db4fe4f729b46b60111c7
+DIST fricas-1.1.6-full.tar.bz2 9719719 SHA256 064b47c74306148f19ebe5dfee2ce0ab823e0c1f163956a7c708df133fcb1b1a
+DIST fricas-1.1.7-full.tar.bz2 9810023 SHA256 43163e02733b6630c8cf5112eed9d26f2de9241b1a6826ba9762cb4d971b9cea SHA512 3b45dec149179fb0e3d54e5808ec72719942975b983ce99c03eb288c7f65f54f4204761001199bca20dbb5da0cc8a165e289f83cf022137fb05a76a4a19358ff WHIRLPOOL f30b216de8f3e2d44228e94c79f3e766fbb26dfa336f9a6575e45997ef36b8172f01eddfef680f8374adad7ad0f10a9ca22bd96835b5dc5e76f59123f0e9182d
+EBUILD fricas-1.1.6.ebuild 2453 SHA256 09e316b4d8a3721e29ea094a53d1a372288c74e1bdd06935b4dce01eeef33168 SHA512 d7006a4960f46ef92a5af9027aaca31a8c38c46c06b680c5051b0c8fd4f3a03ec749bc00e9d8763ca867b89c6ae58cb269663f02b82adf4708f80d05aa622c39 WHIRLPOOL 2111e91e97ada4e82c34f42c105a4f87963659f651b21f110f80716d58819d7a49ea1d8501b6edca7d06bbd0e78a51dcadcd61961c31ff3e01e6b93ac0939ad0
+EBUILD fricas-1.1.7-r1.ebuild 2583 SHA256 bbb5ab72007928733569d2b5d9c162dde56eb2ac9fd96385d629600def656e09 SHA512 c7c646b2d7d5161c6916aad85516215ac7d7550016018ce053815f288ae3ea4452238f1b6302d7789dd8ec30a201b590ab25c1dd5ef34d43ab2446ddc86e0f2c WHIRLPOOL 841c02c2a771d474c407048cd951d3a5efc20c3f59936f907e4334373fc05796f1cfd25498fe66a2e4553f9fec65603cff50f1c633938d99004b179f1959958a
+MISC ChangeLog 2545 SHA256 2208664c1c516d0c30d602db8f3373d22cb043ec4bda44232f964a4ea29d42de SHA512 8fc2c7d3f093035886a61a1b84b0556b43ac46224e3a2190c76aed85896ac7f564a67787d49c1efc6d4c65a8a1ffe5748fbca71b98f8b7cf9efd194d3fa55aba WHIRLPOOL 43a8d8ffb0ec6bb004e5903aee74c9306c61a13dc41d95108da9d8acd23ec9c6541901cfff86a0b56a0479f4515bcac9fb2e28ac4d7b1b0430ced8005e39264e
+MISC metadata.xml 933 SHA256 b97ab549155d90db3996450671ad96928bc262ccd9f288061db3e4533b77401d SHA512 260366eab84124a6e9d94acba992a6b6489c8517403ebb92bdf8ab775f2296bde53c4d9e3f9d0911508fb6ad85693a77693b8e67f233f1940c4a37d000b36f7e WHIRLPOOL 17b42a79fd98f09e2d21cc15efd5942f1970a4c4eaf38dd6ace6e264fa41ab05fe7fa613f35f02526f2c0c6a416b5a5d64a5aee035037618133704e256ade9c2
diff --git a/sci-mathematics/fricas/files/fricas-sbcl.patch b/sci-mathematics/fricas/files/fricas-sbcl.patch
new file mode 100644
index 000000000000..16bb16c189c5
--- /dev/null
+++ b/sci-mathematics/fricas/files/fricas-sbcl.patch
@@ -0,0 +1,13 @@
+diff -r -U2 fricas-1.1.7.orig/configure.ac fricas-1.1.7/configure.ac
+--- fricas-1.1.7.orig/configure.ac	2012-06-19 08:17:01.000000000 +0700
++++ fricas-1.1.7/configure.ac	2012-08-05 11:18:22.000000000 +0700
+@@ -243,4 +243,9 @@
+ fi
+ 
++## Work-around for broken sbcl in Gentoo
++if test $FRICAS_LISP = sbcl ; then
++    FRICAS_LISP="$FRICAS_LISP --sysinit /dev/null --userinit /dev/null"
++fi
++
+ AC_ARG_WITH([lisp-flavor],
+             [AS_HELP_STRING([--with-lisp-flavor=F],
diff --git a/sci-mathematics/fricas/fricas-1.1.7-r1.ebuild b/sci-mathematics/fricas/fricas-1.1.7-r1.ebuild
index 67372c4fceda..b265dea4e69e 100644
--- a/sci-mathematics/fricas/fricas-1.1.7-r1.ebuild
+++ b/sci-mathematics/fricas/fricas-1.1.7-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fricas/fricas-1.1.7-r1.ebuild,v 1.1 2012/06/22 07:35:14 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fricas/fricas-1.1.7-r1.ebuild,v 1.2 2012/08/05 05:28:50 grozin Exp $
 EAPI=4
-inherit eutils multilib elisp-common
+inherit eutils multilib elisp-common autotools
 
 DESCRIPTION="FriCAS is a fork of Axiom computer algebra system"
 HOMEPAGE="http://${PN}.sourceforge.net/"
@@ -49,6 +49,10 @@ RESTRICT="strip"
 src_prepare() {
 	# fix a bug in src/graph/view3D/smoothShade3d.c
 	epatch "${FILESDIR}"/${P}.patch
+
+	# workaround for broken sbcl
+	epatch "${FILESDIR}"/${PN}-sbcl.patch
+	eautoreconf
 }
 
 src_configure() {