summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2014-06-09 02:43:41 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2014-06-09 02:43:41 +0000
commit6e434c38e0a87ed63b9b5b36b0c385f2cc0ae439 (patch)
treedd892496012ac3e74a137641783eb78a6e02e6d9 /sci-libs/cminpack
parentVersion bump. Updated home page, doc building, added patch for underlinking c... (diff)
downloadgentoo-2-6e434c38e0a87ed63b9b5b36b0c385f2cc0ae439.tar.gz
gentoo-2-6e434c38e0a87ed63b9b5b36b0c385f2cc0ae439.tar.bz2
gentoo-2-6e434c38e0a87ed63b9b5b36b0c385f2cc0ae439.zip
Version bump
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-libs/cminpack')
-rw-r--r--sci-libs/cminpack/ChangeLog10
-rw-r--r--sci-libs/cminpack/cminpack-1.3.0.ebuild32
-rw-r--r--sci-libs/cminpack/cminpack-1.3.4.ebuild (renamed from sci-libs/cminpack/cminpack-1.3.1.ebuild)11
3 files changed, 15 insertions, 38 deletions
diff --git a/sci-libs/cminpack/ChangeLog b/sci-libs/cminpack/ChangeLog
index 5b049f53789c..1a7a5b1cb358 100644
--- a/sci-libs/cminpack/ChangeLog
+++ b/sci-libs/cminpack/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sci-libs/cminpack
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cminpack/ChangeLog,v 1.9 2013/11/14 02:04:03 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cminpack/ChangeLog,v 1.10 2014/06/09 02:43:41 bicatali Exp $
+
+*cminpack-1.3.4 (09 Jun 2014)
+
+ 09 Jun 2014; Sébastien Fabbro <bicatali@gentoo.org> +cminpack-1.3.4.ebuild,
+ -cminpack-1.3.0.ebuild, -cminpack-1.3.1.ebuild:
+ Version bump
*cminpack-1.3.2 (14 Nov 2013)
diff --git a/sci-libs/cminpack/cminpack-1.3.0.ebuild b/sci-libs/cminpack/cminpack-1.3.0.ebuild
deleted file mode 100644
index 8260a5a6b7f8..000000000000
--- a/sci-libs/cminpack/cminpack-1.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 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.3 2013/02/05 18:38:50 ulm 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="minpack"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-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/cminpack-1.3.1.ebuild b/sci-libs/cminpack/cminpack-1.3.4.ebuild
index 26056062d1aa..68338dc942ae 100644
--- a/sci-libs/cminpack/cminpack-1.3.1.ebuild
+++ b/sci-libs/cminpack/cminpack-1.3.4.ebuild
@@ -1,23 +1,26 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cminpack/cminpack-1.3.1.ebuild,v 1.1 2013/10/23 18:42:08 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cminpack/cminpack-1.3.4.ebuild,v 1.1 2014/06/09 02:43:41 bicatali Exp $
EAPI=5
-inherit cmake-utils
+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"
+SLOT="0/1"
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)