aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-physics/espresso++/ChangeLog6
-rw-r--r--sci-physics/espresso++/espresso++-9999.ebuild18
-rw-r--r--sci-physics/espresso++/metadata.xml3
3 files changed, 10 insertions, 17 deletions
diff --git a/sci-physics/espresso++/ChangeLog b/sci-physics/espresso++/ChangeLog
index 637498213..3d4182ad4 100644
--- a/sci-physics/espresso++/ChangeLog
+++ b/sci-physics/espresso++/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-physics/espresso++
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 07 Feb 2014; Christoph Junghans <ottxor@gentoo.org> espresso++-9999.ebuild,
+ metadata.xml:
+ live ebuild update
+
09 Oct 2013; Christoph Junghans <ottxor@gentoo.org> espresso++-9999.ebuild:
sync with gx86
diff --git a/sci-physics/espresso++/espresso++-9999.ebuild b/sci-physics/espresso++/espresso++-9999.ebuild
index ae17b8447..694093a10 100644
--- a/sci-physics/espresso++/espresso++-9999.ebuild
+++ b/sci-physics/espresso++/espresso++-9999.ebuild
@@ -20,34 +20,26 @@ else
SRC_URI="https://espressopp.mpip-mainz.mpg.de/Download/${PN//+/p}-${PV}.tgz"
S="${WORKDIR}/${PN//+/p}-${PV}"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
- PATCHES=( "${FILESDIR}/${P}-multilib.patch" )
fi
-CMAKE_REMOVE_MODULES_LIST="FindBoost"
-
EHP_OPTS="--config hostfingerprints.hg.berlios.de=f4:79:d2:17:f8:0c:9b:c2:6e:65:60:2a:49:0e:09:79:85:6d:4b:e3"
EHG_CLONE_CMD="hg clone ${EHG_QUIET_CMD_OPT} ${EHP_OPTS} --pull --noupdate"
EHG_PULL_CMD="hg pull ${EHG_QUIET_CMD_OPT} ${EHP_OPTS}"
-LICENSE="GPL-3 !system-boost? ( Boost-1.0 )"
+LICENSE="GPL-3"
SLOT="0"
-IUSE="-system-boost"
+IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
virtual/mpi
- system-boost? ( dev-libs/boost[python,mpi,${PYTHON_USEDEP}] )"
+ dev-libs/boost[python,mpi,${PYTHON_USEDEP}]
+ dev-python/mpi4py"
DEPEND="${RDEPEND}"
DOCS=( AUTHORS NEWS README )
src_configure() {
- mycmakeargs=( $(cmake-utils_use system-boost EXTERNAL_BOOST) -DLIB="$(get_libdir)" )
+ mycmakeargs=( -DEXTERNAL_BOOST=ON -DEXTERNAL_MPI4PY=ON -DLIB="$(get_libdir)" )
cmake-utils_src_configure
}
-
-src_install() {
- cmake-utils_src_install
- rm "${ED}/usr/bin/ESPRC" || die
- rmdir "${ED}/usr/bin" || die
-}
diff --git a/sci-physics/espresso++/metadata.xml b/sci-physics/espresso++/metadata.xml
index 2d6dc5360..a556ddb82 100644
--- a/sci-physics/espresso++/metadata.xml
+++ b/sci-physics/espresso++/metadata.xml
@@ -6,7 +6,4 @@
<email>ottxor@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
- <use>
- <flag name="system-boost">Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
- </use>
</pkgmetadata>