| 1 |
commit: d6c53b0a3c9f52a30f077536de11332d955312b1 |
| 2 |
Author: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Sep 27 20:07:13 2013 +0000 |
| 4 |
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Sep 27 20:07:13 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d6c53b0a |
| 7 |
|
| 8 |
sys-cluster/charm-6.5.1-r1: Added python dependencies |
| 9 |
|
| 10 |
The documentation is built partly with python2.x scripts. I added the |
| 11 |
necessary dependencies. |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.1 |
| 14 |
|
| 15 |
--- |
| 16 |
sys-cluster/charm/ChangeLog | 4 ++++ |
| 17 |
sys-cluster/charm/charm-6.5.1-r1.ebuild | 22 ++++++++++++++-------- |
| 18 |
2 files changed, 18 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog |
| 21 |
index fa7dd1d..d005b5f 100644 |
| 22 |
--- a/sys-cluster/charm/ChangeLog |
| 23 |
+++ b/sys-cluster/charm/ChangeLog |
| 24 |
@@ -3,6 +3,10 @@ |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
27 Sep 2013; Nicolas Bock <nicolasbock@×××××.com> charm-6.5.1-r1.ebuild: |
| 28 |
+ sys-cluster/charm-6.5.1-r1: Added python dependencies The documentation is |
| 29 |
+ built partly with python2.x scripts. I added the necessary dependencies. |
| 30 |
+ |
| 31 |
+ 27 Sep 2013; Nicolas Bock <nicolasbock@×××××.com> charm-6.5.1-r1.ebuild: |
| 32 |
sys-cluster/charm-6.5.1-r1: doc depends on python-2 |
| 33 |
|
| 34 |
27 Sep 2013; Nicolas Bock <nicolasbock@×××××.com> charm-6.5.1-r1.ebuild: |
| 35 |
|
| 36 |
diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild |
| 37 |
index b4e2913..d429138 100644 |
| 38 |
--- a/sys-cluster/charm/charm-6.5.1-r1.ebuild |
| 39 |
+++ b/sys-cluster/charm/charm-6.5.1-r1.ebuild |
| 40 |
@@ -4,9 +4,9 @@ |
| 41 |
|
| 42 |
EAPI=5 |
| 43 |
|
| 44 |
-PYTHON_DEPEND="doc? 2" |
| 45 |
+PYTHON_COMPAT=( python{2_6,2_7} ) |
| 46 |
|
| 47 |
-inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs |
| 48 |
+inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs python-single-r1 |
| 49 |
|
| 50 |
DESCRIPTION="Message-passing parallel language and runtime system" |
| 51 |
HOMEPAGE="http://charm.cs.uiuc.edu/" |
| 52 |
@@ -24,11 +24,13 @@ DEPEND=" |
| 53 |
>=app-text/poppler-0.12.3-r3[utils] |
| 54 |
dev-tex/latex2html |
| 55 |
virtual/tex-base |
| 56 |
- dev-python/beautifulsoup |
| 57 |
+ >=dev-python/beautifulsoup-4 |
| 58 |
media-libs/netpbm |
| 59 |
+ ${PYTHON_DEPS} |
| 60 |
)" |
| 61 |
|
| 62 |
REQUIRED_USE=" |
| 63 |
+ doc? ( ${PYTHON_REQUIRED_USE} ) |
| 64 |
cmkopt? ( !charmdebug !charmtracing ) |
| 65 |
charmproduction? ( !charmdebug !charmtracing )" |
| 66 |
|
| 67 |
@@ -99,15 +101,19 @@ src_prepare() { |
| 68 |
} |
| 69 |
|
| 70 |
src_compile() { |
| 71 |
+ local mybuildoptions="$(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') $(get_opts) ${MAKEOPTS} ${CFLAGS}" |
| 72 |
+ |
| 73 |
# Build charmm++ first. |
| 74 |
- einfo "running ./build charm++ $(usex mpi 'mpi' 'net')-linux$(usex amd64 '-amd64' '') $(get_opts) ${MAKEOPTS} ${CFLAGS}" |
| 75 |
- ./build charm++ $(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') \ |
| 76 |
- $(get_opts) ${MAKEOPTS} ${CFLAGS} || die "Failed to build charm++" |
| 77 |
+ einfo "running ./build charm++ ${mybuildoptions}" |
| 78 |
+ ./build charm++ ${mybuildoptions} || die "Failed to build charm++" |
| 79 |
|
| 80 |
# make pdf/html docs |
| 81 |
if use doc; then |
| 82 |
- cd "${S}"/doc |
| 83 |
- make doc || die "failed to create pdf/html docs" |
| 84 |
+ python-single-r1_pkg_setup |
| 85 |
+ python_fix_shebang ${S}/doc |
| 86 |
+ einfo "forcing ${EPYTHON}" |
| 87 |
+ einfo "running ./build doc ${mybuildoptions}" |
| 88 |
+ ./build doc ${mybuildoptions} || die "Failed to build charm++ documentation" |
| 89 |
fi |
| 90 |
} |
Archives