| 1 |
commit: 24d49d50d85c465cabe555d7185fc9f1eed12a59 |
| 2 |
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 21 16:18:20 2022 +0000 |
| 4 |
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 21 16:18:36 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24d49d50 |
| 7 |
|
| 8 |
sci-chemistry/votca: fix python dep |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/833818 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org> |
| 13 |
|
| 14 |
sci-chemistry/votca/votca-2022.ebuild | 12 +++++++++++- |
| 15 |
sci-chemistry/votca/votca-9999.ebuild | 12 +++++++++++- |
| 16 |
2 files changed, 22 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-chemistry/votca/votca-2022.ebuild b/sci-chemistry/votca/votca-2022.ebuild |
| 19 |
index a60728a6a6a9..0962e065f91d 100644 |
| 20 |
--- a/sci-chemistry/votca/votca-2022.ebuild |
| 21 |
+++ b/sci-chemistry/votca/votca-2022.ebuild |
| 22 |
@@ -2,8 +2,9 @@ |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 27 |
|
| 28 |
-inherit bash-completion-r1 cmake |
| 29 |
+inherit bash-completion-r1 cmake python-single-r1 |
| 30 |
|
| 31 |
if [[ ${PV} == *9999 ]]; then |
| 32 |
inherit git-r3 |
| 33 |
@@ -25,12 +26,14 @@ HOMEPAGE="https://www.votca.org/" |
| 34 |
LICENSE="Apache-2.0" |
| 35 |
SLOT="0" |
| 36 |
IUSE="+gromacs test" |
| 37 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 38 |
RESTRICT="!test? ( test )" |
| 39 |
|
| 40 |
RDEPEND=" |
| 41 |
!sci-libs/votca-tools |
| 42 |
!sci-chemistry/votca-csg |
| 43 |
!sci-chemistry/votca-xtp |
| 44 |
+ ${PYTHON_DEPS} |
| 45 |
app-shells/bash:* |
| 46 |
>=dev-cpp/eigen-3.3 |
| 47 |
dev-libs/boost:= |
| 48 |
@@ -47,6 +50,13 @@ BDEPEND="virtual/pkgconfig" |
| 49 |
|
| 50 |
DOCS=( README.rst NOTICE.rst CHANGELOG.rst ) |
| 51 |
|
| 52 |
+src_prepare() { |
| 53 |
+ # espressopp was removed from gentoo |
| 54 |
+ rm -r ./csg-tutorials/spce/ibi_espressopp || die |
| 55 |
+ python_fix_shebang . |
| 56 |
+ cmake_src_prepare |
| 57 |
+} |
| 58 |
+ |
| 59 |
src_configure() { |
| 60 |
local mycmakeargs=( |
| 61 |
-DENABLE_TESTING=$(usex test) |
| 62 |
|
| 63 |
diff --git a/sci-chemistry/votca/votca-9999.ebuild b/sci-chemistry/votca/votca-9999.ebuild |
| 64 |
index a60728a6a6a9..0962e065f91d 100644 |
| 65 |
--- a/sci-chemistry/votca/votca-9999.ebuild |
| 66 |
+++ b/sci-chemistry/votca/votca-9999.ebuild |
| 67 |
@@ -2,8 +2,9 @@ |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
EAPI=7 |
| 71 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 72 |
|
| 73 |
-inherit bash-completion-r1 cmake |
| 74 |
+inherit bash-completion-r1 cmake python-single-r1 |
| 75 |
|
| 76 |
if [[ ${PV} == *9999 ]]; then |
| 77 |
inherit git-r3 |
| 78 |
@@ -25,12 +26,14 @@ HOMEPAGE="https://www.votca.org/" |
| 79 |
LICENSE="Apache-2.0" |
| 80 |
SLOT="0" |
| 81 |
IUSE="+gromacs test" |
| 82 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 83 |
RESTRICT="!test? ( test )" |
| 84 |
|
| 85 |
RDEPEND=" |
| 86 |
!sci-libs/votca-tools |
| 87 |
!sci-chemistry/votca-csg |
| 88 |
!sci-chemistry/votca-xtp |
| 89 |
+ ${PYTHON_DEPS} |
| 90 |
app-shells/bash:* |
| 91 |
>=dev-cpp/eigen-3.3 |
| 92 |
dev-libs/boost:= |
| 93 |
@@ -47,6 +50,13 @@ BDEPEND="virtual/pkgconfig" |
| 94 |
|
| 95 |
DOCS=( README.rst NOTICE.rst CHANGELOG.rst ) |
| 96 |
|
| 97 |
+src_prepare() { |
| 98 |
+ # espressopp was removed from gentoo |
| 99 |
+ rm -r ./csg-tutorials/spce/ibi_espressopp || die |
| 100 |
+ python_fix_shebang . |
| 101 |
+ cmake_src_prepare |
| 102 |
+} |
| 103 |
+ |
| 104 |
src_configure() { |
| 105 |
local mycmakeargs=( |
| 106 |
-DENABLE_TESTING=$(usex test) |
Archives