[gentoo-commits] proj/sci:master commit in: sci-chemistry/ball/

[Justin Lecher]

commit:     4b4e19cbc59b4108251e0613aaefe16f72768539
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 27 06:41:39 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Mar 27 06:41:39 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4b4e19cb

sci-chemistry/ball: Import tree changes

Package-Manager: portage-2.2.10

---
 sci-chemistry/ball/ChangeLog        |  3 +++
 sci-chemistry/ball/ball-9999.ebuild | 35 ++++++++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/sci-chemistry/ball/ChangeLog b/sci-chemistry/ball/ChangeLog
index d90512f..3a9a297 100644
--- a/sci-chemistry/ball/ChangeLog
+++ b/sci-chemistry/ball/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Mar 2014; Justin Lecher <jlec@g.o> ball-9999.ebuild:
+  Import tree changes
+
   06 Jan 2014; Justin Lecher <jlec@g.o> ball-9999.ebuild:
   Switch from git-2 to git-r3
 

diff --git a/sci-chemistry/ball/ball-9999.ebuild b/sci-chemistry/ball/ball-9999.ebuild
index 9c8c921..e39865c 100644
--- a/sci-chemistry/ball/ball-9999.ebuild
+++ b/sci-chemistry/ball/ball-9999.ebuild
@@ -11,16 +11,23 @@ inherit cmake-utils git-r3 python-single-r1
 DESCRIPTION="Biochemical Algorithms Library"
 HOMEPAGE="http://www.ball-project.org/"
 SRC_URI=""
-EGIT_REPO_URI="https://bitbucket.org/ball/ball.git"
+EGIT_REPO_URI="http://bitbucket.org/ball/ball.git"
 
 SLOT="0"
 LICENSE="LGPL-2 GPL-3"
 KEYWORDS=""
-IUSE="cuda mpi +python sql +threads +webkit"
+IUSE="cuda mpi +python sql test +threads +webkit"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-cpp/eigen:3
 	dev-libs/boost
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qttest:4
+	dev-qt/qtwebkit:4
 	media-libs/glew
 	sci-libs/fftw:3.0[threads?]
 	sci-libs/gsl
@@ -28,14 +35,10 @@ RDEPEND="
 	sci-mathematics/lpsolve
 	virtual/opengl
 	x11-libs/libX11
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qttest:4
 	cuda? ( dev-util/nvidia-cuda-toolkit )
 	mpi? ( virtual/mpi )
-	sql? ( dev-qt/qtsql:4 )
 	python? ( ${PYTHON_DEPS} )
+	sql? ( dev-qt/qtsql:4 )
 	webkit? ( dev-qt/qtwebkit:4 )"
 DEPEND="${RDEPEND}
 	dev-python/sip
@@ -53,11 +56,21 @@ pkg_setup() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_use threads FFTW_THREADS)
-		$(cmake-utils_use_use cuda CUDA)
-		$(cmake-utils_use_use mpi MPI)
-		$(cmake-utils_use_use sql QTSQL)
-		$(cmake-utils_use_use webkit QTWEBKIT)
+		$(cmake-utils_use cuda MT_ENABLE_CUDA)
+		$(cmake-utils_use mpi MT_ENABLE_MPI)
+		$(cmake-utils_use sql BALL_HAS_QTSQL)
+		$(cmake-utils_use_use webkit USE_QTWEBKIT)
 		$(cmake-utils_use python BALL_PYTHON_SUPPORT)
 	)
 	cmake-utils_src_configure
+	local i
+	for i in "${S}"/data/*; do
+		ln -sf "${i}" "${BUILD_DIR}"/source/TEST/ || die
+		ln -sf "${i}" "${S}"/source/TEST/ || die
+	done
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use test && cmake-utils_src_make build_tests
 }