gentoo resync : 12.03.2021

3 files changed, 22 insertions, 21 deletions

diff --git a/sci-misc/h5utils/Manifest b/sci-misc/h5utils/Manifest
index f2d63926aaa1..f8eaa09e020b 100644
--- a/sci-misc/h5utils/Manifest
+++ b/sci-misc/h5utils/Manifest
@@ -1,8 +1,8 @@
 AUX h5utils-1.12.1-automagic.patch 2226 BLAKE2B 3c4aac896c971870274410f467943fb4068da96d0cee9a356b98a0c94234d7c101d6cf5951b1f1ca998c692a5efceff183f83fb4e19428331e126f37c60cdb7c SHA512 ae8513c6c214fdd17886b65e77c707c08c97b7c72943ea0608cd8f4d269a4f2ef7df579b5746b76b307a77d68b9993860b6cce8cb6793da21123ad9892769999
 AUX h5utils-1.12.1-png15.patch 1420 BLAKE2B 99144644c0ea10ed9be48a40cbe8651eac1620d5b8d42f1cd9c170649e40df38066f585b6f0a59470fe15894a1b0d293ac0f4e98f79510377410c819a2e4b251 SHA512 babc34ab9d585468dabae50d16b7cb59a9326f541c69be5f347189bc6386273a61b9ec3a8a09e00fb2da386ee1fd592f0c85d2c3290134c74d8aa5d1057bd563
-AUX h5utils-1.13.1-automagic.patch 2251 BLAKE2B 7d973a51c595d2221a6824624c6c6cd256e69d3847db43c53f5375b01ab80b3de64c199059a8a478af3b2182902aeef200cb5c43313afbff9946950a83df9d58 SHA512 5d4c2898899f32639033c8b69ae3bedc4ffe1ef5cc19999d1aa383d4b9f20c7b8db35d0f92217f4bb1383841d73e7daac752cf1d71410480754d361ef9bb95e4
+AUX h5utils-1.13.1-automagic.patch 2261 BLAKE2B c9aed879b096c95cf6c17c15d13d6a4a2f0f47afb96e00d382971676cfd34fc53ed802c8070f4d6a19f18165f828746a87efbe845ef89ddeaeee35bcff2eeb87 SHA512 c13621ada5c4f2e2e247bff5d4bd94d19ec888c6fd4b5dde1591ce06a96d346942392c1c3e33bcbd17d30e3d13d4799a7d54a456aa6b52a7123bcad05754d6d9
 DIST h5utils-1.12.1.tar.gz 156785 BLAKE2B 55fd5df6ce593261ffb889de1cc575da28d0006e46b5e50c3d5f49caa93b2f9f229e9c8f8444e67b30d7e19a619815dd9d8d46d33c9c25f9fae979a5caaced53 SHA512 b4295ac52ddfe922ed9f0a9079c69d6fdba5a261558d8c820a8feae592db3bd57a3394ab1fc9ceead00038a80bc70f32e0a8aa437cb33182899553bfdbf1f547
 DIST h5utils-1.13.1.tar.gz 113754 BLAKE2B db8fbd51d93aaafbecdf549e9e40fd1e39284cc90301f098f552f80bef6f7edb33b45b91ad1dee502ad9c0c44f49ebbb589025511acc0f160980eab94da1afa3 SHA512 cd04997c3f1392f4755f78df67555ac43a3287cc482e47c11ef8c29edf4aac7915d89d550a0b0585ca90527bad532bbb139bb0162c49fc2a27c292c9dc5ecbe4
 EBUILD h5utils-1.12.1-r2.ebuild 782 BLAKE2B 0f758aad9e1c88aeec5a2c2513abe178d19a99686f76c286f5b1e7577de2d5e92f7b6c760e5f579e78bed508b2793801d575a08752de94c65a48a7e589c86ee2 SHA512 45c664a647f17326dc16cf28cfbfe75ad4685122ad9ccfd1ed952d6e4ed2fefd6a234875ebeccea5d063e1210eeaae5f4e3ddbe5430437ec59dff9f3c72ad29c
