Version bump. Updated homepage. Switch to EAPI5. Parallel compilation now works. Keyword amd64-linux and x86-linux

Package-Manager: portage-2.2.01.22120-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

4 files changed, 38 insertions, 28 deletions

diff --git a/dev-util/cmt/ChangeLog b/dev-util/cmt/ChangeLog
index 51d68aa354d4..ad60343f7252 100644
--- a/dev-util/cmt/ChangeLog
+++ b/dev-util/cmt/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2012/06/07 21:28:44 zmedico Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.14 2013/07/09 15:34:34 bicatali Exp $
+
+*cmt-1.26 (09 Jul 2013)
+
+  09 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> +cmt-1.26.ebuild,
+  -cmt-1.24.ebuild, cmt-1.25.ebuild:
+  Version bump. Updated homepage. Switch to EAPI5. Parallel compilation now
+  works. Keyword amd64-linux and x86-linux
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> cmt-1.24.ebuild, cmt-1.25.ebuild:
   inherit multilib for get_libdir
@@ -67,4 +74,3 @@
   15 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
   +files/80cmt-mode-gentoo.el, +metadata.xml, +cmt-1.20.20070720.ebuild:
   Initial import from science overlay, closing bug #65835.
-
diff --git a/dev-util/cmt/Manifest b/dev-util/cmt/Manifest
index 4fc8af6de7a9..02ba01859baa 100644
--- a/dev-util/cmt/Manifest
+++ b/dev-util/cmt/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 80cmt-mode-gentoo.el 207 SHA256 56524651c55dfdeb4693aeb9a6b05ccad14b87468196d807dac9527a420b5dc3 SHA512 a4006264cde07d84ab9171f48fa2d18c3c6e3fe3025acd55707d94f96dac9573e22e45196d784d9aa04f904fe0d3ee99e63f3a2aded00ee7d76a305728c1ae8d WHIRLPOOL 3bbb58bc8726a126124fcbaee46056061d30c1f5955ef8c8a35e90470ce448c129121ddba828b246ff73f1af6de21e174d1f0862977042b943e902bccb043ee2
 AUX cmt-1.22-limits.patch 268 SHA256 59045566332a4fd98119cffd3b825f3a87e70ad992559508bf5c54114467c711 SHA512 ba52ea77bf865ce755671b10f1d234ac160bff134b0b4e67132cfb0eb40849cd47587c3164b0d0c54c4b55002fea8d9fb757b803fdd4a43d4cf1dec8ca82e027 WHIRLPOOL 45e98feb3a885c9b4f3c26ec7094eecf4fc04e024a92907820a59dbb818aafac21695dcaeb65ac3994b4e82fa5310260849d82f83c6987371485e124f5c00238
-DIST CMTv1r24.tar.gz 2183271 SHA256 300ad0096f1623f24596d7b1163a6bc547e8943697b85322636e0708350fc549 SHA512 20b7c18e8cd04963b2b07e21c8b2e0386fcee56f776a13dbc459a000bd549d0480b6aac115dfe5e1ed1d68b05b2a8b30466712722bb1125af0bcba50e2220ce8 WHIRLPOOL 6b70878037a78a6510fdee2c55bcd6ecc8513d8909cda834af9dd9c855d26e4e07a5ce1a15c3dd9e687046ed063a393838b23d72a04f3c568ce113fc55ffa5c1
 DIST CMTv1r25.tar.gz 2191253 SHA256 673b5727b941b9eb2d33b234bc62a8c1545484a86fb604c4bab8e31a0f6c5b91 SHA512 6c43e1447f80e9795424823a8b58e7ddefc2c5e45eaa3228c3d56b13e64e1293c2aa55c86d0af0173bca86ceb53ee32ec0c1b708f0deb945f133287779f809b5 WHIRLPOOL 8580f704120351ec0c411fb1a7decec61689cbd75b6b3e5919c676395a76cc27b094bc8694741a892eec2ac3e28cc4fc615f066a89765e5e59d837dee9263bdc
