sci-libs/cminpack: Version BUmp, add underlinking fix, which fixes test failures, #422693

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

5 files changed, 60 insertions, 4 deletions

diff --git a/sci-libs/cminpack/ChangeLog b/sci-libs/cminpack/ChangeLog
index 9e8012b482ad..4ce4a4f35941 100644
--- a/sci-libs/cminpack/ChangeLog
+++ b/sci-libs/cminpack/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/cminpack
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cminpack/ChangeLog,v 1.3 2012/05/29 18:40:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cminpack/ChangeLog,v 1.4 2012/06/20 19:21:05 jlec Exp $
+
+*cminpack-1.3.0 (20 Jun 2012)
+
+  20 Jun 2012; Justin Lecher <jlec@gentoo.org> cminpack-1.2.2.ebuild,
+  +files/cminpack-1.2.2-underlinking.patch, +cminpack-1.3.0.ebuild,
+  metadata.xml:
+  Version BUmp, add underlinking fix, which fixes test failures, #422693
 
 *cminpack-1.2.2 (29 May 2012)
 
diff --git a/sci-libs/cminpack/cminpack-1.2.2.ebuild b/sci-libs/cminpack/cminpack-1.2.2.ebuild
index f022c0367938..993ef2f63e65 100644
--- a/sci-libs/cminpack/cminpack-1.2.2.ebuild
+++ b/sci-libs/cminpack/cminpack-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cminpack/cminpack-1.2.2.ebuild,v 1.1 2012/05/29 18:40:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cminpack/cminpack-1.2.2.ebuild,v 1.2 2012/06/20 19:21:05 jlec Exp $
 
 EAPI=4
 
@@ -15,6 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
+PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
+
 src_configure() {
 	mycmakeargs+=(
 		-DSHARED_LIBS=ON
diff --git a/sci-libs/cminpack/cminpack-1.3.0.ebuild b/sci-libs/cminpack/cminpack-1.3.0.ebuild
new file mode 100644
index 000000000000..71e25cb8fa80
--- /dev/null
+++ b/sci-libs/cminpack/cminpack-1.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cminpack/cminpack-1.3.0.ebuild,v 1.1 2012/06/20 19:21:05 jlec Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="C implementation of the MINPACK nonlinear optimization library"
+HOMEPAGE="http://devernay.free.fr/hacks/cminpack/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.2.2-underlinking.patch )
+
+src_configure() {
+	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/files/cminpack-1.2.2-underlinking.patch b/sci-libs/cminpack/files/cminpack-1.2.2-underlinking.patch
new file mode 100644
index 000000000000..a042d4c2f72b
--- /dev/null
+++ b/sci-libs/cminpack/files/cminpack-1.2.2-underlinking.patch
@@ -0,0 +1,15 @@
+ CMakeLists.txt |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 57394af..5a46a75 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,6 +56,7 @@ set (cminpack_hdrs
+     cminpack.h minpack.h)
+ 
+ add_library (cminpack ${LIB_TYPE} ${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 7f432fd0dc55..243b487434c9 100644
--- a/sci-libs/cminpack/metadata.xml
+++ b/sci-libs/cminpack/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
   Minpack includes software for solving nonlinear equations and
   nonlinear least squares problems. Five algorithmic paths each
   include a core subroutine and an easy-to-use driver. The algorithms