version bump

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x55265D89)

4 files changed, 123 insertions, 2 deletions

diff --git a/sci-libs/silo/ChangeLog b/sci-libs/silo/ChangeLog
index 5acedd91da7b..766fc0913390 100644
--- a/sci-libs/silo/ChangeLog
+++ b/sci-libs/silo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/silo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/silo/ChangeLog,v 1.1 2014/07/24 05:48:35 slis Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/silo/ChangeLog,v 1.2 2015/01/08 12:31:38 slis Exp $
+
+*silo-4.10.2 (08 Jan 2015)
+
+  08 Jan 2015; Sławek Lis <slis@gentoo.org> +files/silo-4.10.2-qtlibs.patch,
+  +files/silo-4.10.2-tests.patch, +silo-4.10.2.ebuild:
+  version bump
 
 *silo-4.9.1 (24 Jul 2014)
 
diff --git a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch b/sci-libs/silo/files/silo-4.10.2-qtlibs.patch
new file mode 100644
index 000000000000..e8fc4284cac0
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.10.2-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/files/silo-4.10.2-tests.patch b/sci-libs/silo/files/silo-4.10.2-tests.patch
new file mode 100644
index 000000000000..2e0a52191d0e
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.10.2-tests.patch
@@ -0,0 +1,11 @@
+--- tests/Makefile.in.old	2014-07-24 07:25:53.464381420 +0200
++++ tests/Makefile.in	2014-07-24 07:26:14.951048323 +0200
+@@ -169,7 +169,7 @@
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(ioperf_stdio_la_LDFLAGS) $(LDFLAGS) -o $@
+ rocket_silo_la_LIBADD =
+-am_rocket_silo_la_OBJECTS = rocket_silo.lo
++am_rocket_silo_la_OBJECTS = rocket_silo.lo ../src/.libs/libsilo.la
+ rocket_silo_la_OBJECTS = $(am_rocket_silo_la_OBJECTS)
+ rocket_silo_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
diff --git a/sci-libs/silo/silo-4.10.2.ebuild b/sci-libs/silo/silo-4.10.2.ebuild
new file mode 100644
index 000000000000..9dcd5cabb928
--- /dev/null
+++ b/sci-libs/silo/silo-4.10.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/silo/silo-4.10.2.ebuild,v 1.1 2015/01/08 12:31:38 slis Exp $
+
+EAPI=5
+
+inherit eutils
+
+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 qt4 test"
+
+REQUIRED_USE="silex? ( qt4 )"
+
+RDEPEND="
+	hdf5? ( sci-libs/hdf5 )
+	qt4? ( dev-qt/qtgui:4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-qtlibs.patch"
+	epatch "${FILESDIR}/${P}-tests.patch"
+}
+
+src_configure() {
+	econf \
+		--enable-install-lite-headers \
+		--enable-shared \
+		$(use_enable silex silex ) \
+		$(use_enable static-libs static ) \
+		$(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} )
+}