[gentoo-commits] proj/sci:master commit in: sci-libs/ciftilib/, sci-libs/ciftilib/files/

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     fd57fb2706919f70446dc9e90e93ba9ba96179b3
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 30 09:31:03 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 30 09:31:03 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=fd57fb27

sci-libs/ciftilib: version bump, EAPI bump, cmake-utils-->cmake

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

 .../{ciftilib-1.5.3-r1.ebuild => ciftilib-1.6.0.ebuild}  | 16 ++++++----------
 .../ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch     | 12 ------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild
similarity index 84%
rename from sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild
rename to sci-libs/ciftilib/ciftilib-1.6.0.ebuild
index ad4894dd1..062fa44ef 100644
--- a/sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild
+++ b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++ Library for reading and writing CIFTI-2 and CIFTI-1 files"
 HOMEPAGE="https://github.com/Washington-University/CiftiLib"
@@ -22,10 +22,6 @@ DEPEND="
 	"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.3-openmp_in_pc.patch
-	)
-
 S="${WORKDIR}/CiftiLib-${PV}"
 
 #TODO: Enable doc building and installation
@@ -42,14 +38,14 @@ src_prepare(){
 		-e "s:DT_:CIFTI_DT_:g" \
 		-i `grep -rl DT_ *`
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(-DBUILD_SHARED_LIBS=ON)
 	use qt5 || mycmakeargs+=(-DIGNORE_QT=TRUE)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test(){
@@ -57,5 +53,5 @@ src_test(){
 	local myctestargs=(
 			-j1
 	)
-	cmake-utils_src_test
+	cmake_src_test
 }

diff --git a/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch b/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch
deleted file mode 100644
index 6fd35159a..000000000
--- a/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CiftiLib.pc.in b/CiftiLib.pc.in
-index 13cd78c..8db6c46 100644
---- a/CiftiLib.pc.in
-+++ b/CiftiLib.pc.in
-@@ -5,6 +5,6 @@ Name: CiftiLib
- Description: C++ Library for reading and writing CIFTI-2 and CIFTI-1 files
- Version: @CIFTILIB_VERSION@
- URL: https://github.com/Washington-University/CiftiLib
--Cflags: -I${includedir}/CiftiLib @CIFTILIB_PKGCONFIG_DEFINE@
-+Cflags: -I${includedir}/CiftiLib @CIFTILIB_PKGCONFIG_DEFINE@ @OpenMP_CXX_FLAGS@
- Libs: -L${libdir} -lCifti
- @CIFTILIB_PKGCONFIG_REQUIRES_LINE@