| 1 |
commit: 0c2a5cb0f6a062b7da6f9a90cbb06e3784df29a6 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 8 12:36:34 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 15:54:21 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2a5cb0 |
| 7 |
|
| 8 |
sci-chemistry/pdb2pqr: Switch to python-single-r1 |
| 9 |
|
| 10 |
Use python-single-r1 as requiered for the dep on sci-chemistry/apbs. |
| 11 |
|
| 12 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 13 |
|
| 14 |
...pqr-1.9.0-r2.ebuild => pdb2pqr-1.9.0-r3.ebuild} | 72 ++++++++-------------- |
| 15 |
1 file changed, 27 insertions(+), 45 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r2.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r3.ebuild |
| 18 |
similarity index 60% |
| 19 |
rename from sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r2.ebuild |
| 20 |
rename to sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r3.ebuild |
| 21 |
index ad95f8f410f..179e6448d60 100644 |
| 22 |
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r2.ebuild |
| 23 |
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r3.ebuild |
| 24 |
@@ -5,7 +5,7 @@ EAPI=5 |
| 25 |
|
| 26 |
PYTHON_COMPAT=( python2_7 ) |
| 27 |
|
| 28 |
-inherit scons-utils fortran-2 flag-o-matic python-r1 toolchain-funcs |
| 29 |
+inherit scons-utils fortran-2 flag-o-matic python-single-r1 toolchain-funcs |
| 30 |
|
| 31 |
DESCRIPTION="Automated pipeline for performing Poisson-Boltzmann electrostatics calculations" |
| 32 |
HOMEPAGE="https://www.poissonboltzmann.org/" |
| 33 |
@@ -19,13 +19,15 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
| 34 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 35 |
|
| 36 |
RDEPEND="${PYTHON_DEPS} |
| 37 |
- || ( |
| 38 |
- dev-python/numpy-python2[${PYTHON_USEDEP}] |
| 39 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 40 |
- ) |
| 41 |
- sci-chemistry/openbabel-python[${PYTHON_USEDEP}] |
| 42 |
- opal? ( dev-python/zsi[${PYTHON_USEDEP}] ) |
| 43 |
- pdb2pka? ( sci-chemistry/apbs[${PYTHON_USEDEP},-mpi] )" |
| 44 |
+ $(python_gen_cond_dep ' |
| 45 |
+ || ( |
| 46 |
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] |
| 47 |
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}] |
| 48 |
+ ) |
| 49 |
+ sci-chemistry/openbabel-python[${PYTHON_MULTI_USEDEP}] |
| 50 |
+ opal? ( dev-python/zsi[${PYTHON_MULTI_USEDEP}] ) |
| 51 |
+ ') |
| 52 |
+ pdb2pka? ( sci-chemistry/apbs[${PYTHON_SINGLE_USEDEP},-mpi] )" |
| 53 |
DEPEND="${RDEPEND} |
| 54 |
dev-lang/swig:0" |
| 55 |
|
| 56 |
@@ -43,6 +45,7 @@ pkg_setup() { |
| 57 |
einfo "Allow usage of ${MAXATOMS} during calculations" |
| 58 |
fi |
| 59 |
fortran-2_pkg_setup |
| 60 |
+ python-single-r1_pkg_setup |
| 61 |
} |
| 62 |
|
| 63 |
src_prepare() { |
| 64 |
@@ -54,15 +57,10 @@ src_prepare() { |
| 65 |
epatch "${PATCHES[@]}" |
| 66 |
tc-export CXX |
| 67 |
rm -rf scons || die |
| 68 |
- |
| 69 |
- python_copy_sources |
| 70 |
} |
| 71 |
|
| 72 |
src_configure() { |
| 73 |
- python_configure() { |
| 74 |
- cd "${BUILD_DIR}" || die |
| 75 |
- |
| 76 |
- cat > build_config.py <<- EOF |
| 77 |
+ cat > build_config.py <<- EOF |
| 78 |
PREFIX="${D}/$(python_get_sitedir)/${PN}" |
| 79 |
#URL="http://<COMPUTER NAME>/pdb2pqr/" |
| 80 |
APBS="${EPREFIX}/usr/bin/apbs" |
| 81 |
@@ -71,51 +69,35 @@ src_configure() { |
| 82 |
MAX_ATOMS=${MAXATOMS} |
| 83 |
BUILD_PDB2PKA=$(usex pdb2pka True False) |
| 84 |
REBUILD_SWIG=True |
| 85 |
- EOF |
| 86 |
- } |
| 87 |
- |
| 88 |
- python_foreach_impl python_configure |
| 89 |
+ EOF |
| 90 |
} |
| 91 |
|
| 92 |
src_compile() { |
| 93 |
- python_compile() { |
| 94 |
- cd "${BUILD_DIR}" || die |
| 95 |
- escons |
| 96 |
- } |
| 97 |
- python_foreach_impl python_compile |
| 98 |
+ escons |
| 99 |
} |
| 100 |
|
| 101 |
src_test() { |
| 102 |
- python_test() { |
| 103 |
- local myesconsargs=( -j1 ) |
| 104 |
- cd "${BUILD_DIR}" || die |
| 105 |
- escons test |
| 106 |
- escons advtest |
| 107 |
- escons complete-test |
| 108 |
- } |
| 109 |
- python_foreach_impl python_test |
| 110 |
+ local myesconsargs=( -j1 ) |
| 111 |
+ escons test |
| 112 |
+ escons advtest |
| 113 |
+ escons complete-test |
| 114 |
} |
| 115 |
|
| 116 |
src_install() { |
| 117 |
dodir /usr/share/doc/${PF}/html |
| 118 |
- python_install() { |
| 119 |
- local lib |
| 120 |
- |
| 121 |
- cd "${BUILD_DIR}" || die |
| 122 |
+ local lib |
| 123 |
|
| 124 |
- escons install |
| 125 |
+ escons install |
| 126 |
|
| 127 |
- find "${D}$(python_get_sitedir)"/${PN}/{jmol,examples,doc,contrib} -delete || die |
| 128 |
+ find "${D}$(python_get_sitedir)"/${PN}/{jmol,examples,doc,contrib} -delete || die |
| 129 |
|
| 130 |
- python_doscript "${FILESDIR}"/{${PN},pdb2pka} |
| 131 |
+ python_doscript "${FILESDIR}"/{${PN},pdb2pka} |
| 132 |
|
| 133 |
- for lib in apbslib.py{,c,o}; do |
| 134 |
- dosym ../../apbs/${lib} $(python_get_sitedir)/${PN}/pdb2pka/${lib} |
| 135 |
- done |
| 136 |
- dosym ../../_apbslib.so $(python_get_sitedir)/${PN}/pdb2pka/_apbslib.so |
| 137 |
- python_optimize |
| 138 |
- } |
| 139 |
- python_foreach_impl python_install |
| 140 |
+ for lib in apbslib.py{,c,o}; do |
| 141 |
+ dosym ../../apbs/${lib} $(python_get_sitedir)/${PN}/pdb2pka/${lib} |
| 142 |
+ done |
| 143 |
+ dosym ../../_apbslib.so $(python_get_sitedir)/${PN}/pdb2pka/_apbslib.so |
| 144 |
+ python_optimize |
| 145 |
|
| 146 |
if use doc; then |
| 147 |
pushd doc > /dev/null |
Archives