Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/
Date: Fri, 01 Jan 2021 01:56:04
Message-Id: 1609466153.e4c36e7e9a47e830fd712d37197a74cb5c4f29b0.mgorny@gentoo
1 commit: e4c36e7e9a47e830fd712d37197a74cb5c4f29b0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 1 01:52:27 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 1 01:55:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c36e7e
7
8 sci-physics/espresso: Remove old (py3.6)
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sci-physics/espresso/Manifest | 2 -
13 sci-physics/espresso/espresso-4.0.0-r2.ebuild | 118 -------------
14 .../espresso/espresso-4.0_pre20170228.ebuild | 120 -------------
15 sci-physics/espresso/files/1056.patch | 190 ---------------------
16 sci-physics/espresso/files/2277.patch | 19 ---
17 5 files changed, 449 deletions(-)
18
19 diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
20 index a4941b7d188..366b7e76700 100644
21 --- a/sci-physics/espresso/Manifest
22 +++ b/sci-physics/espresso/Manifest
23 @@ -1,3 +1 @@
24 -DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
25 -DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2
26 DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
27
28 diff --git a/sci-physics/espresso/espresso-4.0.0-r2.ebuild b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
29 deleted file mode 100644
30 index 0afbf393e9a..00000000000
31 --- a/sci-physics/espresso/espresso-4.0.0-r2.ebuild
32 +++ /dev/null
33 @@ -1,118 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -PYTHON_COMPAT=( python3_6 )
40 -CMAKE_MAKEFILE_GENERATOR="ninja"
41 -
42 -inherit cmake-utils python-single-r1 savedconfig
43 -
44 -DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
45 -HOMEPAGE="http://espressomd.org"
46 -
47 -if [[ ${PV} = 9999 ]]; then
48 - EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
49 - EGIT_BRANCH="python"
50 - inherit git-r3
51 - KEYWORDS=""
52 -else
53 - SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
54 - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
55 -fi
56 -
57 -LICENSE="GPL-3"
58 -SLOT="0"
59 -IUSE="cuda doc examples +fftw +hdf5 test"
60 -RESTRICT="!test? ( test )"
61 -
62 -REQUIRED_USE="
63 - ${PYTHON_REQUIRED_USE}"
64 -
65 -RDEPEND="
66 - ${PYTHON_DEPS}
67 - $(python_gen_cond_dep '
68 - >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
69 - dev-python/numpy[${PYTHON_MULTI_USEDEP}]
70 - ')
71 - cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
72 - fftw? ( sci-libs/fftw:3.0 )
73 - dev-libs/boost:=[mpi]
74 - hdf5? ( sci-libs/hdf5:=[mpi] )"
75 -
76 -DEPEND="${RDEPEND}
77 - doc? (
78 - app-doc/doxygen[dot]
79 - dev-texlive/texlive-latexextra
80 - virtual/latex-base )"
81 -
82 -DOCS=( AUTHORS NEWS README ChangeLog )
83 -
84 -PATCHES=( "${FILESDIR}/2277.patch" )
85 -
86 -src_prepare() {
87 - use cuda && cuda_src_prepare
88 - cmake-utils_src_prepare
89 -}
90 -
91 -src_configure() {
92 - 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 - -DLIBDIR=$(get_libdir)
102 - )
103 - cmake-utils_src_configure
104 -}
105 -
106 -src_compile() {
107 - cmake-utils_src_compile
108 - use doc && cmake-utils_src_make doxygen
109 - [[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
110 -}
111 -
112 -src_install() {
113 - local i docdir="${S}"
114 -
115 - cmake-utils_src_install
116 -
117 - insinto /usr/share/${PN}/
118 - doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
119 -
120 - save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
121 -
122 - if use doc; then
123 - [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
124 - newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
125 - newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
126 - for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
127 - newdoc "${i}" "tutorial_${i##*/}"
128 - done
129 - dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
130 - fi
131 -
132 - if use examples; then
133 - insinto "/usr/share/${PN}/examples/python"
134 - doins -r samples/${i}/.
135 - fi
136 -}
137 -
138 -pkg_postinst() {
139 - echo
140 - elog "Please read and cite:"
141 - elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
142 - elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
143 - echo
144 - elog "If you need more features, change"
145 - elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
146 - elog "and reemerge with USE=savedconfig"
147 - echo
148 - elog "For a full feature list see:"
149 - elog "/usr/share/${PN}/myconfig-sample.hpp"
150 - echo
151 -}
152
153 diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
154 deleted file mode 100644
155 index e7c540b1629..00000000000
156 --- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
157 +++ /dev/null
158 @@ -1,120 +0,0 @@
159 -# Copyright 1999-2020 Gentoo Authors
160 -# Distributed under the terms of the GNU General Public License v2
161 -
162 -EAPI=6
163 -
164 -PYTHON_COMPAT=( python3_6 )
165 -CMAKE_MAKEFILE_GENERATOR="ninja"
166 -
167 -inherit cmake-utils python-single-r1 savedconfig
168 -
169 -DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
170 -HOMEPAGE="http://espressomd.org"
171 -
172 -if [[ ${PV} = 9999 ]]; then
173 - EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
174 - EGIT_BRANCH="master"
175 - inherit git-r3
176 - KEYWORDS=""
177 -else
178 - inherit vcs-snapshot
179 - COMMIT="8a021f5e8b1d508f356f4419d360bd9dfb7fec2c"
180 - SRC_URI="https://github.com/${PN}md/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
181 - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
182 -fi
183 -
184 -LICENSE="GPL-3"
185 -SLOT="0"
186 -IUSE="cuda doc examples +fftw +hdf5 test"
187 -RESTRICT="!test? ( test )"
188 -
189 -REQUIRED_USE="
190 - ${PYTHON_REQUIRED_USE}"
191 -
192 -RDEPEND="
193 - ${PYTHON_DEPS}
194 - $(python_gen_cond_dep '
195 - >dev-python/cython-0.22[${PYTHON_MULTI_USEDEP}]
196 - dev-python/numpy[${PYTHON_MULTI_USEDEP}]
197 - ')
198 - cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
199 - fftw? ( sci-libs/fftw:3.0 )
200 - dev-libs/boost:=[mpi]
201 - hdf5? ( sci-libs/hdf5:=[cxx] )"
202 -
203 -DEPEND="${RDEPEND}
204 - doc? (
205 - app-doc/doxygen[dot]
206 - dev-texlive/texlive-latexextra
207 - virtual/latex-base )"
208 -
209 -DOCS=( AUTHORS NEWS README ChangeLog )
210 -
211 -PATCHES=( "${FILESDIR}"/1056.patch )
212 -
213 -src_prepare() {
214 - use cuda && cuda_src_prepare
215 - cmake-utils_src_prepare
216 -}
217 -
218 -src_configure() {
219 - mycmakeargs=(
220 - -DWITH_CUDA=$(usex cuda)
221 - -DPYTHON_EXECUTABLE="${PYTHON}"
222 - -DWITH_TESTS=$(usex test)
223 - -DWITH_SCAFACOS=ON
224 - -DINSTALL_PYPRESSO=OFF
225 - -DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
226 - -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
227 - -DCMAKE_SKIP_RPATH=YES
228 - -DLIBDIR=$(get_libdir)
229 - )
230 - cmake-utils_src_configure
231 -}
232 -
233 -src_compile() {
234 - cmake-utils_src_compile
235 - use doc && cmake-utils_src_make doxygen
236 - [[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
237 -}
238 -
239 -src_install() {
240 - local i docdir="${S}"
241 -
242 - cmake-utils_src_install
243 -
244 - insinto /usr/share/${PN}/
245 - doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
246 -
247 - save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
248 -
249 - if use doc; then
250 - [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
251 - newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
252 - newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
253 - for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
254 - newdoc "${i}" "tutorial_${i##*/}"
255 - done
256 - dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
257 - fi
258 -
259 - if use examples; then
260 - insinto "/usr/share/${PN}/examples/"
261 - doins -r samples/python/.
262 - fi
263 -}
264 -
265 -pkg_postinst() {
266 - echo
267 - elog "Please read and cite:"
268 - elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
269 - elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
270 - echo
271 - elog "If you need more features, change"
272 - elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
273 - elog "and reemerge with USE=savedconfig"
274 - echo
275 - elog "For a full feature list see:"
276 - elog "/usr/share/${PN}/myconfig-sample.hpp"
277 - echo
278 -}
279
280 diff --git a/sci-physics/espresso/files/1056.patch b/sci-physics/espresso/files/1056.patch
281 deleted file mode 100644
282 index 18a478e446b..00000000000
283 --- a/sci-physics/espresso/files/1056.patch
284 +++ /dev/null
285 @@ -1,190 +0,0 @@
286 -From d075cbaa80ce0b484c8422be27c5b5680f6abee4 Mon Sep 17 00:00:00 2001
287 -From: Christoph Junghans <junghans@×××××.org>
288 -Date: Fri, 3 Mar 2017 16:05:45 -0700
289 -Subject: [PATCH] cmake: install all shared libs in back in libdir
290 -
291 -some libraries weren't installed and the python module path
292 -isn't in the LD_LIBRARY_PATH and hence partly revert
293 -80ad49e954f4a6590707fd86e4fd586682ad626d
294 ----
295 - CMakeLists.txt | 4 ++++
296 - src/core/CMakeLists.txt | 4 ++--
297 - src/core/actor/CMakeLists.txt | 4 ++--
298 - src/core/constraints/CMakeLists.txt | 1 +
299 - src/core/correlators/CMakeLists.txt | 1 +
300 - src/core/immersed_boundary/CMakeLists.txt | 4 ++--
301 - src/core/object-in-fluid/CMakeLists.txt | 2 +-
302 - src/core/observables/CMakeLists.txt | 1 +
303 - src/core/scafacos/CMakeLists.txt | 2 +-
304 - src/core/shapes/CMakeLists.txt | 1 +
305 - src/core/utils/CMakeLists.txt | 1 +
306 - src/script_interface/CMakeLists.txt | 1 +
307 - 12 files changed, 18 insertions(+), 8 deletions(-)
308 -
309 -diff --git a/CMakeLists.txt b/CMakeLists.txt
310 -index cf49c40..7a8bc15 100644
311 ---- a/CMakeLists.txt
312 -+++ b/CMakeLists.txt
313 -@@ -238,6 +238,10 @@ if (NOT DEFINED DATA)
314 - set(DATA "share/espresso")
315 - endif(NOT DEFINED DATA)
316 -
317 -+if (NOT DEFINED LIBDIR)
318 -+ set(LIBDIR "lib")
319 -+endif(NOT DEFINED LIBDIR)
320 -+
321 - if (NOT DEFINED BINDIR)
322 - set(BINDIR "bin")
323 - endif(NOT DEFINED BINDIR)
324 -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
325 -index 9982a54..13bb052 100644
326 ---- a/src/core/CMakeLists.txt
327 -+++ b/src/core/CMakeLists.txt
328 -@@ -23,7 +23,7 @@ add_custom_target(EspressoConfig DEPENDS config-features.hpp config-features.cpp
329 - add_dependencies(EspressoConfig myconfig)
330 -
331 - add_library(EspressoCore SHARED ${EspressoCore_SRC} config-features.cpp config-version.cpp)
332 --install(TARGETS EspressoCore LIBRARY DESTINATION ${PYTHON_INSTDIR})
333 -+install(TARGETS EspressoCore LIBRARY DESTINATION ${LIBDIR})
334 - add_dependencies(EspressoCore EspressoConfig)
335 -
336 - target_link_libraries(EspressoCore ${LIBRARIES} Actor ObjectInFluid ImmersedBoundary Shapes Constraints EspressoUtils Correlators Observables)
337 -@@ -43,7 +43,7 @@ if(CUDA)
338 - cuda_include_directories(${CMAKE_CURRENT_BINARY_DIR})
339 -
340 - cuda_add_library(EspressoCuda SHARED ${EspressoCuda_SRC})
341 -- install(TARGETS EspressoCuda DESTINATION ${PYTHON_INSTDIR})
342 -+ install(TARGETS EspressoCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
343 - add_dependencies(EspressoCuda EspressoConfig)
344 -
345 - set_target_properties(EspressoCuda PROPERTIES MACOSX_RPATH TRUE)
346 -diff --git a/src/core/actor/CMakeLists.txt b/src/core/actor/CMakeLists.txt
347 -index 0421243..1b5eafe 100644
348 ---- a/src/core/actor/CMakeLists.txt
349 -+++ b/src/core/actor/CMakeLists.txt
350 -@@ -1,7 +1,7 @@
351 - file(GLOB Actor_SRC *.cpp)
352 -
353 - add_library(Actor SHARED ${Actor_SRC})
354 --install(TARGETS Actor LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
355 -+install(TARGETS Actor LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
356 - add_dependencies(Actor EspressoConfig)
357 -
358 - set_target_properties(Actor PROPERTIES MACOSX_RPATH TRUE)
359 -@@ -9,7 +9,7 @@ set_target_properties(Actor PROPERTIES MACOSX_RPATH TRUE)
360 - if(CUDA)
361 - file(GLOB ActorCuda_SRC *.cu)
362 - cuda_add_library(ActorCuda SHARED ${ActorCuda_SRC})
363 -- install(TARGETS ActorCuda DESTINATION ${PYTHON_INSTDIR})
364 -+ install(TARGETS ActorCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
365 - add_dependencies(ActorCuda EspressoConfig)
366 -
367 - add_dependencies(Actor ActorCuda)
368 -diff --git a/src/core/constraints/CMakeLists.txt b/src/core/constraints/CMakeLists.txt
369 -index 0f5c043..d07ad77 100644
370 ---- a/src/core/constraints/CMakeLists.txt
371 -+++ b/src/core/constraints/CMakeLists.txt
372 -@@ -1,4 +1,5 @@
373 - file(GLOB Constraints_SRC Constraint.cpp)
374 - add_library(Constraints SHARED ${Constraints_SRC})
375 -+install(TARGETS Constraints LIBRARY DESTINATION ${LIBDIR})
376 - add_dependencies(Constraints EspressoConfig)
377 - set_target_properties(Constraints PROPERTIES MACOSX_RPATH TRUE)
378 -diff --git a/src/core/correlators/CMakeLists.txt b/src/core/correlators/CMakeLists.txt
379 -index c5ff02f..fcc3611 100644
380 ---- a/src/core/correlators/CMakeLists.txt
381 -+++ b/src/core/correlators/CMakeLists.txt
382 -@@ -1,4 +1,5 @@
383 - file(GLOB Correlators_SRC *.?pp)
384 - add_library(Correlators SHARED ${Correlators_SRC})
385 -+install(TARGETS Correlators LIBRARY DESTINATION ${LIBDIR})
386 - add_dependencies(Correlators EspressoConfig)
387 - set_target_properties(Correlators PROPERTIES MACOSX_RPATH TRUE)
388 -diff --git a/src/core/immersed_boundary/CMakeLists.txt b/src/core/immersed_boundary/CMakeLists.txt
389 -index ec7fb85..8e7285f 100644
390 ---- a/src/core/immersed_boundary/CMakeLists.txt
391 -+++ b/src/core/immersed_boundary/CMakeLists.txt
392 -@@ -1,13 +1,13 @@
393 - file(GLOB ImmersedBoundary_SRC *.cpp)
394 - add_library(ImmersedBoundary SHARED ${ImmersedBoundary_SRC})
395 - set_target_properties(ImmersedBoundary PROPERTIES MACOSX_RPATH TRUE)
396 --install(TARGETS ImmersedBoundary LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
397 -+install(TARGETS ImmersedBoundary LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
398 - add_dependencies(ImmersedBoundary EspressoConfig)
399 -
400 - if(CUDA)
401 - file(GLOB ImmersedBoundaryCuda_SRC *.cu)
402 - cuda_add_library(ImmersedBoundaryCuda SHARED ${ImmersedBoundaryCuda_SRC})
403 -- install(TARGETS ImmersedBoundaryCuda DESTINATION ${PYTHON_INSTDIR})
404 -+ install(TARGETS ImmersedBoundaryCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
405 - add_dependencies(ImmersedBoundaryCuda EspressoConfig)
406 -
407 - set_target_properties(ImmersedBoundaryCuda PROPERTIES MACOSX_RPATH TRUE)
408 -diff --git a/src/core/object-in-fluid/CMakeLists.txt b/src/core/object-in-fluid/CMakeLists.txt
409 -index 7154486..c25228a 100644
410 ---- a/src/core/object-in-fluid/CMakeLists.txt
411 -+++ b/src/core/object-in-fluid/CMakeLists.txt
412 -@@ -1,5 +1,5 @@
413 - file(GLOB ObjectInFluid_SRC *.cpp)
414 - add_library(ObjectInFluid SHARED ${ObjectInFluid_SRC})
415 --install(TARGETS ObjectInFluid LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
416 -+install(TARGETS ObjectInFluid LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
417 - add_dependencies(ObjectInFluid EspressoConfig)
418 - set_target_properties(ObjectInFluid PROPERTIES MACOSX_RPATH TRUE)
419 -diff --git a/src/core/observables/CMakeLists.txt b/src/core/observables/CMakeLists.txt
420 -index 9813d86..51ab79d 100644
421 ---- a/src/core/observables/CMakeLists.txt
422 -+++ b/src/core/observables/CMakeLists.txt
423 -@@ -1,4 +1,5 @@
424 - file(GLOB Observables_SRC *.?pp)
425 - add_library(Observables SHARED ${Observables_SRC})
426 -+install(TARGETS Observables LIBRARY DESTINATION ${LIBDIR})
427 - add_dependencies(Observables EspressoConfig)
428 - set_target_properties(Observables PROPERTIES MACOSX_RPATH TRUE)
429 -diff --git a/src/core/scafacos/CMakeLists.txt b/src/core/scafacos/CMakeLists.txt
430 -index 1479683..3028ca0 100644
431 ---- a/src/core/scafacos/CMakeLists.txt
432 -+++ b/src/core/scafacos/CMakeLists.txt
433 -@@ -2,7 +2,7 @@ include_directories(${SCAFACOS_INCLUDE_DIRS})
434 -
435 - file(GLOB Scafacos_SRC *.cpp)
436 - add_library(Scafacos SHARED ${Scafacos_SRC})
437 --install(TARGETS Scafacos DESTINATION ${PYTHON_INSTDIR})
438 -+install(TARGETS Scafacos DESTINATION ${PYTHON_INSTDIR}/espressomd)
439 - add_dependencies(Scafacos EspressoConfig)
440 -
441 - target_link_libraries(Scafacos ${SCAFACOS_LDFLAGS})
442 -diff --git a/src/core/shapes/CMakeLists.txt b/src/core/shapes/CMakeLists.txt
443 -index 0e5ecaa..5be3a9d 100644
444 ---- a/src/core/shapes/CMakeLists.txt
445 -+++ b/src/core/shapes/CMakeLists.txt
446 -@@ -1,4 +1,5 @@
447 - file(GLOB Shapes_SRC *.cpp)
448 - add_library(Shapes SHARED ${Shapes_SRC})
449 -+install(TARGETS Shapes LIBRARY DESTINATION ${LIBDIR})
450 - add_dependencies(Shapes EspressoConfig)
451 - set_target_properties(Shapes PROPERTIES MACOSX_RPATH TRUE)
452 -diff --git a/src/core/utils/CMakeLists.txt b/src/core/utils/CMakeLists.txt
453 -index ec0f6f7..4cd8ada 100644
454 ---- a/src/core/utils/CMakeLists.txt
455 -+++ b/src/core/utils/CMakeLists.txt
456 -@@ -1,3 +1,4 @@
457 - file(GLOB EspressoUtils_SRC *.cpp)
458 - add_library(EspressoUtils SHARED ${EspressoUtils_SRC})
459 -+install(TARGETS EspressoUtils LIBRARY DESTINATION ${LIBDIR})
460 - set_target_properties(EspressoUtils PROPERTIES MACOSX_RPATH TRUE)
461 -diff --git a/src/script_interface/CMakeLists.txt b/src/script_interface/CMakeLists.txt
462 -index 8aff034..59c1c9d 100644
463 ---- a/src/script_interface/CMakeLists.txt
464 -+++ b/src/script_interface/CMakeLists.txt
465 -@@ -28,6 +28,7 @@ if(H5MD)
466 - )
467 - endif(H5MD)
468 - add_library(EspressoScriptInterface SHARED ${EspressoScriptInterface_SRC})
469 -+install(TARGETS EspressoScriptInterface LIBRARY DESTINATION ${LIBDIR})
470 - add_dependencies(EspressoScriptInterface EspressoConfig EspressoConfig)
471 - set_target_properties(EspressoScriptInterface PROPERTIES MACOSX_RPATH TRUE)
472 - target_link_libraries(EspressoScriptInterface EspressoCore)
473 ---
474 -2.10.2
475 -
476
477 diff --git a/sci-physics/espresso/files/2277.patch b/sci-physics/espresso/files/2277.patch
478 deleted file mode 100644
479 index 608bd287612..00000000000
480 --- a/sci-physics/espresso/files/2277.patch
481 +++ /dev/null
482 @@ -1,19 +0,0 @@
483 -From 46110a514ce2420a350cca8b9af28e0c4eb51861 Mon Sep 17 00:00:00 2001
484 -From: Christoph Junghans <junghans@×××××.org>
485 -Date: Fri, 21 Sep 2018 06:57:16 -0600
486 -Subject: [PATCH] cmake: install libH5mdCore
487 -
488 ----
489 - src/core/io/writer/CMakeLists.txt | 1 +
490 - 1 file changed, 1 insertion(+)
491 -
492 -diff --git a/src/core/io/writer/CMakeLists.txt b/src/core/io/writer/CMakeLists.txt
493 -index e677ba273a..42b96c96af 100644
494 ---- a/src/core/io/writer/h5md/CMakeLists.txt
495 -+++ b/src/core/io/writer/h5md/CMakeLists.txt
496 -@@ -4,4 +4,5 @@
497 - "${CMAKE_SOURCE_DIR}/libs/h5xx"
498 - )
499 - add_dependencies(H5mdCore EspressoConfig)
500 -+install(TARGETS H5mdCore LIBRARY DESTINATION ${LIBDIR})
501 -