Fix maxima-rmaxima.patch for cases when maxima is compiled by several lisps, some support readline, some not

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

3 files changed, 25 insertions, 15 deletions

diff --git a/sci-mathematics/maxima/ChangeLog b/sci-mathematics/maxima/ChangeLog
index a0a36729816b..fa888ad2a2ef 100644
--- a/sci-mathematics/maxima/ChangeLog
+++ b/sci-mathematics/maxima/ChangeLog
@@ -1,6 +1,10 @@
 # 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.100 2012/08/25 04:10:19 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/maxima/ChangeLog,v 1.101 2012/10/30 16:38:03 grozin Exp $
+
+  30 Oct 2012; Andrey Grozin <grozin@gentoo.org> files/maxima-rmaxima.patch:
+  Fix maxima-rmaxima.patch for cases when maxima is compiled by several lisps,
+  some support readline, some not
 
   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,
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index f45c5c44727d..27e49e28b50e 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -12,7 +12,7 @@ AUX maxima-ccl.patch 372 SHA256 2190a51fbb51119b822222c93669f29b5fcc14c96510f87a
 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
-AUX maxima-rmaxima.patch 481 SHA256 e918a1e2aa01f44518829013b0b6bafb276f7752503bfe43f21dcefadca1f3d6 SHA512 45f0a81b31b178622880f11db0bfa2082411ba040ee7154782e6d764651a8d564016273aafd8fb55469b2384fe84b2071da625648c5a187bc5a5155b1c50bdeb WHIRLPOOL 81173a750edc27f442eed4ca8589755b47afa73e131aa1285fad7b55a3742ad9a7da65fb75ecf881e0bd8565fe736725599abcae3528a5f2f2cb8b74355bfc1e
+AUX maxima-rmaxima.patch 552 SHA256 73cc45185ee9de683686348e11ed4135a498a1a65cc61b80cf1407c6ec49b133 SHA512 a60c8c5ac23b0342823fbcd15e27f44ea85652640271ea845e383796422fa416b221dd036eb0a1639f70f9b09473471657612c7a5f99892cfb214d52156a6907 WHIRLPOOL a328f28ecf817b77f621d46652df8450e47855614e51f0760be0ac0d9d7e5886956d3ce108e2acdae88b81c2dc8f3cadafe3693529c452d076937b70a9a6256f
 AUX maxima-xdg-utils.patch 1090 SHA256 99c600c4c7e813305da375a4afa4a5e7ea6aa4ec9f1ecc051b9c913281af53ea SHA512 31b121a2d6f1c24e5f2fa3e6129f661a891660665bf45a2907146e3bae9309d185f83d7001287df92a73aff81562a7011ad6b92e03516883bc0ae0730570fa38 WHIRLPOOL 1aee0e9b00d7991b6d07b954927b152f1a5effddf3dca79b11ba47203f8be8b2d8432feb394295d77fc7669e9c3c8f9e0dd8d4fefc9657270d20e033f5fb49d7
 DIST maxima-5.18.1.tar.gz 20440947 SHA256 eef1f70503755ec8fb311a13731044e6fff17e6fd9534eb6bea68a12964d94bf
 DIST maxima-5.26.0.tar.gz 26047841 SHA256 887105c99a91122f3e622472aa39bdd1ca8ed6198cf09b49917f63f8396dced9
@@ -22,5 +22,5 @@ EBUILD maxima-5.18.1.ebuild 4197 SHA256 8a94a0d0b12ba9e2e99968e9dff248b8d18403b2
 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 5162 SHA256 ea8263fbeb3aff1bb9d43c26fd1e0f5a46d4aa95c93a506d817f62ff2ee61c55 SHA512 0deadd2a78cbba228661bce49bb9c2e98ec6878a72c93496c6791494807aebc7aea969e46287caaf383a97231008a396dbf1c8f43e122f072bced851e4140d98 WHIRLPOOL 323498fdac2e59b91efaee47622d10d97e256a730eb9e067383b9a9bdf2ec9a682815ae633ca230c9fb1ae79f66febf1969ff6c78b5f8837f451a0330c601962
-MISC ChangeLog 22955 SHA256 542ed74642b2f181bde196a5b7cfdc97776df9f97283c5c948d8988a2ab263b2 SHA512 9c709523d35fae0d9fd4c717926759c1fe32ff530218e07875e495bfe9a2b22c7945af1969e628f4ff0a44117fba27b9820fc71aa755e802618614e5f53e7b18 WHIRLPOOL d60cdc7ef530446126c5753a78a595eba95bf8f31800ec9753934da18cbb5993a1bd0cb2abacbfe79ab2f917f326ce2e81398297d8daaf422607726bea2671c0
+MISC ChangeLog 23146 SHA256 a0625b8d244bc7b5e7dd1a98cc8729bde651c2a11716c92ef46486dee09ad2f3 SHA512 13087f4ef1a1d0e5d38ae4af9fcf1915f7f87b213112f7e18f6a0ff8df3aa46494094ec3476f0490241605ea5b8198a4f7c4408431483fb6940ede662a1b56f7 WHIRLPOOL 0c9f4fc78362ab4b408e4fb204246660bb8a0cf41a3709da3c6b8383b95c82b0b54e168cacade656e6c3dcc5b23bf97b27960483d12d7fa4120893d7d5b11e7f
 MISC metadata.xml 1316 SHA256 c5b7768087c365de73e5fe1458c72155134c0db19d6d9e22527e7dc0c5f99f50 SHA512 b7a7af7e6342b140b1d2a09ecb3a4a59107fe23bf0bfb63ca8c344e5960d7f3ac64e0b19f516333e34ab878e82fef58bdb447c0110058b09aa66870ba2f836a7 WHIRLPOOL 3cae3e8642d61d403bc5f82d5471c3b4d48670bcabec9af35309f95dfe4bba7306581d7e8f38f4dd7c45da9d56d0eec92fc71a7a7cff778ea78673fe5b857385
diff --git a/sci-mathematics/maxima/files/maxima-rmaxima.patch b/sci-mathematics/maxima/files/maxima-rmaxima.patch
index db8e87380591..712cbda19d45 100644
--- a/sci-mathematics/maxima/files/maxima-rmaxima.patch
+++ b/sci-mathematics/maxima/files/maxima-rmaxima.patch
@@ -1,19 +1,25 @@
---- src/Makefile.am.orig	2010-02-01 21:58:17.353941395 +1300
-+++ src/Makefile.am	2010-02-01 22:09:12.859975783 +1300
-@@ -3,8 +3,16 @@
- if WIN32
+diff -r -U2 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-10-30 22:22:29.000000000 +0700
+@@ -4,5 +4,21 @@
  bin_SCRIPTS = maxima maxima-command.ico maxima.bat set_lang.vbs
  else
-+if CLISP
-+bin_SCRIPTS = maxima
++if SBCL
+ bin_SCRIPTS = maxima rmaxima
 +else
-+if GCL
-+bin_SCRIPTS = maxima
++if CMUCL
++bin_SCRIPTS = maxima rmaxima
 +else
- bin_SCRIPTS = maxima rmaxima
- endif
++if ECL
++bin_SCRIPTS = maxima rmaxima
++else
++if OPENMCL
++bin_SCRIPTS = maxima rmaxima
++else
++bin_SCRIPTS = maxima
++endif
 +endif
 +endif
++endif
+ endif
  
- LOADDEFSYSTEM = (load "$(top_srcdir)/lisp-utils/defsystem.lisp")
- LOADMAKEPROCLAIM = (load "$(top_srcdir)/lisp-utils/make-proclaim.lisp")