From 9533a3000f15dd70f312f36705ad78e744fdfc0d Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 22 Feb 2016 12:10:19 +0100 Subject: dev-cpp/eigen: Bump to EAPI=6 * Drop version dependend code from ebuilds * Fix error handling logic * Propargate cahnges to live ebuild Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher --- dev-cpp/eigen/eigen-3.2.8.ebuild | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'dev-cpp/eigen/eigen-3.2.8.ebuild') diff --git a/dev-cpp/eigen/eigen-3.2.8.ebuild b/dev-cpp/eigen/eigen-3.2.8.ebuild index 12b0a5d7d..1da50f438 100644 --- a/dev-cpp/eigen/eigen-3.2.8.ebuild +++ b/dev-cpp/eigen/eigen-3.2.8.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 FORTRAN_NEEDED=fortran @@ -32,7 +32,8 @@ CDEPEND=" sci-libs/cholmod[metis?] sci-libs/spqr sci-libs/superlu - sci-libs/umfpack )" + sci-libs/umfpack + )" DEPEND=" doc? ( app-doc/doxygen[dot,latex] ) test? ( ${CDEPEND} )" @@ -53,12 +54,14 @@ src_prepare() { {blas,lapack}/CMakeLists.txt || die # TOFIX: static-libs for blas are always built with PIC - use static-libs || sed -i \ - -e "/add_dependencies/s/eigen_[a-z]*_static//g" \ - -e "/TARGETS/s/eigen_[a-z]*_static//g" \ - -e "/add_library(eigen_[a-z]*_static/d" \ - -e "/target_link_libraries(eigen_[a-z]*_static/d" \ - {blas,lapack}/CMakeLists.txt || die + if ! use static-libs; then + sed \ + -e "/add_dependencies/s/eigen_[a-z]*_static//g" \ + -e "/TARGETS/s/eigen_[a-z]*_static//g" \ + -e "/add_library(eigen_[a-z]*_static/d" \ + -e "/target_link_libraries(eigen_[a-z]*_static/d" \ + -i {blas,lapack}/CMakeLists.txt || die + fi sed -i -e "/Unknown build type/d" CMakeLists.txt || die -- cgit v1.2.3-65-gdbad