diff options
author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2017-02-02 19:02:14 +0100 |
---|---|---|
committer | Guilherme Amadio <amadio@gentoo.org> | 2017-02-02 17:58:47 -0200 |
commit | 0950fdbdef714e040841712830463f47caf1dc46 (patch) | |
tree | 60f4b8b97eb63fe1461f730d070a2a87a6ccef8e /sci-physics/clhep | |
parent | sci-biology/infernal: Used pushd twice (diff) | |
download | gentoo-0950fdbdef714e040841712830463f47caf1dc46.tar.gz gentoo-0950fdbdef714e040841712830463f47caf1dc46.tar.bz2 gentoo-0950fdbdef714e040841712830463f47caf1dc46.zip |
sci-physics/clhep: remove unused patches
Signed-off-by: Guilherme Amadio <amadio@gentoo.org>
Diffstat (limited to 'sci-physics/clhep')
-rw-r--r-- | sci-physics/clhep/files/clhep-2.1.2.3-libdir.patch | 93 | ||||
-rw-r--r-- | sci-physics/clhep/files/clhep-2.1.2.4-libdir.patch | 87 | ||||
-rw-r--r-- | sci-physics/clhep/files/clhep-2.1.2.4-lsb-whitespace.patch | 32 |
3 files changed, 0 insertions, 212 deletions
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 deleted file mode 100644 index 69e6c24451bb..000000000000 --- a/sci-physics/clhep/files/clhep-2.1.2.3-libdir.patch +++ /dev/null @@ -1,93 +0,0 @@ -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... 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 deleted file mode 100644 index fbdbb6110a6b..000000000000 --- a/sci-physics/clhep/files/clhep-2.1.2.4-libdir.patch +++ /dev/null @@ -1,87 +0,0 @@ -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/files/clhep-2.1.2.4-lsb-whitespace.patch b/sci-physics/clhep/files/clhep-2.1.2.4-lsb-whitespace.patch deleted file mode 100644 index 9880dd88806a..000000000000 --- a/sci-physics/clhep/files/clhep-2.1.2.4-lsb-whitespace.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Nur cmake/Modules.orig/ClhepPackageCompiler.cmake cmake/Modules/ClhepPackageCompiler.cmake ---- cmake/Modules.orig/ClhepPackageCompiler.cmake 2012-08-14 13:07:41.891381108 -0700 -+++ cmake/Modules/ClhepPackageCompiler.cmake 2012-08-14 13:08:39.826695769 -0700 -@@ -16,6 +16,7 @@ - execute_process(COMMAND ${CMAKE_CXX_COMPILER} - ${CMAKE_CXX_COMPILER_ARG1} -dumpversion - OUTPUT_VARIABLE _my_COMPILER_VERSION -+ OUTPUT_STRIP_TRAILING_WHITESPACE - ) - set( COMPILER_VERSION ${_my_COMPILER_VERSION} PARENT_SCOPE) - STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2" -diff -Nur cmake/Modules.orig/ClhepPackaging.cmake cmake/Modules/ClhepPackaging.cmake ---- cmake/Modules.orig/ClhepPackaging.cmake 2012-08-14 13:07:41.890381099 -0700 -+++ cmake/Modules/ClhepPackaging.cmake 2012-08-14 13:08:17.025571936 -0700 -@@ -68,7 +68,7 @@ - # We have linux, so incorporate Vendor info into package name - # - Distributor ID - ##exec_program(${LSB_RELEASE_PROGRAM} ARGS -s -i OUTPUT_VARIABLE LSB_VENDOR) -- execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -i OUTPUT_VARIABLE LSB_VENDOR) -+ execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -i OUTPUT_VARIABLE LSB_VENDOR OUTPUT_STRIP_TRAILING_WHITESPACE) - string(REGEX REPLACE " " "-" LSB_VENDOR ${LSB_VENDOR}) - string(TOLOWER ${LSB_VENDOR} LSB_VENDOR) - if("${LSB_VENDOR}" MATCHES "scientificslf") -@@ -85,7 +85,7 @@ - - # - Distributor release - ##exec_program(${LSB_RELEASE_PROGRAM} ARGS -s -r OUTPUT_VARIABLE LSB_RELEASE) -- execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -r OUTPUT_VARIABLE LSB_RELEASE) -+ execute_process(COMMAND ${LSB_RELEASE_PROGRAM} -s -r OUTPUT_VARIABLE LSB_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) - string(TOLOWER ${LSB_RELEASE} LSB_RELEASE) - string(REGEX REPLACE "([0-9])\\.([0-9])?" "\\1" LSB_RELEASE ${LSB_RELEASE}) - |