Version bump

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

3 files changed, 100 insertions, 6 deletions

diff --git a/sci-libs/ceres-solver/ChangeLog b/sci-libs/ceres-solver/ChangeLog
index 4343d15738fc..be318bab1816 100644
--- a/sci-libs/ceres-solver/ChangeLog
+++ b/sci-libs/ceres-solver/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2013/03/04 18:28:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ChangeLog,v 1.5 2013/05/22 21:10:27 bicatali Exp $
+
+*ceres-solver-1.6.0 (22 May 2013)
+
+  22 May 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  +ceres-solver-1.6.0.ebuild:
+  Version bump
 
   04 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org> ceres-solver-1.4.0.ebuild:
   Avoid forced downloading of latex style file minted.sty (bug #460170)
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index f7b8b0d7713d..4d6f648a0422 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -4,13 +4,15 @@ Hash: SHA256
 AUX ceres-solver-1.4.0-respect-libdir.patch 1428 SHA256 08af3dfe6578c61874a01062f98c20e705b5783c7ee869966a0d1480bf1e77a0 SHA512 a124cc7d2bc5d0ff3592e7d8bf9396df000723e9a5d57afc88ada2ecd9e6a0c9ad26f6d67e3fff2b8e89df71585771c808b0e1dd3739826804e49c0da5579403 WHIRLPOOL c9f76c754ef3133f4f244480c54fff6ccf6e70c99100ecbdcae30ef0ebaee481e7cef87d7ebee2b5295b275daebd72223f073466f6361838f2c04dc7f09a0c15
 AUX ceres-solver-1.4.0-test-no-suitesparse.patch 729 SHA256 6d85e8546a4972c226c51fb760bc1b049ff71fe4275afb3f1f8b98c2a6bcca68 SHA512 dbd39b3e23c56817ec64ae65f3de953b0951c409a89e1df07622243c7729421bbf601c407090280955333e04d70147f6a5d9b150edbc6c4ceb6ca6517720cf2a WHIRLPOOL 3f58635e4a9ea07bd900cf7d1a1e132d180d12afb7254929ff0f43dea557016db453e6abd4ee3b9610bed26e9f172c948dd89a098c17cf394db2e37d51fb1889
 DIST ceres-solver-1.4.0.tar.gz 3659154 SHA256 0a88bbfa20a98c780e4a3371b4f4059d77f7daa0515ef6bb31c25f335bf2a2be SHA512 6489d4840072729652ef95badd7eecf48755dc2d7fce54b7926eab5e3411d6dde20142576683ff45bf649950b445bbb1bead1bad2f10ed63ae319f0f3069cd66 WHIRLPOOL 6f76c0329fda0a31620627b2c6ab777739bea7f11068841f545e2cfc2511e8950a0399a7c4c3cda5152e15676a0a760ce9e7219fd5ed5408a317b9ecb6e96e0f
+DIST ceres-solver-1.6.0.tar.gz 3947640 SHA256 4d0887ec5081505ab73e65a8a70c14b20e0c08ef7075ec3bba801cf5f014775b SHA512 a32556edaf1295051cb8aba29c348dc3a6be3b6be545b219df45a50e222effc7ebe384d9c9fcad33c23b85a75429ad73a5926a7af4a520706bed47c5b52840cc WHIRLPOOL b42610289a5be1d2b1fc381a113c6bd6256813c9364e85152268fce83e9ed7a005580e23324ea3d9cd97d47086c499deb5619ff122f4ea86d763d2b48f241824
 EBUILD ceres-solver-1.4.0.ebuild 2458 SHA256 e0c48f292fe3d804769c303158034176d7a5ddba3734d0dae40aa980f9bf67de SHA512 b075674e3d01c44e7653a17447a320aff1ab2fca694ffa6e2a593bcb19cdc9993ab85de14016b525e99d6d999981f73bb9214393a6a480ce701d5d10edbbaab6 WHIRLPOOL 3162be2f54dbbcb8445eb9c4ccd030f73180289e4e99413468e90fffbc902f2c80e2b1ec96df09db0c0ac7df9e81cae8da061136064b7c6bb8ad49c6c4cbc429
-MISC ChangeLog 893 SHA256 8ae564364873abfef6cfecb34ad3c8cd0a9d7100407ac3b1a3292f47572df387 SHA512 1bb51a48ed498c8694fad1ff1625bca5e32861d96d196589306bd513910078fae0530fc1553d2f6d13f0beaca81ccb60c46ee093dcda66bc45d0a1cfea5cfb17 WHIRLPOOL 65155698da510b191dfa4350cd20ec813e1cfbf2cfa138371fed5925c0451fc59940ad133a8f462ba540f187e1c0d00e49810bdaaeb24124caeb044803761ad0
+EBUILD ceres-solver-1.6.0.ebuild 2261 SHA256 8ae1f1730b4838ce677c2458bffb96894157397e62e9d81b4acfd66aa4069589 SHA512 459131364994e82ebab2701adc2b515b818596fb434c1ff1df7044cba8bb68abbab6c53ed54dce57b57168ca7234f5e4a29b5db406fa8c0f450b63519b04d38c WHIRLPOOL 5aad9128fb705515941bdf2e0d4bf20a38fe0b041b439b192469884e5c650a81ac39378d69954f2579c1400884ed62b81e446de8015a9680c2331e074e7e87e7
+MISC ChangeLog 1029 SHA256 681f2fa59e5a475b368a885249714efa9c128647ed6839cc4958ae50cdf872a8 SHA512 6a3b30ab1ece66f1dc0119b340ca0b8fff3e0a487c776546a70352799b435b91abce60ca40bee6e7a8b76d95b73198a6f3d3a56e09adfe5be7c522921c5809f5 WHIRLPOOL f2f01c4087ecf7a33a200074042aed67d7b766b10b8beafc30bcea1b0c683a3f434dbb297835f6d4bc4d33488458a7cbe523fa6f5f7342aef23810f12e103ffa
 MISC metadata.xml 1375 SHA256 167df44ea3a8a7af388ce00ebbff10b02e2c50418b4137d1446581729e93fb5e SHA512 d1229e9e235f154a7dc29970e1d9f70f6b05400f296f6a99e26d52dd0f6bf517e0e64820f60a3e3baed7c7fb7653bc980539176338b248a55a768de5f6a32974 WHIRLPOOL b78eee2044a9f22ed74dc2cb616c31babf272ffc5bde2be0eddacb434b3efb055abd2166d482083d73d8801ad2cabd4a1e61fc19831addbe66ef98a4cb1326cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlE05+8ACgkQ1ycZbhPLE2AWJgCfYi/BBNkoci6hTYfxCBCs23NR
-WLEAn1SGP4WjRVTPBg/3jYZ1bkSANYMB
-=toHW
+iEYEAREIAAYFAlGdNEgACgkQ1ycZbhPLE2ArlgCfU3Wuk9HTHhhYsctCUZfyX0Mk
+HPQAninNFP28J7p8w8PcuJWdBWZT72NF
+=s70l
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild
new file mode 100644
index 000000000000..91ed71c5669c
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild
@@ -0,0 +1,86 @@
+# 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.6.0.ebuild,v 1.1 2013/05/22 21:10:26 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
+		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
+}