[gentoo-commits] gentoo-x86 commit in media-sound/cm: ChangeLog cm-2.10.0-r1.ebuild cm-2.4.2.ebuild

[gentoo-commits] gentoo-x86 commit in media-sound/cm: ChangeLog cm-2.10.0-r1.ebuild cm-2.4.2.ebuild

[Marijn Schouten (hkbst)]

hkbst       07/10/07 15:38:34

  Modified:             ChangeLog
  Added:                cm-2.10.0-r1.ebuild
  Removed:              cm-2.4.2.ebuild
  Log:
  fix emacs support, bug 194985, thanks to ulm and add quoting where necessary, remove old 2.4.2 stuff
  (Portage version: 2.1.3.12)

Revision  Changes    Path
1.24                 media-sound/cm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/cm/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/cm/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/cm/ChangeLog?r1=1.23&r2=1.24

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/cm/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog	18 Apr 2007 17:44:34 -0000	1.23
+++ ChangeLog	7 Oct 2007 15:38:33 -0000	1.24
@@ -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



1.1                  media-sound/cm/cm-2.10.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/cm/cm-2.10.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/cm/cm-2.10.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: cm-2.10.0-r1.ebuild
===================================================================
# 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
}



-- 
gentoo-commits@gentoo.org mailing list