[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/files/, sci-libs/hdf/

[Sam James]

commit: 24a7e5c2de5100a0b6124fc3fa61b8914c36e0c1
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Apr  8 03:21:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  8 05:21:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a7e5c2

sci-libs/hdf: drop painful dead weight

I am not fighting with Modern C more than I have to, so just prune this.

The key here is that upstream hdf4 doesn't support it and doesn't want
you using it, because it appears to just be an uplifted copy of netcdf
code. So why not, erm, just use netcdf?

Good question, and this package doesn't have an answer to that. Yeet
these vendored tools into the sunset. No need to rename them to private
copies.

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 ...do-not-build-the-mfhdf-tools-ncgen-ncdump.patch | 30 ++
 sci-libs/hdf/hdf-4.2.15-r2.ebuild  |  8 +++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git 
a/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch
 
b/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch
new file mode 100644
index ..c57481a6cb84
--- /dev/null
+++ 
b/sci-libs/hdf/files/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch
@@ -0,0 +1,30 @@
+From 5a93f7ba5bea12bd78616a2168035324054ed7b7 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Sun, 7 Apr 2024 23:11:43 -0400
+Subject: [PATCH] simply do not build the mfhdf tools ncgen/ncdump
+
+They were removed upstream in:
+https://github.com/HDFGroup/hdf4/commit/57b87b9927f0127d0d04ab7cd6c93e01bf54e3ee
+
+With the note that people who want them can get them from... yup, you
+guessed it, netcdf.
+---
+ mfhdf/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mfhdf/Makefile.am b/mfhdf/Makefile.am
+index d62d3af..0963923 100644
+--- a/mfhdf/Makefile.am
 b/mfhdf/Makefile.am
+@@ -17,7 +17,7 @@ FORTRAN_DIR =
+ endif
+ 
+ # src folder in root Makefile, build other folders now
+-SUBDIRS = $(XDR_DIR) libsrc $(FORTRAN_DIR) test ncdump ncgen dumper hdfimport 
hdiff hrepack nctest
++SUBDIRS = $(XDR_DIR) libsrc $(FORTRAN_DIR) test dumper hdfimport hdiff 
hrepack nctest
+ 
+ DIST_SUBDIRS = xdr libsrc fortran test ncdump ncgen dumper hdfimport hdiff 
hrepack nctest examples
+ 
+-- 
+2.43.2
+

diff --git a/sci-libs/hdf/hdf-4.2.15-r2.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
index 6e762b25fff0..01a74e03df73 100644
--- a/sci-libs/hdf/hdf-4.2.15-r2.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
@@ -37,6 +37,9 @@ PATCHES=(
 
# backport fix for Modern C
"${FILESDIR}"/hdf4-c99.patch
+
+   # These tools were dropped upstream. Get them from netcdf...
+   
"${FILESDIR}"/0001-simply-do-not-build-the-mfhdf-tools-ncgen-ncdump.patch
 )
 
 src_prepare() {
@@ -78,9 +81,4 @@ src_install() {
else
rm -r share/hdf4_examples || die
fi
-
-   mv bin/ncgen{,-hdf} || die
-   mv bin/ncdump{,-hdf} || die
-   mv share/man/man1/ncgen{,-hdf}.1 || die
-   mv share/man/man1/ncdump{,-hdf}.1 || die
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/, sci-libs/hdf/files/

[Sam James]

commit: ddbb1f2c1f53b2fc22b91f7a131e78e7e802335a
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Apr  8 03:16:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  8 05:21:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddbb1f2c

sci-libs/hdf: big fat gobs of Modern C backporting

Ideally I would like to solve this by updating to a new upstream
release. Unfortunately, that has a combination of complications:
- existing patches don't apply
- upstream changed download site
- upstream changed up the codebase quite a bit, and notes:
  - XDR is now minimalist internals, and renamed
  - lots of internal headers were dropped, which "may cause codebases to
stop compiling, so we are bumping the minor version"

It apparently constitutes a major version.

Surprisingly, porting individual Modern C fixes from upstream is *less*
work.

This message was sponsored by Big Science. Much gratitude. <3

Closes: https://bugs.gentoo.org/874414
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/files/hdf4-c99.patch  | 371 +
 .../{hdf-4.2.15-r1.ebuild => hdf-4.2.15-r2.ebuild} |   5 +-
 2 files changed, 375 insertions(+), 1 deletion(-)

diff --git a/sci-libs/hdf/files/hdf4-c99.patch 
b/sci-libs/hdf/files/hdf4-c99.patch
new file mode 100644
index ..de5f5d07847d
--- /dev/null
+++ b/sci-libs/hdf/files/hdf4-c99.patch
@@ -0,0 +1,371 @@
+From a3d4d30fe457fc9a85fce5508119dffd3ace54c1 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Sun, 7 Apr 2024 21:28:39 -0400
+Subject: [PATCH 01/11] fix tests omitting required header
+
+sys/time.h is not time.h.
+
+Purports to be fixed by 
https://github.com/HDFGroup/hdf4/commit/276e2c205b767d31f9d0b757f53a36aee1e1f9b2
+which however doesn't directly include time.h, as of the current
+version. In later releases it does.
+---
+ hdf/test/buffer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hdf/test/buffer.c b/hdf/test/buffer.c
+index c7990e7..9f0f06f 100644
+--- a/hdf/test/buffer.c
 b/hdf/test/buffer.c
+@@ -50,6 +50,7 @@
+ #ifdef H4_HAVE_SYS_TIME_H
+ #include 
+ #endif
++#include 
+ #include "tutils.h"
+ #include "hfile.h"
+ 
+-- 
+2.43.2
+
+
+From 02ec8e25e096241e20664acfc6596767f050ec86 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Sun, 7 Apr 2024 20:41:06 -0400
+Subject: [PATCH 02/11] fix util omitting required header
+
+sys/wait.h is POSIX, but for some godforsaken reason upstream has
+decided to only include it behind random OS identifier macros. In a
+newer upstream version, they at least migrate over to including it
+whenever the header exists.
+
+https://github.com/HDFGroup/hdf4/commit/67e11955e41471c8892acc3c8930ea538f719a03
+---
+ hdf/util/he_file.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/hdf/util/he_file.c b/hdf/util/he_file.c
+index 8686e2f..d6c5e7f 100644
+--- a/hdf/util/he_file.c
 b/hdf/util/he_file.c
+@@ -17,9 +17,7 @@
+ #include "he.h"
+ 
+ /* get the prototype for the wait() func. */
+-#if defined SUN | defined HP9000 | defined IRIX | defined UNIX386
+ #include 
+-#endif /* SUN | HP9000 */
+ #ifdef H4_HAVE_UNISTD_H
+ #include 
+ #endif
+-- 
+2.43.2
+
+
+From 60223f44459e7b43a26bdccf473804f1f0fd710f Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Sun, 7 Apr 2024 20:46:48 -0400
+Subject: [PATCH 03/11] another POSIX function with a missing header
+
+For this one it is not immediately apparent to me that it's fixed
+upstream at all. Will check later.
+---
+ mfhdf/libsrc/file.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mfhdf/libsrc/file.c b/mfhdf/libsrc/file.c
+index a53301f..df73212 100644
+--- a/mfhdf/libsrc/file.c
 b/mfhdf/libsrc/file.c
+@@ -20,6 +20,7 @@
+ #include 
+ #endif /* DEBUG */
+ 
++#include 
+ #include
+ #include
+ #include"local_nc.h"
+-- 
+2.43.2
+
+
+From 2b4772cf958a1af0fff6117d4f7127607d3f1a50 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Sun, 7 Apr 2024 20:48:56 -0400
+Subject: [PATCH 04/11] add brand new definition of function no one bothered to
+ define at all
+
+Added upstream in 
https://github.com/HDFGroup/hdf4/commit/8a4137d60e2d932703fc6ee91501ad374ccba885
+---
+ mfhdf/test/hdftest.h | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/mfhdf/test/hdftest.h b/mfhdf/test/hdftest.h
+index a211c49..a946e5c 100644
+--- a/mfhdf/test/hdftest.h
 b/mfhdf/test/hdftest.h
+@@ -52,6 +52,9 @@
+ 
+ /*** Utility Functions ***/
+ 
++/* Generates the correct name for the test file */
++intn make_datafilename(char* basename, char* testfile, unsigned int size);
++
+ /* Calls SDcreate, SDwritedata, and SDendaccess */
+ int32 make_SDS(int32 sd_id, char* sds_name, int32 type, int32 rank,
+ int32* dim_sizes, int32 unlim_dim, VOIDP 
written_data);
+@@ -65,6 +68,9 @@ int32 make_Ext3D_SDS(int32 sd_id, char* sds_name, int32 
type, int32 rank,
+int32* 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: dc29c66b78d5c6909ba9210d0faf733b2cb016a6
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Apr  8 04:39:23 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  8 05:21:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc29c66b

sci-libs/hdf: update EAPI 7 -> 8

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/hdf-4.2.15-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.15-r2.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
index 1b395672879f..02fc69143873 100644
--- a/sci-libs/hdf/hdf-4.2.15-r2.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 FORTRAN_NEEDED=fortran
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: 677056ae1551e2ab9c7203ea4a4c32f7d2d59f0a
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Apr  8 03:32:34 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  8 05:21:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677056ae

sci-libs/hdf: mark as LTO-unsafe, strict-aliasing unsafe

I cannot tell whether it's still a problem upstream. Too many
catastrophes going on in this codebase right now. Not going to report it
when I have no clue.

Maybe if it could be updated for a better baseline...

Closes: https://bugs.gentoo.org/862720
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/hdf-4.2.15-r2.ebuild | 8 
 1 file changed, 8 insertions(+)

diff --git a/sci-libs/hdf/hdf-4.2.15-r2.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
index 01a74e03df73..1b395672879f 100644
--- a/sci-libs/hdf/hdf-4.2.15-r2.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r2.ebuild
@@ -50,6 +50,14 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing, -Werror=lto-type-mismatch
+   # https://bugs.gentoo.org/862720
+   #
+   # Do not trust with LTO either, just because of strict-aliasing.
+   # But also because it does have blatant LTO errors too.
+   append-flags -fno-strict-aliasing
+   filter-lto
+
[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
# GCC 10 workaround
# bug #723014

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: 44509d1ea56aa3ec0051004fb0232b9296d2c677
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 19 03:45:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 19 03:46:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44509d1e

sci-libs/hdf: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/hdf/metadata.xml b/sci-libs/hdf/metadata.xml
index 15ed11bf8172..c4fb0d5104c1 100644
--- a/sci-libs/hdf/metadata.xml
+++ b/sci-libs/hdf/metadata.xml
@@ -16,4 +16,7 @@
unstructured grids. You can also mix and match them in HDF files
according to your needs.

+   
+   HDFGroup/hdf4
+   
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/files/, sci-libs/hdf/

[Andreas Sturmlechner]

commit: 92ea2e6dce27c52e8f8039bf0c60fd85f89d8e10
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  9 22:21:20 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  9 23:04:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ea2e6d

sci-libs/hdf: Drop 4.2.13-r1 and 4.2.15 (r0)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/hdf/Manifest  |  1 -
 .../files/hdf-4.2.11-enable-fortran-shared.patch   | 35 -
 .../hdf/files/hdf-4.2.11-fix-szip-detection.patch  | 27 ---
 .../hdf/files/hdf-4.2.13-fix-xdr-configure.patch   | 13 
 sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch| 29 
 sci-libs/hdf/hdf-4.2.13-r1.ebuild  | 83 --
 sci-libs/hdf/hdf-4.2.15.ebuild | 77 
 7 files changed, 265 deletions(-)

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index f263bbc2c62b..d44550729bb1 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,3 +1,2 @@
-DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 
3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899
 SHA512 
d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
 DIST hdf-4.2.15-arch-patches-1.tar.bz2 7187 BLAKE2B 
461e3d7c5e3603fb909d59d6fb23b59f64ef6a6c4e58fe85ddf906a8f27918ac25d3928f5c705290d9d778e1ed07b009bd0602409c05d13a06905d58f2a2cfff
 SHA512 
616c39d06fb6f479a7bed88a89828530ac32018dae827259b76d6e177e5b50378722b60532533a02ae534dddc445f4e360e7a19a28e2cf9728549e5ee27c3e67
 DIST hdf-4.2.15.tar.bz2 3647900 BLAKE2B 
b1d60ee880563bf64ae6eae4c66f86afe55f4c512f06c84c154de30034fa7a65cfa2b9bd68fbf8a055bb42b57215455ac8967f2a73ec88b361750aa07e0da5e6
 SHA512 
7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9

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
deleted file mode 100644
index 7d48a8a0ca97..
--- a/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch
+++ /dev/null
@@ -1,35 +0,0 @@
 hdf-4.2.11.orig/configure.ac   2016-03-16 20:07:45.093493050 +
-+++ hdf-4.2.11/configure.ac2016-03-16 20:15:56.767311873 +
-@@ -224,20 +224,6 @@
- ## Build static libraries by default. Furthermore, fortran shared libraries
- ## are unsupported. Disallow a user from enabling both shared libraries and
- ## fortran.
--if test "X${enable_shared}" != "Xyes"; then
--enable_shared="no"
--fi
--
--if test "X${enable_shared}" = "Xyes"; then
--if test "X${BUILD_FORTRAN}" = "Xyes"; then
--AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure 
with --disable-fortran flag.])
--fi
--fi
--
--AC_PROG_INSTALL
--AC_PROG_LN_S
--
--AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
- 
- AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], [])
- 
-@@ -847,11 +833,6 @@
- ## 
- ## Check to see if libtool has enabled shared libraries. Set a conditional
- ## as some Makefiles will build based on availability of shared libraries.
--if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
--  enable_shared=yes
--else
--  enable_shared=no
--fi
- 
- ## 
- ## Specify shared library extension the host machine should recognize.

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
deleted file mode 100644
index 4486eb959b82..
--- a/sci-libs/hdf/files/hdf-4.2.11-fix-szip-detection.patch
+++ /dev/null
@@ -1,27 +0,0 @@
 hdf-4.2.11.orig/configure.ac   2016-03-16 20:07:45.093493050 +
-+++ hdf-4.2.11/configure.ac2016-03-16 22:08:06.232711036 +
-@@ -473,12 +473,14 @@
-   yes)
- HAVE_SZIP="yes"
- AC_CHECK_HEADERS([szlib.h], [HAVE_SZLIB_H="yes"], [unset HAVE_SZIP])
--if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
-+if test "x$HAVE_SZIP" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
-   AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
- fi
- 
- if test -z "$HAVE_SZIP"; then
-   AC_MSG_ERROR([couldn't find szlib library])
-+else
-+  USE_COMP_SZIP="yes"
- fi
- ;;
-   no)
-@@ -525,7 +527,7 @@
-   AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
- fi
- 
--if test -z "$HAVE_SZIP"; then
-+if test  "x$HAVE_SZIP" != "xyes"; then
-   AC_MSG_ERROR([couldn't find szlib library])
- else
-   USE_COMP_SZIP="yes"

diff --git a/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Jakov Smolić]

commit: 93dd92e0bfb7a24cf6e764e9c4f2680160a752b1
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Dec 10 19:27:41 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Dec 10 19:27:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93dd92e0

sci-libs/hdf: Stabilize 4.2.15-r1 x86, #816390

Signed-off-by: Jakov Smolić  gentoo.org>

 sci-libs/hdf/hdf-4.2.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
index 4f9a634bf617..047eb57a8562 100644
--- a/sci-libs/hdf/hdf-4.2.15-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15
 
 LICENSE="NCSA-HDF"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: 192727371502b32ba0c92efe7701d034dd860a82
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  9 21:22:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  9 21:22:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19272737

sci-libs/hdf: Stabilize 4.2.15-r1 amd64, #816390

Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/hdf-4.2.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
index 09db1bf47c05..4f9a634bf617 100644
--- a/sci-libs/hdf/hdf-4.2.15-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15
 
 LICENSE="NCSA-HDF"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Yixun Lan]

commit: 4148308762bdddc31a0249844518a184dcab9e40
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Dec  8 08:46:00 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Dec  8 08:46:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41483087

sci-libs/hdf: keyword ~riscv

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 sci-libs/hdf/hdf-4.2.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
index fe289bf6b3de..09db1bf47c05 100644
--- a/sci-libs/hdf/hdf-4.2.15-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15
 
 LICENSE="NCSA-HDF"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ia64 ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Yixun Lan]

