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

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

9 files changed, 152 insertions, 344 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/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>