Version bump. Switch to cmake build, added patch to respect libdir

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

4 files changed, 155 insertions, 8 deletions

diff --git a/sci-physics/clhep/ChangeLog b/sci-physics/clhep/ChangeLog
index ca357f12c5b7..2f639efa0534 100644
--- a/sci-physics/clhep/ChangeLog
+++ b/sci-physics/clhep/ChangeLog
@@ -1,6 +1,12 @@
 # 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.40 2012/06/26 06:09:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/clhep/ChangeLog,v 1.41 2012/06/28 00:31:06 bicatali Exp $
+
+*clhep-2.1.2.3 (28 Jun 2012)
+
+  28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> +clhep-2.1.2.3.ebuild,
+  +files/clhep-2.1.2.3-libdir.patch:
+  Version bump. Switch to cmake build, added patch to respect libdir
 
   26 Jun 2012; Justin Lecher <jlec@gentoo.org> clhep-2.1.2.2.ebuild,
   +files/clhep-2.1.2.2-automake-1.12.patch, metadata.xml:
@@ -161,4 +167,3 @@
   06 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
   +files/clhep-2.0.3.3-gcc43.patch, +metadata.xml, +clhep-2.0.3.3.ebuild:
   Initial import, closing bug #98233
-
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index 383e1dc55022..d92f448799ba 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 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
-MISC ChangeLog 5140 RMD160 53a4dd9cfaff20aaf711c0b4f9488d5436e47ab3 SHA1 d223d3bf3ab9d3d8023f5791ed1b63653a2d2fc8 SHA256 560913efd04fcdf479a27269dee41ff4c5826a22451fdd3a6517188c6188728c
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/pUgwACgkQgAnW8HDreRZsQgCcD0shVZU9GftOg1PgRHS+7EHB
-xkEAnRrD7p3IUHFvMLVzA8e8OU8Qp0Jq
-=JRBk
+iEYEARECAAYFAk/rpeQACgkQ1ycZbhPLE2DCSQCghTR3quY9Dun3asgWRi/ZJFi5
+jRUAn1NwFDeCZAz+BdR5DCj9RoeKG8Pn
+=TfSx
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/clhep/clhep-2.1.2.3.ebuild b/sci-physics/clhep/clhep-2.1.2.3.ebuild
new file mode 100644
index 000000000000..9760f1fcd507
--- /dev/null
+++ b/sci-physics/clhep/clhep-2.1.2.3.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.3.ebuild,v 1.1 2012/06/28 00:31:06 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.3-libdir.patch b/sci-physics/clhep/files/clhep-2.1.2.3-libdir.patch
new file mode 100644
index 000000000000..69e6c24451bb
--- /dev/null
+++ b/sci-physics/clhep/files/clhep-2.1.2.3-libdir.patch
@@ -0,0 +1,93 @@
+diff -Nur 2.1.2.3/CLHEP.orig/cmake/Modules/ClhepBuildLibrary.cmake 2.1.2.3/CLHEP/cmake/Modules/ClhepBuildLibrary.cmake
+--- 2.1.2.3/CLHEP.orig/cmake/Modules/ClhepBuildLibrary.cmake	2012-06-27 20:47:44.000000000 +0100
++++ 2.1.2.3/CLHEP/cmake/Modules/ClhepBuildLibrary.cmake	2012-06-27 23:49:13.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,22 +78,22 @@
+   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" )
+       # copy
+       file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink 
+-        	 "exec_program(${CMAKE_COMMAND} ARGS -E chdir ${CMAKE_INSTALL_PREFIX}/lib; ${CMAKE_COMMAND} ARGS -E copy ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} )" )
++        	 "exec_program(${CMAKE_COMMAND} ARGS -E chdir $ENV{CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}; ${CMAKE_COMMAND} ARGS -E copy ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} )" )
+       file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink 
+-        	 "exec_program(${CMAKE_COMMAND} ARGS -E chdir ${CMAKE_INSTALL_PREFIX}/bin; ${CMAKE_COMMAND} ARGS -E copy ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} )" )
++        	 "exec_program(${CMAKE_COMMAND} ARGS -E chdir $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin; ${CMAKE_COMMAND} ARGS -E copy ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} )" )
+   else()
+       # create the symbolic links
+       file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink 
+-        	 "exec_program(${CMAKE_COMMAND} ARGS -E chdir ${CMAKE_INSTALL_PREFIX}/lib; ${CMAKE_COMMAND} ARGS -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} )" )
++        	 "exec_program(${CMAKE_COMMAND} ARGS -E chdir $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}; ${CMAKE_COMMAND} ARGS -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} )" )
+       file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink 
+-        	 "exec_program(${CMAKE_COMMAND} ARGS -E chdir ${CMAKE_INSTALL_PREFIX}/lib; ${CMAKE_COMMAND} ARGS -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} )" )
++        	 "exec_program(${CMAKE_COMMAND} ARGS -E chdir $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}; ${CMAKE_COMMAND} ARGS -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} )" )
+   endif()
+ 
+   INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink )
+diff -Nur 2.1.2.3/CLHEP.orig/cmake/Modules/ClhepToolchain.cmake 2.1.2.3/CLHEP/cmake/Modules/ClhepToolchain.cmake
+--- 2.1.2.3/CLHEP.orig/cmake/Modules/ClhepToolchain.cmake	2012-06-27 20:47:44.000000000 +0100
++++ 2.1.2.3/CLHEP/cmake/Modules/ClhepToolchain.cmake	2012-06-27 23:39:28.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...