projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2a2cc9a)
use dobin instead of exeinto /usr/bin/ && doexe; drop old
authorJustin Lecher <jlec@gentoo.org>
Sat, 21 Mar 2015 16:27:50 +0000 (16:27 +0000)
committerJustin Lecher <jlec@gentoo.org>
Sat, 21 Mar 2015 16:27:50 +0000 (16:27 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

dev-util/cmt/ChangeLog patch | blob | history
dev-util/cmt/Manifest patch | blob | history
dev-util/cmt/cmt-1.25.ebuild [deleted file] patch | blob | history
dev-util/cmt/cmt-1.26.ebuild patch | blob | history
dev-util/cmt/metadata.xml patch | blob | history

diff --git a/dev-util/cmt/ChangeLog b/dev-util/cmt/ChangeLog
index ad60343f7252ce5e07857442b91992d5ea3213cd..df49e5fec8222664095b29ba4bd2e34199a1fe3b 100644 (file)
--- a/dev-util/cmt/ChangeLog
+++ b/dev-util/cmt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cmt
-# 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 $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.15 2015/03/21 16:27:49 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -cmt-1.25.ebuild,
+  cmt-1.26.ebuild, metadata.xml:
+  use dobin instead of exeinto /usr/bin/ && doexe; drop old
 
 *cmt-1.26 (09 Jul 2013)
 
diff --git a/dev-util/cmt/Manifest b/dev-util/cmt/Manifest
index 02ba01859baaa2a229a7adffa1a6c60d307e42d3..bd9e0d1fca70ba238f2e2da47704e9be415942fb 100644 (file)
--- a/dev-util/cmt/Manifest
+++ b/dev-util/cmt/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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 CMTv1r25.tar.gz 2191253 SHA256 673b5727b941b9eb2d33b234bc62a8c1545484a86fb604c4bab8e31a0f6c5b91 SHA512 6c43e1447f80e9795424823a8b58e7ddefc2c5e45eaa3228c3d56b13e64e1293c2aa55c86d0af0173bca86ceb53ee32ec0c1b708f0deb945f133287779f809b5 WHIRLPOOL 8580f704120351ec0c411fb1a7decec61689cbd75b6b3e5919c676395a76cc27b094bc8694741a892eec2ac3e28cc4fc615f066a89765e5e59d837dee9263bdc
 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
+EBUILD cmt-1.26.ebuild 2137 SHA256 de9fac4c2fa439f318eea285dabf384e99299c2c83444c32cbaa9194b2f40deb SHA512 c2a8df6713dcb793c99fd8a1153addd51b4ef368870277aa79e44a4893240c0a317443618abe66119c7446eca20f578f73f6fa1bb964e48415b00b97ae0efe7b WHIRLPOOL 27e80f5fd87d4591932e8f02f8597e058ca1e85b9233365c9132893e25e0fb110e30a786a99740e62b956175fab458450f375eb9358212aa61647eace486dfd1
+MISC ChangeLog 2565 SHA256 14a69ea129a63b1fc246e341ce4f2e328a623666a2c41d557ef605eb5c5861d3 SHA512 3cc9d4f6892ac8bf10b3945607cf3f731bdcda9ab331dc04f7e2bc3cfdfd48111fcb1351b345064d2cc6ea126c4be7cdaa0ebad016ebc4553754f7ad5986d1af WHIRLPOOL 3ce6fb04990b9665591e255f5681dda40421b65f49fbd8a44c6f3dfcf55426265fafaf6e174cca83cab9284b29410e6c3a666e80582c0bc1e907325357a323c9
+MISC metadata.xml 674 SHA256 5daa3ebdcd595f10a204652da5ba8f1b5234738015e9dc35ed27beb8722472e2 SHA512 ef128916b7ef520e60ef77923abaf8a51f72ec1bc9df954507a7245b26183e0d9c79fa717cf124a5604cb5082febc5db7f530e6c97cf7f4e30763b7e692c4f40 WHIRLPOOL d6c7d55bb3de392d84d057b63196eaf572bd8b094427d5994c17808591ed8dd32c4546acfe1ed85eaf81f1942de264223c479983e06d17e32ed1d921d8f6789a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlHcLZwACgkQ1ycZbhPLE2AOJACgmUYazVpld4pFw1fmFja4UTyW
-Q4sAoJbOqqxbP+qVvepz3zwyZeva5dCM
-=zIHl
+iQJ8BAEBCgBmBQJVDZwGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirzD4P/ibZsn53i7bbTqJoavnxIQFP
+5w/uM2AoTxBZQIWKJ92sz4rdq6tWOIsR1zGNvEZIf9E9gU8jWkhyQLDnRotBxaDk
+Q60LqWF6eVvIQIj92pnWB/pSx5U6GS2zzvN7fvONLsugqeC9Se2n+s1tx+QX0oE9
++qybP/U8+BupKQZeR279hivhcOKcyFEjVLbkLdAALyyTG5RjvGMClhaal16nHoE9
+RBoceB16L/XUfoSVpRPLAMvHpyEdzC0vs6ZVEWGlsBrMdzCbmBAbgDjrMZv/LiUU
+gOgIngRI6tPpPtz9US7qZo/IrdilTinv/IfKFuLl7/Fs0Wkl/tfx1b6m5KRerCst
+PoUhRDHUSS3MksDDvGnI0kgq+69ofX0yVdS5LF2B6UxYapinqP/LStEVMu57l/Qd
+3Jud+TWsMrVxhmBOxKfuldl8QPNK12AFJJhduVLCdsjCwtntdFI5OpKiOS7niJTR
+ACb+kKNsbzLwKiey9ovsZN5mxwMMTaB9di+cTUXeEDZJM2M4NsOOsJdXRCRgTUrw
+zNv49lIQkCqbHE8KmUt860l3Y0wzC0gkqWrJrhL6jXMhh81k9nDemkFoC9eeoI1z
+IJR3gcVDV1TpeQLBiqMR6YTjWUiJgpYG+G5+X/mvM/eCyhCJFHpuHJFbgclhypt2
+xYEutqha+1aeh7k34kX5
+=qHit
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmt/cmt-1.25.ebuild b/dev-util/cmt/cmt-1.25.ebuild
deleted file mode 100644 (file)
index c972cf8..0000000
--- a/dev-util/cmt/cmt-1.25.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.3 2013/07/09 15:34:34 bicatali Exp $
-
-EAPI=4
-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.net/"
-SRC_URI="http://www.cmtsite.net/${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}"/${PN}-1.22-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.26.ebuild b/dev-util/cmt/cmt-1.26.ebuild
index ef9c18599bb1557bbccbc07eacb155e076945a1e..12772a078ff807b93920a77ac2e50102d44b3af4 100644 (file)
--- a/dev-util/cmt/cmt-1.26.ebuild
+++ b/dev-util/cmt/cmt-1.26.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.26.ebuild,v 1.1 2013/07/09 15:34:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.26.ebuild,v 1.2 2015/03/21 16:27:49 jlec Exp $
 
 EAPI=5
+
 inherit eutils elisp-common multilib toolchain-funcs versionator
 
 CPV=($(get_version_components ${PV}))
@@ -24,21 +25,21 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/CMT/${CMT_PV}"
 
 src_configure() {
-       cd "${S}"/mgr
-       ./INSTALL
+       cd "${S}"/mgr || die
+       ./INSTALL || die
        source setup.sh
 }
 
 src_compile() {
-       cd "${S}"/mgr
+       cd "${S}"/mgr || die
        emake \
                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 .
+       cd "${S}" || die
+       mv src/demo . || die
        rm ${CMTBIN}/*.o || die
 
        use emacs && elisp-compile doc/cmt-mode.el
@@ -60,8 +61,7 @@ src_install() {
                cp -pPR java "${ED}"/${CMTDIR}
                echo "#!${EPREFIX}/bin/sh" > jcmt
                echo "java cmt_parser" >> jcmt
-               exeinto /usr/bin
-               doexe jcmt
+               dobin jcmt
                echo "CLASSPATH=\"${CMTDIR}/java/cmt.jar\"" >> 99cmt
        fi
 
diff --git a/dev-util/cmt/metadata.xml b/dev-util/cmt/metadata.xml
index 5144ff5d71c00e23c89223f396c05ac1ae8d3c41..53d37b8a512ef90ef7659349b7e79929aa73c14e 100644 (file)
--- a/dev-util/cmt/metadata.xml
+++ b/dev-util/cmt/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>bicatali@gentoo.org</email></maintainer>
-<longdescription lang="en">
+  <maintainer>
+    <email>bicatali@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
   CMT is a configuration management environment, based on some
   management conventions and comprises several shell-based
   utilities. It is an attempt to formalize software production and
Unnamed repository; edit this file 'description' to name the repository.