[gentoo-commits] proj/sci:master commit in: sci-chemistry/erkale/

[Andrew Ammerlaan]

commit:     fb9356bf7ec6fa8bdf01da289b9f0775615b3b6d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Jan 28 14:54:03 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Jan 28 14:56:43 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=fb9356bf

sci-chemistry/erkale: EAPI bump, camke-utils --> cmake

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-chemistry/erkale/erkale-9999.ebuild | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/sci-chemistry/erkale/erkale-9999.ebuild b/sci-chemistry/erkale/erkale-9999.ebuild
index 1d4d4c334..11c7b05c6 100644
--- a/sci-chemistry/erkale/erkale-9999.ebuild
+++ b/sci-chemistry/erkale/erkale-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils flag-o-matic git-r3 multibuild toolchain-funcs
+inherit cmake flag-o-matic git-r3 multibuild toolchain-funcs
 
 DESCRIPTION="Quantum chemistry program for atoms and molecules"
 HOMEPAGE="https://github.com/susilehtola/erkale"
@@ -22,16 +22,19 @@ RDEPEND="
 "
 DEPEND="
 	>=sci-libs/armadillo-4[blas,lapack]
-	virtual/pkgconfig
 	${RDEPEND}
 "
+BDEPEND="virtual/pkgconfig"
 
 MULTIBUILD_VARIANTS=( serial )
 
 src_prepare() {
 	use openmp && MULTIBUILD_VARIANTS+=( omp )
 	append-cxxflags "-DARMA_DONT_USE_ATLAS -DARMA_DONT_USE_WRAPPER"
-	cmake-utils_src_prepare
+	cmake_src_prepare
+	# libint has renamed things
+	find -type f -name "*.h" -exec sed -i -e 's/#include <libint\/libint.h>/#include <libint2.h>/g' {} + || die
+	find -type f -name "*.h" -exec sed -i -e 's/#include <libderiv\/libderiv.h>/#include <libint2\/deriv_iter.h>/g' {} + || die
 }
 
 src_configure() {
@@ -44,13 +47,13 @@ src_configure() {
 			-DERKALE_SYSTEM_LIBRARY="${basis/\/\///}"
 			-DLAPACK_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) lapack --cflags-only-I | sed 's/-I//')"
 		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 	multibuild_foreach_variant my_configure
 }
 
 src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
+	multibuild_foreach_variant cmake_src_compile
 }
 
 src_test() {
@@ -66,5 +69,5 @@ src_install() {
 	insinto "/usr/share/${PN}"
 	doins -r "${S}/basis"
 
-	multibuild_foreach_variant cmake-utils_src_install
+	multibuild_foreach_variant cmake_src_install
 }