gentoo Easter resync : 12.04.2020

3 files changed, 53 insertions, 49 deletions

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 022df791ecac..0e9e8120302d 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,5 +1,5 @@
-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
-EBUILD ceres-solver-1.11.0.ebuild 2412 BLAKE2B f4aec1265ab4534a65b768e4b4da9546e8ef4fb68b918488e57ab494c3f0b30d179dba1dc68d9c45630396a66ef535f8936b31c68962530360337f2c1c48b469 SHA512 a15c6ef0f7d97ef7515180b085979efb7c55327038cf380101bc7e856cf660c2f60d3d869470bd63f38fe82b6a719857828da60ddacf06b18b6eedb9482cb1ec
-EBUILD ceres-solver-1.12.0.ebuild 2418 BLAKE2B 08e50a9f5a09647f01ad930fb70e32773dc7a5c12b4e7bd8c53f3f6f18011500a0ddbccf3e0f3aedaf823bd49f7042c201cdb2ce5d0346d66127296223d6372d SHA512 c2b4b9f8d4753fc7dcf46044e7ca4a285f0a8e27cc2b6737229884b8ff8715530eca5c6a5dfb28e396235083bd2e66c01c738899fc0755fef64d54a3f2f0bb24
+DIST ceres-solver-1.14.0.tar.gz 5450130 BLAKE2B cfcfe07cecb267528081dfc6deb5283bc5a04b79d4595e45365960895b84a6dca2a3024b046868f06709fc81e8514730cbc409ab01cb0cbee488b5bad5b9f7cc SHA512 a2af9918d2730709361ec971431a2b22e6ca3ca440081be87fa52729ec43702020b021837bfe5a42a58db1ab89ea6aada11f2d1888da66bef614ec1f27ab30c6
+EBUILD ceres-solver-1.12.0.ebuild 2400 BLAKE2B 40d628872950995e250c6ad5ddac436e2c9b8fc9e4ad25c93d66851930370dabdcfad93ad1ca70c0b37a201ded641b2e547bb95b14a11418f910403c6c2d502e SHA512 e84db68bd83234e6ee272a07bb40a4a41ae225b61aaa7ecc42dd4b8a6996f0d72cf2805a3c69bd45db271f5b9974e2aa36eb52bf51070c93b0b753839f728b42
+EBUILD ceres-solver-1.14.0.ebuild 2323 BLAKE2B 1379ac818581c2b62926381bfec1c8b13cd838ae43c65fd77cd1495b1650d32cf9d132cfc8695329e711a2bf1863cb330c76a3727ff527b9115c5ed7a321c440 SHA512 80ed6b5071c06d10c0ccd68bf1fa5a4a79ef21e1a31c1e9263cca52d33c4bb8c2e23b66d09f47e32cecb314bb179eca51a9d49c233ea88a37c846ad91bb351c5
 MISC metadata.xml 1525 BLAKE2B 46de33a7fa6513877e2427442e918d8e39871a6b6b8a15a18d14dcedd55c42bfb1bdeab7e1cc57c0ac03ba06d5c3628dd666b6f0787eac5c9dc75785e2a9e471 SHA512 4c95aef23ce327f9cd11b53638e1b6485eb789cd296ad8a571278b65c9001465f56c97b97db6e2c4a4ed76336f0e33684958adef593d74193cb73930e7ea5ad2
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 8bef6c01db95..05747c215b05 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
diff --git a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
index d8f758d4dd37..d40b75690c4b 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.11.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib eutils python-any-r1 toolchain-funcs
+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/"
@@ -14,29 +14,36 @@ 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 )"
+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? (
+		dev-python/sphinx
+		dev-python/sphinx_rtd_theme
+	)
+	lapack? ( virtual/pkgconfig )
+"
 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=
-		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}"
+		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() {
 	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
@@ -52,6 +59,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	cmake_src_prepare
+
 	# search paths work for prefix
 	sed -e "s:/usr:${EPREFIX}/usr:g" \
 		-i cmake/*.cmake || die
@@ -59,27 +68,24 @@ src_prepare() {
 	# 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_BENCHMARKS=OFF
 		-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)"
+		-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
@@ -87,11 +93,9 @@ 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
+		dodoc -r examples data
 	fi
 }