Fixing bugs #48496 and #48726 (-ppc added, passes on command line parameters)

5 files changed, 28 insertions, 16 deletions

diff --git a/app-sci/mupad/ChangeLog b/app-sci/mupad/ChangeLog
index 4b9a74fdb91c..8ac33c200fda 100644
--- a/app-sci/mupad/ChangeLog
+++ b/app-sci/mupad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-sci/mupad
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-sci/mupad/ChangeLog,v 1.3 2003/09/28 16:32:50 pyrania Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/app-sci/mupad/ChangeLog,v 1.4 2004/05/10 08:47:59 phosphan Exp $
+
+*mupad-2.5.2-r2 (10 May 2004)
+
+  10 May 2004; Patrick Kursawe <phosphan@gentoo.org> mupad-2.5.2-r2.ebuild,
+  mupad-2.5.2.ebuild:
+  Fixing bugs #48496 and #48726 (-ppc added, passes on command line parameters)
 
   28 Sep 2003; Markus Nigbur <pyrania@gentoo.org> mupad-2.5.2-r1.ebuild:
   Marked stable.
diff --git a/app-sci/mupad/Manifest b/app-sci/mupad/Manifest
index 8488dac2a16f..d21a08e645a6 100644
--- a/app-sci/mupad/Manifest
+++ b/app-sci/mupad/Manifest
@@ -1,6 +1,6 @@
-MD5 3a1b02b5ce2c4a65a75f7f1e8db570d6 mupad-2.5.2.ebuild 3084
 MD5 bca767e792941450cde1edef1a4d99e1 mupad-2.5.2-r1.ebuild 3154
 MD5 f8c1944906a21aff4137d084b99913c9 ChangeLog 1038
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 8d64dbf54dc083a501f670eca1b585bb mupad-2.5.2-r2.ebuild 3164
 MD5 4e05b1eb3ba3380509b9085086cad7ef files/digest-mupad-2.5.2-r1 249
-MD5 f8815e5e9d9c7c3ed0353c8a60025dff files/digest-mupad-2.5.2 249
+MD5 4e05b1eb3ba3380509b9085086cad7ef files/digest-mupad-2.5.2-r2 249
diff --git a/app-sci/mupad/files/digest-mupad-2.5.2 b/app-sci/mupad/files/digest-mupad-2.5.2-r2
index 233e5c712090..7030107e1ca5 100644
--- a/app-sci/mupad/files/digest-mupad-2.5.2
+++ b/app-sci/mupad/files/digest-mupad-2.5.2-r2
@@ -1,4 +1,4 @@
-MD5 1572d15a03bc31644b11bf9ca7023d0d bin_linux_scilab_252.tgz 9497255
 MD5 b7521edbe61835a1bf8187d404da6885 linux_libs.tgz 3806366
 MD5 e1615ed9f278783c7fab191e2f16c2da share_252.tgz 20261044
+MD5 1572d15a03bc31644b11bf9ca7023d0d bin_linux_scilab_252.tgz 9497255
 MD5 70d3d397f2f62c07651763932c591b17 docpatch25x.tgz 56937
diff --git a/app-sci/mupad/mupad-2.5.2-r1.ebuild b/app-sci/mupad/mupad-2.5.2-r1.ebuild
index c2f36513e25d..3b40621832c0 100644
--- a/app-sci/mupad/mupad-2.5.2-r1.ebuild
+++ b/app-sci/mupad/mupad-2.5.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/mupad/mupad-2.5.2-r1.ebuild,v 1.2 2003/09/28 16:32:50 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/mupad/mupad-2.5.2-r1.ebuild,v 1.3 2004/05/10 08:47:59 phosphan Exp $
 
 IUSE="mupad-noscilab"
 
diff --git a/app-sci/mupad/mupad-2.5.2.ebuild b/app-sci/mupad/mupad-2.5.2-r2.ebuild
index 2d36965110c1..7e3bdbf1afea 100644
--- a/app-sci/mupad/mupad-2.5.2.ebuild
+++ b/app-sci/mupad/mupad-2.5.2-r2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/mupad/mupad-2.5.2.ebuild,v 1.2 2003/06/21 07:26:28 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/mupad/mupad-2.5.2-r2.ebuild,v 1.1 2004/05/10 08:47:59 phosphan Exp $
+
+IUSE="mupad-noscilab"
 
 VER=`echo $PV|awk -F. '{ print $1$2$3 }'`
-URLPATH="http://www.ibiblio.org/pub/Linux/apps/math/MuPAD/distrib/unix"
+URLPATH="ftp://ftp.mupad.de/MuPAD/distrib/unix/"
 INSTDIR="/usr/lib/mupad"
 INSTBINDIR="${INSTDIR}/share/bin"
 BINDIR="/usr/bin"
@@ -11,7 +13,10 @@ BINDIR="/usr/bin"
 RESTRICT="nostrip"
 DESCRIPTION="MuPAD is an open computer algebra system"
 HOMEPAGE="http://www.mupad.de/index_uni.shtml"
-SRC_URI="${URLPATH}/bin_linux_scilab_${VER}.tgz ${URLPATH}/linux_libs.tgz ${URLPATH}/share_${VER}.tgz"
+
+SRC_URI="${URLPATH}/linux_libs.tgz
+	${URLPATH}/share_${VER}.tgz
+	${URLPATH}/bin_linux_scilab_${VER}.tgz"
 
 # If version is 2.5.2, download documentation patch
 if [ "${VER}" = "252" ] ; then
@@ -22,12 +27,11 @@ fi
 LICENSE="mupad"
 
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86 -ppc"
 IUSE=""
 DEPEND="virtual/glibc"
 RDEPEND="=dev-lang/tk-8.3*"
 
-
 src_unpack() {
 	echo -n ""
 }
@@ -63,16 +67,18 @@ src_install() {
 		# How do I get this do "die" if it fails?
 		cat > ${D}${BINDIR}/${FILE} <<-ENDOFSCRIPT
 			#!/bin/sh
-			exec ${INSTBINDIR}/${FILE}
+			exec ${INSTBINDIR}/${FILE} \$*
 		ENDOFSCRIPT
 		fperms 0755 ${BINDIR}/${FILE} || die
 	done
 
 	#move docs to the roper place
 	dodir /usr/share/doc/${PF}/
-	mv ${D}/usr/lib/mupad/share/{changes/*,copyright/*,doc/*} ${D}/usr/share/doc/${PF}/
-	rmdir ${D}/usr/lib/mupad/share/{changes,copyright,doc}
 	mv ${D}/usr/lib/mupad/{INSTALL,LICENSE} ${D}/usr/share/doc/${PF}/
+	for fn in changes copyright doc; do dosym /usr/lib/mupad/share/$fn /usr/share/doc/${PF}; done
+
+	#remove scilab stuff if user set the flag
+	use mupad-noscilab && rm -rf ${D}/usr/lib/mupad/packages/scilab/
 }
 
 pkg_postinst() {