public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-libs/silo/, sci-libs/silo/files/
@ 2014-01-20  9:00 Justin Lecher
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2014-01-20  9:00 UTC (permalink / raw
  To: gentoo-commits

commit:     56c46ee03f275a41a241f8c9badc8dbc67dd3283
Author:     Andreas Schäfer <gentryx <AT> gmx <DOT> de>
AuthorDate: Sat Jan 18 23:00:45 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 23:00:45 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=56c46ee0

added ebuild for silo

---
 sci-libs/silo/files/silo-4.9.1-qtlibs.patch | 66 +++++++++++++++++++++++++++++
 sci-libs/silo/metadata.xml                  | 18 ++++++++
 sci-libs/silo/silo-4.9.1.ebuild             | 35 +++++++++++++++
 3 files changed, 119 insertions(+)

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 0000000..e8fc428
--- /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 0000000..2ee5908
--- /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 0000000..775f140
--- /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} )
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/silo/, sci-libs/silo/files/
@ 2015-04-16  6:34 Justin Lecher
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2015-04-16  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     7b22c591c98ae02c17799724e9ddd2cf34c83718
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 06:32:15 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 06:32:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7b22c591

In CVS

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/silo/files/silo-4.9.1-qtlibs.patch | 66 -----------------------------
 sci-libs/silo/metadata.xml                  | 18 --------
 sci-libs/silo/silo-4.9.1.ebuild             | 38 -----------------
 3 files changed, 122 deletions(-)

diff --git a/sci-libs/silo/files/silo-4.9.1-qtlibs.patch b/sci-libs/silo/files/silo-4.9.1-qtlibs.patch
deleted file mode 100644
index e8fc428..0000000
--- a/sci-libs/silo/files/silo-4.9.1-qtlibs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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
deleted file mode 100644
index 2ee5908..0000000
--- a/sci-libs/silo/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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
deleted file mode 100644
index 9cfc914..0000000
--- a/sci-libs/silo/silo-4.9.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-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 static-libs"
-
-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 \
-		--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} )
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-04-16  6:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-16  6:34 [gentoo-commits] proj/sci:master commit in: sci-libs/silo/, sci-libs/silo/files/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2014-01-20  9:00 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox