* [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/
@ 2015-01-22 10:14 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2015-01-22 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 9fc8f70d5c0811d398dc549eed020ba9271146fa
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Tue Jan 20 17:58:36 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan 20 17:58:36 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9fc8f70d
Made changes requested by @junghans
---
sci-libs/nexus/nexus-4.3.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/nexus/nexus-4.3.1.ebuild b/sci-libs/nexus/nexus-4.3.1.ebuild
index 9444e9e..22c81d4 100644
--- a/sci-libs/nexus/nexus-4.3.1.ebuild
+++ b/sci-libs/nexus/nexus-4.3.1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
FORTRAN_NEEDED=fortran
FORTRAN_STANDARD=90
PYTHON_COMPAT=( python2_7 )
-inherit fortran-2 java-pkg-opt-2 flag-o-matic python-single-r1
+inherit fortran-2 flag-o-matic python-single-r1
DESCRIPTION="Data format for neutron and x-ray scattering data"
HOMEPAGE="http://nexusformat.org/"
@@ -53,6 +53,6 @@ src_configure() {
src_compile() {
# Handling of dependencies between Fortran module files doesn't play well with parallel make
- use fortran && MAKEOPTS+=" -j1 "
+ use fortran && MAKEOPTS="${MAKEOPTS} -j1 "
default
}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/
@ 2020-09-28 0:46 Aisha Tammy
0 siblings, 0 replies; 11+ messages in thread
From: Aisha Tammy @ 2020-09-28 0:46 UTC (permalink / raw
To: gentoo-commits
commit: d65e9fc0f39654fc2ef5cc96e021a99edc2e6b95
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Mon Sep 28 00:46:38 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Mon Sep 28 00:46:38 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d65e9fc0
sci-libs/nexus: drop old version
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
sci-libs/nexus/metadata.xml | 17 +++++-------
sci-libs/nexus/nexus-4.4.1.ebuild | 56 ---------------------------------------
2 files changed, 7 insertions(+), 66 deletions(-)
diff --git a/sci-libs/nexus/metadata.xml b/sci-libs/nexus/metadata.xml
index ef8f9fd1a..f4859bfa6 100644
--- a/sci-libs/nexus/metadata.xml
+++ b/sci-libs/nexus/metadata.xml
@@ -2,26 +2,23 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>c.kerr@embl-hamburg.de</email>
- <name>Chris Kerr</name>
- <description>I occasionally submit patches to NeXus</description>
+ <email>gentoo@aisha.cc</email>
+ <name>Aisha Tammy</name>
</maintainer>
<maintainer type="project">
<email>sci@gentoo.org</email>
<name>Gentoo Science Project</name>
</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>
+ <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="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="fortran">Build the Fortran bindings</flag>
<flag name="java">Build the Java bindings</flag>
- <flag name="utils">Build optional utility applications</flag>
</use>
<upstream>
<remote-id type="github">nexusformat/code</remote-id>
diff --git a/sci-libs/nexus/nexus-4.4.1.ebuild b/sci-libs/nexus/nexus-4.4.1.ebuild
deleted file mode 100644
index 253a81115..000000000
--- a/sci-libs/nexus/nexus-4.4.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD="77 90"
-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 -> ${P}.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 )
-"
-
-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 "
- 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)
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/
@ 2020-09-28 0:46 Aisha Tammy
0 siblings, 0 replies; 11+ messages in thread
From: Aisha Tammy @ 2020-09-28 0:46 UTC (permalink / raw
To: gentoo-commits
commit: 06351d3139be034f67c6446819b8298fcd5e9bf1
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Mon Sep 28 00:43:02 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Mon Sep 28 00:44:11 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=06351d31
sci-libs/nexus: version bump
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
sci-libs/nexus/nexus-4.4.3_p20200126.ebuild | 58 +++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/sci-libs/nexus/nexus-4.4.3_p20200126.ebuild b/sci-libs/nexus/nexus-4.4.3_p20200126.ebuild
new file mode 100644
index 000000000..b19a65fbe
--- /dev/null
+++ b/sci-libs/nexus/nexus-4.4.3_p20200126.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake java-pkg-opt-2
+
+DESCRIPTION="Data format for neutron and x-ray scattering data"
+HOMEPAGE="http://nexusformat.org/"
+COMMIT=5b803b3a0014bd9759b3d846da3cd3c1cfafd7d5
+SRC_URI="https://github.com/nexusformat/code/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}"/code-${COMMIT}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cxx hdf4 +hdf5 java xml"
+
+REQUIRED_USE=" || ( hdf4 hdf5 xml ) "
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline
+ sys-libs/libtermcap-compat
+ xml? ( dev-libs/mxml )
+ hdf4? ( sci-libs/hdf )
+ hdf5? ( sci-libs/hdf5[zlib] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-doc/doxygen[dot]
+"
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+ cmake_src_prepare
+}
+
+src_configure() {
+ # no fortran, doesn't compile
+ local mycmakeargs=(
+ -DENABLE_APPS=ON
+ -DENABLE_CONTRIB=ON
+ -DENABLE_HDF4=$(usex hdf4)
+ -DENABLE_HDF5=$(usex hdf5)
+ -DENABLE_MXML=$(usex xml)
+ -DENABLE_CXX=$(usex cxx)
+ -DENABLE_FORTRAN90=NO
+ -DENABLE_FORTRAN77=NO
+ -DENABLE_JAVA=$(usex java)
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/
@ 2016-01-10 15:32 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2016-01-10 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 8e3268e6915d4bc6a7c2c61b25f47546ecd81c08
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Sat Jan 2 14:16:28 2016 +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=8e3268e6
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 f4f5e9e..6230c4c 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$
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/
@ 2016-01-10 15:32 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2016-01-10 15:32 UTC (permalink / raw
To: gentoo-commits
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>cjk34@cam.ac.uk</email>
+ <email>c.kerr@embl-hamburg.de</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)
}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/
@ 2016-01-10 15:32 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2016-01-10 15:32 UTC (permalink / raw
To: gentoo-commits
commit: c817293c8840a5405c94efa2e3baa68bd080dfc3
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Sat Jan 2 14:15:45 2016 +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=c817293c
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 833da21..f4f5e9e 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"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/
@ 2016-01-10 15:32 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2016-01-10 15:32 UTC (permalink / raw
To: gentoo-commits
commit: eb72853c593bb30f3f345c4c718cdec1437c0616
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Sat Jan 2 14:19:22 2016 +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=eb72853c
Save the downloaded tarball as ${P}.tar.gz
Using the `->` operator in `SRC_URI`
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 6230c4c..b113f9e 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"
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/
@ 2016-01-10 15:32 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2016-01-10 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 395f638fc61ea8bdd77771f2e787b76cade2b32b
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Thu Dec 31 16:07:48 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=395f638f
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 53b5ba1..833da21 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 "
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/
@ 2015-09-21 19:05 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2015-09-21 19:05 UTC (permalink / raw
To: gentoo-commits
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>cjk34@cam.ac.uk</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>cjk34@cam.ac.uk</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) \
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/
@ 2015-01-22 10:14 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2015-01-22 10:14 UTC (permalink / raw
To: gentoo-commits
commit: d5e2245ffa5d0632b79ed33ab39acfc91b40944e
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Tue Jan 20 21:23:32 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan 20 21:23:32 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d5e2245f
export MAKEOPTS in pkg_setup so we can use the default src_compile
---
sci-libs/nexus/nexus-4.3.1.ebuild | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/sci-libs/nexus/nexus-4.3.1.ebuild b/sci-libs/nexus/nexus-4.3.1.ebuild
index 22c81d4..e887f03 100644
--- a/sci-libs/nexus/nexus-4.3.1.ebuild
+++ b/sci-libs/nexus/nexus-4.3.1.ebuild
@@ -33,6 +33,8 @@ DEPEND="${RDEPEND}
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
}
@@ -50,9 +52,3 @@ src_configure() {
$(use_with java) \
$(use_with python)
}
-
-src_compile() {
- # Handling of dependencies between Fortran module files doesn't play well with parallel make
- use fortran && MAKEOPTS="${MAKEOPTS} -j1 "
- default
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/
@ 2015-01-22 10:14 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2015-01-22 10:14 UTC (permalink / raw
To: gentoo-commits
commit: 1abe210bec6f9eac5b29a9ee563d8222847a0c86
Author: Chris Kerr <debdepba <AT> dasganma <DOT> tk>
AuthorDate: Tue Jan 20 11:56:32 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jan 20 12:02:09 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1abe210b
New ebuild for NeXus
---
sci-libs/nexus/metadata.xml | 26 ++++++++++++++++++
sci-libs/nexus/nexus-4.3.1.ebuild | 58 +++++++++++++++++++++++++++++++++++++++
2 files changed, 84 insertions(+)
diff --git a/sci-libs/nexus/metadata.xml b/sci-libs/nexus/metadata.xml
new file mode 100644
index 0000000..c7dbbdb
--- /dev/null
+++ b/sci-libs/nexus/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<maintainer>
+ <email>cjk34@cam.ac.uk</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>
+
+</pkgmetadata>
diff --git a/sci-libs/nexus/nexus-4.3.1.ebuild b/sci-libs/nexus/nexus-4.3.1.ebuild
new file mode 100644
index 0000000..9444e9e
--- /dev/null
+++ b/sci-libs/nexus/nexus-4.3.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+PYTHON_COMPAT=( python2_7 )
+inherit fortran-2 java-pkg-opt-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"
+
+RDEPEND="
+ sci-libs/hdf5
+ python? ( ${PYTHON_DEPS} )
+ xml? ( dev-libs/mxml )
+ cbf? ( sci-libs/cbflib )
+ guile? ( dev-scheme/guile )
+" # 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 )
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ 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)
+}
+
+src_compile() {
+ # Handling of dependencies between Fortran module files doesn't play well with parallel make
+ use fortran && MAKEOPTS+=" -j1 "
+ default
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-09-28 0:46 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-22 10:14 [gentoo-commits] proj/sci:master commit in: sci-libs/nexus/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2020-09-28 0:46 Aisha Tammy
2020-09-28 0:46 Aisha Tammy
2016-01-10 15:32 Justin Lecher
2016-01-10 15:32 Justin Lecher
2016-01-10 15:32 Justin Lecher
2016-01-10 15:32 Justin Lecher
2016-01-10 15:32 Justin Lecher
2015-09-21 19:05 Justin Lecher
2015-01-22 10:14 Justin Lecher
2015-01-22 10:14 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox