1 |
commit: 92ea2e6dce27c52e8f8039bf0c60fd85f89d8e10 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 9 22:21:20 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 9 23:04:11 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ea2e6d |
7 |
|
8 |
sci-libs/hdf: Drop 4.2.13-r1 and 4.2.15 (r0) |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
sci-libs/hdf/Manifest | 1 - |
14 |
.../files/hdf-4.2.11-enable-fortran-shared.patch | 35 --------- |
15 |
.../hdf/files/hdf-4.2.11-fix-szip-detection.patch | 27 ------- |
16 |
.../hdf/files/hdf-4.2.13-fix-xdr-configure.patch | 13 ---- |
17 |
sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch | 29 -------- |
18 |
sci-libs/hdf/hdf-4.2.13-r1.ebuild | 83 ---------------------- |
19 |
sci-libs/hdf/hdf-4.2.15.ebuild | 77 -------------------- |
20 |
7 files changed, 265 deletions(-) |
21 |
|
22 |
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest |
23 |
index f263bbc2c62b..d44550729bb1 100644 |
24 |
--- a/sci-libs/hdf/Manifest |
25 |
+++ b/sci-libs/hdf/Manifest |
26 |
@@ -1,3 +1,2 @@ |
27 |
-DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657 |
28 |
DIST hdf-4.2.15-arch-patches-1.tar.bz2 7187 BLAKE2B 461e3d7c5e3603fb909d59d6fb23b59f64ef6a6c4e58fe85ddf906a8f27918ac25d3928f5c705290d9d778e1ed07b009bd0602409c05d13a06905d58f2a2cfff SHA512 616c39d06fb6f479a7bed88a89828530ac32018dae827259b76d6e177e5b50378722b60532533a02ae534dddc445f4e360e7a19a28e2cf9728549e5ee27c3e67 |
29 |
DIST hdf-4.2.15.tar.bz2 3647900 BLAKE2B b1d60ee880563bf64ae6eae4c66f86afe55f4c512f06c84c154de30034fa7a65cfa2b9bd68fbf8a055bb42b57215455ac8967f2a73ec88b361750aa07e0da5e6 SHA512 7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9 |
30 |
|
31 |
diff --git a/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch b/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch |
32 |
deleted file mode 100644 |
33 |
index 7d48a8a0ca97..000000000000 |
34 |
--- a/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch |
35 |
+++ /dev/null |
36 |
@@ -1,35 +0,0 @@ |
37 |
---- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000 |
38 |
-+++ hdf-4.2.11/configure.ac 2016-03-16 20:15:56.767311873 +0000 |
39 |
-@@ -224,20 +224,6 @@ |
40 |
- ## Build static libraries by default. Furthermore, fortran shared libraries |
41 |
- ## are unsupported. Disallow a user from enabling both shared libraries and |
42 |
- ## fortran. |
43 |
--if test "X${enable_shared}" != "Xyes"; then |
44 |
-- enable_shared="no" |
45 |
--fi |
46 |
-- |
47 |
--if test "X${enable_shared}" = "Xyes"; then |
48 |
-- if test "X${BUILD_FORTRAN}" = "Xyes"; then |
49 |
-- AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure with --disable-fortran flag.]) |
50 |
-- fi |
51 |
--fi |
52 |
-- |
53 |
--AC_PROG_INSTALL |
54 |
--AC_PROG_LN_S |
55 |
-- |
56 |
--AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH]) |
57 |
- |
58 |
- AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], []) |
59 |
- |
60 |
-@@ -847,11 +833,6 @@ |
61 |
- ## ------------------------------------------------------------------------ |
62 |
- ## Check to see if libtool has enabled shared libraries. Set a conditional |
63 |
- ## as some Makefiles will build based on availability of shared libraries. |
64 |
--if (./libtool --features | grep '^enable shared libraries' > /dev/null); then |
65 |
-- enable_shared=yes |
66 |
--else |
67 |
-- enable_shared=no |
68 |
--fi |
69 |
- |
70 |
- ## ------------------------------------------------------------------------ |
71 |
- ## Specify shared library extension the host machine should recognize. |
72 |
|
73 |
diff --git a/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch b/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch |
74 |
deleted file mode 100644 |
75 |
index 4486eb959b82..000000000000 |
76 |
--- a/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch |
77 |
+++ /dev/null |
78 |
@@ -1,27 +0,0 @@ |
79 |
---- hdf-4.2.11.orig/configure.ac 2016-03-16 20:07:45.093493050 +0000 |
80 |
-+++ hdf-4.2.11/configure.ac 2016-03-16 22:08:06.232711036 +0000 |
81 |
-@@ -473,12 +473,14 @@ |
82 |
- yes) |
83 |
- HAVE_SZIP="yes" |
84 |
- AC_CHECK_HEADERS([szlib.h], [HAVE_SZLIB_H="yes"], [unset HAVE_SZIP]) |
85 |
-- if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then |
86 |
-+ if test "x$HAVE_SZIP" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then |
87 |
- AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP]) |
88 |
- fi |
89 |
- |
90 |
- if test -z "$HAVE_SZIP"; then |
91 |
- AC_MSG_ERROR([couldn't find szlib library]) |
92 |
-+ else |
93 |
-+ USE_COMP_SZIP="yes" |
94 |
- fi |
95 |
- ;; |
96 |
- no) |
97 |
-@@ -525,7 +527,7 @@ |
98 |
- AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP]) |
99 |
- fi |
100 |
- |
101 |
-- if test -z "$HAVE_SZIP"; then |
102 |
-+ if test "x$HAVE_SZIP" != "xyes"; then |
103 |
- AC_MSG_ERROR([couldn't find szlib library]) |
104 |
- else |
105 |
- USE_COMP_SZIP="yes" |
106 |
|
107 |
diff --git a/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch b/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch |
108 |
deleted file mode 100644 |
109 |
index a4514ab267ec..000000000000 |
110 |
--- a/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch |
111 |
+++ /dev/null |
112 |
@@ -1,13 +0,0 @@ |
113 |
-Index: hdf-4.2.13/configure.ac |
114 |
-=================================================================== |
115 |
---- hdf-4.2.13.orig/configure.ac |
116 |
-+++ hdf-4.2.13/configure.ac |
117 |
-@@ -676,7 +676,7 @@ case "$host" in |
118 |
- *) ;; |
119 |
- esac |
120 |
- |
121 |
--if test "X$BUILD_XDR" != "Xyes"; then |
122 |
-+if test "X$BUILD_XDR" = "Xyes"; then |
123 |
- AC_TRY_LINK([ |
124 |
- #include <rpc/types.h> |
125 |
- #include <rpc/xdr.h>], [xdr_int], |
126 |
|
127 |
diff --git a/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch b/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch |
128 |
deleted file mode 100644 |
129 |
index 963388f66982..000000000000 |
130 |
--- a/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch |
131 |
+++ /dev/null |
132 |
@@ -1,29 +0,0 @@ |
133 |
-Index: hdf-4.2.13/configure.ac |
134 |
-=================================================================== |
135 |
---- hdf-4.2.13.orig/configure.ac |
136 |
-+++ hdf-4.2.13/configure.ac |
137 |
-@@ -673,6 +673,9 @@ case "$host" in |
138 |
- *-pc-cygwin*) |
139 |
- LIBS="$LIBS -ltirpc" |
140 |
- CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;; |
141 |
-+ *-pc-linux*) |
142 |
-+ LIBS="$LIBS -ltirpc" |
143 |
-+ CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc" ;; |
144 |
- *) ;; |
145 |
- esac |
146 |
- |
147 |
-@@ -703,6 +706,14 @@ if test "X$BUILD_XDR" != "Xyes"; then |
148 |
- HAVE_RPC="yes" |
149 |
- AC_CHECK_HEADER([rpc.h],[:], [unset HAVE_RPC]) |
150 |
- AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC]) |
151 |
-+ if test -z "$HAVE_RPC"; then |
152 |
-+ AC_MSG_ERROR([couldn't find tirpc library]) |
153 |
-+ fi |
154 |
-+ ;; |
155 |
-+ *-pc-linux*) |
156 |
-+ HAVE_RPC="yes" |
157 |
-+ AC_CHECK_HEADER([rpc/rpc.h],[:], [unset HAVE_RPC]) |
158 |
-+ AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC]) |
159 |
- if test -z "$HAVE_RPC"; then |
160 |
- AC_MSG_ERROR([couldn't find tirpc library]) |
161 |
- fi |
162 |
|
163 |
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild |
164 |
deleted file mode 100644 |
165 |
index cf5dc153dc11..000000000000 |
166 |
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild |
167 |
+++ /dev/null |
168 |
@@ -1,83 +0,0 @@ |
169 |
-# Copyright 1999-2021 Gentoo Authors |
170 |
-# Distributed under the terms of the GNU General Public License v2 |
171 |
- |
172 |
-EAPI=6 |
173 |
- |
174 |
-FORTRAN_NEEDED=fortran |
175 |
- |
176 |
-inherit fortran-2 toolchain-funcs autotools flag-o-matic |
177 |
- |
178 |
-MYP=${P/_p/-patch} |
179 |
- |
180 |
-DESCRIPTION="General purpose library and format for storing scientific data" |
181 |
-HOMEPAGE="https://www.hdfgroup.org/hdf4.html" |
182 |
-SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2" |
183 |
- |
184 |
-SLOT="0" |
185 |
-LICENSE="NCSA-HDF" |
186 |
-KEYWORDS="amd64 ~ia64 ppc -sparc x86 ~amd64-linux ~x86-linux" |
187 |
-IUSE="examples fortran szip static-libs test" |
188 |
-RESTRICT="!test? ( test )" |
189 |
-REQUIRED_USE="test? ( szip )" |
190 |
- |
191 |
-RDEPEND=" |
192 |
- net-libs/libtirpc |
193 |
- sys-libs/zlib |
194 |
- virtual/jpeg:0 |
195 |
- szip? ( virtual/szip )" |
196 |
-DEPEND="${RDEPEND} |
197 |
- test? ( virtual/szip )" |
198 |
- |
199 |
-S="${WORKDIR}/${MYP}" |
200 |
- |
201 |
-PATCHES=( |
202 |
- "${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch |
203 |
- "${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch |
204 |
- "${FILESDIR}"/${PN}-4.2.13-fix-xdr-configure.patch |
205 |
- "${FILESDIR}"/${PN}-4.2.13-linux-tirpc.patch |
206 |
-) |
207 |
- |
208 |
-src_prepare() { |
209 |
- default |
210 |
- sed -i -e 's/-R/-L/g' config/commence.am || die #rpath |
211 |
- eautoreconf |
212 |
-} |
213 |
- |
214 |
-src_configure() { |
215 |
- [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check |
216 |
- # GCC 10 workaround |
217 |
- # bug #723014 |
218 |
- append-fflags $(test-flags-FC -fallow-argument-mismatch) |
219 |
- |
220 |
- econf \ |
221 |
- --enable-shared \ |
222 |
- --enable-production=gentoo \ |
223 |
- --disable-netcdf \ |
224 |
- $(use_enable fortran) \ |
225 |
- $(use_enable static-libs static) \ |
226 |
- $(use_with szip szlib) \ |
227 |
- CC="$(tc-getCC)" |
228 |
-} |
229 |
- |
230 |
-src_install() { |
231 |
- default |
232 |
- |
233 |
- if ! use static-libs; then |
234 |
- find "${ED}" -name '*.la' -delete || die |
235 |
- fi |
236 |
- |
237 |
- dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt |
238 |
- |
239 |
- cd "${ED}"usr |
240 |
- if use examples; then |
241 |
- mv share/hdf4_examples share/doc/${PF}/examples || die |
242 |
- docompress -x /usr/share/doc/${PF}/examples |
243 |
- else |
244 |
- rm -r share/hdf4_examples || die |
245 |
- fi |
246 |
- |
247 |
- mv bin/ncgen{,-hdf} || die |
248 |
- mv bin/ncdump{,-hdf} || die |
249 |
- mv share/man/man1/ncgen{,-hdf}.1 || die |
250 |
- mv share/man/man1/ncdump{,-hdf}.1 || die |
251 |
-} |
252 |
|
253 |
diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild |
254 |
deleted file mode 100644 |
255 |
index 7f129df09b6b..000000000000 |
256 |
--- a/sci-libs/hdf/hdf-4.2.15.ebuild |
257 |
+++ /dev/null |
258 |
@@ -1,77 +0,0 @@ |
259 |
-# Copyright 1999-2021 Gentoo Authors |
260 |
-# Distributed under the terms of the GNU General Public License v2 |
261 |
- |
262 |
-EAPI=7 |
263 |
- |
264 |
-FORTRAN_NEEDED=fortran |
265 |
- |
266 |
-inherit fortran-2 toolchain-funcs autotools flag-o-matic |
267 |
- |
268 |
-DESCRIPTION="General purpose library and format for storing scientific data" |
269 |
-HOMEPAGE="https://www.hdfgroup.org/hdf4.html" |
270 |
-SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar.bz2" |
271 |
- |
272 |
-SLOT="0" |
273 |
-LICENSE="NCSA-HDF" |
274 |
-KEYWORDS="amd64 ~ia64 ~ppc -riscv -sparc x86 ~amd64-linux ~x86-linux" |
275 |
-IUSE="examples fortran szip static-libs test" |
276 |
-RESTRICT="!test? ( test )" |
277 |
-REQUIRED_USE="test? ( szip )" |
278 |
- |
279 |
-RDEPEND=" |
280 |
- net-libs/libtirpc |
281 |
- sys-libs/zlib |
282 |
- virtual/jpeg:0 |
283 |
- szip? ( virtual/szip )" |
284 |
-DEPEND="${RDEPEND} |
285 |
- test? ( virtual/szip )" |
286 |
- |
287 |
-PATCHES=( |
288 |
- "${FILESDIR}"/${PN}-4.2.15-enable-fortran-shared.patch |
289 |
- "${FILESDIR}"/${PN}-4.2.15-fix-rpch-location.patch |
290 |
-) |
291 |
- |
292 |
-src_prepare() { |
293 |
- default |
294 |
- sed -i -e 's/-R/-L/g' config/commence.am || die #rpath |
295 |
- eautoreconf |
296 |
-} |
297 |
- |
298 |
-src_configure() { |
299 |
- [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check |
300 |
- # GCC 10 workaround |
301 |
- # bug #723014 |
302 |
- append-fflags $(test-flags-FC -fallow-argument-mismatch) |
303 |
- |
304 |
- econf \ |
305 |
- --enable-shared \ |
306 |
- --enable-production=gentoo \ |
307 |
- --disable-netcdf \ |
308 |
- $(use_enable fortran) \ |
309 |
- $(use_enable static-libs static) \ |
310 |
- $(use_with szip szlib) \ |
311 |
- CC="$(tc-getCC)" |
312 |
-} |
313 |
- |
314 |
-src_install() { |
315 |
- default |
316 |
- |
317 |
- if ! use static-libs; then |
318 |
- find "${ED}" -name '*.la' -delete || die |
319 |
- fi |
320 |
- |
321 |
- dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt |
322 |
- |
323 |
- cd "${ED}/usr" || die |
324 |
- if use examples; then |
325 |
- mv share/hdf4_examples share/doc/${PF}/examples || die |
326 |
- docompress -x /usr/share/doc/${PF}/examples |
327 |
- else |
328 |
- rm -r share/hdf4_examples || die |
329 |
- fi |
330 |
- |
331 |
- mv bin/ncgen{,-hdf} || die |
332 |
- mv bin/ncdump{,-hdf} || die |
333 |
- mv share/man/man1/ncgen{,-hdf}.1 || die |
334 |
- mv share/man/man1/ncdump{,-hdf}.1 || die |
335 |
-} |