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

2024-08-24 Thread Andrew Ammerlaan
commit: 1ae3d189873e66680973fbe35176357b9b98fff8
Author: Paul Zander  gmail  com>
AuthorDate: Wed Aug 21 18:26:51 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Aug 24 19:45:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ae3d189

sci-libs/ceres-solver: fix build with GCC 15

Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38270
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild |  1 +
 .../files/ceres-solver-2.2.0-include-algorithm.patch   | 18 ++
 2 files changed, 19 insertions(+)

diff --git a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
index eb2f320fe9bc..191c4845525f 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
@@ -45,6 +45,7 @@ DOCS=( README.md VERSION )
 
 PATCHES=(
"${FILESDIR}/${PN}-2.0.0-system-mathjax.patch"
+   "${FILESDIR}/${PN}-2.2.0-include-algorithm.patch"
 )
 
 src_prepare() {

diff --git 
a/sci-libs/ceres-solver/files/ceres-solver-2.2.0-include-algorithm.patch 
b/sci-libs/ceres-solver/files/ceres-solver-2.2.0-include-algorithm.patch
new file mode 100644
index ..4f5887eec6e4
--- /dev/null
+++ b/sci-libs/ceres-solver/files/ceres-solver-2.2.0-include-algorithm.patch
@@ -0,0 +1,18 @@
+From: Paul Zander 
+Date: Wed, 21 Aug 2024 20:19:25 +0200
+Subject: [PATCH] include algorithm
+
+Signed-off-by: Paul Zander 
+
+--- a/internal/ceres/cuda_streamed_buffer.h
 b/internal/ceres/cuda_streamed_buffer.h
+@@ -34,6 +34,9 @@
+ #include "ceres/internal/config.h"
+ 
+ #ifndef CERES_NO_CUDA
++
++#include 
++
+ #include "ceres/cuda_buffer.h"
+ 
+ namespace ceres::internal {



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2024-05-29 Thread Sam James
commit: f500d185d470f3e5db51258e9af5cb872d5bc551
Author: Sam James  gentoo  org>
AuthorDate: Wed May 29 11:45:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 29 11:45:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f500d185

sci-libs/ceres-solver: Stabilize 2.2.0-r1 amd64, #933039

Signed-off-by: Sam James  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
index 747e151d1e59..eb2f320fe9bc 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz";
 
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 )"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples cuda gflags lapack +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2024-03-18 Thread Andrew Ammerlaan
commit: 7e7330cc8c499ec3ca1083e4cceb4748fef19986
Author: Paul Zander  gmail  com>
AuthorDate: Sat Mar 16 15:00:53 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Mar 18 15:26:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7330cc

sci-libs/ceres-solver: 2.2.0 fix automagic cuda dependency

Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35779
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...r-2.2.0.ebuild => ceres-solver-2.2.0-r1.ebuild} | 26 +++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-2.2.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
similarity index 77%
rename from sci-libs/ceres-solver/ceres-solver-2.2.0.ebuild
rename to sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
index 6abc595b8231..747e151d1e59 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.2.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 DOCS_BUILDER="sphinx"
 DOCS_DEPEND="dev-python/sphinx-rtd-theme"
 DOCS_DIR="docs/source"
-inherit cmake-multilib flag-o-matic python-any-r1 docs
+inherit cmake-multilib cuda flag-o-matic python-any-r1 docs
 
 DESCRIPTION="Nonlinear least-squares minimizer"
 HOMEPAGE="http://ceres-solver.org/";
@@ -16,7 +16,7 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz";
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 )"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples gflags lapack +schur sparse test"
+IUSE="examples cuda gflags lapack +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
 RESTRICT="!test? ( test )"
@@ -28,6 +28,7 @@ BDEPEND="${PYTHON_DEPS}
 "
 RDEPEND="
dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
+   cuda? ( dev-util/nvidia-cuda-toolkit:= )
lapack? ( virtual/lapack )
sparse? (
sci-libs/amd
@@ -61,7 +62,7 @@ src_prepare() {
 }
 
 src_configure() {
-   # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
+   # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF
local mycmakeargs=(
-DBUILD_BENCHMARKS=OFF
-DBUILD_EXAMPLES=$(usex examples)
@@ -72,13 +73,32 @@ src_configure() {
-DSCHUR_SPECIALIZATIONS=$(usex schur)
-DSUITESPARSE=$(usex sparse)
-DEigen3_DIR=/usr/$(get_libdir)/cmake/eigen3
+
+   -DBUILD_SHARED_LIBS="yes"
+   -DEIGENMETIS="yes"
+   -DEIGENSPARSE="yes"
+   -DMINIGLOG="no"
+   -DCUSTOM_BLAS="yes"
+   -DUSE_CUDA="$(usex cuda)"
)
 
+   if use cuda; then
+   : "${CUDAHOSTCXX:=$(cuda_gccdir)}"
+   : "${CUDAARCHS:=all}"
+   export CUDAHOSTCXX
+   export CUDAARCHS
+   fi
+
use sparse || mycmakeargs+=( -DEIGENSPARSE=ON )
 
cmake-multilib_src_configure
 }
 
+src_test() {
+   use cuda && cuda_add_sandbox -w
+   cmake_src_test
+}
+
 src_install() {
cmake-multilib_src_install
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2024-03-10 Thread Andrew Ammerlaan
commit: 109784a7a8f36e88215286003bfd1482453404fc
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sun Mar 10 15:32:12 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Mar 10 15:51:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=109784a7

sci-libs/ceres-solver: add 2.2.0

Closes: https://bugs.gentoo.org/873265
Closes: https://bugs.gentoo.org/862678
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/ceres-solver/Manifest  |  1 +
 sci-libs/ceres-solver/ceres-solver-2.2.0.ebuild | 89 +
 2 files changed, 90 insertions(+)

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index c3da8e66ac75..e4bd9d33e5bc 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1 +1,2 @@
 DIST ceres-solver-2.1.0.tar.gz 3802187 BLAKE2B 
d8ff780cf9b9de2541c15a2b95bde07a2d1c8e60bab3a8a4b13134b99da699da452467afe3310b9f70c3c2a6bd033ea3c4bd3c401153899e9c70867fae30c633
 SHA512 
db777c4a4b85a9972628c714413fe9ca1a92cc6c8b14d80401842a02c4d7e7df4e9d236775e231e8337e47f21e47cd82c1a0fbcfeffbd9b654e46a66262996f2
+DIST ceres-solver-2.2.0.tar.gz 7635532 BLAKE2B 
ecdd5147e235df711705fc262fad18cfc79f8cfaaa9aba41428c70ae5996aab44c44e5b7d3f62d8ab4633ec2d7511c39191323911fea1276f5797e900c42bc60
 SHA512 
bf519fbcbd0ee2d4624be72cde061a09d191ee5e56dc33984669393799b885c2164efc99dcef71307f8b50a9ccad945882376ace3d9a44ba7e1f25c20511aabd

diff --git a/sci-libs/ceres-solver/ceres-solver-2.2.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.2.0.ebuild
new file mode 100644
index ..6abc595b8231
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-2.2.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DOCS_BUILDER="sphinx"
+DOCS_DEPEND="dev-python/sphinx-rtd-theme"
+DOCS_DIR="docs/source"
+inherit cmake-multilib flag-o-matic python-any-r1 docs
+
+DESCRIPTION="Nonlinear least-squares minimizer"
+HOMEPAGE="http://ceres-solver.org/";
+SRC_URI="http://ceres-solver.org/${P}.tar.gz";
+
+LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples gflags lapack +schur sparse test"
+
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+   >=dev-cpp/eigen-3.3.4:3
+   lapack? ( virtual/pkgconfig )
+   doc? ( 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2023-08-16 Thread Michael Orlitzky
commit: f9d11a491abec360730183e4edee265e2a12b620
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Aug 16 13:21:48 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Aug 16 20:13:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d11a49

sci-libs/ceres-solver: add dev-libs/mathjax upper bound

This package patches in support for the system copy of dev-libs/mathjax,
and may actually work with mathjax-3.x, but for now let's play it safe.
An upgrade to mathjax-3.x can be attempted once it's in the tree.

Bug: https://bugs.gentoo.org/837722
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../{ceres-solver-2.1.0.ebuild => ceres-solver-2.1.0-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.1.0-r1.ebuild
similarity index 98%
rename from sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
rename to sci-libs/ceres-solver/ceres-solver-2.1.0-r1.ebuild
index 28312cad9867..0266f174e0e4 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.1.0-r1.ebuild
@@ -24,7 +24,7 @@ RESTRICT="!test? ( test )"
 BDEPEND="${PYTHON_DEPS}
>=dev-cpp/eigen-3.3.4:3
lapack? ( virtual/pkgconfig )
-   doc? ( dev-libs/mathjax )
+   doc? ( 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2023-02-23 Thread Andrew Ammerlaan
commit: bdadffa54f771359469438a8b0ac2d055339f1e1
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Feb 23 13:41:01 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Feb 23 13:41:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdadffa5

sci-libs/ceres-solver: enable py3.11

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
index 7cb34a8756d3..28312cad9867 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DOCS_BUILDER="sphinx"
 DOCS_DEPEND="dev-python/sphinx-rtd-theme"
 DOCS_DIR="docs/source"



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2022-12-19 Thread Andreas Sturmlechner
commit: facd0108c9e6255119ad55a5bb6995ec7a901dd8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 18 11:40:04 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 19 14:44:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=facd0108

sci-libs/ceres-solver: drop 2.0.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/ceres-solver/Manifest  |  1 -
 sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild | 99 -
 2 files changed, 100 deletions(-)

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 8d35692a2766..c3da8e66ac75 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,2 +1 @@
-DIST ceres-solver-2.0.0.tar.gz 11225245 BLAKE2B 
1761908747d460f6a84cb519b4bbb49fec7e1e36cc616b438c45ace57d10bd3bb4d0cb2795e07d5096e0b9453511c185ffdd3872e317aa8095daeb86933643b0
 SHA512 
843b19389f4d628b2b8b8538655cb330e092ffcc960c6896c6e3065b3a34e330c81e993b7abcd754e575742e2104087efde3526945c92f7df3f6b700984e49f9
 DIST ceres-solver-2.1.0.tar.gz 3802187 BLAKE2B 
d8ff780cf9b9de2541c15a2b95bde07a2d1c8e60bab3a8a4b13134b99da699da452467afe3310b9f70c3c2a6bd033ea3c4bd3c401153899e9c70867fae30c633
 SHA512 
db777c4a4b85a9972628c714413fe9ca1a92cc6c8b14d80401842a02c4d7e7df4e9d236775e231e8337e47f21e47cd82c1a0fbcfeffbd9b654e46a66262996f2

diff --git a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
deleted file mode 100644
index 684d229cf029..
--- a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DOCS_BUILDER="sphinx"
-DOCS_DEPEND="dev-python/sphinx_rtd_theme"
-DOCS_DIR="docs/source"
-inherit cmake-multilib python-any-r1 docs toolchain-funcs
-
-DESCRIPTION="Nonlinear least-squares minimizer"
-HOMEPAGE="http://ceres-solver.org/";
-SRC_URI="http://ceres-solver.org/${P}.tar.gz";
-
-LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
-SLOT="0/1"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxsparse examples gflags lapack openmp +schur sparse test"
-
-REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-   >=dev-cpp/eigen-3.3.4:3
-   lapack? ( virtual/pkgconfig )
-   doc? ( dev-libs/mathjax )
-"
-RDEPEND="
-   dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
-   cxsparse? ( sci-libs/cxsparse )
-   lapack? ( virtual/lapack )
-   sparse? (
-   sci-libs/amd
-   sci-libs/camd
-   sci-libs/ccolamd
-   sci-libs/cholmod[metis(+)]
-   sci-libs/colamd
-   sci-libs/spqr
-   )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md VERSION )
-
-PATCHES=( "${FILESDIR}/${P}-system-mathjax.patch" )
-
-pkg_pretend() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-   use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # search paths work for prefix
-   sed -e "s:/usr:${EPREFIX}/usr:g" \
-   -i cmake/*.cmake || die
-
-   # remove Werror
-   sed -e 's/-Werror=(all|extra)//g' \
-   -i CMakeLists.txt || die
-}
-
-src_configure() {
-   # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
-   local mycmakeargs=(
-   -DBUILD_BENCHMARKS=OFF
-   -DBUILD_EXAMPLES=$(usex examples)
-   -DBUILD_TESTING=$(usex test)
-   -DBUILD_DOCUMENTATION=$(usex doc)
-   -DGFLAGS=$(usex gflags)
-   -DLAPACK=$(usex lapack)
-   -DSCHUR_SPECIALIZATIONS=$(usex schur)
-   -DCXSPARSE=$(usex cxsparse)
-   -DSUITESPARSE=$(usex sparse)
-   -DEigen3_DIR=/usr/$(get_libdir)/cmake/eigen3
-   -DCERES_THREADING_MODEL=$(usex openmp OPENMP CXX_THREADS)
-   )
-   use doc && mycmakeargs+=(
-   -DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
-   )
-   use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
-   cmake-multilib_src_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   if use examples; then
-   docompress -x /usr/share/doc/${PF}/examples
-   dodoc -r examples data
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2022-09-26 Thread Jakov Smolić
commit: f3707c36b9d2bf88caa572ad4f7d0978fcb71edb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Sep 26 15:04:46 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Sep 26 15:04:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3707c36

sci-libs/ceres-solver: Stabilize 2.1.0 amd64, #872566

Signed-off-by: Jakov Smolić  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
index fa2a76ca48ac..a274e62d83d7 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz";
 
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxsparse examples gflags lapack openmp +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2022-08-19 Thread Andreas Sturmlechner
commit: 063d917915f5a876bb485963947ad266026f0bef
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 14 21:37:03 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 19 08:13:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063d9179

sci-libs/ceres-solver: drop 1.14.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/ceres-solver/Manifest   |  1 -
 sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild | 99 
 2 files changed, 100 deletions(-)

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 0bc19ef944c4..8d35692a2766 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,3 +1,2 @@
-DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B 
cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc
 SHA512 
a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
 DIST ceres-solver-2.0.0.tar.gz 11225245 BLAKE2B 
1761908747d460f6a84cb519b4bbb49fec7e1e36cc616b438c45ace57d10bd3bb4d0cb2795e07d5096e0b9453511c185ffdd3872e317aa8095daeb86933643b0
 SHA512 
843b19389f4d628b2b8b8538655cb330e092ffcc960c6896c6e3065b3a34e330c81e993b7abcd754e575742e2104087efde3526945c92f7df3f6b700984e49f9
 DIST ceres-solver-2.1.0.tar.gz 3802187 BLAKE2B 
d8ff780cf9b9de2541c15a2b95bde07a2d1c8e60bab3a8a4b13134b99da699da452467afe3310b9f70c3c2a6bd033ea3c4bd3c401153899e9c70867fae30c633
 SHA512 
db777c4a4b85a9972628c714413fe9ca1a92cc6c8b14d80401842a02c4d7e7df4e9d236775e231e8337e47f21e47cd82c1a0fbcfeffbd9b654e46a66262996f2

diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
deleted file mode 100644
index 67f410873961..
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake-multilib python-any-r1 toolchain-funcs
-
-DESCRIPTION="Nonlinear least-squares minimizer"
-HOMEPAGE="http://ceres-solver.org/";
-SRC_URI="http://ceres-solver.org/${P}.tar.gz";
-
-LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
-SLOT="0/1"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxsparse doc examples gflags lapack openmp +schur sparse test"
-
-REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-   >=dev-cpp/eigen-3.3.4:3
-   doc? (
-   $(python_gen_any_dep '
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-   ')
-   )
-   lapack? ( virtual/pkgconfig )
-"
-RDEPEND="
-   dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
-   cxsparse? ( sci-libs/cxsparse )
-   lapack? ( virtual/lapack )
-   sparse? (
-   sci-libs/amd
-   sci-libs/camd
-   sci-libs/ccolamd
-   sci-libs/cholmod[metis(+)]
-   sci-libs/colamd
-   sci-libs/spqr
-   )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md VERSION )
-
-pkg_pretend() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-   use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # search paths work for prefix
-   sed -e "s:/usr:${EPREFIX}/usr:g" \
-   -i cmake/*.cmake || die
-
-   # remove Werror
-   sed -e 's/-Werror=(all|extra)//g' \
-   -i CMakeLists.txt || die
-}
-
-src_configure() {
-   # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
-   local mycmakeargs=(
-   -DBUILD_BENCHMARKS=OFF
-   -DBUILD_EXAMPLES=OFF
-   -DBUILD_TESTING=$(usex test)
-   -DBUILD_DOCUMENTATION=$(usex doc)
-   -DGFLAGS=$(usex gflags)
-   -DLAPACK=$(usex lapack)
-   -DOPENMP=$(usex openmp)
-   -DSCHUR_SPECIALIZATIONS=$(usex schur)
-   -DCXSPARSE=$(usex cxsparse)
-   -DSUITESPARSE=$(usex sparse)
-   )
-   use doc && mycmakeargs+=(
-   -DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
-   )
-   use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
-   cmake-multilib_src_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-
-   if use examples; then
-   docompress -x /usr/share/doc/${PF}/examples
-   dodoc -r examples data
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2022-05-14 Thread David Seifert
commit: db08774d96d5eb0b797cf0199625d7275587f428
Author: David Seifert  gentoo  org>
AuthorDate: Sat May 14 21:30:21 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May 14 21:30:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db08774d

sci-libs/ceres-solver: [QA] tc-has-openmp → tc-check-openmp

Signed-off-by: David Seifert  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild | 10 +++---
 sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild  | 10 +++---
 sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild  |  8 ++--
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index 4bd35e1b7fc8..67f410873961 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,15 +48,11 @@ DEPEND="${RDEPEND}"
 DOCS=( README.md VERSION )
 
 pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-   if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
-   ewarn "OpenMP is not available in your current selected 
gcc"
-   die "need openmp capable gcc"
-   fi
-   fi
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
use doc && python-any-r1_pkg_setup
 }
 

diff --git a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
index 8ed07b8f792e..66ffb261da7c 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,15 +48,11 @@ DOCS=( README.md VERSION )
 PATCHES=( "${FILESDIR}/${P}-system-mathjax.patch" )
 
 pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-   if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
-   ewarn "OpenMP is not available in your current selected 
gcc"
-   die "need openmp capable gcc"
-   fi
-   fi
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
use doc && python-any-r1_pkg_setup
 }
 

diff --git a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
index 92fefb044a1a..fa2a76ca48ac 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
@@ -48,15 +48,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-   if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
-   ewarn "OpenMP is not available in your current selected 
gcc"
-   die "need openmp capable gcc"
-   fi
-   fi
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
use doc && python-any-r1_pkg_setup
 }
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2022-05-04 Thread Sam James
commit: 3f0ed6797219492f58a2a4c3183087ad1c53337d
Author: Sam James  gentoo  org>
AuthorDate: Wed May  4 23:55:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  5 00:11:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0ed679

sci-libs/ceres-solver: add 2.1.0

Closes: https://bugs.gentoo.org/842636
Signed-off-by: Sam James  gentoo.org>

 sci-libs/ceres-solver/Manifest  |   1 +
 sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild | 106 
 2 files changed, 107 insertions(+)

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 3a08363f7eda..0bc19ef944c4 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,2 +1,3 @@
 DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B 
cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc
 SHA512 
a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
 DIST ceres-solver-2.0.0.tar.gz 11225245 BLAKE2B 
1761908747d460f6a84cb519b4bbb49fec7e1e36cc616b438c45ace57d10bd3bb4d0cb2795e07d5096e0b9453511c185ffdd3872e317aa8095daeb86933643b0
 SHA512 
843b19389f4d628b2b8b8538655cb330e092ffcc960c6896c6e3065b3a34e330c81e993b7abcd754e575742e2104087efde3526945c92f7df3f6b700984e49f9
+DIST ceres-solver-2.1.0.tar.gz 3802187 BLAKE2B 
d8ff780cf9b9de2541c15a2b95bde07a2d1c8e60bab3a8a4b13134b99da699da452467afe3310b9f70c3c2a6bd033ea3c4bd3c401153899e9c70867fae30c633
 SHA512 
db777c4a4b85a9972628c714413fe9ca1a92cc6c8b14d80401842a02c4d7e7df4e9d236775e231e8337e47f21e47cd82c1a0fbcfeffbd9b654e46a66262996f2

diff --git a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
new file mode 100644
index ..92fefb044a1a
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DOCS_BUILDER="sphinx"
+DOCS_DEPEND="dev-python/sphinx_rtd_theme"
+DOCS_DIR="docs/source"
+inherit cmake-multilib python-any-r1 docs toolchain-funcs
+
+DESCRIPTION="Nonlinear least-squares minimizer"
+HOMEPAGE="http://ceres-solver.org/";
+SRC_URI="http://ceres-solver.org/${P}.tar.gz";
+
+LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxsparse examples gflags lapack openmp +schur sparse test"
+
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+   >=dev-cpp/eigen-3.3.4:3
+   lapack? ( virtual/pkgconfig )
+   doc? ( dev-libs/mathjax )
+"
+RDEPEND="
+   dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
+   cxsparse? ( sci-libs/cxsparse )
+   lapack? ( virtual/lapack )
+   sparse? (
+   sci-libs/amd
+   sci-libs/camd
+   sci-libs/ccolamd
+   sci-libs/cholmod[metis(+)]
+   sci-libs/colamd
+   sci-libs/spqr
+   )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md VERSION )
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.0.0-system-mathjax.patch"
+)
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+   if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
+   ewarn "OpenMP is not available in your current selected 
gcc"
+   die "need openmp capable gcc"
+   fi
+   fi
+}
+
+pkg_setup() {
+   use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # search paths work for prefix
+   sed -e "s:/usr:${EPREFIX}/usr:g" \
+   -i cmake/*.cmake || die
+
+   # remove Werror
+   sed -e 's/-Werror=(all|extra)//g' \
+   -i CMakeLists.txt || die
+}
+
+src_configure() {
+   # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
+   local mycmakeargs=(
+   -DBUILD_BENCHMARKS=OFF
+   -DBUILD_EXAMPLES=$(usex examples)
+   -DBUILD_TESTING=$(usex test)
+   -DBUILD_DOCUMENTATION=$(usex doc)
+   -DGFLAGS=$(usex gflags)
+   -DLAPACK=$(usex lapack)
+   -DSCHUR_SPECIALIZATIONS=$(usex schur)
+   -DCXSPARSE=$(usex cxsparse)
+   -DSUITESPARSE=$(usex sparse)
+   -DEigen3_DIR=/usr/$(get_libdir)/cmake/eigen3
+   -DCERES_THREADING_MODEL=$(usex openmp OPENMP CXX_THREADS)
+   )
+
+   use doc && mycmakeargs+=(
+   -DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+   )
+   use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
+
+   cmake-multilib_src_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   if use example

[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2021-11-03 Thread Jakov Smolić
commit: 8ec2e0b5ba3114a83966b305d9fdd140cff7b3e5
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Nov  3 20:38:04 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Nov  3 20:38:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec2e0b5

sci-libs/ceres-solver: Stabilize 2.0.0 amd64, #816387

Signed-off-by: Jakov Smolić  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
index 771ac309e41..8ed07b8f792 100644
--- a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz";
 
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxsparse examples gflags lapack openmp +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"



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

2021-08-04 Thread Andrew Ammerlaan
commit: bcfb8cbaf2ba393d0959684675c3913e44338dc3
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Aug  4 19:25:40 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Aug  4 19:32:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcfb8cba

sci-libs/ceres-solver: Bump to 2.0.0

* Based off of sci-libs/ceres-solver-1.14.0.
* Uses existing `USE=openmp` to set new CERES_THREADING_MODEL cmake
  variable.
* Fixes error where `Eigen3Config.cmake` is missing.
* Add `USE=system-mathjax` and associated patch to enable generated doc to
  use local MathJax to render embedded math.

Closes: https://bugs.gentoo.org/806409
Signed-off-by: Brian R McCarter  us.navy.mil>
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/ceres-solver/Manifest |   1 +
 sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild| 104 +
 .../files/ceres-solver-2.0.0-system-mathjax.patch  |  10 ++
 3 files changed, 115 insertions(+)

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 941bf4bbf4f..3a08363f7ed 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1 +1,2 @@
 DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B 
cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc
 SHA512 
a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
+DIST ceres-solver-2.0.0.tar.gz 11225245 BLAKE2B 
1761908747d460f6a84cb519b4bbb49fec7e1e36cc616b438c45ace57d10bd3bb4d0cb2795e07d5096e0b9453511c185ffdd3872e317aa8095daeb86933643b0
 SHA512 
843b19389f4d628b2b8b8538655cb330e092ffcc960c6896c6e3065b3a34e330c81e993b7abcd754e575742e2104087efde3526945c92f7df3f6b700984e49f9

diff --git a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
new file mode 100644
index 000..771ac309e41
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+DOCS_BUILDER="sphinx"
+DOCS_DEPEND="dev-python/sphinx_rtd_theme"
+DOCS_DIR="docs/source"
+inherit cmake-multilib python-any-r1 docs toolchain-funcs
+
+DESCRIPTION="Nonlinear least-squares minimizer"
+HOMEPAGE="http://ceres-solver.org/";
+SRC_URI="http://ceres-solver.org/${P}.tar.gz";
+
+LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxsparse examples gflags lapack openmp +schur sparse test"
+
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+   >=dev-cpp/eigen-3.3.4:3
+   lapack? ( virtual/pkgconfig )
+   doc? ( dev-libs/mathjax )
+"
+RDEPEND="
+   dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
+   cxsparse? ( sci-libs/cxsparse )
+   lapack? ( virtual/lapack )
+   sparse? (
+   sci-libs/amd
+   sci-libs/camd
+   sci-libs/ccolamd
+   sci-libs/cholmod[metis(+)]
+   sci-libs/colamd
+   sci-libs/spqr
+   )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md VERSION )
+
+PATCHES=( "${FILESDIR}/${P}-system-mathjax.patch" )
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+   if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
+   ewarn "OpenMP is not available in your current selected 
gcc"
+   die "need openmp capable gcc"
+   fi
+   fi
+}
+
+pkg_setup() {
+   use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # search paths work for prefix
+   sed -e "s:/usr:${EPREFIX}/usr:g" \
+   -i cmake/*.cmake || die
+
+   # remove Werror
+   sed -e 's/-Werror=(all|extra)//g' \
+   -i CMakeLists.txt || die
+}
+
+src_configure() {
+   # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
+   local mycmakeargs=(
+   -DBUILD_BENCHMARKS=OFF
+   -DBUILD_EXAMPLES=$(usex examples)
+   -DBUILD_TESTING=$(usex test)
+   -DBUILD_DOCUMENTATION=$(usex doc)
+   -DGFLAGS=$(usex gflags)
+   -DLAPACK=$(usex lapack)
+   -DSCHUR_SPECIALIZATIONS=$(usex schur)
+   -DCXSPARSE=$(usex cxsparse)
+   -DSUITESPARSE=$(usex sparse)
+   -DEigen3_DIR=/usr/$(get_libdir)/cmake/eigen3
+   -DCERES_THREADING_MODEL=$(usex openmp OPENMP CXX_THREADS)
+   )
+   use doc && mycmakeargs+=(
+   -DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+   )
+   use sparse || use cxs

[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2021-06-05 Thread Andrew Ammerlaan
commit: 64dd72b47b070e5a64346098ab4b1b09c61f073a
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Jun  5 13:03:03 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jun  5 13:03:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64dd72b4

sci-libs/ceres-solver: properly depend on sphinx(_rtd_theme)

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index 6eb8c9d0f1b..4bd35e1b7fc 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
@@ -23,8 +23,10 @@ RESTRICT="!test? ( test )"
 BDEPEND="${PYTHON_DEPS}
>=dev-cpp/eigen-3.3.4:3
doc? (
-   dev-python/sphinx
-   dev-python/sphinx_rtd_theme
+   $(python_gen_any_dep '
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+   ')
)
lapack? ( virtual/pkgconfig )
 "



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2021-06-05 Thread Andrew Ammerlaan
commit: d8b3811af868b6a451c27dbd4845b89a909bcc3e
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Jun  5 12:51:30 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Jun  5 13:03:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b3811a

sci-libs/ceres-solver: add python-3.9 support

Bugday 2021-06-05

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21130
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index 30cce977960..6eb8c9d0f1b 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake-multilib python-any-r1 toolchain-funcs
 
 DESCRIPTION="Nonlinear least-squares minimizer"



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2020-05-01 Thread Andreas Sturmlechner
commit: 79996b214863489ff4ea8d55968f34796b624278
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May  1 18:04:50 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May  1 20:31:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79996b21

sci-libs/ceres-solver: Drop 1.12.0

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/ceres-solver/Manifest   |  1 -
 sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild | 97 
 sci-libs/ceres-solver/metadata.xml   |  1 -
 3 files changed, 99 deletions(-)

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 0b1e2173e3d..941bf4bbf4f 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,2 +1 @@
-DIST ceres-solver-1.12.0.tar.gz 5008861 BLAKE2B 
52b3954dde96386bd031543ab9d7370368f58f76f1dec9d24ef10803da787cc96f40a1c775626fde832b70ebd94cf4274c70a8fb4bd7e1bcf040e119cbec09f8
 SHA512 
485eece0471cf05d31b5dd7e133e23115a334a4ed557a3c1bd0b715a063f840738af8f507e935522a0dae90ce6851984c0002a25e9b445b90889792f68a05571
 DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B 
cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc
 SHA512 
a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6

diff --git a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
deleted file mode 100644
index 05747c215b0..000
--- a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-multilib eutils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Nonlinear least-squares minimizer"
-HOMEPAGE="http://ceres-solver.org/";
-SRC_URI="http://ceres-solver.org/${P}.tar.gz";
-
-LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
-SLOT="0/1"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
-
-RDEPEND="
-   dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
-   cxsparse? ( sci-libs/cxsparse )
-   lapack? ( virtual/lapack )
-   sparse? (
-   sci-libs/amd
-   sci-libs/camd
-   sci-libs/ccolamd
-   sci-libs/cholmod[metis(+)]
-   sci-libs/colamd
-   sci-libs/spqr
-   )"
-
-DEPEND="${RDEPEND}
-   dev-cpp/eigen:3
-   doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme )
-   lapack? ( virtual/pkgconfig )
-   ${PYTHON_DEPS}"
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-   if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
-   ewarn "OpenMP is not available in your current selected 
gcc"
-   die "need openmp capable gcc"
-   fi
-   fi
-}
-
-pkg_setup() {
-   use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   # search paths work for prefix
-   sed -e "s:/usr:${EPREFIX}/usr:g" \
-   -i cmake/*.cmake || die
-
-   # remove Werror
-   sed -e 's/-Werror=(all|extra)//g' \
-   -i CMakeLists.txt || die
-
-   # respect gentoo doc install directory
-   sed -e "s:share/doc/ceres:share/doc/${PF}:" \
-   -i docs/source/CMakeLists.txt || die
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
-   local mycmakeargs=(
-   -DBUILD_SHARED_LIBS=ON
-   -DBUILD_EXAMPLES=OFF
-   -DENABLE_TESTING="$(usex test)"
-   -DCXX11="$(usex c++11)"
-   -DBUILD_DOCUMENTATION="$(usex doc)"
-   -DGFLAGS="$(usex gflags)"
-   -DLAPACK="$(usex lapack)"
-   -DOPENMP="$(usex openmp)"
-   -DSCHUR_SPECIALIZATIONS="$(usex schur)"
-   -DCXSPARSE="$(usex cxsparse)"
-   -DSUITESPARSE="$(usex sparse)"
-   )
-   use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
-   cmake-multilib_src_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-   dodoc README.md VERSION
-
-   if use examples; then
-   docinto /usr/share/doc/${PF}
-   docompress -x /usr/share/doc/${PF}/examples
-   doins -r examples data
-   fi
-}

diff --git a/sci-libs/ceres-solver/metadata.xml 
b/sci-libs/ceres-solver/metadata.xml
index 42d1cafcb8b..57c1a1394e0 100644
--- a/sci-libs/ceres-solver/metadata.xml
+++ b/sci-libs/ceres-solver/metada

[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2020-04-20 Thread Agostino Sarubbo
commit: cf0d7f0f17786a213c3ff859e68e7b57c2695cc7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Apr 20 10:14:44 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Apr 20 10:16:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf0d7f0f

sci-libs/ceres-solver: amd64 stable wrt bug #716824

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index d40b75690c4..c7c0bfab640 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz";
 
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxsparse doc examples gflags lapack openmp +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2020-04-09 Thread Andreas Sturmlechner
commit: a276fa7aa64e7a0b060ab2ffc701961ab133
Author: Bernd Waibel  gmail  com>
AuthorDate: Thu Apr  2 07:02:24 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 21:36:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a276fa7a

sci-libs/ceres-solver: fix CI issue

- address the MissingUseDepDefault issue form pkgcheck
- remove slot and subslot operators on deps without slots

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15204
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index d5241fc699a..d40b75690c4 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
@@ -30,15 +30,15 @@ BDEPEND="${PYTHON_DEPS}
 "
 RDEPEND="
dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
-   cxsparse? ( sci-libs/cxsparse:0= )
+   cxsparse? ( sci-libs/cxsparse )
lapack? ( virtual/lapack )
sparse? (
-   sci-libs/amd:0=
-   sci-libs/camd:0=
-   sci-libs/ccolamd:0=
-   sci-libs/cholmod:0=[metis]
-   sci-libs/colamd:0=
-   sci-libs/spqr:0=
+   sci-libs/amd
+   sci-libs/camd
+   sci-libs/ccolamd
+   sci-libs/cholmod[metis(+)]
+   sci-libs/colamd
+   sci-libs/spqr
)
 "
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2020-04-09 Thread Andreas Sturmlechner
commit: 49aa9d895e0d2cc38c55dce8c3eccd200c245fc8
Author: Bernd Waibel  gmail  com>
AuthorDate: Thu Apr  2 17:51:16 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  9 21:36:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49aa9d89

sci-libs/ceres-solver: fix CI issues

- address MissingUseDepDefault and DeprecatedInsinto issues from pkgcheck
- remove slot and subslot operator on dependencies without slots

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Bernd Waibel  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
index 8bef6c01db9..05747c215b0 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
@@ -21,15 +21,15 @@ REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) 
abi_x86_32? ( !sparse !lapack
 
 RDEPEND="
dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
-   cxsparse? ( sci-libs/cxsparse:0= )
+   cxsparse? ( sci-libs/cxsparse )
lapack? ( virtual/lapack )
sparse? (
-   sci-libs/amd:0=
-   sci-libs/camd:0=
-   sci-libs/ccolamd:0=
-   sci-libs/cholmod:0=[metis]
-   sci-libs/colamd:0=
-   sci-libs/spqr:0=
+   sci-libs/amd
+   sci-libs/camd
+   sci-libs/ccolamd
+   sci-libs/cholmod[metis(+)]
+   sci-libs/colamd
+   sci-libs/spqr
)"
 
 DEPEND="${RDEPEND}
@@ -90,7 +90,7 @@ src_install() {
dodoc README.md VERSION
 
if use examples; then
-   insinto /usr/share/doc/${PF}
+   docinto /usr/share/doc/${PF}
docompress -x /usr/share/doc/${PF}/examples
doins -r examples data
fi



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2020-03-21 Thread Andreas Sturmlechner
commit: 9d4a85b0d543b4564beaaa955c2314e70b7e6952
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 22 00:31:58 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 22 00:32:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d4a85b0

sci-libs/ceres-solver: Drop USE c++11

Closes: https://bugs.gentoo.org/705192
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index 6b175ba5ec7..d5241fc699a 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz";
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
+IUSE="cxsparse doc examples gflags lapack openmp +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
 
@@ -76,9 +76,7 @@ src_configure() {
-DBUILD_BENCHMARKS=OFF
-DBUILD_EXAMPLES=OFF
-DBUILD_TESTING=$(usex test)
-   -DCXX11=$(usex c++11)
-DBUILD_DOCUMENTATION=$(usex doc)
-   -DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
-DGFLAGS=$(usex gflags)
-DLAPACK=$(usex lapack)
-DOPENMP=$(usex openmp)
@@ -86,6 +84,9 @@ src_configure() {
-DCXSPARSE=$(usex cxsparse)
-DSUITESPARSE=$(usex sparse)
)
+   use doc && mycmakeargs+=(
+   -DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+   )
use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
cmake-multilib_src_configure
 }



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2020-03-19 Thread Andreas Sturmlechner
commit: 3db3b24b7572757f66fcb66337be767cde33b02e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 19 12:34:42 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 19 13:23:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db3b24b

sci-libs/ceres-solver: Drop 1.11.0

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/ceres-solver/Manifest   |  1 -
 sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild | 97 
 2 files changed, 98 deletions(-)

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 6a7c6cb6b19..9eea55fad9f 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,2 +1 @@
-DIST ceres-solver-1.11.0.tar.gz 3944965 BLAKE2B 
cafae018abde9b8085f7e8841a6a720ef52cd40178a43c3050b6b20465bc9675cc326a6bc405572a235758c5f2f99e936375f711bf5c4b121acfe0c0641713c6
 SHA512 
4941538e6ec31e2ee56a24446748dc5d6dd02ba9c151e4320a2db943fd1a377455b0ee23d56780e1f05322b30e25057145c540fde901d7fd2244ec630a73527c
 DIST ceres-solver-1.12.0.tar.gz 5008861 BLAKE2B 
52b3954dde96386bd031543ab9d7370368f58f76f1dec9d24ef10803da787cc96f40a1c775626fde832b70ebd94cf4274c70a8fb4bd7e1bcf040e119cbec09f8
 SHA512 
485eece0471cf05d31b5dd7e133e23115a334a4ed557a3c1bd0b715a063f840738af8f507e935522a0dae90ce6851984c0002a25e9b445b90889792f68a05571

diff --git a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
deleted file mode 100644
index d8f758d4dd3..000
--- a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Nonlinear least-squares minimizer"
-HOMEPAGE="http://ceres-solver.org/";
-SRC_URI="http://ceres-solver.org/${P}.tar.gz";
-
-LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
-
-RDEPEND="
-   dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
-   cxsparse? ( sci-libs/cxsparse:0= )
-   lapack? ( virtual/lapack )
-   sparse? (
-   sci-libs/amd:0=
-   sci-libs/camd:0=
-   sci-libs/ccolamd:0=
-   sci-libs/cholmod:0=
-   sci-libs/colamd:0=
-   sci-libs/spqr:0=
-   )"
-
-DEPEND="${RDEPEND}
-   dev-cpp/eigen:3
-   doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme )
-   lapack? ( virtual/pkgconfig )
-   ${PYTHON_DEPS}"
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-   if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
-   ewarn "OpenMP is not available in your current selected 
gcc"
-   die "need openmp capable gcc"
-   fi
-   fi
-}
-
-pkg_setup() {
-   use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   # search paths work for prefix
-   sed -e "s:/usr:${EPREFIX}/usr:g" \
-   -i cmake/*.cmake || die
-
-   # remove Werror
-   sed -e 's/-Werror=(all|extra)//g' \
-   -i CMakeLists.txt || die
-
-   # respect gentoo doc install directory
-   sed -e "s:share/doc/ceres:share/doc/${PF}:" \
-   -i docs/source/CMakeLists.txt || die
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
-   local mycmakeargs=(
-   -DBUILD_SHARED_LIBS=ON
-   -DBUILD_EXAMPLES=OFF
-   -DENABLE_TESTING="$(usex test)"
-   -DCXX11="$(usex c++11)"
-   -DBUILD_DOCUMENTATION="$(usex doc)"
-   -DGFLAGS="$(usex gflags)"
-   -DLAPACK="$(usex lapack)"
-   -DOPENMP="$(usex openmp)"
-   -DSCHUR_SPECIALIZATIONS="$(usex schur)"
-   -DCXSPARSE="$(usex cxsparse)"
-   -DSUITESPARSE="$(usex sparse)"
-   )
-   use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
-   cmake-multilib_src_configure
-}
-
-src_install() {
-   cmake-multilib_src_install
-   dodoc README.md VERSION
-
-   if use examples; then
-   insinto /usr/share/doc/${PF}
-   docompress -x /usr/share/doc/${PF}/examples
-   doins -r examples data
-   fi
-}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2020-03-19 Thread Andreas Sturmlechner
commit: bc28470c9cc435c88c35041a0ff52ea83595edae
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 19 13:01:24 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 19 13:23:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc28470c

sci-libs/ceres-solver: 1.14.0 version bump, EAPI-7 bump, cmake.eclass

fix doc install path
python3_7 + python3_8

Closes: https://bugs.gentoo.org/700294
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/ceres-solver/Manifest   |   1 +
 sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild | 100 +++
 2 files changed, 101 insertions(+)

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 9eea55fad9f..0b1e2173e3d 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1 +1,2 @@
 DIST ceres-solver-1.12.0.tar.gz 5008861 BLAKE2B 
52b3954dde96386bd031543ab9d7370368f58f76f1dec9d24ef10803da787cc96f40a1c775626fde832b70ebd94cf4274c70a8fb4bd7e1bcf040e119cbec09f8
 SHA512 
485eece0471cf05d31b5dd7e133e23115a334a4ed557a3c1bd0b715a063f840738af8f507e935522a0dae90ce6851984c0002a25e9b445b90889792f68a05571
+DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B 
cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc
 SHA512 
a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6

diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
new file mode 100644
index 000..6b175ba5ec7
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1 toolchain-funcs
+
+DESCRIPTION="Nonlinear least-squares minimizer"
+HOMEPAGE="http://ceres-solver.org/";
+SRC_URI="http://ceres-solver.org/${P}.tar.gz";
+
+LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
+
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+   >=dev-cpp/eigen-3.3.4:3
+   doc? (
+   dev-python/sphinx
+   dev-python/sphinx_rtd_theme
+   )
+   lapack? ( virtual/pkgconfig )
+"
+RDEPEND="
+   dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
+   cxsparse? ( sci-libs/cxsparse:0= )
+   lapack? ( virtual/lapack )
+   sparse? (
+   sci-libs/amd:0=
+   sci-libs/camd:0=
+   sci-libs/ccolamd:0=
+   sci-libs/cholmod:0=[metis]
+   sci-libs/colamd:0=
+   sci-libs/spqr:0=
+   )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md VERSION )
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+   if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
+   ewarn "OpenMP is not available in your current selected 
gcc"
+   die "need openmp capable gcc"
+   fi
+   fi
+}
+
+pkg_setup() {
+   use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # search paths work for prefix
+   sed -e "s:/usr:${EPREFIX}/usr:g" \
+   -i cmake/*.cmake || die
+
+   # remove Werror
+   sed -e 's/-Werror=(all|extra)//g' \
+   -i CMakeLists.txt || die
+}
+
+src_configure() {
+   # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
+   local mycmakeargs=(
+   -DBUILD_BENCHMARKS=OFF
+   -DBUILD_EXAMPLES=OFF
+   -DBUILD_TESTING=$(usex test)
+   -DCXX11=$(usex c++11)
+   -DBUILD_DOCUMENTATION=$(usex doc)
+   -DCERES_DOCS_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+   -DGFLAGS=$(usex gflags)
+   -DLAPACK=$(usex lapack)
+   -DOPENMP=$(usex openmp)
+   -DSCHUR_SPECIALIZATIONS=$(usex schur)
+   -DCXSPARSE=$(usex cxsparse)
+   -DSUITESPARSE=$(usex sparse)
+   )
+   use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
+   cmake-multilib_src_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+
+   if use examples; then
+   docompress -x /usr/share/doc/${PF}/examples
+   dodoc -r examples data
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2020-02-10 Thread Michał Górny
commit: 636b2b80cfddf316ebb8eb799984878f5701ede9
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Feb 10 13:05:49 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Feb 10 13:26:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=636b2b80

sci-libs/ceres-solver: Remove py2 where possible

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
index 175e6a1cec4..8bef6c01db9 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-multilib eutils python-any-r1 toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2019-05-20 Thread Mikle Kolyada
commit: 670805e181be9cf3db7a5b9600cded44c666037c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May 20 11:03:01 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May 20 11:03:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670805e1

sci-libs/ceres-solver: amd64 stable wrt bug #685046

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
index a77aaf09933..e2f4c1ef081 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
 
 REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"



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

2017-06-26 Thread Sebastien Fabbro
commit: 5786dd2fb80aa92041a0c2b3d8599a5fdfdd4c52
Author: Sébastien Fabbro  gentoo  org>
AuthorDate: Mon Jun 26 16:27:06 2017 +
Commit: Sebastien Fabbro  gentoo  org>
CommitDate: Tue Jun 27 02:48:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5786dd2f

sci-libs/ceres-solver: version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-libs/ceres-solver/Manifest |  3 +-
 sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild   | 96 +
 sci-libs/ceres-solver/ceres-solver-1.8.0.ebuild| 80 --
 sci-libs/ceres-solver/ceres-solver-1.9.0.ebuild| 97 --
 .../files/ceres-solver-1.9.0-underlink.patch   | 13 ---
 sci-libs/ceres-solver/metadata.xml |  1 -
 6 files changed, 97 insertions(+), 193 deletions(-)

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index f25049fcfeb..5a3ff59fddb 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,3 +1,2 @@
 DIST ceres-solver-1.11.0.tar.gz 3944965 SHA256 
4d666cc33296b4c5cd77bad18ffc487b3223d4bbb7d1dfb342ed9a87dc9af844 SHA512 
4941538e6ec31e2ee56a24446748dc5d6dd02ba9c151e4320a2db943fd1a377455b0ee23d56780e1f05322b30e25057145c540fde901d7fd2244ec630a73527c
 WHIRLPOOL 
82e8c9f8fcf66f20dea28c5ddcfc4ac030a20d86c498eda487899b090fb67e7e44e3e1a76d3b689a409860c83713005e4f889814707d25cf298892ae9ea78890
-DIST ceres-solver-1.8.0.tar.gz 3506384 SHA256 
8ee53241930622b74946201123cd38231161878caacf6c30a3bf1c68b24d79af SHA512 
114ab5e8e40cffb325c69b70b546697d90833a3f82239fc901fb0d87a9d98b376e2e042b768fd0252d8412f3d301adfb7d992202a0e149d037bea86a08f8c6db
 WHIRLPOOL 
cf966a02dced9b672d6aa8a2aecf0aab71bb718bbc5f13acdab2641aed4622c08909eaae6fde1ea91d3e2d0046131692e2ce65969dcbd431ff372482540e4d31
-DIST ceres-solver-1.9.0.tar.gz 3793265 SHA256 
30ac0729249f908afe80cb6fd06ae6d037f25a60d9fac54f61344389adab9c1a SHA512 
8a991eba3bf1e8fe34ad87291af4ab2091e1026dc1eb83a5e5e40913035744587021592c613b5c5077b2ca848bd61175788933996b91f3c6ef4a40309606691d
 WHIRLPOOL 
9187d217f9283f4575d8633ec7cba4d6868624a178fae12e9204f0989554c7b3e9b217b8890288382325b871ac59038e08dd9255be252ae8570c71a4485c1481
+DIST ceres-solver-1.12.0.tar.gz 5008861 SHA256 
745bfed55111e086954126b748eb9efe20e30be5b825c6dec3c525cf20afc895 SHA512 
485eece0471cf05d31b5dd7e133e23115a334a4ed557a3c1bd0b715a063f840738af8f507e935522a0dae90ce6851984c0002a25e9b445b90889792f68a05571
 WHIRLPOOL 
80d884cd62b80b80927c451a2bea0d02dfe120acd98cfa8b6d1b2b9adf74a50242c7dd25e0d445d6454a919c03fc2e64479c7abea100231bcaad5c4b1ff541bc

diff --git a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
new file mode 100644
index 000..d9c8044cdb3
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-multilib eutils python-any-r1 toolchain-funcs
+
+DESCRIPTION="Nonlinear least-squares minimizer"
+HOMEPAGE="http://ceres-solver.org/";
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
+
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
+
+RDEPEND="
+   dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
+   cxsparse? ( sci-libs/cxsparse:0= )
+   lapack? ( virtual/lapack )
+   sparse? (
+   sci-libs/amd:0=
+   sci-libs/camd:0=
+   sci-libs/ccolamd:0=
+   sci-libs/cholmod:0=[metis]
+   sci-libs/colamd:0=
+   sci-libs/spqr:0=
+   )"
+
+DEPEND="${RDEPEND}
+   dev-cpp/eigen:3
+   doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme )
+   lapack? ( virtual/pkgconfig )
+   ${PYTHON_DEPS}"
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+   if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
+   ewarn "OpenMP is not available in your current selected 
gcc"
+   die "need openmp capable gcc"
+   fi
+   fi
+}
+
+pkg_setup() {
+   use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   # search paths work for prefix
+   sed -e "s:/usr:${EPREFIX}/usr:g" \
+   -i cmake/*.cmake || die
+
+   # remove Werror
+   sed -e 's/-Werror=(all|extra)//g' \
+   -i CMakeLists.txt || die
+
+   # respect gentoo doc install directory
+   sed -e "s:share/doc/ceres:share/doc/${PF}:" \
+   -i docs/source/CMakeLists.txt || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
+   

[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2017-01-22 Thread Justin Lecher
commit: 3c9b9c373bede1d53c75fa08a034395027b3be54
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Jan 22 10:20:27 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Jan 22 10:21:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9b9c37

sci-libs/ceres-solver: Restrict non native X86 to supporting USE

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=593954
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=596560
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=606776

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher  gentoo.org>

 sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild | 11 +-
 sci-libs/ceres-solver/metadata.xml   | 26 
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
index f027bf4..02c634f 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,12 +15,12 @@ SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
 SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
 IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
-REQUIRED_USE="test? ( gflags ) sparse? ( lapack )"
+
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse 
!lapack )"
 
 RDEPEND="
-   dev-cpp/glog[gflags?]
+   dev-cpp/glog[gflags?,${MULTILIB_USEDEP}]
cxsparse? ( sci-libs/cxsparse:0= )
lapack? ( virtual/lapack )
sparse? (
@@ -29,7 +29,8 @@ RDEPEND="
sci-libs/ccolamd:0=
sci-libs/cholmod:0=
sci-libs/colamd:0=
-   sci-libs/spqr:0= )"
+   sci-libs/spqr:0=
+   )"
 
 DEPEND="${RDEPEND}
dev-cpp/eigen:3

diff --git a/sci-libs/ceres-solver/metadata.xml 
b/sci-libs/ceres-solver/metadata.xml
index e08063b..644a681 100644
--- a/sci-libs/ceres-solver/metadata.xml
+++ b/sci-libs/ceres-solver/metadata.xml
@@ -1,11 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-
-  s...@gentoo.org
-  Gentoo Science Project
-
-
+  
+s...@gentoo.org
+Gentoo Science Project
+  
+  
   Ceres Solver is a portable C++ library that allows for
   modeling and solving large complicated nonlinear least squares
   problems. It features:
@@ -21,15 +21,15 @@
 * Iterative linear solvers for general sparse and bundle
   adjustment problems
 
-
-  Enable simple support for sparse matrix algebra from
+  
+Enable simple support for sparse matrix algebra from
   sci-libs/cxsparse with no LAPACK dependencies
-  Enable fixed-size schur specializations (disable if
+Enable fixed-size schur specializations (disable if
   binary size is an issue)
-  Enable support for sparse matrix algebra with various
+Enable support for sparse matrix algebra with various
   packages from SuiteSparse
-  Use dev-cpp/gflags for flag parsing
-  Use dev-libs/protobuf to encode structured 
data
-  Build ceres-solver using the C++11 standard
-
+Use dev-cpp/gflags for flag parsing
+Use dev-libs/protobuf to encode 
structured data
+Build ceres-solver using the C++11 standard
+  
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2016-10-29 Thread Mike Gilbert
commit: 568207e87bf3984958b885af081f4c59bf5bfa3e
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Oct 29 23:12:26 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Oct 29 23:14:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568207e8

sci-libs/ceres-solver: fix REQUIRED_USE

Package-Manager: portage-2.3.2

 sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild | 2 +-
 sci-libs/ceres-solver/ceres-solver-1.9.0.ebuild  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
index 3be25f7..f027bf4 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
-REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) doc? ( 
${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack )"
 
 RDEPEND="
dev-cpp/glog[gflags?]

diff --git a/sci-libs/ceres-solver/ceres-solver-1.9.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.9.0.ebuild
index 80e0ea0..d69cbab 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.9.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ SLOT="0/1"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="cxsparse doc examples gflags lapack openmp protobuf +schur sparse 
static-libs test"
-REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) doc? ( 
${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack )"
 
 RDEPEND="
dev-cpp/glog[gflags?]



[gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/

2016-04-07 Thread Sebastien Fabbro
commit: c5d30d5c42db8da8b451070775fe68b27d9031fd
Author: Sébastien Fabbro  gentoo  org>
AuthorDate: Fri Apr  8 00:08:52 2016 +
Commit: Sebastien Fabbro  gentoo  org>
CommitDate: Fri Apr  8 00:09:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d30d5c

sci-libs/ceres-solver: Version bump

Package-Manager: portage-2.2.28

 sci-libs/ceres-solver/Manifest   |  1 +
 sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild | 95 
 sci-libs/ceres-solver/metadata.xml   |  1 +
 3 files changed, 97 insertions(+)

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index e22fd30..f25049f 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,2 +1,3 @@
+DIST ceres-solver-1.11.0.tar.gz 3944965 SHA256 
4d666cc33296b4c5cd77bad18ffc487b3223d4bbb7d1dfb342ed9a87dc9af844 SHA512 
4941538e6ec31e2ee56a24446748dc5d6dd02ba9c151e4320a2db943fd1a377455b0ee23d56780e1f05322b30e25057145c540fde901d7fd2244ec630a73527c
 WHIRLPOOL 
82e8c9f8fcf66f20dea28c5ddcfc4ac030a20d86c498eda487899b090fb67e7e44e3e1a76d3b689a409860c83713005e4f889814707d25cf298892ae9ea78890
 DIST ceres-solver-1.8.0.tar.gz 3506384 SHA256 
8ee53241930622b74946201123cd38231161878caacf6c30a3bf1c68b24d79af SHA512 
114ab5e8e40cffb325c69b70b546697d90833a3f82239fc901fb0d87a9d98b376e2e042b768fd0252d8412f3d301adfb7d992202a0e149d037bea86a08f8c6db
 WHIRLPOOL 
cf966a02dced9b672d6aa8a2aecf0aab71bb718bbc5f13acdab2641aed4622c08909eaae6fde1ea91d3e2d0046131692e2ce65969dcbd431ff372482540e4d31
 DIST ceres-solver-1.9.0.tar.gz 3793265 SHA256 
30ac0729249f908afe80cb6fd06ae6d037f25a60d9fac54f61344389adab9c1a SHA512 
8a991eba3bf1e8fe34ad87291af4ab2091e1026dc1eb83a5e5e40913035744587021592c613b5c5077b2ca848bd61175788933996b91f3c6ef4a40309606691d
 WHIRLPOOL 
9187d217f9283f4575d8633ec7cba4d6868624a178fae12e9204f0989554c7b3e9b217b8890288382325b871ac59038e08dd9255be252ae8570c71a4485c1481

diff --git a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild 
b/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
new file mode 100644
index 000..3be25f7
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit cmake-multilib eutils python-any-r1 toolchain-funcs
+
+DESCRIPTION="Nonlinear least-squares minimizer"
+HOMEPAGE="http://ceres-solver.org/";
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 ) cxsparse? ( BSD )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="cxsparse c++11 doc examples gflags lapack openmp +schur sparse test"
+REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) doc? ( 
${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+   dev-cpp/glog[gflags?]
+   cxsparse? ( sci-libs/cxsparse:0= )
+   lapack? ( virtual/lapack )
+   sparse? (
+   sci-libs/amd:0=
+   sci-libs/camd:0=
+   sci-libs/ccolamd:0=
+   sci-libs/cholmod:0=
+   sci-libs/colamd:0=
+   sci-libs/spqr:0= )"
+
+DEPEND="${RDEPEND}
+   dev-cpp/eigen:3
+   doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme )
+   lapack? ( virtual/pkgconfig )"
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+   if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
+   ewarn "OpenMP is not available in your current selected 
gcc"
+   die "need openmp capable gcc"
+   fi
+   fi
+}
+
+pkg_setup() {
+   use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   # search paths work for prefix
+   sed -e "s:/usr:${EPREFIX}/usr:g" \
+   -i cmake/*.cmake || die
+
+   # remove Werror
+   sed -e 's/-Werror=(all|extra)//g' \
+   -i CMakeLists.txt || die
+
+   # respect gentoo doc install directory
+   sed -e "s:share/doc/ceres:share/doc/${PF}:" \
+   -i docs/source/CMakeLists.txt || die
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF
+   local mycmakeargs=(
+   -DBUILD_SHARED_LIBS=ON
+   -DBUILD_EXAMPLES=OFF
+   -DENABLE_TESTING="$(usex test)"
+   -DCXX11="$(usex c++11)"
+   -DBUILD_DOCUMENTATION="$(usex doc)"
+   -DGFLAGS="$(usex gflags)"
+   -DLAPACK="$(usex lapack)"
+   -DOPENMP="$(usex openmp)"
+   -DSCHUR_SPECIALIZATIONS="$(usex schur)"
+   -DCXSPARSE="$(usex cxsparse)"
+   -DSUITESPARSE="$(usex sparse)"
+   )
+   use sparse || use cxsparse || mycmakeargs+=( -DEIGENSPARSE=ON )
+   cmake-multilib_src_configure
+}
+
+src_install() {
+   cmake-multilib_src_install
+   dodoc README.md V