gentoo resync : 25.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-26 15:48:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-26 15:48:02 +0000
commit: 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree: 6fce284d5bfddaf597a490ac66069d16c6a485db /sci-libs/silo
parent: 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)
4 files changed, 117 insertions, 19 deletions
diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index 32a09c12fa0c..5d0679d11007 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -1,10 +1,12 @@
 AUX silo-4.10.2-mpiposix.patch 1902 BLAKE2B c26f6681bbab0065f046414c406bcfac3cc1a993729bb67e1178e67261201afbaad3f0469b8859d5c34261ea00f4be4f131a9db9f981dbbe18f137b53dc9a435 SHA512 626a7b8084a936b667f704a1a35edb8f6ce9ab42b58857024b87f280364d99b452e3f149b577e45898eb08523f0741eecc1c4ad20a46018dae377ca17adcf97a
-AUX silo-4.10.2-qtlibs.patch 3558 BLAKE2B cd14024e9c32e1bb48359ce9a3375b31ce434828d24a957f9b8a3eea52708dc24481cd2f7090fa8d0b8bf839c5413f5d9e47ee5782ea777cac9405c92c5032d9 SHA512 629a16392ce32d7b9d79cd4870f6236e0129bc2ef570afc515b2af698dc67a4a773fc7d1a92c65ea8663ca1f993cac4d81a326ac6f10e474adcb614599863966
+AUX silo-4.10.2-qt5.patch 1414 BLAKE2B 3b33d1228f9b26340d851a97dfcdde38b1ab66632a05ef0a3a5d7b9cec2c9c7186c922d0630bf6600830c53263218b90fe66ab0156cdf143a4df5577b200f5ab SHA512 a6a22b7ef04179b8d101d38b72244be6c59d4d23bb8dd0855ba5f3267a181e2b175806dbfa6c1184bd5f3542e842701f096a389e6cae6df5d26209319d96316f
+AUX silo-4.10.2-qtlibs.patch 4320 BLAKE2B 34fbff942d4caa73bf18302873ba4dc63de063eec84b3e0cd3bf3b24a5aeb44d40b74567f8001c3d14e19dabdb5133ea4ca32af067b16398a6aaaaac664209c5 SHA512 3f2e63ee943463fc23d7ba3542c756bd158c8b8f8280ec87eef53e30add0b335edfd202c592885e2f4002c7f975324ca7e96351c1d9c25ffb1adf2b67cd034d9
 AUX silo-4.10.2-tests.patch 562 BLAKE2B 27a15c9b6561101610774fd5f69b3bde7c0bca13943f37792562a0af66924566852ff67d5eee208bfcf1dd7790be602809c552a3f5a3b98cfc971aa1e90fd560 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3
 AUX silo-4.9.1-qtlibs.patch 3558 BLAKE2B cd14024e9c32e1bb48359ce9a3375b31ce434828d24a957f9b8a3eea52708dc24481cd2f7090fa8d0b8bf839c5413f5d9e47ee5782ea777cac9405c92c5032d9 SHA512 629a16392ce32d7b9d79cd4870f6236e0129bc2ef570afc515b2af698dc67a4a773fc7d1a92c65ea8663ca1f993cac4d81a326ac6f10e474adcb614599863966
 AUX silo-4.9.1-tests.patch 562 BLAKE2B 27a15c9b6561101610774fd5f69b3bde7c0bca13943f37792562a0af66924566852ff67d5eee208bfcf1dd7790be602809c552a3f5a3b98cfc971aa1e90fd560 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3
 DIST silo-4.10.2.tar.gz 13135900 BLAKE2B 6326a42df43c4bb6936522d1730db8ce45c6b74779cf37b7a5a0b7a72def9e9a4f174b68392adbda59936113ccac4ae5e7bf7266effb364eac7e5d0cff8bb37c SHA512 8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e
 DIST silo-4.9.1.tar.gz 12038537 BLAKE2B 4c5bf6a4390333d659df96a302f6ee8f7a81325194cb6853c278e94b6c229da964103874c02fcb4b4f9f4985cf9b023ee3a553e1ca6237ccdbc5e7d9f64c1906 SHA512 512e16ec6bd62deb3596d918895a0c82606a9f519345e4c4abd1a19eb40172576b70313472b75ae4183ee9d86a0f19443504f232ca6e633b1652f9d547927b83