-EBUILD cmt-1.24.ebuild 2184 SHA256 0b07efddef8557aedfbce41cca5d40525c360b6fd6ebe03cd04d2d581bf34013 SHA512 0589d712998c357902da011c27f95d380c780e62759e404d399f0e584f609d0c6de9f988e65366e6e9dba2907161985c1e676004155649577b9de29761c477ca WHIRLPOOL f73e44c48c1bb7b4d1fcf8fb9a8b63bb001509317cda4f7b32c87fa70c6972d1d114e3f91440258ccff7d14dd5a6cb58c4f151453977a19afc63c028f9359f73
-EBUILD cmt-1.25.ebuild 2184 SHA256 97d7593e6e236d1d1dd2630a4f398e9efd7e70f60327812bd7032af2df085ee7 SHA512 bbf00a9008d8f46aaa819337cfb8cd0b5a8fae44338491ae3fc8cce900011019c0b543ca46fee22e4ab585036584acb2b22d2c7ba668bc1131cab2f459956371 WHIRLPOOL 1b82e1263507ec513e70fb094bb863c4bc22cf9485c62bcfb031950b8e42dc5744733cee2728e06a5b3cc2098c5479f7e5f8e38959c24b24f10ab9b55b958082
-MISC ChangeLog 2155 SHA256 a112ce956cc18ca687f7aa3172f16e9b78f4b882e9c8e9f4526e72a506b76a59 SHA512 c6b92fd873afd3011be0adc595da911eaa8ce74bb9677d10beb0f1251b7b7dddf2b6ab791131f626b82b69fa93236b78cc969f8f7d9120b4c21e9025e51e7949 WHIRLPOOL 6e0c867132a7ffb09728f020cb1d68cc107f64c01f7bedcce69a76e1d3564c652318d6f3f0564292e725b3742b1e02ef80999a2c9cb23d4fab117ef50027094d
+DIST CMTv1r26.tar.gz 2194291 SHA256 1f4edd814aae018707325aed893d04a82e5e609ec8f082dd511373e33e987e34 SHA512 412366dbf4aaef9f092f9472792e314c6d8f3e0360ddfa6d135e2bea9a167b627ddc78ad5a2d4f5139b4835abb68c06166abf3204bf5ba3969089923782e817e WHIRLPOOL 049f511c85ff1cf0a0cefec6cca7020f44fd2e86b76e649bc5bc583b2ac60f5ea3d683b52d630712ac1d729cd0fd92364b4192937130ef84ff66f5d9ef8940e0
+EBUILD cmt-1.25.ebuild 2185 SHA256 141ea8652a6366b3e5720cc301a881a1a0e944a588f478947b269f4f5aa8eda1 SHA512 c3b770c5bafd484178371edf9cf1f0a2f7eafa8e6e423c44b4e6f8df6dc6b50ecb2f4780f84389fdd4ca7b8b2e6d8774c2aadc0fa5a4d812682f95ab76883017 WHIRLPOOL 6d9086606f6d3150a024b2cc6544d9c97db69a77a9bc5f8a118b6749292aabd7d1c5b666451eac6c7558226009ea25fd336d4dc7b07a7ab481786adb173cdab1
+EBUILD cmt-1.26.ebuild 2123 SHA256 0f4024832be1caa79b477224a59e20cebbcdf0e2952cbefc7b3e7e0e843a1968 SHA512 11b3eb31d4e9a9b41820bc978503c26bc33978ed077f860fc05b19b1e845cc9e6254857c501a8e796b3be93307a35390e48fb6035b6f5ecb4843ce97c00e7eaf WHIRLPOOL ef40ac870d40be24a05a394615893c59199f710be4f0b721a26b388084f1b2cc70971b085a0ec4383dbdc37803a85841b345fb10eacb00bf42fb2e6c783e5763
+MISC ChangeLog 2410 SHA256 8067ce92966e9489c16bc7d7e81ad09101a6b2c3250e49ec7251da285ebbed6c SHA512 5c5d2f1685bf6e0658837c43d2ada5a7054d57891cbe2e08e38448a3d2e8af17b0dd9c8031ea55f4d3e2fc90f1d007632c59ecc06b12f694a47f6a0d00b28d73 WHIRLPOOL 4a26d076dd0fe50106ddf37f89dacbe23196e33320afbd7e43991069e84e5605f586fdb8c426feca3fbf9238d262c5f7e632a14e39ff445347967382f493d373
 MISC metadata.xml 662 SHA256 4a34d25132d1db15281f2766de3d48870b3f40642e5bda1d92019a226381fd51 SHA512 bbac9ec4a01618cb94abbf25be8855ad2f7e1316b2e8ea70385b6e5fb0a6e2bfc8d705d058bb6d29553fb05c1a9f62c4666b09b9ab0ae7b0d8f1f9b887908dc5 WHIRLPOOL 1a663fa1f07ec2bed68b3284051e3ca32f94cc3ce949eb4fdb0cf624b9f414d40590578f5ec1d140eb628fe479a8caa2e96e35faade562acf0927a9a63a4902b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlHcLZwACgkQ1ycZbhPLE2AOJACgmUYazVpld4pFw1fmFja4UTyW
