1 |
commit: 87ad744e3f351ce03906019a1025fa52454125af |
2 |
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 7 15:27:06 2018 +0000 |
4 |
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 7 15:27:30 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ad744e |
7 |
|
8 |
sci-physics/espresso: version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
sci-physics/espresso/Manifest | 1 + |
13 |
...{espresso-9999.ebuild => espresso-4.0.0.ebuild} | 41 +++++++--------------- |
14 |
sci-physics/espresso/espresso-9999.ebuild | 41 +++++++--------------- |
15 |
sci-physics/espresso/metadata.xml | 1 - |
16 |
4 files changed, 25 insertions(+), 59 deletions(-) |
17 |
|
18 |
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest |
19 |
index d5d5ca9efc6..2b8aa0ed6e9 100644 |
20 |
--- a/sci-physics/espresso/Manifest |
21 |
+++ b/sci-physics/espresso/Manifest |
22 |
@@ -1 +1,2 @@ |
23 |
+DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019 |
24 |
DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2 |
25 |
|
26 |
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-4.0.0.ebuild |
27 |
similarity index 73% |
28 |
copy from sci-physics/espresso/espresso-9999.ebuild |
29 |
copy to sci-physics/espresso/espresso-4.0.0.ebuild |
30 |
index b841b4d4bc5..953909c3dd7 100644 |
31 |
--- a/sci-physics/espresso/espresso-9999.ebuild |
32 |
+++ b/sci-physics/espresso/espresso-4.0.0.ebuild |
33 |
@@ -1,4 +1,4 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
+# Copyright 1999-2018 Gentoo Foundation |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
EAPI=6 |
39 |
@@ -13,35 +13,29 @@ HOMEPAGE="http://espressomd.org" |
40 |
|
41 |
if [[ ${PV} = 9999 ]]; then |
42 |
EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git" |
43 |
- EGIT_BRANCH="master" |
44 |
+ EGIT_BRANCH="python" |
45 |
inherit git-r3 |
46 |
KEYWORDS="" |
47 |
else |
48 |
- SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz" |
49 |
+ SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz" |
50 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" |
51 |
fi |
52 |
|
53 |
LICENSE="GPL-3" |
54 |
SLOT="0" |
55 |
-IUSE="cuda doc examples +fftw +hdf5 packages +python tcl test" |
56 |
+IUSE="cuda doc examples +fftw +hdf5 test" |
57 |
|
58 |
REQUIRED_USE=" |
59 |
- packages? ( tcl ) |
60 |
- || ( python tcl ) |
61 |
${PYTHON_REQUIRED_USE}" |
62 |
|
63 |
RDEPEND=" |
64 |
${PYTHON_DEPS} |
65 |
- python? ( |
66 |
- >dev-python/cython-0.22[${PYTHON_USEDEP}] |
67 |
- dev-python/numpy[${PYTHON_USEDEP}] |
68 |
- ) |
69 |
- tcl? ( dev-lang/tcl:0= ) |
70 |
+ >=dev-python/cython-0.26.1[${PYTHON_USEDEP}] |
71 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
72 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) |
73 |
fftw? ( sci-libs/fftw:3.0 ) |
74 |
dev-libs/boost:=[mpi] |
75 |
- hdf5? ( sci-libs/hdf5:= ) |
76 |
- packages? ( dev-tcltk/tcllib )" |
77 |
+ hdf5? ( sci-libs/hdf5:=[mpi] )" |
78 |
|
79 |
DEPEND="${RDEPEND} |
80 |
doc? ( |
81 |
@@ -60,12 +54,10 @@ src_configure() { |
82 |
mycmakeargs=( |
83 |
-DWITH_CUDA=$(usex cuda) |
84 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
85 |
- -DWITH_PYTHON=$(usex python) |
86 |
- -DWITH_TCL=$(usex tcl) |
87 |
-DWITH_TESTS=$(usex test) |
88 |
- -DWITH_SCAFACOS=ON |
89 |
-DINSTALL_PYPRESSO=OFF |
90 |
-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw) |
91 |
+ -DWITH_HDF5=$(usex hdf5) |
92 |
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5) |
93 |
-DCMAKE_SKIP_RPATH=YES |
94 |
-DLIBDIR=$(get_libdir) |
95 |
@@ -93,24 +85,15 @@ src_install() { |
96 |
[[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}" |
97 |
newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf |
98 |
newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf |
99 |
- for j in $(usev python) $(usev tcl); do |
100 |
- for i in "${docdir}/doc/tutorials/${j}"/*/[0-9]*.pdf; do |
101 |
- newdoc "${i}" "${j}_tutorial_${i##*/}" |
102 |
- done |
103 |
+ for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do |
104 |
+ newdoc "${i}" "tutorial_${i##*/}" |
105 |
done |
106 |
dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html |
107 |
fi |
108 |
|
109 |
if use examples; then |
110 |
- for i in $(usev python) $(usev tcl); do |
111 |
- insinto "/usr/share/${PN}/examples/${i}" |
112 |
- doins -r samples/${i}/. |
113 |
- done |
114 |
- fi |
115 |
- |
116 |
- if use packages; then |
117 |
- insinto /usr/share/${PN}/packages |
118 |
- doins -r packages/* |
119 |
+ insinto "/usr/share/${PN}/examples/python" |
120 |
+ doins -r samples/${i}/. |
121 |
fi |
122 |
} |
123 |
|
124 |
|
125 |
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild |
126 |
index b841b4d4bc5..953909c3dd7 100644 |
127 |
--- a/sci-physics/espresso/espresso-9999.ebuild |
128 |
+++ b/sci-physics/espresso/espresso-9999.ebuild |
129 |
@@ -1,4 +1,4 @@ |
130 |
-# Copyright 1999-2017 Gentoo Foundation |
131 |
+# Copyright 1999-2018 Gentoo Foundation |
132 |
# Distributed under the terms of the GNU General Public License v2 |
133 |
|
134 |
EAPI=6 |
135 |
@@ -13,35 +13,29 @@ HOMEPAGE="http://espressomd.org" |
136 |
|
137 |
if [[ ${PV} = 9999 ]]; then |
138 |
EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git" |
139 |
- EGIT_BRANCH="master" |
140 |
+ EGIT_BRANCH="python" |
141 |
inherit git-r3 |
142 |
KEYWORDS="" |
143 |
else |
144 |
- SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz" |
145 |
+ SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz" |
146 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" |
147 |
fi |
148 |
|
149 |
LICENSE="GPL-3" |
150 |
SLOT="0" |
151 |
-IUSE="cuda doc examples +fftw +hdf5 packages +python tcl test" |
152 |
+IUSE="cuda doc examples +fftw +hdf5 test" |
153 |
|
154 |
REQUIRED_USE=" |
155 |
- packages? ( tcl ) |
156 |
- || ( python tcl ) |
157 |
${PYTHON_REQUIRED_USE}" |
158 |
|
159 |
RDEPEND=" |
160 |
${PYTHON_DEPS} |
161 |
- python? ( |
162 |
- >dev-python/cython-0.22[${PYTHON_USEDEP}] |
163 |
- dev-python/numpy[${PYTHON_USEDEP}] |
164 |
- ) |
165 |
- tcl? ( dev-lang/tcl:0= ) |
166 |
+ >=dev-python/cython-0.26.1[${PYTHON_USEDEP}] |
167 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
168 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) |
169 |
fftw? ( sci-libs/fftw:3.0 ) |
170 |
dev-libs/boost:=[mpi] |
171 |
- hdf5? ( sci-libs/hdf5:= ) |
172 |
- packages? ( dev-tcltk/tcllib )" |
173 |
+ hdf5? ( sci-libs/hdf5:=[mpi] )" |
174 |
|
175 |
DEPEND="${RDEPEND} |
176 |
doc? ( |
177 |
@@ -60,12 +54,10 @@ src_configure() { |
178 |
mycmakeargs=( |
179 |
-DWITH_CUDA=$(usex cuda) |
180 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
181 |
- -DWITH_PYTHON=$(usex python) |
182 |
- -DWITH_TCL=$(usex tcl) |
183 |
-DWITH_TESTS=$(usex test) |
184 |
- -DWITH_SCAFACOS=ON |
185 |
-DINSTALL_PYPRESSO=OFF |
186 |
-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw) |
187 |
+ -DWITH_HDF5=$(usex hdf5) |
188 |
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5) |
189 |
-DCMAKE_SKIP_RPATH=YES |
190 |
-DLIBDIR=$(get_libdir) |
191 |
@@ -93,24 +85,15 @@ src_install() { |
192 |
[[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}" |
193 |
newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf |
194 |
newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf |
195 |
- for j in $(usev python) $(usev tcl); do |
196 |
- for i in "${docdir}/doc/tutorials/${j}"/*/[0-9]*.pdf; do |
197 |
- newdoc "${i}" "${j}_tutorial_${i##*/}" |
198 |
- done |
199 |
+ for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do |
200 |
+ newdoc "${i}" "tutorial_${i##*/}" |
201 |
done |
202 |
dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html |
203 |
fi |
204 |
|
205 |
if use examples; then |
206 |
- for i in $(usev python) $(usev tcl); do |
207 |
- insinto "/usr/share/${PN}/examples/${i}" |
208 |
- doins -r samples/${i}/. |
209 |
- done |
210 |
- fi |
211 |
- |
212 |
- if use packages; then |
213 |
- insinto /usr/share/${PN}/packages |
214 |
- doins -r packages/* |
215 |
+ insinto "/usr/share/${PN}/examples/python" |
216 |
+ doins -r samples/${i}/. |
217 |
fi |
218 |
} |
219 |
|
220 |
|
221 |
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml |
222 |
index f162adc22dc..87ef8dd6f08 100644 |
223 |
--- a/sci-physics/espresso/metadata.xml |
224 |
+++ b/sci-physics/espresso/metadata.xml |
225 |
@@ -12,7 +12,6 @@ |
226 |
<use> |
227 |
<flag name="cuda">Enable cuda support</flag> |
228 |
<flag name="examples">Installs the examples</flag> |
229 |
- <flag name="packages">Installs extra TCL subpackages</flag> |
230 |
</use> |
231 |
<upstream> |
232 |
<remote-id type="github">espressomd/espresso</remote-id> |