1 |
commit: bc5b58f78574e2a185a02ab4b56230a02f1090ff |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 27 22:39:37 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 27 22:39:37 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc5b58f7 |
7 |
|
8 |
sci-chemistry/pdbmat: port to EAPI 8 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/809773 |
11 |
Closes: https://bugs.gentoo.org/834303 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
sci-chemistry/pdbmat/files/CMakeLists.txt | 6 ++++-- |
15 |
.../pdbmat/{pdbmat-3.89.ebuild => pdbmat-3.89-r1.ebuild} | 15 +++++++-------- |
16 |
2 files changed, 11 insertions(+), 10 deletions(-) |
17 |
|
18 |
diff --git a/sci-chemistry/pdbmat/files/CMakeLists.txt b/sci-chemistry/pdbmat/files/CMakeLists.txt |
19 |
index 2f1937d84b3f..a20199bbca91 100644 |
20 |
--- a/sci-chemistry/pdbmat/files/CMakeLists.txt |
21 |
+++ b/sci-chemistry/pdbmat/files/CMakeLists.txt |
22 |
@@ -1,14 +1,16 @@ |
23 |
cmake_minimum_required (VERSION 2.6) |
24 |
project (PDBMAT Fortran) |
25 |
|
26 |
+include(GNUInstallDirs) |
27 |
+ |
28 |
option (EXAMPLES "Instal additional example files" OFF) |
29 |
|
30 |
add_executable(diagstd diagstd.f) |
31 |
add_executable(pdbmat pdbmat.f) |
32 |
|
33 |
install (TARGETS diagstd pdbmat DESTINATION bin) |
34 |
-install (FILES diagstd.README pdbmat.README DESTINATION share/doc/pdbmat) |
35 |
+install (FILES diagstd.README pdbmat.README DESTINATION ${CMAKE_INSTALL_DOCDIR}) |
36 |
|
37 |
if ( EXAMPLES ) |
38 |
- install (DIRECTORY ../Try_ENM2011 DESTINATION share/pdbmat/examples) |
39 |
+ install (DIRECTORY ../Try_ENM2011 DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) |
40 |
endif (EXAMPLES) |
41 |
|
42 |
diff --git a/sci-chemistry/pdbmat/pdbmat-3.89.ebuild b/sci-chemistry/pdbmat/pdbmat-3.89-r1.ebuild |
43 |
similarity index 79% |
44 |
rename from sci-chemistry/pdbmat/pdbmat-3.89.ebuild |
45 |
rename to sci-chemistry/pdbmat/pdbmat-3.89-r1.ebuild |
46 |
index 6c14461b5019..40ef7c9df2d3 100644 |
47 |
--- a/sci-chemistry/pdbmat/pdbmat-3.89.ebuild |
48 |
+++ b/sci-chemistry/pdbmat/pdbmat-3.89-r1.ebuild |
49 |
@@ -1,25 +1,24 @@ |
50 |
-# Copyright 1999-2017 Gentoo Foundation |
51 |
+# Copyright 1999-2022 Gentoo Authors |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
|
54 |
-EAPI=6 |
55 |
+EAPI=8 |
56 |
|
57 |
-inherit cmake-utils fortran-2 |
58 |
+inherit cmake fortran-2 |
59 |
|
60 |
DESCRIPTION="Calculate Tirion's model from pdb structures" |
61 |
HOMEPAGE="http://ecole.modelisation.free.fr/modes.html" |
62 |
SRC_URI="http://ecole.modelisation.free.fr/enm2011.tar.gz -> ${P}.tar.gz" |
63 |
+S="${WORKDIR}"/Source_ENM2011 |
64 |
|
65 |
-SLOT="0" |
66 |
LICENSE="CeCILL-2" |
67 |
+SLOT="0" |
68 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
69 |
IUSE="examples" |
70 |
|
71 |
-S="${WORKDIR}"/Source_ENM2011 |
72 |
- |
73 |
src_prepare() { |
74 |
cp "${FILESDIR}"/CMakeLists.txt . || die |
75 |
|
76 |
- cmake-utils_src_prepare |
77 |
+ cmake_src_prepare |
78 |
} |
79 |
|
80 |
src_configure() { |
81 |
@@ -27,5 +26,5 @@ src_configure() { |
82 |
-DEXAMPLES=$(usex examples) |
83 |
) |
84 |
|
85 |
- cmake-utils_src_configure |
86 |
+ cmake_src_configure |
87 |
} |