Merge /usr/local/portage/andis_overlay

4 files changed, 120 insertions, 0 deletions

diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
new file mode 100644
index 000000000..dcd0e04f5
--- /dev/null
+++ b/sci-libs/silo/Manifest
@@ -0,0 +1 @@
+DIST silo-4.9.1.tar.gz 12038537 SHA256 4908eb77577e26948aedee5976deedc3d2c1fd01b6fc5bd9cb61772cbbe2a56e SHA512 512e16ec6bd62deb3596d918895a0c82606a9f519345e4c4abd1a19eb40172576b70313472b75ae4183ee9d86a0f19443504f232ca6e633b1652f9d547927b83 WHIRLPOOL 7cd875ce28bac86cbe68e931d95cf5543671aa7142ab672f5bdc23da9467eb6b755b2e8f06bb2871686aa01e835a5495697a454bcb36153adf86be09735219d9
diff --git a/sci-libs/silo/files/silo-4.9.1-qtlibs.patch b/sci-libs/silo/files/silo-4.9.1-qtlibs.patch
new file mode 100644
index 000000000..e8fc4284c
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.9.1-qtlibs.patch
@@ -0,0 +1,66 @@
+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 @@
+         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"
+     else
+       # Use cached value or do search, starting with suggestions from
+       # the command line
+@@ -27577,7 +27577,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"
+   else
+     # There is no valid definition for $QTDIR as Trolltech likes to see it
+     ax_qt_dir=
+@@ -27589,7 +27589,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"
+     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 @@
+       # 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"
+       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 @@
+         # 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"
+         cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27726,7 +27726,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"
+           cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27809,7 +27809,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"
+             cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/sci-libs/silo/metadata.xml b/sci-libs/silo/metadata.xml
new file mode 100644
index 000000000..2ee5908ca
--- /dev/null
+++ b/sci-libs/silo/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>cluster</herd>
+  <longdescription>
+    Silo is a library for reading and writing a wide variety of
+    scientific data to binary, disk files. The files Silo produces and
+    the data within them can be easily shared and exchanged between
+    wholly independently developed applications running on disparate
+    computing platforms.
+  </longdescription>
+  <use>
+    <flag name="silex">Build silex data browser</flag>
+  </use>
+  <maintainer>
+    <email>gentryx@gmx.de</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/sci-libs/silo/silo-4.9.1.ebuild b/sci-libs/silo/silo-4.9.1.ebuild
new file mode 100644
index 000000000..775f14096
--- /dev/null
+++ b/sci-libs/silo/silo-4.9.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2013-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A mesh and field I/O library and scientific database"
+HOMEPAGE="https://wci.llnl.gov/codes/silo"
+SRC_URI="https://wci.llnl.gov/codes/silo/${P}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="hdf5 qt4 +silex"
+
+REQUIRED_USE="silex? ( qt4 )"
+
+RDEPEND="
+	hdf5? ( sci-libs/hdf5 )
+	qt4? ( dev-qt/qtgui:4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-qtlibs.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_enable silex silex ) \
+		$(use_with qt4 Qt-lib-dir "${EPREFIX}"/usr/lib${LIB_LOCATION_SUFFIX}/qt4 ) \
+		$(use_with qt4 Qt-include-dir "${EPREFIX}"/usr/include/qt4 ) \
+		$(use_with hdf5 hdf5 ${EPREFIX}"/usr/include,${EPREFIX}"/usr/lib${LIB_LOCATION_SUFFIX} )
+}