commit: 6a7dd2024afab2042fdffedf4a907abaa2cddb56
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Dec  8 08:39:46 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Dec  8 08:41:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7dd202

sci-libs/hdf: fix riscv64 test error

the original patch took from
https://sources.debian.org/patches/libhdf4/4.2.15-4/riscv64.diff/

Bug: https://bugs.gentoo.org/664856
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 sci-libs/hdf/Manifest | 2 +-
 sci-libs/hdf/hdf-4.2.15-r1.ebuild | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 74b9e9dfb5b1..f263bbc2c62b 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,3 +1,3 @@
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 
3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899
 SHA512 
d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
-DIST hdf-4.2.15-arch-patches.tar.bz2 7012 BLAKE2B 
58fd8ac608856fff95bd385aa01062820a7b58c6b89d9733709449ad20cedb691e1bcaeb314b0d846068af5a30cdf46740ce5d02f54be144c8e292b3c5db55d1
 SHA512 
c86a9aee2b0e388793f84bcaf2900f498ba481a00e8a3b50bb70b30f5a9631c6abfa99dc17fb9a7af13b47f50742cf40a69d5e79b515f22072eaae72656c3bda
+DIST hdf-4.2.15-arch-patches-1.tar.bz2 7187 BLAKE2B 
461e3d7c5e3603fb909d59d6fb23b59f64ef6a6c4e58fe85ddf906a8f27918ac25d3928f5c705290d9d778e1ed07b009bd0602409c05d13a06905d58f2a2cfff
 SHA512 
616c39d06fb6f479a7bed88a89828530ac32018dae827259b76d6e177e5b50378722b60532533a02ae534dddc445f4e360e7a19a28e2cf9728549e5ee27c3e67
 DIST hdf-4.2.15.tar.bz2 3647900 BLAKE2B 
