subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sci\-physics\/espresso\/"

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/files/, sci-physics/espresso/

2023-01-29 Thread Andreas Sturmlechner

commit: 68e206daf689674928f9f799db10fc761201ad9f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 28 09:20:08 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 29 21:59:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e206da

sci-physics/espresso: drop 4.1.3

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-physics/espresso/Manifest  |   1 -
 sci-physics/espresso/espresso-4.1.3.ebuild | 122 -
 .../espresso/files/espresso-4.1.3-gcc-11.patch |  37 ---
 3 files changed, 160 deletions(-)

diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 949e4ac778c0..8fc3c5ca8d45 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,2 +1 @@
-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-4.1.3.ebuild 
b/sci-physics/espresso/espresso-4.1.3.ebuild
deleted file mode 100644
index 17f2fbd1addc..
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake cuda python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="http://espressomd.org";
-
-if [[ ${PV} =  ]]; then
-   EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git";
-   EGIT_BRANCH="python"
-   inherit git-r3
-else
-   
SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz";
-   KEYWORDS="~amd64 ~x86 ~amd64-linux"
-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_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:=[mpi] )"
-
-DEPEND="${RDEPEND}
-   doc? (
-   app-doc/doxygen[dot]
-   dev-texlive/texlive-latexextra
-   virtual/latex-base )"
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-gcc-11.patch
-)
-
-src_prepare() {
-   use cuda && cuda_src_prepare
-   cmake_src_prepare
-}
-
-src_configure() {
-   local 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
-   )
-   cmake_src_configure
-}
-
-src_compile() {
-   cmake_src_compile
-   use doc && cmake_build doxygen
-   [[ ${PV} =  ]] && use doc && cmake_build ug dg tutorials
-}
-
-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} =  ]] && 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
-
-   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}"
-   elo

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/

2022-08-31 Thread Andrew Ammerlaan

commit: 8bfe3614f161abf4836c66418ca0deceef3bb251
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Wed Aug 31 15:25:08 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Aug 31 15:26:10 2022 +
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  gentoo.org>

 sci-physics/espresso/Manifest  |  1 +
 ...{espresso-.ebuild => espresso-4.2.0.ebuild} | 34 +-
 sci-physics/espresso/espresso-.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-.ebuild 
b/sci-physics/espresso/espresso-4.2.0.ebuild
similarity index 83%
copy from sci-physics/espresso/espresso-.ebuild
copy to sci-physics/espresso/espresso-4.2.0.ebuild
index 19e9be04e85a..fb6b55b2bc12 100644
--- a/sci-physics/espresso/espresso-.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} =  ]] && 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} =  ]] && 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-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index 19e9be04e85a..0373c76056bf 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.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-lin

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/

2021-08-30 Thread Jakov Smolić

commit: 4709d8e4ea9ec149753b98cabf365b3520070d65
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon Aug 30 21:18:46 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon Aug 30 21:22:07 2021 +
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ć  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 000..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 
++
+ #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 
++#include 
+ 
+ #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 
+ #include 
+ #include 
+ #include 
+

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2021-07-17 Thread David Seifert

commit: 5d48bc3167868ca93664326e445f8ac58650a1fd
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jul 17 18:17:08 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jul 17 18:17:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d48bc31

sci-physics/espresso: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP

Signed-off-by: David Seifert  gentoo.org>

 sci-physics/espresso/espresso-4.1.3.ebuild | 6 +++---
 sci-physics/espresso/espresso-.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild 
b/sci-physics/espresso/espresso-4.1.3.ebuild
index a60bb434ef8..19e9be04e85 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 CMAKE_MAKEFILE_GENERATOR="emake"
 
 inherit cmake cuda python-single-r1 savedconfig
@@ -31,8 +31,8 @@ REQUIRED_USE="
 RDEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
-   >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
-   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+   >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
')
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index a60bb434ef8..19e9be04e85 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 CMAKE_MAKEFILE_GENERATOR="emake"
 
 inherit cmake cuda python-single-r1 savedconfig
@@ -31,8 +31,8 @@ REQUIRED_USE="
 RDEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
-   >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
-   dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+   >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
')
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2021-02-14 Thread Sam James

commit: efc046af4b3479a93b8c237dce7a78c9115fbfbc
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 14 23:22:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 15 00:31:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc046af

sci-physics/espresso: fix double KEYWORDS

Double KEYWORDS lines break tools like ekeyword and Nattka.
As per PMS, blank/empty KEYWORDS is implied by not defining
the variable.

See: https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-physics/espresso/espresso-4.1.3.ebuild | 1 -
 sci-physics/espresso/espresso-.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild 
b/sci-physics/espresso/espresso-4.1.3.ebuild
index 66c2b9a4c69..1ef336f2ab4 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -15,7 +15,6 @@ if [[ ${PV} =  ]]; 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"

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index 66c2b9a4c69..1ef336f2ab4 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -15,7 +15,6 @@ if [[ ${PV} =  ]]; 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"

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2021-01-06 Thread Fabian Groffen

commit: a90ac558bb4731140fd89d9f8d309d05775ba765
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 15:19:35 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 15:19:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a90ac558

sci-physics/espresso: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sci-physics/espresso/espresso-4.1.3.ebuild | 4 ++--
 sci-physics/espresso/espresso-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild 
b/sci-physics/espresso/espresso-4.1.3.ebuild
index ef5f6578edc..926982e17eb 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} =  ]]; then
KEYWORDS=""
 else

SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz";
-   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-3"

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index ef5f6578edc..926982e17eb 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} =  ]]; then
KEYWORDS=""
 else

SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz";
-   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-3"

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/

2020-12-31 Thread Michał Górny

commit: e4c36e7e9a47e830fd712d37197a74cb5c4f29b0
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Jan  1 01:52:27 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Jan  1 01:55:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c36e7e

sci-physics/espresso: Remove old (py3.6)

Signed-off-by: Michał Górny  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..000
--- 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} =  ]]; 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} =  ]] && 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} =  ]] && 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

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2020-08-16 Thread Christoph Junghans

commit: 93533be3232554ddc1b0546ea1f1bde62c348bc7
Author: Christoph Junghans  gentoo  org>
AuthorDate: Sun Aug 16 15:21:58 2020 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Sun Aug 16 15:22:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93533be3

sci-physics/espresso: version bump

Closes: https://bugs.gentoo.org/737416
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Christoph Junghans  gentoo.org>

 sci-physics/espresso/Manifest  |  1 +
 ...{espresso-.ebuild => espresso-4.1.3.ebuild} | 31 +++---
 sci-physics/espresso/espresso-.ebuild  | 31 +++---
 sci-physics/espresso/metadata.xml  |  4 ---
 4 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 2b8aa0ed6e9..a4941b7d188 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,2 +1,3 @@
 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-.ebuild 
b/sci-physics/espresso/espresso-4.1.3.ebuild
similarity index 79%
copy from sci-physics/espresso/espresso-.ebuild
copy to sci-physics/espresso/espresso-4.1.3.ebuild
index fcc6fbc9926..ef5f6578edc 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils python-single-r1 savedconfig
+inherit cmake python-single-r1 savedconfig
 
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://espressomd.org";
@@ -48,9 +48,11 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README ChangeLog )
 
