gentoo resync : 14.05.2020

3 files changed, 1 insertions, 101 deletions

diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 4da6bab71a19..4b8cbe441c1f 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD ceres-solver-1.12.0.ebuild 2400 BLAKE2B 40d628872950995e250c6ad5ddac436e2c9b8fc9e4ad25c93d66851930370dabdcfad93ad1ca70c0b37a201ded641b2e547bb95b14a11418f910403c6c2d502e SHA512 e84db68bd83234e6ee272a07bb40a4a41ae225b61aaa7ecc42dd4b8a6996f0d72cf2805a3c69bd45db271f5b9974e2aa36eb52bf51070c93b0b753839f728b42
 EBUILD ceres-solver-1.14.0.ebuild 2322 BLAKE2B 86586d0e78b7a3bcd892ddc78ebfba929a50c17ff162f0063ff6c01101c29dfe75559c6b1172dfa3b75ea2afc8bf544682f1b1a7503c2abc2c80d91088101de3 SHA512 f4636950774524f3201ac63abb60ed76ab0380f0e765eb82d4aee3f82d577aba74d0fd7619e77b32989ed39c552393e6048b30a1af16d59d4b13f6c3d66087a6
-MISC metadata.xml 1525 BLAKE2B 46de33a7fa6513877e2427442e918d8e39871a6b6b8a15a18d14dcedd55c42bfb1bdeab7e1cc57c0ac03ba06d5c3628dd666b6f0787eac5c9dc75785e2a9e471 SHA512 4c95aef23ce327f9cd11b53638e1b6485eb789cd296ad8a571278b65c9001465f56c97b97db6e2c4a4ed76336f0e33684958adef593d74193cb73930e7ea5ad2
+MISC metadata.xml 1451 BLAKE2B c23657557890c4b62551c79eb7a3b07ef0921f5766b9d771d85e1cf156b03a9d783f6d307504ce5cfc810e096bd990f2aef58f7da6cf912df3fbafa7b63f257e SHA512 e9867b3e997e1c28e900f1148287ed052d5e29440c7f8d99b61432c8870d8f6d7368d387f9cc72bb948a412b77ad8e4cc2f418c41ad60f21c8027e23f36d71aa
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 05747c215b05..000000000000
--- 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 42d1cafcb8bf..57c1a1394e07 100644
--- a/sci-libs/ceres-solver/metadata.xml
+++ b/sci-libs/ceres-solver/metadata.xml
@@ -29,6 +29,5 @@
     <flag name="sparse">Enable support for sparse matrix algebra with various
   packages from SuiteSparse</flag>
     <flag name="gflags">Use <pkg>dev-cpp/gflags</pkg> for flag parsing</flag>
-    <flag name="c++11">Build ceres-solver using the C++11 standard</flag>
   </use>
 </pkgmetadata>