From 88a50b5ea0d003ac41aa047d45994af1d00a38b7 Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Thu, 31 Dec 2015 17:01:57 +0100 Subject: 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/Manifest | 2 +- sci-libs/nexus/metadata.xml | 12 ++++----- sci-libs/nexus/nexus-4.3.1.ebuild | 57 --------------------------------------- sci-libs/nexus/nexus-4.4.1.ebuild | 56 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 65 deletions(-) delete mode 100644 sci-libs/nexus/nexus-4.3.1.ebuild create mode 100644 sci-libs/nexus/nexus-4.4.1.ebuild diff --git a/sci-libs/nexus/Manifest b/sci-libs/nexus/Manifest index 47ec4c670..0828e19bb 100644 --- a/sci-libs/nexus/Manifest +++ b/sci-libs/nexus/Manifest @@ -1 +1 @@ -DIST nexus-4.3.1.tar.gz 16734478 SHA256 da186e0978321e793800cd45611fc767d46cf5d7d2c8f60277b3f48b4a84cb0b SHA512 f470d4bc1e7f3d714b4849798a9d509b8d23da486a25d4998d023fea1f148030ab86b88ac088ad71847db6692479e1ca2fad48d2c4dad016f9652e19c08f5a0b WHIRLPOOL effa806f7372ef974412aa974bdf4b84cfc7632ecb3153638bc9e948b80eb87130c0a4df9b6d010d36b3c0d7d8bdbde17e58d17de8ec298a161ebcfa2dc4b045 +DIST v4.4.1.tar.gz 4820168 SHA256 5674ff3ac5573e80a33963804975ae1dadf55a95bcee818f23f485569d72bf1b SHA512 f561e5dcb48d6bb5d8acbfecae0e447fe7ca5c82ef85d03d3a9874a2f31e47769ac4229579a31321e2462160f39f6a1f1af28e7d05d5ff9985b1c4281cf053d1 WHIRLPOOL e86d2407eac3ca65274e9e622d3859321550966077b378f918eaafd9a37f68e0958f2b25329f07b8a93fd535613cbe2a9b5ef0d4a7a003acbc199ae9acf99915 diff --git a/sci-libs/nexus/metadata.xml b/sci-libs/nexus/metadata.xml index 2c83b9196..bbec0bdc3 100644 --- a/sci-libs/nexus/metadata.xml +++ b/sci-libs/nexus/metadata.xml @@ -3,9 +3,9 @@ sci - cjk34@cam.ac.uk + c.kerr@embl-hamburg.de Chris Kerr - I don't develop this software, I'm just a Gentoo user who wanted to install it + I occasionally submit patches to NeXus 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. Allow using the verbose XML representation of NeXus data + Support the old HDF4 representation + Support the standard representation (HDF5) Generate library documentation with app-doc/doxygen - Generate bindings with dev-lang/swig - Support for Crystallographic Binary Format files with sci-libs/cbflib Build the Fortran bindings - Build the Scheme bindings - Build the TCL bindings Build the Java bindings - Build the Python bindings + Build optional utility applications diff --git a/sci-libs/nexus/nexus-4.3.1.ebuild b/sci-libs/nexus/nexus-4.3.1.ebuild deleted file mode 100644 index 6111a06d6..000000000 --- a/sci-libs/nexus/nexus-4.3.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -FORTRAN_NEEDED=fortran -FORTRAN_STANDARD=90 -PYTHON_COMPAT=( python2_7 ) -inherit fortran-2 flag-o-matic python-single-r1 - -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" - -LICENSE="LGPL-2.1" -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: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: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 -} - -src_configure() { - # Linking between Fortran libraries gives a relocation error, using workaround suggested at: - # 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) -} diff --git a/sci-libs/nexus/nexus-4.4.1.ebuild b/sci-libs/nexus/nexus-4.4.1.ebuild new file mode 100644 index 000000000..53b5ba159 --- /dev/null +++ b/sci-libs/nexus/nexus-4.4.1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +FORTRAN_NEEDED=fortran +FORTRAN_STANDARD=90 +PYTHON_COMPAT=( python2_7 ) +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="https://github.com/nexusformat/code/archive/v${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc cxx fortran -hdf4 +hdf5 java utils xml" + +REQUIRED_USE=" || ( hdf4 hdf5 xml ) " + +RDEPEND=" + xml? ( dev-libs/mxml ) + 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 ) +" + +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() { + # Linking between Fortran libraries gives a relocation error, using workaround suggested at: + # http://www.gentoo.org/proj/en/base/amd64/howtos/?part=1&chap=3 + use fortran && append-fflags -fPIC + + 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) +} -- cgit v1.2.3-65-gdbad From 395f638fc61ea8bdd77771f2e787b76cade2b32b Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Thu, 31 Dec 2015 17:07:48 +0100 Subject: Corrected name of directory of unpacked tarball --- sci-libs/nexus/nexus-4.4.1.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sci-libs/nexus/nexus-4.4.1.ebuild b/sci-libs/nexus/nexus-4.4.1.ebuild index 53b5ba159..833da212d 100644 --- a/sci-libs/nexus/nexus-4.4.1.ebuild +++ b/sci-libs/nexus/nexus-4.4.1.ebuild @@ -31,6 +31,8 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen dev-tex/xcolor ) " +S="${WORKDIR}/code-${PV}" + pkg_setup() { # Handling of dependencies between Fortran module files doesn't play well with parallel make use fortran && export MAKEOPTS="${MAKEOPTS} -j1 " -- cgit v1.2.3-65-gdbad From c817293c8840a5405c94efa2e3baa68bd080dfc3 Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Sat, 2 Jan 2016 15:15:45 +0100 Subject: Update FORTRAN_STANDARD and remove PYTHON_COMPAT --- sci-libs/nexus/nexus-4.4.1.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sci-libs/nexus/nexus-4.4.1.ebuild b/sci-libs/nexus/nexus-4.4.1.ebuild index 833da212d..f4f5e9e22 100644 --- a/sci-libs/nexus/nexus-4.4.1.ebuild +++ b/sci-libs/nexus/nexus-4.4.1.ebuild @@ -5,8 +5,7 @@ EAPI=5 FORTRAN_NEEDED=fortran -FORTRAN_STANDARD=90 -PYTHON_COMPAT=( python2_7 ) +FORTRAN_STANDARD="77 90" inherit cmake-utils fortran-2 java-pkg-opt-2 DESCRIPTION="Data format for neutron and x-ray scattering data" -- cgit v1.2.3-65-gdbad From 8e3268e6915d4bc6a7c2c61b25f47546ecd81c08 Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Sat, 2 Jan 2016 15:16:28 +0100 Subject: Update copyright year --- sci-libs/nexus/nexus-4.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/nexus/nexus-4.4.1.ebuild b/sci-libs/nexus/nexus-4.4.1.ebuild index f4f5e9e22..6230c4c30 100644 --- a/sci-libs/nexus/nexus-4.4.1.ebuild +++ b/sci-libs/nexus/nexus-4.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -- cgit v1.2.3-65-gdbad From eb72853c593bb30f3f345c4c718cdec1437c0616 Mon Sep 17 00:00:00 2001 From: Chris Kerr Date: Sat, 2 Jan 2016 15:19:22 +0100 Subject: Save the downloaded tarball as ${P}.tar.gz Using the `->` operator in `SRC_URI` --- sci-libs/nexus/Manifest | 2 +- sci-libs/nexus/nexus-4.4.1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-libs/nexus/Manifest b/sci-libs/nexus/Manifest index 0828e19bb..ae75bd58b 100644 --- a/sci-libs/nexus/Manifest +++ b/sci-libs/nexus/Manifest @@ -1 +1 @@ -DIST v4.4.1.tar.gz 4820168 SHA256 5674ff3ac5573e80a33963804975ae1dadf55a95bcee818f23f485569d72bf1b SHA512 f561e5dcb48d6bb5d8acbfecae0e447fe7ca5c82ef85d03d3a9874a2f31e47769ac4229579a31321e2462160f39f6a1f1af28e7d05d5ff9985b1c4281cf053d1 WHIRLPOOL e86d2407eac3ca65274e9e622d3859321550966077b378f918eaafd9a37f68e0958f2b25329f07b8a93fd535613cbe2a9b5ef0d4a7a003acbc199ae9acf99915 +DIST nexus-4.4.1.tar.gz 4820168 SHA256 5674ff3ac5573e80a33963804975ae1dadf55a95bcee818f23f485569d72bf1b SHA512 f561e5dcb48d6bb5d8acbfecae0e447fe7ca5c82ef85d03d3a9874a2f31e47769ac4229579a31321e2462160f39f6a1f1af28e7d05d5ff9985b1c4281cf053d1 WHIRLPOOL e86d2407eac3ca65274e9e622d3859321550966077b378f918eaafd9a37f68e0958f2b25329f07b8a93fd535613cbe2a9b5ef0d4a7a003acbc199ae9acf99915 diff --git a/sci-libs/nexus/nexus-4.4.1.ebuild b/sci-libs/nexus/nexus-4.4.1.ebuild index 6230c4c30..b113f9e82 100644 --- a/sci-libs/nexus/nexus-4.4.1.ebuild +++ b/sci-libs/nexus/nexus-4.4.1.ebuild @@ -10,7 +10,7 @@ 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="https://github.com/nexusformat/code/archive/v${PV}.tar.gz" +SRC_URI="https://github.com/nexusformat/code/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -- cgit v1.2.3-65-gdbad