gentoo resync : 06.05.2018

5 files changed, 2 insertions, 151 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 994a52c04b95..e641a2ac6b93 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
index 733585e03ec9..cd4ebf36fe64 100644
--- a/sci-libs/adolc/Manifest
+++ b/sci-libs/adolc/Manifest
@@ -1,7 +1,6 @@
 AUX adolc-2.4.0-no-colpack.patch 580 BLAKE2B 95247622f68b6e5c4f45eb6eef7cd99f7596705712346aab2a79233d2dda936c9a25cc65437e9b7082672fa7c0cd023a9281871498e1a3133eea770bb5ce48d7 SHA512 974e538343c377ce286c63b5206a5c3c33d9b5995addac07860ca52f6e1d3ca42d1fe8c1384b6d5d0ac39c062d8dc1f984262172b347f273c0e4c7d43fd120a2
 AUX adolc-2.5.0-no-colpack.patch 1424 BLAKE2B ea11eed8f816daaa9809b8f6a6f20e87a22acbf2d210f60000b93635f68d5f362530bac5a46c173ffbd33aec31769c6e5dadf9f638779bbdc0e17483b1a0f5c4 SHA512 826023e0066620a1885a462c31cb5be80d880f917df26c007564e327b8be8513621e56b601b6f9bfcec0fc617a15eea5016436aa08bebb0346254089a5d850ec
 AUX adolc-2.5.0-pkgconfig-no-ldflags.patch 364 BLAKE2B a35ab92ca491110c390a4d0f90c7cb12f417891762571ec91ce64fb81d84c4a7e3249971302e3801f721e7791725e37e3f4d241160ec80c5c633af096cad9107 SHA512 914bd01428fc07f50985afc076722778029835048883eade3730878c2d103cd29c288656d524ad3895416e94b50b5db2f53e35fdab0ed2a0f364669bf304af41
-AUX adolc-2.5.2-dash.patch 5020 BLAKE2B e7ff9c003f2dc9b6804f3e95a54c1ce3e3a5cab786b46fa2a612a2066ba1bf238b951d3b0d589be7885290b92d3177eaab46eb14181d7b18686fea2d7381333b SHA512 3240473df5fc4aa03edb5d0a5c61cf086b76065400bb735cb1b994a2c28cd69e7a4e7be87fe1cb044a329a08c787777bf3c5276acaf4ce2a193f2f44bd05335e
 AUX adolc-2.6.2-dash.patch 4516 BLAKE2B 8db052472bd3051ed0b8b1a180aac4098862695cefeed0f0f94600d447b2ef5b888ba072613ea101ac1435569eb9d5bcba1aa64b23a0bc7cf01a4ef20d3f760b SHA512 9b904d8c0ab3c286af27b293b5ffe516b9c1da53169702f94a9213496b6626e1a587e8ab8d9d25b983872c1a97620a8d5386d9053ba1a4c973ef5e145f655bc5
 DIST ADOL-C-2.4.1.tgz 2210414 BLAKE2B f9b1fd7f0e619d811b29e077e436697dc8b5a388568d73b2db602e57f97cbb690a5b47a55c722ae45cc28698dd19949eddb9d02e11c87383191e217f012519bb SHA512 5e5135ca587d159510bf77338fdff3d324f4d32c4ec6f8cf64ddc92253b427b8ee26a30bc1d83fe18121bbfdc7454c3536f58849c0c335e1b240e39d46acdccc
 DIST ADOL-C-2.6.3.tgz 2416928 BLAKE2B 74e575a1a919bc2787be0c29deaac4b503c077cb06efdba3f2382f21abf1ed53e8cb5f41729dc39f9188e44460fa137a09cffdb296b5f92131153795f36fa83a SHA512 e3c44b1f8ab5211a8a3c3163124e35b6d1e9551672ab4944d983dd3117f609d512c1b08c61e535dc4d50089295ee565bec07aaca67aa88b57b17bc3906573262