-EBUILD h5utils-1.13.1.ebuild 738 BLAKE2B 9d8de56f8701b6f888dc9b82749bcd878b284e452b47f0a11cf9900f1e372921b83edf9ed7f714f846ccb251f3af369fd3552e75913fa6afe84533db239c4204 SHA512 e3bca11f6e4ac1dcb09647b25198ecb6cd5fe657ba9c673d76c86b093849cd0d33cdb01f7fe60907ac705bf1d8c5734559b71b88a14cd7d7da57ca4455dd7ba0
+EBUILD h5utils-1.13.1.ebuild 737 BLAKE2B 32ba75cd8d4979f1a00d82f12631e9a26dc851db27964353044152814dadf42eaab8995e9027262b4233a44a374093d9dcb9ab88d553a6473e446c98830ba391 SHA512 898174d2a2b5593d0887ddc16cae82aef6c7a51efcac2b61876c84e4f33aa8226d29e66ec1a4df78334cb3e507152fd0c9aacdc7fda201dd1135d1323825bff3
 MISC metadata.xml 776 BLAKE2B 4e2af756ae62083753d5204c1524d42b3ebc3a01026a6354b583902c2bd730f1c256bb4c1f63fae9e6ce0ee016bc2d6a0d9aede6117dbbca7ddc47577411653a SHA512 12bda28a2fd9022d8472f81afc827b1329ab84598e8a91a7170bfeffb4b55953b37a9504bffc58933c352ebbdd25beb781e570d5f8de9759a290c4476a40afd1
diff --git a/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch
index 7c166040cb48..81e7d8a5b605 100644
--- a/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch
+++ b/sci-misc/h5utils/files/h5utils-1.13.1-automagic.patch
@@ -19,24 +19,7 @@
 -	H4TOH5="h4toh5"
 -	H5TOH4="h5toh4"
 -fi
-+AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present]))
-+
-+AS_IF([test "x$with_hdf" = "xyes"], [
-+  AC_CHECK_HEADERS(hdf.h hdf/hdf.h)
-+  AC_CHECK_LIB(jpeg, jpeg_start_compress,
-+      [AC_CHECK_LIB(df, DFSDgetdata,
-+         [H4_LIBS="-ldf -ljpeg"; HDF4=yes],
-+         [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)],
-+      [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])])
-+  if test $HDF4 = yes; then
-+      MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS"
-+      MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS"
-+      MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS"
-+  fi
-+
-+  AC_SUBST(H4_LIBS)
-+])
- 
+-
 -HDF4=no
 -if test "x$H4TOH5" != xh4toh5 -o "x$H5TOH4" != xh5toh4; then
 -	AC_CHECK_LIB(jpeg, jpeg_start_compress,
@@ -57,6 +40,24 @@
 -	fi
 -fi
 -AC_CHECK_HEADERS(hdf.h hdf/hdf.h)
++AC_ARG_WITH([hdf], AS_HELP_STRING([--with-hdf], [build hdf4 utils even if h4toh5 and h5toh4 are present]))
++
++AS_IF([test "x$with_hdf" = "xyes"], [
++  AC_CHECK_HEADERS(hdf.h hdf/hdf.h)
++  AC_CHECK_LIB(jpeg, jpeg_start_compress,
++      [AC_CHECK_LIB(df, DFSDgetdata,
++         [H4_LIBS="-ldf -ljpeg"; HDF4=yes],
++         [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)],
++      [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])])
++  if test $HDF4 = yes; then
++      MORE_H5UTILS="h5fromh4\$(EXEEXT) $MORE_H5UTILS"
++      MORE_H5UTILS_MANS="doc/man/h5fromh4.1 $MORE_H5UTILS_MANS"
++      MORE_H5UTILS="h4fromh5\$(EXEEXT) $MORE_H5UTILS"
++  fi
++
++  AC_SUBST(H4_LIBS)
++])
++
  
 -AC_SUBST(H4_LIBS)
  
diff --git a/sci-misc/h5utils/h5utils-1.13.1.ebuild b/sci-misc/h5utils/h5utils-1.13.1.ebuild
index 3055754da187..f017eb4ac117 100644
--- a/sci-misc/h5utils/h5utils-1.13.1.ebuild
+++ b/sci-misc/h5utils/h5utils-1.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/NanoComp/h5utils/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="hdf octave"
 
 DEPEND="