Gentoo Archives: gentoo-commits

From: Sebastien Fabbro <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/cminpack/, sci-libs/cminpack/files/
Date: Thu, 29 Dec 2016 07:02:31
Message-Id: 1482994888.562a051a9a1921760fe10fe25662510bf211d5bb.bicatali@gentoo
1 commit: 562a051a9a1921760fe10fe25662510bf211d5bb
2 Author: S├ębastien Fabbro <bicatali <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 29 04:01:16 2016 +0000
4 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 29 07:01:28 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=562a051a
7
8 sci-libs/cminpack: version bump
9 Added github upstream
10
11 Package-Manager: Portage-2.3.3, Repoman-2.3.1
12
13 sci-libs/cminpack/Manifest | 2 +-
14 sci-libs/cminpack/cminpack-1.3.2.ebuild | 35 ----------------------
15 sci-libs/cminpack/cminpack-1.3.5.ebuild | 34 +++++++++++++++++++++
16 .../files/cminpack-1.3.5-underlinking.patch | 10 +++++++
17 sci-libs/cminpack/metadata.xml | 3 ++
18 5 files changed, 48 insertions(+), 36 deletions(-)
19
20 diff --git a/sci-libs/cminpack/Manifest b/sci-libs/cminpack/Manifest
21 index 572530c..8dd7ebe 100644
22 --- a/sci-libs/cminpack/Manifest
23 +++ b/sci-libs/cminpack/Manifest
24 @@ -1,2 +1,2 @@
25 -DIST cminpack-1.3.2.tar.gz 299376 SHA256 a0a7f9b2e97c4f6dc8fe39675aed8423b27c7e839ba6c1745bcc2acc09c97825 SHA512 ec7cf2bdb58148b7664cca78cb2f5f2501c8d2df46a723285832a4e1fbe69457d1b5f67d2cdc7904900597a1af7bb22008e13f260e4672c32944cdadd856fd82 WHIRLPOOL 530d047bc56d536e2bec32d99845202ff9a664e70df1c2f6a1bd2023f6efd098338d2101a077365109c177a65b57be7c3d23aca7b2c5023e0fff63d660ca6848
26 DIST cminpack-1.3.4.tar.gz 311147 SHA256 3b517bf7dca68cc9a882883db96dac0a0d37d72aba6dfb0c9c7e78e67af503ca SHA512 2221dd710285e4d043ec51b296979686645ee48dad2e4bcbfef3e78ff6e8e02c09575af17edc3e9879cb9b7d4b431f0effe24640a2bdc437e32d0d0710545d7a WHIRLPOOL 460b56dcdac171daf9fda1c43b05654b549f1349babe8dfe5190f2aea98c3c42953ceda12e6dfff49d93958c6aaa0dc8b124477d1a22346e4d0a557dcae692a4
27 +DIST cminpack-1.3.5.tar.gz 312932 SHA256 a3ab4be6c8a8bab36c6ac7d4322fb0b9c4347a8096fd6c96d1686dc30e4b1afe SHA512 bb6f1764d90ccc7cbbb114a509f5416567246a730e4329617671e01b535b3a69f6a6df0483810ad1ad28228a1061a3595a15d437647b94a8a2013203905c6fed WHIRLPOOL 018b4877d2bbd602503b0055f7570f10b12183ac3a2c4f42cf4aea2ac7bb21556621214b83c4f620b1dc6abd6c79645d6fd5702ef079e1fa79a268616c1190fe
28
29 diff --git a/sci-libs/cminpack/cminpack-1.3.2.ebuild b/sci-libs/cminpack/cminpack-1.3.2.ebuild
30 deleted file mode 100644
31 index 236b20a..00000000
32 --- a/sci-libs/cminpack/cminpack-1.3.2.ebuild
33 +++ /dev/null
34 @@ -1,35 +0,0 @@
35 -# Copyright 1999-2013 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI=5
40 -
41 -inherit cmake-utils multilib
42 -
43 -DESCRIPTION="C implementation of the MINPACK nonlinear optimization library"
44 -HOMEPAGE="http://devernay.free.fr/hacks/cminpack/"
45 -SRC_URI="${HOMEPAGE}/${P}.tar.gz"
46 -
47 -LICENSE="minpack"
48 -SLOT="0/${PV}"
49 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
50 -IUSE="doc test"
51 -
52 -PATCHES=( "${FILESDIR}"/${PN}-1.2.2-underlinking.patch )
53 -
54 -src_configure() {
55 - sed -i \
56 - -e "/CMINPACK_LIB_INSTALL_DIR/s:lib\(\|64\):$(get_libdir):g" \
57 - cmake/cminpack_utils.cmake || die
58 - local mycmakeargs+=(
59 - -DSHARED_LIBS=ON
60 - $(cmake-utils_use_build test examples)
61 - )
62 - cmake-utils_src_configure
63 -}
64 -
65 -src_install() {
66 - cmake-utils_src_install
67 - dodoc readme*
68 - use doc && dohtml -A .txt doc/*
69 -}
70
71 diff --git a/sci-libs/cminpack/cminpack-1.3.5.ebuild b/sci-libs/cminpack/cminpack-1.3.5.ebuild
72 new file mode 100644
73 index 00000000..1a46678
74 --- /dev/null
75 +++ b/sci-libs/cminpack/cminpack-1.3.5.ebuild
76 @@ -0,0 +1,34 @@
77 +# Copyright 1999-2016 Gentoo Foundation
78 +# Distributed under the terms of the GNU General Public License v2
79 +# $Id$
80 +
81 +EAPI=6
82 +
83 +inherit cmake-utils
84 +
85 +DESCRIPTION="C implementation of the MINPACK nonlinear optimization library"
86 +HOMEPAGE="http://devernay.free.fr/hacks/cminpack/"
87 +SRC_URI="https://github.com/devernay/cminpack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
88 +
89 +LICENSE="minpack"
90 +SLOT="0/1"
91 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
92 +IUSE="doc test"
93 +
94 +PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
95 +
96 +src_configure() {
97 + local mycmakeargs=(
98 + -DCMINPACK_LIB_INSTALL_DIR=$(get_libdir)
99 + -DBUILD_SHARED_LIBS=ON
100 + -DBUILD_EXAMPLES=$(usex test)
101 + )
102 + cmake-utils_src_configure
103 + use test && export LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}"
104 +}
105 +
106 +src_install() {
107 + cmake-utils_src_install
108 + dodoc readme*
109 + use doc && dodoc -r doc/*
110 +}
111
112 diff --git a/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch b/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch
113 new file mode 100644
114 index 00000000..5133f5f
115 --- /dev/null
116 +++ b/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch
117 @@ -0,0 +1,10 @@
118 +--- a/CMakeLists.txt 2016-12-29 03:57:50.652989816 +0000
119 ++++ b/CMakeLists.txt 2016-12-29 03:58:33.882632282 +0000
120 +@@ -59,6 +59,7 @@
121 + cminpack.h minpack.h)
122 +
123 + add_library (cminpack ${cminpack_srcs})
124 ++target_link_libraries (cminpack m)
125 +
126 + install (TARGETS cminpack
127 + LIBRARY DESTINATION ${CMINPACK_LIB_INSTALL_DIR} COMPONENT library
128
129 diff --git a/sci-libs/cminpack/metadata.xml b/sci-libs/cminpack/metadata.xml
130 index 9d09084..1e24c78 100644
131 --- a/sci-libs/cminpack/metadata.xml
132 +++ b/sci-libs/cminpack/metadata.xml
133 @@ -17,4 +17,7 @@
134 This is the C re-write of the original fortran minpack
135 implementation.
136 </longdescription>
137 + <upstream>
138 + <remote-id type="github">devernay/cminpack</remote-id>
139 + </upstream>
140 </pkgmetadata>