diff --git a/sci-libs/adolc/files/adolc-2.5.2-dash.patch b/sci-libs/adolc/files/adolc-2.5.2-dash.patch
deleted file mode 100644
index 3aa5a3035a14..000000000000
--- a/sci-libs/adolc/files/adolc-2.5.2-dash.patch
+++ /dev/null
@@ -1,148 +0,0 @@
- configure.ac | 45 +++++++++++++++++----------------------------
- 1 file changed, 17 insertions(+), 28 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 926832c..1310025 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,12 +29,12 @@ AM_SILENT_RULES([yes])
- 
- adolclib=adolc
- 
--if test "x$CFLAGS" == x ; then
-+if test "x$CFLAGS" = x ; then
-     ac_shell_cflags="not_set"
- else
-     ac_shell_cflags="$CFLAGS"
- fi
--if test "x$CXXFLAGS" == x ; then
-+if test "x$CXXFLAGS" = x ; then
-     ac_shell_cxxflags="not_set"
- else
-     ac_shell_cxxflags="$CXXFLAGS"
-@@ -225,12 +225,12 @@ AS_HELP_STRING([--enable-harddebug],[enable ADOL-C hard debug mode
-    AC_MSG_RESULT(no)
-    ])
- 
--if test x$adolc_harddebug == xyes ; then
-+if test x$adolc_harddebug = xyes ; then
- adolc_debug=yes
- AC_DEFINE(ADOLC_HARDDEBUG,1,[ADOL-C hard debug mode])
- fi
- 
--if test x$adolc_debug == xyes ; then
-+if test x$adolc_debug = xyes ; then
- AC_DEFINE(ADOLC_DEBUG,1,[ADOL-C debug mode])
- fi
- 
-@@ -248,7 +248,7 @@ AS_HELP_STRING([--disable-stdczero],[adouble default constructor does not initia
-   AC_MSG_RESULT(yes)
-   ])
- 
--if test x$adolc_stdczero == xyes; then
-+if test x$adolc_stdczero = xyes; then
- AC_DEFINE(ADOLC_ADOUBLE_STDCZERO,1,[ADOL-C adouble zeroing mode])
- fi
- 
-@@ -265,7 +265,7 @@ AS_HELP_STRING([--enable-lateinit],[adouble constructors need to be called. With
-   AC_MSG_RESULT(no)
-   ])
- 
--if test x$adolc_late_init == xyes; then
-+if test x$adolc_late_init = xyes; then
- AC_DEFINE(ADOLC_ADOUBLE_LATEINIT,1,[ADOL-C adouble late initialization mode])
- fi
- 
-@@ -282,7 +282,7 @@ AS_HELP_STRING([--enable-tserrno],[use errno as thread number cache [default=no]
-   AC_MSG_RESULT(no)
-   ])
- 
--if test x$adolc_tserrno == xyes ; then
-+if test x$adolc_tserrno = xyes ; then
- AC_DEFINE(ADOLC_THREADSAVE_ERRNO,1,[ADOL-C thread save errno mode])
- fi
- 
-@@ -351,8 +351,8 @@ AC_ARG_WITH(cflags,
-             [AS_HELP_STRING([--with-cflags=FLAGS],
-                             [use CFLAGS=FLAGS (default: -O2)])],
-             [ac_adolc_cflags="$withval"
--             if test x${adolc_debug} == xyes ||
--                test x${adolc_harddebug} == xyes ; then
-+             if test "x${adolc_debug}" = xyes ||
-+                test "x${adolc_harddebug}" = xyes ; then
-                 ac_adolc_cflags="$ac_adolc_cflags -g -O0"
-              fi
-              ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag"
-@@ -360,8 +360,8 @@ AC_ARG_WITH(cflags,
-              AC_MSG_RESULT($ac_adolc_cflags)],
-             [if test "$ac_shell_cflags" = "not_set"; then
-                 ac_adolc_cflags="-O2"
--                if test x${adolc_debug} == xyes ||
--                   test x${adolc_harddebug} == xyes ; then
-+                if test "x${adolc_debug}" = xyes ||
-+                   test "x${adolc_harddebug}" = xyes ; then
-                    ac_adolc_cflags="-g -O0 -Wall -ansi"
-                 fi
-              else
-@@ -377,8 +377,8 @@ AC_ARG_WITH(cxxflags,
-             [AS_HELP_STRING([--with-cxxflags=FLAGS],
-                             [use CXXFLAGS=FLAGS (default: -O2)])],
-             [ac_adolc_cxxflags="$withval"
--             if test x${adolc_debug} == xyes ||
--                test x${adolc_harddebug} == xyes ; then
-+             if test x${adolc_debug} = xyes ||
-+                test x${adolc_harddebug} = xyes ; then
-                 ac_adolc_cxxflags="$ac_adolc_cxxflags -g -O0"
-              fi
-              ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag"
-@@ -386,8 +386,8 @@ AC_ARG_WITH(cxxflags,
-              AC_MSG_RESULT($ac_adolc_cxxflags)],
-             [if test "$ac_shell_cxxflags" = "not_set"; then
-                 ac_adolc_cxxflags="-O2"
--                if test x${adolc_debug} == xyes ||
--                   test x${adolc_harddebug} == xyes ; then
-+                if test x${adolc_debug} = xyes ||
-+                   test x${adolc_harddebug} = xyes ; then
-                    ac_adolc_cxxflags="-g -O0 -Wall"
-                 fi
-              else
-@@ -420,7 +420,7 @@ AC_ARG_ENABLE(tapedoc_values,
-   ])
- AC_MSG_RESULT($tapedoc_values)
- 
--if test x$tapedoc_values == xyes; then
-+if test x$tapedoc_values = xyes; then
- AC_DEFINE(ADOLC_TAPE_DOC_VALUES,1,[ADOL-C tape_doc routine computes values])
- fi
- 
-@@ -583,7 +583,7 @@ while test "x${pdir}" != "x/" ; do
-         break
-     fi
- done
--if test "x${pdir}" == "x/" ; then
-+if test "x${pdir}" = "x/" ; then
-     writable=false
- fi
- if ! ${writable} ; then
-@@ -595,15 +595,6 @@ if ! ${writable} ; then
-     warn=true
- fi
- 
--case ${prefix} in 
--   ${HOME}|${HOME}/*)
--if $warn ; then
--    for (( i=5; i>0; i-- )); do
--        echo -ne "\rPlease read the above messages carefully, continuing in ${i} seconds"
--        sleep 1
--    done
--    echo -e "\rPlease read the above messages carefully                                 "
--fi
- echo \
- "
- *****************************************************************************
-@@ -629,5 +620,3 @@ echo \
- 
- *****************************************************************************
- "
--;;
--esac
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 1cd4b1f02045..4b20f73bef2a 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -11,7 +11,7 @@ DIST hdf-4.2.13.tar.bz2 3616255 BLAKE2B 3b20f018849b64aebc0e5fa53516f65f6e181b42
 DIST hdf-4.2.8.tar.bz2 3027253 BLAKE2B b1291fce4b2f47a4b2f1d725cfc5314c4e451d2dd4ede242ef64a11490884ff991b800b06b7aabf574659117c6abde5cd26236d23d8f38e003c7df9271248d90 SHA512 d033007eff74d957572db8433f66e9df6fec44f67b28ddbad6e9a2d832b5504a29e9ecc5565d861b8308bab8d0dbfce19ae1e2ade0dd758d370a333819364c8e
 DIST hdf-4.2.9.tar.bz2 3126686 BLAKE2B 491fdad375bef944ed9f7040faba0e811b11019e1f51c5c3f874f29be07b945eb68af31cfce56db5e1f03f3bbd9e85320bed6e5f7f2b725676ead50dac022986 SHA512 99630177167f115f4a7f4424cf3fc77962c4eb46698f884d0e89acfe7d585aa659fd7cdf36a29246ae518675b07182223d4337a7d0aac6344ce21ccbed9aa390
 EBUILD hdf-4.2.11.ebuild 1598 BLAKE2B 6cc328bba07d7f5fd96dfc11576d8f89d17b8e4889d74210ef2ed5bfa5faf72f3200d74e8cfd8856c0658f9376139fde9261b03ffbdc51549fcc3d7113e4171d SHA512 e873ec4aec9c1890b1a658aae3e07c6acbd304b6f4e1e90aee2930222518eccc9539dd9a4c0182f4fb352ec5e693cae2f6897a0606c56ab8055f52422e73c488
-EBUILD hdf-4.2.13-r1.ebuild 1787 BLAKE2B 3b7caf81a92ff196bb1cd61295d73a972a22e5e82dc842a39ada96a25fb8ca0c7ba17c0e99138612f406bc86081ee24d5625c9da4f68b9a0a6a38b6df0d3d04f SHA512 71b32ef907661eda8d4279f579cdabe21d7da36ff2820383749c6052537097b9c0ca48ab94f0f03392fa60e8dccc6b32c88ca54d7a9eb6636e34fddbc0485357
+EBUILD hdf-4.2.13-r1.ebuild 1786 BLAKE2B 93475813317b568ddd8b42c275933194757348a06025d60e301911062e592fadd5f06cda6b9f3dde04de81d951632e6a6b70e75b366d889590640007719074d7 SHA512 060e608526d9dcbb0b24d8107f3030129be77281ad79e9a8fca6f62854bb75880f34a73d3db491dd24bc76203c26aca20c38c23c1568fc67eb9584d9a9b1720b
 EBUILD hdf-4.2.13.ebuild 1670 BLAKE2B b0af1304dc0a3ea13dbac2094322e96cc0cf87dcaf2ac0e1700fa4dfb514d8e62869fd47b92c323d07736217498fd8ee74604563eef52f975d4f8858365e6d58 SHA512 1d86aa88ac7fd4f9b8037d3dc5a0c0c1f3b07bf85af3508bc6bd0d29608fe0f37a52cc99001c634ac4632f3cfe1750286ac95adfdaa6d827167ed3884d573aa7
 EBUILD hdf-4.2.8.ebuild 1333 BLAKE2B dd4a11a50035b4279c5460f8db46988a9b3786b9bd9bd24ff7aa806dcddf2a9baacc95a37f7a80a02b4e5fd0f84876d166c52aa98f6ecfb739f5a89432910b17 SHA512 87e14301b2f8ffed92013aafc9dce2ebd1ab127c7bbf1bfa2ed73de9e44a57130fe18d3db1dc2b23de03d73029aee114a521278da5d9e07853f6a2375224c74f
 EBUILD hdf-4.2.9.ebuild 1327 BLAKE2B 8d7d692ce5370dc405cbd3a81afa564b5ff59fdcdd21a6d9af44b468c72df2fd4672579ee0fd9e27521db714ecc958b28e47accee3b3c7366c56ce4bfddb12b0 SHA512 17b9ffe9ce05679f64f8bf87ad0ef69d45e6a07fee2745c9378e73d6538e00cd82e08395b272b98cf4933baa6e9ab8bf1d240b052dc991a4f5f8b2d74b3f5462
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index 331ad8938e5a..f0e700167311 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 )"