Gentoo Archives: gentoo-commits

From: Christoph Junghans <junghans@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/lmfit/files/, sci-libs/lmfit/
Date: Fri, 01 Jun 2018 00:22:51
Message-Id: 1527812551.46f559e11bea962d98030a2c440fa13c6656daab.junghans@gentoo
1 commit: 46f559e11bea962d98030a2c440fa13c6656daab
2 Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 1 00:21:54 2018 +0000
4 Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 1 00:22:31 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f559e1
7
8 sci-libs/lmfit: initial import from science overlay
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 sci-libs/lmfit/Manifest | 3 ++
13 sci-libs/lmfit/files/lmfit-7.0-cmake.patch | 66 ++++++++++++++++++++++++++++++
14 sci-libs/lmfit/lmfit-5.1.ebuild | 24 +++++++++++
15 sci-libs/lmfit/lmfit-6.4.ebuild | 24 +++++++++++
16 sci-libs/lmfit/lmfit-7.0.ebuild | 25 +++++++++++
17 sci-libs/lmfit/metadata.xml | 11 +++++
18 6 files changed, 153 insertions(+)
19
20 diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
21 new file mode 100644
22 index 00000000000..a40aaa40c8e
23 --- /dev/null
24 +++ b/sci-libs/lmfit/Manifest
25 @@ -0,0 +1,3 @@
26 +DIST lmfit-5.1.tgz 345077 BLAKE2B df27621745601ffacd2110b28f3e3ea2b06d4c8c3c8fad5dda13bb4d6c2bd9f2a793ff88fab4f6d8c78075278bb26f3f424bd0074095e67ab1780a9d57b72b4b SHA512 1df6ed51d7f2137529793948f6c57ef3658932c9198776925a9f6e1d586352651c93aa053a064db7a201dbb848a7108f284223feff45171d142087539d834b29
27 +DIST lmfit-6.4.tgz 388809 BLAKE2B 48aa619642ac3fd009ec6a8f8b44ee4c800fc3f33e2603b557218cdf37c789159dc3947a648d560b9e2dd7fef08a6644fd25ac61505859dc3b1d151eeea58c27 SHA512 2bd0f24dd4638345b8b1ce6803ddcf45ca3ef888eb285e99f9f158c2e30b0f96016d9d84a112cdbf28f2ba98470e54fe773416179a65264426043c9a5186757d
28 +DIST lmfit-7.0.tgz 37950 BLAKE2B a509110f70e7e863d1172b8d91f7439763f0434702f265751e9955494f4982b4c17f0baaa080af86e5cae7f535555e27b98b45ba6a529061d107e53bdb9fd698 SHA512 78f479786c6e5c417781c6d629f5a517335fac70df049fafdefd511485da4e542c988d69c998f96eaab4306160de4bb09a631ca6ffff74bba70c51428d734fc3
29
30 diff --git a/sci-libs/lmfit/files/lmfit-7.0-cmake.patch b/sci-libs/lmfit/files/lmfit-7.0-cmake.patch
31 new file mode 100644
32 index 00000000000..9ca4efb248e
33 --- /dev/null
34 +++ b/sci-libs/lmfit/files/lmfit-7.0-cmake.patch
35 @@ -0,0 +1,66 @@
36 +From 4e66272e1f5ebb220af517ca4d8804936f7f465c Mon Sep 17 00:00:00 2001
37 +From: Christoph Junghans <junghans@×××××.org>
38 +Date: Thu, 31 May 2018 18:11:26 -0600
39 +Subject: [PATCH] cmake: minor distribution tweaks
40 +
41 +- Use GNUInstallDirs to allow to configure install dirs
42 +- Allow to disable injecting c flags
43 +
44 +Signed-off-by: Christoph Junghans <junghans@×××××.org>
45 +---
46 + CMakeLists.txt | 7 +++++--
47 + lib/CMakeLists.txt | 4 ++--
48 + man/CMakeLists.txt | 2 +-
49 + 3 files changed, 8 insertions(+), 5 deletions(-)
50 +
51 +diff --git a/CMakeLists.txt b/CMakeLists.txt
52 +index f2d0bdf..75753d3 100644
53 +--- a/CMakeLists.txt
54 ++++ b/CMakeLists.txt
55 +@@ -13,9 +13,12 @@ set(lmfit_VERSION ${lmfit_SOVERSION}.0) # lib version
56 + # --- Declare project-wide user flags, and set default values ---
57 + option(FITTEST "Build with FitTest" OFF)
58 +
59 +-set(destination ${CMAKE_INSTALL_PREFIX})
60 ++include(GNUInstallDirs)
61 +
62 +-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas -Werror")
63 ++option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON)
64 ++if (INJECT_C_FLAGS)
65 ++ set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses -Wno-unknown-pragmas -Werror")
66 ++endif()
67 +
68 + add_subdirectory(lib)
69 + add_subdirectory(demo)
70 +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
71 +index 51b79bb..754f60f 100644
72 +--- a/lib/CMakeLists.txt
73 ++++ b/lib/CMakeLists.txt
74 +@@ -17,9 +17,9 @@ target_link_libraries(${library_name} m)
75 +
76 + install(
77 + TARGETS ${library_name} LIBRARY
78 +- DESTINATION ${destination}/lib
79 ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}
80 + COMPONENT Libraries)
81 + install(
82 + FILES ${inc_files}
83 +- DESTINATION ${destination}/include
84 ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
85 + COMPONENT Headers)
86 +diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
87 +index a718d3d..4a15597 100644
88 +--- a/man/CMakeLists.txt
89 ++++ b/man/CMakeLists.txt
90 +@@ -15,7 +15,7 @@ function(one_page pname section)
91 + )
92 + install(
93 + FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section}
94 +- DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}"
95 ++ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}"
96 + )
97 + endfunction()
98 +
99 +--
100 +2.16.4
101 +
102
103 diff --git a/sci-libs/lmfit/lmfit-5.1.ebuild b/sci-libs/lmfit/lmfit-5.1.ebuild
104 new file mode 100644
105 index 00000000000..5cc8fa8bda4
106 --- /dev/null
107 +++ b/sci-libs/lmfit/lmfit-5.1.ebuild
108 @@ -0,0 +1,24 @@
109 +# Copyright 1999-2018 Gentoo Foundation
110 +# Distributed under the terms of the GNU General Public License v2
111 +
112 +EAPI=6
113 +
114 +inherit eutils
115 +
116 +DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
117 +HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit"
118 +SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/old/${P}.tgz"
119 +
120 +LICENSE="BSD-2"
121 +SLOT="0"
122 +KEYWORDS="~amd64"
123 +IUSE="static-libs"
124 +
125 +src_configure() {
126 + econf $(use_enable static-libs static)
127 +}
128 +
129 +src_install() {
130 + default
131 + prune_libtool_files
132 +}
133
134 diff --git a/sci-libs/lmfit/lmfit-6.4.ebuild b/sci-libs/lmfit/lmfit-6.4.ebuild
135 new file mode 100644
136 index 00000000000..5cc8fa8bda4
137 --- /dev/null
138 +++ b/sci-libs/lmfit/lmfit-6.4.ebuild
139 @@ -0,0 +1,24 @@
140 +# Copyright 1999-2018 Gentoo Foundation
141 +# Distributed under the terms of the GNU General Public License v2
142 +
143 +EAPI=6
144 +
145 +inherit eutils
146 +
147 +DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
148 +HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit"
149 +SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/old/${P}.tgz"
150 +
151 +LICENSE="BSD-2"
152 +SLOT="0"
153 +KEYWORDS="~amd64"
154 +IUSE="static-libs"
155 +
156 +src_configure() {
157 + econf $(use_enable static-libs static)
158 +}
159 +
160 +src_install() {
161 + default
162 + prune_libtool_files
163 +}
164
165 diff --git a/sci-libs/lmfit/lmfit-7.0.ebuild b/sci-libs/lmfit/lmfit-7.0.ebuild
166 new file mode 100644
167 index 00000000000..e895f1f0688
168 --- /dev/null
169 +++ b/sci-libs/lmfit/lmfit-7.0.ebuild
170 @@ -0,0 +1,25 @@
171 +# Copyright 1999-2018 Gentoo Foundation
172 +# Distributed under the terms of the GNU General Public License v2
173 +
174 +EAPI=6
175 +
176 +inherit cmake-utils
177 +
178 +DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
179 +HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit"
180 +SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/${P}.tgz"
181 +
182 +LICENSE="BSD-2"
183 +SLOT="0"
184 +KEYWORDS="~amd64"
185 +IUSE=""
186 +
187 +PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
188 +
189 +src_configure() {
190 + local mycmakeargs=(
191 + -DINJECT_C_FLAGS=OFF
192 + )
193 +
194 + cmake-utils_src_configure
195 +}
196
197 diff --git a/sci-libs/lmfit/metadata.xml b/sci-libs/lmfit/metadata.xml
198 new file mode 100644
199 index 00000000000..2550df8221b
200 --- /dev/null
201 +++ b/sci-libs/lmfit/metadata.xml
202 @@ -0,0 +1,11 @@
203 +<?xml version="1.0" encoding="UTF-8"?>
204 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
205 +<pkgmetadata>
206 + <maintainer type="project">
207 + <email>sci@g.o</email>
208 + <name>Gentoo Science Project</name>
209 + </maintainer>
210 + <upstream>
211 + <remote-id type="sourceforge">lmfit</remote-id>
212 + </upstream>
213 +</pkgmetadata>