Version bump, fixed older version for automake-1.9, bug #428006

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

10 files changed, 168 insertions, 364 deletions

diff --git a/sci-physics/clhep/ChangeLog b/sci-physics/clhep/ChangeLog
index 2f639efa0534..cb7c78c81afb 100644
--- a/sci-physics/clhep/ChangeLog
+++ b/sci-physics/clhep/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-physics/clhep
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.41 2012/06/28 00:31:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.42 2012/08/07 18:05:12 bicatali Exp $
+
+*clhep-2.1.2.4 (07 Aug 2012)
+
+  07 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> +clhep-2.1.2.4.ebuild,
+  +files/clhep-2.1.2.4-libdir.patch, -clhep-2.1.1.0.ebuild,
+  -clhep-2.1.2.0.ebuild, -clhep-2.1.2.2.ebuild,
+  -files/clhep-2.1.2.2-automake-1.12.patch, clhep-2.1.0.1.ebuild, metadata.xml:
+  Version bump, fixed older version for automake-1.9, bug #428006
 
 *clhep-2.1.2.3 (28 Jun 2012)
 
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index d92f448799ba..4d51bc821cf9 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,26 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX clhep-2.1.2.2-automake-1.12.patch 7692 RMD160 27117e5125b5a4bbf916a8f9d5973b06392f7dcf SHA1 dbe675402b29b7141d824593e5651fb2f734eed2 SHA256 4c93fb585c6fd1ef1ede745dcebf31973b3c7ea4280b5d1f59702adfc472e003
-AUX clhep-2.1.2.3-libdir.patch 5727 RMD160 a265a0482f6502cf4a1f78c19daa3e666823ac7b SHA1 ce61ddacf7840c30b8ea919ba6d49066556882a3 SHA256 bf4685a87a5077cbc87c58d6dcc5a94a5dc1659d5c354e91efb1ff641829a1bb
-DIST clhep-2.0.4.6.tgz 3593699 RMD160 8f4f7aa44cedadba74f2301ab38a732333ca4c04 SHA1 21eed390d32cf916298705b6d3bc82d15cf1ba29 SHA256 a75e9d5b08cec7456e580834fb0894043054ee66336c2ce4c33622ca2500ee55
-DIST clhep-2.1.0.1.tgz 4243520 RMD160 2f5f1cefd3f5e58843733f87a91233415c5de1cb SHA1 9ea129adfc680bc00db0eca3a46db3d7eb51b648 SHA256 b8492c1c795e899d8ab2462fc4f40f05a520dba17e598ca2434623e24f51cd29
-DIST clhep-2.1.1.0.tgz 4265666 RMD160 c3217dcfb90f489a520d18252f3e60b05f57d49b SHA1 3ad65041e68c7a6c19208dcaa1f4dcf769588d1d SHA256 7cdce06e7af7d78f13d8badce2c77c5962b5383ead865d537aa8cd70c9d469f3
-DIST clhep-2.1.2.0.tgz 3715254 RMD160 04b13225639d8f5e332245f0b430c4b64d80d318 SHA1 1336de8d4c87f5b6b00e63956b45ef429e59d7f4 SHA256 b4dcb7812acbd4a781fab556eb4bfac2ed4c1fbfa64cb5d27a296cdba4f6336c
-DIST clhep-2.1.2.2.tgz 1839362 RMD160 082a39ff259a80ae354386606f52e6e69ca42089 SHA1 374340e316c192c211db36c4cd3f29407cc75318 SHA256 efa59d433d6501f378c7c3eaa6565a3e89f4ee4b69ec2a67261a56d428676093
-DIST clhep-2.1.2.3.tgz 1845390 RMD160 28d3ceee97ff37bfe9c1825b361ad5d0ee97640f SHA1 7670b2e4ab53787a8efce88911d752a3a7c2aee9 SHA256 4353231be09c134507092161cd3ced27a065ca0ebb31ee0256e60a8163c47c3b
-EBUILD clhep-2.0.4.6.ebuild 1267 RMD160 f1e6bcd5ac937c5516a8ddb6a1aa8d5eaf9a4393 SHA1 f990f9134b206a66ff5a113dc1993709c81e2507 SHA256 18855f294ddabbe38220a07a88cf619727bd6192cb652d5b6a299fa1fd5912db
-EBUILD clhep-2.1.0.1.ebuild 1319 RMD160 62e2b5b697a57fe1f8635f43e5eb042c74da3dd8 SHA1 c476f6bb94606248aa2a995d2a8ac2b929978ef1 SHA256 04d737ad7d1be2e8af2723bfcf286e73e4b3eac1925d9e63a56acaf4bf72c76d
-EBUILD clhep-2.1.1.0.ebuild 1215 RMD160 f81767d19726cef8adddcdba7b479148ce1fa5ce SHA1 14a31fe7d95e3997073ba1f680976c78c95ed3d3 SHA256 5ceb468a926bdcd659aca7f85fc6f46c5dbb6eb0a1f93a241d3d6b486b4a7c75
-EBUILD clhep-2.1.2.0.ebuild 1224 RMD160 7885333d418c894cde1f22d51a1e4b8113663833 SHA1 6cbb3e2c3f3b91395ff42497adb26c4a2351069f SHA256 964ef623202a035eb32f0b56468774711ab085be5161348547bdde042a847dd5
-EBUILD clhep-2.1.2.2.ebuild 1344 RMD160 ae73d6fbd74ba3fa2b9a378efad6dc43770ccf79 SHA1 de0ae38d5c789e13396955dfdc47e75f5ca69d57 SHA256 a20ceb36660f16d5917732cf21c1778d5fe5f43e348fb13a071b8c2b35be98b3
-EBUILD clhep-2.1.2.3.ebuild 1194 RMD160 b8b194726d83d8b08ae28f147f766adcae139cd8 SHA1 f9f129bccb743f8ca051dcc3d38a65ea31c42341 SHA256 fc62999db1b229d3ac4a96112cfd9e661d9ff1b723856206db174330b3b688f4
-MISC ChangeLog 5358 RMD160 92607e8f07ba43660297233729a3bf83179c63c4 SHA1 5b8355d4d20d09b77b446ba728099257325c161b SHA256 a85b6bf0ceab1e64c9b0b109b2d499642ca764556813304c33164664bf734376
-MISC metadata.xml 496 RMD160 ad7856891d94ece5ae2b905044f3f3f3bde47dc3 SHA1 acfe1796527d8ced964aa7a5d86c4cc651711bcd SHA256 01e1a291b2db7fc616024ded9ca68f384a968d379a9d4550c37781c254ed1dcf
+AUX clhep-2.1.2.3-libdir.patch 5727 SHA256 bf4685a87a5077cbc87c58d6dcc5a94a5dc1659d5c354e91efb1ff641829a1bb SHA512 886f8977156afdafc415f928ffa3f39f728264801b664f34869f00daf85d293c2521d0c9bb25f1945afb217adc1588bb12258c68d23981a4532dff99da6dca88 WHIRLPOOL f981bc499959cc561d3410603b3b7ade99b096de9ddb2b545da1ede5f2f2301ed9c7d87e4ec035ff382ce0a86c183b148cf3357fbc73380cbb67e7efcda4105a
+AUX clhep-2.1.2.4-libdir.patch 4448 SHA256 60719f87870d1506a6d6a6df813a26575b96438da5f21a647997b0f8c806b529 SHA512 b6362fe126780daedd000922040227444d00a85fab80a42440fa876ddb3e9fcd2812184a71f7030a4c1fdd0e560b2b37c05f50ac5ef0014417f174e7061e5099 WHIRLPOOL 3944d40178d07cdbf3becb4cbee81194c7f9ee1e19401022e13978e02cc70412d2987c304b5801760b33440d525efeda3b63033ba7df4b88dd8f0f5f8ebe3c69
+DIST clhep-2.0.4.6.tgz 3593699 SHA256 a75e9d5b08cec7456e580834fb0894043054ee66336c2ce4c33622ca2500ee55
+DIST clhep-2.1.0.1.tgz 4243520 SHA256 b8492c1c795e899d8ab2462fc4f40f05a520dba17e598ca2434623e24f51cd29
+DIST clhep-2.1.2.3.tgz 1845390 SHA256 4353231be09c134507092161cd3ced27a065ca0ebb31ee0256e60a8163c47c3b
+DIST clhep-2.1.2.4.tgz 1845804 SHA256 ca1b39772c4fb75047c001a892019e65be4ac61ccd9f059bd2ff273c88b5c2cf SHA512 5386c41e33e780a3096f8cea47700b8e89246b4450d6ba135bafecde8af6d7315c681f2eee7569afd837cfaacd2c35f104bf5b077f5a4e23faaeaee9fdca7363 WHIRLPOOL 1c26d5ac15fecfdf6302a69ac547b732c65cda3e34d43c90c8a7a0327073bebed24a34ccc6ff0c3bc673733d5ba2368004016a65da46b5cedbf23ce7b3585526
+EBUILD clhep-2.0.4.6.ebuild 1267 SHA256 18855f294ddabbe38220a07a88cf619727bd6192cb652d5b6a299fa1fd5912db SHA512 509a3de7b577a90605f8b7f86ae9dddda6b24cd4c56b36492257e227dfae501396c9542948cd1050ec2c14fafd7fc4b5c8e4c07e110bfef95f663bae600db1c9 WHIRLPOOL 5da973ddfdb7d94e3fe16e180271940ed8260a3a7317823e734759553a55a636ccd33cd7c0f5d8bcfb4c565a92aed07c2538bdf85f4c7790583ff08d88edebd1
+EBUILD clhep-2.1.0.1.ebuild 1340 SHA256 790b11816d9fa7106aeda93c8d5765f4c7a61abe4d538cec637c15e7cc8c03b9 SHA512 75f8f6f163c0b3c429d330e371eff1497b0f33748037361ed6faa8ea3f9acf71b1d694b47743c6c29e5b8cc448ead3a5536507cd24c92b0750a82d14b2a36d79 WHIRLPOOL 0549e6ebeb5142a40cbd4acbbf4b3aa8354059d36d37921e8f18e313467c93495559eb47a4719ff2681f688dae05f5e6b2346ed1f0c93b91011f2bdd2cb81af5
+EBUILD clhep-2.1.2.3.ebuild 1194 SHA256 fc62999db1b229d3ac4a96112cfd9e661d9ff1b723856206db174330b3b688f4 SHA512 99b21257b2f875bcf47b8a02f720d753d1835fef9dc26c05e28db45572f717162795fdb68d0d493c24f1a4db0b1cdcc12d1b0f6b5025edb1b0e2d9b9b4f46fc1 WHIRLPOOL 460ee73e70d84042764b7a51f9cd96dac2be7e50435e08acd809357484bdad6094a84785ace45b9801b0d0b4e7a1d683b81040f98d5e53f3b28a9a174ad0ad32
+EBUILD clhep-2.1.2.4.ebuild 1194 SHA256 4853628b51a99d40022fa37876875fb20dd3dbf1f9008ef366c35e393a062526 SHA512 751451e8bdd5536bdc35b2af20b22fb76da6c754e38c0265b94def7cd117acc58a6735c3e2f095b6b0aec07e38a1dbb24736c5b3deae63f12608e721e2bcac2e WHIRLPOOL d1c415276fd6a24637bbbec9534eb954f41eea61eb9f57522dfb54c4df15d41c83400d0213c069f19c0daf8f8681165bb2f858e7a72580f03d5a3963eb7f1ee0
+MISC ChangeLog 5721 SHA256 b54f99669b8da079100d04ff80dc4c9f81d772a7b616b3a9e0943d02d44d7020 SHA512 2081356d3d6f48c4e2537052cfaede846d718145fcaea16a9232a25953f436b5b155a2184803911a700698b0c56e301e0d7b0eb211d2f57ad30d739be1644533 WHIRLPOOL b55a29314649080fcc9eb076d5a4e52b15cc50df31f2811c6c63c48972c540edcbfa24da37ee40cb1361d257d70abb07154f52a6a174f367882f25f230d050ca
+MISC metadata.xml 492 SHA256 613ba276ff258a43d37ebe01e499de73706b9d0de732adc015e747e5b9569bb8 SHA512 70f52dc251a60a9f80201e189c520f521dfa64af233cb64ca2192c5f51bdcd38bd6095b829291434e36e51011cb73f85171ef20088d38e2ff8abdd2cf32a5c1e WHIRLPOOL 635ff8090f1fb594a6138bb375b801bdc83f944488a6f1a1c531892d8072ecb0da8dabbd7f5fd58d8d3b4a9dbe870ce945d193894cc7dce8fc2dfca0b31e4008
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/rpeQACgkQ1ycZbhPLE2DCSQCghTR3quY9Dun3asgWRi/ZJFi5
-jRUAn1NwFDeCZAz+BdR5DCj9RoeKG8Pn
-=TfSx
+iEYEAREIAAYFAlAhWQ0ACgkQ1ycZbhPLE2Dn0gCgle4aybHdBkCojKaAQ0VUnypg
+dOQAoJIte5IJzCpjAUghKTv/Og0O71XH
+=BFMU
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/clhep/clhep-2.1.0.1.ebuild b/sci-physics/clhep/clhep-2.1.0.1.ebuild
index 8a11f8f83687..f4ca814dca1a 100644
--- a/sci-physics/clhep/clhep-2.1.0.1.ebuild
+++ b/sci-physics/clhep/clhep-2.1.0.1.ebuild
@@ -1,8 +1,10 @@
-# 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/sci-physics/clhep/clhep-2.1.0.1.ebuild,v 1.6 2011/06/28 20:00:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.0.1.ebuild,v 1.7 2012/08/07 18:05:12 bicatali Exp $
 
 EAPI=2
