commit:     73823988fa96d1e033117349ba1ccbba5c88b623
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 18:24:38 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 18:24:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=73823988

sci-libs/nexus: Add subslot operators

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/nexus/metadata.xml       | 37 ++++++++++++++++++-------------------
 sci-libs/nexus/nexus-4.3.1.ebuild | 15 +++++++++------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/sci-libs/nexus/metadata.xml b/sci-libs/nexus/metadata.xml
index c7dbbdb..2c83b91 100644
--- a/sci-libs/nexus/metadata.xml
+++ b/sci-libs/nexus/metadata.xml
@@ -1,26 +1,25 @@
 <?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>Libraries and tools for the NeXus data format, developed
+       <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>Libraries and tools for the NeXus data format, 
developed
   collaboratively by scientists from major scientific facilities to facilitate
   analysis and visualisation of neutron, x-ray and muon data.
   NeXus is based on HDF5.</longdescription>
-<use>
-       <flag name="xml">Allow using the verbose XML representation of NeXus 
data</flag>
-       <flag name="doc">Generate library documentation with 
<pkg>app-doc/doxygen</pkg></flag>
-       <flag name="swig">Generate bindings with <pkg>dev-lang/swig</pkg></flag>
-       <flag name="cbf">Support for Crystallographic Binary Format files with 
sci-libs/cbflib</flag>
-       <flag name="fortran">Build the Fortran bindings</flag>
-       <flag name="guile">Build the Scheme bindings</flag>
-       <flag name="tcl">Build the TCL bindings</flag>
-       <flag name="java">Build the Java bindings</flag>
-       <flag name="python">Build the Python bindings</flag>
-</use>
-
+       <use>
+               <flag name="xml">Allow using the verbose XML representation of 
NeXus data</flag>
+               <flag name="doc">Generate library documentation with 
<pkg>app-doc/doxygen</pkg></flag>
+               <flag name="swig">Generate bindings with 
<pkg>dev-lang/swig</pkg></flag>
+               <flag name="cbf">Support for Crystallographic Binary Format 
files with sci-libs/cbflib</flag>
+               <flag name="fortran">Build the Fortran bindings</flag>
+               <flag name="guile">Build the Scheme bindings</flag>
+               <flag name="tcl">Build the TCL bindings</flag>
+               <flag name="java">Build the Java bindings</flag>
+               <flag name="python">Build the Python bindings</flag>
+       </use>
 </pkgmetadata>

diff --git a/sci-libs/nexus/nexus-4.3.1.ebuild 
b/sci-libs/nexus/nexus-4.3.1.ebuild
index 32c31f8..6111a06 100644
--- a/sci-libs/nexus/nexus-4.3.1.ebuild
+++ b/sci-libs/nexus/nexus-4.3.1.ebuild
@@ -18,17 +18,19 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="cbf doc fortran guile java python swig tcl xml"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RDEPEND="
        sci-libs/hdf5
        python? ( ${PYTHON_DEPS} )
-       xml?    ( dev-libs/mxml )
-       cbf?    ( sci-libs/cbflib )
-       guile?  ( dev-scheme/guile )
+       xml? ( dev-libs/mxml )
+       cbf? ( sci-libs/cbflib )
+       guile? ( dev-scheme/guile:12 )
 " # N.B. the website says it depends on HDF4 too, but I find it builds fine 
without it
 
 DEPEND="${RDEPEND}
-       doc?    ( app-doc/doxygen dev-tex/xcolor )
-       swig?   ( dev-lang/swig )
+       doc? ( app-doc/doxygen dev-tex/xcolor )
+       swig? ( dev-lang/swig:0 )
 "
 
 pkg_setup() {
@@ -43,7 +45,8 @@ src_configure() {
        # http://www.gentoo.org/proj/en/base/amd64/howtos/?part=1&chap=3
        use fortran && append-fflags -fPIC
 
-       econf   $(use_with doc doxygen) \
+       econf \
+               $(use_with doc doxygen) \
                $(use_with fortran f90) \
                $(use_with swig) \
                $(use_with xml) \

Reply via email to