Version bump

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

3 files changed, 35 insertions, 31 deletions

diff --git a/dev-util/cmt/ChangeLog b/dev-util/cmt/ChangeLog
index e2d4eb2c03a4..721f4fd2f6f0 100644
--- a/dev-util/cmt/ChangeLog
+++ b/dev-util/cmt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cmt
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.10 2011/12/29 09:04:19 bicatali Exp $
+
+*cmt-1.23 (29 Dec 2011)
+
+  29 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -cmt-1.20.20090520.ebuild, +cmt-1.23.ebuild:
+  Version bump
 
 *cmt-1.22 (23 Mar 2011)
 
diff --git a/dev-util/cmt/Manifest b/dev-util/cmt/Manifest
index 4ec437eb0915..98b1d16178b5 100644
--- a/dev-util/cmt/Manifest
+++ b/dev-util/cmt/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 80cmt-mode-gentoo.el 207 RMD160 f2bc0327ce783dbb1c909883b43a9a94566e2f77 SHA1 3e686aa29aecf4f7daaeec7b1b9ebf11fac00dbc SHA256 56524651c55dfdeb4693aeb9a6b05ccad14b87468196d807dac9527a420b5dc3
 AUX cmt-1.22-limits.patch 268 RMD160 3ef0a88a6472cdea2fef586ece1e75e808ea2fdf SHA1 da10dc26563df8ff57e40613ca7f17c15caf7b30 SHA256 59045566332a4fd98119cffd3b825f3a87e70ad992559508bf5c54114467c711
-DIST CMTv1r20p20090520.tar.gz 2117498 RMD160 22e6d4ea1ab403e9028fe2e094f19cde6a66c8b2 SHA1 48c8872770d4237eb6284b6a65d56aeef8ddb795 SHA256 dca481aacafc95c63c91f908c4e5de1115cb0a8705bfc51cb2386b8ff79149c8
 DIST CMTv1r22.tar.gz 2146071 RMD160 83d14a0c97ca77048b210341feb81e6e4b8585d6 SHA1 bb17466b288534367f466d71be17586cdf720441 SHA256 c12c0096910777b9acfaee8a61b503902161c32a433a3d28904e26674e110475
-EBUILD cmt-1.20.20090520.ebuild 2325 RMD160 20e8d3d360dbaa8d36c355750fb9a1ce131540c1 SHA1 af01dbd060cff8aa0af0532b8903a774a2c97604 SHA256 0c17809be69eca6ddee950ce267d7bb69a6bf0c53dbeb15562ef7d5527b183a0
+DIST CMTv1r23.tar.gz 2160817 RMD160 008127cfae201e04e0c738f64aa9866cd34820dd SHA1 44c06fa818994dfd373ef9be2ff6500c922c7484 SHA256 8ba3178fe3b55685779f68b9e425ed12e20cb152198ef25650a1a1c99617b0c7
 EBUILD cmt-1.22.ebuild 2170 RMD160 b465dc53c005a9dcbce49a5f31552e75f1abb067 SHA1 7db27ef5a7d8a378f5e1e3020c994acdbfa0c841 SHA256 682feb08a3545389036930d89de269deb01bf2171dc36bdfd907f406221d0d26
-MISC ChangeLog 1630 RMD160 20680773cc0e6c1895f5df105fff4f986446cd08 SHA1 8ecb27cb4a36cc14279e7f74565a420a66f4f2f4 SHA256 cc840065bcfbf4177db8e8ace7484c410a6e00f789b084adb72439add3f16b1a
+EBUILD cmt-1.23.ebuild 2176 RMD160 1937282efdd51e99c26dd46f159e523fa4431c96 SHA1 2910f8d09354b68abbc69f97009f2de0b85ab754 SHA256 e43f29319c1bc65106d30866020f2874db32d169770be9d1e305744f4f3862cf
+MISC ChangeLog 1774 RMD160 265d365ba12a1e23e7216548af3d57cbedd8e175 SHA1 ccc953fba908b494752e81b9e0575417bb884b2f SHA256 71b04610f542ee9630c0dc6c58eb9be650acff8a20d486e2db1b58ea78803cbd
 MISC metadata.xml 662 RMD160 52b3a769c6d2612e7e3231020564e75c3ea89c19 SHA1 0a15c7691cca2b8555da8cda802a8a6607d3b787 SHA256 4a34d25132d1db15281f2766de3d48870b3f40642e5bda1d92019a226381fd51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59m5IACgkQfXuS5UK5QB25iQQAls0eh/A/XLGrvrCI8qGQj7DN
