commit: 88a50b5ea0d003ac41aa047d45994af1d00a38b7
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Thu Dec 31 16:01:57 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 13:19:34 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=88a50b5e
Update NeXus ebuild to version 4.4.1
Versions from 4.4 are built with CMake
Python support is now in a separate project, called Nexpy
sci-libs/nexus/metadata.xml | 12 +++----
.../{nexus-4.3.1.ebuild => nexus-4.4.1.ebuild} | 39 +++++++++++-----------
2 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/sci-libs/nexus/metadata.xml b/sci-libs/nexus/metadata.xml
index 2c83b91..bbec0bd 100644
--- a/sci-libs/nexus/metadata.xml
+++ b/sci-libs/nexus/metadata.xml
@@ -3,9 +3,9 @@
<pkgmetadata>
<herd>sci</herd>
<maintainer>
- <email>[email protected]</email>
+ <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>
+ <description>I occasionally submit patches to
NeXus</description>
</maintainer>
<longdescription>Libraries and tools for the NeXus data format,
developed
collaboratively by scientists from major scientific facilities to facilitate
@@ -13,13 +13,11 @@
NeXus is based on HDF5.</longdescription>
<use>
<flag name="xml">Allow using the verbose XML representation of
NeXus data</flag>
+ <flag name="hdf4">Support the old HDF4 representation</flag>
+ <flag name="hdf5">Support the standard representation
(HDF5)</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>
+ <flag name="utils">Build optional utility applications</flag>
</use>
</pkgmetadata>
diff --git a/sci-libs/nexus/nexus-4.3.1.ebuild
b/sci-libs/nexus/nexus-4.4.1.ebuild
similarity index 53%
rename from sci-libs/nexus/nexus-4.3.1.ebuild
rename to sci-libs/nexus/nexus-4.4.1.ebuild
index 6111a06..53b5ba1 100644
--- a/sci-libs/nexus/nexus-4.3.1.ebuild
+++ b/sci-libs/nexus/nexus-4.4.1.ebuild
@@ -7,37 +7,35 @@ EAPI=5
FORTRAN_NEEDED=fortran
FORTRAN_STANDARD=90
PYTHON_COMPAT=( python2_7 )
-inherit fortran-2 flag-o-matic python-single-r1
+inherit cmake-utils fortran-2 java-pkg-opt-2
DESCRIPTION="Data format for neutron and x-ray scattering data"
HOMEPAGE="http://nexusformat.org/";
-SRC_URI="http://download.nexusformat.org/kits/${PV}/${P}.tar.gz";
+SRC_URI="https://github.com/nexusformat/code/archive/v${PV}.tar.gz";
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="cbf doc fortran guile java python swig tcl xml"
+IUSE="doc cxx fortran -hdf4 +hdf5 java utils xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE=" || ( hdf4 hdf5 xml ) "
RDEPEND="
- sci-libs/hdf5
- python? ( ${PYTHON_DEPS} )
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
+ hdf4? ( sci-libs/hdf )
+ hdf5? ( sci-libs/hdf5[zlib] )
+ utils? ( sys-libs/readline:0 sys-libs/libtermcap-compat
dev-libs/libxml2 )
+"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen dev-tex/xcolor )
- swig? ( dev-lang/swig:0 )
"
pkg_setup() {
- use python && python-single-r1_pkg_setup
# Handling of dependencies between Fortran module files doesn't play
well with parallel make
use fortran && export MAKEOPTS="${MAKEOPTS} -j1 "
use fortran && fortran-2_pkg_setup
+ java-pkg-opt-2_pkg_setup
}
src_configure() {
@@ -45,13 +43,14 @@ 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) \
- $(use_with fortran f90) \
- $(use_with swig) \
- $(use_with xml) \
- $(use_with cbf cbflib) \
- $(use_with guile) \
- $(use_with java) \
- $(use_with python)
+ cmake-utils_src_configure \
+ $(cmake-utils_use_enable hdf4) \
+ $(cmake-utils_use_enable hdf5) \
+ $(cmake-utils_use_enable xml MXML) \
+ $(cmake-utils_use_enable cxx) \
+ $(cmake-utils_use_enable fortran FORTRAN90) \
+ $(cmake-utils_use_enable fortran FORTRAN77) \
+ $(cmake-utils_use_enable java) \
+ $(cmake-utils_use_enable utils APPS) \
+ $(cmake-utils_use_enable utils CONTRIB)
}
