Added ~amd64 ~sparc.

4 files changed, 15 insertions, 40 deletions

diff --git a/media-sound/cm/ChangeLog b/media-sound/cm/ChangeLog
index bac798d91f1d..1730c7eee70a 100644
--- a/media-sound/cm/ChangeLog
+++ b/media-sound/cm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/cm
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/ChangeLog,v 1.6 2004/06/24 23:55:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/ChangeLog,v 1.7 2004/07/06 07:10:46 eradicator Exp $
+
+  05 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cm-2.4.2.ebuild:
+  Added ~amd64 ~sparc.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> cm-2.4.0.ebuild,
   cm-2.4.2.ebuild:
diff --git a/media-sound/cm/cm-2.4.0.ebuild b/media-sound/cm/cm-2.4.0.ebuild
index 4ce0d3fb010b..601038b4e097 100644
--- a/media-sound/cm/cm-2.4.0.ebuild
+++ b/media-sound/cm/cm-2.4.0.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/cm-2.4.0.ebuild,v 1.10 2004/06/24 23:55:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/cm-2.4.0.ebuild,v 1.11 2004/07/06 07:10:46 eradicator Exp $
 
 IUSE=""
 
 DESCRIPTION="Common Music: An object oriented music composition environment in LISP/scheme"
-HOMEPAGE="http://www-ccrma.stanford.edu/software/cm/doc/cm.html"
-SRC_URI="ftp://ftp-ccrma.stanford.edu/pub/Lisp/cm/sources/${P}.tar.gz"
+HOMEPAGE="http://commonmusic.sourceforge.net"
+SRC_URI="mirror://sourceforge/commonmusic/${P}.tar.gz"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,22 +35,6 @@ src_install() {
 	doins ${S}/etc/examples/*
 	dohtml -r doc/*
 	dodoc ${S}/readme.text ${S}/doc/changelog.text
-}
 
-pkg_postinst() {
-	# when the package is first run it generates the cm script
-	# that will load the necessary source files into guile when run
-	guile -c "(load \"/usr/share/cm/src/cm.scm\")"
-	ln /usr/share/cm/bin/cm /usr/bin/cm
-	chmod +x /usr/bin/cm
+	newexe ${FILESDIR}/${PN}-2.4.0-exec ${PN}
 }
-
-# This will break upgrades... find a better way
-#pkg_prerm() {
-#	if [ -e /usr/bin/cm ]; then
-#	    rm /usr/bin/cm
-#	fi
-#	if [ -e /usr/share/cm/bin ]; then
-#		rm -rf /usr/share/cm/bin
-#	fi
-#}
diff --git a/media-sound/cm/cm-2.4.2.ebuild b/media-sound/cm/cm-2.4.2.ebuild
index 9187eb9a6ce1..e5bc2db3ecd2 100644
--- a/media-sound/cm/cm-2.4.2.ebuild
+++ b/media-sound/cm/cm-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/cm-2.4.2.ebuild,v 1.5 2004/06/24 23:55:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/cm-2.4.2.ebuild,v 1.6 2004/07/06 07:10:46 eradicator Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~sparc ~amd64"
 
 DEPEND=">=dev-util/guile-1.6.4"
 
@@ -35,22 +35,6 @@ src_install() {
 	doins ${S}/etc/examples/*
 	dohtml -r doc/*
 	dodoc ${S}/readme.text ${S}/doc/changelog.text
-}
 
-pkg_postinst() {
-	# when the package is first run it generates the cm script
-	# that will load the necessary source files into guile when run
-	guile -c "(load \"/usr/share/cm/src/cm.scm\")"
-	ln /usr/share/cm/bin/cm /usr/bin/cm
-	chmod +x /usr/bin/cm
+	newexe ${FILESDIR}/${PN}-2.4.0-exec ${PN}
 }
-
-#This will break upgrades
-#pkg_prerm() {
-#	if [ -e /usr/bin/cm ]; then
-#	    rm /usr/bin/cm
-#	fi
-#	if [ -e /usr/share/cm/bin ]; then
-#		rm -rf /usr/share/cm/bin
-#	fi
-#}
diff --git a/media-sound/cm/files/cm-2.4.0-exec b/media-sound/cm/files/cm-2.4.0-exec
new file mode 100644
index 000000000000..9500f8e9aa7f
--- /dev/null
+++ b/media-sound/cm/files/cm-2.4.0-exec
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+guile -c '(begin (define cm-bin-directory "/usr/share/cm/bin/") (load "/usr/share/cm/src/cm.scm") (load "/usr/share/cm/bin/cminit.lisp") (top-repl))'
\ No newline at end of file