From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- sci-libs/lmfit/Manifest | 1 - sci-libs/lmfit/files/lmfit-8.0-cmake.patch | 59 ------------------------------ 2 files changed, 60 deletions(-) delete mode 100644 sci-libs/lmfit/files/lmfit-8.0-cmake.patch (limited to 'sci-libs/lmfit') diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest index c31cc91894f3..01310b15ee66 100644 --- a/sci-libs/lmfit/Manifest +++ b/sci-libs/lmfit/Manifest @@ -1,5 +1,4 @@ AUX lmfit-7.0-cmake.patch 2226 BLAKE2B 317d232718c8172508d67de527161b074676bf62ff4da45d21a9444626fb2e84150c0b3fb099a6a9c5247ea2ec9b53c89b4b0f6d64f8b3d6352629e440e89ad4 SHA512 a9e95299baac18818a131ac67c82d49777e7cae6629d9f6bedc2e7f175f2d6a416888d973064df13d79315a5445d95c0e9a2e3d5fc1ac476fdb2b688dbe601e3 -AUX lmfit-8.0-cmake.patch 2251 BLAKE2B 4549bfb77187c0bc1040a3d3e4e3233445536d039b0d185e4a2d160fcf4d7c0ba2584bd0d943f9527c4af141688a0940763f7c23893263f7af1e294337710e65 SHA512 d3bcb2a9aa882c8240c873a65cc4b8d198ca26990d64d87988ea09e8398b10f83aedd4367bf65cb949091a6a4c3b4d70911658e46808d852cc26c3af2f6e032f AUX lmfit-8.2.2-cmake.patch 2769 BLAKE2B 7f67349b93cde9bf14ce5295d3a32a73301897e1643be5beea71ccb8e9d7a9a128c4160b7eb5dcbdfb1189ee6e774e151bd5f71b3af4d7ec0a00ba61f7ad79f1 SHA512 93b1f5242e1152dea4910c96b2c561a370f2e2a78fc730b5ee00257049f96a253badf5d7752a1bbac320df43e436d8f4d913fbf8d40f7b36e3579efb16147417 DIST lmfit-5.1.tgz 345077 BLAKE2B df27621745601ffacd2110b28f3e3ea2b06d4c8c3c8fad5dda13bb4d6c2bd9f2a793ff88fab4f6d8c78075278bb26f3f424bd0074095e67ab1780a9d57b72b4b SHA512 1df6ed51d7f2137529793948f6c57ef3658932c9198776925a9f6e1d586352651c93aa053a064db7a201dbb848a7108f284223feff45171d142087539d834b29 DIST lmfit-6.4.tgz 388809 BLAKE2B 48aa619642ac3fd009ec6a8f8b44ee4c800fc3f33e2603b557218cdf37c789159dc3947a648d560b9e2dd7fef08a6644fd25ac61505859dc3b1d151eeea58c27 SHA512 2bd0f24dd4638345b8b1ce6803ddcf45ca3ef888eb285e99f9f158c2e30b0f96016d9d84a112cdbf28f2ba98470e54fe773416179a65264426043c9a5186757d diff --git a/sci-libs/lmfit/files/lmfit-8.0-cmake.patch b/sci-libs/lmfit/files/lmfit-8.0-cmake.patch deleted file mode 100644 index 367aa2147ae4..000000000000 --- a/sci-libs/lmfit/files/lmfit-8.0-cmake.patch +++ /dev/null @@ -1,59 +0,0 @@ -from: christoph junghans -date: mon, 22 oct 2018 21:00:00 -0600 -subject: [patch] cmake: minor distribution tweaks - -- use gnuinstalldirs to allow to configure install dirs -- allow to disable injecting c flags - -signed-off-by: christoph junghans ---- - cmakelists.txt | 7 +++++-- - lib/cmakelists.txt | 4 ++-- - man/cmakelists.txt | 2 +- - 3 files changed, 8 insertions(+), 5 deletions(-) - -diff -Naur lmfit-8.0.orig/CMakeLists.txt lmfit-8.0/CMakeLists.txt ---- lmfit-8.0.orig/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600 -+++ lmfit-8.0/CMakeLists.txt 2018-10-22 20:56:00.573905982 -0600 -@@ -13,9 +13,12 @@ - # --- Declare project-wide user flags, and set default values --- - option(FITTEST "Build with FitTest" OFF) - --set(destination ${CMAKE_INSTALL_PREFIX}) -+include(GNUInstallDirs) - --set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas") -+option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON) -+if (INJECT_C_FLAGS) -+ set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas") -+endif() - - add_subdirectory(lib) - add_subdirectory(demo) -diff -Naur lmfit-8.0.orig/lib/CMakeLists.txt lmfit-8.0/lib/CMakeLists.txt ---- lmfit-8.0.orig/lib/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600 -+++ lmfit-8.0/lib/CMakeLists.txt 2018-10-22 20:55:08.073213116 -0600 -@@ -17,9 +17,9 @@ - - install( - TARGETS ${library_name} LIBRARY -- DESTINATION ${destination}/lib -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT Libraries) - install( - FILES ${inc_files} -- DESTINATION ${destination}/include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT Headers) -diff -Naur lmfit-8.0.orig/man/CMakeLists.txt lmfit-8.0/man/CMakeLists.txt ---- lmfit-8.0.orig/man/CMakeLists.txt 2018-10-22 20:54:43.452888191 -0600 -+++ lmfit-8.0/man/CMakeLists.txt 2018-10-22 20:55:08.073213116 -0600 -@@ -15,7 +15,7 @@ - ) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section} -- DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}" -+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}" - ) - endfunction() - -- cgit v1.2.3