commit: 743c2d9bf3e68329bb350f08d212fe0ebd9a6aa0 Author: Christoph Junghans <junghans <AT> gentoo <DOT> org> AuthorDate: Fri Jun 1 00:19:03 2018 +0000 Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org> CommitDate: Fri Jun 1 00:19:03 2018 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=743c2d9b
sci-libs/lmfit: version bump Package-Manager: Portage-2.3.24, Repoman-2.3.6 sci-libs/lmfit/files/lmfit-7.0-cmake.patch | 66 ++++++++++++++++++++++++++++++ sci-libs/lmfit/lmfit-7.0.ebuild | 25 +++++++++++ 2 files changed, 91 insertions(+) diff --git a/sci-libs/lmfit/files/lmfit-7.0-cmake.patch b/sci-libs/lmfit/files/lmfit-7.0-cmake.patch new file mode 100644 index 000000000..9ca4efb24 --- /dev/null +++ b/sci-libs/lmfit/files/lmfit-7.0-cmake.patch @@ -0,0 +1,66 @@ +From 4e66272e1f5ebb220af517ca4d8804936f7f465c Mon Sep 17 00:00:00 2001 +From: Christoph Junghans <[email protected]> +Date: Thu, 31 May 2018 18:11:26 -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 <[email protected]> +--- + CMakeLists.txt | 7 +++++-- + lib/CMakeLists.txt | 4 ++-- + man/CMakeLists.txt | 2 +- + 3 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f2d0bdf..75753d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,9 +13,12 @@ set(lmfit_VERSION ${lmfit_SOVERSION}.0) # lib version + # --- 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 -Werror") ++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 -Werror") ++endif() + + add_subdirectory(lib) + add_subdirectory(demo) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 51b79bb..754f60f 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -17,9 +17,9 @@ target_link_libraries(${library_name} m) + + 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 --git a/man/CMakeLists.txt b/man/CMakeLists.txt +index a718d3d..4a15597 100644 +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -15,7 +15,7 @@ function(one_page pname section) + ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section} +- DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}" ++ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}" + ) + endfunction() + +-- +2.16.4 + diff --git a/sci-libs/lmfit/lmfit-7.0.ebuild b/sci-libs/lmfit/lmfit-7.0.ebuild new file mode 100644 index 000000000..e895f1f06 --- /dev/null +++ b/sci-libs/lmfit/lmfit-7.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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"; + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) + +src_configure() { + local mycmakeargs=( + -DINJECT_C_FLAGS=OFF + ) + + cmake-utils_src_configure +}
