[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     20c442d83ee5b393544614e7148de4d222c2be2d
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Tue Jan 27 20:04:04 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Jan 27 20:04:04 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=20c442d8

src_test requires `make AllTests`

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 58f2eb0..56b8eda 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -74,4 +74,10 @@ src_configure() {
 			$(cmake-utils_use_build test TESTING)
 		)
 	cmake-utils_src_configure
-}
\ No newline at end of file
+}
+
+src_test() {
+	# Tests are not built by default
+	emake AllTests
+	cmake-utils_src_test
+}

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     504030d02eb42832d74f031fc8e11bf5707642e0
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Tue Jan 27 20:45:30 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Jan 27 20:45:30 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=504030d0

Add RESTRICT=test because the tests require sample data and X11

The sample data isn't in an easy-to-get tarball, rather it is in
a folder in the git repository
https://github.com/mantidproject/mantid/tree/master/Test/AutoTestData

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 56b8eda..260336d 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -18,6 +18,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc opencl paraview shared-libs tcmalloc test"
+RESTRICT="test" # Testing requires sample data and X11 access
 
 RDEPEND="
 	${PYTHON_DEPS}

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     e3520823453ce02b40dd7de4c3b9b6e749dce4a3
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Wed Jan 28 08:22:28 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 08:22:28 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e3520823

Fortran eclass not needed

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index ecfcfe7..af5fb3f 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 FORTRAN_STANDARD=90
 PYTHON_COMPAT=python2_7
-inherit eutils cmake-utils fortran-2 versionator python-single-r1
+inherit eutils cmake-utils versionator python-single-r1
 
 MAJOR_PV=$(get_version_component_range 1-2)
 

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     c2e8d30665c4dd1aa47f600bcaac1bd39a656056
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Wed Jan 28 08:17:58 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 08:17:58 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c2e8d306

Added PYTHON_USEDEP

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 260336d..4474a49 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -22,33 +22,33 @@ RESTRICT="test" # Testing requires sample data and X11 access
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=sci-libs/nexus-4.2
+	>=sci-libs/nexus-4.2[${PYTHON_USEDEP}]
 	>=dev-libs/poco-1.4.2
-	dev-libs/boost[python]
+	dev-libs/boost[python,${PYTHON_USEDEP}]
 	opencl?		( virtual/opencl )
 	tcmalloc?	( dev-util/google-perftools )
-	paraview?	( >=sci-visualization/paraview-4 )
+	paraview?	( >=sci-visualization/paraview-4[python,${PYTHON_USEDEP}] )
 	virtual/opengl
 	dev-qt/qthelp
 	x11-libs/qscintilla
 	x11-libs/qwt:5
 	x11-libs/qwtplot3d
-	dev-python/PyQt4
+	dev-python/PyQt4[${PYTHON_USEDEP}]
 	sci-libs/gsl
-	dev-python/ipython[qt4]
-	dev-python/numpy
-	sci-libs/scipy
+	dev-python/ipython[qt4,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
 	dev-cpp/muParser
 	dev-libs/jsoncpp
 	dev-libs/openssl
-	sci-libs/opencascade
+	sci-libs/opencascade[qt4]
 "
 
 DEPEND="${RDEPEND}
 	dev-python/sphinx
 	doc?	( app-doc/doxygen
-		  dev-python/sphinx
-		  dev-python/sphinx-bootstrap-theme )
+		  dev-python/sphinx[${PYTHON_USEDEP}]
+		  dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}] )
 	test?	( dev-util/cppcheck )
 "
 

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     cf8accd1ee9ef6a0c2581e51d1c96d52925b8815
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Thu Jan 29 15:38:08 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 15:38:08 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cf8accd1

Added useflag for undocumented NO_OPENCASCADE option

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 5 +++--
 sci-visualization/mantid/metadata.xml        | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 6776674..d877497 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${MAJOR_PV}/${P}-Source.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc opencl paraview shared-libs tcmalloc test"
+IUSE="doc +opencascade opencl paraview shared-libs tcmalloc test"
 RESTRICT="test" # Testing requires sample data and X11 access
 
 # There is a list of dependencies on the Mantid website at:
@@ -46,7 +46,7 @@ RDEPEND="
 	dev-cpp/muParser
 	dev-libs/jsoncpp
 	dev-libs/openssl
-	sci-libs/opencascade[qt4]
+	opencascade?	( sci-libs/opencascade[qt4] )
 "
 
 DEPEND="${RDEPEND}
@@ -68,6 +68,7 @@ src_configure() {
 	export CPPFLAGS="-DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP ${CPPFLAGS}"
 	mycmakeargs=(	$(cmake-utils_use_enable doc QTASSISTANT)
 			$(cmake-utils_use_use doc DOT)
+			$(cmake-utils_use_no opencascade)
 			$(cmake-utils_use opencl OPENCL_BUILD)
 			$(cmake-utils_use_build shared-libs SHARED_LIBS)
 			$(cmake-utils_use_use tcmalloc TCMALLOC)

diff --git a/sci-visualization/mantid/metadata.xml b/sci-visualization/mantid/metadata.xml
index 64152fc..44843e5 100644
--- a/sci-visualization/mantid/metadata.xml
+++ b/sci-visualization/mantid/metadata.xml
@@ -15,6 +15,7 @@
 </longdescription>
 <use>
 	<flag name="doc">Generate documentation with <pkg>app-doc/doxygen</pkg>, QT Assistant etc</flag>
+	<flag name="opencascade">Use OpenCascade to show 3D models of instruments</flag>
 	<flag name="opencl">Use OpenCL to accelerate calculations</flag>
 	<flag name="paraview">Enable the Visualisation and Analysis Toolkit ExtensionS (VATES)</flag>
 	<flag name="shared-libs">Build shared libraries</flag>

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     0501851b45221f7056b5ac5be5cd26b2ad3ad941
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Wed Jan 28 08:19:55 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 08:19:55 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0501851b

Removed commented-out pkg_setup

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 4474a49..ecfcfe7 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -60,11 +60,6 @@ src_prepare() {
 		"${FILESDIR}/${P}-minigzip-OF.patch"
 }
 
-# pkg_setup() {
-# 	python-single-r1_pkg_setup
-# 	fortran-2_pkg_setup
-# }
-
 src_configure() {
 	mycmakeargs=(	$(cmake-utils_use_enable doc QTASSISTANT)
 			$(cmake-utils_use_use doc DOT)

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     03d95aedbfe3fad37cc724e72e847dcdad0b4a90
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Thu Jan 29 08:56:45 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 08:56:45 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=03d95aed

Added the dependencies listed on the Mantid website

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 52d953f..27a77d3 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -20,21 +20,26 @@ KEYWORDS="~amd64"
 IUSE="doc opencl paraview shared-libs tcmalloc test"
 RESTRICT="test" # Testing requires sample data and X11 access
 
+# There is a list of dependencies on the Mantid website at:
+# http://www.mantidproject.org/Mantid_Prerequisites
 RDEPEND="
 	${PYTHON_DEPS}
 	>=sci-libs/nexus-4.2[${PYTHON_USEDEP}]
 	>=dev-libs/poco-1.4.2
 	dev-libs/boost[python,${PYTHON_USEDEP}]
+	>=dev-qt/qthelp-4.6:4
+	>=dev-qt/qtwebkit-4.6:4
+	doc?		( >=dev-qt/assistant-4.6:4 )
 	opencl?		( virtual/opencl )
 	tcmalloc?	( dev-util/google-perftools )
 	paraview?	( >=sci-visualization/paraview-4[python,${PYTHON_USEDEP}] )
 	virtual/opengl
-	dev-qt/qthelp
 	x11-libs/qscintilla
 	x11-libs/qwt:5
 	x11-libs/qwtplot3d
 	dev-python/PyQt4[${PYTHON_USEDEP}]
 	sci-libs/gsl
+	dev-python/sip[${PYTHON_USEDEP}]
 	dev-python/ipython[qt4,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
@@ -48,7 +53,10 @@ DEPEND="${RDEPEND}
 	dev-python/sphinx
 	doc?	( app-doc/doxygen[dot]
 		  dev-python/sphinx[${PYTHON_USEDEP}]
-		  dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}] )
+		  dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+		  app-text/dvipng
+		  dev-texlive/texlive-latex
+		  dev-texlive/texlive-latexextra )
 	test?	( dev-util/cppcheck )
 "
 

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     03860e7508278d9a3a7a4a48f25aadcaf4e6de59
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Thu Jan 29 13:06:51 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 13:06:51 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=03860e75

using $PATCHES instead of a custom src_prepare

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 27a77d3..6776674 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -62,9 +62,7 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P}-Source"
 
-src_prepare() {
-	epatch	"${FILESDIR}/${P}-minigzip-OF.patch"
-}
+PATCHES=( "${FILESDIR}/${P}-minigzip-OF.patch" )
 
 src_configure() {
 	export CPPFLAGS="-DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP ${CPPFLAGS}"

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     b8faa24a8174cc49f97e25235d8b88c7e7266b6d
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Thu Jan 29 17:43:07 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 17:59:13 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b8faa24a

Realised that BUILD_SHARED_LIBS doesn't do anything so removed the option

In the main Mantid code, BUILD_SHARED_LIBS only has any effect under Cygwin.
It also appears in the test code, specifically the bundled gmock and gtest,
but there is a set(BUILD_SHARED_LIBS Off) command overriding what is set
on the command line anyway.

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 3 +--
 sci-visualization/mantid/metadata.xml        | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index ecb38b2..a848c4c 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${MAJOR_PV}/${P}-Source.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc +opencascade opencl paraview shared-libs tcmalloc test"
+IUSE="doc +opencascade opencl paraview tcmalloc test"
 RESTRICT="test" # Testing requires sample data and X11 access
 
 # There is a list of dependencies on the Mantid website at:
@@ -70,7 +70,6 @@ src_configure() {
 			$(cmake-utils_use_use doc DOT)
 			$(cmake-utils_use_no opencascade)
 			$(cmake-utils_use opencl OPENCL_BUILD)
-			$(cmake-utils_use_build shared-libs SHARED_LIBS)
 			$(cmake-utils_use_use tcmalloc TCMALLOC)
 			$(cmake-utils_use paraview MAKE_VATES)
 			$(cmake-utils_use_build test TESTING)

diff --git a/sci-visualization/mantid/metadata.xml b/sci-visualization/mantid/metadata.xml
index 44843e5..184c922 100644
--- a/sci-visualization/mantid/metadata.xml
+++ b/sci-visualization/mantid/metadata.xml
@@ -18,7 +18,6 @@
 	<flag name="opencascade">Use OpenCascade to show 3D models of instruments</flag>
 	<flag name="opencl">Use OpenCL to accelerate calculations</flag>
 	<flag name="paraview">Enable the Visualisation and Analysis Toolkit ExtensionS (VATES)</flag>
-	<flag name="shared-libs">Build shared libraries</flag>
 	<flag name="tcmalloc">Use thread-caching malloc</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     beed16073bb22e18607c6d899f827dd4badfbfd0
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Wed Jan 28 21:35:29 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 21:35:29 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=beed1607

Depend on doxygen with USE=dot

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 33ed01e..1c6abbb 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	dev-python/sphinx
-	doc?	( app-doc/doxygen
+	doc?	( app-doc/doxygen[dot]
 		  dev-python/sphinx[${PYTHON_USEDEP}]
 		  dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}] )
 	test?	( dev-util/cppcheck )

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     ff8b05da94b37de0ff432298884bbecb515a8f96
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Thu Jan 29 17:36:45 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 17:36:45 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ff8b05da

Using append-cppflags from flag-o-matic as suggested by @junghans

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index d877497..ecb38b2 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 FORTRAN_STANDARD=90
 PYTHON_COMPAT=python2_7
-inherit eutils cmake-utils versionator python-single-r1 multilib
+inherit eutils cmake-utils versionator python-single-r1 multilib flag-o-matic
 
 MAJOR_PV=$(get_version_component_range 1-2)
 
@@ -65,7 +65,7 @@ S="${WORKDIR}/${P}-Source"
 PATCHES=( "${FILESDIR}/${P}-minigzip-OF.patch" )
 
 src_configure() {
-	export CPPFLAGS="-DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP ${CPPFLAGS}"
+	append-cppflags -DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP
 	mycmakeargs=(	$(cmake-utils_use_enable doc QTASSISTANT)
 			$(cmake-utils_use_use doc DOT)
 			$(cmake-utils_use_no opencascade)

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     85d64673078ff32eb26eccfab1806ffb491fc062
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Thu Jan 29 18:00:43 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 18:00:43 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=85d64673

Switch USE_PRECOMPILED_HEADERS with pch USE flag

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 609cede..053c559 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${MAJOR_PV}/${P}-Source.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc +opencascade opencl paraview tcmalloc test"
+IUSE="doc +opencascade opencl paraview pch tcmalloc test"
 RESTRICT="test" # Testing requires sample data and X11 access
 
 # There is a list of dependencies on the Mantid website at:
@@ -73,6 +73,7 @@ src_configure() {
 			$(cmake-utils_use opencl OPENCL_BUILD)
 			$(cmake-utils_use_use tcmalloc TCMALLOC)
 			$(cmake-utils_use paraview MAKE_VATES)
+			$(cmake-utils_use_use pch PRECOMPILED_HEADERS)
 			$(cmake-utils_use_build test TESTING)
 			-DCMAKE_PREFIX_PATH="${CASROOT}"
 		)

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     514b1eb6c3e5cc0aea9972299107615324e900fb
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Thu Jan 29 18:20:40 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 18:20:40 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=514b1eb6

Test that CASROOT has been set; suggestion by @junghans

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 16c3662..4e756e6 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -75,8 +75,12 @@ src_configure() {
 			$(cmake-utils_use paraview MAKE_VATES)
 			$(cmake-utils_use_use pch PRECOMPILED_HEADERS)
 			$(cmake-utils_use_build test TESTING)
-			-DCMAKE_PREFIX_PATH="${CASROOT}"
 		)
+	if use opencascade
+	then
+		[[ -z ${CASROOT} ]] && die "CASROOT environment variable not defined, that usually means you need to use 'eselect opencascade'."
+		mycmakeargs+=( -DCMAKE_PREFIX_PATH="${CASROOT}" )
+	fi
 	cmake-utils_src_configure
 }
 

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     e68812ba7738417d93a304dfc6bca83a6f68093f
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Thu Jan 29 18:04:42 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 18:04:42 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e68812ba

None of the python code uses the NeXus python library

I was going to add [python] to nexus[${PYTHON_USEDEP}] but checked
first with a `git grep 'import .*nxs'` in the Mantid source giving
no results

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 053c559..16c3662 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -24,7 +24,7 @@ RESTRICT="test" # Testing requires sample data and X11 access
 # http://www.mantidproject.org/Mantid_Prerequisites
 RDEPEND="
 	${PYTHON_DEPS}
-	>=sci-libs/nexus-4.2[${PYTHON_USEDEP}]
+	>=sci-libs/nexus-4.2
 	>=dev-libs/poco-1.4.2
 	dev-libs/boost[python,${PYTHON_USEDEP}]
 	>=dev-qt/qthelp-4.6:4

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Christoph Junghans]

commit:     87de89084e04365856e85e0ac9d2dbcded65e88c
Author:     Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Thu Jan 29 17:55:56 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Jan 29 17:59:44 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=87de8908

Enable DOCS_HTML with USE=doc

---
 sci-visualization/mantid/mantid-3.3.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index a848c4c..609cede 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -68,6 +68,7 @@ src_configure() {
 	append-cppflags -DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP
 	mycmakeargs=(	$(cmake-utils_use_enable doc QTASSISTANT)
 			$(cmake-utils_use_use doc DOT)
+			$(cmake-utils_use doc DOCS_HTML)
 			$(cmake-utils_use_no opencascade)
 			$(cmake-utils_use opencl OPENCL_BUILD)
 			$(cmake-utils_use_use tcmalloc TCMALLOC)

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Justin Lecher]

commit:     0485ea999b29a523390c46e1a26d3278d0384fa7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 15:15:09 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 15:15:09 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0485ea99

sci-visualization/mantid: fix SLOT operators; fix whitespaces

Package-Manager: portage-2.2.17

---
 sci-visualization/mantid/ChangeLog           |  7 ++++
 sci-visualization/mantid/mantid-3.3.0.ebuild | 56 ++++++++++++++++------------
 sci-visualization/mantid/metadata.xml        | 28 +++++++-------
 3 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/sci-visualization/mantid/ChangeLog b/sci-visualization/mantid/ChangeLog
new file mode 100644
index 0000000..642a8f2
--- /dev/null
+++ b/sci-visualization/mantid/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-visualization/mantid
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  18 Feb 2015; Justin Lecher <jlec@gentoo.org> mantid-3.3.0.ebuild,
+  metadata.xml:
+  sci-visualization/mantid: fix SLOT operators; fix whitespaces

diff --git a/sci-visualization/mantid/mantid-3.3.0.ebuild b/sci-visualization/mantid/mantid-3.3.0.ebuild
index 4e756e6..16225c1 100644
--- a/sci-visualization/mantid/mantid-3.3.0.ebuild
+++ b/sci-visualization/mantid/mantid-3.3.0.ebuild
@@ -5,7 +5,9 @@
 EAPI=5
 
 FORTRAN_STANDARD=90
-PYTHON_COMPAT=python2_7
+
+PYTHON_COMPAT=( python2_7 )
+
 inherit eutils cmake-utils versionator python-single-r1 multilib flag-o-matic
 
 MAJOR_PV=$(get_version_component_range 1-2)
@@ -18,6 +20,9 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc +opencascade opencl paraview pch tcmalloc test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RESTRICT="test" # Testing requires sample data and X11 access
 
 # There is a list of dependencies on the Mantid website at:
@@ -29,10 +34,10 @@ RDEPEND="
 	dev-libs/boost[python,${PYTHON_USEDEP}]
 	>=dev-qt/qthelp-4.6:4
 	>=dev-qt/qtwebkit-4.6:4
-	doc?		( >=dev-qt/assistant-4.6:4 )
-	opencl?		( virtual/opencl )
-	tcmalloc?	( dev-util/google-perftools )
-	paraview?	( >=sci-visualization/paraview-4[python,${PYTHON_USEDEP}] )
+	doc? ( >=dev-qt/assistant-4.6:4 )
+	opencl? ( virtual/opencl )
+	tcmalloc? ( dev-util/google-perftools )
+	paraview? ( >=sci-visualization/paraview-4[python,${PYTHON_USEDEP}] )
 	virtual/opengl
 	x11-libs/qscintilla
 	x11-libs/qwt:5
@@ -45,36 +50,39 @@ RDEPEND="
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	dev-cpp/muParser
 	dev-libs/jsoncpp
-	dev-libs/openssl
-	opencascade?	( sci-libs/opencascade[qt4] )
+	dev-libs/openssl:0
+	opencascade? ( sci-libs/opencascade:=[qt4] )
 "
 
 DEPEND="${RDEPEND}
 	dev-python/sphinx
-	doc?	( app-doc/doxygen[dot]
-		  dev-python/sphinx[${PYTHON_USEDEP}]
-		  dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
-		  app-text/dvipng
-		  dev-texlive/texlive-latex
-		  dev-texlive/texlive-latexextra )
-	test?	( dev-util/cppcheck )
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+		app-text/dvipng
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		)
+	test? ( dev-util/cppcheck )
 "
 
 S="${WORKDIR}/${P}-Source"
 
-PATCHES=( "${FILESDIR}/${P}-minigzip-OF.patch" )
+PATCHES=( "${FILESDIR}"/${P}-minigzip-OF.patch )
 
 src_configure() {
 	append-cppflags -DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP
-	mycmakeargs=(	$(cmake-utils_use_enable doc QTASSISTANT)
-			$(cmake-utils_use_use doc DOT)
-			$(cmake-utils_use doc DOCS_HTML)
-			$(cmake-utils_use_no opencascade)
-			$(cmake-utils_use opencl OPENCL_BUILD)
-			$(cmake-utils_use_use tcmalloc TCMALLOC)
-			$(cmake-utils_use paraview MAKE_VATES)
-			$(cmake-utils_use_use pch PRECOMPILED_HEADERS)
-			$(cmake-utils_use_build test TESTING)
+	mycmakeargs=(
+		$(cmake-utils_use_enable doc QTASSISTANT)
+		$(cmake-utils_use_use doc DOT)
+		$(cmake-utils_use doc DOCS_HTML)
+		$(cmake-utils_use_no opencascade)
+		$(cmake-utils_use opencl OPENCL_BUILD)
+		$(cmake-utils_use_use tcmalloc TCMALLOC)
+		$(cmake-utils_use paraview MAKE_VATES)
+		$(cmake-utils_use_use pch PRECOMPILED_HEADERS)
+		$(cmake-utils_use_build test TESTING)
 		)
 	if use opencascade
 	then

diff --git a/sci-visualization/mantid/metadata.xml b/sci-visualization/mantid/metadata.xml
index 184c922..52e887f 100644
--- a/sci-visualization/mantid/metadata.xml
+++ b/sci-visualization/mantid/metadata.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-	<email>cjk34@cam.ac.uk</email>
-	<name>Chris Kerr</name>
-	<description>I don't develop this software, I'm just a Gentoo user who wanted to install it</description>
-</maintainer>
-<longdescription>The Mantid project provides a framework that supports
+  <herd>sci</herd>
+  <maintainer>
+    <email>cjk34@cam.ac.uk</email>
+    <name>Chris Kerr</name>
+    <description>I don't develop this software, I'm just a Gentoo user who wanted to install it</description>
+  </maintainer>
+  <longdescription>The Mantid project provides a framework that supports
   high-performance computing and visualisation of scientific data.
 
   Mantid has been created to manipulate and analyse neutron scattering and muon
   spectroscopy data, but could be applied to many other techniques.
 </longdescription>
-<use>
-	<flag name="doc">Generate documentation with <pkg>app-doc/doxygen</pkg>, QT Assistant etc</flag>
-	<flag name="opencascade">Use OpenCascade to show 3D models of instruments</flag>
-	<flag name="opencl">Use OpenCL to accelerate calculations</flag>
-	<flag name="paraview">Enable the Visualisation and Analysis Toolkit ExtensionS (VATES)</flag>
-	<flag name="tcmalloc">Use thread-caching malloc</flag>
-</use>
+  <use>
+    <flag name="doc">Generate documentation with <pkg>app-doc/doxygen</pkg>, QT Assistant etc</flag>
+    <flag name="opencascade">Use OpenCascade to show 3D models of instruments</flag>
+    <flag name="opencl">Use OpenCL to accelerate calculations</flag>
+    <flag name="paraview">Enable the Visualisation and Analysis Toolkit ExtensionS (VATES)</flag>
+    <flag name="tcmalloc">Use thread-caching malloc</flag>
+  </use>
 </pkgmetadata>

[gentoo-commits] proj/sci:master commit in: sci-visualization/mantid/

[Justin Lecher]

commit:     d9a973a7062ba6728080717cd06cc3f85d0fdb4d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 11:42:48 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 11:42:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d9a973a7

sci-visualization/mantid: Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20

 sci-visualization/mantid/ChangeLog    | 3 +++
 sci-visualization/mantid/metadata.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sci-visualization/mantid/ChangeLog b/sci-visualization/mantid/ChangeLog
index 642a8f2..dc58dbb 100644
--- a/sci-visualization/mantid/ChangeLog
+++ b/sci-visualization/mantid/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  sci-visualization/mantid: Updating remote-id in metadata.xml
+
   18 Feb 2015; Justin Lecher <jlec@gentoo.org> mantid-3.3.0.ebuild,
   metadata.xml:
   sci-visualization/mantid: fix SLOT operators; fix whitespaces

diff --git a/sci-visualization/mantid/metadata.xml b/sci-visualization/mantid/metadata.xml
index 52e887f..6a018c7 100644
--- a/sci-visualization/mantid/metadata.xml
+++ b/sci-visualization/mantid/metadata.xml
@@ -20,4 +20,7 @@
     <flag name="paraview">Enable the Visualisation and Analysis Toolkit ExtensionS (VATES)</flag>
     <flag name="tcmalloc">Use thread-caching malloc</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">mantid</remote-id>
+  </upstream>
 </pkgmetadata>