1 |
commit: 951bafca9ed6046b5584a6d7a9b44de579fff99d |
2 |
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 3 18:00:08 2016 +0000 |
4 |
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 3 18:00:25 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=951bafca |
7 |
|
8 |
sci-physics/espresso: live ebuild update |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
sci-physics/espresso/espresso-9999.ebuild | 50 +++++++++++++++---------------- |
13 |
sci-physics/espresso/metadata.xml | 2 +- |
14 |
2 files changed, 25 insertions(+), 27 deletions(-) |
15 |
|
16 |
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild |
17 |
index 66a0214..6b906a0 100644 |
18 |
--- a/sci-physics/espresso/espresso-9999.ebuild |
19 |
+++ b/sci-physics/espresso/espresso-9999.ebuild |
20 |
@@ -24,24 +24,25 @@ fi |
21 |
|
22 |
LICENSE="GPL-3" |
23 |
SLOT="0" |
24 |
-IUSE="cuda doc examples +fftw +hdf5 packages python test -tk" |
25 |
+IUSE="cuda doc examples +fftw +hdf5 packages +python tcl test" |
26 |
|
27 |
-REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} )" |
28 |
+REQUIRED_USE=" |
29 |
+ packages? ( tcl ) |
30 |
+ || ( python tcl ) |
31 |
+ ${PYTHON_REQUIRED_USE}" |
32 |
|
33 |
RDEPEND=" |
34 |
+ ${PYTHON_DEPS} |
35 |
python? ( |
36 |
- ${PYTHON_DEPS} |
37 |
>dev-python/cython-0.22[${PYTHON_USEDEP}] |
38 |
dev-python/numpy[${PYTHON_USEDEP}] |
39 |
) |
40 |
- dev-lang/tcl:0= |
41 |
+ tcl? ( dev-lang/tcl:0= ) |
42 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) |
43 |
fftw? ( sci-libs/fftw:3.0 ) |
44 |
dev-libs/boost:=[mpi] |
45 |
- virtual/mpi |
46 |
hdf5? ( sci-libs/hdf5 ) |
47 |
- packages? ( dev-tcltk/tcllib ) |
48 |
- tk? ( >=dev-lang/tk-8.4.18-r1:0= )" |
49 |
+ packages? ( dev-tcltk/tcllib )" |
50 |
|
51 |
DEPEND="${RDEPEND} |
52 |
doc? ( |
53 |
@@ -51,10 +52,6 @@ DEPEND="${RDEPEND} |
54 |
|
55 |
DOCS=( AUTHORS NEWS README ChangeLog ) |
56 |
|
57 |
-pkg_setup() { |
58 |
- use python && python-single-r1_pkg_setup |
59 |
-} |
60 |
- |
61 |
src_prepare() { |
62 |
use cuda && cuda_src_prepare |
63 |
cmake-utils_src_prepare |
64 |
@@ -63,9 +60,12 @@ src_prepare() { |
65 |
src_configure() { |
66 |
mycmakeargs=( |
67 |
-DWITH_CUDA=$(usex cuda) |
68 |
+ -DPYTHON_EXECUTABLE="${PYTHON}" |
69 |
-DWITH_PYTHON=$(usex python) |
70 |
+ -DWITH_TCL=$(usex tcl) |
71 |
-DWITH_TESTS=$(usex test) |
72 |
- -DWITH_H5MD=$(usex hdf5) |
73 |
+ -DWITH_SCAFACOS=ON |
74 |
+ -DINSTALL_PYPRESSO=OFF |
75 |
-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw) |
76 |
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5) |
77 |
-DCMAKE_SKIP_RPATH=YES |
78 |
@@ -81,7 +81,7 @@ src_compile() { |
79 |
} |
80 |
|
81 |
src_install() { |
82 |
- local i |
83 |
+ local i docdir="${S}" |
84 |
|
85 |
cmake-utils_src_install |
86 |
|
87 |
@@ -91,24 +91,22 @@ src_install() { |
88 |
save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp |
89 |
|
90 |
if use doc; then |
91 |
- if [[ ${PV} = 9999 ]] ; then |
92 |
- newdoc ${CMAKE_BUILD_DIR}/doc/dg/dg.pdf developer_guide.pdf |
93 |
- newdoc ${CMAKE_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf |
94 |
- for i in ${CMAKE_BUILD_DIR}/doc/tutorials/*/*/[0-9]*.pdf; do |
95 |
- newdoc "${i}" "tutorial_${i##*/}" |
96 |
- done |
97 |
- else |
98 |
- newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf |
99 |
- for i in "${S}"/doc/tutorials/*/*/[0-9]*.pdf; do |
100 |
- newdoc "${i}" "tutorial_${i##*/}" |
101 |
+ [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}" |
102 |
+ newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf |
103 |
+ newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf |
104 |
+ for j in $(usev python) $(usev tcl); do |
105 |
+ for i in "${docdir}/doc/tutorials/${j}"/*/[0-9]*.pdf; do |
106 |
+ newdoc "${i}" "${j}_tutorial_${i##*/}" |
107 |
done |
108 |
- fi |
109 |
+ done |
110 |
dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html |
111 |
fi |
112 |
|
113 |
if use examples; then |
114 |
- insinto /usr/share/${PN}/examples |
115 |
- doins -r samples/* |
116 |
+ for i in $(usev python) $(usev tcl); do |
117 |
+ insinto "/usr/share/${PN}/examples/${i}" |
118 |
+ doins -r samples/${i}/. |
119 |
+ done |
120 |
fi |
121 |
|
122 |
if use packages; then |
123 |
|
124 |
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml |
125 |
index 13db459..3d99b65 100644 |
126 |
--- a/sci-physics/espresso/metadata.xml |
127 |
+++ b/sci-physics/espresso/metadata.xml |
128 |
@@ -12,6 +12,6 @@ |
129 |
<use> |
130 |
<flag name="cuda">Enable cuda support</flag> |
131 |
<flag name="examples">Installs the examples</flag> |
132 |
- <flag name="packages">Installs extra subpackages</flag> |
133 |
+ <flag name="packages">Installs extra TCL subpackages</flag> |
134 |
</use> |
135 |
</pkgmetadata> |