Gentoo Archives: gentoo-commits

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