Version bump. Updated home page, doc building, added patch for underlinking cholmod

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 127 insertions, 95 deletions

diff --git a/sci-libs/ceres-solver/ChangeLog b/sci-libs/ceres-solver/ChangeLog
index 0cff93daa551..3f17d6909391 100644
--- a/sci-libs/ceres-solver/ChangeLog
+++ b/sci-libs/ceres-solver/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2013/11/14 01:49:00 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ChangeLog,v 1.8 2014/06/09 02:29:13 bicatali Exp $
+
+*ceres-solver-1.9.0 (09 Jun 2014)
+
+  09 Jun 2014; Sébastien Fabbro <bicatali@gentoo.org>
+  +ceres-solver-1.9.0.ebuild, +files/ceres-solver-1.9.0-underlink.patch,
+  -ceres-solver-1.7.0.ebuild:
+  Version bump. Updated home page, doc building, added patch for underlinking
+  cholmod
 
 *ceres-solver-1.8.0 (14 Nov 2013)
 
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 566044453065..fa37cd1da62c 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ceres-solver-1.7.0.tar.gz 3455041 SHA256 5dd60e4dd076824574841ddc6fdeb5dbcdba3035c5a208ec0a58c970724b6f05 SHA512 617fda19de55105ad349cc111e0f393b40daffb2d9bd91a676beae209795628f1c21e2dfdb8a6247f212c2636349ebf5d592cf4e050f05741db080af5fd7f2e9 WHIRLPOOL 8314590bc9f29ca082d707b8f450069c79c7f2427b4ed32048ec5e58331f8c318643e7113a61f505f9475886307e6c60aaae400d1fa78ef1474a63eed35d2131
+AUX ceres-solver-1.9.0-underlink.patch 537 SHA256 518611d22bd2650fc485b24bffd4df11b27881854bd8d9b0c6067dc119c31c5c SHA512 909115b0d3d6d6dac0706863e01ee3a0bd48664c0ccd980cadeecdf24ddf71a61efdb703fa0e53e8c9396fd3cfa15446fb1527df30ff9c6013e33612254637e3 WHIRLPOOL 5e19113d81ff86c89add87e6d5243f773c04d8c9f6c72fff84d9b336ca47dacdee7a46833751b5e8694e82b900246cd5f27d9d73f40048e77184846cfb0de66b
 DIST ceres-solver-1.8.0.tar.gz 3506384 SHA256 8ee53241930622b74946201123cd38231161878caacf6c30a3bf1c68b24d79af SHA512 114ab5e8e40cffb325c69b70b546697d90833a3f82239fc901fb0d87a9d98b376e2e042b768fd0252d8412f3d301adfb7d992202a0e149d037bea86a08f8c6db WHIRLPOOL cf966a02dced9b672d6aa8a2aecf0aab71bb718bbc5f13acdab2641aed4622c08909eaae6fde1ea91d3e2d0046131692e2ce65969dcbd431ff372482540e4d31
-EBUILD ceres-solver-1.7.0.ebuild 2277 SHA256 b8599af28ce9768b3a9bf5e2c033b74c9207d4139cd4a77eab5d8665488c1c7e SHA512 b66a931e778d70f1a40fbb5f9d81c16f3510fa64f9249e6c9d190f064ad15bd46b502c581c8f2c623a7a8f8fe8e6ddb887a4d2355ccaf43caa02322b0d40aab4 WHIRLPOOL 781f6ad434b0486dbb644f43e1c11d00163a623615c7130f68dafe13babc000b65d1f8e90f77f550a385a8c4a793e7a0074af2ca09dfc7c6f0e8018b5587c8f3
+DIST ceres-solver-1.9.0.tar.gz 3793265 SHA256 30ac0729249f908afe80cb6fd06ae6d037f25a60d9fac54f61344389adab9c1a SHA512 8a991eba3bf1e8fe34ad87291af4ab2091e1026dc1eb83a5e5e40913035744587021592c613b5c5077b2ca848bd61175788933996b91f3c6ef4a40309606691d WHIRLPOOL 9187d217f9283f4575d8633ec7cba4d6868624a178fae12e9204f0989554c7b3e9b217b8890288382325b871ac59038e08dd9255be252ae8570c71a4485c1481
 EBUILD ceres-solver-1.8.0.ebuild 1958 SHA256 701a0af26f027cb4ddb2fd1325a31df9ca14743c59ff86c55c1cfd74c9cc5cb0 SHA512 045d30f9e1c72c21a1393488fa300d075e4a95372f617a81bce83d1d3b825cd087d0bf9321211867eccd98c5771271314b89a838be6aa2fd057c1cdc6b34b0fc WHIRLPOOL a02542e02c2809577fee05bfe790382c3a1037f69029424bf854019cce0511b820b24fd775ff1a03795c729dd87b19dc06bf7be0fbe89a9b083ca37ab9ade08f
