1 |
commit: 73823988fa96d1e033117349ba1ccbba5c88b623 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 21 18:24:38 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 21 18:24:38 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=73823988 |
7 |
|
8 |
sci-libs/nexus: Add subslot operators |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
sci-libs/nexus/metadata.xml | 37 ++++++++++++++++++------------------- |
14 |
sci-libs/nexus/nexus-4.3.1.ebuild | 15 +++++++++------ |
15 |
2 files changed, 27 insertions(+), 25 deletions(-) |
16 |
|
17 |
diff --git a/sci-libs/nexus/metadata.xml b/sci-libs/nexus/metadata.xml |
18 |
index c7dbbdb..2c83b91 100644 |
19 |
--- a/sci-libs/nexus/metadata.xml |
20 |
+++ b/sci-libs/nexus/metadata.xml |
21 |
@@ -1,26 +1,25 @@ |
22 |
<?xml version="1.0" encoding="UTF-8"?> |
23 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
24 |
<pkgmetadata> |
25 |
-<herd>sci</herd> |
26 |
-<maintainer> |
27 |
- <email>cjk34@××××××.uk</email> |
28 |
- <name>Chris Kerr</name> |
29 |
- <description>I don't develop this software, I'm just a Gentoo user who wanted to install it</description> |
30 |
-</maintainer> |
31 |
-<longdescription>Libraries and tools for the NeXus data format, developed |
32 |
+ <herd>sci</herd> |
33 |
+ <maintainer> |
34 |
+ <email>cjk34@××××××.uk</email> |
35 |
+ <name>Chris Kerr</name> |
36 |
+ <description>I don't develop this software, I'm just a Gentoo user who wanted to install it</description> |
37 |
+ </maintainer> |
38 |
+ <longdescription>Libraries and tools for the NeXus data format, developed |
39 |
collaboratively by scientists from major scientific facilities to facilitate |
40 |
analysis and visualisation of neutron, x-ray and muon data. |
41 |
NeXus is based on HDF5.</longdescription> |
42 |
-<use> |
43 |
- <flag name="xml">Allow using the verbose XML representation of NeXus data</flag> |
44 |
- <flag name="doc">Generate library documentation with <pkg>app-doc/doxygen</pkg></flag> |
45 |
- <flag name="swig">Generate bindings with <pkg>dev-lang/swig</pkg></flag> |
46 |
- <flag name="cbf">Support for Crystallographic Binary Format files with sci-libs/cbflib</flag> |
47 |
- <flag name="fortran">Build the Fortran bindings</flag> |
48 |
- <flag name="guile">Build the Scheme bindings</flag> |
49 |
- <flag name="tcl">Build the TCL bindings</flag> |
50 |
- <flag name="java">Build the Java bindings</flag> |
51 |
- <flag name="python">Build the Python bindings</flag> |
52 |
-</use> |
53 |
- |
54 |
+ <use> |
55 |
+ <flag name="xml">Allow using the verbose XML representation of NeXus data</flag> |
56 |
+ <flag name="doc">Generate library documentation with <pkg>app-doc/doxygen</pkg></flag> |
57 |
+ <flag name="swig">Generate bindings with <pkg>dev-lang/swig</pkg></flag> |
58 |
+ <flag name="cbf">Support for Crystallographic Binary Format files with sci-libs/cbflib</flag> |
59 |
+ <flag name="fortran">Build the Fortran bindings</flag> |
60 |
+ <flag name="guile">Build the Scheme bindings</flag> |
61 |
+ <flag name="tcl">Build the TCL bindings</flag> |
62 |
+ <flag name="java">Build the Java bindings</flag> |
63 |
+ <flag name="python">Build the Python bindings</flag> |
64 |
+ </use> |
65 |
</pkgmetadata> |
66 |
|
67 |
diff --git a/sci-libs/nexus/nexus-4.3.1.ebuild b/sci-libs/nexus/nexus-4.3.1.ebuild |
68 |
index 32c31f8..6111a06 100644 |
69 |
--- a/sci-libs/nexus/nexus-4.3.1.ebuild |
70 |
+++ b/sci-libs/nexus/nexus-4.3.1.ebuild |
71 |
@@ -18,17 +18,19 @@ SLOT="0" |
72 |
KEYWORDS="~amd64" |
73 |
IUSE="cbf doc fortran guile java python swig tcl xml" |
74 |
|
75 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
76 |
+ |
77 |
RDEPEND=" |
78 |
sci-libs/hdf5 |
79 |
python? ( ${PYTHON_DEPS} ) |
80 |
- xml? ( dev-libs/mxml ) |
81 |
- cbf? ( sci-libs/cbflib ) |
82 |
- guile? ( dev-scheme/guile ) |
83 |
+ xml? ( dev-libs/mxml ) |
84 |
+ cbf? ( sci-libs/cbflib ) |
85 |
+ guile? ( dev-scheme/guile:12 ) |
86 |
" # N.B. the website says it depends on HDF4 too, but I find it builds fine without it |
87 |
|
88 |
DEPEND="${RDEPEND} |
89 |
- doc? ( app-doc/doxygen dev-tex/xcolor ) |
90 |
- swig? ( dev-lang/swig ) |
91 |
+ doc? ( app-doc/doxygen dev-tex/xcolor ) |
92 |
+ swig? ( dev-lang/swig:0 ) |
93 |
" |
94 |
|
95 |
pkg_setup() { |
96 |
@@ -43,7 +45,8 @@ src_configure() { |
97 |
# http://www.gentoo.org/proj/en/base/amd64/howtos/?part=1&chap=3 |
98 |
use fortran && append-fflags -fPIC |
99 |
|
100 |
- econf $(use_with doc doxygen) \ |
101 |
+ econf \ |
102 |
+ $(use_with doc doxygen) \ |
103 |
$(use_with fortran f90) \ |
104 |
$(use_with swig) \ |
105 |
$(use_with xml) \ |