From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 74E341382C5 for ; Thu, 28 Jan 2021 14:56:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8E1DE0A88; Thu, 28 Jan 2021 14:56:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D416E0A88 for ; Thu, 28 Jan 2021 14:56:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D1273410DE for ; Thu, 28 Jan 2021 14:56:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E97E48B for ; Thu, 28 Jan 2021 14:56:46 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1611845803.fb9356bf7ec6fa8bdf01da289b9f0775615b3b6d.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/erkale/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/erkale/erkale-9999.ebuild X-VCS-Directories: sci-chemistry/erkale/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: fb9356bf7ec6fa8bdf01da289b9f0775615b3b6d X-VCS-Branch: master Date: Thu, 28 Jan 2021 14:56:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8cbf4e58-e361-4e2f-ab31-90b9927c2634 X-Archives-Hash: f8ac54f673d1b5947661ddf0aa939993 commit: fb9356bf7ec6fa8bdf01da289b9f0775615b3b6d Author: Andrew Ammerlaan riseup net> AuthorDate: Thu Jan 28 14:54:03 2021 +0000 Commit: Andrew Ammerlaan riseup 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 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 /#include /g' {} + || die + find -type f -name "*.h" -exec sed -i -e 's/#include /#include /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 }