-R+RqFXf1KMxKHUWO2wrF7McBhQzgfUMX0+UOYcfEtiO+FvldU+FfUw2L2szl3AoC
-QhZ0dbX3EakfTDqrXLbzjLYsYs8QJi1wGjrWbgixo0gTyJG0R9d+sJ8h/agCCA5B
-JMNUaKhRpIhU5wuoOrg=
-=5IUP
+iEYEARECAAYFAk78LRsACgkQ1ycZbhPLE2DIRQCfe3MRzBW3War6483wvAWkcZNi
+q5EAnR2wHb1w2mTWLiANW8HWOSfX6WkO
+=hCk5
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmt/cmt-1.20.20090520.ebuild b/dev-util/cmt/cmt-1.23.ebuild
index c19302ab0593..3b4b2dcbbb37 100644
--- a/dev-util/cmt/cmt-1.20.20090520.ebuild
+++ b/dev-util/cmt/cmt-1.23.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.20.20090520.ebuild,v 1.2 2010/11/19 05:41:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.23.ebuild,v 1.1 2011/12/29 09:04:19 bicatali Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils elisp-common toolchain-funcs versionator
 
 CPV=($(get_version_components ${PV}))
-CMT_PV=v${CPV[0]}r${CPV[1]}p${CPV[2]}
+CMT_PV=v${CPV[0]}r${CPV[1]}
 
 DESCRIPTION="Cross platform configuration management environment"
 HOMEPAGE="http://www.cmtsite.org/"
@@ -23,6 +23,10 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/CMT/${CMT_PV}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.22-limits.patch
+}
+
 src_configure() {
 	cd "${S}"/mgr
 	./INSTALL
@@ -34,10 +38,9 @@ src_compile() {
 	emake -j1 \
 		cpp="$(tc-getCXX)" \
 		cppflags="${CXXFLAGS}" \
-		cpplink="$(tc-getCXX) ${LDFLAGS}" \
-		|| die "emake failed"
+		cpplink="$(tc-getCXX) ${LDFLAGS}"
 
-	sed -i -e "s:${WORKDIR}:/usr/$(get_libdir):g" setup.*sh || die
+	sed -i -e "s:${WORKDIR}:${EPREFIX}/usr/$(get_libdir):g" setup.*sh || die
 	cd "${S}"
 	mv src/demo .
 	rm -f ${CMTBIN}/*.o
@@ -48,9 +51,9 @@ src_compile() {
 }
 
 src_install() {
-	CMTDIR=/usr/$(get_libdir)/CMT/${CMT_PV}
+	CMTDIR="${EPREFIX}"/usr/$(get_libdir)/CMT/${CMT_PV}
 	dodir ${CMTDIR}
-	cp -pPR mgr src ${CMTBIN} "${D}"/${CMTDIR} || die
+	cp -pPR mgr src ${CMTBIN} "${ED}"/${CMTDIR} || die
 	dodir /usr/bin
 	dosym ${CMTDIR}/${CMTBIN}/cmt.exe /usr/bin/cmt
 
@@ -60,26 +63,23 @@ src_install() {
 		 CMTCONFIG="$(${CMTROOT}/mgr/cmt_system.sh)"
 	EOF
 	if use java; then
-		cp -pPR java "${D}"/${CMTDIR}
-		echo "#!/bin/sh" > jcmt
+		cp -pPR java "${ED}"/${CMTDIR}
+		echo "#!${EPREFIX}/bin/sh" > jcmt
 		echo "java cmt_parser" >> jcmt
 		exeinto /usr/bin
-		doexe jcmt || die "doexe failed"
+		doexe jcmt
 		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"
+	doenvd 99cmt
+	dodoc ChangeLog doc/*.txt
+	dohtml doc/{ChangeLog,ReleaseNotes}.html
 
 	if use doc; then
-		cd "${S}"/mgr
-		emake gendoc || die "emake gendoc failed"
+		emake -C mgr gendoc
 		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"
+		doins -r doc/{CMTDoc,CMTFAQ}.{html,pdf} doc/Images
+		doins -r demo
 	fi
 
 	if use emacs; then