b1d60ee880563bf64ae6eae4c66f86afe55f4c512f06c84c154de30034fa7a65cfa2b9bd68fbf8a055bb42b57215455ac8967f2a73ec88b361750aa07e0da5e6
 SHA512 
7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9

diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
index 295ff65d6a46..fe289bf6b3de 100644
--- a/sci-libs/hdf/hdf-4.2.15-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
@@ -10,7 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic
 DESCRIPTION="General purpose library and format for storing scientific data"
 HOMEPAGE="https://www.hdfgroup.org/hdf4.html;
 
SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar.bz2;
-SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15-arch-patches.tar.bz2;
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15-arch-patches-1.tar.bz2;
+SRC_URI+=" 
https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15-arch-patches-1.tar.bz2;
 
 LICENSE="NCSA-HDF"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: 28c7fbfaac998822c0926e8cdf9c80035ecdb7dd
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  8 05:28:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  8 05:28:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28c7fbfa

sci-libs/hdf: Keyword 4.2.15-r1 arm, #804927

Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/hdf-4.2.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
index 8b3949ff0844..295ff65d6a46 100644
--- a/sci-libs/hdf/hdf-4.2.15-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15-
 
 LICENSE="NCSA-HDF"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ia64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: ee7731616dbf09cab41ebf2f974ea19d6825659e
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  8 05:16:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  8 05:16:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee773161

sci-libs/hdf: Stabilize 4.2.15-r1 ppc, #816390

Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/hdf-4.2.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
index e889b13db235..8b3949ff0844 100644
--- a/sci-libs/hdf/hdf-4.2.15-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15-
 
 LICENSE="NCSA-HDF"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: 0f59e02374b08163b3eaf1bb96826e0dee3c610c
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  8 04:45:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  8 04:45:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f59e023

sci-libs/hdf: fix typo

Had switched it back to ${FILESDIR} to add an extra patch but forgot
to switch it back again apparently.

Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/hdf-4.2.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
index c93e912c8ccd..e889b13db235 100644
--- a/sci-libs/hdf/hdf-4.2.15-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 
# May need to extend these for more arches in future.
# bug #664856
-   "${FILESDIR}"/${PN}-4.2.15-arch-patches/
+   "${WORKDIR}"/${PN}-4.2.15-arch-patches/
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: ad6e8b5b84c4fb5e19e5a0f475e52776725a790a
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  8 04:20:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  8 04:20:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad6e8b5b

sci-libs/hdf: drop -riscv for 4.2.15-r1 with new arch. support

This should now support riscv, but will leave keywording for
the arch team of course. But dropping -riscv as it's no longer
known-broken.

Bug: https://bugs.gentoo.org/664856
Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/hdf-4.2.15-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
index 2c9f240f5c3e..c93e912c8ccd 100644
--- a/sci-libs/hdf/hdf-4.2.15-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15-
 
 LICENSE="NCSA-HDF"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc -riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: 84b1a3a4e4fb165d9a76d53ebc4b24de5568ae83
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  8 04:17:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  8 04:19:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b1a3a4

sci-libs/hdf: support additional architectures

Pull in patches from Fedora [0] and Debian [1] with some simple rebasing
(added riscv, hppa, sparc64 by cherry-picking extra bits too).

All references included in the respective patches within
the patch tarball too.

This should, in total, give us:
- hppa
- sparc{,64}
- arm
- arm64
- ppc
- ppc64(le?)
- s390

[0] https://src.fedoraproject.org/rpms/hdf/tree/rawhide
[1] https://sources.debian.org/patches/libhdf4/4.2.15-4/

Bug: https://bugs.gentoo.org/664856
Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/Manifest |  1 +
 sci-libs/hdf/hdf-4.2.15-r1.ebuild | 82 +++
 2 files changed, 83 insertions(+)

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index ffbb29281d6e..74b9e9dfb5b1 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,2 +1,3 @@
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 
3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899
 SHA512 
d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
+DIST hdf-4.2.15-arch-patches.tar.bz2 7012 BLAKE2B 
58fd8ac608856fff95bd385aa01062820a7b58c6b89d9733709449ad20cedb691e1bcaeb314b0d846068af5a30cdf46740ce5d02f54be144c8e292b3c5db55d1
 SHA512 
c86a9aee2b0e388793f84bcaf2900f498ba481a00e8a3b50bb70b30f5a9631c6abfa99dc17fb9a7af13b47f50742cf40a69d5e79b515f22072eaae72656c3bda
 DIST hdf-4.2.15.tar.bz2 3647900 BLAKE2B 
b1d60ee880563bf64ae6eae4c66f86afe55f4c512f06c84c154de30034fa7a65cfa2b9bd68fbf8a055bb42b57215455ac8967f2a73ec88b361750aa07e0da5e6
 SHA512 
7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9

diff --git a/sci-libs/hdf/hdf-4.2.15-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
new file mode 100644
index ..2c9f240f5c3e
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.15-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs autotools flag-o-matic
+
+DESCRIPTION="General purpose library and format for storing scientific data"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html;
+SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar.bz2;
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-4.2.15-arch-patches.tar.bz2;
+
+LICENSE="NCSA-HDF"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc -riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples fortran szip static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( szip )"
+
+RDEPEND="net-libs/libtirpc:=
+   sys-libs/zlib
+   virtual/jpeg:0
+   szip? ( virtual/szip )"
+DEPEND="${RDEPEND}
+   test? ( virtual/szip )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.2.15-enable-fortran-shared.patch
+   "${FILESDIR}"/${PN}-4.2.15-fix-rpch-location.patch
+
+   # May need to extend these for more arches in future.
+   # bug #664856
+   "${FILESDIR}"/${PN}-4.2.15-arch-patches/
+)
+
+src_prepare() {
+   default
+
+   sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
+   eautoreconf
+}
+
+src_configure() {
+   [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+   # GCC 10 workaround
+   # bug #723014
+   append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
+   econf \
+   --enable-shared \
+   --enable-production=gentoo \
+   --disable-netcdf \
+   $(use_enable fortran) \
+   $(use_enable static-libs static) \
+   $(use_with szip szlib) \
+   CC="$(tc-getCC)"
+}
+
+src_install() {
+   default
+
+   if ! use static-libs; then
+   find "${ED}" -name '*.la' -delete || die
+   fi
+
+   dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
+
+   cd "${ED}/usr" || die
+   if use examples; then
+   mv  share/hdf4_examples share/doc/${PF}/examples || die
+   docompress -x /usr/share/doc/${PF}/examples
+   else
+   rm -r share/hdf4_examples || die
+   fi
+
+   mv bin/ncgen{,-hdf} || die
+   mv bin/ncdump{,-hdf} || die
+   mv share/man/man1/ncgen{,-hdf}.1 || die
+   mv share/man/man1/ncdump{,-hdf}.1 || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Jakov Smolić]

commit: 34ec1b238fb4938be7edb89e9a804ce951083ae7
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Nov  9 21:48:58 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Nov  9 21:48:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ec1b23

sci-libs/hdf: Stabilize 4.2.15 x86, #816390

Signed-off-by: Jakov Smolić  gentoo.org>

 sci-libs/hdf/hdf-4.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild
index d21c07c43c4..7f129df09b6 100644
--- a/sci-libs/hdf/hdf-4.2.15.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ~ia64 ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ~ppc -riscv -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: e0a06877cb984967163aee95fc7c7e08e1dc847a
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 29 12:32:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 29 12:32:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a06877

sci-libs/hdf: Stabilize 4.2.15 amd64, #816390

Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/hdf-4.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild
index 21cf98fc16d..d21c07c43c4 100644
--- a/sci-libs/hdf/hdf-4.2.15.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ia64 ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Marek Szuba]

commit: b9c5a5079188feef26b21c455166ff9ba7f38b4d
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Aug 14 21:35:44 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Aug 14 23:15:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c5a507

sci-libs/hdf: keyword 4.2.15 for -riscv

Architecture not supported; see Bug #664856.

Signed-off-by: Marek Szuba  gentoo.org>

 sci-libs/hdf/hdf-4.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild
index b2ff7488868..21cf98fc16d 100644
--- a/sci-libs/hdf/hdf-4.2.15.ebuild
+++ b/sci-libs/hdf/hdf-4.2.15.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc -riscv -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( szip )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/, sci-libs/hdf/files/

[Andrew Ammerlaan]

commit: c483b68977abd67da3b10c13b6d4da9656ddecf4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Jun 10 14:43:18 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Jun 10 14:43:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c483b689

sci-libs/hdf: add version 4.2.15

Closes: https://bugs.gentoo.org/771648
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/hdf/Manifest  |  1 +
 .../files/hdf-4.2.15-enable-fortran-shared.patch   | 37 +++
 .../hdf/files/hdf-4.2.15-fix-rpch-location.patch   | 13 
 sci-libs/hdf/hdf-4.2.15.ebuild | 77 ++
 4 files changed, 128 insertions(+)

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index e10b0af4e45..ffbb29281d6 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1 +1,2 @@
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 
3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899
 SHA512 
