* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/
@ 2017-03-06 8:16 Christoph Junghans
0 siblings, 0 replies; 5+ messages in thread
From: Christoph Junghans @ 2017-03-06 8:16 UTC (permalink / raw
To: gentoo-commits
commit: b2f23f09f4a9199ea5605bf0c3e786f69c8e6b2e
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 6 08:12:16 2017 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Mon Mar 6 08:16:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f23f09
sci-physics/espresso: version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-physics/espresso/Manifest | 1 +
.../espresso/espresso-4.0_pre20170228.ebuild | 118 +++++++++++++
sci-physics/espresso/files/1056.patch | 190 +++++++++++++++++++++
3 files changed, 309 insertions(+)
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 73ae97cdf72..0b243949f69 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,2 +1,3 @@
DIST espresso-3.3.0.tar.gz 18952622 SHA256 64ea2684e4fc0d31c11969e49ec74c25138b4f74686f67b93c7e1103833ff08f SHA512 90edbbdc8d7f7247b5179fce0fad796a9488f82a1754519918c6588c932050675397d36e0167aae770db9803b6c22f7d14d23c04cf307d10802afd3d5d5edc20 WHIRLPOOL 3e9547f2da6676edf3de415fa848301f2959c3dfeef1c3f461b4e1eb202224ead7635748b47d42edb9f661dc5d672f38168e15ab6c55a9c9d7f102ae11f8574e
DIST espresso-3.3.1.tar.gz 18986557 SHA256 8576fc1fe59e04dec4fa0d354b7ec52365622860099624f36bddbb2b472c0c70 SHA512 3fc6e681e625f2cf98ac0aa3b1c16fbe17b9f9aa8f79f2e89926501cbb68621d171d6c6a22f42f9f60298ee31520ca712ace57d57738d2cf76f7ae2f7c0436b1 WHIRLPOOL 7075cbb8fba944cda8290a3f27650fcdd2b466495c6d4697ae3074c60ded86e08ea4ea0d9336c8ca859f7b3303cd496dba2972c9c8205a7b3cafbe36fcfc8a40
+DIST espresso-4.0_pre20170228.tar.gz 23621395 SHA256 01e6770949db7bfad9dba3776a644dd0c0758e3781edf23363d7d2671ee14b01 SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2 WHIRLPOOL 02ef0d937726a1abe3f8df4f19ed62008b69494304cf4d569d74936d834bcb20e4a0bd5d6edff009c74c8e16f6b14f9c794ff209c8e39e6d8eed785e5356d6d6
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
new file mode 100644
index 00000000000..252f74e2e5c
--- /dev/null
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils python-single-r1 savedconfig
+
+DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
+HOMEPAGE="http://espressomd.org"
+
+if [[ ${PV} = 9999 ]]; then
+ EGIT_REPO_URI="git://github.com/espressomd/espresso.git https://github.com/espressomd/espresso.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ KEYWORDS=""
+else
+ inherit vcs-snapshot
+ COMMIT="8a021f5e8b1d508f356f4419d360bd9dfb7fec2c"
+ SRC_URI="https://github.com/${PN}md/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda doc examples +fftw +hdf5 test"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >dev-python/cython-0.22[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+ fftw? ( sci-libs/fftw:3.0 )
+ dev-libs/boost:=[mpi]
+ hdf5? ( sci-libs/hdf5:=[cxx] )"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen[dot]
+ dev-texlive/texlive-latexextra
+ virtual/latex-base )"
+
+DOCS=( AUTHORS NEWS README ChangeLog )
+
+PATCHES=( "${FILESDIR}"/1056.patch )
+
+src_prepare() {
+ use cuda && cuda_src_prepare
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DWITH_CUDA=$(usex cuda)
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DWITH_TESTS=$(usex test)
+ -DWITH_SCAFACOS=ON
+ -DINSTALL_PYPRESSO=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
+ -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
+ -DCMAKE_SKIP_RPATH=YES
+ -DLIBDIR=$(get_libdir)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && cmake-utils_src_make doxygen
+ [[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
+}
+
+src_install() {
+ local i docdir="${S}"
+
+ cmake-utils_src_install
+
+ insinto /usr/share/${PN}/
+ doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
+
+ save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
+
+ if use doc; then
+ [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
+ newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
+ newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
+ for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
+ newdoc "${i}" "tutorial_${i##*/}"
+ done
+ dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
+ fi
+
+ if use examples; then
+ insinto "/usr/share/${PN}/examples/"
+ doins -r samples/python/.
+ fi
+}
+
+pkg_postinst() {
+ echo
+ elog "Please read and cite:"
+ elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
+ elog "http://dx.doi.org/10.1016/j.cpc.2005.10.005"
+ echo
+ elog "If you need more features, change"
+ elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
+ elog "and reemerge with USE=savedconfig"
+ echo
+ elog "For a full feature list see:"
+ elog "/usr/share/${PN}/myconfig-sample.hpp"
+ echo
+}
diff --git a/sci-physics/espresso/files/1056.patch b/sci-physics/espresso/files/1056.patch
new file mode 100644
index 00000000000..18a478e446b
--- /dev/null
+++ b/sci-physics/espresso/files/1056.patch
@@ -0,0 +1,190 @@
+From d075cbaa80ce0b484c8422be27c5b5680f6abee4 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Fri, 3 Mar 2017 16:05:45 -0700
+Subject: [PATCH] cmake: install all shared libs in back in libdir
+
+some libraries weren't installed and the python module path
+isn't in the LD_LIBRARY_PATH and hence partly revert
+80ad49e954f4a6590707fd86e4fd586682ad626d
+---
+ CMakeLists.txt | 4 ++++
+ src/core/CMakeLists.txt | 4 ++--
+ src/core/actor/CMakeLists.txt | 4 ++--
+ src/core/constraints/CMakeLists.txt | 1 +
+ src/core/correlators/CMakeLists.txt | 1 +
+ src/core/immersed_boundary/CMakeLists.txt | 4 ++--
+ src/core/object-in-fluid/CMakeLists.txt | 2 +-
+ src/core/observables/CMakeLists.txt | 1 +
+ src/core/scafacos/CMakeLists.txt | 2 +-
+ src/core/shapes/CMakeLists.txt | 1 +
+ src/core/utils/CMakeLists.txt | 1 +
+ src/script_interface/CMakeLists.txt | 1 +
+ 12 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cf49c40..7a8bc15 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -238,6 +238,10 @@ if (NOT DEFINED DATA)
+ set(DATA "share/espresso")
+ endif(NOT DEFINED DATA)
+
++if (NOT DEFINED LIBDIR)
++ set(LIBDIR "lib")
++endif(NOT DEFINED LIBDIR)
++
+ if (NOT DEFINED BINDIR)
+ set(BINDIR "bin")
+ endif(NOT DEFINED BINDIR)
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 9982a54..13bb052 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -23,7 +23,7 @@ add_custom_target(EspressoConfig DEPENDS config-features.hpp config-features.cpp
+ add_dependencies(EspressoConfig myconfig)
+
+ add_library(EspressoCore SHARED ${EspressoCore_SRC} config-features.cpp config-version.cpp)
+-install(TARGETS EspressoCore LIBRARY DESTINATION ${PYTHON_INSTDIR})
++install(TARGETS EspressoCore LIBRARY DESTINATION ${LIBDIR})
+ add_dependencies(EspressoCore EspressoConfig)
+
+ target_link_libraries(EspressoCore ${LIBRARIES} Actor ObjectInFluid ImmersedBoundary Shapes Constraints EspressoUtils Correlators Observables)
+@@ -43,7 +43,7 @@ if(CUDA)
+ cuda_include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ cuda_add_library(EspressoCuda SHARED ${EspressoCuda_SRC})
+- install(TARGETS EspressoCuda DESTINATION ${PYTHON_INSTDIR})
++ install(TARGETS EspressoCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
+ add_dependencies(EspressoCuda EspressoConfig)
+
+ set_target_properties(EspressoCuda PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/core/actor/CMakeLists.txt b/src/core/actor/CMakeLists.txt
+index 0421243..1b5eafe 100644
+--- a/src/core/actor/CMakeLists.txt
++++ b/src/core/actor/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ file(GLOB Actor_SRC *.cpp)
+
+ add_library(Actor SHARED ${Actor_SRC})
+-install(TARGETS Actor LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
++install(TARGETS Actor LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
+ add_dependencies(Actor EspressoConfig)
+
+ set_target_properties(Actor PROPERTIES MACOSX_RPATH TRUE)
+@@ -9,7 +9,7 @@ set_target_properties(Actor PROPERTIES MACOSX_RPATH TRUE)
+ if(CUDA)
+ file(GLOB ActorCuda_SRC *.cu)
+ cuda_add_library(ActorCuda SHARED ${ActorCuda_SRC})
+- install(TARGETS ActorCuda DESTINATION ${PYTHON_INSTDIR})
++ install(TARGETS ActorCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
+ add_dependencies(ActorCuda EspressoConfig)
+
+ add_dependencies(Actor ActorCuda)
+diff --git a/src/core/constraints/CMakeLists.txt b/src/core/constraints/CMakeLists.txt
+index 0f5c043..d07ad77 100644
+--- a/src/core/constraints/CMakeLists.txt
++++ b/src/core/constraints/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ file(GLOB Constraints_SRC Constraint.cpp)
+ add_library(Constraints SHARED ${Constraints_SRC})
++install(TARGETS Constraints LIBRARY DESTINATION ${LIBDIR})
+ add_dependencies(Constraints EspressoConfig)
+ set_target_properties(Constraints PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/core/correlators/CMakeLists.txt b/src/core/correlators/CMakeLists.txt
+index c5ff02f..fcc3611 100644
+--- a/src/core/correlators/CMakeLists.txt
++++ b/src/core/correlators/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ file(GLOB Correlators_SRC *.?pp)
+ add_library(Correlators SHARED ${Correlators_SRC})
++install(TARGETS Correlators LIBRARY DESTINATION ${LIBDIR})
+ add_dependencies(Correlators EspressoConfig)
+ set_target_properties(Correlators PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/core/immersed_boundary/CMakeLists.txt b/src/core/immersed_boundary/CMakeLists.txt
+index ec7fb85..8e7285f 100644
+--- a/src/core/immersed_boundary/CMakeLists.txt
++++ b/src/core/immersed_boundary/CMakeLists.txt
+@@ -1,13 +1,13 @@
+ file(GLOB ImmersedBoundary_SRC *.cpp)
+ add_library(ImmersedBoundary SHARED ${ImmersedBoundary_SRC})
+ set_target_properties(ImmersedBoundary PROPERTIES MACOSX_RPATH TRUE)
+-install(TARGETS ImmersedBoundary LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
++install(TARGETS ImmersedBoundary LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
+ add_dependencies(ImmersedBoundary EspressoConfig)
+
+ if(CUDA)
+ file(GLOB ImmersedBoundaryCuda_SRC *.cu)
+ cuda_add_library(ImmersedBoundaryCuda SHARED ${ImmersedBoundaryCuda_SRC})
+- install(TARGETS ImmersedBoundaryCuda DESTINATION ${PYTHON_INSTDIR})
++ install(TARGETS ImmersedBoundaryCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
+ add_dependencies(ImmersedBoundaryCuda EspressoConfig)
+
+ set_target_properties(ImmersedBoundaryCuda PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/core/object-in-fluid/CMakeLists.txt b/src/core/object-in-fluid/CMakeLists.txt
+index 7154486..c25228a 100644
+--- a/src/core/object-in-fluid/CMakeLists.txt
++++ b/src/core/object-in-fluid/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ file(GLOB ObjectInFluid_SRC *.cpp)
+ add_library(ObjectInFluid SHARED ${ObjectInFluid_SRC})
+-install(TARGETS ObjectInFluid LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
++install(TARGETS ObjectInFluid LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
+ add_dependencies(ObjectInFluid EspressoConfig)
+ set_target_properties(ObjectInFluid PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/core/observables/CMakeLists.txt b/src/core/observables/CMakeLists.txt
+index 9813d86..51ab79d 100644
+--- a/src/core/observables/CMakeLists.txt
++++ b/src/core/observables/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ file(GLOB Observables_SRC *.?pp)
+ add_library(Observables SHARED ${Observables_SRC})
++install(TARGETS Observables LIBRARY DESTINATION ${LIBDIR})
+ add_dependencies(Observables EspressoConfig)
+ set_target_properties(Observables PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/core/scafacos/CMakeLists.txt b/src/core/scafacos/CMakeLists.txt
+index 1479683..3028ca0 100644
+--- a/src/core/scafacos/CMakeLists.txt
++++ b/src/core/scafacos/CMakeLists.txt
+@@ -2,7 +2,7 @@ include_directories(${SCAFACOS_INCLUDE_DIRS})
+
+ file(GLOB Scafacos_SRC *.cpp)
+ add_library(Scafacos SHARED ${Scafacos_SRC})
+-install(TARGETS Scafacos DESTINATION ${PYTHON_INSTDIR})
++install(TARGETS Scafacos DESTINATION ${PYTHON_INSTDIR}/espressomd)
+ add_dependencies(Scafacos EspressoConfig)
+
+ target_link_libraries(Scafacos ${SCAFACOS_LDFLAGS})
+diff --git a/src/core/shapes/CMakeLists.txt b/src/core/shapes/CMakeLists.txt
+index 0e5ecaa..5be3a9d 100644
+--- a/src/core/shapes/CMakeLists.txt
++++ b/src/core/shapes/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ file(GLOB Shapes_SRC *.cpp)
+ add_library(Shapes SHARED ${Shapes_SRC})
++install(TARGETS Shapes LIBRARY DESTINATION ${LIBDIR})
+ add_dependencies(Shapes EspressoConfig)
+ set_target_properties(Shapes PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/core/utils/CMakeLists.txt b/src/core/utils/CMakeLists.txt
+index ec0f6f7..4cd8ada 100644
+--- a/src/core/utils/CMakeLists.txt
++++ b/src/core/utils/CMakeLists.txt
+@@ -1,3 +1,4 @@
+ file(GLOB EspressoUtils_SRC *.cpp)
+ add_library(EspressoUtils SHARED ${EspressoUtils_SRC})
++install(TARGETS EspressoUtils LIBRARY DESTINATION ${LIBDIR})
+ set_target_properties(EspressoUtils PROPERTIES MACOSX_RPATH TRUE)
+diff --git a/src/script_interface/CMakeLists.txt b/src/script_interface/CMakeLists.txt
+index 8aff034..59c1c9d 100644
+--- a/src/script_interface/CMakeLists.txt
++++ b/src/script_interface/CMakeLists.txt
+@@ -28,6 +28,7 @@ if(H5MD)
+ )
+ endif(H5MD)
+ add_library(EspressoScriptInterface SHARED ${EspressoScriptInterface_SRC})
++install(TARGETS EspressoScriptInterface LIBRARY DESTINATION ${LIBDIR})
+ add_dependencies(EspressoScriptInterface EspressoConfig EspressoConfig)
+ set_target_properties(EspressoScriptInterface PROPERTIES MACOSX_RPATH TRUE)
+ target_link_libraries(EspressoScriptInterface EspressoCore)
+--
+2.10.2
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/
@ 2018-09-23 12:49 Christoph Junghans
0 siblings, 0 replies; 5+ messages in thread
From: Christoph Junghans @ 2018-09-23 12:49 UTC (permalink / raw
To: gentoo-commits
commit: 8ec855c644f7c1488cf89696d8afab04ff9da0e9
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 23 12:48:41 2018 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Sun Sep 23 12:49:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec855c6
sci-physics/espresso: fix install
Package-Manager: Portage-2.3.49, Repoman-2.3.10
...espresso-4.0.0.ebuild => espresso-4.0.0-r1.ebuild} | 2 ++
sci-physics/espresso/files/2277.patch | 19 +++++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/sci-physics/espresso/espresso-4.0.0.ebuild b/sci-physics/espresso/espresso-4.0.0-r1.ebuild
similarity index 98%
rename from sci-physics/espresso/espresso-4.0.0.ebuild
rename to sci-physics/espresso/espresso-4.0.0-r1.ebuild
index 953909c3dd7..54eb213cc07 100644
--- a/sci-physics/espresso/espresso-4.0.0.ebuild
+++ b/sci-physics/espresso/espresso-4.0.0-r1.ebuild
@@ -45,6 +45,8 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS NEWS README ChangeLog )
+PATCHES=( "${FILESDIR}/2277.patch" )
+
src_prepare() {
use cuda && cuda_src_prepare
cmake-utils_src_prepare
diff --git a/sci-physics/espresso/files/2277.patch b/sci-physics/espresso/files/2277.patch
new file mode 100644
index 00000000000..608bd287612
--- /dev/null
+++ b/sci-physics/espresso/files/2277.patch
@@ -0,0 +1,19 @@
+From 46110a514ce2420a350cca8b9af28e0c4eb51861 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Fri, 21 Sep 2018 06:57:16 -0600
+Subject: [PATCH] cmake: install libH5mdCore
+
+---
+ src/core/io/writer/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/core/io/writer/CMakeLists.txt b/src/core/io/writer/CMakeLists.txt
+index e677ba273a..42b96c96af 100644
+--- a/src/core/io/writer/h5md/CMakeLists.txt
++++ b/src/core/io/writer/h5md/CMakeLists.txt
+@@ -4,4 +4,5 @@
+ "${CMAKE_SOURCE_DIR}/libs/h5xx"
+ )
+ add_dependencies(H5mdCore EspressoConfig)
++install(TARGETS H5mdCore LIBRARY DESTINATION ${LIBDIR})
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/
@ 2021-01-01 1:56 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2021-01-01 1:56 UTC (permalink / raw
To: gentoo-commits
commit: e4c36e7e9a47e830fd712d37197a74cb5c4f29b0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 01:52:27 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 01:55:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c36e7e
sci-physics/espresso: Remove old (py3.6)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-physics/espresso/Manifest | 2 -
sci-physics/espresso/espresso-4.0.0-r2.ebuild | 118 -------------
.../espresso/espresso-4.0_pre20170228.ebuild | 120 -------------
sci-physics/espresso/files/1056.patch | 190 ---------------------
sci-physics/espresso/files/2277.patch | 19 ---
5 files changed, 449 deletions(-)
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index a4941b7d188..366b7e76700 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,3 +1 @@
-DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
-DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2
DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
diff --git a/sci-physics/espresso/espresso-4.0.0-r2.ebuild b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
deleted file mode 100644
index 0afbf393e9a..00000000000
--- a/sci-physics/espresso/espresso-4.0.0-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="http://espressomd.org"
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
- EGIT_BRANCH="python"
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda doc examples +fftw +hdf5 test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- ')
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
- fftw? ( sci-libs/fftw:3.0 )
- dev-libs/boost:=[mpi]
- hdf5? ( sci-libs/hdf5:=[mpi] )"
-
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen[dot]
- dev-texlive/texlive-latexextra
- virtual/latex-base )"
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/2277.patch" )
-
-src_prepare() {
- use cuda && cuda_src_prepare
- cmake-utils_src_prepare
-}
-
-src_configure() {
- mycmakeargs=(
- -DWITH_CUDA=$(usex cuda)
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DWITH_TESTS=$(usex test)
- -DINSTALL_PYPRESSO=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
- -DWITH_HDF5=$(usex hdf5)
- -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
- -DCMAKE_SKIP_RPATH=YES
- -DLIBDIR=$(get_libdir)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_make doxygen
- [[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
-}
-
-src_install() {
- local i docdir="${S}"
-
- cmake-utils_src_install
-
- insinto /usr/share/${PN}/
- doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
-
- save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
-
- if use doc; then
- [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
- newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
- newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
- for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
- newdoc "${i}" "tutorial_${i##*/}"
- done
- dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
- fi
-
- if use examples; then
- insinto "/usr/share/${PN}/examples/python"
- doins -r samples/${i}/.
- fi
-}
-
-pkg_postinst() {
- echo
- elog "Please read and cite:"
- elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
- elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
- echo
- elog "If you need more features, change"
- elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
- elog "and reemerge with USE=savedconfig"
- echo
- elog "For a full feature list see:"
- elog "/usr/share/${PN}/myconfig-sample.hpp"
- echo
-}
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
deleted file mode 100644
index e7c540b1629..00000000000
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="http://espressomd.org"
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
- EGIT_BRANCH="master"
- inherit git-r3
- KEYWORDS=""
-else
- inherit vcs-snapshot
- COMMIT="8a021f5e8b1d508f356f4419d360bd9dfb7fec2c"
- SRC_URI="https://github.com/${PN}md/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda doc examples +fftw +hdf5 test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >dev-python/cython-0.22[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- ')
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
- fftw? ( sci-libs/fftw:3.0 )
- dev-libs/boost:=[mpi]
- hdf5? ( sci-libs/hdf5:=[cxx] )"
-
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen[dot]
- dev-texlive/texlive-latexextra
- virtual/latex-base )"
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-PATCHES=( "${FILESDIR}"/1056.patch )
-
-src_prepare() {
- use cuda && cuda_src_prepare
- cmake-utils_src_prepare
-}
-
-src_configure() {
- mycmakeargs=(
- -DWITH_CUDA=$(usex cuda)
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DWITH_TESTS=$(usex test)
- -DWITH_SCAFACOS=ON
- -DINSTALL_PYPRESSO=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
- -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
- -DCMAKE_SKIP_RPATH=YES
- -DLIBDIR=$(get_libdir)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_make doxygen
- [[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
-}
-
-src_install() {
- local i docdir="${S}"
-
- cmake-utils_src_install
-
- insinto /usr/share/${PN}/
- doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
-
- save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
-
- if use doc; then
- [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
- newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
- newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
- for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
- newdoc "${i}" "tutorial_${i##*/}"
- done
- dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
- fi
-
- if use examples; then
- insinto "/usr/share/${PN}/examples/"
- doins -r samples/python/.
- fi
-}
-
-pkg_postinst() {
- echo
- elog "Please read and cite:"
- elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
- elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
- echo
- elog "If you need more features, change"
- elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
- elog "and reemerge with USE=savedconfig"
- echo
- elog "For a full feature list see:"
- elog "/usr/share/${PN}/myconfig-sample.hpp"
- echo
-}
diff --git a/sci-physics/espresso/files/1056.patch b/sci-physics/espresso/files/1056.patch
deleted file mode 100644
index 18a478e446b..00000000000
--- a/sci-physics/espresso/files/1056.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From d075cbaa80ce0b484c8422be27c5b5680f6abee4 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Fri, 3 Mar 2017 16:05:45 -0700
-Subject: [PATCH] cmake: install all shared libs in back in libdir
-
-some libraries weren't installed and the python module path
-isn't in the LD_LIBRARY_PATH and hence partly revert
-80ad49e954f4a6590707fd86e4fd586682ad626d
----
- CMakeLists.txt | 4 ++++
- src/core/CMakeLists.txt | 4 ++--
- src/core/actor/CMakeLists.txt | 4 ++--
- src/core/constraints/CMakeLists.txt | 1 +
- src/core/correlators/CMakeLists.txt | 1 +
- src/core/immersed_boundary/CMakeLists.txt | 4 ++--
- src/core/object-in-fluid/CMakeLists.txt | 2 +-
- src/core/observables/CMakeLists.txt | 1 +
- src/core/scafacos/CMakeLists.txt | 2 +-
- src/core/shapes/CMakeLists.txt | 1 +
- src/core/utils/CMakeLists.txt | 1 +
- src/script_interface/CMakeLists.txt | 1 +
- 12 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cf49c40..7a8bc15 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -238,6 +238,10 @@ if (NOT DEFINED DATA)
- set(DATA "share/espresso")
- endif(NOT DEFINED DATA)
-
-+if (NOT DEFINED LIBDIR)
-+ set(LIBDIR "lib")
-+endif(NOT DEFINED LIBDIR)
-+
- if (NOT DEFINED BINDIR)
- set(BINDIR "bin")
- endif(NOT DEFINED BINDIR)
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 9982a54..13bb052 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,7 +23,7 @@ add_custom_target(EspressoConfig DEPENDS config-features.hpp config-features.cpp
- add_dependencies(EspressoConfig myconfig)
-
- add_library(EspressoCore SHARED ${EspressoCore_SRC} config-features.cpp config-version.cpp)
--install(TARGETS EspressoCore LIBRARY DESTINATION ${PYTHON_INSTDIR})
-+install(TARGETS EspressoCore LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(EspressoCore EspressoConfig)
-
- target_link_libraries(EspressoCore ${LIBRARIES} Actor ObjectInFluid ImmersedBoundary Shapes Constraints EspressoUtils Correlators Observables)
-@@ -43,7 +43,7 @@ if(CUDA)
- cuda_include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
- cuda_add_library(EspressoCuda SHARED ${EspressoCuda_SRC})
-- install(TARGETS EspressoCuda DESTINATION ${PYTHON_INSTDIR})
-+ install(TARGETS EspressoCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
- add_dependencies(EspressoCuda EspressoConfig)
-
- set_target_properties(EspressoCuda PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/actor/CMakeLists.txt b/src/core/actor/CMakeLists.txt
-index 0421243..1b5eafe 100644
---- a/src/core/actor/CMakeLists.txt
-+++ b/src/core/actor/CMakeLists.txt
-@@ -1,7 +1,7 @@
- file(GLOB Actor_SRC *.cpp)
-
- add_library(Actor SHARED ${Actor_SRC})
--install(TARGETS Actor LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
-+install(TARGETS Actor LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
- add_dependencies(Actor EspressoConfig)
-
- set_target_properties(Actor PROPERTIES MACOSX_RPATH TRUE)
-@@ -9,7 +9,7 @@ set_target_properties(Actor PROPERTIES MACOSX_RPATH TRUE)
- if(CUDA)
- file(GLOB ActorCuda_SRC *.cu)
- cuda_add_library(ActorCuda SHARED ${ActorCuda_SRC})
-- install(TARGETS ActorCuda DESTINATION ${PYTHON_INSTDIR})
-+ install(TARGETS ActorCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
- add_dependencies(ActorCuda EspressoConfig)
-
- add_dependencies(Actor ActorCuda)
-diff --git a/src/core/constraints/CMakeLists.txt b/src/core/constraints/CMakeLists.txt
-index 0f5c043..d07ad77 100644
---- a/src/core/constraints/CMakeLists.txt
-+++ b/src/core/constraints/CMakeLists.txt
-@@ -1,4 +1,5 @@
- file(GLOB Constraints_SRC Constraint.cpp)
- add_library(Constraints SHARED ${Constraints_SRC})
-+install(TARGETS Constraints LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(Constraints EspressoConfig)
- set_target_properties(Constraints PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/correlators/CMakeLists.txt b/src/core/correlators/CMakeLists.txt
-index c5ff02f..fcc3611 100644
---- a/src/core/correlators/CMakeLists.txt
-+++ b/src/core/correlators/CMakeLists.txt
-@@ -1,4 +1,5 @@
- file(GLOB Correlators_SRC *.?pp)
- add_library(Correlators SHARED ${Correlators_SRC})
-+install(TARGETS Correlators LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(Correlators EspressoConfig)
- set_target_properties(Correlators PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/immersed_boundary/CMakeLists.txt b/src/core/immersed_boundary/CMakeLists.txt
-index ec7fb85..8e7285f 100644
---- a/src/core/immersed_boundary/CMakeLists.txt
-+++ b/src/core/immersed_boundary/CMakeLists.txt
-@@ -1,13 +1,13 @@
- file(GLOB ImmersedBoundary_SRC *.cpp)
- add_library(ImmersedBoundary SHARED ${ImmersedBoundary_SRC})
- set_target_properties(ImmersedBoundary PROPERTIES MACOSX_RPATH TRUE)
--install(TARGETS ImmersedBoundary LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
-+install(TARGETS ImmersedBoundary LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
- add_dependencies(ImmersedBoundary EspressoConfig)
-
- if(CUDA)
- file(GLOB ImmersedBoundaryCuda_SRC *.cu)
- cuda_add_library(ImmersedBoundaryCuda SHARED ${ImmersedBoundaryCuda_SRC})
-- install(TARGETS ImmersedBoundaryCuda DESTINATION ${PYTHON_INSTDIR})
-+ install(TARGETS ImmersedBoundaryCuda DESTINATION ${PYTHON_INSTDIR}/espressomd)
- add_dependencies(ImmersedBoundaryCuda EspressoConfig)
-
- set_target_properties(ImmersedBoundaryCuda PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/object-in-fluid/CMakeLists.txt b/src/core/object-in-fluid/CMakeLists.txt
-index 7154486..c25228a 100644
---- a/src/core/object-in-fluid/CMakeLists.txt
-+++ b/src/core/object-in-fluid/CMakeLists.txt
-@@ -1,5 +1,5 @@
- file(GLOB ObjectInFluid_SRC *.cpp)
- add_library(ObjectInFluid SHARED ${ObjectInFluid_SRC})
--install(TARGETS ObjectInFluid LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION ${PYTHON_INSTDIR})
-+install(TARGETS ObjectInFluid LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR})
- add_dependencies(ObjectInFluid EspressoConfig)
- set_target_properties(ObjectInFluid PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/observables/CMakeLists.txt b/src/core/observables/CMakeLists.txt
-index 9813d86..51ab79d 100644
---- a/src/core/observables/CMakeLists.txt
-+++ b/src/core/observables/CMakeLists.txt
-@@ -1,4 +1,5 @@
- file(GLOB Observables_SRC *.?pp)
- add_library(Observables SHARED ${Observables_SRC})
-+install(TARGETS Observables LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(Observables EspressoConfig)
- set_target_properties(Observables PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/scafacos/CMakeLists.txt b/src/core/scafacos/CMakeLists.txt
-index 1479683..3028ca0 100644
---- a/src/core/scafacos/CMakeLists.txt
-+++ b/src/core/scafacos/CMakeLists.txt
-@@ -2,7 +2,7 @@ include_directories(${SCAFACOS_INCLUDE_DIRS})
-
- file(GLOB Scafacos_SRC *.cpp)
- add_library(Scafacos SHARED ${Scafacos_SRC})
--install(TARGETS Scafacos DESTINATION ${PYTHON_INSTDIR})
-+install(TARGETS Scafacos DESTINATION ${PYTHON_INSTDIR}/espressomd)
- add_dependencies(Scafacos EspressoConfig)
-
- target_link_libraries(Scafacos ${SCAFACOS_LDFLAGS})
-diff --git a/src/core/shapes/CMakeLists.txt b/src/core/shapes/CMakeLists.txt
-index 0e5ecaa..5be3a9d 100644
---- a/src/core/shapes/CMakeLists.txt
-+++ b/src/core/shapes/CMakeLists.txt
-@@ -1,4 +1,5 @@
- file(GLOB Shapes_SRC *.cpp)
- add_library(Shapes SHARED ${Shapes_SRC})
-+install(TARGETS Shapes LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(Shapes EspressoConfig)
- set_target_properties(Shapes PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/core/utils/CMakeLists.txt b/src/core/utils/CMakeLists.txt
-index ec0f6f7..4cd8ada 100644
---- a/src/core/utils/CMakeLists.txt
-+++ b/src/core/utils/CMakeLists.txt
-@@ -1,3 +1,4 @@
- file(GLOB EspressoUtils_SRC *.cpp)
- add_library(EspressoUtils SHARED ${EspressoUtils_SRC})
-+install(TARGETS EspressoUtils LIBRARY DESTINATION ${LIBDIR})
- set_target_properties(EspressoUtils PROPERTIES MACOSX_RPATH TRUE)
-diff --git a/src/script_interface/CMakeLists.txt b/src/script_interface/CMakeLists.txt
-index 8aff034..59c1c9d 100644
---- a/src/script_interface/CMakeLists.txt
-+++ b/src/script_interface/CMakeLists.txt
-@@ -28,6 +28,7 @@ if(H5MD)
- )
- endif(H5MD)
- add_library(EspressoScriptInterface SHARED ${EspressoScriptInterface_SRC})
-+install(TARGETS EspressoScriptInterface LIBRARY DESTINATION ${LIBDIR})
- add_dependencies(EspressoScriptInterface EspressoConfig EspressoConfig)
- set_target_properties(EspressoScriptInterface PROPERTIES MACOSX_RPATH TRUE)
- target_link_libraries(EspressoScriptInterface EspressoCore)
---
-2.10.2
-
diff --git a/sci-physics/espresso/files/2277.patch b/sci-physics/espresso/files/2277.patch
deleted file mode 100644
index 608bd287612..00000000000
--- a/sci-physics/espresso/files/2277.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 46110a514ce2420a350cca8b9af28e0c4eb51861 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@votca.org>
-Date: Fri, 21 Sep 2018 06:57:16 -0600
-Subject: [PATCH] cmake: install libH5mdCore
-
----
- src/core/io/writer/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/core/io/writer/CMakeLists.txt b/src/core/io/writer/CMakeLists.txt
-index e677ba273a..42b96c96af 100644
---- a/src/core/io/writer/h5md/CMakeLists.txt
-+++ b/src/core/io/writer/h5md/CMakeLists.txt
-@@ -4,4 +4,5 @@
- "${CMAKE_SOURCE_DIR}/libs/h5xx"
- )
- add_dependencies(H5mdCore EspressoConfig)
-+install(TARGETS H5mdCore LIBRARY DESTINATION ${LIBDIR})
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/
@ 2021-08-30 21:23 Jakov Smolić
0 siblings, 0 replies; 5+ messages in thread
From: Jakov Smolić @ 2021-08-30 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 4709d8e4ea9ec149753b98cabf365b3520070d65
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 21:18:46 2021 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Aug 30 21:22:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4709d8e4
sci-physics/espresso: Fix build with gcc-11
* Call python_optimize for non byte-compiled modules
* Builds with >=boost-1.75 versions
Closes: https://bugs.gentoo.org/737534
Closes: https://bugs.gentoo.org/793011
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
sci-physics/espresso/espresso-4.1.3.ebuild | 6 ++++
.../espresso/files/espresso-4.1.3-gcc-11.patch | 37 ++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index 19e9be04e85..4c60379b475 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -49,6 +49,10 @@ DOCS=( AUTHORS NEWS README ChangeLog )
S="${WORKDIR}/${PN}"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc-11.patch
+)
+
src_prepare() {
use cuda && cuda_src_prepare
cmake_src_prepare
@@ -79,6 +83,8 @@ src_install() {
cmake_src_install
+ python_optimize
+
insinto /usr/share/${PN}/
doins "${BUILD_DIR}/myconfig-sample.hpp"
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
new file mode 100644
index 00000000000..fcda88e9b8b
--- /dev/null
+++ b/sci-physics/espresso/files/espresso-4.1.3-gcc-11.patch
@@ -0,0 +1,37 @@
+https://src.fedoraproject.org/rpms/espresso/blob/f34/f/espresso-gcc11.patch
+--- a/src/core/communication.hpp
++++ b/src/core/communication.hpp
+@@ -49,6 +49,8 @@
+ * to \ref CALLBACK_LIST.
+ */
+
++#include <cstddef>
++
+ #include "MpiCallbacks.hpp"
+
+ /* Includes needed by callbacks. */
+diff --git a/src/script_interface/ParallelScriptInterface.hpp b/src/script_interface/ParallelScriptInterface.hpp
+index c33e67d..02ad815 100644
+--- a/src/script_interface/ParallelScriptInterface.hpp
++++ b/src/script_interface/ParallelScriptInterface.hpp
+@@ -23,6 +23,7 @@
+ #define SCRIPT_INTERFACE_PARALLEL_SCRIPT_INTERFACE_HPP
+
+ #include <utility>
++#include <limits>
+
+ #include "MpiCallbacks.hpp"
+ #include "ScriptInterface.hpp"
+diff --git a/src/utils/include/utils/NumeratedContainer.hpp b/src/utils/include/utils/NumeratedContainer.hpp
+index 1d99098..1191a79 100644
+--- a/src/utils/include/utils/NumeratedContainer.hpp
++++ b/src/utils/include/utils/NumeratedContainer.hpp
+@@ -24,6 +24,7 @@
+ * Keep an enumerated list of T objects, managed by the class.
+ */
+
++#include <cstddef>
+ #include <cassert>
+ #include <set>
+ #include <unordered_map>
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/
@ 2022-08-31 15:26 Andrew Ammerlaan
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2022-08-31 15:26 UTC (permalink / raw
To: gentoo-commits
commit: 8bfe3614f161abf4836c66418ca0deceef3bb251
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 15:25:08 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 15:26:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfe3614
sci-physics/espresso: update to version 4.2.0
Closes: https://bugs.gentoo.org/846287
Closes: https://bugs.gentoo.org/811186
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-physics/espresso/Manifest | 1 +
...{espresso-9999.ebuild => espresso-4.2.0.ebuild} | 34 +++++++++++++---------
sci-physics/espresso/espresso-9999.ebuild | 30 ++++++++++---------
.../files/espresso-4.2.0-fix-disable-test.patch | 12 ++++++++
4 files changed, 50 insertions(+), 27 deletions(-)
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 366b7e767003..949e4ac778c0 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1 +1,2 @@
DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
+DIST espresso-4.2.0.tar.gz 14000445 BLAKE2B 79de0e364cd932e534b0e1ee9433ae90e4deeb1ade262aa6877a30c8656f03155ca77b8feafdd5607f83e36ee4f47ad7ec28be353bc3358216a9c9f8c0902323 SHA512 b80afb1bef57911fd79b88378a5b2e31b07a18d415fe17fcd5ed28fb448eeca5922f98af8df42117e9e869645765d55ecfb3aae615fa6a53c915f7d8a63081c5
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-4.2.0.ebuild
similarity index 83%
copy from sci-physics/espresso/espresso-9999.ebuild
copy to sci-physics/espresso/espresso-4.2.0.ebuild
index 19e9be04e85a..fb6b55b2bc12 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-4.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..11} )
CMAKE_MAKEFILE_GENERATOR="emake"
inherit cmake cuda python-single-r1 savedconfig
@@ -19,11 +19,14 @@ else
SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
fi
+S="${WORKDIR}/${PN}"
LICENSE="GPL-3"
SLOT="0"
IUSE="cuda doc examples +fftw +hdf5 test"
-RESTRICT="!test? ( test )"
+
+# unittest_decorators not packaged
+RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}"
@@ -37,17 +40,22 @@ RDEPEND="
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
dev-libs/boost:=[mpi]
- hdf5? ( sci-libs/hdf5:=[mpi] )"
+ hdf5? ( sci-libs/hdf5:=[mpi] )
+"
DEPEND="${RDEPEND}
doc? (
app-doc/doxygen[dot]
dev-texlive/texlive-latexextra
- virtual/latex-base )"
+ virtual/latex-base
+ )
+"
-DOCS=( AUTHORS NEWS README ChangeLog )
+DOCS=( AUTHORS NEWS Readme.md ChangeLog )
-S="${WORKDIR}/${PN}"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-disable-test.patch"
+)
src_prepare() {
use cuda && cuda_src_prepare
@@ -74,23 +82,23 @@ src_compile() {
[[ ${PV} = 9999 ]] && use doc && cmake_build ug dg tutorials
}
+src_test() {
+ LD_PRELOAD="${BUILD_DIR}/src/core/Espresso_core.so" cmake_src_test
+}
+
src_install() {
local i docdir="${S}"
cmake_src_install
+ python_optimize
+
insinto /usr/share/${PN}/
doins "${BUILD_DIR}/myconfig-sample.hpp"
save_config "${BUILD_DIR}/src/config/myconfig-final.hpp"
if use doc; then
- [[ ${PV} = 9999 ]] && docdir="${BUILD_DIR}"
- newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
- newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
- for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
- newdoc "${i}" "tutorial_${i##*/}"
- done
dodoc -r "${BUILD_DIR}/doc/doxygen/html"
fi
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 19e9be04e85a..0373c76056bf 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..11} )
CMAKE_MAKEFILE_GENERATOR="emake"
inherit cmake cuda python-single-r1 savedconfig
@@ -19,11 +19,14 @@ else
SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
fi
+S="${WORKDIR}/${PN}"
LICENSE="GPL-3"
SLOT="0"
IUSE="cuda doc examples +fftw +hdf5 test"
-RESTRICT="!test? ( test )"
+
+# unittest_decorators not packaged
+RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}"
@@ -37,17 +40,18 @@ RDEPEND="
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
dev-libs/boost:=[mpi]
- hdf5? ( sci-libs/hdf5:=[mpi] )"
+ hdf5? ( sci-libs/hdf5:=[mpi] )
+"
DEPEND="${RDEPEND}
doc? (
app-doc/doxygen[dot]
dev-texlive/texlive-latexextra
- virtual/latex-base )"
+ virtual/latex-base
+ )
+"
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-S="${WORKDIR}/${PN}"
+DOCS=( AUTHORS NEWS Readme.md ChangeLog )
src_prepare() {
use cuda && cuda_src_prepare
@@ -74,6 +78,10 @@ src_compile() {
[[ ${PV} = 9999 ]] && use doc && cmake_build ug dg tutorials
}
+src_test() {
+ LD_PRELOAD="${BUILD_DIR}/src/core/Espresso_core.so" cmake_src_test
+}
+
src_install() {
local i docdir="${S}"
@@ -85,12 +93,6 @@ src_install() {
save_config "${BUILD_DIR}/src/config/myconfig-final.hpp"
if use doc; then
- [[ ${PV} = 9999 ]] && docdir="${BUILD_DIR}"
- newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
- newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
- for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
- newdoc "${i}" "tutorial_${i##*/}"
- done
dodoc -r "${BUILD_DIR}/doc/doxygen/html"
fi
diff --git a/sci-physics/espresso/files/espresso-4.2.0-fix-disable-test.patch b/sci-physics/espresso/files/espresso-4.2.0-fix-disable-test.patch
new file mode 100644
index 000000000000..83c133df4bdd
--- /dev/null
+++ b/sci-physics/espresso/files/espresso-4.2.0-fix-disable-test.patch
@@ -0,0 +1,12 @@
+diff --git a/src/script_interface/CMakeLists.txt b/src/script_interface/CMakeLists.txt
+index a799571..9d03f33 100644
+--- a/src/script_interface/CMakeLists.txt
++++ b/src/script_interface/CMakeLists.txt
+@@ -54,4 +54,6 @@ target_link_libraries(
+ target_include_directories(Espresso_script_interface
+ PUBLIC ${CMAKE_SOURCE_DIR}/src)
+
+-add_subdirectory(tests)
++if(WITH_TESTS)
++ add_subdirectory(tests)
++endif(WITH_TESTS)
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-08-31 15:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-31 15:26 [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2021-08-30 21:23 Jakov Smolić
2021-01-01 1:56 Michał Górny
2018-09-23 12:49 Christoph Junghans
2017-03-06 8:16 Christoph Junghans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox