1 |
commit: fb448cd504da31d7ea98396e14c03199693ece40 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 28 13:03:57 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 28 18:08:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb448cd5 |
7 |
|
8 |
sci-chemistry/votca-xtp: Fix EAPI-7 bump, drop unused multilib |
9 |
|
10 |
CMAKE_MAKEFILE_GENERATOR=ninja is default in EAPI-7/cmake.eclass |
11 |
Use https |
12 |
Use double brackets |
13 |
Sort RDEPEND |
14 |
Use BDEPEND |
15 |
|
16 |
Package-Manager: Portage-3.0.16, Repoman-3.0.2 |
17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
18 |
|
19 |
sci-chemistry/votca-xtp/votca-xtp-1.6.4.ebuild | 28 ++++++++++++-------------- |
20 |
sci-chemistry/votca-xtp/votca-xtp-9999.ebuild | 28 ++++++++++++-------------- |
21 |
2 files changed, 26 insertions(+), 30 deletions(-) |
22 |
|
23 |
diff --git a/sci-chemistry/votca-xtp/votca-xtp-1.6.4.ebuild b/sci-chemistry/votca-xtp/votca-xtp-1.6.4.ebuild |
24 |
index fc37002f5a3..d9f436b0316 100644 |
25 |
--- a/sci-chemistry/votca-xtp/votca-xtp-1.6.4.ebuild |
26 |
+++ b/sci-chemistry/votca-xtp/votca-xtp-1.6.4.ebuild |
27 |
@@ -3,35 +3,33 @@ |
28 |
|
29 |
EAPI=7 |
30 |
|
31 |
-CMAKE_MAKEFILE_GENERATOR="ninja" |
32 |
+inherit bash-completion-r1 cmake |
33 |
|
34 |
-inherit bash-completion-r1 cmake multilib |
35 |
- |
36 |
-IUSE="" |
37 |
-if [ "${PV}" != "9999" ]; then |
38 |
+if [[ ${PV} == *9999 ]]; then |
39 |
+ inherit git-r3 |
40 |
+ EGIT_REPO_URI="https://github.com/${PN/-//}.git" |
41 |
+else |
42 |
SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
43 |
KEYWORDS="~amd64 ~x86 ~amd64-linux" |
44 |
S="${WORKDIR}/${P#votca-}" |
45 |
-else |
46 |
- inherit git-r3 |
47 |
- EGIT_REPO_URI="https://github.com/${PN/-//}.git" |
48 |
fi |
49 |
|
50 |
DESCRIPTION="Votca excitation and charge properties module" |
51 |
-HOMEPAGE="http://www.votca.org" |
52 |
+HOMEPAGE="https://www.votca.org/" |
53 |
|
54 |
LICENSE="Apache-2.0" |
55 |
SLOT="0" |
56 |
+IUSE="" |
57 |
|
58 |
RDEPEND=" |
59 |
- ~sci-libs/votca-tools-${PV} |
60 |
>=dev-cpp/eigen-3.3 |
61 |
- sci-libs/hdf5[cxx] |
62 |
~sci-chemistry/votca-csg-${PV} |
63 |
- sci-libs/libxc" |
64 |
- |
65 |
-DEPEND="${RDEPEND} |
66 |
- virtual/pkgconfig" |
67 |
+ sci-libs/hdf5[cxx] |
68 |
+ sci-libs/libxc |
69 |
+ ~sci-libs/votca-tools-${PV} |
70 |
+" |
71 |
+DEPEND="${RDEPEND}" |
72 |
+BDEPEND="virtual/pkgconfig" |
73 |
|
74 |
DOCS=( README.md NOTICE CHANGELOG.md ) |
75 |
|
76 |
|
77 |
diff --git a/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild b/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild |
78 |
index fc37002f5a3..d9f436b0316 100644 |
79 |
--- a/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild |
80 |
+++ b/sci-chemistry/votca-xtp/votca-xtp-9999.ebuild |
81 |
@@ -3,35 +3,33 @@ |
82 |
|
83 |
EAPI=7 |
84 |
|
85 |
-CMAKE_MAKEFILE_GENERATOR="ninja" |
86 |
+inherit bash-completion-r1 cmake |
87 |
|
88 |
-inherit bash-completion-r1 cmake multilib |
89 |
- |
90 |
-IUSE="" |
91 |
-if [ "${PV}" != "9999" ]; then |
92 |
+if [[ ${PV} == *9999 ]]; then |
93 |
+ inherit git-r3 |
94 |
+ EGIT_REPO_URI="https://github.com/${PN/-//}.git" |
95 |
+else |
96 |
SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
97 |
KEYWORDS="~amd64 ~x86 ~amd64-linux" |
98 |
S="${WORKDIR}/${P#votca-}" |
99 |
-else |
100 |
- inherit git-r3 |
101 |
- EGIT_REPO_URI="https://github.com/${PN/-//}.git" |
102 |
fi |
103 |
|
104 |
DESCRIPTION="Votca excitation and charge properties module" |
105 |
-HOMEPAGE="http://www.votca.org" |
106 |
+HOMEPAGE="https://www.votca.org/" |
107 |
|
108 |
LICENSE="Apache-2.0" |
109 |
SLOT="0" |
110 |
+IUSE="" |
111 |
|
112 |
RDEPEND=" |
113 |
- ~sci-libs/votca-tools-${PV} |
114 |
>=dev-cpp/eigen-3.3 |
115 |
- sci-libs/hdf5[cxx] |
116 |
~sci-chemistry/votca-csg-${PV} |
117 |
- sci-libs/libxc" |
118 |
- |
119 |
-DEPEND="${RDEPEND} |
120 |
- virtual/pkgconfig" |
121 |
+ sci-libs/hdf5[cxx] |
122 |
+ sci-libs/libxc |
123 |
+ ~sci-libs/votca-tools-${PV} |
124 |
+" |
125 |
+DEPEND="${RDEPEND}" |
126 |
+BDEPEND="virtual/pkgconfig" |
127 |
|
128 |
DOCS=( README.md NOTICE CHANGELOG.md ) |