summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-util/cmt/ChangeLog8
-rw-r--r--dev-util/cmt/cmt-1.20.20070720.ebuild28
-rw-r--r--dev-util/cmt/cmt-1.20.20080222.ebuild86
3 files changed, 108 insertions, 14 deletions
diff --git a/dev-util/cmt/ChangeLog b/dev-util/cmt/ChangeLog
index 12cb783db65d..0bca25adac03 100644
--- a/dev-util/cmt/ChangeLog
+++ b/dev-util/cmt/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-util/cmt
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.2 2008/02/13 07:28:13 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.3 2008/04/04 11:09:26 bicatali Exp $
+
+*cmt-1.20.20080222 (04 Apr 2008)
+
+ 04 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
+ cmt-1.20.20070720.ebuild, +cmt-1.20.20080222.ebuild:
+ Version bump and fixed bug ##216108 for bad install of demo directory.
13 Feb 2008; Christian Faulhammer <opfer@gentoo.org> metadata.xml:
add no-herd
diff --git a/dev-util/cmt/cmt-1.20.20070720.ebuild b/dev-util/cmt/cmt-1.20.20070720.ebuild
index e731324a47ec..d3c9f51181ba 100644
--- a/dev-util/cmt/cmt-1.20.20070720.ebuild
+++ b/dev-util/cmt/cmt-1.20.20070720.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.20.20070720.ebuild,v 1.1 2007/09/15 13:14:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.20.20070720.ebuild,v 1.2 2008/04/04 11:09:26 bicatali Exp $
inherit elisp-common toolchain-funcs versionator
@@ -20,11 +20,10 @@ DEPEND=""
RDEPEND="emacs? ( virtual/emacs )
java? ( virtual/jdk )"
-RESTRICT="test"
-S=${WORKDIR}/CMT/${CMT_PV}
+S="${WORKDIR}/CMT/${CMT_PV}"
src_compile() {
- cd mgr
+ cd "${S}"/mgr
./INSTALL
source setup.sh
emake -j1 \
@@ -45,28 +44,31 @@ src_install() {
dodir /usr/bin
dosym ${CMTDIR}/${CMTBIN}/cmt.exe /usr/bin/cmt
- echo "CMTROOT=\"${CMTDIR}\"" > 99cmt
- echo "CMTBIN=\"$(uname)-$(uname -m | sed -e 's# ##g')\"" >> 99cmt
- echo "CMTCONFIG=\"$(${CMTROOT}/mgr/cmt_system.sh)\"" >> 99cmt
-
+ cat > 99cmt <<-EOF
+ CMTROOT="${CMTDIR}"
+ CMTBIN="$(uname)-$(uname -m | sed -e 's# ##g')"
+ CMTCONFIG="$(${CMTROOT}/mgr/cmt_system.sh)"
+ EOF
if use java; then
cp -pPR java "${D}"/${CMTDIR}
echo "#!/bin/sh" > jcmt
echo "java cmt_parser" >> jcmt
exeinto /usr/bin
- doexe jcmt
+ doexe jcmt || die "doexe failed"
echo "CLASSPATH=\"${CMTDIR}/java/cmt.jar\"" >> 99cmt
fi
- doenvd 99cmt
+ doenvd 99cmt || die "doenvd failed"
dodoc ChangeLog doc/*.txt || die "dodoc failed"
dohtml doc/{ChangeLog,ReleaseNotes}.html || die "dohtml failed"
if use doc; then
cd "${S}"/mgr
- make gendoc || die "make gendoc failed"
+ emake gendoc || die "emake gendoc failed"
+ insinto /usr/share/doc/${PF}
cd "${S}"/doc
- dohtml -r CMTDoc.html Images CMTFAQ.html || die "dohtml failed"
+ doins -r {CMTDoc,CMTFAQ}.{html,pdf} Images || die "doc install failed"
+ cd "${S}"
doins -r demo || die "doins demo failed"
fi
diff --git a/dev-util/cmt/cmt-1.20.20080222.ebuild b/dev-util/cmt/cmt-1.20.20080222.ebuild
new file mode 100644
index 000000000000..ce331567694d
--- /dev/null
+++ b/dev-util/cmt/cmt-1.20.20080222.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.20.20080222.ebuild,v 1.1 2008/04/04 11:09:26 bicatali Exp $
+
+inherit elisp-common toolchain-funcs versionator
+
+CPV=($(get_version_components ${PV}))
+CMT_PV=v${CPV[0]}r${CPV[1]}p${CPV[2]}
+
+DESCRIPTION="Cross platform configuration management environment"
+HOMEPAGE="http://www.cmtsite.org/"
+SRC_URI="http://www.cmtsite.org/${CMT_PV}/CMT${CMT_PV}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs java doc"
+
+DEPEND=""
+RDEPEND="emacs? ( virtual/emacs )
+ java? ( virtual/jdk )"
+
+S="${WORKDIR}/CMT/${CMT_PV}"
+
+src_compile() {
+ cd "${S}"/mgr
+ ./INSTALL
+ source setup.sh
+ emake -j1 \
+ cpp="$(tc-getCXX)" \
+ cppflags="${CXXFLAGS}" \
+ || die "make failed"
+
+ sed -i -e "s:${WORKDIR}:/usr/$(get_libdir):g" setup.*sh
+ cd "${S}"
+ mv src/demo .
+ rm -f ${CMTBIN}/*.o
+}
+
+src_install() {
+ CMTDIR=/usr/$(get_libdir)/CMT/${CMT_PV}
+ dodir ${CMTDIR}
+ cp -pPR mgr src ${CMTBIN} "${D}"/${CMTDIR}
+ dodir /usr/bin
+ dosym ${CMTDIR}/${CMTBIN}/cmt.exe /usr/bin/cmt
+
+ cat > 99cmt <<-EOF
+ CMTROOT="${CMTDIR}"
+ CMTBIN="$(uname)-$(uname -m | sed -e 's# ##g')"
+ CMTCONFIG="$(${CMTROOT}/mgr/cmt_system.sh)"
+ EOF
+ if use java; then
+ cp -pPR java "${D}"/${CMTDIR}
+ echo "#!/bin/sh" > jcmt
+ echo "java cmt_parser" >> jcmt
+ exeinto /usr/bin
+ doexe jcmt || die "doexe failed"
+ echo "CLASSPATH=\"${CMTDIR}/java/cmt.jar\"" >> 99cmt
+ fi
+
+ doenvd 99cmt || die "doenvd failed"
+ dodoc ChangeLog doc/*.txt || die "dodoc failed"
+ dohtml doc/{ChangeLog,ReleaseNotes}.html || die "dohtml failed"
+
+ if use doc; then
+ cd "${S}"/mgr
+ emake gendoc || die "emake gendoc failed"
+ insinto /usr/share/doc/${PF}
+ cd "${S}"/doc
+ doins -r {CMTDoc,CMTFAQ}.{html,pdf} Images || die "doc install failed"
+ cd "${S}"
+ doins -r demo || die "doins demo failed"
+ fi
+
+ use emacs && \
+ elisp-site-file-install \
+ doc/cmt-mode.el "${FILESDIR}"/80cmt-mode-gentoo.el
+}
+
+pkg_postinst () {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}