+EBUILD silo-4.10.2-r1.ebuild 1179 BLAKE2B e785939ebf112b33777b56f99abfddfe68d042dd5e149dffc198e91378a8af86e3c647d3f0e5de707b0ff90ef4e425cbe4aed2b56ab4575d245f8f149280c056 SHA512 641e8e2f98ce7d916b565014760ca21dd43447080b8c47e186575414820868d7bba91ef7c951f57af35a7cee4e5ea6ea7f5d4f4db60e1dab6bd63a8ffb7bafb8
 EBUILD silo-4.10.2.ebuild 1099 BLAKE2B aa5bbf3d5f0451a5a8e711f594f315997247b4415e43845f8b94259979c1c4ec129de72184096bf22de0ab0862672fe91c15d55e100bf3695a6676e08c201a0d SHA512 1cd5333c6f337d876347b8f946365fbb9ccc1e4aec90ed00399eff2b2021ba60231a59db17312d993e25d99c28665511866d03fe4f6990652022e168a72143d4
 EBUILD silo-4.9.1.ebuild 989 BLAKE2B 68f2b46491e44c6ab2f60c3756195d316ad3ffeac91071338ad607e8daa32f5c36074880e5630ba5949c15435fe6678e8251332cf9643e6724c8a2456fa32978 SHA512 55f52bab2e917ff99fdfed8e2943be770981d064a5a29c7406d097b6667c6b99508a602a11c6a6a199e82362503791aee577f3fef794eb37809576eafe329c1f
 MISC metadata.xml 751 BLAKE2B 15f217d9eeeedb7889e47a18d81715f674156e59aef6901ec3873a731484a645a74c1840d2b41e1ca53d0247b43c5f401353b86e419f74f0aeb965146a53b9c1 SHA512 be9db7766bd0e0ea6c5f7f4505ee48ab6ea8b7da1ccc78ab68868072d15d068dab3f6eeeb53cf5cd348da92d52e32d8ad363798de55cd4a79fb1c19ad8456f5e
diff --git a/sci-libs/silo/files/silo-4.10.2-qt5.patch b/sci-libs/silo/files/silo-4.10.2-qt5.patch
new file mode 100644
index 000000000000..1e1fe8803a37
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.10.2-qt5.patch
@@ -0,0 +1,44 @@
+--- tools/silex/SiloFile.h.orig	2018-01-24 11:01:23.354705068 +0100
++++ tools/silex/SiloFile.h	2018-01-24 11:01:34.843705761 +0100
+@@ -61,6 +61,8 @@
+ #include <vector>
+ using std::vector;
+ 
++#define toAscii toLatin1
++
+ // ****************************************************************************
+ //  Class:  SiloDir
+ //
+--- tools/silex/main.cpp.orig	2018-01-24 11:02:21.201708556 +0100
++++ tools/silex/main.cpp	2018-01-24 11:02:34.146709336 +0100
+@@ -58,7 +58,7 @@
+ #include <cstdlib>
+ 
+ #ifndef Q_WS_MACX
+-#include "qwindowsstyle.h"
++//#include "qwindowsstyle.h"
+ #endif
+ #include "qfiledialog.h"
+ #include "qstring.h"
+@@ -91,7 +91,7 @@
+     QApplication::setColorSpec(QApplication::ManyColor);
+     QApplication a(argc, argv);
+ #ifndef Q_WS_MACX
+-    a.setStyle(new QWindowsStyle);
++//    a.setStyle(new QWindowsStyle);
+ #endif
+     Explorer *w = 0;
+     if (argc > 1)
+--- tools/silex/SiloView.cpp.orig	2018-01-24 11:03:13.775711725 +0100
++++ tools/silex/SiloView.cpp	2018-01-24 11:03:30.032712706 +0100
+@@ -109,8 +109,8 @@
+         dirTreeView->OpenRootDir();
+         dirView->Set(silo->root);
+ 
+-        dirTreeView->header()->setResizeMode(QHeaderView::Interactive);
+-        dirView->header()->setResizeMode(QHeaderView::Interactive);
++        dirTreeView->header()->setSectionResizeMode(QHeaderView::Interactive);
++        dirView->header()->setSectionResizeMode(QHeaderView::Interactive);
+     }
+ }
+ 
diff --git a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch b/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
index e8fc4284cac0..ecd5297c281f 100644
--- a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
+++ b/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
@@ -1,66 +1,78 @@
-diff -ru silo-4.9.1-old/configure silo-4.9.1-new/configure
---- silo-4.9.1-old/configure	2014-01-18 23:19:15.755030306 +0100
-+++ silo-4.9.1-new/configure	2014-01-18 23:20:52.595031159 +0100
-@@ -27503,7 +27503,7 @@
+--- configure.orig	2018-01-24 10:50:10.458664501 +0100
++++ configure	2018-01-24 10:50:42.967666461 +0100
+@@ -27541,7 +27541,7 @@
          ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
                       sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
        fi
 -      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
      else
        # Use cached value or do search, starting with suggestions from
        # the command line
