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 <[email protected]> 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>[email protected]</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>[email protected]</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>

Reply via email to