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

["Christoph Junghans" <ottxor@gentoo.org>]

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>