Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/files/, sci-physics/espresso/
Date: Sun, 29 Jan 2023 21:59:55
Message-Id: 1675029580.68e206daf689674928f9f799db10fc761201ad9f.asturm@gentoo
1 commit: 68e206daf689674928f9f799db10fc761201ad9f
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 28 09:20:08 2023 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 29 21:59:40 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e206da
7
8 sci-physics/espresso: drop 4.1.3
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 sci-physics/espresso/Manifest | 1 -
13 sci-physics/espresso/espresso-4.1.3.ebuild | 122 ---------------------
14 .../espresso/files/espresso-4.1.3-gcc-11.patch | 37 -------
15 3 files changed, 160 deletions(-)
16
17 diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
18 index 949e4ac778c0..8fc3c5ca8d45 100644
19 --- a/sci-physics/espresso/Manifest
20 +++ b/sci-physics/espresso/Manifest
21 @@ -1,2 +1 @@
22 -DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
23 DIST espresso-4.2.0.tar.gz 14000445 BLAKE2B 79de0e364cd932e534b0e1ee9433ae90e4deeb1ade262aa6877a30c8656f03155ca77b8feafdd5607f83e36ee4f47ad7ec28be353bc3358216a9c9f8c0902323 SHA512 b80afb1bef57911fd79b88378a5b2e31b07a18d415fe17fcd5ed28fb448eeca5922f98af8df42117e9e869645765d55ecfb3aae615fa6a53c915f7d8a63081c5
24
25 diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
26 deleted file mode 100644
27 index 17f2fbd1addc..000000000000
28 --- a/sci-physics/espresso/espresso-4.1.3.ebuild
29 +++ /dev/null
30 @@ -1,122 +0,0 @@
31 -# Copyright 1999-2023 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -PYTHON_COMPAT=( python3_9 )
37 -CMAKE_MAKEFILE_GENERATOR="emake"
38 -
39 -inherit cmake cuda python-single-r1 savedconfig
40 -
41 -DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
42 -HOMEPAGE="http://espressomd.org"
43 -
44 -if [[ ${PV} = 9999 ]]; then
45 - EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
46 - EGIT_BRANCH="python"
47 - inherit git-r3
48 -else
49 - SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
50 - KEYWORDS="~amd64 ~x86 ~amd64-linux"
51 -fi
52 -
53 -LICENSE="GPL-3"
54 -SLOT="0"
55 -IUSE="cuda doc examples +fftw +hdf5 test"
56 -RESTRICT="!test? ( test )"
57 -
58 -REQUIRED_USE="
59 - ${PYTHON_REQUIRED_USE}"
60 -
61 -RDEPEND="
62 - ${PYTHON_DEPS}
63 - $(python_gen_cond_dep '
64 - >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
65 - dev-python/numpy[${PYTHON_USEDEP}]
66 - ')
67 - cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
68 - fftw? ( sci-libs/fftw:3.0 )
69 - dev-libs/boost:=[mpi]
70 - hdf5? ( sci-libs/hdf5:=[mpi] )"
71 -
72 -DEPEND="${RDEPEND}
73 - doc? (
74 - app-doc/doxygen[dot]
75 - dev-texlive/texlive-latexextra
76 - virtual/latex-base )"
77 -
78 -DOCS=( AUTHORS NEWS README ChangeLog )
79 -
80 -S="${WORKDIR}/${PN}"
81 -
82 -PATCHES=(
83 - "${FILESDIR}"/${P}-gcc-11.patch
84 -)
85 -
86 -src_prepare() {
87 - use cuda && cuda_src_prepare
88 - cmake_src_prepare
89 -}
90 -
91 -src_configure() {
92 - local mycmakeargs=(
93 - -DWITH_CUDA=$(usex cuda)
94 - -DPYTHON_EXECUTABLE="${PYTHON}"
95 - -DWITH_TESTS=$(usex test)
96 - -DINSTALL_PYPRESSO=OFF
97 - -DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
98 - -DWITH_HDF5=$(usex hdf5)
99 - -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
100 - -DCMAKE_SKIP_RPATH=YES
101 - )
102 - cmake_src_configure
103 -}
104 -
105 -src_compile() {
106 - cmake_src_compile
107 - use doc && cmake_build doxygen
108 - [[ ${PV} = 9999 ]] && use doc && cmake_build ug dg tutorials
109 -}
110 -
111 -src_install() {
112 - local i docdir="${S}"
113 -
114 - cmake_src_install
115 -
116 - python_optimize
117 -
118 - insinto /usr/share/${PN}/
119 - doins "${BUILD_DIR}/myconfig-sample.hpp"
120 -
121 - save_config "${BUILD_DIR}/src/config/myconfig-final.hpp"
122 -
123 - if use doc; then
124 - [[ ${PV} = 9999 ]] && docdir="${BUILD_DIR}"
125 - newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
126 - newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
127 - for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
128 - newdoc "${i}" "tutorial_${i##*/}"
129 - done
130 - dodoc -r "${BUILD_DIR}/doc/doxygen/html"
131 - fi
132 -
133 - if use examples; then
134 - insinto "/usr/share/${PN}/examples/python"
135 - doins -r samples/${i}/.
136 - fi
137 -}
138 -
139 -pkg_postinst() {
140 - echo
141 - elog "Please read and cite:"
142 - elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
143 - elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
144 - echo
145 - elog "If you need more features, change"
146 - elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
147 - elog "and reemerge with USE=savedconfig"
148 - echo
149 - elog "For a full feature list see:"
150 - elog "/usr/share/${PN}/myconfig-sample.hpp"
151 - echo
152 -}
153
154 diff --git a/sci-physics/espresso/files/espresso-4.1.3-gcc-11.patch b/sci-physics/espresso/files/espresso-4.1.3-gcc-11.patch
155 deleted file mode 100644
156 index fcda88e9b8b8..000000000000
157 --- a/sci-physics/espresso/files/espresso-4.1.3-gcc-11.patch
158 +++ /dev/null
159 @@ -1,37 +0,0 @@
160 -https://src.fedoraproject.org/rpms/espresso/blob/f34/f/espresso-gcc11.patch
161 ---- a/src/core/communication.hpp
162 -+++ b/src/core/communication.hpp
163 -@@ -49,6 +49,8 @@
164 - * to \ref CALLBACK_LIST.
165 - */
166 -
167 -+#include <cstddef>
168 -+
169 - #include "MpiCallbacks.hpp"
170 -
171 - /* Includes needed by callbacks. */
172 -diff --git a/src/script_interface/ParallelScriptInterface.hpp b/src/script_interface/ParallelScriptInterface.hpp
173 -index c33e67d..02ad815 100644
174 ---- a/src/script_interface/ParallelScriptInterface.hpp
175 -+++ b/src/script_interface/ParallelScriptInterface.hpp
176 -@@ -23,6 +23,7 @@
177 - #define SCRIPT_INTERFACE_PARALLEL_SCRIPT_INTERFACE_HPP
178 -
179 - #include <utility>
180 -+#include <limits>
181 -
182 - #include "MpiCallbacks.hpp"
183 - #include "ScriptInterface.hpp"
184 -diff --git a/src/utils/include/utils/NumeratedContainer.hpp b/src/utils/include/utils/NumeratedContainer.hpp
185 -index 1d99098..1191a79 100644
186 ---- a/src/utils/include/utils/NumeratedContainer.hpp
187 -+++ b/src/utils/include/utils/NumeratedContainer.hpp
188 -@@ -24,6 +24,7 @@
189 - * Keep an enumerated list of T objects, managed by the class.
190 - */
191 -
192 -+#include <cstddef>
193 - #include <cassert>
194 - #include <set>
195 - #include <unordered_map>
196 -