aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2013-01-25 19:30:46 -0700
committerChristoph Junghans <ottxor@gentoo.org>2013-01-25 19:30:46 -0700
commit79be03b7042415dde7313359fe7644c71d1edd2b (patch)
treefcb151e5929b50d7bdd90b41f0c8aefd0754e7d8
parentmerging github && overlays.g.o (diff)
downloadsci-79be03b7042415dde7313359fe7644c71d1edd2b.tar.gz
sci-79be03b7042415dde7313359fe7644c71d1edd2b.tar.bz2
sci-79be03b7042415dde7313359fe7644c71d1edd2b.zip
sync with gx86
Package-Manager: portage-2.2.0_alpha161
-rw-r--r--sci-physics/espresso++/ChangeLog5
-rw-r--r--sci-physics/espresso++/espresso++-9999.ebuild14
2 files changed, 12 insertions, 7 deletions
diff --git a/sci-physics/espresso++/ChangeLog b/sci-physics/espresso++/ChangeLog
index 49db84a0b..ce08d35a4 100644
--- a/sci-physics/espresso++/ChangeLog
+++ b/sci-physics/espresso++/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-physics/espresso++
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 26 Jan 2013; Christoph Junghans <ottxor@gentoo.org> espresso++-9999.ebuild:
+ sync with gx86
+
23 Dec 2012; 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 d09ae36ff..e7ae60783 100644
--- a/sci-physics/espresso++/espresso++-9999.ebuild
+++ b/sci-physics/espresso++/espresso++-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.1.0.ebuild,v 1.5 2012/05/06 23:08:00 ottxor Exp $
-EAPI=4
+EAPI=5
PYTHON_DEPEND="2:2.6"
@@ -16,11 +16,13 @@ if [[ ${PV} = 9999 ]]; then
EHG_REVISION="default"
inherit mercurial
else
- SRC_URI="https://www.espresso-pp.de/Download/${PN%++}pp_${PV//./_}.tgz"
- S="${WORKDIR}/${PN%++}pp"
+ SRC_URI="https://espressopp.mpip-mainz.mpg.de/Download/${PN//+/p}-${PV}.tgz"
+ S="${WORKDIR}/${PN//+/p}-${PV}"
fi
-LICENSE="GPL-3"
+CMAKE_REMOVE_MODULES_LIST="FindBoost"
+
+LICENSE="GPL-3 !system-boost? ( Boost-1.0 )"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
IUSE="-system-boost"
@@ -40,7 +42,7 @@ pkg_setup() {
src_configure() {
mycmakeargs=(
- $(cmake-utils_use system-boost EXTERNAL_BOOST)
+ $(cmake-utils_use system-boost EXTERNAL_BOOST)
)
cmake-utils_src_configure
}