Correcting sbcl workaround (#411453); dont load init file in ccl (#432246, thanks to RCV <reich-cv@yandex.ru>)

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

6 files changed, 40 insertions, 23 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index 46cf78f697a4..a0a36729816b 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/maxima
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.99 2012/08/15 16:40:41 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.100 2012/08/25 04:10:19 grozin Exp $
+
+  25 Aug 2012; Andrey Grozin <grozin@gentoo.org> maxima-5.28.0.ebuild,
+  files/maxima-5.28.0-sbcl.patch, files/maxima-5.28.0.patch,
+  +files/maxima-ccl.patch:
+  Correcting sbcl workaround (#411453); dont load init file in ccl (#432246,
+  thanks to RCV <reich-cv@yandex.ru>)
 
 *maxima-5.28.0 (15 Aug 2012)
 
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 4057ecb7e2ce..f45c5c44727d 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -5,9 +5,10 @@ AUX maxima-5.26.0.patch 3263 SHA256 dd7d02c0eaac5a0763363ed46c207bfb40e55b8470dc
 AUX maxima-5.27.0-inhibit-sys_usr-inits.patch 1236 SHA256 7b33f354741c5534ccbffff4831c4346a248c8c5a2e7d2e8e495a24a4a3874fd SHA512 0f97fb8bae29ec4fe9ec043482f664ec67d86f84da196d15be87b945b737e4d4fe937f99b53d77c3737906a5bdd7d72cc4f91a0364ecdf3c141681a31abb7f37 WHIRLPOOL 59696491fa586e9c95e176a5a8234b89c823648d513cc2d0a26bbc40bca6ab01aa4a4bc8ac37343361f5ef1a0c7a0c56f2b7cc431e3111b91a63083ed134f3cb
 AUX maxima-5.27.0-wish.patch 946 SHA256 dd535626d5d2d16f249e2c41157f5bbfb030236651d9b0404cc1a69c5fec9e0c SHA512 34dd30d5eafac7c1551a57cce5010713766867330bbcf1c9ac82553626a84c051e728eac9ed7b0818359ac1016d9a1bb08e829f9e96fd15260db631f824eb4bb WHIRLPOOL c8d80aeabb6756dd4f4c22daeee2416e6d2ea06e3dba8f1fd2bdee53c510ff65a89f681116dbd0087eb06ceb18649ad31268e34d49464f4aaf8a9b1b8fac1b2b
 AUX maxima-5.27.0.patch 3263 SHA256 dd7d02c0eaac5a0763363ed46c207bfb40e55b8470dc3b7c2892753b466a2ea0 SHA512 70e4f49972c631917e6da1b6d5fcfb415e93516dffd5868b34b7742e78a82b153fab85b51408c69f71946cb4f4f467d65250aee27e5b69cc675b2a380b42145b WHIRLPOOL 90c1d24fa466c6325c8e384d966070aea57ae5ae89b86a9029e5072d6ab6e588e1852ae42e11e635bd8ec17b5461e0bb693e92618489d691fe6d868c70ed43a7
-AUX maxima-5.28.0-sbcl.patch 583 SHA256 70ecc481fdb3cc3d34ecd2b1a55cc696c215470a9b5e5c1bd5bc81b80f8d6980 SHA512 bc72e9d55e2ddadd3b88b6c731fa6fe6b74a7a354e6f14f3831b27e475c1c72c2014239bd2ce34d0fd5e55ed43e54ae787c163965837bcc15de37fc6d84aa503 WHIRLPOOL 72155e4493e0a2fc53e12f6e43de89ae888d2877a925829a98ab86db7b67a04df3ab56cd6b88c35d9f2d073f333d01167620a6575d125bae0c26b5a00a4bd097
+AUX maxima-5.28.0-sbcl.patch 435 SHA256 85d36d14d4037472bfcf415602f2932a36c9b56413647f2ad0b3007b31b2993e SHA512 da60829f3f91818e84e82b7caf543eda74e71c5444e6f1e0e342c7ff9c2727c14cd8210cdc534c06f5c2c957c7f03b7367af8c3d0f1cdd944346f8dd620558a2 WHIRLPOOL b36a34a8aa83afa82880d07be8c2a075bd91de61fda5338435ce15b06674c58ae50f7f0aeb8d1fc243c8209aca5171eb649840f84cb15fbbe5ea8a7781ab3a2f
 AUX maxima-5.28.0-wish.patch 946 SHA256 dd535626d5d2d16f249e2c41157f5bbfb030236651d9b0404cc1a69c5fec9e0c SHA512 34dd30d5eafac7c1551a57cce5010713766867330bbcf1c9ac82553626a84c051e728eac9ed7b0818359ac1016d9a1bb08e829f9e96fd15260db631f824eb4bb WHIRLPOOL c8d80aeabb6756dd4f4c22daeee2416e6d2ea06e3dba8f1fd2bdee53c510ff65a89f681116dbd0087eb06ceb18649ad31268e34d49464f4aaf8a9b1b8fac1b2b
-AUX maxima-5.28.0.patch 4833 SHA256 527a777225ef0e8754ea437575838082c29bbd5947acd93d23c1ca287ea40876 SHA512 c265fb933fab738cbd5fa88a2396455e088c11a641bcee3619fba6ffae0bf397cf83010a48ae63641857cdba7d737d9946ad99eb751db76dbf0afa06e3cd3263 WHIRLPOOL 6deccf0c63cb92d8d3173b8474f6ad5cd7d9a57d0351a68fb2907d489ccdad34a5dfb9a034ff5a31abf658f3927b0fd190a9cf5b472b1259e2a06976bcae24a9
+AUX maxima-5.28.0.patch 5286 SHA256 bd11b5b6ff8364d638fa5c8719b1718d1f1c9433331cf3547094e4804119742f SHA512 c5b032d0d64eaa1b6550f50c18cb1f53613eee5cade52705b740d2cda30366ac5b3145ee1040506ad51c4e164abb40e1229434bd1de1e5f59e4f6dc68f833716 WHIRLPOOL 8fe857fd597b6d6a415ad385e8e41aac3f855a99d8747fe559d9ca6554dd8de42b685dc29603e3120bcfc40601de79ee8ad59a12807be75e4700a1a5e541486e
+AUX maxima-ccl.patch 372 SHA256 2190a51fbb51119b822222c93669f29b5fcc14c96510f87a53388f3322a6622c SHA512 a617348c6f525eee4f2e471ede0b6bc1f6e4df4cfe944f52584bc6a5a2aff0a5ca6f554286f6c8cd3e88793e88bc5d258af20188743000677b229c3b69b8c257 WHIRLPOOL e7720f692f50967a536195d7b08a77380269b62d6a68c7b9d6301fe224ac349f4324eccd026035cdf03edded15de87002ae63811ffc1142a03729dd500851a52
 AUX maxima-ecl-ldflags.patch 1069 SHA256 e4a12120d30389690d2d5c1ac8ae77713e1818950632c2953ac6ec57a9c11976 SHA512 9b080be546a95ef5eccbc1da9a7d18f90f8dcec0033d521008ed948f1e411ea7a37bf7a2c5cf54430f14fc7c4cab445cccebecbda2fcb5bc1ff8062878d67b0c WHIRLPOOL 52c185c647a11b4210f46ded0ac94fbf5e094691a231d1304885a4b235da120e0230384f91f8cf67cbdd09d6cd32a23bc4dd4de5c212ca41c0d94543a4babdb6
 AUX maxima-imaxima.patch 211 SHA256 b1d07af716f477dedfb011cb8c4fdf154d146db5172664865efc1ec025bfa2ce SHA512 48b66de8b6a77c60033cfc04fecbca410ecf87aa52fd08326d2535af0261047b79fbe8515d8c7d73087fc98af2b6d8c436fe44941256a0d2ba8edff24ce7df9f WHIRLPOOL ebb601a3be816ef37eb43368f5ba46e0a47dd48fc2eee1a4c6c31869d9bbc3c448ccf01c807ddca8798258c069b2b627b3ae5063afc03ee6a50f9521158e4711
 AUX maxima-no-init-files.patch 2626 SHA256 58b82fa1cdcc2eafc0f912541b350ae7aec8c492be5f6b0ce2174ae01f399d88 SHA512 f7ea883892f78090080c0842789f3dadf080e477115983e3f37738a63f187befb4f5e3ac259dac1c51f55d7590a159c9ef54c437301a1a5f7cd477f75c0910c6 WHIRLPOOL 2cd45ada31726735d4760b6c50de55372227b97f9653761a944aa5ef5457d89a99ddbf4ea33b7efeec6b2a0bb8fad1dc22fe8aea5e4660ef4b634a8a8925782d
@@ -20,6 +21,6 @@ DIST maxima-5.28.0.tar.gz 27312348 SHA256 d73e925f0116ba361bf4390c80e24d4fa763f6
 EBUILD maxima-5.18.1.ebuild 4197 SHA256 8a94a0d0b12ba9e2e99968e9dff248b8d18403b2eddbcab6305805e1e211b662 SHA512 eeea8f30bf5c1c467df82823fdd0c467926648d2a598819c8aca32e56c7969303f465458fa0d42d4c26fd2684068f59048ec049a56e26d1b932e56e32aae02d0 WHIRLPOOL 8900e30c855159771d13d25566c4d06b62f9cbcf10ccd18b0bc20e7558147233c8d49d3d99c5d2bf3d2ac1577fac99c9071188ec2d4ee85cc3c155c6897cf852
 EBUILD maxima-5.26.0.ebuild 5129 SHA256 8130e9712676683448c77b90ff1fc4cad86825c34a1b2248ae083e706e6c6195 SHA512 ca5d2b94ad655f1e1c0d71e7c539d3ec066c962d8db3df3cafdc0ad9661c6615bc4c883d28a99df092b1acc279dd3291e4a4d44faf48ae218e28d9139e799bb5 WHIRLPOOL 729d6faf262496d3767cff8f81ad83af9fe7355cd52a2fe504e43860c2a3eaf90b018e3e2d9755583039f4c7ea0f038d1826e52ac138dda9260dd36db35e1e3e
 EBUILD maxima-5.27.0-r1.ebuild 5129 SHA256 fe5955c77a5847ca43eae978462f6b74d3c29b898c9ebee84b977edaffc8142f SHA512 fb992509f3296a5d19cbd04201b010cbeb5ccaab930f0f3803d28544fab590b3340eed77cbe34d8575c02d976a52ef3bcbdc15b958c165efc160a06bf85fff14 WHIRLPOOL 1c47a6275faa0ee3178fe6f828accf3a207455091148d23bcfd8326b2279d1a81b3fe8b9fae30ae9d23441d8e9583a1d3047ac4722f909f365469ece7e5022f7
-EBUILD maxima-5.28.0.ebuild 5123 SHA256 9c0a5e602d39f13127ae0d82ab2894217655d7d3c951dcd85f173ed4ce62cda4 SHA512 8fab2bd75d2b3a28e0067ad327d02518c501fd776ed46fc2c1f383c6a431f2ea9251b4b7290d14d3f1b8d68b1adbc49fec66de678bc9995afa90ef20aad1addf WHIRLPOOL de2c96b0d4b0d9e35c2a345944328bc9c5f51a75e130016d64710d6ba71057a11e80935fd4c7af17cb00838f17cc1c504670fc27c288824131430af0a99fc194
-MISC ChangeLog 22679 SHA256 d9ebc0afd9b356529ead99500c449c7e79ca5fa2ca45a3fccbcce68710c795de SHA512 5b260953caabdd6e81e65a58b324aad058c7b4a592ca8a839c76d2446f70ed64896e99a5314514df45d11e8a0b5920d29dfba084a902ed9f53d2e36cb4895680 WHIRLPOOL ce0dea2369a8122a29bb507b45f4351a23cf98fa2c9da5b50e159bdca0e46f1e6fcda72fbe22985fd6ab43f80af72bfd46c72a2d78c07e4890751e5b6d75a5ec
+EBUILD maxima-5.28.0.ebuild 5162 SHA256 ea8263fbeb3aff1bb9d43c26fd1e0f5a46d4aa95c93a506d817f62ff2ee61c55 SHA512 0deadd2a78cbba228661bce49bb9c2e98ec6878a72c93496c6791494807aebc7aea969e46287caaf383a97231008a396dbf1c8f43e122f072bced851e4140d98 WHIRLPOOL 323498fdac2e59b91efaee47622d10d97e256a730eb9e067383b9a9bdf2ec9a682815ae633ca230c9fb1ae79f66febf1969ff6c78b5f8837f451a0330c601962
+MISC ChangeLog 22955 SHA256 542ed74642b2f181bde196a5b7cfdc97776df9f97283c5c948d8988a2ab263b2 SHA512 9c709523d35fae0d9fd4c717926759c1fe32ff530218e07875e495bfe9a2b22c7945af1969e628f4ff0a44117fba27b9820fc71aa755e802618614e5f53e7b18 WHIRLPOOL d60cdc7ef530446126c5753a78a595eba95bf8f31800ec9753934da18cbb5993a1bd0cb2abacbfe79ab2f917f326ce2e81398297d8daaf422607726bea2671c0
 MISC metadata.xml 1316 SHA256 c5b7768087c365de73e5fe1458c72155134c0db19d6d9e22527e7dc0c5f99f50 SHA512 b7a7af7e6342b140b1d2a09ecb3a4a59107fe23bf0bfb63ca8c344e5960d7f3ac64e0b19f516333e34ab878e82fef58bdb447c0110058b09aa66870ba2f836a7 WHIRLPOOL 3cae3e8642d61d403bc5f82d5471c3b4d48670bcabec9af35309f95dfe4bba7306581d7e8f38f4dd7c45da9d56d0eec92fc71a7a7cff778ea78673fe5b857385
diff --git a/sci-mathematics/maxima/files/maxima-5.28.0-sbcl.patch b/sci-mathematics/maxima/files/maxima-5.28.0-sbcl.patch
index ebb094bfb839..66a583e0adba 100644
--- a/sci-mathematics/maxima/files/maxima-5.28.0-sbcl.patch
+++ b/sci-mathematics/maxima/files/maxima-5.28.0-sbcl.patch
@@ -1,8 +1,8 @@
-diff -r -U1 maxima-5.28.0.orig/src/Makefile.in maxima-5.28.0/src/Makefile.in
---- maxima-5.28.0.orig/src/Makefile.in	2012-08-13 04:21:58.000000000 +0700
-+++ maxima-5.28.0/src/Makefile.in	2012-08-15 18:16:12.000000000 +0700
-@@ -235,3 +235,3 @@
- @SBCL_EXEC_TRUE@SBCL_INST_MAXIMA = $(INSTALL_PROGRAM) $(SBCL_MAXIMA) "$(DESTDIR)$(verpkglibdir)/$(SBCL_MAXIMA)"
--@SBCL_TRUE@EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --eval
-+@SBCL_TRUE@EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --sysinit /dev/null --userinit /dev/null --eval
- @GCL_TRUE@EXECUTEGCL = $(GCL_NAME) -batch -eval
+diff -r -U1 maxima-5.28.0.orig/src/Makefile.am maxima-5.28.0/src/Makefile.am
+--- maxima-5.28.0.orig/src/Makefile.am	2012-06-15 12:21:34.000000000 +0700
++++ maxima-5.28.0/src/Makefile.am	2012-08-25 09:32:26.000000000 +0700
+@@ -199,3 +199,3 @@
+ if SBCL
+-EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --eval
++EXECUTESBCL = "$(SBCL_NAME)" --noinform --noprint --no-sysinit --no-userinit --eval
+ all-local: sharefiles.mk $(SBCL_MAXIMA)
diff --git a/sci-mathematics/maxima/files/maxima-5.28.0.patch b/sci-mathematics/maxima/files/maxima-5.28.0.patch
index ef20b4979cff..c8bd4191dda8 100644
--- a/sci-mathematics/maxima/files/maxima-5.28.0.patch
+++ b/sci-mathematics/maxima/files/maxima-5.28.0.patch
@@ -1,11 +1,3 @@
-diff -r -U1 maxima-5.28.0.orig/configure.in maxima-5.28.0/configure.in
---- maxima-5.28.0.orig/configure.in	2012-08-12 23:17:53.000000000 +0700
-+++ maxima-5.28.0/configure.in	2012-08-15 21:47:42.000000000 +0700
-@@ -350,3 +350,3 @@
- dnl n.b. openmcl_default_name is hardcoded in "with" message
--openmcl_default_name=openmcl
-+openmcl_default_name=ccl
- AC_ARG_ENABLE(openmcl,
 diff -r -U1 maxima-5.28.0.orig/src/maxima.in maxima-5.28.0/src/maxima.in
 --- maxima-5.28.0.orig/src/maxima.in	2012-06-15 12:21:34.000000000 +0700
 +++ maxima-5.28.0/src/maxima.in	2012-08-15 21:46:37.000000000 +0700
@@ -41,6 +33,14 @@ diff -r -U1 maxima-5.28.0.orig/src/maxima.in maxima-5.28.0/src/maxima.in
 -	    exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
 +	    exec "@CMUCL_NAME@" $MAXIMA_LISP_OPTIONS -quiet -nositeinit -noinit -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
  	fi
+@@ -183,5 +183,5 @@
+     if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+-      exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++      exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+     else
+-      exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
++      exec "@OPENMCL_NAME@" -I "$maxima_image_base.image" $MAXIMA_LISP_OPTIONS --no-init -e '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    fi
 @@ -196,5 +196,5 @@
    if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
 -    exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" --noinform $MAXIMA_LISP_OPTIONS --end-runtime-options --eval '(cl-user::run)' --end-toplevel-options "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
diff --git a/sci-mathematics/maxima/files/maxima-ccl.patch b/sci-mathematics/maxima/files/maxima-ccl.patch
new file mode 100644
index 000000000000..6e746740b0af
--- /dev/null
+++ b/sci-mathematics/maxima/files/maxima-ccl.patch
@@ -0,0 +1,8 @@
+diff -r -U1 maxima-5.28.0.orig/configure.in maxima-5.28.0/configure.in
+--- maxima-5.28.0.orig/configure.in	2012-08-12 23:17:53.000000000 +0700
++++ maxima-5.28.0/configure.in	2012-08-15 21:47:42.000000000 +0700
+@@ -350,3 +350,3 @@
+ dnl n.b. openmcl_default_name is hardcoded in "with" message
+-openmcl_default_name=openmcl
++openmcl_default_name=ccl
+ AC_ARG_ENABLE(openmcl,
diff --git a/sci-mathematics/maxima/maxima-5.28.0.ebuild b/sci-mathematics/maxima/maxima-5.28.0.ebuild
index cd8018f07e92..62fe3722dff1 100644
--- a/sci-mathematics/maxima/maxima-5.28.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.28.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.28.0.ebuild,v 1.1 2012/08/15 16:40:41 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/maxima-5.28.0.ebuild,v 1.2 2012/08/25 04:10:19 grozin Exp $
 
 EAPI=3
 
@@ -102,9 +102,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-xdg-utils.patch
 
 	# Don't use lisp init files
-	# ClozureCL (former OpenMCL) executable name is ccl
 	epatch "${FILESDIR}"/${P}.patch
 
+	# ClozureCL (former OpenMCL) executable name is ccl
+	epatch "${FILESDIR}"/${PN}-ccl.patch
+
 	# make xmaxima conditional on tk (wish)
 	epatch "${FILESDIR}"/${P}-wish.patch