summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2013-01-11 19:37:29 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2013-01-11 19:37:29 +0000
commite20fc3e11f72eaf6c3851372f3947c2e6ad5eefc (patch)
treecd416d2fa75b26f818015b8c7436108193fc0414 /sci-libs/ceres-solver
parentBump the sys-apps/dbus dependency, per bug #451402. Drop old. (diff)
downloadgentoo-2-e20fc3e11f72eaf6c3851372f3947c2e6ad5eefc.tar.gz
gentoo-2-e20fc3e11f72eaf6c3851372f3947c2e6ad5eefc.tar.bz2
gentoo-2-e20fc3e11f72eaf6c3851372f3947c2e6ad5eefc.zip
Fixed for generic pkg-config
(Portage version: 2.2.01.21476-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-libs/ceres-solver')
-rw-r--r--sci-libs/ceres-solver/ChangeLog6
-rw-r--r--sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild8
-rw-r--r--sci-libs/ceres-solver/metadata.xml20
3 files changed, 19 insertions, 15 deletions
diff --git a/sci-libs/ceres-solver/ChangeLog b/sci-libs/ceres-solver/ChangeLog
index d8ccd6309927..2dacb163626d 100644
--- a/sci-libs/ceres-solver/ChangeLog
+++ b/sci-libs/ceres-solver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/ceres-solver
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ChangeLog,v 1.2 2013/01/11 14:43:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ChangeLog,v 1.3 2013/01/11 19:37:29 bicatali Exp $
+
+ 11 Jan 2013; Sébastien Fabbro <bicatali@gentoo.org> ceres-solver-1.4.0.ebuild,
+ metadata.xml:
+ Fixed for generic pkg-config
11 Jan 2013; Justin Lecher <jlec@gentoo.org> ceres-solver-1.4.0.ebuild,
metadata.xml:
diff --git a/sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild
index 4a9ca59704f1..eca1f91c3aac 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild,v 1.2 2013/01/11 14:43:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild,v 1.3 2013/01/11 19:37:29 bicatali Exp $
EAPI=4
-inherit cmake-utils eutils multilib
+inherit cmake-utils eutils multilib toolchain-funcs
DESCRIPTION="Nonlinear least-squares minimizer"
HOMEPAGE="https://code.google.com/p/ceres-solver/"
@@ -60,8 +60,8 @@ src_prepare() {
src_configure() {
local blibs llibs
if use sparse; then
- blibs=$(pkg-config --libs blas)
- llibs=$(pkg-config --libs lapack)
+ blibs=$($(tc-getPKG_CONFIG) --libs blas)
+ llibs=$($(tc-getPKG_CONFIG) --libs lapack)
fi
local mycmakeargs=(
-DBLAS_LIB="${blibs}"
diff --git a/sci-libs/ceres-solver/metadata.xml b/sci-libs/ceres-solver/metadata.xml
index aeaf40685a97..58151b34fb81 100644
--- a/sci-libs/ceres-solver/metadata.xml
+++ b/sci-libs/ceres-solver/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">
Ceres Solver is a portable C++ library that allows for
modeling and solving large complicated nonlinear least squares
problems. It features:
@@ -10,7 +10,7 @@
* robust loss functions
* local parameterizations
* threaded Jacobian evaluators and linear solvers
- * Levenberg-Marquardt and Dogleg (Powell,Subspace) solvers
+ * Levenberg-Marquardt and Dogleg (Powell, Subspace) solvers
* Dense QR and Cholesky factorization (using Eigen) for small problems
* Sparse Cholesky factorization (using SuiteSparse) for large sparse
problems
@@ -18,13 +18,13 @@
* Iterative linear solvers for general sparse and bundle
adjustment problems
</longdescription>
- <use>
- <flag name="schur">Enable fixed-size schur specializations (disable if
+<use>
+ <flag name="schur">Enable fixed-size schur specializations (disable if
binary size is an issue)</flag>
- <flag name="metis">Use METIS via <pkg>sci-libs/cholmod</pkg> for matrix partitioning</flag>
- <flag name="sparse">Enable support for sparse matrix algebra with various
+ <flag name="metis">Use METIS via <pkg>sci-libs/cholmod</pkg> for matrix partitioning</flag>
+ <flag name="sparse">Enable support for sparse matrix algebra with various
packages from SuiteSparse</flag>
- <flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
- <flag name="protobuf">Use <pkg>dev-libs/protobuf</pkg> to encode structured data</flag>
- </use>
+ <flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
+ <flag name="protobuf">Use <pkg>dev-libs/protobuf</pkg> to encode structured data</flag>
+</use>
</pkgmetadata>