+
+WANT_AUTOMAKE=1.9
 inherit autotools eutils
 
 DESCRIPTION="High Energy Physics C++ library"
diff --git a/sci-physics/clhep/clhep-2.1.1.0.ebuild b/sci-physics/clhep/clhep-2.1.1.0.ebuild
deleted file mode 100644
index 835c683e1eea..000000000000
--- a/sci-physics/clhep/clhep-2.1.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.1.0.ebuild,v 1.1 2011/08/06 20:50:27 bicatali Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="public-domain"
-SLOT="2"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-
-IUSE="exceptions static-libs"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	for d in $(find . -name configure.ac); do
-		# respect user flags and fix some compilers stuff
-		sed -i \
-			-e 's:^g++):*g++):g' \
-			-e 's:^icc):icc|icpc):g' \
-			-e '/AM_CXXFLAGS=/s:-O ::g' \
-			${d} || die
-		# need to rebuild because original configurations
-		# have buggy detection
-	done
-	for d in $(find . -name Makefile.am | xargs grep -l ": %\.cc"); do
-		sed -i \
-			-e 's|: %\.cc|: %\.cc \$(shareddir)|' \
-			-e 's|all-local: \$(shareddir)|all-local: |' \
-			${d} || die
-		# fixing parallel build
-	done
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable exceptions) \
-		$(use_enable static-libs static)
-}
diff --git a/sci-physics/clhep/clhep-2.1.2.0.ebuild b/sci-physics/clhep/clhep-2.1.2.0.ebuild
deleted file mode 100644
index b03702ea4df0..000000000000
--- a/sci-physics/clhep/clhep-2.1.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.2.0.ebuild,v 1.1 2011/12/29 08:44:38 bicatali Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="public-domain"
-SLOT="2"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-
-IUSE="exceptions static-libs"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	local d
-	for d in $(find . -name configure.ac); do
-		# respect user flags and fix some compilers stuff
-		sed -i \
-			-e 's:^g++):*g++):g' \
-			-e 's:^icc):icc|icpc):g' \
-			-e '/AM_CXXFLAGS=/s:-O ::g' \
-			${d} || die
-		# need to rebuild because original configurations
-		# have buggy detection
-	done
-	for d in $(find . -name Makefile.am | xargs grep -l ": %\.cc"); do
-		sed -i \
-			-e 's|: %\.cc|: %\.cc \$(shareddir)|' \
-			-e 's|all-local: \$(shareddir)|all-local: |' \
-			${d} || die
-		# fixing parallel build
-	done
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable exceptions) \
-		$(use_enable static-libs static)
-}
diff --git a/sci-physics/clhep/clhep-2.1.2.2.ebuild b/sci-physics/clhep/clhep-2.1.2.2.ebuild
deleted file mode 100644
index d40ea97aefbf..000000000000
--- a/sci-physics/clhep/clhep-2.1.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.2.2.ebuild,v 1.3 2012/06/26 06:09:11 jlec Exp $
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="public-domain"
-SLOT="2"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="exceptions static-libs"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-PATCHES=( "${FILESDIR}"/${P}-automake-1.12.patch )
-
-src_prepare() {
-	local d
-	for d in $(find . -name configure.ac); do
-		# respect user flags and fix some compilers stuff
-		sed -i \
-			-e 's:^g++):*g++):g' \
-			-e 's:^icc):icc|icpc):g' \
-			-e '/AM_CXXFLAGS=/s:-O ::g' \
-			${d} || die
-		# need to rebuild because original configurations
-		# have buggy detection
-	done
-	for d in $(find . -name Makefile.am | xargs grep -l ": %\.cc"); do
-		sed -i \
-			-e 's|: %\.cc|: %\.cc \$(shareddir)|' \
-			-e 's|all-local: \$(shareddir)|all-local: |' \
-			${d} || die
-		# fixing parallel build
-	done
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( $(use_enable exceptions) )
-	autotools-utils_src_configure
-}
diff --git a/sci-physics/clhep/clhep-2.1.2.4.ebuild b/sci-physics/clhep/clhep-2.1.2.4.ebuild
new file mode 100644
index 000000000000..8bd81b8de833
--- /dev/null
+++ b/sci-physics/clhep/clhep-2.1.2.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/clhep-2.1.2.4.ebuild,v 1.1 2012/08/07 18:05:12 bicatali Exp $
+
+EAPI=4
+
+inherit cmake-utils multilib
+
+DESCRIPTION="High Energy Physics C++ library"
+HOMEPAGE="http://www.cern.ch/clhep"
+SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc static-libs test"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base )"
+
+S="${WORKDIR}/${PV}/CLHEP"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libdir.patch
+	# respect flags
+	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
+	# dont build test if not asked
+	if ! use test; then
+		sed -i \
+			-e '/add_subdirectory(test)/d' \
+			*/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable test TESTING)
+		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
+	)
+	DESTDIR="${ED}" cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
+	dodoc README ChangeLog
+}
diff --git a/sci-physics/clhep/files/clhep-2.1.2.2-automake-1.12.patch b/sci-physics/clhep/files/clhep-2.1.2.2-automake-1.12.patch
deleted file mode 100644
index d1b5ce49a5b5..000000000000
--- a/sci-physics/clhep/files/clhep-2.1.2.2-automake-1.12.patch
+++ /dev/null
@@ -1,192 +0,0 @@
- CLHEP/Cast/src/Makefile.am             |    2 +-
- CLHEP/Evaluator/src/Makefile.am        |    2 +-
- CLHEP/Exceptions/src/Makefile.am       |    2 +-
- CLHEP/Fields/src/Makefile.am           |    2 +-
- CLHEP/GenericFunctions/src/Makefile.am |    2 +-
- CLHEP/Geometry/src/Makefile.am         |    2 +-
- CLHEP/Makefile.am                      |    4 ++--
- CLHEP/Matrix/src/Makefile.am           |    2 +-
- CLHEP/Random/src/Makefile.am           |    2 +-
- CLHEP/RandomObjects/src/Makefile.am    |    2 +-
- CLHEP/RefCount/src/Makefile.am         |    2 +-
- CLHEP/Vector/src/Makefile.am           |    2 +-
- CLHEP/configure.ac                     |    1 +
- 13 files changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/CLHEP/Cast/src/Makefile.am b/CLHEP/Cast/src/Makefile.am
-index ec0fa65..0294bcd 100755
---- a/CLHEP/Cast/src/Makefile.am
-+++ b/CLHEP/Cast/src/Makefile.am
-@@ -50,7 +50,7 @@ endif
- 
- install-exec-local: $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_shared)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-diff --git a/CLHEP/Evaluator/src/Makefile.am b/CLHEP/Evaluator/src/Makefile.am
-index f2faaab..c220d64 100755
---- a/CLHEP/Evaluator/src/Makefile.am
-+++ b/CLHEP/Evaluator/src/Makefile.am
-@@ -52,7 +52,7 @@ endif
- 
- install-exec-local: $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_shared)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-diff --git a/CLHEP/Exceptions/src/Makefile.am b/CLHEP/Exceptions/src/Makefile.am
-index 293e1fe..35da349 100755
---- a/CLHEP/Exceptions/src/Makefile.am
-+++ b/CLHEP/Exceptions/src/Makefile.am
-@@ -58,7 +58,7 @@ endif
- 
- install-exec-local: $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_shared)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-diff --git a/CLHEP/Fields/src/Makefile.am b/CLHEP/Fields/src/Makefile.am
-index 9631546..519e46f 100755
---- a/CLHEP/Fields/src/Makefile.am
-+++ b/CLHEP/Fields/src/Makefile.am
-@@ -52,7 +52,7 @@ endif
- 
- install-exec-local: $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_shared)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-diff --git a/CLHEP/GenericFunctions/src/Makefile.am b/CLHEP/GenericFunctions/src/Makefile.am
-index 4e771a1..fdc82e0 100755
---- a/CLHEP/GenericFunctions/src/Makefile.am
-+++ b/CLHEP/GenericFunctions/src/Makefile.am
-@@ -134,7 +134,7 @@ endif
- 
- install-exec-local: $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_shared)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-diff --git a/CLHEP/Geometry/src/Makefile.am b/CLHEP/Geometry/src/Makefile.am
-index d37d424..495df4a 100755
---- a/CLHEP/Geometry/src/Makefile.am
-+++ b/CLHEP/Geometry/src/Makefile.am
-@@ -56,7 +56,7 @@ endif
- 
- install-exec-local: $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_shared)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-diff --git a/CLHEP/Makefile.am b/CLHEP/Makefile.am
-index adb111b..482d7e4 100755
---- a/CLHEP/Makefile.am
-+++ b/CLHEP/Makefile.am
-@@ -84,7 +84,7 @@ install-exec-local: install-CLHEPLIB install-versionheader
- 
- install-CLHEPLIB: $(CLHEPLIB) $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(CLHEPLIB)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL_DATA) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-@@ -119,7 +119,7 @@ install-CLHEPLIB: $(CLHEPLIB) $(lib_shared)
- 
- install-versionheader: versionheader
- 	@$(NORMAL_INSTALL)
--	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
-+	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
- 	if test -f ClhepVersion.h; then \
- 	  echo " $(INSTALL_DATA) 'ClhepVersion.h' '$(DESTDIR)$(includedir)/ClhepVersion.h'"; \
- 	  $(INSTALL_DATA) "ClhepVersion.h" "$(DESTDIR)$(includedir)/ClhepVersion.h"; \
-diff --git a/CLHEP/Matrix/src/Makefile.am b/CLHEP/Matrix/src/Makefile.am
-index 12f5732..645ab96 100755
---- a/CLHEP/Matrix/src/Makefile.am
-+++ b/CLHEP/Matrix/src/Makefile.am
-@@ -61,7 +61,7 @@ endif
- 
- install-exec-local: $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_shared)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-diff --git a/CLHEP/Random/src/Makefile.am b/CLHEP/Random/src/Makefile.am
-index 8bcb0a3..971d688 100755
---- a/CLHEP/Random/src/Makefile.am
-+++ b/CLHEP/Random/src/Makefile.am
-@@ -88,7 +88,7 @@ endif
- 
- install-exec-local: $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_shared)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-diff --git a/CLHEP/RandomObjects/src/Makefile.am b/CLHEP/RandomObjects/src/Makefile.am
-index 2a0ec6e..221e346 100755
---- a/CLHEP/RandomObjects/src/Makefile.am
-+++ b/CLHEP/RandomObjects/src/Makefile.am
-@@ -54,7 +54,7 @@ endif
- 
- install-exec-local: $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_shared)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-diff --git a/CLHEP/RefCount/src/Makefile.am b/CLHEP/RefCount/src/Makefile.am
-index e3e2f85..5850d84 100755
---- a/CLHEP/RefCount/src/Makefile.am
-+++ b/CLHEP/RefCount/src/Makefile.am
-@@ -51,7 +51,7 @@ endif
- 
- install-exec-local: $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_shared)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-diff --git a/CLHEP/Vector/src/Makefile.am b/CLHEP/Vector/src/Makefile.am
-index 4fa1d26..376a85e 100755
---- a/CLHEP/Vector/src/Makefile.am
-+++ b/CLHEP/Vector/src/Makefile.am
-@@ -85,7 +85,7 @@ endif
- 
- install-exec-local: $(lib_shared)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_shared)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    echo " $(INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$p'"; \
-diff --git a/CLHEP/configure.ac b/CLHEP/configure.ac
-index 96dcbe8..edb0879 100755
---- a/CLHEP/configure.ac
-+++ b/CLHEP/configure.ac
-@@ -16,6 +16,7 @@ AM_INIT_AUTOMAKE(1.9 foreign)
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_RANLIB
-+AC_PROG_MKDIR_P
- 
- # ----------------------------------------------------------------------
- # subpackages
diff --git a/sci-physics/clhep/files/clhep-2.1.2.4-libdir.patch b/sci-physics/clhep/files/clhep-2.1.2.4-libdir.patch
new file mode 100644
index 000000000000..fbdbb6110a6b
--- /dev/null
+++ b/sci-physics/clhep/files/clhep-2.1.2.4-libdir.patch
@@ -0,0 +1,87 @@
+diff -Nur CLHEP.orig/cmake/Modules/ClhepBuildLibrary.cmake CLHEP/cmake/Modules/ClhepBuildLibrary.cmake
+--- CLHEP.orig/cmake/Modules/ClhepBuildLibrary.cmake	2012-07-09 19:33:59.000000000 +0100
++++ CLHEP/cmake/Modules/ClhepBuildLibrary.cmake	2012-08-07 18:44:55.000000000 +0100
+@@ -47,8 +47,8 @@
+   # Install the libraries
+   INSTALL (TARGETS ${package} ${package}S
+       RUNTIME DESTINATION bin
+-      LIBRARY DESTINATION lib
+-      ARCHIVE DESTINATION lib
++      LIBRARY DESTINATION lib${LIB_SUFFIX}
++      ARCHIVE DESTINATION lib${LIB_SUFFIX}
+       ) 
+ endmacro(clhep_build_library)
+ 
+@@ -78,8 +78,8 @@
+   INSTALL(TARGETS CLHEP CLHEPS
+       EXPORT CLHEPLibraryDepends
+       RUNTIME DESTINATION bin
+-      LIBRARY DESTINATION lib
+-      ARCHIVE DESTINATION lib
++      LIBRARY DESTINATION lib${LIB_SUFFIX}
++      ARCHIVE DESTINATION lib${LIB_SUFFIX}
+       ) 
+ 
+   if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
+@@ -91,9 +91,9 @@
+   else()
+       # create the symbolic links
+       file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink 
+-        	 "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/lib\" )" )
++        	 "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY \"$ENV{DESTDIR}S{CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}\" )" )
+       file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink 
+-        	 "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/lib\" )" )
++        	 "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}\" )" )
+   endif()
+ 
+   INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink )
+diff -Nur CLHEP.orig/cmake/Modules/ClhepToolchain.cmake CLHEP/cmake/Modules/ClhepToolchain.cmake
+--- CLHEP.orig/cmake/Modules/ClhepToolchain.cmake	2011-12-16 00:07:27.000000000 +0000
++++ CLHEP/cmake/Modules/ClhepToolchain.cmake	2012-08-07 17:48:57.000000000 +0100
+@@ -63,7 +63,7 @@
+ #
+ set(CLHEP_PKGCONFIG_PREFIX ${PROJECT_BINARY_DIR})
+ set(CLHEP_PKGCONFIG_INCLUDEDIR ${CLHEP_INCLUDE_DIR})
+-set(CLHEP_PKGCONFIG_LIBDIR ${PROJECT_BINARY_DIR}/lib)
++set(CLHEP_PKGCONFIG_LIBDIR ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
+ 
+ configure_file(${PROJECT_SOURCE_DIR}/cmake/Templates/clhep.pc.in
+   ${PROJECT_BINARY_DIR}/clhep.pc
+@@ -84,7 +84,7 @@
+ # We use a relative path from the directory where the CLHEPConfig.cmake
+ # file is installed to the actual include dir. 
+ file(RELATIVE_PATH _relincpath 
+-  ${CMAKE_INSTALL_PREFIX}/lib/CLHEP-${VERSION}
++  ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/CLHEP-${VERSION}
+   ${CMAKE_INSTALL_PREFIX}/include
+   )
+ set(CLHEP_INCLUDE_DIR "\${_thisdir}/${_relincpath}")
+@@ -111,7 +111,7 @@
+ # If you later use GNUInstallDirs.cmake, this would need more work to
+ # ensure accurate calculation of the relative path.
+ set(CLHEP_PKGCONFIG_PREFIX "\${pcfiledir}/../..")
+-set(CLHEP_PKGCONFIG_LIBDIR "\${prefix}/lib")
++set(CLHEP_PKGCONFIG_LIBDIR "\${prefix}/lib${LIB_SUFFIX}")
+ set(CLHEP_PKGCONFIG_INCLUDEDIR "\${prefix}/include")
+ 
+ configure_file(${PROJECT_SOURCE_DIR}/cmake/Templates/clhep.pc.in
+@@ -129,16 +129,16 @@
+ install(FILES
+   ${PROJECT_BINARY_DIR}/InstallTreeFiles/CLHEPConfigVersion.cmake 
+   ${PROJECT_BINARY_DIR}/InstallTreeFiles/CLHEPConfig.cmake 
+-  DESTINATION lib/CLHEP-${VERSION}
++  DESTINATION lib${LIB_SUFFIX}/CLHEP-${VERSION}
+   )
+ 
+-install(EXPORT CLHEPLibraryDepends DESTINATION lib/CLHEP-${VERSION})
++install(EXPORT CLHEPLibraryDepends DESTINATION lib${LIB_SUFFIX}/CLHEP-${VERSION})
+ 
+ # Install the pkg-config file. The choice of 'lib/pkgconfig' for the 
+ # installation seems fairly standard.
+ install(FILES
+   ${PROJECT_BINARY_DIR}/InstallTreeFiles/clhep.pc
+-  DESTINATION lib/pkgconfig
++  DESTINATION lib${LIB_SUFFIX}/pkgconfig
+   )
+ 
+ # - And we should be done...
diff --git a/sci-physics/clhep/metadata.xml b/sci-physics/clhep/metadata.xml
index ced7d05b28e4..cc9e48460d31 100644
--- a/sci-physics/clhep/metadata.xml
+++ b/sci-physics/clhep/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-physics</herd>
-	<longdescription lang="en">
+<herd>sci-physics</herd>
+<longdescription lang="en">
   A Class Library for High Energy Physics is intended to be a set of
   HEP-specific foundation and utility classes such as random
   generators, physics vectors, geometry and linear algebra.
 </longdescription>
-	<use>
-		<flag name="exceptions">Enable zoom exceptions for user intervention</flag>
-	</use>
+<use>
+  <flag name="exceptions">Enable zoom exceptions for user intervention</flag>
+</use>
 </pkgmetadata>