gentoo resync : 15.12.2019

7 files changed, 9 insertions, 451 deletions

diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 3a2fce57402b..c4724f471bca 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,14 +1,11 @@
-AUX 4.2.7_p1-autotools.patch 3908 BLAKE2B 83041007560940adbce1bc6fc3c0cdb66d9b3e2a4a66f269792896b195f3592601fd03b997b2aea4ffe443226172a0cb379b445e01b9c70377e9c8e51ff508e6 SHA512 ba33a5a2e182feca790069f730dcc2a67d1ac22985a4e4b484e28b8cff7fe55da9675d8c2c60a2a0c733035b76df9325642e7e71a38d2ba7cc4c5378cc9a133c
 AUX hdf-4.2.11-enable-fortran-shared.patch 1287 BLAKE2B 4b1b7aab9a2eb958684418a01067f37b46c38ad1f8c983caace0f01b29a26d1f0c787cfb80045f228a91cb962dd997995e6e5ada1df28e6e1d0bbc70d332265c SHA512 787260127abff6695e5cddbbd75290c2349ae150c01dd1c74e83539e78d503bbcb017ea8aba8f808d846e7e291e4cb13ef69d4186ff1e38780c75e0046ca6734
 AUX hdf-4.2.11-fix-examples-dir.patch 5966 BLAKE2B 8ff35e5db544e73e85629f555d6dd7b22ae902d16c4fa2da5e9c29694196abc9fc65c591fa5898f324ad36a73cc39b2b3785ae1936ae101da3cab4a2eb6d7f5c SHA512 f33b6e2f5de26687accba8b6ff7c1d50b96f9ad40b84771ea8a361692da88d2f376331cb8a80dc662e3213d6ddc7707ca5fcbfcaf7c1ef7224a534c0a969fabb
 AUX hdf-4.2.11-fix-szip-detection.patch 896 BLAKE2B 6e703621ffed66b6757a500cf24cf1f428d5d130f9aebfc261e6108d19cbd7846fc2d90820c993d03fab5c7943b032afb3c8d0b2053ef1665a94f6e38403c60f SHA512 44342b4e7680a002a3dd9ae2a56dcb6689ee57824476436dc5ef5ff1884174e9de6c98972fccc88296f376a354f92e049d64c493df81da2d08ace6271cd2292a
 AUX hdf-4.2.13-fix-xdr-configure.patch 376 BLAKE2B 611e5b37016750ad408a0cf8d73827e4974248747c1a21206149ededbfe8cfd087c862f321e55a23b5d7187b202ac6256edee84c9dee3cad6357081a7ae86d75 SHA512 dd99f0c0a5fe858a717c1373c75c84867383511e91fb5c703353feb22410ea561f84fe03c5c7578d27817a74579516e60331f5d14a1ad3ea38ab1376e396b5c8
 AUX hdf-4.2.13-linux-tirpc.patch 972 BLAKE2B a95350ef2364e3ff08aa79d12e458853bebe610cd8376f6b6a0483f0962fca1a131be1b09cf3cc1447e1fb3b2fded9567a1a3755dbf5f195b0f70ae124bed3c9 SHA512 9901bdacab3e82632637d18fd08714876a990ceb4573261cc0e1e03a5e4e422c50c460a594d46b0434c9c7b96c1bf57de1aa52bbb59e525298eeacf22e8b41b1
-AUX hdf-4.2.9-autotools.patch 3486 BLAKE2B 75786eb25bc11bb53cded2ed6704411eec129dcc2e4fbe43f7b48340a8ff9721d3405e931498085ceeec5eba8fb36c9a7cbf2e1fb05ca89a2d0e5fff67496272 SHA512 c34fafadc39e43169d353bf6d5a01b814ae5d963da2cdf3b140e83dedae84b424dcfcd770aed3512e4ae4f3f358147cf01ec9a72be7e6db5d41c39443d6d44c7
-AUX hdf-ppc.patch 10374 BLAKE2B db28f0a201e4ade1cf126328522443acc99cc1951c9ab538ef137f42a84b6a38e08b9484337fef218a72675fd6ae5b26ddd340540fc3141e89b6be3c4848d41c SHA512 ac88c595e369709dc907b5f009429654c59ae1ac31869aace2656511687d0a7093d41af218768cc825181f623d0018991d1e49e0c48329766c01f608873d2ddb
 DIST hdf-4.2.11.tar.bz2 3173535 BLAKE2B a35a366858cc67d6ef68959cf407c21a929d5dca82834937b648eded506c7c3f75dd67be763f0d1fc24b7be92849b53d688abb25611cbc9b918340dbb23a83e1 SHA512 b3be9a91c62fa258c8aa6f97d1ccbd8301225e43938b525a826c639fd8b30b7dd566f58f4d54e365606d861ad01660887163e5ca6521293791080e5ed41ef781
 DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b421c3842a033c2ec5586c262f18cb0be5c2a146bdecd9ae7580963817face2a21458852756f5b7072b7e6d5899 SHA512 d7be2b3650255590b72db4a6931325ec0af256db4b846cfe886c76bf24034901b2ba7a7e546566f426d265b1793287ea3f95d8fbd818a3d018fa6813a4541657
