Version bump. Switch to EAPI=4.

(Portage version: 2.1.9.43/cvs/Linux x86_64)

3 files changed, 115 insertions, 2 deletions

diff --git a/dev-util/cmt/ChangeLog b/dev-util/cmt/ChangeLog
index b87651e54aa8..e2d4eb2c03a4 100644
--- a/dev-util/cmt/ChangeLog
+++ b/dev-util/cmt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cmt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.8 2010/11/19 05:41:28 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.9 2011/03/23 19:11:02 bicatali Exp $
+
+*cmt-1.22 (23 Mar 2011)
+
+  23 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> +cmt-1.22.ebuild,
+  +files/cmt-1.22-limits.patch:
+  Version bump. Switch to EAPI=4.
 
   19 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org>
   -cmt-1.20.20081118.ebuild, cmt-1.20.20090520.ebuild, metadata.xml:
diff --git a/dev-util/cmt/cmt-1.22.ebuild b/dev-util/cmt/cmt-1.22.ebuild
new file mode 100644
index 000000000000..f0558b60da4c
--- /dev/null
+++ b/dev-util/cmt/cmt-1.22.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.22.ebuild,v 1.1 2011/03/23 19:11:02 bicatali Exp $
+
+EAPI=4
+inherit eutils elisp-common toolchain-funcs versionator
+
+CPV=($(get_version_components ${PV}))
+CMT_PV=v${CPV[0]}r${CPV[1]}
+
+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="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	java? ( virtual/jdk )"
+
+S="${WORKDIR}/CMT/${CMT_PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-limits.patch
+}
+
+src_configure() {
+	cd "${S}"/mgr
+	./INSTALL
+	source setup.sh
+}
+
+src_compile() {
+	cd "${S}"/mgr
+	emake -j1 \
+		cpp="$(tc-getCXX)" \
+		cppflags="${CXXFLAGS}" \
+		cpplink="$(tc-getCXX) ${LDFLAGS}"
+
+	sed -i -e "s:${WORKDIR}:${EPREFIX}/usr/$(get_libdir):g" setup.*sh || die
+	cd "${S}"
+	mv src/demo .
+	rm -f ${CMTBIN}/*.o
+
+	if use emacs; then
+		elisp-compile doc/cmt-mode.el || die
+	fi
+}
+
+src_install() {
+	CMTDIR="${EPREFIX}"/usr/$(get_libdir)/CMT/${CMT_PV}
+	dodir ${CMTDIR}
+	cp -pPR mgr src ${CMTBIN} "${ED}"/${CMTDIR} || die
+	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 "${ED}"/${CMTDIR}
+		echo "#!${EPREFIX}/bin/sh" > jcmt
+		echo "java cmt_parser" >> jcmt
+		exeinto /usr/bin
+		doexe jcmt
+		echo "CLASSPATH=\"${CMTDIR}/java/cmt.jar\"" >> 99cmt
+	fi
+
+	doenvd 99cmt
+	dodoc ChangeLog doc/*.txt
+	dohtml doc/{ChangeLog,ReleaseNotes}.html
+
+	if use doc; then
+		emake -C mgr gendoc
+		insinto /usr/share/doc/${PF}
+		doins -r doc/{CMTDoc,CMTFAQ}.{html,pdf} doc/Images
+		doins -r demo
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} doc/cmt-mode.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/80cmt-mode-gentoo.el || die
+	fi
+}
+
+pkg_postinst () {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmt/files/cmt-1.22-limits.patch b/dev-util/cmt/files/cmt-1.22-limits.patch
new file mode 100644
index 000000000000..99ce621fc278
--- /dev/null
+++ b/dev-util/cmt/files/cmt-1.22-limits.patch
@@ -0,0 +1,10 @@
+--- source/cmt_awk.cxx.orig	2011-03-23 19:03:17.000000000 +0000
++++ source/cmt_awk.cxx	2011-03-23 19:03:48.000000000 +0000
+@@ -12,6 +12,7 @@
+ #define PATH_MAX _MAX_PATH
+ #endif
+ 
++#include <climits>
+ #include "cmt_awk.h"
+ #include "cmt_system.h"
+ #include "cmt_log.h"