public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-util/cmt: cmt-1.20.20070720.ebuild ChangeLog cmt-1.20.20080222.ebuild
@ 2008-04-04 11:09 Sebastien Fabbro (bicatali)
  0 siblings, 0 replies; only message in thread
From: Sebastien Fabbro (bicatali) @ 2008-04-04 11:09 UTC (permalink / raw
  To: gentoo-commits

bicatali    08/04/04 11:09:26

  Modified:             cmt-1.20.20070720.ebuild ChangeLog
  Added:                cmt-1.20.20080222.ebuild
  Log:
  Version bump and fixed bug ##216108 for bad install of demo directory.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.2                  dev-util/cmt/cmt-1.20.20070720.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmt/cmt-1.20.20070720.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmt/cmt-1.20.20070720.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmt/cmt-1.20.20070720.ebuild?r1=1.1&r2=1.2

Index: cmt-1.20.20070720.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.20.20070720.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmt-1.20.20070720.ebuild	15 Sep 2007 13:14:47 -0000	1.1
+++ cmt-1.20.20070720.ebuild	4 Apr 2008 11:09:26 -0000	1.2
@@ -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 @@
 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 @@
 	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
 



1.3                  dev-util/cmt/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmt/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmt/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmt/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	13 Feb 2008 07:28:13 -0000	1.2
+++ ChangeLog	4 Apr 2008 11:09:26 -0000	1.3
@@ -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



1.1                  dev-util/cmt/cmt-1.20.20080222.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmt/cmt-1.20.20080222.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmt/cmt-1.20.20080222.ebuild?rev=1.1&content-type=text/plain

Index: cmt-1.20.20080222.ebuild
===================================================================
# 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
}



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-04-04 11:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-04 11:09 [gentoo-commits] gentoo-x86 commit in dev-util/cmt: cmt-1.20.20070720.ebuild ChangeLog cmt-1.20.20080222.ebuild Sebastien Fabbro (bicatali)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox