Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Christoph Junghans <junghans@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
Date: Sun, 16 Aug 2020 15:22:30
Message-Id: 1597591339.93533be3232554ddc1b0546ea1f1bde62c348bc7.junghans@gentoo
1 commit: 93533be3232554ddc1b0546ea1f1bde62c348bc7
2 Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 16 15:21:58 2020 +0000
4 Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 16 15:22:19 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93533be3
7
8 sci-physics/espresso: version bump
9
10 Closes: https://bugs.gentoo.org/737416
11 Package-Manager: Portage-2.3.103, Repoman-2.3.23
12 Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org>
13
14 sci-physics/espresso/Manifest | 1 +
15 ...{espresso-9999.ebuild => espresso-4.1.3.ebuild} | 31 +++++++++++-----------
16 sci-physics/espresso/espresso-9999.ebuild | 31 +++++++++++-----------
17 sci-physics/espresso/metadata.xml | 4 ---
18 4 files changed, 33 insertions(+), 34 deletions(-)
19
20 diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
21 index 2b8aa0ed6e9..a4941b7d188 100644
22 --- a/sci-physics/espresso/Manifest
23 +++ b/sci-physics/espresso/Manifest
24 @@ -1,2 +1,3 @@
25 DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
26 DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2
27 +DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
28
29 diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
30 similarity index 79%
31 copy from sci-physics/espresso/espresso-9999.ebuild
32 copy to sci-physics/espresso/espresso-4.1.3.ebuild
33 index fcc6fbc9926..ef5f6578edc 100644
34 --- a/sci-physics/espresso/espresso-9999.ebuild
35 +++ b/sci-physics/espresso/espresso-4.1.3.ebuild
36 @@ -1,12 +1,12 @@
37 # Copyright 1999-2020 Gentoo Authors
38 # Distributed under the terms of the GNU General Public License v2
39
40 -EAPI=6
41 +EAPI=7
42
43 -PYTHON_COMPAT=( python3_6 )
44 -CMAKE_MAKEFILE_GENERATOR="ninja"
45 +PYTHON_COMPAT=( python3_{6,7,8,9} )
46 +CMAKE_MAKEFILE_GENERATOR="emake"
47
48 -inherit cmake-utils python-single-r1 savedconfig
49 +inherit cmake python-single-r1 savedconfig
50
51 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
52 HOMEPAGE="http://espressomd.org"
53 @@ -48,9 +48,11 @@ DEPEND="${RDEPEND}
54
55 DOCS=( AUTHORS NEWS README ChangeLog )
56
57 +S="${WORKDIR}/${PN}"
58 +
59 src_prepare() {
60 use cuda && cuda_src_prepare
61 - cmake-utils_src_prepare
62 + cmake_src_prepare
63 }
64
65 src_configure() {
66 @@ -63,35 +65,34 @@ src_configure() {
67 -DWITH_HDF5=$(usex hdf5)
68 -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
69 -DCMAKE_SKIP_RPATH=YES
70 - -DLIBDIR=$(get_libdir)
71 )
72 - cmake-utils_src_configure
73 + cmake_src_configure
74 }
75
76 src_compile() {
77 - cmake-utils_src_compile
78 - use doc && cmake-utils_src_make doxygen
79 - [[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
80 + cmake_src_compile
81 + use doc && cmake_build doxygen
82 + [[ ${PV} = 9999 ]] && use doc && cmake_build ug dg tutorials
83 }
84
85 src_install() {
86 local i docdir="${S}"
87
88 - cmake-utils_src_install
89 + cmake_src_install
90
91 insinto /usr/share/${PN}/
92 - doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
93 + doins "${BUILD_DIR}/myconfig-sample.hpp"
94
95 - save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
96 + save_config "${BUILD_DIR}/src/config/myconfig-final.hpp"
97
98 if use doc; then
99 - [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
100 + [[ ${PV} = 9999 ]] && docdir="${BUILD_DIR}"
101 newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
102 newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
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 + dodoc -r "${BUILD_DIR}/doc/doxygen/html"
108 fi
109
110 if use examples; then
111
112 diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
113 index fcc6fbc9926..ef5f6578edc 100644
114 --- a/sci-physics/espresso/espresso-9999.ebuild
115 +++ b/sci-physics/espresso/espresso-9999.ebuild
116 @@ -1,12 +1,12 @@
117 # Copyright 1999-2020 Gentoo Authors
118 # Distributed under the terms of the GNU General Public License v2
119
120 -EAPI=6
121 +EAPI=7
122
123 -PYTHON_COMPAT=( python3_6 )
124 -CMAKE_MAKEFILE_GENERATOR="ninja"
125 +PYTHON_COMPAT=( python3_{6,7,8,9} )
126 +CMAKE_MAKEFILE_GENERATOR="emake"
127
128 -inherit cmake-utils python-single-r1 savedconfig
129 +inherit cmake python-single-r1 savedconfig
130
131 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
132 HOMEPAGE="http://espressomd.org"
133 @@ -48,9 +48,11 @@ DEPEND="${RDEPEND}
134
135 DOCS=( AUTHORS NEWS README ChangeLog )
136
137 +S="${WORKDIR}/${PN}"
138 +
139 src_prepare() {
140 use cuda && cuda_src_prepare
141 - cmake-utils_src_prepare
142 + cmake_src_prepare
143 }
144
145 src_configure() {
146 @@ -63,35 +65,34 @@ src_configure() {
147 -DWITH_HDF5=$(usex hdf5)
148 -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
149 -DCMAKE_SKIP_RPATH=YES
150 - -DLIBDIR=$(get_libdir)
151 )
152 - cmake-utils_src_configure
153 + cmake_src_configure
154 }
155
156 src_compile() {
157 - cmake-utils_src_compile
158 - use doc && cmake-utils_src_make doxygen
159 - [[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
160 + cmake_src_compile
161 + use doc && cmake_build doxygen
162 + [[ ${PV} = 9999 ]] && use doc && cmake_build ug dg tutorials
163 }
164
165 src_install() {
166 local i docdir="${S}"
167
168 - cmake-utils_src_install
169 + cmake_src_install
170
171 insinto /usr/share/${PN}/
172 - doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
173 + doins "${BUILD_DIR}/myconfig-sample.hpp"
174
175 - save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
176 + save_config "${BUILD_DIR}/src/config/myconfig-final.hpp"
177
178 if use doc; then
179 - [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
180 + [[ ${PV} = 9999 ]] && docdir="${BUILD_DIR}"
181 newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
182 newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
183 for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
184 newdoc "${i}" "tutorial_${i##*/}"
185 done
186 - dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
187 + dodoc -r "${BUILD_DIR}/doc/doxygen/html"
188 fi
189
190 if use examples; then
191
192 diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
193 index 87ef8dd6f08..37615e72f9b 100644
194 --- a/sci-physics/espresso/metadata.xml
195 +++ b/sci-physics/espresso/metadata.xml
196 @@ -1,10 +1,6 @@
197 <?xml version='1.0' encoding='UTF-8'?>
198 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
199 <pkgmetadata>
200 - <maintainer type="person">
201 - <email>junghans@g.o</email>
202 - <name>Christoph Junghans</name>
203 - </maintainer>
204 <maintainer type="project">
205 <email>sci-physics@g.o</email>
206 <name>Gentoo Physics Project</name>
Report Message
Find on MARC Find on Google Groups