| 1 |
commit: 8ea6d8dc6fdf1117e5f78354d17b6b6f6d20c270 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 26 22:12:19 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 18:08:15 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea6d8dc |
| 7 |
|
| 8 |
sci-libs/votca-tools: Fix EAPI-7 bump, drop unused eclasses |
| 9 |
|
| 10 |
CMAKE_MAKEFILE_GENERATOR=ninja is default in EAPI-7/cmake.eclass |
| 11 |
Use https |
| 12 |
Use double brackets |
| 13 |
Sort RDEPEND |
| 14 |
Add slot operator to sci-libs/fftw |
| 15 |
Use BDEPEND |
| 16 |
local mycmakeargs |
| 17 |
|
| 18 |
Bug: https://bugs.gentoo.org/773175 |
| 19 |
Package-Manager: Portage-3.0.15, Repoman-3.0.2 |
| 20 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 21 |
|
| 22 |
sci-libs/votca-tools/votca-tools-1.6.4.ebuild | 28 +++++++++++++-------------- |
| 23 |
sci-libs/votca-tools/votca-tools-9999.ebuild | 28 +++++++++++++-------------- |
| 24 |
2 files changed, 28 insertions(+), 28 deletions(-) |
| 25 |
|
| 26 |
diff --git a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild |
| 27 |
index ba77bc97616..21ffc1d3bba 100644 |
| 28 |
--- a/sci-libs/votca-tools/votca-tools-1.6.4.ebuild |
| 29 |
+++ b/sci-libs/votca-tools/votca-tools-1.6.4.ebuild |
| 30 |
@@ -3,40 +3,40 @@ |
| 31 |
|
| 32 |
EAPI=7 |
| 33 |
|
| 34 |
-CMAKE_MAKEFILE_GENERATOR="ninja" |
| 35 |
+inherit cmake |
| 36 |
|
| 37 |
-inherit cmake eutils multilib |
| 38 |
- |
| 39 |
-if [ "${PV}" != "9999" ]; then |
| 40 |
+if [[ ${PV} == *9999 ]]; then |
| 41 |
+ EGIT_REPO_URI="https://github.com/${PN/-//}.git" |
| 42 |
+ inherit git-r3 |
| 43 |
+else |
| 44 |
SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 45 |
KEYWORDS="~amd64 ~x86 ~amd64-linux" |
| 46 |
S="${WORKDIR}/${P#votca-}" |
| 47 |
-else |
| 48 |
- inherit git-r3 |
| 49 |
- EGIT_REPO_URI="https://github.com/${PN/-//}.git" |
| 50 |
fi |
| 51 |
|
| 52 |
DESCRIPTION="Votca tools library" |
| 53 |
-HOMEPAGE="http://www.votca.org" |
| 54 |
+HOMEPAGE="https://www.votca.org/" |
| 55 |
|
| 56 |
LICENSE="Apache-2.0" |
| 57 |
SLOT="0" |
| 58 |
IUSE="" |
| 59 |
|
| 60 |
RDEPEND=" |
| 61 |
+ >=dev-cpp/eigen-3.3 |
| 62 |
dev-libs/boost:= |
| 63 |
dev-libs/expat |
| 64 |
- >=dev-cpp/eigen-3.3 |
| 65 |
- sci-libs/fftw:3.0" |
| 66 |
- |
| 67 |
-DEPEND="${RDEPEND} |
| 68 |
+ sci-libs/fftw:3.0= |
| 69 |
+" |
| 70 |
+DEPEND="${RDEPEND}" |
| 71 |
+BDEPEND=" |
| 72 |
>=app-text/txt2tags-2.5 |
| 73 |
- virtual/pkgconfig" |
| 74 |
+ virtual/pkgconfig |
| 75 |
+" |
| 76 |
|
| 77 |
DOCS=( NOTICE ) |
| 78 |
|
| 79 |
src_configure() { |
| 80 |
- mycmakeargs=( |
| 81 |
+ local mycmakeargs=( |
| 82 |
-DWITH_RC_FILES=OFF |
| 83 |
) |
| 84 |
cmake_src_configure |
| 85 |
|
| 86 |
diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild |
| 87 |
index ba77bc97616..21ffc1d3bba 100644 |
| 88 |
--- a/sci-libs/votca-tools/votca-tools-9999.ebuild |
| 89 |
+++ b/sci-libs/votca-tools/votca-tools-9999.ebuild |
| 90 |
@@ -3,40 +3,40 @@ |
| 91 |
|
| 92 |
EAPI=7 |
| 93 |
|
| 94 |
-CMAKE_MAKEFILE_GENERATOR="ninja" |
| 95 |
+inherit cmake |
| 96 |
|
| 97 |
-inherit cmake eutils multilib |
| 98 |
- |
| 99 |
-if [ "${PV}" != "9999" ]; then |
| 100 |
+if [[ ${PV} == *9999 ]]; then |
| 101 |
+ EGIT_REPO_URI="https://github.com/${PN/-//}.git" |
| 102 |
+ inherit git-r3 |
| 103 |
+else |
| 104 |
SRC_URI="https://github.com/${PN/-//}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 105 |
KEYWORDS="~amd64 ~x86 ~amd64-linux" |
| 106 |
S="${WORKDIR}/${P#votca-}" |
| 107 |
-else |
| 108 |
- inherit git-r3 |
| 109 |
- EGIT_REPO_URI="https://github.com/${PN/-//}.git" |
| 110 |
fi |
| 111 |
|
| 112 |
DESCRIPTION="Votca tools library" |
| 113 |
-HOMEPAGE="http://www.votca.org" |
| 114 |
+HOMEPAGE="https://www.votca.org/" |
| 115 |
|
| 116 |
LICENSE="Apache-2.0" |
| 117 |
SLOT="0" |
| 118 |
IUSE="" |
| 119 |
|
| 120 |
RDEPEND=" |
| 121 |
+ >=dev-cpp/eigen-3.3 |
| 122 |
dev-libs/boost:= |
| 123 |
dev-libs/expat |
| 124 |
- >=dev-cpp/eigen-3.3 |
| 125 |
- sci-libs/fftw:3.0" |
| 126 |
- |
| 127 |
-DEPEND="${RDEPEND} |
| 128 |
+ sci-libs/fftw:3.0= |
| 129 |
+" |
| 130 |
+DEPEND="${RDEPEND}" |
| 131 |
+BDEPEND=" |
| 132 |
>=app-text/txt2tags-2.5 |
| 133 |
- virtual/pkgconfig" |
| 134 |
+ virtual/pkgconfig |
| 135 |
+" |
| 136 |
|
| 137 |
DOCS=( NOTICE ) |
| 138 |
|
| 139 |
src_configure() { |
| 140 |
- mycmakeargs=( |
| 141 |
+ local mycmakeargs=( |
| 142 |
-DWITH_RC_FILES=OFF |
| 143 |
) |
| 144 |
cmake_src_configure |
Archives