d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
+DIST hdf-4.2.15.tar.bz2 3647900 BLAKE2B 
b1d60ee880563bf64ae6eae4c66f86afe55f4c512f06c84c154de30034fa7a65cfa2b9bd68fbf8a055bb42b57215455ac8967f2a73ec88b361750aa07e0da5e6
 SHA512 
7d4037800ef8950ed74f225355ef5458444bed26fc189fbbd2ce7d36009998013ac1f6ba5d4e60834acf8f6f73550357238745acc35e162679919400a48191e9

diff --git a/sci-libs/hdf/files/hdf-4.2.15-enable-fortran-shared.patch 
b/sci-libs/hdf/files/hdf-4.2.15-enable-fortran-shared.patch
new file mode 100644
index 000..8c6a1c9f868
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.15-enable-fortran-shared.patch
@@ -0,0 +1,37 @@
+diff --git a/configure.ac b/configure.ac
+index 0014f85..5601a1c 100644
+--- a/configure.ac
 b/configure.ac
+@@ -290,20 +290,6 @@ fi
+ ## Build static libraries by default. Furthermore, fortran shared libraries
+ ## are unsupported. Disallow a user from enabling both shared libraries and
+ ## fortran.
+-if test "X${enable_shared}" != "Xyes"; then
+-enable_shared="no"
+-fi
+-
+-if test "X${enable_shared}" = "Xyes"; then
+-if test "X${BUILD_FORTRAN}" = "Xyes"; then
+-AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure 
with --disable-fortran flag.])
+-fi
+-fi
+-
+-AC_PROG_INSTALL
+-AC_PROG_LN_S
+-
+-AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
+ 
+ AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], [])
+ 
+@@ -948,11 +934,6 @@ done
+ ## 
+ ## Check to see if libtool has enabled shared libraries. Set a conditional
+ ## as some Makefiles will build based on availability of shared libraries.
+-if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
+-  enable_shared=yes
+-else
+-  enable_shared=no
+-fi
+ 
+ ## 
+ ## Specify shared library extension the host machine should recognize.

diff --git a/sci-libs/hdf/files/hdf-4.2.15-fix-rpch-location.patch 
b/sci-libs/hdf/files/hdf-4.2.15-fix-rpch-location.patch
new file mode 100644
index 000..a373649e2ab
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.15-fix-rpch-location.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 5601a1c..df03984 100644
+--- a/configure.ac
 b/configure.ac
+@@ -693,7 +693,7 @@ if test "X$BUILD_XDR" != "Xyes"; then
+   if test -z "$HAVE_OLDRPC" ; then
+ LIBS="$LIBS -ltirpc"
+ CPPFLAGS="$SYSCPPFLAGS -I/usr/include/tirpc"
+-AC_CHECK_HEADER([rpc/rpc.h],[:], [unset HAVE_TIRPC])
++AC_CHECK_HEADER([tirpc/rpc/rpc.h],[:], [unset HAVE_TIRPC])
+ if test -z "$HAVE_TIRPC" ; then
+   CPPFLAGS="$SYSCPPFLAGS"
+   AC_MSG_ERROR([couldn't find rpc headers])

diff --git a/sci-libs/hdf/hdf-4.2.15.ebuild b/sci-libs/hdf/hdf-4.2.15.ebuild
new file mode 100644
index 000..b2ff7488868
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.15.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs autotools flag-o-matic
+
+DESCRIPTION="General purpose library and format for storing scientific data"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html;
+SRC_URI="https://support.hdfgroup.org/ftp/HDF/releases/${PN^^}${PV}/src/${P}.tar.bz2;
+
+SLOT="0"
+LICENSE="NCSA-HDF"
+KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples fortran szip static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( szip )"
+
+RDEPEND="
+   net-libs/libtirpc
+   sys-libs/zlib
+   virtual/jpeg:0
+   szip? ( virtual/szip )"
+DEPEND="${RDEPEND}
+   test? ( virtual/szip )"
+
+PATCHES=(
+   

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[David Seifert]

commit: dd6f9b1f9a47804d36c8dce5aab67022f19e57ee
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Mon May 31 09:19:21 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon May 31 09:19:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6f9b1f

sci-libs/hdf: drop deprecated ltprune eclass

Signed-off-by: Conrad Kostecki  gentoo.org>
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/hdf/hdf-4.2.13-r1.ebuild | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index 7937f8032bd..cf5dc153dc1 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 FORTRAN_NEEDED=fortran
 
-inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
+inherit fortran-2 toolchain-funcs autotools flag-o-matic
 
 MYP=${P/_p/-patch}
 
@@ -61,8 +61,13 @@ src_configure() {
 
 src_install() {
default
-   use static-libs || prune_libtool_files --all
+
+   if ! use static-libs; then
+   find "${ED}" -name '*.la' -delete || die
+   fi
+
dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
+
cd "${ED}"usr
if use examples; then
mv  share/hdf4_examples share/doc/${PF}/examples || die
@@ -70,6 +75,7 @@ src_install() {
else
rm -r share/hdf4_examples || die
fi
+
mv bin/ncgen{,-hdf} || die
mv bin/ncdump{,-hdf} || die
mv share/man/man1/ncgen{,-hdf}.1 || die

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: d5abd4baeb499afac336e69bd59a430c748ed673
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 19 12:26:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 19 12:45:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5abd4ba

sci-libs/hdf: add bug reference to gcc 10 workaround

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/hdf-4.2.13-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index cb609f264b5..7937f8032bd 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -45,6 +45,8 @@ src_prepare() {
 
 src_configure() {
[[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+   # GCC 10 workaround
+   # bug #723014
append-fflags $(test-flags-FC -fallow-argument-mismatch)
 
econf \

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sam James]

commit: 74d38102d26f09358ddbc9645691353cade7e41f
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 19 12:14:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 19 12:19:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74d38102

sci-libs/hdf: workaround gcc 10 (fortran) failure

Closes: https://bugs.gentoo.org/723014
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-libs/hdf/hdf-4.2.13-r1.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index ae60cc865d3..cb609f264b5 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,10 +41,12 @@ src_prepare() {
default
sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
eautoreconf
-   [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
 }
 
 src_configure() {
+   [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+   append-fflags $(test-flags-FC -fallow-argument-mismatch)
+
econf \
--enable-shared \
--enable-production=gentoo \

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[David Seifert]

commit: 5432165433b6e32fd6ef412aa9fcfcf7ea151664
Author: Jakov Smolic  sartura  hr>
AuthorDate: Thu Feb 18 18:55:49 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Feb 18 18:55:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54321654

sci-libs/hdf: Remove old

Closes: https://bugs.gentoo.org/716530
Closes: https://bugs.gentoo.org/664856
Closes: https://bugs.gentoo.org/639390

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/hdf/hdf-4.2.13.ebuild | 70 --
 1 file changed, 70 deletions(-)

diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
deleted file mode 100644
index feefb99d01a..000
--- a/sci-libs/hdf/hdf-4.2.13.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
-
-MYP=${P/_p/-patch}
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="https://www.hdfgroup.org/hdf4.html;
-SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
-
-SLOT="0"
-LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples fortran szip static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( szip )"
-
-RDEPEND="
-   sys-libs/zlib
-   virtual/jpeg:0
-   szip? ( virtual/szip )"
-DEPEND="${RDEPEND}
-   test? ( virtual/szip )"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch
-   "${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch
-)
-
-src_prepare() {
-   default
-   sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
-   eautoreconf
-   [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
-}
-
-src_configure() {
-   econf \
-   --enable-shared \
-   --enable-production=gentoo \
-   --disable-netcdf \
-   $(use_enable fortran) \
-   $(use_enable static-libs static) \
-   $(use_with szip szlib) \
-   CC="$(tc-getCC)"
-}
-
-src_install() {
-   default
-   use static-libs || prune_libtool_files --all
-   dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
-   cd "${ED}"usr
-   if use examples; then
-   mv  share/hdf4_examples share/doc/${PF}/examples || die
-   docompress -x /usr/share/doc/${PF}/examples
-   else
-   rm -r share/hdf4_examples || die
-   fi
-   mv bin/ncgen{,-hdf} || die
-   mv bin/ncdump{,-hdf} || die
-   mv share/man/man1/ncgen{,-hdf}.1 || die
-   mv share/man/man1/ncdump{,-hdf}.1 || die
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/files/, sci-libs/hdf/

[David Seifert]

commit: 1da7f8cbf1a9b8d6a36886efab8e4bb6e779e1e9
Author: Jakov Smolic  sartura  hr>
AuthorDate: Sun Jan 17 11:51:23 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 17 11:51:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da7f8cb

sci-libs/hdf: Remove old

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-libs/hdf/Manifest  |   1 -
 .../hdf/files/hdf-4.2.11-fix-examples-dir.patch| 120 -
 sci-libs/hdf/hdf-4.2.11.ebuild |  66 
 3 files changed, 187 deletions(-)

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 5fbf047ece6..e10b0af4e45 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,2 +1 @@
-DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B 
a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1
 SHA512 
b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 
3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899
 SHA512 
d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657

diff --git a/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch 
b/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
deleted file mode 100644
index f6f15545d66..000
--- a/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -Nur hdf-4.2.11.orig/hdf/examples/Makefile.am 
hdf-4.2.11/hdf/examples/Makefile.am
 hdf-4.2.11.orig/hdf/examples/Makefile.am   2016-03-16 20:07:45.103492925 
+
-+++ hdf-4.2.11/hdf/examples/Makefile.am2016-03-16 22:16:35.836304451 
+
-@@ -46,8 +46,8 @@
- INSTALL_TOP_FILES = README
- 
- # Where to install example files
--EXAMPLEDIR=$(prefix)/examples/c
--EXAMPLETOPDIR=$(prefix)/examples
-+EXAMPLEDIR=$(docdir)/examples/c
-+EXAMPLETOPDIR=$(docdir)/examples
- 
- # How to build C programs using h4cc
- $(EXTRA_PROG): $(H4CC)
-diff -Nur hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am 
hdf-4.2.11/hdf/fortran/examples/Makefile.am
 hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am   2016-03-16 
20:07:45.103492925 +
-+++ hdf-4.2.11/hdf/fortran/examples/Makefile.am2016-03-16 
22:17:58.775261767 +
-@@ -41,7 +41,7 @@
- INSTALL_SCRIPT_FILES = run-fortran-ex.sh
- 
- # Where to install Fortran example files
--EXAMPLEDIR=$(prefix)/examples/fortran
-+EXAMPLEDIR=$(docdir)/examples/fortran
- 
- # How to build Fortran programs using h4fc
- $(EXTRA_PROG): $(H4FC)
-diff -Nur hdf-4.2.11.orig/mfhdf/examples/Makefile.am 
hdf-4.2.11/mfhdf/examples/Makefile.am
 hdf-4.2.11.orig/mfhdf/examples/Makefile.am 2016-03-16 20:07:45.183491919 
+
-+++ hdf-4.2.11/mfhdf/examples/Makefile.am  2016-03-16 22:18:38.304764814 
+
-@@ -23,7 +23,7 @@
-   SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c\
-   SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c
- 
--EXAMPLEDIR=$(prefix)/examples/c
-+EXAMPLEDIR=$(docdir)/examples/c
- 
- # How to build programs using h4cc
- $(EXTRA_PROG): $(H4CC)
-diff -Nur hdf-4.2.11.orig/mfhdf/fortran/examples/Makefile.am 
hdf-4.2.11/mfhdf/fortran/examples/Makefile.am
 hdf-4.2.11.orig/mfhdf/fortran/examples/Makefile.am 2016-03-16 
20:07:45.183491919 +
-+++ hdf-4.2.11/mfhdf/fortran/examples/Makefile.am  2016-03-16 
22:18:15.075056851 +
-@@ -24,7 +24,7 @@
-   SD_set_attr.f SD_get_attr.f SD_compress_sds.f SD_chunking_example.f
- 
- # Where to install example files
--EXAMPLEDIR=$(prefix)/examples/fortran
-+EXAMPLEDIR=$(docdir)/examples/fortran
- 
- # How to build Fortran programs using h4fc
- $(EXTRA_PROG): $(H4FC)
-diff -up hdf-4.2.11/config/examples.am.destdir hdf-4.2.11/config/examples.am
 hdf-4.2.11/config/examples.am.destdir  2015-02-09 09:43:05.0 
-0700
-+++ hdf-4.2.11/config/examples.am  2015-02-13 13:24:09.008230956 -0700
-@@ -44,7 +44,7 @@ CHECK_CLEANFILES+= *.hdf
- CLEANFILES=$(EXAMPLE_PROG)
- 
- # How to create EXAMPLEDIR if it doesn't already exist
--$(EXAMPLEDIR):
-+$(DESTDIR)$(EXAMPLEDIR):
-   mkdir -p $@
- 
- # Install and uninstall rules.  We install the source files, not the
-@@ -54,42 +54,42 @@ install-data-local:
- uninstall-local:
-   @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
- 
--install-examples: $(EXAMPLEDIR) 
-+install-examples: $(DESTDIR)$(EXAMPLEDIR) 
-   @for f in X $(INSTALL_FILES); do \
- if test $$f != X; then \
--  (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
--  chmod a-x $(EXAMPLEDIR)/$$f; \
-+  (set 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Andreas K. Hüttel]

commit: f44a58d40e870657ff24e5afce1de28c5090840b
Author: Alexey Sokolov  google  com>
AuthorDate: Sat Jun 20 16:12:44 2020 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Jun 27 20:44:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44a58d4

sci-libs/hdf: update homepage

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov  asokolov.org>
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 sci-libs/hdf/hdf-4.2.11.ebuild| 4 ++--
 sci-libs/hdf/hdf-4.2.13-r1.ebuild | 4 ++--
 sci-libs/hdf/hdf-4.2.13.ebuild| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
index a167bc4da9f..e898f4d0737 100644
--- a/sci-libs/hdf/hdf-4.2.11.ebuild
+++ b/sci-libs/hdf/hdf-4.2.11.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic 
ltprune
 MYP=${P/_p/-patch}
 
 DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html;
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html;
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"

diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index d50d336f6fc..ae60cc865d3 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic 
ltprune
 MYP=${P/_p/-patch}
 
 DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html;
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html;
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"

diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
index 39f74110671..feefb99d01a 100644
--- a/sci-libs/hdf/hdf-4.2.13.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic 
ltprune
 MYP=${P/_p/-patch}
 
 DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html;
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html;
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/files/

[Aaron Bauman]

commit: 9944e026169ff995416c0c8305ea6f5148bf7c5c
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Nov 20 18:33:17 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Nov 24 00:40:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9944e026

sci-libs/hdf: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13722
Signed-off-by: Aaron Bauman  gentoo.org>

 sci-libs/hdf/files/4.2.7_p1-autotools.patch  | 116 ---
 sci-libs/hdf/files/hdf-4.2.9-autotools.patch | 112 --
 sci-libs/hdf/files/hdf-ppc.patch | 214 ---
 3 files changed, 442 deletions(-)

diff --git a/sci-libs/hdf/files/4.2.7_p1-autotools.patch 
b/sci-libs/hdf/files/4.2.7_p1-autotools.patch
deleted file mode 100644
index 6ae9ccfc64e..000
--- a/sci-libs/hdf/files/4.2.7_p1-autotools.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -Nur hdf-4.2.7-patch1.orig/configure.ac hdf-4.2.7-patch1/configure.ac
 hdf-4.2.7-patch1.orig/configure.ac 2012-03-18 03:45:46.0 +
-+++ hdf-4.2.7-patch1/configure.ac  2012-04-13 03:04:17.0 +0100
-@@ -200,20 +200,6 @@
- dnl Build static libraries by default. Furthermore, fortran shared libraries
- dnl are unsupported. Disallow a user from enabling both shared libraries and
- dnl fortran.
--if test "X${enable_shared}" != "Xyes"; then
--enable_shared="no"
--fi
--
--if test "X${enable_shared}" = "Xyes"; then
--if test "X${BUILD_FORTRAN}" = "Xyes"; then
--AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure 
with --disable-fortran flag.])
--fi
--fi
--
--AC_PROG_INSTALL
--AC_PROG_LN_S
--
--AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
- 
- AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], [])
- 
-@@ -404,6 +390,8 @@
- 
- if test -z "$HAVE_SZIP"; then
-   AC_MSG_ERROR([couldn't find szlib library])
-+else
-+  USE_COMP_SZIP="yes"
- fi
- ;;
-   no)
-@@ -447,7 +435,7 @@
- 
- AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
- 
--if test -z "$HAVE_SZIP"; then
-+if test "X$HAVE_SZIP" != "Xyes"; then
-   AC_MSG_ERROR([couldn't find szlib library])
- else
-   USE_COMP_SZIP="yes"
-@@ -703,7 +691,7 @@
- dnl ==
- dnl Libtool initialization
- dnl ==
--LT_INIT(dlopen disable-shared) 
-+LT_INIT(dlopen) 
- LT_OUTPUT
- 
- dnl ==
-@@ -781,11 +769,6 @@
- dnl 
- dnl Check to see if libtool has enabled shared libraries. Set a conditional
- dnl as some Makefiles will build based on availability of shared libraries.
--if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
--  enable_shared=yes
--else
--  enable_shared=no
--fi
- 
- dnl 
- dnl Specify shared library extension the host machine should recognize.
-@@ -840,23 +823,8 @@
- dnl name of the compiler and the reported version number.
- AC_SUBST([F77_VERSION])
- dnl Strip anything that looks like a flag off of $F77
--F77_NOFLAGS=`echo $F77 | sed 's/ -.*//'`
--
--if `echo $F77_NOFLAGS | grep ^/ >/dev/null 2>&1`; then
--  F77_VERSION="$F77"
--else
--  F77_VERSION="$F77";
--  for x in `echo $PATH | sed -e 's/:/ /g'`; do
--if test -x $x/$F77_NOFLAGS; then
--  F77_VERSION="$x/$F77"
--  break
--fi
--  done
--fi
--if test -n "$fc_version_info"; then
--  F77_VERSION="$F77_VERSION ( $fc_version_info)"
--fi
- 
-+F77_VERSION="$F77";
- 
- dnl This part doesn't work yet since HDF4 config files do not contain
- dnl information for fortran_vendor and fortran_version. 
-diff -Nur hdf-4.2.7-patch1.orig/hdf/test/fortestF.f 
hdf-4.2.7-patch1/hdf/test/fortestF.f
 hdf-4.2.7-patch1.orig/hdf/test/fortestF.f  2012-03-18 03:44:01.0 
+
-+++ hdf-4.2.7-patch1/hdf/test/fortestF.f   2012-04-13 02:20:45.0 
+0100
-@@ -203,7 +203,7 @@
- 
-   if (cmd .NE. 'Test' .AND. cmd .NE. 'test') then
-print *, 'Unknown Command: ', cmd, param
--   print *, 'Try one of "Skip", "Test", "Verbosity" or "Cleanup"'
-+   print *, 'Try one of Skip, Test, Verbosity or Cleanup'
-retcode = -1
-return
-   endif
-diff -Nur hdf-4.2.7-patch1.orig/mfhdf/libsrc/Makefile.am 
hdf-4.2.7-patch1/mfhdf/libsrc/Makefile.am
 hdf-4.2.7-patch1.orig/mfhdf/libsrc/Makefile.am 2012-03-18 
03:44:00.0 +
-+++ hdf-4.2.7-patch1/mfhdf/libsrc/Makefile.am  2012-04-13 02:20:45.0 
+0100
-@@ -32,10 +32,11 @@
- else
- libmfhdf_la_SOURCES = $(CSOURCES)
- endif
-+libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
- 
- if HDF_BUILD_XDR
- XDRLIB = ../xdr/libxdr.la
--libmfhdf_la_LIBADD = $(XDRLIB)

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Aaron Bauman]

commit: 840c43fc98154758856e45ae2fe1b1237b571923
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Nov 13 19:43:41 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Nov 13 19:58:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=840c43fc

sci-libs/hdf: drop old EAPI

Signed-off-by: Aaron Bauman  gentoo.org>

 sci-libs/hdf/Manifest |  2 --
 sci-libs/hdf/hdf-4.2.8.ebuild | 56 ---
 sci-libs/hdf/hdf-4.2.9.ebuild | 56 ---
 3 files changed, 114 deletions(-)

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index f61e45f4988..5fbf047ece6 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,4 +1,2 @@
 DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B 
a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1
 SHA512 
b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 
3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899
 SHA512 
d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
-DIST hdf-4.2.8.tar.bz2 3027253 BLAKE2B 
b1291fce4b2f47a4b2f1d725cfc5314c4e451d2dd4ede242ef64a11490884ff991b800b06b7aabf574659117c6abde5cd26236d23d8f38e003c7df9271248d90
 SHA512 
d033007eff74d957572db8433f66e9df6fec44f67b28ddbad6e9a2d832b5504a29e9ecc5565d861b8308bab8d0dbfce19ae1e2ade0dd758d370a333819364c8e
-DIST hdf-4.2.9.tar.bz2 3126686 BLAKE2B 
491fdad375bef944ed9f7040faba0e811b11019e1f51c5c3f874f29be07b945eb68af31cfce56db5e1f03f3bbd9e85320bed6e5f7f2b725676ead50dac022986
 SHA512 
99630177167f115f4a7f4424cf3fc77962c4eb46698f884d0e89acfe7d585aa659fd7cdf36a29246ae518675b07182223d4337a7d0aac6344ce21ccbed9aa390

diff --git a/sci-libs/hdf/hdf-4.2.8.ebuild b/sci-libs/hdf/hdf-4.2.8.ebuild
deleted file mode 100644
index 32d8a3f2f0a..000
--- a/sci-libs/hdf/hdf-4.2.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 toolchain-funcs autotools flag-o-matic
-
-MYP=${P/_p/-patch}
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html;
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
-
-SLOT="0"
-LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ia64 ppc -sparc x86 ~amd64-linux ~x86-linux"
-IUSE="fortran szip static-libs"
-
-RDEPEND="
-   sys-libs/zlib
-   virtual/jpeg
-   szip? ( virtual/szip )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MYP}
-
-src_prepare() {
-   epatch "${FILESDIR}"/4.2.7_p1-autotools.patch \
-   "${FILESDIR}"/${PN}-ppc.patch
-   sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
-   eautoreconf
-   [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
-}
-
-src_configure() {
-   econf \
-   --enable-shared \
-   --enable-production=gentoo \
-   --disable-netcdf \
-   $(use_enable fortran) \
-   $(use_enable static-libs static) \
-   $(use_with szip szlib) \
-   CC="$(tc-getCC)"
-}
-
-src_install() {
-   default
-   dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
-   cd "${ED}"usr
-   mv bin/ncgen{,-hdf} || die
-   mv bin/ncdump{,-hdf} || die
-   mv share/man/man1/ncgen{,-hdf}.1 || die
-   mv share/man/man1/ncdump{,-hdf}.1 || die
-}

diff --git a/sci-libs/hdf/hdf-4.2.9.ebuild b/sci-libs/hdf/hdf-4.2.9.ebuild
deleted file mode 100644
index 04467f22944..000
--- a/sci-libs/hdf/hdf-4.2.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 toolchain-funcs autotools flag-o-matic
-
-MYP=${P/_p/-patch}
-
-DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html;
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
-
-SLOT="0"
-LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="fortran szip static-libs"
-
-RDEPEND="
-   sys-libs/zlib
-   virtual/jpeg
-   szip? ( virtual/szip )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MYP}
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-autotools.patch \
-   "${FILESDIR}"/${PN}-ppc.patch
-   sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
-   eautoreconf
-   [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
-}
-
-src_configure() {
-   econf \
-  

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sergei Trofimovich]

commit: f9aac467d23a2d0edcebf9100f1462fc62f43ce3
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Aug 30 15:51:28 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 30 18:24:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9aac467

sci-libs/hdf: upstream lacks sparc platform support

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="sparc"

 sci-libs/hdf/hdf-4.2.11.ebuild| 4 ++--
 sci-libs/hdf/hdf-4.2.13-r1.ebuild | 2 +-
 sci-libs/hdf/hdf-4.2.13.ebuild| 4 ++--
 sci-libs/hdf/hdf-4.2.8.ebuild | 4 ++--
 sci-libs/hdf/hdf-4.2.9.ebuild | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
index 1d23a4cfe97..3582363389a 100644
--- a/sci-libs/hdf/hdf-4.2.11.ebuild
+++ b/sci-libs/hdf/hdf-4.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ 
SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 

diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index 63e729e7010..d92320b868a 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ia64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ia64 ppc -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 

diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
index 103ea3b4428..d7244d6583f 100644
--- a/sci-libs/hdf/hdf-4.2.13.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ 
SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 

diff --git a/sci-libs/hdf/hdf-4.2.8.ebuild b/sci-libs/hdf/hdf-4.2.8.ebuild
index 3561a95953c..32d8a3f2f0a 100644
--- a/sci-libs/hdf/hdf-4.2.8.ebuild
+++ b/sci-libs/hdf/hdf-4.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,7 +15,7 @@ 
SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ia64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ia64 ppc -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="fortran szip static-libs"
 
 RDEPEND="

diff --git a/sci-libs/hdf/hdf-4.2.9.ebuild b/sci-libs/hdf/hdf-4.2.9.ebuild
index 3d7f73a04cd..04467f22944 100644
--- a/sci-libs/hdf/hdf-4.2.9.ebuild
+++ b/sci-libs/hdf/hdf-4.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,7 +15,7 @@ 
SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="fortran szip static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Mikle Kolyada]

commit: a782013e4df949e20265ca4cf11fae20d33d77ee
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri May 25 21:10:14 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri May 25 21:10:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a782013e

sci-libs/hdf: ppc stable wrt bug #630868

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-libs/hdf/hdf-4.2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index ed67c5f51be..63e729e7010 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ia64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ia64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Thomas Deutschmann]

commit: 9cdf7bf3592ebaae3ec72454df0d62836735bc12
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon May  7 00:17:43 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon May  7 00:24:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cdf7bf3

sci-libs/hdf: x86 stable (bug #630868)

Package-Manager: Portage-2.3.34, Repoman-2.3.9

 sci-libs/hdf/hdf-4.2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index 8ddb0d1d81c..ed67c5f51be 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ia64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Mikle Kolyada]

commit: 530b96094534c8a4ab199353a2039ec876a3be33
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  6 21:46:08 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  6 21:47:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=530b9609

sci-libs/hdf: amd64 stable wrt bug #630868

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-libs/hdf/hdf-4.2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index f0e70016731..8ddb0d1d81c 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sergei Trofimovich]

commit: fb77d8be1f457e09fdc842febb98addc53949ee0
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat May  5 17:50:34 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat May  5 17:50:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb77d8be

sci-libs/hdf: stable 4.2.13-r1 for ia64, bug #630868

Bug: https://bugs.gentoo.org/630868
Package-Manager: Portage-2.3.36, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"

 sci-libs/hdf/hdf-4.2.13-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index 331ad8938e5..f0e70016731 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/, sci-libs/hdf/files/

[Andreas Hüttel]

commit: ddb167f03450fcc9869a3a230894a700a19812b1
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Apr 22 14:28:07 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Apr 22 14:28:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddb167f0

sci-libs/hdf: Revbump that uses libtirpc, bug 630868

Patches by Bernd Feige. This still needs to be stabilized.

Bug: https://bugs.gentoo.org/630868
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 .../hdf/files/hdf-4.2.13-fix-xdr-configure.patch   | 13 
 sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch| 29 +
 sci-libs/hdf/hdf-4.2.13-r1.ebuild  | 72 ++
 3 files changed, 114 insertions(+)

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
new file mode 100644
index 000..a4514ab267e
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.13-fix-xdr-configure.patch
@@ -0,0 +1,13 @@
+Index: hdf-4.2.13/configure.ac
+===
+--- hdf-4.2.13.orig/configure.ac
 hdf-4.2.13/configure.ac
+@@ -676,7 +676,7 @@ case "$host" in
+   *) ;;
+ esac
+ 
+-if test "X$BUILD_XDR" != "Xyes"; then
++if test "X$BUILD_XDR" = "Xyes"; then
+ AC_TRY_LINK([
+ #include 
+ #include ], [xdr_int],

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
new file mode 100644
index 000..963388f6698
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.13-linux-tirpc.patch
@@ -0,0 +1,29 @@
+Index: hdf-4.2.13/configure.ac
+===
+--- hdf-4.2.13.orig/configure.ac
 hdf-4.2.13/configure.ac
+@@ -673,6 +673,9 @@ case "$host" in
+   *-pc-cygwin*)
+ LIBS="$LIBS -ltirpc"
+ CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc"  ;;
++  *-pc-linux*)
++LIBS="$LIBS -ltirpc"
++CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc"  ;;
+   *) ;;
+ esac
+ 
+@@ -703,6 +706,14 @@ if test "X$BUILD_XDR" != "Xyes"; then
+   HAVE_RPC="yes"
+   AC_CHECK_HEADER([rpc.h],[:], [unset HAVE_RPC])
+   AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC])
++  if test -z "$HAVE_RPC"; then
++AC_MSG_ERROR([couldn't find tirpc library])
++  fi
++  ;;
++ *-pc-linux*)
++  HAVE_RPC="yes"
++  AC_CHECK_HEADER([rpc/rpc.h],[:], [unset HAVE_RPC])
++  AC_CHECK_LIB([tirpc], [xdr_opaque],[:], [unset HAVE_RPC])
+   if test -z "$HAVE_RPC"; then
+ AC_MSG_ERROR([couldn't find tirpc library])
+   fi

diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild 
b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
new file mode 100644
index 000..331ad8938e5
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs autotools flag-o-matic
+
+MYP=${P/_p/-patch}
+
+DESCRIPTION="General purpose library and format for storing scientific data"
+HOMEPAGE="http://www.hdfgroup.org/hdf4.html;
+SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
+
+SLOT="0"
+LICENSE="NCSA-HDF"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples fortran szip static-libs test"
+REQUIRED_USE="test? ( szip )"
+
+RDEPEND="
+   net-libs/libtirpc
+   sys-libs/zlib
+   virtual/jpeg:0
+   szip? ( virtual/szip )"
+DEPEND="${RDEPEND}
+   test? ( virtual/szip )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch
+   "${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch
+   "${FILESDIR}"/${PN}-4.2.13-fix-xdr-configure.patch
+   "${FILESDIR}"/${PN}-4.2.13-linux-tirpc.patch
+)
+
+src_prepare() {
+   default
+   sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
+   eautoreconf
+   [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+}
+
+src_configure() {
+   econf \
+   --enable-shared \
+   --enable-production=gentoo \
+   --disable-netcdf \
+   $(use_enable fortran) \
+   $(use_enable static-libs static) \
+   $(use_with szip szlib) \
+   CC="$(tc-getCC)"
+}
+
+src_install() {
+   default
+   use static-libs || prune_libtool_files --all
+   dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
+   cd "${ED}"usr
+   if use examples; then
+   mv  share/hdf4_examples share/doc/${PF}/examples || die
+   docompress -x /usr/share/doc/${PF}/examples
+   else
+   rm -r share/hdf4_examples || die
+   fi
+   mv bin/ncgen{,-hdf} || die
+   mv bin/ncdump{,-hdf} || die
+   mv share/man/man1/ncgen{,-hdf}.1 || die
+   mv share/man/man1/ncdump{,-hdf}.1 || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sergei Trofimovich]

commit: dae2b980440baebd7ec0f9dbcbb917fcb5168fa6
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Aug 27 09:48:10 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Aug 27 14:03:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dae2b980

sci-libs/hdf: stable 4.2.8 for ia64, bug #627018

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="ia64"

 sci-libs/hdf/hdf-4.2.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/hdf/hdf-4.2.8.ebuild b/sci-libs/hdf/hdf-4.2.8.ebuild
index 8b3efd8a95d..3561a95953c 100644
--- a/sci-libs/hdf/hdf-4.2.8.ebuild
+++ b/sci-libs/hdf/hdf-4.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,7 +15,7 @@ 
SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ia64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="fortran szip static-libs"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sebastien Fabbro]

commit: 55117c8e1fbe7ca4fcc6cee02fa3d0893e44b6bd
Author: Sébastien Fabbro  gentoo  org>
AuthorDate: Fri Aug 11 22:48:12 2017 +
Commit: Sebastien Fabbro  gentoo  org>
CommitDate: Fri Aug 11 23:23:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55117c8e

sci-libs/hdf: version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 sci-libs/hdf/Manifest  |  1 +
 sci-libs/hdf/hdf-4.2.13.ebuild | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 34e6461a569..f23855fc791 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,3 +1,4 @@
 DIST hdf-4.2.11.tar.bz2 3173535 SHA256 
bb0e900b8cc6bc89a5730abc97e654e7705e8e1fbc4e0d4477f417822428d99b SHA512 
b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
 WHIRLPOOL 
6168284c0f4cb272cfa14f12779ca2106d86d68d38d85f58ba73c137611acde6ed3d1c32bd5620496b20578de7decae6428654eb6a3afffbf7c11fff1ccebc20
+DIST hdf-4.2.13.tar.bz2 3616255 SHA256 
55d3a42313bda0aba7b0463687caf819a970e0ba206f5ed2c23724f80d2ae0f3 SHA512 
d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
 WHIRLPOOL 
eba55c872ebd6d5143d1b28578ea8afd87a5708e0139f0fdec455987b8afcbe38efe0d5bbb88ea9ff06f2ab09e3cc1ad78f813d93e7e6f1f020d8b876b6e007c
 DIST hdf-4.2.8.tar.bz2 3027253 SHA256 
e8a94ae2c838007ccdd55bb3cd9684adba3ded367c09803ffc84a2704f83c00f SHA512 
d033007eff74d957572db8433f66e9df6fec44f67b28ddbad6e9a2d832b5504a29e9ecc5565d861b8308bab8d0dbfce19ae1e2ade0dd758d370a333819364c8e
 WHIRLPOOL 
89ac6a092024fe2fac61bff918c14bf90e80db0b77f48e2ffe7cbf05610a3687e214c684f49e909b985c09b6baacf3dc730a15141fb44a3d59c191777c538299
 DIST hdf-4.2.9.tar.bz2 3126686 SHA256 
942a54bff4da8c0733c5626b5e11162deda1adeb65c384b141f0681c935ca98a SHA512 
99630177167f115f4a7f4424cf3fc77962c4eb46698f884d0e89acfe7d585aa659fd7cdf36a29246ae518675b07182223d4337a7d0aac6344ce21ccbed9aa390
 WHIRLPOOL 
0ed161fba7f862c1d93aebbcb6184c0b256ce71be12fa49598f9c8bf727ea1ef46c612c41908a49774b7982f5dfe577bcb8ada2c26bf2488627952040bdd9934

diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
new file mode 100644
index 000..103ea3b4428
--- /dev/null
+++ b/sci-libs/hdf/hdf-4.2.13.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 toolchain-funcs autotools flag-o-matic
+
+MYP=${P/_p/-patch}
+
+DESCRIPTION="General purpose library and format for storing scientific data"
+HOMEPAGE="http://www.hdfgroup.org/hdf4.html;
+SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
+
+SLOT="0"
+LICENSE="NCSA-HDF"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples fortran szip static-libs test"
+REQUIRED_USE="test? ( szip )"
+
+RDEPEND="
+   sys-libs/zlib
+   virtual/jpeg:0
+   szip? ( virtual/szip )"
+DEPEND="${RDEPEND}
+   test? ( virtual/szip )"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.2.11-fix-szip-detection.patch
+   "${FILESDIR}"/${PN}-4.2.11-enable-fortran-shared.patch
+)
+
+src_prepare() {
+   default
+   sed -i -e 's/-R/-L/g' config/commence.am || die #rpath
+   eautoreconf
+   [[ $(tc-getFC) = *gfortran ]] && append-fflags -fno-range-check
+}
+
+src_configure() {
+   econf \
+   --enable-shared \
+   --enable-production=gentoo \
+   --disable-netcdf \
+   $(use_enable fortran) \
+   $(use_enable static-libs static) \
+   $(use_with szip szlib) \
+   CC="$(tc-getCC)"
+}
+
+src_install() {
+   default
+   use static-libs || prune_libtool_files --all
+   dodoc release_notes/{RELEASE,HISTORY,bugs_fixed,misc_docs}.txt
+   cd "${ED}"usr
+   if use examples; then
+   mv  share/hdf4_examples share/doc/${PF}/examples || die
+   docompress -x /usr/share/doc/${PF}/examples
+   else
+   rm -r share/hdf4_examples || die
+   fi
+   mv bin/ncgen{,-hdf} || die
+   mv bin/ncdump{,-hdf} || die
+   mv share/man/man1/ncgen{,-hdf}.1 || die
+   mv share/man/man1/ncdump{,-hdf}.1 || die
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sergei Trofimovich]

commit: 8568e63f0bb38313118a9c5ea52ef1dbf3d46dd8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jul 15 09:12:31 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul 15 10:08:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8568e63f

sci-libs/hdf: ia64 keyworded, bug #615510

Package-Manager: Portage-2.3.6, Repoman-2.3.2
RepoMan-Options: --include-arches="ia64"

 sci-libs/hdf/hdf-4.2.11.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
index cf75fa687a4..1d23a4cfe97 100644
--- a/sci-libs/hdf/hdf-4.2.11.ebuild
+++ b/sci-libs/hdf/hdf-4.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ 
SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2;
 
 SLOT="0"
 LICENSE="NCSA-HDF"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fortran szip static-libs test"
 REQUIRED_USE="test? ( szip )"
 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/

[Sebastien Fabbro]

commit: 8790efe3547cecb4399f0e42a3e3d70ba63cb1a9
Author: Sébastien Fabbro  gentoo  org>
AuthorDate: Wed Mar 16 22:38:57 2016 +
Commit: Sebastien Fabbro  gentoo  org>
CommitDate: Fri Mar 18 20:10:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8790efe3

sci-libs/hdf: switch to virtual/szip

Package-Manager: portage-2.2.27

 sci-libs/hdf/hdf-4.2.8.ebuild | 4 ++--
 sci-libs/hdf/hdf-4.2.9.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/hdf/hdf-4.2.8.ebuild b/sci-libs/hdf/hdf-4.2.8.ebuild
index 1ac5cf7..f0b817f 100644
--- a/sci-libs/hdf/hdf-4.2.8.ebuild
+++ b/sci-libs/hdf/hdf-4.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ IUSE="fortran szip static-libs"
 RDEPEND="
sys-libs/zlib
virtual/jpeg
-   szip? ( >=sci-libs/szip-2 )"
+   szip? ( virtual/szip )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MYP}

diff --git a/sci-libs/hdf/hdf-4.2.9.ebuild b/sci-libs/hdf/hdf-4.2.9.ebuild
index b2b1e65..4c9441c 100644
--- a/sci-libs/hdf/hdf-4.2.9.ebuild
+++ b/sci-libs/hdf/hdf-4.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ IUSE="fortran szip static-libs"
 RDEPEND="
sys-libs/zlib
virtual/jpeg
-   szip? ( >=sci-libs/szip-2 )"
+   szip? ( virtual/szip )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MYP}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf/files/, sci-libs/hdf/

[Sebastien Fabbro]

commit: c9a62f92fd53c520cff4ca6607e707a11e2e761e
Author: Sébastien Fabbro  gentoo  org>
AuthorDate: Wed Mar 16 22:42:55 2016 +
Commit: Sebastien Fabbro  gentoo  org>
CommitDate: Fri Mar 18 20:10:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a62f92

sci-libs/hdf: Version bump

Package-Manager: portage-2.2.27

 sci-libs/hdf/Manifest  |   1 +
 .../files/hdf-4.2.11-enable-fortran-shared.patch   |  35 ++
 .../hdf/files/hdf-4.2.11-fix-examples-dir.patch| 120 +
 .../hdf/files/hdf-4.2.11-fix-szip-detection.patch  |  27 +
 sci-libs/hdf/hdf-4.2.11.ebuild |  66 
 5 files changed, 249 insertions(+)

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index f1ec6cf..34e6461 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,2 +1,3 @@
+DIST hdf-4.2.11.tar.bz2 3173535 SHA256 
bb0e900b8cc6bc89a5730abc97e654e7705e8e1fbc4e0d4477f417822428d99b SHA512 
b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
 WHIRLPOOL 
6168284c0f4cb272cfa14f12779ca2106d86d68d38d85f58ba73c137611acde6ed3d1c32bd5620496b20578de7decae6428654eb6a3afffbf7c11fff1ccebc20
 DIST hdf-4.2.8.tar.bz2 3027253 SHA256 
e8a94ae2c838007ccdd55bb3cd9684adba3ded367c09803ffc84a2704f83c00f SHA512 
d033007eff74d957572db8433f66e9df6fec44f67b28ddbad6e9a2d832b5504a29e9ecc5565d861b8308bab8d0dbfce19ae1e2ade0dd758d370a333819364c8e
 WHIRLPOOL 
89ac6a092024fe2fac61bff918c14bf90e80db0b77f48e2ffe7cbf05610a3687e214c684f49e909b985c09b6baacf3dc730a15141fb44a3d59c191777c538299
 DIST hdf-4.2.9.tar.bz2 3126686 SHA256 
942a54bff4da8c0733c5626b5e11162deda1adeb65c384b141f0681c935ca98a SHA512 
99630177167f115f4a7f4424cf3fc77962c4eb46698f884d0e89acfe7d585aa659fd7cdf36a29246ae518675b07182223d4337a7d0aac6344ce21ccbed9aa390
 WHIRLPOOL 
0ed161fba7f862c1d93aebbcb6184c0b256ce71be12fa49598f9c8bf727ea1ef46c612c41908a49774b7982f5dfe577bcb8ada2c26bf2488627952040bdd9934

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
new file mode 100644
index 000..7d48a8a
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.11-enable-fortran-shared.patch
@@ -0,0 +1,35 @@
+--- hdf-4.2.11.orig/configure.ac   2016-03-16 20:07:45.093493050 +
 hdf-4.2.11/configure.ac2016-03-16 20:15:56.767311873 +
+@@ -224,20 +224,6 @@
+ ## Build static libraries by default. Furthermore, fortran shared libraries
+ ## are unsupported. Disallow a user from enabling both shared libraries and
+ ## fortran.
+-if test "X${enable_shared}" != "Xyes"; then
+-enable_shared="no"
+-fi
+-
+-if test "X${enable_shared}" = "Xyes"; then
+-if test "X${BUILD_FORTRAN}" = "Xyes"; then
+-AC_MSG_ERROR([Cannot build shared fortran libraries. Please configure 
with --disable-fortran flag.])
+-fi
+-fi
+-
+-AC_PROG_INSTALL
+-AC_PROG_LN_S
+-
+-AC_CHECK_PROGS([AR], [ar xar], [:], [$PATH])
+ 
+ AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [none], [])
+ 
+@@ -847,11 +833,6 @@
+ ## 
+ ## Check to see if libtool has enabled shared libraries. Set a conditional
+ ## as some Makefiles will build based on availability of shared libraries.
+-if (./libtool --features | grep '^enable shared libraries' > /dev/null); then
+-  enable_shared=yes
+-else
+-  enable_shared=no
+-fi
+ 
+ ## 
+ ## Specify shared library extension the host machine should recognize.

diff --git a/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch 
b/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
new file mode 100644
index 000..f6f1554
--- /dev/null
+++ b/sci-libs/hdf/files/hdf-4.2.11-fix-examples-dir.patch
@@ -0,0 +1,120 @@
+diff -Nur hdf-4.2.11.orig/hdf/examples/Makefile.am 
hdf-4.2.11/hdf/examples/Makefile.am
+--- hdf-4.2.11.orig/hdf/examples/Makefile.am   2016-03-16 20:07:45.103492925 
+
 hdf-4.2.11/hdf/examples/Makefile.am2016-03-16 22:16:35.836304451 
+
+@@ -46,8 +46,8 @@
+ INSTALL_TOP_FILES = README
+ 
+ # Where to install example files
+-EXAMPLEDIR=$(prefix)/examples/c
+-EXAMPLETOPDIR=$(prefix)/examples
++EXAMPLEDIR=$(docdir)/examples/c
++EXAMPLETOPDIR=$(docdir)/examples
+ 
+ # How to build C programs using h4cc
+ $(EXTRA_PROG): $(H4CC)
+diff -Nur hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am 
hdf-4.2.11/hdf/fortran/examples/Makefile.am
+--- hdf-4.2.11.orig/hdf/fortran/examples/Makefile.am   2016-03-16 
20:07:45.103492925 +
 hdf-4.2.11/hdf/fortran/examples/Makefile.am2016-03-16 
22:17:58.775261767 +
+@@ -41,7 +41,7 @@
+ INSTALL_SCRIPT_FILES = run-fortran-ex.sh
+ 
+ # Where to install Fortran example files
+-EXAMPLEDIR=$(prefix)/examples/fortran
++EXAMPLEDIR=$(docdir)/examples/fortran
+ 
+ # How to build Fortran programs using h4fc
+