[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 

[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/, 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/, 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/, 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
+