1 |
commit: fd57fb2706919f70446dc9e90e93ba9ba96179b3 |
2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
3 |
AuthorDate: Sat Jan 30 09:31:03 2021 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
5 |
CommitDate: Sat Jan 30 09:31:03 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=fd57fb27 |
7 |
|
8 |
sci-libs/ciftilib: version bump, EAPI bump, cmake-utils-->cmake |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
11 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
12 |
|
13 |
.../{ciftilib-1.5.3-r1.ebuild => ciftilib-1.6.0.ebuild} | 16 ++++++---------- |
14 |
.../ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch | 12 ------------ |
15 |
2 files changed, 6 insertions(+), 22 deletions(-) |
16 |
|
17 |
diff --git a/sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild |
18 |
similarity index 84% |
19 |
rename from sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild |
20 |
rename to sci-libs/ciftilib/ciftilib-1.6.0.ebuild |
21 |
index ad4894dd1..062fa44ef 100644 |
22 |
--- a/sci-libs/ciftilib/ciftilib-1.5.3-r1.ebuild |
23 |
+++ b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild |
24 |
@@ -1,9 +1,9 @@ |
25 |
-# Copyright 1999-2018 Gentoo Authors |
26 |
+# Copyright 1999-2021 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
-EAPI="6" |
30 |
+EAPI=7 |
31 |
|
32 |
-inherit cmake-utils |
33 |
+inherit cmake |
34 |
|
35 |
DESCRIPTION="C++ Library for reading and writing CIFTI-2 and CIFTI-1 files" |
36 |
HOMEPAGE="https://github.com/Washington-University/CiftiLib" |
37 |
@@ -22,10 +22,6 @@ DEPEND=" |
38 |
" |
39 |
RDEPEND="${DEPEND}" |
40 |
|
41 |
-PATCHES=( |
42 |
- "${FILESDIR}"/${PN}-1.5.3-openmp_in_pc.patch |
43 |
- ) |
44 |
- |
45 |
S="${WORKDIR}/CiftiLib-${PV}" |
46 |
|
47 |
#TODO: Enable doc building and installation |
48 |
@@ -42,14 +38,14 @@ src_prepare(){ |
49 |
-e "s:DT_:CIFTI_DT_:g" \ |
50 |
-i `grep -rl DT_ *` |
51 |
|
52 |
- cmake-utils_src_prepare |
53 |
+ cmake_src_prepare |
54 |
} |
55 |
|
56 |
src_configure() { |
57 |
local mycmakeargs=(-DBUILD_SHARED_LIBS=ON) |
58 |
use qt5 || mycmakeargs+=(-DIGNORE_QT=TRUE) |
59 |
|
60 |
- cmake-utils_src_configure |
61 |
+ cmake_src_configure |
62 |
} |
63 |
|
64 |
src_test(){ |
65 |
@@ -57,5 +53,5 @@ src_test(){ |
66 |
local myctestargs=( |
67 |
-j1 |
68 |
) |
69 |
- cmake-utils_src_test |
70 |
+ cmake_src_test |
71 |
} |
72 |
|
73 |
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 |
74 |
deleted file mode 100644 |
75 |
index 6fd35159a..000000000 |
76 |
--- a/sci-libs/ciftilib/files/ciftilib-1.5.3-openmp_in_pc.patch |
77 |
+++ /dev/null |
78 |
@@ -1,12 +0,0 @@ |
79 |
-diff --git a/CiftiLib.pc.in b/CiftiLib.pc.in |
80 |
-index 13cd78c..8db6c46 100644 |
81 |
---- a/CiftiLib.pc.in |
82 |
-+++ b/CiftiLib.pc.in |
83 |
-@@ -5,6 +5,6 @@ Name: CiftiLib |
84 |
- Description: C++ Library for reading and writing CIFTI-2 and CIFTI-1 files |
85 |
- Version: @CIFTILIB_VERSION@ |
86 |
- URL: https://github.com/Washington-University/CiftiLib |
87 |
--Cflags: -I${includedir}/CiftiLib @CIFTILIB_PKGCONFIG_DEFINE@ |
88 |
-+Cflags: -I${includedir}/CiftiLib @CIFTILIB_PKGCONFIG_DEFINE@ @OpenMP_CXX_FLAGS@ |
89 |
- Libs: -L${libdir} -lCifti |
90 |
- @CIFTILIB_PKGCONFIG_REQUIRES_LINE@ |