+Q4sAoJbOqqxbP+qVvepz3zwyZeva5dCM
+=zIHl
+-----END PGP SIGNATURE-----
diff --git a/dev-util/cmt/cmt-1.25.ebuild b/dev-util/cmt/cmt-1.25.ebuild
index 3bdd7fdf33d4..c972cf88d3ac 100644
--- a/dev-util/cmt/cmt-1.25.ebuild
+++ b/dev-util/cmt/cmt-1.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.25.ebuild,v 1.2 2012/06/07 21:28:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.25.ebuild,v 1.3 2013/07/09 15:34:34 bicatali Exp $
 
 EAPI=4
 inherit eutils elisp-common multilib toolchain-funcs versionator
@@ -9,8 +9,8 @@ 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"
+HOMEPAGE="http://www.cmtsite.net/"
+SRC_URI="http://www.cmtsite.net/${CMT_PV}/CMT${CMT_PV}.tar.gz"
 
 LICENSE="CeCILL-2"
 SLOT="0"
diff --git a/dev-util/cmt/cmt-1.24.ebuild b/dev-util/cmt/cmt-1.26.ebuild
index a93a49a479da..ef9c18599bb1 100644
--- a/dev-util/cmt/cmt-1.24.ebuild
+++ b/dev-util/cmt/cmt-1.26.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.24.ebuild,v 1.2 2012/06/07 21:28:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.26.ebuild,v 1.1 2013/07/09 15:34:34 bicatali Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils elisp-common multilib 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"
+HOMEPAGE="http://www.cmtsite.net/"
+SRC_URI="http://www.cmtsite.net/${CMT_PV}/CMT${CMT_PV}.tar.gz"
 
 LICENSE="CeCILL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="emacs java doc"
 
 DEPEND="emacs? ( virtual/emacs )"
@@ -23,10 +23,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/CMT/${CMT_PV}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.22-limits.patch
-}
-
 src_configure() {
 	cd "${S}"/mgr
 	./INSTALL
@@ -35,7 +31,7 @@ src_configure() {
 
 src_compile() {
 	cd "${S}"/mgr
-	emake -j1 \
+	emake \
 		cpp="$(tc-getCXX)" \
 		cppflags="${CXXFLAGS}" \
 		cpplink="$(tc-getCXX) ${LDFLAGS}"
@@ -43,22 +39,20 @@ src_compile() {
 	sed -i -e "s:${WORKDIR}:${EPREFIX}/usr/$(get_libdir):g" setup.*sh || die
 	cd "${S}"
 	mv src/demo .
-	rm -f ${CMTBIN}/*.o
+	rm ${CMTBIN}/*.o || die
 
-	if use emacs; then
-		elisp-compile doc/cmt-mode.el || die
-	fi
+	use emacs && elisp-compile doc/cmt-mode.el
 }
 
 src_install() {
-	CMTDIR="${EPREFIX}"/usr/$(get_libdir)/CMT/${CMT_PV}
+	CMTDIR=/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}"
+		 CMTROOT="${EROOT%/}${CMTDIR}"
 		 CMTBIN="$(uname)-$(uname -m | sed -e 's# ##g')"
 		 CMTCONFIG="$(${CMTROOT}/mgr/cmt_system.sh)"
 	EOF