Version bump

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

4 files changed, 15 insertions, 108 deletions

diff --git a/dev-util/cmt/ChangeLog b/dev-util/cmt/ChangeLog
index a32493fc61ef..119223e9e045 100644
--- a/dev-util/cmt/ChangeLog
+++ b/dev-util/cmt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cmt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.11 2012/03/12 16:21:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.12 2012/05/31 15:41:56 bicatali Exp $
+
+*cmt-1.25 (31 May 2012)
+
+  31 May 2012; Sébastien Fabbro <bicatali@gentoo.org> -cmt-1.22.ebuild,
+  -cmt-1.23.ebuild, +cmt-1.25.ebuild:
+  Version bump
 
 *cmt-1.24 (12 Mar 2012)
 
diff --git a/dev-util/cmt/Manifest b/dev-util/cmt/Manifest
index b14fb7a83887..2b41335cd3c6 100644
--- a/dev-util/cmt/Manifest
+++ b/dev-util/cmt/Manifest
@@ -3,18 +3,16 @@ 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 CMTv1r22.tar.gz 2146071 RMD160 83d14a0c97ca77048b210341feb81e6e4b8585d6 SHA1 bb17466b288534367f466d71be17586cdf720441 SHA256 c12c0096910777b9acfaee8a61b503902161c32a433a3d28904e26674e110475
-DIST CMTv1r23.tar.gz 2160817 RMD160 008127cfae201e04e0c738f64aa9866cd34820dd SHA1 44c06fa818994dfd373ef9be2ff6500c922c7484 SHA256 8ba3178fe3b55685779f68b9e425ed12e20cb152198ef25650a1a1c99617b0c7
 DIST CMTv1r24.tar.gz 2183271 RMD160 c905af65b89a8bf9dfd6705ea326ea444ca25ce1 SHA1 1f574b9ad6c1e1a90de2e56168ba3db78c2da919 SHA256 300ad0096f1623f24596d7b1163a6bc547e8943697b85322636e0708350fc549
-EBUILD cmt-1.22.ebuild 2170 RMD160 b465dc53c005a9dcbce49a5f31552e75f1abb067 SHA1 7db27ef5a7d8a378f5e1e3020c994acdbfa0c841 SHA256 682feb08a3545389036930d89de269deb01bf2171dc36bdfd907f406221d0d26
-EBUILD cmt-1.23.ebuild 2176 RMD160 1937282efdd51e99c26dd46f159e523fa4431c96 SHA1 2910f8d09354b68abbc69f97009f2de0b85ab754 SHA256 e43f29319c1bc65106d30866020f2874db32d169770be9d1e305744f4f3862cf
+DIST CMTv1r25.tar.gz 2191253 RMD160 5b974801940119b1702c4e302534b0f95f441580 SHA1 3502ae0c1e4cdb01a6e6e9453c1a3c9d8058d8b6 SHA256 673b5727b941b9eb2d33b234bc62a8c1545484a86fb604c4bab8e31a0f6c5b91
 EBUILD cmt-1.24.ebuild 2176 RMD160 5e20d0dc2e1a7e586b86ac7bb4bd55a6b48572c0 SHA1 08016ef7741ed8c885cc716e675fea7a9f5f6067 SHA256 d3a9a57aebee5a02eb9e1ed4a339940b3a8418c11a1b134e9a3238a8e1415859
-MISC ChangeLog 1888 RMD160 d530dd9ea28ef55d997289d5ee4c4f090b0f3aa0 SHA1 2ecaba08f6cb94692d971b3017f65e3a42b3e7ce SHA256 6fb1f7ec199007925810680d340d501ebb95f4aca567a02d023642d256e67300
+EBUILD cmt-1.25.ebuild 2176 RMD160 cd5592c3a8fa6b4cda406a226b51af8d5514597c SHA1 a37afb5d18aa987750bff258f0d3f8c467e5e418 SHA256 bc7d89e770ade14339c40012840cbe510cc05b3a2f94ee088d696522931c2e46
+MISC ChangeLog 2040 RMD160 7e46852d7de593de207fec93fc42eeaec37dd87a SHA1 36d26b5f1902fc2515648c5cc267b7c39728782f SHA256 131f2322b0b8b274e80f1461530c279b8b5959ad8136b8e8256c96529693ba4c
 MISC metadata.xml 662 RMD160 52b3a769c6d2612e7e3231020564e75c3ea89c19 SHA1 0a15c7691cca2b8555da8cda802a8a6607d3b787 SHA256 4a34d25132d1db15281f2766de3d48870b3f40642e5bda1d92019a226381fd51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9eIo8ACgkQ1ycZbhPLE2AligCfbi8UwM9qQDky7TAOmk1mlBzn
-x5YAn35BksiCBhTUv5/4N/AMGym/CqQ4
-=+GWl
+iEYEARECAAYFAk/HkU0ACgkQ1ycZbhPLE2BgmQCggcleSXw/yZrZXGb9qorAoTFC
+FJAAoIG/qQqzE6on8AEj7MnKV1jp8Fbl
+=gtO/
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmt/cmt-1.22.ebuild b/dev-util/cmt/cmt-1.22.ebuild
deleted file mode 100644
index f0558b60da4c..000000000000
--- a/dev-util/cmt/cmt-1.22.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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/cmt-1.23.ebuild b/dev-util/cmt/cmt-1.25.ebuild
index 3b4b2dcbbb37..02f60ac5def9 100644
--- a/dev-util/cmt/cmt-1.23.ebuild
+++ b/dev-util/cmt/cmt-1.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.23.ebuild,v 1.1 2011/12/29 09:04:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.25.ebuild,v 1.1 2012/05/31 15:41:56 bicatali Exp $
 
 EAPI=4
 inherit eutils elisp-common toolchain-funcs versionator