1 |
commit: 2fa7b1781ad366af2e74d2fae9a4510d21471ce1 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 11 19:21:55 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 11 19:45:56 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa7b178 |
7 |
|
8 |
sci-visualization/opendx: Depend on virtual/imagemagick-tools |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/3907 |
12 |
|
13 |
sci-visualization/opendx/opendx-4.4.4-r5.ebuild | 42 ++++++++++------------ |
14 |
...endx-4.4.4-r4.ebuild => opendx-4.4.4-r6.ebuild} | 42 ++++++++++++---------- |
15 |
2 files changed, 42 insertions(+), 42 deletions(-) |
16 |
|
17 |
diff --git a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild |
18 |
index 5c02453d73..6cff41fe1a 100644 |
19 |
--- a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild |
20 |
+++ b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild |
21 |
@@ -1,21 +1,19 @@ |
22 |
-# Copyright 1999-2016 Gentoo Foundation |
23 |
+# Copyright 1999-2017 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
# $Id$ |
26 |
|
27 |
-EAPI=6 |
28 |
+EAPI=4 |
29 |
|
30 |
MYP=dx-${PV} |
31 |
- |
32 |
-inherit autotools eutils flag-o-matic |
33 |
+inherit eutils flag-o-matic autotools multilib |
34 |
|
35 |
DESCRIPTION="3D data visualization tool" |
36 |
HOMEPAGE="http://www.opendx.org/" |
37 |
-SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz |
38 |
- https://dev.gentoo.org/~soap/distfiles/${PN}-4.4.4_p20160917-fix-c++14.patch.bz2" |
39 |
+SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz" |
40 |
|
41 |
LICENSE="IBM" |
42 |
SLOT="0" |
43 |
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
44 |
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" |
45 |
IUSE="hdf cdf netcdf tiff imagemagick szip smp" |
46 |
|
47 |
RDEPEND="x11-libs/libXmu |
48 |
@@ -29,29 +27,26 @@ RDEPEND="x11-libs/libXmu |
49 |
hdf? ( sci-libs/hdf ) |
50 |
cdf? ( sci-libs/cdf ) |
51 |
netcdf? ( sci-libs/netcdf ) |
52 |
- tiff? ( media-libs/tiff:0 ) |
53 |
- imagemagick? ( media-gfx/imagemagick )" |
54 |
+ tiff? ( media-libs/tiff ) |
55 |
+ imagemagick? ( virtual/imagemagick-tools )" |
56 |
|
57 |
DEPEND="${RDEPEND} |
58 |
virtual/pkgconfig" |
59 |
|
60 |
S="${WORKDIR}/${MYP}" |
61 |
-PATCHES=( |
62 |
- "${FILESDIR}/${PN}-4.3.2-sys.h.patch" |
63 |
- "${FILESDIR}/${P}-installpaths.patch" |
64 |
- "${FILESDIR}/${P}-xdg.patch" |
65 |
- "${FILESDIR}/${P}-gcc43.patch" |
66 |
- "${FILESDIR}/${P}-dx-errno.patch" |
67 |
- "${FILESDIR}/${P}-libtool.patch" |
68 |
- "${FILESDIR}/${P}-concurrent-make-fix.patch" |
69 |
- "${FILESDIR}/${P}-open.patch" |
70 |
- "${FILESDIR}/${P}-szip.patch" |
71 |
- "${FILESDIR}/${P}-null.patch" |
72 |
- "${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch" |
73 |
-) |
74 |
|
75 |
src_prepare() { |
76 |
- default |
77 |
+ epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch" |
78 |
+ epatch "${FILESDIR}/${P}-installpaths.patch" |
79 |
+ epatch "${FILESDIR}/${P}-xdg.patch" |
80 |
+ epatch "${FILESDIR}/${P}-gcc43.patch" |
81 |
+ epatch "${FILESDIR}/${P}-dx-errno.patch" |
82 |
+ epatch "${FILESDIR}/${P}-libtool.patch" |
83 |
+ epatch "${FILESDIR}/${P}-concurrent-make-fix.patch" |
84 |
+ epatch "${FILESDIR}/${P}-open.patch" |
85 |
+ epatch "${FILESDIR}/${P}-szip.patch" |
86 |
+ epatch "${FILESDIR}/${P}-null.patch" |
87 |
+ epatch "${FILESDIR}/${P}-magick.patch" |
88 |
eautoreconf |
89 |
} |
90 |
|
91 |
@@ -69,6 +64,7 @@ src_configure() { |
92 |
|
93 |
# javadx is currently broken. we may try to fix it someday. |
94 |
econf \ |
95 |
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
96 |
--with-x \ |
97 |
--without-javadx \ |
98 |
$(use_with szip szlib) \ |
99 |
|
100 |
diff --git a/sci-visualization/opendx/opendx-4.4.4-r4.ebuild b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild |
101 |
similarity index 60% |
102 |
rename from sci-visualization/opendx/opendx-4.4.4-r4.ebuild |
103 |
rename to sci-visualization/opendx/opendx-4.4.4-r6.ebuild |
104 |
index 67d504fe1d..a1bfc06af9 100644 |
105 |
--- a/sci-visualization/opendx/opendx-4.4.4-r4.ebuild |
106 |
+++ b/sci-visualization/opendx/opendx-4.4.4-r6.ebuild |
107 |
@@ -1,19 +1,21 @@ |
108 |
-# Copyright 1999-2016 Gentoo Foundation |
109 |
+# Copyright 1999-2017 Gentoo Foundation |
110 |
# Distributed under the terms of the GNU General Public License v2 |
111 |
# $Id$ |
112 |
|
113 |
-EAPI=4 |
114 |
+EAPI=6 |
115 |
|
116 |
MYP=dx-${PV} |
117 |
-inherit eutils flag-o-matic autotools multilib |
118 |
+ |
119 |
+inherit autotools eutils flag-o-matic |
120 |
|
121 |
DESCRIPTION="3D data visualization tool" |
122 |
HOMEPAGE="http://www.opendx.org/" |
123 |
-SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz" |
124 |
+SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz |
125 |
+ https://dev.gentoo.org/~soap/distfiles/${PN}-4.4.4_p20160917-fix-c++14.patch.bz2" |
126 |
|
127 |
LICENSE="IBM" |
128 |
SLOT="0" |
129 |
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" |
130 |
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
131 |
IUSE="hdf cdf netcdf tiff imagemagick szip smp" |
132 |
|
133 |
RDEPEND="x11-libs/libXmu |
134 |
@@ -27,26 +29,29 @@ RDEPEND="x11-libs/libXmu |
135 |
hdf? ( sci-libs/hdf ) |
136 |
cdf? ( sci-libs/cdf ) |
137 |
netcdf? ( sci-libs/netcdf ) |
138 |
- tiff? ( media-libs/tiff ) |
139 |
- imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )" |
140 |
+ tiff? ( media-libs/tiff:0 ) |
141 |
+ imagemagick? ( virtual/imagemagick-tools )" |
142 |
|
143 |
DEPEND="${RDEPEND} |
144 |
virtual/pkgconfig" |
145 |
|
146 |
S="${WORKDIR}/${MYP}" |
147 |
+PATCHES=( |
148 |
+ "${FILESDIR}/${PN}-4.3.2-sys.h.patch" |
149 |
+ "${FILESDIR}/${P}-installpaths.patch" |
150 |
+ "${FILESDIR}/${P}-xdg.patch" |
151 |
+ "${FILESDIR}/${P}-gcc43.patch" |
152 |
+ "${FILESDIR}/${P}-dx-errno.patch" |
153 |
+ "${FILESDIR}/${P}-libtool.patch" |
154 |
+ "${FILESDIR}/${P}-concurrent-make-fix.patch" |
155 |
+ "${FILESDIR}/${P}-open.patch" |
156 |
+ "${FILESDIR}/${P}-szip.patch" |
157 |
+ "${FILESDIR}/${P}-null.patch" |
158 |
+ "${WORKDIR}/${PN}-4.4.4_p20160917-fix-c++14.patch" |
159 |
+) |
160 |
|
161 |
src_prepare() { |
162 |
- epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch" |
163 |
- epatch "${FILESDIR}/${P}-installpaths.patch" |
164 |
- epatch "${FILESDIR}/${P}-xdg.patch" |
165 |
- epatch "${FILESDIR}/${P}-gcc43.patch" |
166 |
- epatch "${FILESDIR}/${P}-dx-errno.patch" |
167 |
- epatch "${FILESDIR}/${P}-libtool.patch" |
168 |
- epatch "${FILESDIR}/${P}-concurrent-make-fix.patch" |
169 |
- epatch "${FILESDIR}/${P}-open.patch" |
170 |
- epatch "${FILESDIR}/${P}-szip.patch" |
171 |
- epatch "${FILESDIR}/${P}-null.patch" |
172 |
- epatch "${FILESDIR}/${P}-magick.patch" |
173 |
+ default |
174 |
eautoreconf |
175 |
} |
176 |
|
177 |
@@ -64,7 +69,6 @@ src_configure() { |
178 |
|
179 |
# javadx is currently broken. we may try to fix it someday. |
180 |
econf \ |
181 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) \ |
182 |
--with-x \ |
183 |
--without-javadx \ |
184 |
$(use_with szip szlib) \ |