-EBUILD hdf-4.2.11.ebuild 1605 BLAKE2B 3fbc0b8249a58acd581bd772dbc87c84b18cf523394148dc6492c4fb80a1b7a9667f681650da569afb5db34488361ae27b29db1e3c9fde5570a2a4e08c2b8546 SHA512 45933e613ec198793450fdabcc8c70523eeead4b37e416b607803165c57e8f493d40c863e19e30d754fc765a0a14ccc92b472a4a5606d73912a87309339d5233
-EBUILD hdf-4.2.13-r1.ebuild 1790 BLAKE2B 839f4242d020887d46a486b1f74fb192ec3139f08218b3831d80d2b0ba38ac4dd46297b10df70bf9953a18570f689afb07061cc8c678d026378495b3ee36003e SHA512 218b0e94ec940abcf3603a391de2a694195db122c1331f1ad101262bc968bfb820854e3988fe35b6528d0a6afbfa4f520d4511c0da8159d7fc03e6dd6434bc0f
-EBUILD hdf-4.2.13.ebuild 1677 BLAKE2B 5f82e08c5181de3e8b9bfc50774a7f122a47208b8709e557521cdaefbae51e10fe9c5bcc0ee0a58d3d12b6cae8c6c3f8cd74b3e268b4c5c28e6c8f519a205246 SHA512 17fe44cab142ac357c219c012773d0d411a29292a745c414ff1fd1490c5514a231ccbaae6117eddd8b3e9e2c98a70f0b786c7337841259b07095f83813a92787
+EBUILD hdf-4.2.11.ebuild 1629 BLAKE2B 2e529d551fafd7d3b4f5c2c2053b1c18101f8135ca923940778c35d6e3be116f53d0b6edf6f3f97c2990af3261d4e3f44cfe96eb9455a12c6dcb8808d0536f85 SHA512 b05ebf317ffbb9c94d4002eeba5f612461c86946cd2dcdc12d2a74ba3510745d328b2bfa92705a73589279ff080d3f9fa73304535e35978c6ad2920becd69846
+EBUILD hdf-4.2.13-r1.ebuild 1814 BLAKE2B 6ea22642e1f9ca67825450ceaa979624f95a12a8d22c9ad1914ca3cd0a10b27f742f9c4c694700a16088d80f2c1de887bd408bffac3053ec0699677a4a443c70 SHA512 c204a1ccf112c02540d15c23e13fdec577645314dec4ba20347f12550800cc06ddb378a39db099f91e39fa9da82f36645342c1e3617491ef45c805e9486e9c10
+EBUILD hdf-4.2.13.ebuild 1701 BLAKE2B a9c4e887a0574b7dc305820efb837e81d4a31df1a133a50d9b4996776cdbbc40a77d8905e979bc9731265483a1d822043966ff172c6f83749535357aa41d2781 SHA512 c3793c7f7936d1125c5e59a0258cb8c243dc739075838f24eb10604f2257b65eff7c4ad85b6a5147a21c7e2b93138dedbbeb1493577392204625bbd30371a7d2
 MISC metadata.xml 859 BLAKE2B c5c33f1a444d0af6287dac495443be05de5a2b8d9c55d4bf9aeb80ebc28f1391612510771848277fa1467097ab480b9b1dc306af587d2621e4a1d16c6bdc91a5 SHA512 2a38d2fbd5672f4465cba6da9f74c6ef95068be26514acc3d2949049f8461265e2ce7c6751d1853218ac4a4b62746e355faa9f2e0d7d8d6dc2faf17d8e40fceb
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 6ae9ccfc64e5..000000000000
--- 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.000000000 +0000
-+++ hdf-4.2.7-patch1/configure.ac	2012-04-13 03:04:17.000000000 +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.000000000 +0000
-+++ hdf-4.2.7-patch1/hdf/test/fortestF.f	2012-04-13 02:20:45.000000000 +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.000000000 +0000
-+++ hdf-4.2.7-patch1/mfhdf/libsrc/Makefile.am	2012-04-13 02:20:45.000000000 +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)
-+libmfhdf_la_LIBADD += $(XDRLIB)
- endif
- 
- if HDF_BUILD_NETCDF
diff --git a/sci-libs/hdf/files/hdf-4.2.9-autotools.patch b/sci-libs/hdf/files/hdf-4.2.9-autotools.patch
deleted file mode 100644
index a31946a0dfee..000000000000
--- a/sci-libs/hdf/files/hdf-4.2.9-autotools.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -216,20 +216,6 @@ AC_SUBST([BUILD_FORTRAN])
- ## 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], [])
- 
-@@ -261,7 +247,7 @@ AC_SUBST([LT_STATIC_EXEC])
- ## ======================================================================
- ## Libtool initialization
- ## ======================================================================
--LT_INIT([dlopen disable-shared])
-+LT_INIT([dlopen])
- LT_OUTPUT
- 
- ## ----------------------------------------------------------------------
-@@ -453,6 +439,8 @@ case "$withval" in
- 
-     if test -z "$HAVE_SZIP"; then
-       AC_MSG_ERROR([couldn't find szlib library])
-+    else
-+      USE_COMP_SZIP="yes"
-     fi
-     ;;
-   no)
-@@ -496,7 +484,7 @@ case "$withval" in
- 
-     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"
-@@ -837,11 +825,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.
-@@ -911,22 +894,7 @@ fi
- ## name of the compiler and the reported version number.
- AC_SUBST([F77_VERSION])
- ## 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"
- 
- ## This part doesn't work yet since HDF4 config files do not contain
- ## information for fortran_vendor and fortran_version. 
---- a/hdf/test/fortestF.f
-+++ b/hdf/test/fortestF.f
-@@ -203,7 +203,7 @@ C Skip command
- 
- 	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
---- a/mfhdf/libsrc/Makefile.am
-+++ b/mfhdf/libsrc/Makefile.am
-@@ -32,10 +32,11 @@ libmfhdf_la_SOURCES = $(CSOURCES) $(FSOURCES)
- else
- libmfhdf_la_SOURCES = $(CSOURCES)
- endif
-+libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la
- 
- if HDF_BUILD_XDR
- XDRLIB = $(top_builddir)/mfhdf/xdr/libxdr.la
--libmfhdf_la_LIBADD = $(XDRLIB)
-+libmfhdf_la_LIBADD += $(XDRLIB)
- endif
- 
- if HDF_BUILD_NETCDF
diff --git a/sci-libs/hdf/files/hdf-ppc.patch b/sci-libs/hdf/files/hdf-ppc.patch
deleted file mode 100644
index 3cf62d09371d..000000000000
--- a/sci-libs/hdf/files/hdf-ppc.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-Fix FTBS on ppc
-
-https://bugs.gentoo.org/show_bug.cgi?id=450188
-
-Source: http://pkgs.fedoraproject.org/cgit/hdf.git
---- a/hdf/src/hdfi.h
-+++ b/hdf/src/hdfi.h
-@@ -76,6 +76,7 @@
- #define     DFMT_IA64           0x4441
- #define     DFMT_LINUX64        0x4441
- #define     DFMT_POWERPC64      0x1111
-+#define     DFMT_LINUXPPC       0x1111
- 
- /* I/O library constants */
- #define UNIXUNBUFIO 1
-@@ -1289,6 +1290,57 @@ typedef long              hdf_pint_t;
- 
- #endif /*Linux 64 */
- 
-+/* Linux PPC */
-+#if defined __powerpc__ && !defined __powerpc64__
-+
-+#ifdef GOT_MACHINE
-+If you get an error on this line more than one machine type has been defined.
-+Please check your Makefile.
-+#endif
-+#define GOT_MACHINE
-+
-+#include <sys/file.h>               /* for unbuffered i/o stuff */
-+#include <sys/stat.h>
-+#define DF_MT             DFMT_LINUXPPC
-+typedef void              VOID;
-+typedef void              *VOIDP;
-+typedef char              *_fcd;
-+typedef char              char8;
-+typedef unsigned char     uchar8;
-+typedef char              int8;
-+typedef unsigned char     uint8;
-+typedef short int         int16;
-+typedef unsigned short int uint16;
-+typedef int               int32;
-+typedef unsigned int      uint32;
-+typedef int               intn;
-+typedef unsigned int      uintn;
-+typedef int               intf;     /* size of INTEGERs in Fortran compiler */
-+typedef float             float32;
-+typedef double            float64;
-+typedef long              hdf_pint_t;   /* an integer the same size as a pointer */
-+#define FNAME_POST_UNDERSCORE
-+#define _fcdtocp(desc) (desc)
-+#ifdef  HAVE_FMPOOL
-+#define FILELIB PAGEBUFIO  /* enable page buffering */
-+#else
-+#define FILELIB UNIXBUFIO
-+#endif
-+
-+/* JPEG #define's - Look in the JPEG docs before changing - (Q) */
-+
-+/* Determine the memory manager we are going to use. Valid values are: */
-+/*  MEM_DOS, MEM_ANSI, MEM_NAME, MEM_NOBS.  See the JPEG docs for details on */
-+/*  what each does */
-+#define JMEMSYS         MEM_ANSI
-+
-+#ifdef __GNUC__
-+#define HAVE_STDC
-+#define INCLUDES_ARE_ANSI
-+#endif
-+
-+#endif /*Linux PPC */
-+
- /*-----------------------------------------------------*/
- /* 64-bit Free BSD */
- 
---- a/mfhdf/fortran/config/jackets-linux.c
-+++ b/mfhdf/fortran/config/jackets-linux.c
-@@ -34,7 +34,7 @@
- 
- struct ncfils {			/* This will be a common block from Fortran */
-     double dd;
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-     int ll;
- #else
-     long ll;
-@@ -65,7 +65,7 @@ struct ncfils {			/* This will be a comm
- 
- struct ncfils {			/* This will be a common block from Fortran */
-     double dd;
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-     int ll;
- #else
-     long ll;
-@@ -430,7 +430,7 @@ stoig(shorts, ints, dims, basis, ndims)
- }
- #endif /* FORTRAN_HAS_NO_SHORT */
- 
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- /*
-  * Convert multi-dimensional array of NCLONGs stored in ints to packed
-  * array of longs, in malloc'ed space.  Returns pointer to longs or NULL
-@@ -916,7 +916,7 @@ nncvpt1(cdfid, varid, indices, value, rc
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long          longs = *(int *)value;
-@@ -1030,7 +1030,7 @@ nncvpt(cdfid, varid, start, count, value
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itol (value, ncount, ndims);
-@@ -1141,7 +1141,7 @@ nncvptg(cdfid, varid, start, count, stri
- 	tmpbasis	= nctypelen(NC_LONG);
-     else
- #endif
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-     if (datatype == NC_LONG)
- 	tmpbasis	= sizeof(int);
-     else
-@@ -1198,7 +1198,7 @@ nncvptg(cdfid, varid, start, count, stri
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itolg (value, ncount, nbasis, ndims);
-@@ -1334,7 +1334,7 @@ nncvgt1(cdfid, varid, indices, value, rc
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long          longs;
-@@ -1476,7 +1476,7 @@ nncvgt(cdfid, varid, start, count, value
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long iocount = dimprod (ncount, ndims);	/* product of dimensions */
-@@ -1614,7 +1614,7 @@ nncvgtg(cdfid, varid, start, count, stri
- 	tmpbasis	= nctypelen(NC_LONG);
-     else
- #endif
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
-     if (datatype == NC_LONG)
- 	tmpbasis	= sizeof(int);
-     else
-@@ -1685,7 +1685,7 @@ nncvgtg(cdfid, varid, start, count, stri
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long iocount = dimprod (ncount, ndims);	/* product of dimensions */
-@@ -1851,7 +1851,7 @@ nncapt(cdfid, varid, attname, datatype,
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) *datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- 	long *longs = itol (value, attlen, 1);
-@@ -2016,7 +2016,7 @@ nncagt(cdfid, varid, attname, value, rco
- 	return;
-     }				/* else */
- #endif				/* FORTRAN_HAS_NO_SHORT */
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- #ifdef HDF
-     if ((nc_type) datatype == NC_LONG && handle->file_type!=HDF_FILE) {
- /* EIP  We need to use int buffer to read data in on the platforms where long is 8 bytes
---- a/mfhdf/libsrc/netcdf.h.in
-+++ b/mfhdf/libsrc/netcdf.h.in
-@@ -295,7 +295,7 @@ typedef double        ncdouble;
-  */
- #if defined _CRAYMPP
- typedef short	nclong;
--#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64
-+#elif defined __alpha || (_MIPS_SZLONG == 64) || defined IA64 || (defined __sun__ && defined _LP64) || defined AIX5L64 || defined __powerpc64__
- typedef int     nclong;   
- #else
- typedef long    nclong;         /* default, compatible type */
---- a/mfhdf/ncgen/ncgen.l
-+++ b/mfhdf/ncgen/ncgen.l
-@@ -134,7 +134,7 @@ FloatInf|Infinity|Inf	{    /* float miss
- 		    yyerror(errstr);
- 		}
- 
--#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || __powerpc64__
-+#if defined __alpha || (_MIPS_SZLONG == 64) || defined __ia64 || (defined __sun && defined _LP64) || defined AIX5L64 || defined __x86_64__ || defined __powerpc64__
- 		if (dd < INT_MIN  ||  dd > INT_MAX) 
- #else
- #if defined (_CRAYMPP)
diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
index 3582363389a5..c66597afe4de 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ 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="
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index d92320b868a6..170fa0c5f4cf 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ 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="
diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
index d7244d6583fa..119a9644d97c 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ 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="