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

[Sebastien Fabbro]

commit:     562a051a9a1921760fe10fe25662510bf211d5bb
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 04:01:16 2016 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 07:01:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=562a051a

sci-libs/cminpack: version bump
Added github upstream

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-libs/cminpack/Manifest                         |  2 +-
 sci-libs/cminpack/cminpack-1.3.2.ebuild            | 35 ----------------------
 sci-libs/cminpack/cminpack-1.3.5.ebuild            | 34 +++++++++++++++++++++
 .../files/cminpack-1.3.5-underlinking.patch        | 10 +++++++
 sci-libs/cminpack/metadata.xml                     |  3 ++
 5 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/sci-libs/cminpack/Manifest b/sci-libs/cminpack/Manifest
index 572530c..8dd7ebe 100644
--- a/sci-libs/cminpack/Manifest
+++ b/sci-libs/cminpack/Manifest
@@ -1,2 +1,2 @@
-DIST cminpack-1.3.2.tar.gz 299376 SHA256 a0a7f9b2e97c4f6dc8fe39675aed8423b27c7e839ba6c1745bcc2acc09c97825 SHA512 ec7cf2bdb58148b7664cca78cb2f5f2501c8d2df46a723285832a4e1fbe69457d1b5f67d2cdc7904900597a1af7bb22008e13f260e4672c32944cdadd856fd82 WHIRLPOOL 530d047bc56d536e2bec32d99845202ff9a664e70df1c2f6a1bd2023f6efd098338d2101a077365109c177a65b57be7c3d23aca7b2c5023e0fff63d660ca6848
 DIST cminpack-1.3.4.tar.gz 311147 SHA256 3b517bf7dca68cc9a882883db96dac0a0d37d72aba6dfb0c9c7e78e67af503ca SHA512 2221dd710285e4d043ec51b296979686645ee48dad2e4bcbfef3e78ff6e8e02c09575af17edc3e9879cb9b7d4b431f0effe24640a2bdc437e32d0d0710545d7a WHIRLPOOL 460b56dcdac171daf9fda1c43b05654b549f1349babe8dfe5190f2aea98c3c42953ceda12e6dfff49d93958c6aaa0dc8b124477d1a22346e4d0a557dcae692a4
+DIST cminpack-1.3.5.tar.gz 312932 SHA256 a3ab4be6c8a8bab36c6ac7d4322fb0b9c4347a8096fd6c96d1686dc30e4b1afe SHA512 bb6f1764d90ccc7cbbb114a509f5416567246a730e4329617671e01b535b3a69f6a6df0483810ad1ad28228a1061a3595a15d437647b94a8a2013203905c6fed WHIRLPOOL 018b4877d2bbd602503b0055f7570f10b12183ac3a2c4f42cf4aea2ac7bb21556621214b83c4f620b1dc6abd6c79645d6fd5702ef079e1fa79a268616c1190fe

diff --git a/sci-libs/cminpack/cminpack-1.3.2.ebuild b/sci-libs/cminpack/cminpack-1.3.2.ebuild
deleted file mode 100644
index 236b20a..00000000
--- a/sci-libs/cminpack/cminpack-1.3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="C implementation of the MINPACK nonlinear optimization library"
-HOMEPAGE="http://devernay.free.fr/hacks/cminpack/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-
-LICENSE="minpack"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.2-underlinking.patch )
-
-src_configure() {
-	sed -i \
-		-e "/CMINPACK_LIB_INSTALL_DIR/s:lib\(\|64\):$(get_libdir):g" \
-		cmake/cminpack_utils.cmake || die
-	local mycmakeargs+=(
-		-DSHARED_LIBS=ON
-		$(cmake-utils_use_build test examples)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc readme*
-	use doc && dohtml -A .txt doc/*
-}

diff --git a/sci-libs/cminpack/cminpack-1.3.5.ebuild b/sci-libs/cminpack/cminpack-1.3.5.ebuild
new file mode 100644
index 00000000..1a46678
--- /dev/null
+++ b/sci-libs/cminpack/cminpack-1.3.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="C implementation of the MINPACK nonlinear optimization library"
+HOMEPAGE="http://devernay.free.fr/hacks/cminpack/"
+SRC_URI="https://github.com/devernay/cminpack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="minpack"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMINPACK_LIB_INSTALL_DIR=$(get_libdir)
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_EXAMPLES=$(usex test)
+	)
+	cmake-utils_src_configure
+	use test && export LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}"
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc readme*
+	use doc && dodoc -r doc/*
+}

diff --git a/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch b/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch
new file mode 100644
index 00000000..5133f5f
--- /dev/null
+++ b/sci-libs/cminpack/files/cminpack-1.3.5-underlinking.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt	2016-12-29 03:57:50.652989816 +0000
++++ b/CMakeLists.txt	2016-12-29 03:58:33.882632282 +0000
+@@ -59,6 +59,7 @@
+     cminpack.h minpack.h)
+ 
+ add_library (cminpack ${cminpack_srcs})
++target_link_libraries (cminpack m)
+ 
+ install (TARGETS cminpack 
+    LIBRARY DESTINATION ${CMINPACK_LIB_INSTALL_DIR} COMPONENT library

diff --git a/sci-libs/cminpack/metadata.xml b/sci-libs/cminpack/metadata.xml
index 9d09084..1e24c78 100644
--- a/sci-libs/cminpack/metadata.xml
+++ b/sci-libs/cminpack/metadata.xml
@@ -17,4 +17,7 @@
   This is the C re-write of the original fortran minpack
   implementation.
 </longdescription>
+  <upstream>
+    <remote-id type="github">devernay/cminpack</remote-id>
+  </upstream>
 </pkgmetadata>