fix emacs support, bug 194985, thanks to ulm and add quoting where necessary, remove old 2.4.2 stuff

Package-Manager: portage-2.1.3.12

7 files changed, 155 insertions, 65 deletions

diff --git a/media-sound/cm/ChangeLog b/media-sound/cm/ChangeLog
index bce36f9404c5..b69705ac8dfa 100644
--- a/media-sound/cm/ChangeLog
+++ b/media-sound/cm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/cm
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/ChangeLog,v 1.23 2007/04/18 17:44:34 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/ChangeLog,v 1.24 2007/10/07 15:38:33 hkbst Exp $
+
+  07 Oct 2007; Marijn Schouten <hkBst@gentoo.org> +files/50cm-gentoo.el,
+  -cm-2.4.2.ebuild, +cm-2.10.0-r1.ebuild:
+  remove old 2.4.2 stuff
+
+*cm-2.10.0-r1 (07 Oct 2007)
+
+  07 Oct 2007; Marijn Schouten <hkBst@gentoo.org> +files/50cm-gentoo.el,
+  +cm-2.10.0-r1.ebuild:
+  fix emacs support, bug 194985, thanks to ulm and add quoting where necessary
 
   18 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> cm-2.10.0.ebuild:
   Stable on sparc wrt #75754
diff --git a/media-sound/cm/Manifest b/media-sound/cm/Manifest
index 256c5b37bfa8..ba35e9beaee3 100644
--- a/media-sound/cm/Manifest
+++ b/media-sound/cm/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 50cm-gentoo.el 149 RMD160 b8608abc8f81d600377dc19e9051eb0b68e31c1a SHA1 321c03c31417467ef0d77021838f8ceebe79b789 SHA256 bd1e777d363b6cbf54339605181f42f7d84598f3f6b069a25647e05a2f80e220
+MD5 68b24947c239d5db7e5a377c841cee09 files/50cm-gentoo.el 149
+RMD160 b8608abc8f81d600377dc19e9051eb0b68e31c1a files/50cm-gentoo.el 149
+SHA256 bd1e777d363b6cbf54339605181f42f7d84598f3f6b069a25647e05a2f80e220 files/50cm-gentoo.el 149
 AUX 71cm-gentoo.el 108 RMD160 746351e33fddf06cbfcbfaea0e3578aee4fb3dbf SHA1 fbc68009114f8e5125c79d7fac833bb86c976294 SHA256 f502bb5fe21aedea040e93d5f624b8dd581d236dafa19f9d2223c7c657f3c6e2
 MD5 b5ed20e1434b89de424fc0c6222172d8 files/71cm-gentoo.el 108
 RMD160 746351e33fddf06cbfcbfaea0e3578aee4fb3dbf files/71cm-gentoo.el 108
@@ -10,19 +11,18 @@ MD5 39b2e2aa6a9ea57538cfaf1b1967f197 files/cm-2.4.0-exec 160
 RMD160 211a00bc0fc39b97bceeff17993d11a8363a4386 files/cm-2.4.0-exec 160
 SHA256 ec626a312cb37bf29f7ccc84f8d318382749733839d28948c4a57c6d0e525bdf files/cm-2.4.0-exec 160
 DIST cm-2.10.0.tar.gz 820936 RMD160 5c92ad48576c9fa556499908bcafe5f652465d1f SHA1 27d026f504da47d3e00192a68274bb479b9e27db SHA256 e642afd790c936998e48258c0c1a8cd854a5cdabd2ac635e6936dca1cfff741a