+S="${WORKDIR}/${PN}"
+
 src_prepare() {
use cuda && cuda_src_prepare
-   cmake-utils_src_prepare
+   cmake_src_prepare
 }
 
 src_configure() {
@@ -63,35 +65,34 @@ src_configure() {
-DWITH_HDF5=$(usex hdf5)
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-DCMAKE_SKIP_RPATH=YES
-   -DLIBDIR=$(get_libdir)
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_compile() {
-   cmake-utils_src_compile
-   use doc && cmake-utils_src_make doxygen
-   [[ ${PV} =  ]] && use doc && cmake-utils_src_make ug dg tutorials
+   cmake_src_compile
+   use doc && cmake_build doxygen
+   [[ ${PV} =  ]] && use doc && cmake_build ug dg tutorials
 }
 
 src_install() {
local i docdir="${S}"
 
-   cmake-utils_src_install
+   cmake_src_install
 
insinto /usr/share/${PN}/
-   doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
+   doins "${BUILD_DIR}/myconfig-sample.hpp"
 
-   save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
+   save_config "${BUILD_DIR}/src/config/myconfig-final.hpp"
 
if use doc; then
-   [[ ${PV} =  ]] && docdir="${CMAKE_BUILD_DIR}"
+   [[ ${PV} =  ]] && 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 ${CMAKE_BUILD_DIR}/doc/doxygen/html
+   dodoc -r "${BUILD_DIR}/doc/doxygen/html"
fi
 
if use examples; then

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index fcc6fbc9926..ef5f6578edc 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2020-02-09 Thread Michał Górny

commit: 588795db94366812e38da84d817d8a00bd7835ed
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 19:10:07 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:35:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=588795db

sci-physics/espresso: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny  gentoo.org>

 .../espresso/{espresso-4.0.0-r1.ebuild => espresso-4.0.0-r2.ebuild} | 6 --
 sci-physics/espresso/espresso-4.0_pre20170228.ebuild| 6 --
 sci-physics/espresso/espresso-.ebuild   | 6 --
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sci-physics/espresso/espresso-4.0.0-r1.ebuild 
b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
similarity index 95%
rename from sci-physics/espresso/espresso-4.0.0-r1.ebuild
rename to sci-physics/espresso/espresso-4.0.0-r2.ebuild
index 00b53caa2ef..0afbf393e9a 100644
--- a/sci-physics/espresso/espresso-4.0.0-r1.ebuild
+++ b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
@@ -31,8 +31,10 @@ REQUIRED_USE="
 
 RDEPEND="
${PYTHON_DEPS}
-   >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   $(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]

diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild 
b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index 5755eba6cdf..e7c540b1629 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -33,8 +33,10 @@ REQUIRED_USE="
 
 RDEPEND="
${PYTHON_DEPS}
-   >dev-python/cython-0.22[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   $(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]

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index b9d14d3937e..fcc6fbc9926 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -31,8 +31,10 @@ REQUIRED_USE="
 
 RDEPEND="
${PYTHON_DEPS}
-   >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
+   $(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]

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2020-01-15 Thread Michał Górny

commit: c366d2e26eebaecef660b88afb6f76b4a3ef721c
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Jan 16 06:58:28 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jan 16 07:02:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c366d2e2

sci-physics/espresso: Remove Python 2

Signed-off-by: Michał Górny  gentoo.org>

 sci-physics/espresso/espresso-4.0.0-r1.ebuild| 2 +-
 sci-physics/espresso/espresso-4.0_pre20170228.ebuild | 2 +-
 sci-physics/espresso/espresso-.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-physics/espresso/espresso-4.0.0-r1.ebuild 
b/sci-physics/espresso/espresso-4.0.0-r1.ebuild
index b969b400a5e..00b53caa2ef 100644
--- a/sci-physics/espresso/espresso-4.0.0-r1.ebuild
+++ b/sci-physics/espresso/espresso-4.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig

diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild 
b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index 4d969a356a2..5755eba6cdf 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index 51c609793c3..b9d14d3937e 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

2019-07-22 Thread Christoph Junghans

commit: 2301e741adbdcd9019220a6aa5b8b517de00bc1d
Author: Christoph Junghans  gentoo  org>
AuthorDate: Mon Jul 22 22:49:15 2019 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Mon Jul 22 23:02:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2301e741

sci-physics/espresso++: version bump

Closes: https://bugs.gentoo.org/690472
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Christoph Junghans  gentoo.org>

 sci-physics/espresso++/Manifest | 2 +-
 .../espresso++/{espresso++-2.0.ebuild => espresso++-2.0.2.ebuild}   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-physics/espresso++/Manifest b/sci-physics/espresso++/Manifest
index 06b0cbcf75d..74319b42428 100644
--- a/sci-physics/espresso++/Manifest
+++ b/sci-physics/espresso++/Manifest
@@ -1,2 +1,2 @@
 DIST espresso++-1.9.4.tar.gz 23954404 BLAKE2B 
b2bb7940db21acb64771fc387d22cec49fc39bae58b9d4ff683eccdbba63981e7ba5c6d64ce938f53e125e74db0423d40ac3c60e33a5589b64a20527437027c6
 SHA512 
0b5c8ad81c1d6b742909533c58cd791f1702270778f6f140e84108f0da8313418f7fa39d83de2e24f8308e887a1c41d2fcdd0a33ef505d08244a235f95fe611d
-DIST espresso++-2.0.tar.gz 26352105 BLAKE2B 
1e35f20a781be36b15a587adcfbe461ea2eaaa2be5fffb86906283b1b7327596e94a5c33f4dcb41288fa7d1262ede1655192652d8eb80f8f866d25e5a4ec654c
 SHA512 
97c7fb45091d09c1b131b462b010d7e082589ae1746dd9fedfd6affdbcdd384d5c9beaeaec3e08cec88750d0a1db8a1f8e68adb01f45dd8b92a1cb34c69386dc
+DIST espresso++-2.0.2.tar.gz 26643776 BLAKE2B 
fb4756164f405472c922d4a0d64ad350a74315db96c9e846d1807e1b332c7fa8daa55831d5ee0baa31b4069e1f7c63a91e241e70913fdc5c31a77cc9514acaa4
 SHA512 
599bf0560eb8f9517f890f9f1895ec5a7d43b727e12f14e722506ad571f9d001f5cc54c3e91922954a7e7cefdaff85d5dd15cab58b35bf09f5399e22b42e588c

diff --git a/sci-physics/espresso++/espresso++-2.0.ebuild 
b/sci-physics/espresso++/espresso++-2.0.2.ebuild
similarity index 96%
rename from sci-physics/espresso++/espresso++-2.0.ebuild
rename to sci-physics/espresso++/espresso++-2.0.2.ebuild
index 3bae0551d9b..1aa0aa57f8b 100644
--- a/sci-physics/espresso++/espresso++-2.0.ebuild
+++ b/sci-physics/espresso++/espresso++-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

2019-07-22 Thread Christoph Junghans

commit: 4cf0459ff851896e354fdd5326940a514cf5449d
Author: Christoph Junghans  gentoo  org>
AuthorDate: Mon Jul 22 22:56:00 2019 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Mon Jul 22 23:03:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf0459f

sci-physics/espresso++: remove old

Closes: https://bugs.gentoo.org/595830
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Christoph Junghans  gentoo.org>

 sci-physics/espresso++/Manifest|  1 -
 sci-physics/espresso++/espresso++-1.9.4.ebuild | 60 --
 2 files changed, 61 deletions(-)

diff --git a/sci-physics/espresso++/Manifest b/sci-physics/espresso++/Manifest
index 74319b42428..00e12f47beb 100644
--- a/sci-physics/espresso++/Manifest
+++ b/sci-physics/espresso++/Manifest
@@ -1,2 +1 @@
-DIST espresso++-1.9.4.tar.gz 23954404 BLAKE2B 
b2bb7940db21acb64771fc387d22cec49fc39bae58b9d4ff683eccdbba63981e7ba5c6d64ce938f53e125e74db0423d40ac3c60e33a5589b64a20527437027c6
 SHA512 
0b5c8ad81c1d6b742909533c58cd791f1702270778f6f140e84108f0da8313418f7fa39d83de2e24f8308e887a1c41d2fcdd0a33ef505d08244a235f95fe611d
 DIST espresso++-2.0.2.tar.gz 26643776 BLAKE2B 
fb4756164f405472c922d4a0d64ad350a74315db96c9e846d1807e1b332c7fa8daa55831d5ee0baa31b4069e1f7c63a91e241e70913fdc5c31a77cc9514acaa4
 SHA512 
599bf0560eb8f9517f890f9f1895ec5a7d43b727e12f14e722506ad571f9d001f5cc54c3e91922954a7e7cefdaff85d5dd15cab58b35bf09f5399e22b42e588c

diff --git a/sci-physics/espresso++/espresso++-1.9.4.ebuild 
b/sci-physics/espresso++/espresso++-1.9.4.ebuild
deleted file mode 100644
index 0a19919baf7..000
--- a/sci-physics/espresso++/espresso++-1.9.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils python-r1
-
-DESCRIPTION="A Modern Multiscale Simulation Package for Soft Matter Systems"
-HOMEPAGE="https://www.espresso-pp.de";
-
-MY_PN="${PN//+/p}"
-if [[ ${PV} =  ]]; then
-   EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git";
-   inherit git-r3
-else
-   SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-   virtual/mpi
-   dev-libs/boost:=[python,mpi,${PYTHON_USEDEP}]
-   sci-libs/fftw:3.0
-   >=dev-python/mpi4py-2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-   src_configure_internal() {
-   local mycmakeargs=(
-   -DEXTERNAL_BOOST=ON
-   -DEXTERNAL_MPI4PY=ON
-   -DWITH_RC_FILES=OFF
-   )
-   cmake-utils_src_configure
-   }
-   python_foreach_impl src_configure_internal
-}
-
-src_compile() {
-   python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
-   python_foreach_impl cmake-utils_src_test
-}
-
-src_install() {
-   python_foreach_impl cmake-utils_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/

2018-09-23 Thread Christoph Junghans

commit: 8ec855c644f7c1488cf89696d8afab04ff9da0e9
Author: Christoph Junghans  gentoo  org>
AuthorDate: Sun Sep 23 12:48:41 2018 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Sun Sep 23 12:49:22 2018 +
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 000..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 
+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})
+

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2018-09-07 Thread Christoph Junghans

commit: 87ad744e3f351ce03906019a1025fa52454125af
Author: Christoph Junghans  gentoo  org>
AuthorDate: Fri Sep  7 15:27:06 2018 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Fri Sep  7 15:27:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ad744e

sci-physics/espresso: version bump

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-physics/espresso/Manifest  |  1 +
 ...{espresso-.ebuild => espresso-4.0.0.ebuild} | 41 +++---
 sci-physics/espresso/espresso-.ebuild  | 41 +++---
 sci-physics/espresso/metadata.xml  |  1 -
 4 files changed, 25 insertions(+), 59 deletions(-)

diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index d5d5ca9efc6..2b8aa0ed6e9 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1 +1,2 @@
+DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 
995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5
 SHA512 
53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
 DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 
6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f
 SHA512 
7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-4.0.0.ebuild
similarity index 73%
copy from sci-physics/espresso/espresso-.ebuild
copy to sci-physics/espresso/espresso-4.0.0.ebuild
index b841b4d4bc5..953909c3dd7 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,35 +13,29 @@ HOMEPAGE="http://espressomd.org";
 
 if [[ ${PV} =  ]]; then
EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git";
-   EGIT_BRANCH="master"
+   EGIT_BRANCH="python"
inherit git-r3
KEYWORDS=""
 else
-   SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+   
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 packages +python tcl test"
+IUSE="cuda doc examples +fftw +hdf5 test"
 
 REQUIRED_USE="
-   packages? ( tcl )
-   || ( python tcl )
${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
${PYTHON_DEPS}
-   python? (
-   >dev-python/cython-0.22[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   )
-   tcl? ( dev-lang/tcl:0= )
+   >=dev-python/cython-0.26.1[${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:= )
-   packages? ( dev-tcltk/tcllib )"
+   hdf5? ( sci-libs/hdf5:=[mpi] )"
 
 DEPEND="${RDEPEND}
doc? (
@@ -60,12 +54,10 @@ src_configure() {
mycmakeargs=(
-DWITH_CUDA=$(usex cuda)
-DPYTHON_EXECUTABLE="${PYTHON}"
-   -DWITH_PYTHON=$(usex python)
-   -DWITH_TCL=$(usex tcl)
-DWITH_TESTS=$(usex test)
-   -DWITH_SCAFACOS=ON
-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)
@@ -93,24 +85,15 @@ src_install() {
[[ ${PV} =  ]] && docdir="${CMAKE_BUILD_DIR}"
newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
-   for j in $(usev python) $(usev tcl); do
-   for i in "${docdir}/doc/tutorials/${j}"/*/[0-9]*.pdf; do
-   newdoc "${i}" "${j}_tutorial_${i##*/}"
-   done
+   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
-   for i in $(usev python) $(usev tcl); do
-   insinto "/usr/share/${PN}/examples/${i}"
-   doins -r samples/${i}/.
-   done
-   fi
-
-   if use packages; then
-   insinto /usr/share/${PN}/packages
-   doins -r pa

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

2018-07-15 Thread Christoph Junghans

commit: e35f966afb138fd76c1d49add181c5ee5f45e524
Author: Christoph Junghans  gentoo  org>
AuthorDate: Sun Jul 15 21:38:20 2018 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Sun Jul 15 21:38:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e35f966a

sci-physics/espresso++: version bump

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sci-physics/espresso++/Manifest | 1 +
 .../espresso++/{espresso++-.ebuild => espresso++-2.0.ebuild}| 6 --
 sci-physics/espresso++/espresso++-.ebuild   | 6 --
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sci-physics/espresso++/Manifest b/sci-physics/espresso++/Manifest
index b41cf6edbb1..06b0cbcf75d 100644
--- a/sci-physics/espresso++/Manifest
+++ b/sci-physics/espresso++/Manifest
@@ -1 +1,2 @@
 DIST espresso++-1.9.4.tar.gz 23954404 BLAKE2B 
b2bb7940db21acb64771fc387d22cec49fc39bae58b9d4ff683eccdbba63981e7ba5c6d64ce938f53e125e74db0423d40ac3c60e33a5589b64a20527437027c6
 SHA512 
0b5c8ad81c1d6b742909533c58cd791f1702270778f6f140e84108f0da8313418f7fa39d83de2e24f8308e887a1c41d2fcdd0a33ef505d08244a235f95fe611d
+DIST espresso++-2.0.tar.gz 26352105 BLAKE2B 
1e35f20a781be36b15a587adcfbe461ea2eaaa2be5fffb86906283b1b7327596e94a5c33f4dcb41288fa7d1262ede1655192652d8eb80f8f866d25e5a4ec654c
 SHA512 
97c7fb45091d09c1b131b462b010d7e082589ae1746dd9fedfd6affdbcdd384d5c9beaeaec3e08cec88750d0a1db8a1f8e68adb01f45dd8b92a1cb34c69386dc

diff --git a/sci-physics/espresso++/espresso++-.ebuild 
b/sci-physics/espresso++/espresso++-2.0.ebuild
similarity index 91%
copy from sci-physics/espresso++/espresso++-.ebuild
copy to sci-physics/espresso++/espresso++-2.0.ebuild
index 2f9ecca51ed..3bae0551d9b 100644
--- a/sci-physics/espresso++/espresso++-.ebuild
+++ b/sci-physics/espresso++/espresso++-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,9 +30,11 @@ RDEPEND="${PYTHON_DEPS}
virtual/mpi
dev-libs/boost:=[python,mpi,${PYTHON_USEDEP}]
sci-libs/fftw:3.0
-   dev-python/mpi4py[${PYTHON_USEDEP}]"
+   >=dev-python/mpi4py-2[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_configure() {
src_configure_internal() {
local mycmakeargs=(

diff --git a/sci-physics/espresso++/espresso++-.ebuild 
b/sci-physics/espresso++/espresso++-.ebuild
index 2f9ecca51ed..3bae0551d9b 100644
--- a/sci-physics/espresso++/espresso++-.ebuild
+++ b/sci-physics/espresso++/espresso++-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,9 +30,11 @@ RDEPEND="${PYTHON_DEPS}
virtual/mpi
dev-libs/boost:=[python,mpi,${PYTHON_USEDEP}]
sci-libs/fftw:3.0
-   dev-python/mpi4py[${PYTHON_USEDEP}]"
+   >=dev-python/mpi4py-2[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_configure() {
src_configure_internal() {
local mycmakeargs=(

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/files/

2017-09-02 Thread Michael Palimaka

commit: fe50e58025ef3cd19e2fe572da2de5add50ac442
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Aug 20 12:57:14 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Sep  2 14:35:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe50e580

sci-physics/espresso: remove unused patch

 .../files/espresso-3.3.0-cython-0.22.patch | 23 --
 1 file changed, 23 deletions(-)

diff --git a/sci-physics/espresso/files/espresso-3.3.0-cython-0.22.patch 
b/sci-physics/espresso/files/espresso-3.3.0-cython-0.22.patch
deleted file mode 100644
index 22b726b480e..000
--- a/sci-physics/espresso/files/espresso-3.3.0-cython-0.22.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9e6caa3294b0f5f377c16550a07429b73c871ac3 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans 
-Date: Thu, 12 Mar 2015 08:55:51 -0600
-Subject: [PATCH] fix build with cython-0.22
-

- src/python/espressomd/particle_data.pxd | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/python/espressomd/particle_data.pxd 
b/src/python/espressomd/particle_data.pxd
-index fff022b..4cc39e8 100644
 a/src/python/espressomd/particle_data.pxd
-+++ b/src/python/espressomd/particle_data.pxd
-@@ -185,5 +185,5 @@ cdef class ParticleHandle(object):
-   cdef public int id
-   cdef bint valid
-   cdef Particle particleData
--  cdef int updateParticleData(self)
-+  cdef int updateParticleData(self) except -1
- 
--- 
-2.0.5
-

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2017-07-30 Thread Michał Górny

commit: 72a5dae9b0123719371a586f58fafd03a70d
Author: David Hicks  hicks  id  au>
AuthorDate: Sat Jul 29 19:12:58 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul 30 10:04:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72a5dae9

sci-physics/espresso: use HTTPS for GitHub and doc links

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sci-physics/espresso/espresso-4.0_pre20170228.ebuild | 4 ++--
 sci-physics/espresso/espresso-.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild 
b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index ac559653418..6177a3fe03f 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extensible Simulation Package for Research on 
Soft matter"
 HOMEPAGE="http://espressomd.org";
 
 if [[ ${PV} =  ]]; then
-   EGIT_REPO_URI="git://github.com/espressomd/espresso.git 
https://github.com/espressomd/espresso.git";
+   EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git";
EGIT_BRANCH="master"
inherit git-r3
KEYWORDS=""
@@ -105,7 +105,7 @@ 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";
+   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}"

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index 2fa536f63bd..b841b4d4bc5 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extensible Simulation Package for Research on 
Soft matter"
 HOMEPAGE="http://espressomd.org";
 
 if [[ ${PV} =  ]]; then
-   EGIT_REPO_URI="git://github.com/espressomd/espresso.git 
https://github.com/espressomd/espresso.git";
+   EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git";
EGIT_BRANCH="master"
inherit git-r3
KEYWORDS=""
@@ -118,7 +118,7 @@ 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";
+   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}"

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2017-07-17 Thread Christoph Junghans

commit: 118d8d3cc94dd0553de0fc287b7a155982368f74
Author: Christoph Junghans  gentoo  org>
AuthorDate: Mon Jul 17 14:52:35 2017 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Mon Jul 17 14:57:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118d8d3c

sci-physics/espresso: remove old (bug #595124, #625338)

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 sci-physics/espresso/Manifest  |   2 -
 sci-physics/espresso/espresso-3.3.0.ebuild | 135 -
 sci-physics/espresso/espresso-3.3.1.ebuild | 132 
 3 files changed, 269 deletions(-)

diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 0b243949f69..65391c63a9d 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,3 +1 @@
-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-3.3.0.ebuild 
b/sci-physics/espresso/espresso-3.3.0.ebuild
deleted file mode 100644
index 85a3ab47bca..000
--- a/sci-physics/espresso/espresso-3.3.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="http://espressomd.org";
-
-if [[ ${PV} =  ]]; then
-   EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
-   EGIT_BRANCH="master"
-   AUTOTOOLS_AUTORECONF=1
-   inherit git-r3
-   KEYWORDS=""
-else
-   SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="X cuda doc examples +fftw mpi packages python test -tk"
-
-REQUIRED_USE="
-   python? ( ${PYTHON_REQUIRED_USE} )
-   tk? ( X )"
-
-RESTRICT="tk? ( test )"
-
-RDEPEND="
-   python? (
-   ${PYTHON_DEPS}
-   dev-python/cython[${PYTHON_USEDEP}]
-   dev-python/numpy[${PYTHON_USEDEP}]
-   )
-   dev-lang/tcl:0=
-   cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-   fftw? ( sci-libs/fftw:3.0 )
-   mpi? ( virtual/mpi )
-   packages? ( dev-tcltk/tcllib )
-   tk? ( >=dev-lang/tk-8.4.18-r1:0= )
-   X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}
-   doc? (
-   app-doc/doxygen[dot]
-   dev-texlive/texlive-latexextra
-   virtual/latex-base )"
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-PATCHES=( "${FILESDIR}/${P}-cython-0.22.patch" )
-
-pkg_setup() {
-   use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   use cuda && cuda_src_prepare
-   autotools-utils_src_prepare
-}
-
-src_configure() {
-   myeconfargs=(
-   $(use_with fftw) \
-   $(use_with cuda) \
-   $(use_with python python-interface) \
-   $(use_with mpi) \
-   $(use_with tk) \
-   $(use_with X x)
-   )
-   CXX=$(usex mpi "mpic++" "$(tc-getCXX)") autotools-utils_src_configure
-   restore_config myconfig.hpp
-}
-
-src_compile() {
-   autotools-utils_src_compile
-   use doc && autotools-utils_src_compile doxygen
-   [[ ${PV} =  ]] && use doc && autotools-utils_src_compile ug dg 
tutorials
-}
-
-src_install() {
-   local i
-
-   autotools-utils_src_install
-
-   insinto /usr/share/${PN}
-   doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.hpp
-
-   save_config ${AUTOTOOLS_BUILD_DIR}/src/core/myconfig-final.hpp
-
-   if use doc; then
-   if [[ ${PV} =  ]] ; then
-   newdoc "${AUTOTOOLS_BUILD_DIR}"/doc/dg/dg.pdf 
developer_guide.pdf
-   newdoc "${AUTOTOOLS_BUILD_

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2017-06-15 Thread Pacho Ramos

commit: 49310e382d287d466243732e6f4b2307869de878
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Jun 15 17:24:13 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Jun 15 17:24:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49310e38

sci-physics/espresso: Support newer python

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-physics/espresso/espresso-4.0_pre20170228.ebuild | 2 +-
 sci-physics/espresso/espresso-.ebuild| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild 
b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index dc6d46c9b7c..ac559653418 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index 6bdb32dbb78..2fa536f63bd 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2017-03-06 Thread Tobias Klausmann

commit: 3958d0e342333de4972e34ade8cb60b20e8180e4
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon Mar  6 13:47:48 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon Mar  6 13:47:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3958d0e3

sci-physics/espresso: Fix whitespace and drop CVS header

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 sci-physics/espresso/espresso-4.0_pre20170228.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild 
b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index 252f74e2e5c..dc6d46c9b7c 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
@@ -91,7 +90,7 @@ src_install() {
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##*/}"
+   newdoc "${i}" "tutorial_${i##*/}"
done
dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
fi

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/

2017-03-06 Thread Christoph Junghans

commit: b2f23f09f4a9199ea5605bf0c3e786f69c8e6b2e
Author: Christoph Junghans  gentoo  org>
AuthorDate: Mon Mar  6 08:12:16 2017 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Mon Mar  6 08:16:30 2017 +
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 000..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} =  ]]; 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} =  ]] && 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} =  ]] && docdir="${CMAKE_BUILD_DIR}"
+   newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
+   newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
+

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/files/

2017-02-02 Thread Guilherme Amadio

commit: f1cf618e4651f3e75ecd5a48bfa789c93073b5e4
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Thu Feb  2 18:03:03 2017 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Thu Feb  2 19:58:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1cf618e

sci-physics/espresso++: remove unused patch

Signed-off-by: Guilherme Amadio  gentoo.org>

 .../files/espresso++-1.6.0-multilib.patch  | 65 --
 1 file changed, 65 deletions(-)

diff --git a/sci-physics/espresso++/files/espresso++-1.6.0-multilib.patch 
b/sci-physics/espresso++/files/espresso++-1.6.0-multilib.patch
deleted file mode 100644
index a66988b..
--- a/sci-physics/espresso++/files/espresso++-1.6.0-multilib.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User Christoph Junghans 
-# Date 1381325052 -7200
-# Node ID bcdda52214df0c007e44ec8d5045b0e68b142227
-# Parent  65da1a6110e59322efa1bb5eaff596baf9f07d5d
-added LIB variable
-
-diff -r 65da1a6110e5 -r bcdda52214df CMakeLists.txt
 a/CMakeLists.txt   Tue Oct 08 20:52:46 2013 +0200
-+++ b/CMakeLists.txt   Wed Oct 09 15:24:12 2013 +0200
-@@ -29,6 +29,9 @@
- option(BUILD_SHARED_LIBS "Build shared libs" ON)
- option(BUILD_STANDALONE "Builds pypresso an standalone binary" OFF)
- option(BUILD_PYTHON_MODULE "Builds epresso as python module" ON)
-+if (NOT DEFINED LIB)
-+  set(LIB "lib")
-+endif(NOT DEFINED LIB)
- 
- if(NOT BUILD_STANDALONE AND NOT BUILD_PYTHON_MODULE)
-   message(FATAL_ERROR "You need to enable pypresso or the python module")
-diff -r 65da1a6110e5 -r bcdda52214df contrib/boost/CMakeLists.txt
 a/contrib/boost/CMakeLists.txt Tue Oct 08 20:52:46 2013 +0200
-+++ b/contrib/boost/CMakeLists.txt Wed Oct 09 15:24:12 2013 +0200
-@@ -21,4 +21,4 @@
- 
- add_library(espresso_boost ${BOOST_SOURCES})
- target_link_libraries(espresso_boost ${PYTHON_LIBRARIES} 
${VAMPIRTRACE_LIBRARIES} ${MPI_LIBRARIES} ${RT_LIBRARIES})
--install(TARGETS espresso_boost LIBRARY DESTINATION lib ARCHIVE DESTINATION 
lib)
-+install(TARGETS espresso_boost LIBRARY DESTINATION ${LIB} ARCHIVE DESTINATION 
lib)
-diff -r 65da1a6110e5 -r bcdda52214df contrib/mpi4py/CMakeLists.txt
 a/contrib/mpi4py/CMakeLists.txtTue Oct 08 20:52:46 2013 +0200
-+++ b/contrib/mpi4py/CMakeLists.txtWed Oct 09 15:24:12 2013 +0200
-@@ -12,4 +12,4 @@
- target_link_libraries(dl ${PYTHON_LIBRARIES} ${VAMPIRTRACE_LIBRARIES} 
${MPI_LIBRARIES})
- set_target_properties(dl PROPERTIES PREFIX "" SUFFIX ".so")
- 
--install(TARGETS MPI LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION 
lib)
-+install(TARGETS MPI LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE DESTINATION 
${LIB})
-diff -r 65da1a6110e5 -r bcdda52214df src/CMakeLists.txt
 a/src/CMakeLists.txt   Tue Oct 08 20:52:46 2013 +0200
-+++ b/src/CMakeLists.txt   Wed Oct 09 15:24:12 2013 +0200
-@@ -70,11 +70,11 @@
- add_library(espresso_common ${ESPRESSO_SOURCES})
- target_link_libraries(espresso_common pylogger ${BOOST} ${PYTHON_LIBRARIES}
-   ${VAMPIRTRACE_LIBRARIES} 
${MPI_LIBRARIES} ${FFTW3_LIBRARIES})
--install(TARGETS espresso_common LIBRARY DESTINATION lib ARCHIVE DESTINATION 
lib)
-+install(TARGETS espresso_common LIBRARY DESTINATION ${LIB} ARCHIVE 
DESTINATION lib)
- 
- add_library(pylogger esutil/PyLogger.cpp)
- target_link_libraries(pylogger ${BOOST})
--install(TARGETS pylogger LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
-+install(TARGETS pylogger LIBRARY DESTINATION ${LIB} ARCHIVE DESTINATION lib)
- 
- if(BUILD_STANDALONE)
-   add_executable(pypresso main/pypresso.cpp)
-diff -r 65da1a6110e5 -r bcdda52214df src/pymodule/CMakeLists.txt
 a/src/pymodule/CMakeLists.txt  Tue Oct 08 20:52:46 2013 +0200
-+++ b/src/pymodule/CMakeLists.txt  Wed Oct 09 15:24:12 2013 +0200
-@@ -5,5 +5,5 @@
-   add_dependencies(_espresso scripts)
-   #python libs have not prefix (default would be 'lib')
-   set_target_properties(_espresso PROPERTIES PREFIX "" SUFFIX ".so")
--  install(TARGETS _espresso LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE 
DESTINATION lib)
-+  install(TARGETS _espresso LIBRARY DESTINATION ${PYTHON_INSTDIR} ARCHIVE 
DESTINATION ${LIB})
- endif(BUILD_PYTHON_MODULE)

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

2016-12-14 Thread Christoph Junghans

commit: 54e8cfb04662c51df8f5fba8076a2da2827fa204
Author: Christoph Junghans  gentoo  org>
AuthorDate: Wed Dec 14 20:58:15 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Wed Dec 14 21:00:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e8cfb0

sci-physics/espresso++: version bump

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 sci-physics/espresso++/Manifest|  1 +
 sci-physics/espresso++/espresso++-1.9.4.ebuild | 61 ++
 2 files changed, 62 insertions(+)

diff --git a/sci-physics/espresso++/Manifest b/sci-physics/espresso++/Manifest
index 7f1b5b2..4d51233 100644
--- a/sci-physics/espresso++/Manifest
+++ b/sci-physics/espresso++/Manifest
@@ -1 +1,2 @@
 DIST espresso++-1.9.3.tar.bz2 14714575 SHA256 
602541c9e5889aeff30462f252fa5f2af7d818808ce946d11ee33500f4f2c959 SHA512 
0ac90c6b09da0e7503e83cff8180373249760206fc0035b72868376abbd4a0d9121e7c92ae286493230af2080221464fc0f9428ed78101bde32eb926f07bb010
 WHIRLPOOL 
f9fb22f4d113a47eee1d9203d4dabf5f5cef3347d7c17583459a69a6bee7392675a0f5ebab09315c4a740dba2fb412c13f3cb74ba3e8d0c99f51f62452af28e8
+DIST espresso++-1.9.4.tar.gz 23954404 SHA256 
dc08381259394a4bd076bfe9b4bd53d687911025258e3a17a473ada12e2e5e68 SHA512 
0b5c8ad81c1d6b742909533c58cd791f1702270778f6f140e84108f0da8313418f7fa39d83de2e24f8308e887a1c41d2fcdd0a33ef505d08244a235f95fe611d
 WHIRLPOOL 
c56e1055f8edc46b3c80f1d511dc925e982137600998fa6ecc0bb8aedf90cd701241f12ab3420afa2198b5b6584458b829dc01fd3c68a5223faeb07e833d

diff --git a/sci-physics/espresso++/espresso++-1.9.4.ebuild 
b/sci-physics/espresso++/espresso++-1.9.4.ebuild
new file mode 100644
index ..d011256
--- /dev/null
+++ b/sci-physics/espresso++/espresso++-1.9.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils python-r1
+
+DESCRIPTION="A Modern Multiscale Simulation Package for Soft Matter Systems"
+HOMEPAGE="https://www.espresso-pp.de";
+
+MY_PN="${PN//+/p}"
+if [[ ${PV} =  ]]; then
+   EGIT_REPO_URI="git://github.com/${MY_PN}/${MY_PN}.git 
http://github.com/${MY_PN}/${MY_PN}.git";
+   inherit git-r3
+else
+   SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+   virtual/mpi
+   dev-libs/boost:=[python,mpi,${PYTHON_USEDEP}]
+   sci-libs/fftw:3.0
+   >=dev-python/mpi4py-2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+   src_configure_internal() {
+   local mycmakeargs=(
+   -DEXTERNAL_BOOST=ON
+   -DEXTERNAL_MPI4PY=ON
+   -DWITH_RC_FILES=OFF
+   )
+   cmake-utils_src_configure
+   }
+   python_foreach_impl src_configure_internal
+}
+
+src_compile() {
+   python_foreach_impl cmake-utils_src_make
+}
+
+src_test() {
+   python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+   python_foreach_impl cmake-utils_src_install
+}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

2016-12-14 Thread Christoph Junghans

commit: 912809d2c1514020c7b3be5c3c43be13de4ae5a9
Author: Christoph Junghans  gentoo  org>
AuthorDate: Wed Dec 14 20:58:53 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Wed Dec 14 21:00:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=912809d2

sci-physics/espresso++: remove old

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 sci-physics/espresso++/Manifest|  1 -
 sci-physics/espresso++/espresso++-1.9.3.ebuild | 46 --
 2 files changed, 47 deletions(-)

diff --git a/sci-physics/espresso++/Manifest b/sci-physics/espresso++/Manifest
index 4d51233..23a099e 100644
--- a/sci-physics/espresso++/Manifest
+++ b/sci-physics/espresso++/Manifest
@@ -1,2 +1 @@
-DIST espresso++-1.9.3.tar.bz2 14714575 SHA256 
602541c9e5889aeff30462f252fa5f2af7d818808ce946d11ee33500f4f2c959 SHA512 
0ac90c6b09da0e7503e83cff8180373249760206fc0035b72868376abbd4a0d9121e7c92ae286493230af2080221464fc0f9428ed78101bde32eb926f07bb010
 WHIRLPOOL 
f9fb22f4d113a47eee1d9203d4dabf5f5cef3347d7c17583459a69a6bee7392675a0f5ebab09315c4a740dba2fb412c13f3cb74ba3e8d0c99f51f62452af28e8
 DIST espresso++-1.9.4.tar.gz 23954404 SHA256 
dc08381259394a4bd076bfe9b4bd53d687911025258e3a17a473ada12e2e5e68 SHA512 
0b5c8ad81c1d6b742909533c58cd791f1702270778f6f140e84108f0da8313418f7fa39d83de2e24f8308e887a1c41d2fcdd0a33ef505d08244a235f95fe611d
 WHIRLPOOL 
c56e1055f8edc46b3c80f1d511dc925e982137600998fa6ecc0bb8aedf90cd701241f12ab3420afa2198b5b6584458b829dc01fd3c68a5223faeb07e833d

diff --git a/sci-physics/espresso++/espresso++-1.9.3.ebuild 
b/sci-physics/espresso++/espresso++-1.9.3.ebuild
deleted file mode 100644
index 55b0285..
--- a/sci-physics/espresso++/espresso++-1.9.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="extensible, flexible, fast and parallel simulation software for 
soft matter research"
-HOMEPAGE="https://www.espresso-pp.de";
-
-if [[ ${PV} =  ]]; then
-   EHG_REPO_URI="https://bitbucket.org/${PN//+/p}/${PN//+/p}";
-   inherit mercurial
-   KEYWORDS=
-else
-   inherit vcs-snapshot
-   
#SRC_URI="https://espressopp.mpip-mainz.mpg.de/Download/${PN//+/p}-${PV}.tgz";
-   SRC_URI="https://bitbucket.org/${PN//+/p}/${PN//+/p}/get/v${PV}.tar.bz2 
-> ${P}.tar.bz2"
-   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-   virtual/mpi
-   dev-libs/boost:=[python,mpi,${PYTHON_USEDEP}]
-   sci-libs/fftw:3.0
-   dev-python/mpi4py"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-   local mycmakeargs=(
-   -DEXTERNAL_BOOST=ON
-   -DEXTERNAL_MPI4PY=ON
-   -DWITH_RC_FILES=OFF
-   )
-   cmake-utils_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2016-11-16 Thread Christoph Junghans

commit: 2a73c4db0593360558c423674a37a147dfecb6e2
Author: Christoph Junghans  gentoo  org>
AuthorDate: Wed Nov 16 20:53:01 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Wed Nov 16 20:53:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a73c4db

sci-physics/espresso: fix deps

Package-Manager: portage-2.3.0

 sci-physics/espresso/espresso-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index 48c5e8d..6a10134 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -41,7 +41,7 @@ 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 )
+   hdf5? ( sci-libs/hdf5:= )
packages? ( dev-tcltk/tcllib )"
 
 DEPEND="${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2016-11-13 Thread Christoph Junghans

commit: f6a0d3a162bfd5d496af1db2f7d7c76b616345f8
Author: Christoph Junghans  gentoo  org>
AuthorDate: Mon Nov 14 01:56:40 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Mon Nov 14 01:56:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a0d3a1

sci-physics/espresso: update metadata

Package-Manager: portage-2.3.0

 sci-physics/espresso/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/espresso/metadata.xml 
b/sci-physics/espresso/metadata.xml
index 3d99b65..76b9c10 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -2,7 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 
   
-ott...@gentoo.org
+jungh...@gentoo.org
 Christoph Junghans

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

2016-11-13 Thread Christoph Junghans

commit: d5f1c8b92cddf862a6136e697333ecbd861ccc65
Author: Christoph Junghans  gentoo  org>
AuthorDate: Mon Nov 14 01:56:31 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Mon Nov 14 01:56:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5f1c8b9

sci-physics/espresso++: update metadata

Package-Manager: portage-2.3.0

 sci-physics/espresso++/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/espresso++/metadata.xml 
b/sci-physics/espresso++/metadata.xml
index 170aa60..170ce13 100644
--- a/sci-physics/espresso++/metadata.xml
+++ b/sci-physics/espresso++/metadata.xml
@@ -2,7 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 

-   ott...@gentoo.org
+   jungh...@gentoo.org
Christoph Junghans

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2016-09-06 Thread Christoph Junghans

commit: d80d2bcc2ae5878a1608c6094f1164ad86519c1e
Author: Christoph Junghans  gentoo  org>
AuthorDate: Tue Sep  6 21:25:06 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Tue Sep  6 21:25:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d80d2bcc

sci-physics/espresso: add support for python3

Package-Manager: portage-2.2.28

 sci-physics/espresso/espresso-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index 6b906a0..caba652 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit cmake-utils python-single-r1 savedconfig

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2016-08-03 Thread Christoph Junghans

commit: 951bafca9ed6046b5584a6d7a9b44de579fff99d
Author: Christoph Junghans  gentoo  org>
AuthorDate: Wed Aug  3 18:00:08 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Wed Aug  3 18:00:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=951bafca

sci-physics/espresso: live ebuild update

Package-Manager: portage-2.2.28

 sci-physics/espresso/espresso-.ebuild | 50 +++
 sci-physics/espresso/metadata.xml |  2 +-
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index 66a0214..6b906a0 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -24,24 +24,25 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cuda doc examples +fftw +hdf5 packages python test -tk"
+IUSE="cuda doc examples +fftw +hdf5 packages +python tcl test"
 
-REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+   packages? ( tcl )
+   || ( python tcl )
+   ${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
+   ${PYTHON_DEPS}
python? (
-   ${PYTHON_DEPS}
>dev-python/cython-0.22[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
)
-   dev-lang/tcl:0=
+   tcl? ( dev-lang/tcl:0= )
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
dev-libs/boost:=[mpi]
-   virtual/mpi
hdf5? ( sci-libs/hdf5 )
-   packages? ( dev-tcltk/tcllib )
-   tk? ( >=dev-lang/tk-8.4.18-r1:0= )"
+   packages? ( dev-tcltk/tcllib )"
 
 DEPEND="${RDEPEND}
doc? (
@@ -51,10 +52,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS NEWS README ChangeLog )
 
-pkg_setup() {
-   use python && python-single-r1_pkg_setup
-}
-
 src_prepare() {
use cuda && cuda_src_prepare
cmake-utils_src_prepare
@@ -63,9 +60,12 @@ src_prepare() {
 src_configure() {
mycmakeargs=(
-DWITH_CUDA=$(usex cuda)
+   -DPYTHON_EXECUTABLE="${PYTHON}"
-DWITH_PYTHON=$(usex python)
+   -DWITH_TCL=$(usex tcl)
-DWITH_TESTS=$(usex test)
-   -DWITH_H5MD=$(usex hdf5)
+   -DWITH_SCAFACOS=ON
+   -DINSTALL_PYPRESSO=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-DCMAKE_SKIP_RPATH=YES
@@ -81,7 +81,7 @@ src_compile() {
 }
 
 src_install() {
-   local i
+   local i docdir="${S}"
 
cmake-utils_src_install
 
@@ -91,24 +91,22 @@ src_install() {
save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
 
if use doc; then
-   if [[ ${PV} =  ]] ; then
-   newdoc ${CMAKE_BUILD_DIR}/doc/dg/dg.pdf 
developer_guide.pdf
-   newdoc ${CMAKE_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf
-   for i in 
${CMAKE_BUILD_DIR}/doc/tutorials/*/*/[0-9]*.pdf; do
-   newdoc "${i}" "tutorial_${i##*/}"
-   done
-   else
-   newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf
-   for i in "${S}"/doc/tutorials/*/*/[0-9]*.pdf; do
-   newdoc "${i}" "tutorial_${i##*/}"
+   [[ ${PV} =  ]] && docdir="${CMAKE_BUILD_DIR}"
+   newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
+   newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
+   for j in $(usev python) $(usev tcl); do
+   for i in "${docdir}/doc/tutorials/${j}"/*/[0-9]*.pdf; do
+   newdoc "${i}" "${j}_tutorial_${i##*/}"
done
-   fi
+   done
dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
fi
 
if use examples; then
-   insinto /usr/share/${PN}/examples
-   doins -r samples/*
+   for i in $(usev python) $(usev tcl); do
+   insinto "/usr/share/${PN}/examples/${i}"
+   doins -r samples/${i}/.
+   done
fi
 
if use packages; then

diff --git a/sci-physics/espresso/metadata.xml 
b/sci-physics/espresso/metadata.xml
index 13db459..3d99b65 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -12,6 +12,6 @@
   
 Enable cuda support
 Installs the examples
-Installs extra subpackages
+Installs extra TCL subpackages

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

2016-07-27 Thread Christoph Junghans

commit: 23d148c25f606f2804c114c5f4355b72f10294bc
Author: Christoph Junghans  gentoo  org>
AuthorDate: Wed Jul 27 17:10:13 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Wed Jul 27 17:10:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d148c2

sci-physics/espresso++: live ebuild update

Package-Manager: portage-2.2.28

 sci-physics/espresso++/espresso++-.ebuild | 31 ---
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/sci-physics/espresso++/espresso++-.ebuild 
b/sci-physics/espresso++/espresso++-.ebuild
index fdce523..3d3ecff 100644
--- a/sci-physics/espresso++/espresso++-.ebuild
+++ b/sci-physics/espresso++/espresso++-.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit cmake-utils python-single-r1
+inherit cmake-utils python-r1
 
 DESCRIPTION="A Modern Multiscale Simulation Package for Soft Matter Systems"
 HOMEPAGE="https://www.espresso-pp.de";
@@ -31,14 +31,29 @@ RDEPEND="${PYTHON_DEPS}
virtual/mpi
dev-libs/boost:=[python,mpi,${PYTHON_USEDEP}]
sci-libs/fftw:3.0
-   dev-python/mpi4py"
+   dev-python/mpi4py[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_configure() {
-   local mycmakeargs=(
-   -DEXTERNAL_BOOST=ON
-   -DEXTERNAL_MPI4PY=ON
-   -DWITH_RC_FILES=OFF
-   )
-   cmake-utils_src_configure
+   src_configure_internal() {
+   local mycmakeargs=(
+   -DEXTERNAL_BOOST=ON
+   -DEXTERNAL_MPI4PY=ON
+   -DWITH_RC_FILES=OFF
+   )
+   cmake-utils_src_configure
+   }
+   python_foreach_impl src_configure_internal
+}
+
+src_compile() {
+   python_foreach_impl cmake-utils_src_make
+}
+
+src_test() {
+   python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+   python_foreach_impl cmake-utils_src_install
 }

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2016-07-22 Thread Christoph Junghans

commit: 48013638ebb8cafa036106d6ed9c62db6e5fde77
Author: Christoph Junghans  gentoo  org>
AuthorDate: Fri Jul 22 20:30:05 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Fri Jul 22 20:30:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48013638

sci-physics/espresso: live ebuild update

Installed fixed in espressomd/espresso#749
Package-Manager: portage-2.2.28

 sci-physics/espresso/espresso-.ebuild | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
index 01c45af..66a0214 100644
--- a/sci-physics/espresso/espresso-.ebuild
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -69,6 +69,7 @@ src_configure() {
-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
 }
@@ -82,14 +83,7 @@ src_compile() {
 src_install() {
local i
 
-   #https://github.com/espressomd/espresso/issues/733
-   #cmake-utils_src_install
-   dobin ${CMAKE_BUILD_DIR}/Espresso
-   dolib.so "${CMAKE_BUILD_DIR}"/src/core/{,*}/lib*.so
-   if use python; then
-   insinto $(python_get_sitedir)/${PN}md
-   doins -r "${CMAKE_BUILD_DIR}"/src/python/espressomd
-   fi
+   cmake-utils_src_install
 
insinto /usr/share/${PN}/
doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
@@ -134,6 +128,6 @@ pkg_postinst() {
elog "and reemerge with USE=savedconfig"
echo
elog "For a full feature list see:"
-   elog "/usr/share/${PN}/myconfig-sample.h"
+   elog "/usr/share/${PN}/myconfig-sample.hpp"
echo
 }

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2016-07-19 Thread Christoph Junghans

commit: ddc965faf13b5bb5d69e206f4ad4c3167076ec49
Author: Christoph Junghans  gentoo  org>
AuthorDate: Tue Jul 19 16:57:58 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Tue Jul 19 16:58:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc965fa

sci-physics/espresso: added live ebuild

Package-Manager: portage-2.2.28

 sci-physics/espresso/espresso-.ebuild | 139 ++
 1 file changed, 139 insertions(+)

diff --git a/sci-physics/espresso/espresso-.ebuild 
b/sci-physics/espresso/espresso-.ebuild
new file mode 100644
index 000..01c45af
--- /dev/null
+++ b/sci-physics/espresso/espresso-.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+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} =  ]]; then
+   EGIT_REPO_URI="git://github.com/espressomd/espresso.git 
https://github.com/espressomd/espresso.git";
+   EGIT_BRANCH="master"
+   inherit git-r3
+   KEYWORDS=""
+else
+   SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda doc examples +fftw +hdf5 packages python test -tk"
+
+REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+   python? (
+   ${PYTHON_DEPS}
+   >dev-python/cython-0.22[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   dev-lang/tcl:0=
+   cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+   fftw? ( sci-libs/fftw:3.0 )
+   dev-libs/boost:=[mpi]
+   virtual/mpi
+   hdf5? ( sci-libs/hdf5 )
+   packages? ( dev-tcltk/tcllib )
+   tk? ( >=dev-lang/tk-8.4.18-r1:0= )"
+
+DEPEND="${RDEPEND}
+   doc? (
+   app-doc/doxygen[dot]
+   dev-texlive/texlive-latexextra
+   virtual/latex-base )"
+
+DOCS=( AUTHORS NEWS README ChangeLog )
+
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   use cuda && cuda_src_prepare
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   mycmakeargs=(
+   -DWITH_CUDA=$(usex cuda)
+   -DWITH_PYTHON=$(usex python)
+   -DWITH_TESTS=$(usex test)
+   -DWITH_H5MD=$(usex hdf5)
+   -DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
+   -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
+   -DCMAKE_SKIP_RPATH=YES
+   )
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   cmake-utils_src_compile
+   use doc && cmake-utils_src_make doxygen
+   [[ ${PV} =  ]] && use doc && cmake-utils_src_make ug dg tutorials
+}
+
+src_install() {
+   local i
+
+   #https://github.com/espressomd/espresso/issues/733
+   #cmake-utils_src_install
+   dobin ${CMAKE_BUILD_DIR}/Espresso
+   dolib.so "${CMAKE_BUILD_DIR}"/src/core/{,*}/lib*.so
+   if use python; then
+   insinto $(python_get_sitedir)/${PN}md
+   doins -r "${CMAKE_BUILD_DIR}"/src/python/espressomd
+   fi
+
+   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
+   if [[ ${PV} =  ]] ; then
+   newdoc ${CMAKE_BUILD_DIR}/doc/dg/dg.pdf 
developer_guide.pdf
+   newdoc ${CMAKE_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf
+   for i in 
${CMAKE_BUILD_DIR}/doc/tutorials/*/*/[0-9]*.pdf; do
+   newdoc "${i}" "tutorial_${i##*/}"
+   done
+   else
+   newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf
+   for i in "${S}"/doc/tutorials/*/*/[0-9]*.pdf; do
+   newdoc "${i}" "tutorial_${i##*/}"
+   done
+   fi
+   dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
+   fi
+
+   if use examples; then
+   insinto /usr/share/${PN}/examples
+   doins -r samples/*
+   fi
+
+   if use packages; then
+   insinto /usr/share/${PN}/packages
+   doins -r packages/*
+   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/sh

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

2016-07-18 Thread Christoph Junghans

commit: 271a9f98674f3e5d3f989553e2d3eb0df445c800
Author: Christoph Junghans  gentoo  org>
AuthorDate: Mon Jul 18 16:38:42 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Mon Jul 18 19:40:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=271a9f98

sci-physics/espresso: version bump

Package-Manager: portage-2.2.28

 sci-physics/espresso/Manifest  |   1 +
 sci-physics/espresso/espresso-3.3.1.ebuild | 133 +
 2 files changed, 134 insertions(+)

diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 638d0ca..73ae97c 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1 +1,2 @@
 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

diff --git a/sci-physics/espresso/espresso-3.3.1.ebuild 
b/sci-physics/espresso/espresso-3.3.1.ebuild
new file mode 100644
index 000..7495405
--- /dev/null
+++ b/sci-physics/espresso/espresso-3.3.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 savedconfig
+
+DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
+HOMEPAGE="http://espressomd.org";
+
+if [[ ${PV} =  ]]; then
+   EGIT_REPO_URI="git://github.com/espressomd/espresso.git 
https://github.com/espressomd/espresso.git";
+   EGIT_BRANCH="master"
+   inherit autotools git-r3
+   KEYWORDS=""
+else
+   SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="X cuda doc examples +fftw mpi packages python test -tk"
+
+REQUIRED_USE="
+   python? ( ${PYTHON_REQUIRED_USE} )
+   tk? ( X )"
+
+RESTRICT="tk? ( test )"
+
+RDEPEND="
+   python? (
+   ${PYTHON_DEPS}
+   dev-python/cython[${PYTHON_USEDEP}]
+   dev-python/numpy[${PYTHON_USEDEP}]
+   )
+   dev-lang/tcl:0=
+   cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+   fftw? ( sci-libs/fftw:3.0 )
+   mpi? ( virtual/mpi )
+   packages? ( dev-tcltk/tcllib )
+   tk? ( >=dev-lang/tk-8.4.18-r1:0= )
+   X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}
+   doc? (
+   app-doc/doxygen[dot]
+   dev-texlive/texlive-latexextra
+   virtual/latex-base )"
+
+DOCS=( AUTHORS NEWS README ChangeLog )
+
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   use cuda && cuda_src_prepare
+   default
+}
+
+src_configure() {
+   [[ ${PV} =  ]] && eautoreconf
+   CXX=$(usex mpi "mpic++" "$(tc-getCXX)") econf \
+   $(use_with fftw) \
+   $(use_with cuda) \
+   $(use_with python python-interface) \
+   $(use_with mpi) \
+   $(use_with tk) \
+   $(use_with X x)
+   restore_config myconfig.hpp
+}
+
+src_compile() {
+   default
+   use doc && emake doxygen
+   [[ ${PV} =  ]] && use doc && emake ug dg tutorials
+}
+
+src_install() {
+   local i
+
+   default
+
+   insinto /usr/share/${PN}
+   doins myconfig-sample.hpp
+
+   save_config src/core/myconfig-final.hpp
+
+   if use doc; then
+   if [[ ${PV} =  ]] ; then
+   newdoc doc/dg/dg.pdf developer_guide.pdf
+   newdoc doc/ug/ug.pdf user_guide.pdf
+   for i in doc/tutorials/*/[0-9]*.pdf; do
+   newdoc "${i}" "tutorial_${i##*/}"
+   done
+   else
+   newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf
+   for i in "${S}"/doc/tutorials/*/[0-9]*.pdf; do
+   newdoc "${i}" "tutorial_${i##*/}"
+   done
+   fi
+   dodoc -r doc/doxygen/html
+   fi
+
+   if use examples; then
+   insinto /usr/share/${PN}/examples
+   doins -r samples/*
+   fi
+
+   if use packages; then
+   insinto /usr/share/${PN}/packages
+   doins -r packages/*
+   fi
+}
+
+

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

2016-07-17 Thread Christoph Junghans

commit: 5e8af000be42be0467928abc5a23fe7d1d2d9f38
Author: Christoph Junghans  gentoo  org>
AuthorDate: Mon Jul 18 02:47:18 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Mon Jul 18 02:47:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e8af000

sci-physics/espresso++: remove old

Package-Manager: portage-2.2.28

 sci-physics/espresso++/Manifest|  1 -
 sci-physics/espresso++/espresso++-1.9.2.ebuild | 50 --
 2 files changed, 51 deletions(-)

diff --git a/sci-physics/espresso++/Manifest b/sci-physics/espresso++/Manifest
index 36c233b..7f1b5b2 100644
--- a/sci-physics/espresso++/Manifest
+++ b/sci-physics/espresso++/Manifest
@@ -1,2 +1 @@
-DIST espresso++-1.9.2.tar.bz2 14696734 SHA256 
7bdcf502661809dc39a18b3f7fa0b0799adbf801ddb6681a197ab1bd9c7915b0 SHA512 
2fffd30c24e12c079e5d3c9c98464db7add21b67e848104dc6f3952635595e4108a4d27dd5a852775cb0515e58be7a302602b34fb51dd67dff8f8677d2abb1fc
 WHIRLPOOL 
0fe4ea6f452dd93861a3e04469b5ee8b37c55ccf4523e6ae575b99b3223f861e8e78675a3ef74ba5a3cfe3c9a039453f1eadea4fc99e339db54ac1e1304493b7
 DIST espresso++-1.9.3.tar.bz2 14714575 SHA256 
602541c9e5889aeff30462f252fa5f2af7d818808ce946d11ee33500f4f2c959 SHA512 
0ac90c6b09da0e7503e83cff8180373249760206fc0035b72868376abbd4a0d9121e7c92ae286493230af2080221464fc0f9428ed78101bde32eb926f07bb010
 WHIRLPOOL 
f9fb22f4d113a47eee1d9203d4dabf5f5cef3347d7c17583459a69a6bee7392675a0f5ebab09315c4a740dba2fb412c13f3cb74ba3e8d0c99f51f62452af28e8

diff --git a/sci-physics/espresso++/espresso++-1.9.2.ebuild 
b/sci-physics/espresso++/espresso++-1.9.2.ebuild
deleted file mode 100644
index 2e7fd39..000
--- a/sci-physics/espresso++/espresso++-1.9.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils multilib python-single-r1
-
-DESCRIPTION="extensible, flexible, fast and parallel simulation software for 
soft matter research"
-HOMEPAGE="https://www.espresso-pp.de";
-
-if [[ ${PV} =  ]]; then
-   EHG_REPO_URI="https://bitbucket.org/${PN//+/p}/${PN//+/p}";
-   EHG_REVISION="default"
-   inherit mercurial
-   KEYWORDS=
-else
-   inherit vcs-snapshot
-   
#SRC_URI="https://espressopp.mpip-mainz.mpg.de/Download/${PN//+/p}-${PV}.tgz";
-   SRC_URI="https://bitbucket.org/${PN//+/p}/${PN//+/p}/get/v${PV}.tar.bz2 
-> ${P}.tar.bz2"
-   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-   virtual/mpi
-   dev-libs/boost[python,mpi,${PYTHON_USEDEP}]
-   sci-libs/fftw:3.0
-   dev-python/mpi4py"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_configure() {
-   mycmakeargs=(
-   -DEXTERNAL_BOOST=ON
-   -DEXTERNAL_MPI4PY=ON
-   -DLIB="$(get_libdir)"
-   -DWITH_RC_FILES=OFF
-   )
-   cmake-utils_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

2016-07-17 Thread Christoph Junghans

commit: 22044f9db79ebf0b06715cb505fab32241c77dbe
Author: Christoph Junghans  gentoo  org>
AuthorDate: Mon Jul 18 02:46:46 2016 +
Commit: Christoph Junghans  gentoo  org>
CommitDate: Mon Jul 18 02:47:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22044f9d

sci-physics/espresso++: imported live ebuild from sci

Package-Manager: portage-2.2.28

 sci-physics/espresso++/espresso++-.ebuild | 44 +++
 1 file changed, 44 insertions(+)

diff --git a/sci-physics/espresso++/espresso++-.ebuild 
b/sci-physics/espresso++/espresso++-.ebuild
new file mode 100644
index 000..fdce523
--- /dev/null
+++ b/sci-physics/espresso++/espresso++-.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A Modern Multiscale Simulation Package for Soft Matter Systems"
+HOMEPAGE="https://www.espresso-pp.de";
+
+MY_PN="${PN//+/p}"
+if [[ ${PV} =  ]]; then
+   EGIT_REPO_URI="git://github.com/${MY_PN}/${MY_PN}.git 
http://github.com/${MY_PN}/${MY_PN}.git";
+   inherit git-r3
+else
+   SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+   virtual/mpi
+   dev-libs/boost:=[python,mpi,${PYTHON_USEDEP}]
+   sci-libs/fftw:3.0
+   dev-python/mpi4py"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   local mycmakeargs=(
+   -DEXTERNAL_BOOST=ON
+   -DEXTERNAL_MPI4PY=ON
+   -DWITH_RC_FILES=OFF
+   )
+   cmake-utils_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/files/, sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/files/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/, sci-physics/espresso/files/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/files/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

[gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso++/

35 matches

Site Navigation

Mail list logo

Footer information