-@@ -27577,7 +27577,7 @@
+@@ -27615,7 +27615,7 @@
        ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
                     sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
      fi
 -    ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+    ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++    ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
    else
      # There is no valid definition for $QTDIR as Trolltech likes to see it
      ax_qt_dir=
-@@ -27589,7 +27589,7 @@
+@@ -27627,7 +27627,7 @@
          ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p |
                       sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`"
        fi
 -      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++      ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
      else
        # Normally, when there is no traditional Trolltech installation,
        # the library is installed in a place where the linker finds it
-@@ -27607,7 +27607,7 @@
+@@ -27645,10 +27645,10 @@
        # See if we find the library without any special options.
        # Don't add top $LIBS permanently yet
        ax_save_LIBS="$LIBS"
 -      LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+      LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++      LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
        ax_qt_LIBS="$LIBS"
        ax_save_CXXFLAGS="$CXXFLAGS"
-       CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
-@@ -27668,7 +27668,7 @@
+-      CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
++      CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets -fPIC"
+       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27706,7 +27706,7 @@
          # That did not work. Try the multi-threaded version
          echo "Non-critical error, please neglect the above." >&5
          ax_qt_lib=qt-mt
 -        LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+        LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++        LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
          cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27726,7 +27726,7 @@
+@@ -27764,7 +27764,7 @@
            # That did not work. Try the OpenGL version
            echo "Non-critical error, please neglect the above." >&5
            ax_qt_lib=qt-gl
 -          LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+          LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++          LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
            cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27809,7 +27809,7 @@
+@@ -27847,7 +27847,7 @@
                fi
              done
              # Try with that one
 -            LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
-+            LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
++            LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
              cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
+@@ -27955,7 +27955,7 @@
+     fi # all $ax_qt_* are set
+   fi   # $have_qt reflects the system status
+   if test x"$have_qt" = xyes; then
+-    QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui"
++    QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets -fPIC"
+     if test x"$ax_qt_lib" = xqt-mt; then
+         QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
+     fi
diff --git a/sci-libs/silo/silo-4.10.2-r1.ebuild b/sci-libs/silo/silo-4.10.2-r1.ebuild
new file mode 100644
index 000000000000..b8c03cde0cde
--- /dev/null
+++ b/sci-libs/silo/silo-4.10.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils fortran-2
+
+DESCRIPTION="A mesh and field I/O library and scientific database"
+HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo"
+SRC_URI="https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PN}/${P}/${P}.tar.gz"
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="hdf5 +silex static-libs qt5 test"
+
+REQUIRED_USE="silex? ( qt5 )"
+
+RDEPEND="
+	hdf5? ( sci-libs/hdf5 )
+	qt5? ( dev-qt/qtgui:5 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-qtlibs.patch"
+	epatch "${FILESDIR}/${P}-qt5.patch"
+	epatch "${FILESDIR}/${P}-tests.patch"
+	epatch "${FILESDIR}/${P}-mpiposix.patch"
+}
+
+src_configure() {
+	econf \
+		--enable-install-lite-headers \
+		--enable-shared \
+		$(use_enable silex silex ) \
+		$(use_enable static-libs static ) \
+		$(use_with qt5 Qt-lib-dir "${EPREFIX}"/usr/$(get_libdir) ) \
+		$(use_with qt5 Qt-include-dir "${EPREFIX}"/usr/include/qt5 ) \
+		$(use_with qt5 Qt-bin-dir "${EPREFIX}"/usr/$(get_libdir)/qt5/bin ) \
+		$(use_with hdf5 hdf5 ${EPREFIX}"/usr/include,${EPREFIX}"/usr/$(get_libdir) )
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-26 15:48:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-26 15:48:02 +0000
commit	38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree	6fce284d5bfddaf597a490ac66069d16c6a485db /sci-libs/silo
parent	0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)