[gentoo-commits] repo/gentoo:master commit in: sci-libs/lmfit/files/, sci-libs/lmfit/

[Christoph Junghans]

commit:     85bbab44ed4573d6a715ed83dbccb703b2d38fc2
Author:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 23 03:02:14 2018 +0000
Commit:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Tue Oct 23 03:02:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85bbab44

sci-libs/lmfit: version bump

Package-Manager: Portage-2.3.49, Repoman-2.3.11
Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org>

 sci-libs/lmfit/Manifest                            |  1 +
 sci-libs/lmfit/files/lmfit-8.0-cmake.patch         | 59 ++++++++++++++++++++++
 sci-libs/lmfit/lmfit-7.0.ebuild                    |  2 +-
 .../lmfit/{lmfit-7.0.ebuild => lmfit-8.0.ebuild}   |  0
 4 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
index a40aaa40c8e..1514817e48a 100644
--- a/sci-libs/lmfit/Manifest
+++ b/sci-libs/lmfit/Manifest
@@ -1,3 +1,4 @@
 DIST lmfit-5.1.tgz 345077 BLAKE2B df27621745601ffacd2110b28f3e3ea2b06d4c8c3c8fad5dda13bb4d6c2bd9f2a793ff88fab4f6d8c78075278bb26f3f424bd0074095e67ab1780a9d57b72b4b SHA512 1df6ed51d7f2137529793948f6c57ef3658932c9198776925a9f6e1d586352651c93aa053a064db7a201dbb848a7108f284223feff45171d142087539d834b29
 DIST lmfit-6.4.tgz 388809 BLAKE2B 48aa619642ac3fd009ec6a8f8b44ee4c800fc3f33e2603b557218cdf37c789159dc3947a648d560b9e2dd7fef08a6644fd25ac61505859dc3b1d151eeea58c27 SHA512 2bd0f24dd4638345b8b1ce6803ddcf45ca3ef888eb285e99f9f158c2e30b0f96016d9d84a112cdbf28f2ba98470e54fe773416179a65264426043c9a5186757d
 DIST lmfit-7.0.tgz 37950 BLAKE2B a509110f70e7e863d1172b8d91f7439763f0434702f265751e9955494f4982b4c17f0baaa080af86e5cae7f535555e27b98b45ba6a529061d107e53bdb9fd698 SHA512 78f479786c6e5c417781c6d629f5a517335fac70df049fafdefd511485da4e542c988d69c998f96eaab4306160de4bb09a631ca6ffff74bba70c51428d734fc3
+DIST lmfit-8.0.tgz 42833 BLAKE2B d2ad9f5cd35997c8ce6827148e9ca748f3d14044f515a927442e9e5f57508cdfb729cd7172987a0e94284d7e93f7aafc0cb572137f201994c8d3ad9a9fb64c9b SHA512 3b4e4af6c70269f8752428d416e014d4e69df3f73b25e9ba16dd07afc03598a1dca08050cecba29a3b2651e003e703ba4412716100b1bb55b1830f74f16da676

diff --git a/sci-libs/lmfit/files/lmfit-8.0-cmake.patch b/sci-libs/lmfit/files/lmfit-8.0-cmake.patch
new file mode 100644
index 00000000000..367aa2147ae
--- /dev/null
+++ b/sci-libs/lmfit/files/lmfit-8.0-cmake.patch
@@ -0,0 +1,59 @@
+from: christoph junghans <junghans@×××××.org>
+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 <junghans@×××××.org>
+---
+ 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()
+ 

diff --git a/sci-libs/lmfit/lmfit-7.0.ebuild b/sci-libs/lmfit/lmfit-7.0.ebuild
index db342f68909..e4258a74110 100644
--- a/sci-libs/lmfit/lmfit-7.0.ebuild
+++ b/sci-libs/lmfit/lmfit-7.0.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils
 
 DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
 HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit"
-SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/${P}.tgz"
+SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/old/${P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="0"

diff --git a/sci-libs/lmfit/lmfit-7.0.ebuild b/sci-libs/lmfit/lmfit-8.0.ebuild
similarity index 100%
copy from sci-libs/lmfit/lmfit-7.0.ebuild
copy to sci-libs/lmfit/lmfit-8.0.ebuild