-MISC ChangeLog 1599 SHA256 14709f0904acc24b5f277344961f0f7b24b539fcaa67c22f31ba5fd92dc155ce SHA512 1af0b25ec6d0d21afde3777ed1ff7ca64f5558da7d8dbeb153cf0a451d758f2cdc3c951112b3d7a3f7c6b6fe1ba9f0dfcbfaf9275161048b21b2fefa6003cd9b WHIRLPOOL 8254db333300179631ca57afab50144f9bb8ebe7e6159e074837f20c28e37834c502bc4b275dd39599d37f371acda5e2be2715d127824698a76f2d1f0a674ede
+EBUILD ceres-solver-1.9.0.ebuild 2465 SHA256 586e63dc28ac1e55982549d4e2cdeddaf7f01d5246965fef280b7c760af3e3c8 SHA512 e23db591f853d895c20e6a95083db82d8dbb0b3a318c32fe5f4151e61e6c1479e134a3b29defee17e031a124265215e76524767a7fd175b6f33e1c45e0f9fb9f WHIRLPOOL be1b52965fa0907cd9e9d2bb5b91dec7899f7a07328b14f7bf9ae5f174e5ce432b36c79e9aba42b1bcfb0d1fecebf7f9b513305ec02bb40f4bfe037f7a188273
+MISC ChangeLog 1881 SHA256 568a46ce0b03d6c48e7d95691e14d224562ef6967d2f79c7053c927c6561f48a SHA512 d8883a13571c59382e491a4ae595ef7c1e08965bbc9b385413775de0897304f6c713dc915b5629ba0d57db767ee6f20f229400fc8e5ad8000e93629196f0a112 WHIRLPOOL 842b0dfba081bbf0ed5b2867446099b7458c0b1f77dedc32774ee1c575fec1960e60a9817800645f2817c139302e0a7d733ef80fa627d4a235848cac4eb6fedb
 MISC metadata.xml 1518 SHA256 8092b5f1ed9a02338434d7e77f8210b3cb918e422d7bac9c98d9949268659d5d SHA512 847f71743d9fe7b0035e122d28ee32d3c5d1ab0c52fbd96cc539b1cd008a66cac145974736c96e28714d59715766d1b73ab8e8cb48e4a7b6d16bdd6b03640b7c WHIRLPOOL 4e4f7237b906c1c3ff928dc50db6a1a1f8d81d6cd3cece4fc34b35d28e1c7ae95663f69659ef2b7c58a8c7f962dd5e6acc6edef1dbca6dc380f66d94b411d590
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKELBEACgkQ1ycZbhPLE2B98QCgkCUOVLP5xhFtUdJAhCaK/AjA
-z7gAn1qur7x4VUQBC1JPfozz/X01BWYD
-=0wOr
+iEYEAREIAAYFAlOVG/8ACgkQ1ycZbhPLE2C1sACfThSFK3L4cA+g0RQY5bO2k5PJ
+j8IAnRnjczTBbgNyU92mdhBg+uXrstev
+=h4eR
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ceres-solver/ceres-solver-1.7.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.7.0.ebuild
deleted file mode 100644
index 5d27a1ac243b..000000000000
--- a/sci-libs/ceres-solver/ceres-solver-1.7.0.ebuild
+++ /dev/null
@@ -1,87 +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/ceres-solver/ceres-solver-1.7.0.ebuild,v 1.1 2013/10/23 18:36:55 bicatali Exp $
-
-EAPI=5
-
-inherit cmake-utils eutils multilib toolchain-funcs
-
-DESCRIPTION="Nonlinear least-squares minimizer"
-HOMEPAGE="https://code.google.com/p/ceres-solver/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gflags metis openmp protobuf +schur +sparse static-libs test"
-REQUIRED_USE="test? ( gflags )"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-cpp/glog[gflags?]
-	protobuf? ( dev-libs/protobuf )
-	sparse? (
-		sci-libs/amd
-		sci-libs/camd
-		sci-libs/ccolamd
-		sci-libs/cholmod[metis?]
-		sci-libs/colamd
-		sci-libs/cxsparse
-		sci-libs/spqr
-		virtual/blas
-		virtual/lapack )"
-DEPEND="${RDEPEND}
-	sparse? ( virtual/pkgconfig )
-	doc? ( dev-python/sphinx )"
-
-src_prepare() {
-	# prefix love
-	# disable blas/lapack forced library names
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e '/FIND_LIBRARY(BLAS_LIB NAMES blas)/d' \
-		-e '/FIND_LIBRARY(LAPACK_LIB NAMES lapack)/d' \
-		-e 's/EXISTS ${BLAS_LIB}/BLAS_LIB/g' \
-		-e 's/EXISTS ${LAPACK_LIB}/LAPACK_LIB/g' \
-		-e 's/-Werror//g' \
-		CMakeLists.txt || die
-
-	# respect gentoo doc dir
-	sed -i \
-		-e "s:share/doc/ceres:share/doc/${PF}:" \
-		docs/source/CMakeLists.txt || die
-}
-
-src_configure() {
-	local blibs llibs
-	if use sparse; then
-		blibs=$($(tc-getPKG_CONFIG) --libs blas)
-		llibs=$($(tc-getPKG_CONFIG) --libs lapack)
-	fi
-	local mycmakeargs=(
-		-DBLAS_LIB="${blibs}"
-		-DLAPACK_LIB="${llibs}"
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use doc BUILD_DOCUMENTATION)
-		$(cmake-utils_use gflags GFLAGS)
-		$(cmake-utils_use openmp OPENMP)
-		$(cmake-utils_use protobuf PROTOBUF)
-		$(cmake-utils_use schur SCHUR_SPECIALIZATIONS)
-		$(cmake-utils_use sparse CXSPARSE)
-		$(cmake-utils_use sparse SUITESPARSE)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README VERSION
-
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/libceres.a
-	dosym libceres_shared.so /usr/$(get_libdir)/libceres.so
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/sci-libs/ceres-solver/ceres-solver-1.9.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.9.0.ebuild
new file mode 100644
index 000000000000..aeb6612761ba
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-1.9.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2014 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.9.0.ebuild,v 1.1 2014/06/09 02:29:13 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eutils multilib python-any-r1 toolchain-funcs
+
+DESCRIPTION="Nonlinear least-squares minimizer"
+HOMEPAGE="http://ceres-solver.org/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+LICENSE="BSD"
+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} )"
+
+RDEPEND="
+	dev-cpp/glog[gflags?]
+	cxsparse? ( sci-libs/cxsparse:0= )
+	lapack? ( virtual/lapack )
+	protobuf? ( dev-libs/protobuf )
+	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 )"
+
+PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
+
+pkg_setup() {
+	# XXX: this looks like it should be used with BUILD_TYPE!=binary
+	if 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
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# search paths work for prefix
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		cmake/*.cmake || die
+
+	# remove Werror
+	sed -i \
+		-e 's/-Werror//g' \
+		CMakeLists.txt || die
+
+	# respect gentoo doc install directory
+	sed -i \
+		-e "s:share/doc/ceres:share/doc/${PF}:" \
+		docs/source/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_EXAMPLES=OFF
+		$(cmake-utils_use_enable test TESTING)
+		$(cmake-utils_use doc BUILD_DOCUMENTATION)
+		$(cmake-utils_use gflags GFLAGS)
+		$(cmake-utils_use lapack LAPACK)
+		$(cmake-utils_use openmp OPENMP)
+		$(cmake-utils_use protobuf PROTOBUF)
+		$(cmake-utils_use schur SCHUR_SPECIALIZATIONS)
+		$(cmake-utils_use cxsparse CXSPARSE)
+		$(cmake-utils_use sparse SUITESPARSE)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README VERSION
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		docompress -x /usr/share/doc/${PF}/examples
+		doins -r examples data
+	fi
+}
diff --git a/sci-libs/ceres-solver/files/ceres-solver-1.9.0-underlink.patch b/sci-libs/ceres-solver/files/ceres-solver-1.9.0-underlink.patch
new file mode 100644
index 000000000000..00b005431687
--- /dev/null
+++ b/sci-libs/ceres-solver/files/ceres-solver-1.9.0-underlink.patch
@@ -0,0 +1,13 @@
+--- internal/ceres/CMakeLists.txt.orig	2014-06-05 08:45:55.031448944 -0700
++++ internal/ceres/CMakeLists.txt	2014-06-05 08:48:03.496344301 -0700
+@@ -146,8 +146,9 @@
+ 
+ SET(CERES_LIBRARY_PUBLIC_DEPENDENCIES ${GLOG_LIBRARIES})
+ 
+-IF (SUITESPARSE AND SUITESPARSE_FOUND)
++IF (SUITESPARSE AND SUITESPARSE_FOUND)
+   LIST(APPEND CERES_LIBRARY_PRIVATE_DEPENDENCIES ${SUITESPARSE_LIBRARIES})
++  LIST(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES ${SUITESPARSE_LIBRARIES})
+ ENDIF (SUITESPARSE AND SUITESPARSE_FOUND)
+ 
+ IF (CXSPARSE AND CXSPARSE_FOUND)