-DIST cm-2.4.2.tar.gz 463552 RMD160 d3812c97b5d0a211b903867a04c37281f5e86929 SHA1 f1b3c51d607c83804762f01a284be69d504ed0c0 SHA256 b0c0229b6c7d011eb62bdc6a201ab80518abe0b7fcb8a1901d4f85771ea2d094
+EBUILD cm-2.10.0-r1.ebuild 2782 RMD160 cb865fda375c5b7a9ab43a8ff631acabecb60d75 SHA1 1feaefe7869a8179a58ac7389b723142891ddfe8 SHA256 6028e3bfc801a3f9cc92cb31f4b0c296d453be94d13e19d1757e01a4ddbaa48e
+MD5 e74fb788f4587efc94516931eb7f582d cm-2.10.0-r1.ebuild 2782
+RMD160 cb865fda375c5b7a9ab43a8ff631acabecb60d75 cm-2.10.0-r1.ebuild 2782
+SHA256 6028e3bfc801a3f9cc92cb31f4b0c296d453be94d13e19d1757e01a4ddbaa48e cm-2.10.0-r1.ebuild 2782
 EBUILD cm-2.10.0.ebuild 2641 RMD160 6161da26852a9e1bba93aeaa12d8ab115a6fdaec SHA1 872ad6bf5e2d651b08d027a6bf250b2c278910b9 SHA256 b652793016f987d275e34b04c72371bd94b06348c3d64ee6f6fa11d3332e8d1b
 MD5 e8353cf0d62644d1bf99d1978e7743c3 cm-2.10.0.ebuild 2641
 RMD160 6161da26852a9e1bba93aeaa12d8ab115a6fdaec cm-2.10.0.ebuild 2641
 SHA256 b652793016f987d275e34b04c72371bd94b06348c3d64ee6f6fa11d3332e8d1b cm-2.10.0.ebuild 2641
-EBUILD cm-2.4.2.ebuild 969 RMD160 5edc45d759e9d96e3169e5b0b042751ee53a512d SHA1 fae9c063dd746e4f6eaed18ee2ea67fc6e6382d4 SHA256 82aba57bcea91eabb76f7d41fd43731686101b079006c1b5a823cd58e357024d
-MD5 8fee618b6ad18d603396fa99131f450f cm-2.4.2.ebuild 969
-RMD160 5edc45d759e9d96e3169e5b0b042751ee53a512d cm-2.4.2.ebuild 969
-SHA256 82aba57bcea91eabb76f7d41fd43731686101b079006c1b5a823cd58e357024d cm-2.4.2.ebuild 969
-MISC ChangeLog 2766 RMD160 9dd4465c03b89a16e798774ba58b462241192d6d SHA1 0b736a27a56f8a6fbf4709969f96ae7a2bbd4cd8 SHA256 2c6cfef14df4a3090c2a5e554001fd9a93c7776dca4d765a803f36d24fc33ad0
-MD5 af934210df46396763621360eda98b64 ChangeLog 2766
-RMD160 9dd4465c03b89a16e798774ba58b462241192d6d ChangeLog 2766
-SHA256 2c6cfef14df4a3090c2a5e554001fd9a93c7776dca4d765a803f36d24fc33ad0 ChangeLog 2766
+MISC ChangeLog 3110 RMD160 6d8376e83ac1c206ef8c111fd4b261ae3124161e SHA1 cc0d020ce21ad3f14fe23f9f35ee8a675c285931 SHA256 ffb173cffdde422553f4f3adb3dee9e7fd0c70a89af59f9d835bb930f2096a66
+MD5 b1aa413570e2f00754050581b365cd8a ChangeLog 3110
+RMD160 6d8376e83ac1c206ef8c111fd4b261ae3124161e ChangeLog 3110
+SHA256 ffb173cffdde422553f4f3adb3dee9e7fd0c70a89af59f9d835bb930f2096a66 ChangeLog 3110
 MISC metadata.xml 669 RMD160 12972f8765a7931405d2b22c991d7eed58a96bbe SHA1 162128d4edc1e71067fea37aa97a785c4e21af34 SHA256 605b20bb2e49617d12d1c5a7128ba4cea5727aed2c63706cd1f426aa5e7fe3b1
 MD5 f456c6e5b31a1330d69ddf93c495bf5d metadata.xml 669
 RMD160 12972f8765a7931405d2b22c991d7eed58a96bbe metadata.xml 669
@@ -30,13 +30,6 @@ SHA256 605b20bb2e49617d12d1c5a7128ba4cea5727aed2c63706cd1f426aa5e7fe3b1 metadata
 MD5 62fd0cb5934220f97360a71fbc237354 files/digest-cm-2.10.0 229
 RMD160 99b7de8c70b62b38bfe7bf9977b12a82b9f3e9ea files/digest-cm-2.10.0 229
 SHA256 e5bf400cb844b7d63b5874c2df7af053fdd33240578fd115d80dd33c14092583 files/digest-cm-2.10.0 229
