Respect LDFLAGS

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

5 files changed, 19 insertions, 111 deletions

diff --git a/dev-util/cmt/ChangeLog b/dev-util/cmt/ChangeLog
index 70f61de6cb42..b87651e54aa8 100644
--- a/dev-util/cmt/ChangeLog
+++ b/dev-util/cmt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cmt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.7 2009/09/09 23:06:25 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/ChangeLog,v 1.8 2010/11/19 05:41:28 bicatali Exp $
+
+  19 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -cmt-1.20.20081118.ebuild, cmt-1.20.20090520.ebuild, metadata.xml:
+  Respect LDFLAGS
 
 *cmt-1.20.20090520 (09 Sep 2009)
 
diff --git a/dev-util/cmt/Manifest b/dev-util/cmt/Manifest
index 90b1f7157b0b..79c4ff4484e6 100644
--- a/dev-util/cmt/Manifest
+++ b/dev-util/cmt/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA1
 
 AUX 80cmt-mode-gentoo.el 207 RMD160 f2bc0327ce783dbb1c909883b43a9a94566e2f77 SHA1 3e686aa29aecf4f7daaeec7b1b9ebf11fac00dbc SHA256 56524651c55dfdeb4693aeb9a6b05ccad14b87468196d807dac9527a420b5dc3
-DIST CMTv1r20p20081118.tar.gz 2084878 RMD160 472b6f75b2560d4ccfa840464aef7f1e754eda49 SHA1 e7d2c30ebdd070e9fd188be821ac38c92027cdf7 SHA256 4a6e92d96257aa0a1935aff12977765fbd18628da5519c26b36da88339be92b4
 DIST CMTv1r20p20090520.tar.gz 2117498 RMD160 22e6d4ea1ab403e9028fe2e094f19cde6a66c8b2 SHA1 48c8872770d4237eb6284b6a65d56aeef8ddb795 SHA256 dca481aacafc95c63c91f908c4e5de1115cb0a8705bfc51cb2386b8ff79149c8
-EBUILD cmt-1.20.20081118.ebuild 2287 RMD160 8dbbba744a046544f8d9098c738e6c8cbe66200c SHA1 07b498df25abc7ae7f6d3d358e63d9551868560e SHA256 f9acdcd14616ad9c77ed1b118fcd62ae449f930164dda94687012f268bc92e52
-EBUILD cmt-1.20.20090520.ebuild 2287 RMD160 00f106e0b3cdca8f0ea79bae7617ad9698e1935d SHA1 1f2866062a8c8123dbbef6e39a9d3986d6c0b11a SHA256 179cd3e2ca6ee75703ffced350cf2a475c88bb64874022fbdfc15be3a999c540
-MISC ChangeLog 1322 RMD160 419786851eae70a43415222dcb9756a1d924d94c SHA1 1e98498f823ebabbf133c08c721ecac5b7ea3850 SHA256 66fbc4977afe55b1f952b7674c25063c59b7c165712477ece02ef77286924f53
-MISC metadata.xml 637 RMD160 b44854c6db30c4e83e6b1933d3fec12d896f8025 SHA1 cd4a9649791d1423da16ede29cd827c01b352093 SHA256 2d4b3a2685171a793ffb617e358b4c9b8834a12ccec86881078dc96937ae0a24
+EBUILD cmt-1.20.20090520.ebuild 2325 RMD160 20e8d3d360dbaa8d36c355750fb9a1ce131540c1 SHA1 af01dbd060cff8aa0af0532b8903a774a2c97604 SHA256 0c17809be69eca6ddee950ce267d7bb69a6bf0c53dbeb15562ef7d5527b183a0
+MISC ChangeLog 1465 RMD160 d41d7f7ea9a6698716bcefdbe15a499171b6118e SHA1 911a58f906ff4cf536c74548e5d6f4192cf3524d SHA256 40803e5946fc21f0e6ee52453b2b55e2208189469e42cf32d38b7241d68a7219
+MISC metadata.xml 683 RMD160 9cb6f60c2574d82cccecee2ec619181f0df79eef SHA1 d12d08678eff4c2fb31c4cf41399f1785913df1b SHA256 0ec814b5e37bb2358a6cc0b89dc9e80484d9566dea0c44f795ceba362fc07ed3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkqoNPoACgkQ1ycZbhPLE2A86wCgkXvlrNrJ0pbrmRp4V/zDi+Lv
-XZoAoJw6n3BlrG//teMhmoZY3R9odeyd
-=mUTa
+iEYEARECAAYFAkzmDhEACgkQ1ycZbhPLE2AM1gCgihpiU9+evt9RY6eb+YnF5HgT
+EBMAn2u2DgZ+JAhRWKJQ25HsW9RONqef
+=g02q
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmt/cmt-1.20.20081118.ebuild b/dev-util/cmt/cmt-1.20.20081118.ebuild
deleted file mode 100644
index 8214ec380afa..000000000000
--- a/dev-util/cmt/cmt-1.20.20081118.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.20.20081118.ebuild,v 1.1 2009/04/21 16:39:01 bicatali Exp $
-
-EAPI=2
-inherit eutils 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="emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	java? ( virtual/jdk )"
-
-S="${WORKDIR}/CMT/${CMT_PV}"
-
-src_configure() {
-	cd "${S}"/mgr
-	./INSTALL
-	source setup.sh
-}
-
-src_compile() {
-	cd "${S}"/mgr
-	emake -j1 \
-		cpp="$(tc-getCXX)" \
-		cppflags="${CXXFLAGS}" \
-		|| die "emake failed"
-
-	sed -i -e "s:${WORKDIR}:/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=/usr/$(get_libdir)/CMT/${CMT_PV}
-	dodir ${CMTDIR}
-	cp -pPR mgr src ${CMTBIN} "${D}"/${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 "${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
-
-	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.20.20090520.ebuild b/dev-util/cmt/cmt-1.20.20090520.ebuild
index 73c280edddc8..c19302ab0593 100644
--- a/dev-util/cmt/cmt-1.20.20090520.ebuild
+++ b/dev-util/cmt/cmt-1.20.20090520.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.1 2009/09/09 23:06:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmt/cmt-1.20.20090520.ebuild,v 1.2 2010/11/19 05:41:28 bicatali Exp $
 
 EAPI=2
 inherit eutils elisp-common toolchain-funcs versionator
@@ -34,6 +34,7 @@ src_compile() {
 	emake -j1 \
 		cpp="$(tc-getCXX)" \
 		cppflags="${CXXFLAGS}" \
+		cpplink="$(tc-getCXX) ${LDFLAGS}" \
 		|| die "emake failed"
 
 	sed -i -e "s:${WORKDIR}:/usr/$(get_libdir):g" setup.*sh || die
diff --git a/dev-util/cmt/metadata.xml b/dev-util/cmt/metadata.xml
index e3de35d91c4a..153ee540f783 100644
--- a/dev-util/cmt/metadata.xml
+++ b/dev-util/cmt/metadata.xml
@@ -8,7 +8,8 @@
   management conventions and comprises several shell-based
   utilities. It is an attempt to formalize software production and
   especially configuration management around a package-oriented
-  principle. Used a lot in High Energy Physics large experiments, where
-  a lot of tailored packages are developped.
+  principle. Used in High Energy Physics large experiments, where
+  tailored packages are developped and they do not know the existence
+  of portage and overlays.
 </longdescription>
 </pkgmetadata>