-MD5 33c2c17a13ccaf8e9911397616b2acc1 files/digest-cm-2.4.2 226
-RMD160 1308886b2b94e0487fd93e70ec4a69c507126066 files/digest-cm-2.4.2 226
-SHA256 0184796e9f7e62abf97203d2593834a85bed7db83e4a00cb9fd0f900fc583b9c files/digest-cm-2.4.2 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
-
-iD8DBQFGJlkKKRy60XGEcJIRArgYAJ4kaixLmC2sZBEw00QdhynFklMyaACfa3FV
-BJB4hwWpXjLcQy9MIZ9ZUdo=
-=I81H
------END PGP SIGNATURE-----
+MD5 62fd0cb5934220f97360a71fbc237354 files/digest-cm-2.10.0-r1 229
+RMD160 99b7de8c70b62b38bfe7bf9977b12a82b9f3e9ea files/digest-cm-2.10.0-r1 229
+SHA256 e5bf400cb844b7d63b5874c2df7af053fdd33240578fd115d80dd33c14092583 files/digest-cm-2.10.0-r1 229
diff --git a/media-sound/cm/cm-2.10.0-r1.ebuild b/media-sound/cm/cm-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..0cbe48e3e55a
--- /dev/null
+++ b/media-sound/cm/cm-2.10.0-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cm/cm-2.10.0-r1.ebuild,v 1.1 2007/10/07 15:38:33 hkbst Exp $
+
+inherit elisp-common
+
+DESCRIPTION="Common Music: An object oriented music composition environment in LISP/scheme"
+HOMEPAGE="http://commonmusic.sourceforge.net"
+SRC_URI="mirror://sourceforge/commonmusic/${P}.tar.gz"
+
+LICENSE="LLGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+COMPILERS="dev-lisp/openmcl
+	>=dev-lisp/sbcl-1.0.1
+	dev-lisp/cmucl
+	dev-lisp/clisp"
+
+INTERPRETERS="dev-lisp/ecls
+	dev-scheme/guile
+	dev-scheme/gauche"
+
+DEPEND="|| ( ${COMPILERS} ${INTERPRETERS} )
+		emacs? ( virtual/emacs >=app-emacs/slime-2.0 )
+		test? ( app-shells/tcsh )"
+RDEPEND="${DEPEND}"
+
+IUSE="doc emacs test"
+
+S="${WORKDIR}/${PN}"
+
+SITEFILE=50${PN}-gentoo.el
+
+# for easy testing of any implementation
+#FORCEIMPL="guile"
+#FORCEIMPL="sbcl"
+
+CM="${S}/bin/cm.sh -R . -l \"\${FORCEIMPL}\""
+#echo "${CM}"
+
+implementation() {
+	if [[ ! -z "${FORCEIMPL}" ]]; then
+		echo "${FORCEIMPL}"
+		return
+	fi
+	local impl=$(bin/cm.sh -nv | grep Executable)
+	impl=${impl##*bin/}
+	echo ${impl}
+}
+
+is_lisp() {
+	local impl="$(implementation)"
+#	echo ${impl}
+	if [[ ${impl} == "guile" || ${impl} == "gauche" ]]; then
+		return $(false)
+	fi
+	return $(true)
+}
+
+is_compiler() {
+	local impl="$(implementation)"
+#	echo ${impl}
+	if [[ -z $(echo ${COMPILERS} | grep -i ${impl}) ]]; then
+		return $(false)
+	fi
+	return $(true)
+}
+
+src_compile() {
+	if use emacs; then
+		elisp-compile etc/xemacs/*.el || die "Compiling emacs code failed"
+	fi
+
+	einfo "Detected $(is_compiler && echo "compiler" || echo "interpreter"): $(implementation)"
+
+	if is_compiler; then
+		einfo "Byte-compiling code"
+		echo '(quit)' | eval ${CM}
+	fi
+}
+
+src_test() {
+#	echo   "(if '()\
+#		(begin (display \"scheme\") (load \"etc/test.cm\") (test-cm))\
+#		(progn (format t \"commonlisp\") (load \"etc/test.cm\") (test-cm)))"\
+#		| eval ${CM}
+
+	echo '(load "etc/test.cm")(test-cm)' | eval ${CM}
+}
+
+src_install() {
+	insinto /usr/share/${PN}/
+	for dir in "bin etc src"; do
+		doins -r ${dir}
+	done;
+	doins cm.asd
+	chmod +x "${D}"/usr/share/${PN}/bin/cm.sh
+	dosym /usr/share/${PN}/bin/cm.sh /usr/bin/${PN}
+
+	mv doc/changelog.text .
+	dodoc readme.text changelog.text
+
+	use doc && dohtml -r doc/*
+
+	if use emacs; then
+		elisp-install ${PN} etc/xemacs/*.{el,elc} || die "Installing emacs files failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die "Installing sitefile failed"
+	fi
+}
+
+pkg_postinst() {
+	# make compiled lisp code newer than source files to prevent recompilation
+	sleep 1 && find "${ROOT}"/usr/share/${PN}/bin/ -iname *fasl -exec touch '{}' \;
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/cm/cm-2.4.2.ebuild b/media-sound/cm/cm-2.4.2.ebuild
deleted file mode 100644
index 81594face00d..000000000000
--- a/media-sound/cm/cm-2.4.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 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.10 2007/01/10 19:47:14 peper Exp $
-
-IUSE="doc"
-
-DESCRIPTION="Common Music: An object oriented music composition environment in LISP/scheme"
-HOMEPAGE="http://commonmusic.sourceforge.net"
-SRC_URI="mirror://sourceforge/commonmusic/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-DEPEND=">=dev-scheme/guile-1.6.4"
-
-src_install() {
-	newbin ${FILESDIR}/${PN}-2.4.0-exec ${PN}
-
-	# the installer part needs the bin dir created
-	keepdir /usr/share/${PN}/bin
-
-	insinto /usr/share/${PN}/src
-	doins ${S}/src/*
-
-	insinto /usr/share/${PN}/etc
-	doins ${S}/etc/*
-
-	insinto /usr/share/${PN}/contrib
-	doins ${S}/etc/contrib/*
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/examples
-		doins ${S}/etc/examples/*
-		dohtml -r doc/*
-	fi
-
-	dodoc ${S}/readme.text ${S}/doc/changelog.text
-}
diff --git a/media-sound/cm/files/50cm-gentoo.el b/media-sound/cm/files/50cm-gentoo.el
new file mode 100644
index 000000000000..6dd077d7a6f9
--- /dev/null
+++ b/media-sound/cm/files/50cm-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; media-sound/cm initialisation
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'cm "cm" "Start CM" t)
+(autoload 'enable-cm-commands "cm" nil t)
diff --git a/media-sound/cm/files/digest-cm-2.10.0-r1 b/media-sound/cm/files/digest-cm-2.10.0-r1
new file mode 100644
index 000000000000..10d58e6f3f86
--- /dev/null
+++ b/media-sound/cm/files/digest-cm-2.10.0-r1
@@ -0,0 +1,3 @@
+MD5 9b674af1786b3f1be594548822c8a226 cm-2.10.0.tar.gz 820936
+RMD160 5c92ad48576c9fa556499908bcafe5f652465d1f cm-2.10.0.tar.gz 820936
+SHA256 e642afd790c936998e48258c0c1a8cd854a5cdabd2ac635e6936dca1cfff741a cm-2.10.0.tar.gz 820936
diff --git a/media-sound/cm/files/digest-cm-2.4.2 b/media-sound/cm/files/digest-cm-2.4.2
deleted file mode 100644
index c445fd58783b..000000000000
--- a/media-sound/cm/files/digest-cm-2.4.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2f33e9dac1aff473ae1af1ca38d4ec96 cm-2.4.2.tar.gz 463552
-RMD160 d3812c97b5d0a211b903867a04c37281f5e86929 cm-2.4.2.tar.gz 463552
-SHA256 b0c0229b6c7d011eb62bdc6a201ab80518abe0b7fcb8a1901d4f85771ea2d094 cm-2.4.2.tar.gz 463552