From cce82508f8af80bbb619849e554a893d9c8ce301 Mon Sep 17 00:00:00 2001 From: Slawek Lis Date: Thu, 8 Jan 2015 12:32:02 +0000 Subject: [PATCH] version bump Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x55265D89 --- sci-libs/silo/ChangeLog | 10 ++- sci-libs/silo/Manifest | 20 +++--- sci-libs/silo/files/silo-4.10.2-qtlibs.patch | 66 ++++++++++++++++++++ sci-libs/silo/files/silo-4.10.2-tests.patch | 11 ++++ sci-libs/silo/silo-4.10.2.ebuild | 38 +++++++++++ 5 files changed, 135 insertions(+), 10 deletions(-) create mode 100644 sci-libs/silo/files/silo-4.10.2-qtlibs.patch create mode 100644 sci-libs/silo/files/silo-4.10.2-tests.patch create mode 100644 sci-libs/silo/silo-4.10.2.ebuild 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 +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/Manifest b/sci-libs/silo/Manifest index 604acb93bf45..5365db9d8e8f 100644 --- a/sci-libs/silo/Manifest +++ b/sci-libs/silo/Manifest @@ -1,20 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX silo-4.10.2-qtlibs.patch 3558 SHA256 db09bb42b74415de96220b2c8e56d6aad4164153b1aca65d135f1ac588f226b9 SHA512 629a16392ce32d7b9d79cd4870f6236e0129bc2ef570afc515b2af698dc67a4a773fc7d1a92c65ea8663ca1f993cac4d81a326ac6f10e474adcb614599863966 WHIRLPOOL 5aa61dfaaa7b931f919d35dbfbf3e1a2ac12908597c0c8fb6e7df25af035380c8188668a04c8a1052b0bca4aacd6f170424f94dd1025c481e1bc28b5cf5f58bd +AUX silo-4.10.2-tests.patch 562 SHA256 2b193440fa4348eb8ae5a6fcf96957c3bed3b8edfff1e5a0de51d61e17489635 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3 WHIRLPOOL c422621f4c84d5ea5897b6e5d35b834d7fc6e40c8a1982e72b8b3c36c6a46e64ef6af208dc592ca9a7e028f2fd067e01ccce2d44ff8fd597c4c9431d1250cdca AUX silo-4.9.1-qtlibs.patch 3558 SHA256 db09bb42b74415de96220b2c8e56d6aad4164153b1aca65d135f1ac588f226b9 SHA512 629a16392ce32d7b9d79cd4870f6236e0129bc2ef570afc515b2af698dc67a4a773fc7d1a92c65ea8663ca1f993cac4d81a326ac6f10e474adcb614599863966 WHIRLPOOL 5aa61dfaaa7b931f919d35dbfbf3e1a2ac12908597c0c8fb6e7df25af035380c8188668a04c8a1052b0bca4aacd6f170424f94dd1025c481e1bc28b5cf5f58bd AUX silo-4.9.1-tests.patch 562 SHA256 2b193440fa4348eb8ae5a6fcf96957c3bed3b8edfff1e5a0de51d61e17489635 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3 WHIRLPOOL c422621f4c84d5ea5897b6e5d35b834d7fc6e40c8a1982e72b8b3c36c6a46e64ef6af208dc592ca9a7e028f2fd067e01ccce2d44ff8fd597c4c9431d1250cdca +DIST silo-4.10.2.tar.gz 13135900 SHA256 3af87e5f0608a69849c00eb7c73b11f8422fa36903dd14610584506e7f68e638 SHA512 8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e WHIRLPOOL 6be4da792fb8845749790874315a67495510a1f7112ad879a62e040ec9b1176063bf55ce6612a5dd7a3158efdbb11e5e33a270ae37a061d2354d836ee8dc0569 DIST silo-4.9.1.tar.gz 12038537 SHA256 4908eb77577e26948aedee5976deedc3d2c1fd01b6fc5bd9cb61772cbbe2a56e SHA512 512e16ec6bd62deb3596d918895a0c82606a9f519345e4c4abd1a19eb40172576b70313472b75ae4183ee9d86a0f19443504f232ca6e633b1652f9d547927b83 WHIRLPOOL 7cd875ce28bac86cbe68e931d95cf5543671aa7142ab672f5bdc23da9467eb6b755b2e8f06bb2871686aa01e835a5495697a454bcb36153adf86be09735219d9 +EBUILD silo-4.10.2.ebuild 1152 SHA256 da9ea38e92286c00b96b86091945e4138ee6e5c4bfae1340ecfc83f1c46e5c07 SHA512 f162245367715826af9a85626b71c171f2553ad115a5777970a1b63d60f52cbc04d6747f67b376981f7689ca82d3db9212d37a12d7caa0b87db562ebcd8303db WHIRLPOOL 8f889818fabdf11f727db4fd8f251928ae7295d6a993bcc9b8a6c13fcffad1034cbc3b2d312db19428b2129063b712b2e1e5c8fe1db09ef5b2c2190418c2d604 EBUILD silo-4.9.1.ebuild 1093 SHA256 64176cb914fcc8a02e3578985d55bc114cbec976760979d1e743e460307499ae SHA512 79e23ff64b8edf9e11d21740109ca01496a4ae5648b180b1bb92e2231b5dea2c93f25cedc4c48635b46c2b7c406ccbb96300b95a54c20f781f6786c7a154e975 WHIRLPOOL 7b36c8460301f3be4132ddee0ceb37824ed199e5eb7d20331e0ae4aa1fd74922a9851e7945234c1e67f29921ed5d3520bdc7d00a36dbe33c3ae3482d1e4503a7 -MISC ChangeLog 390 SHA256 305ddddd3677597f897c788869521b51dfb6fc2e79ab432b4edf56e56e632743 SHA512 733981a8a8cc71ee3cb51f373ca265b6836812d059af0eff8f86f1692ade6de0f99bb983e3fc3c64d37fd1b69748986bc4e8661d220b10f1c32309b90de126f8 WHIRLPOOL 67580a0b1bb899d674510428689a543ec8963a73434cf93a335263b3955b462becedb2c688204752e191b6315121977b941dae3ec4910694edd3e9a275f8e567 +MISC ChangeLog 567 SHA256 3490e009bdd5d3e86afce0172005138d1bb309156119d12a07b93098796066b5 SHA512 33000804f383c77234eb9cce2e814d6446be02c9c00fe2a5f62a9f8f8b2b3703694ba53c199d83259caadbe227b7459634784b29320a3e1cdae608deee77951a WHIRLPOOL 1649b6c297eee59acd5443e6c2811f507d2bc98a655f871421ec0e655ae97966a965b35dbb6427783f833a9eec6db1735623f91f7994a19a0901f79dc1107a92 MISC metadata.xml 638 SHA256 f1f6fd2be46c79fa500c530ffe42e37e5957918982fdee7534d8e1c33b4ca93c SHA512 b2b077cbb87a5813b4af84b63b6401c8384f5085d773676e18e0455de4320b7d965cedabc92cdaf50bab695b5ebbddd922edb905db284de4b8949e1d9d3406d2 WHIRLPOOL e33158eb158becbcf1be60cc93a458568da0cb4290cf7e8df3074744c0ff12d3867de033fc0345a611c498b9a0c7df73570a3ddc4746c3c04d1482b7f83c3ea7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJT0J0GAAoJEO1RxJ84ipLk4L0IALiVWa8n2GjHB927FfFcA899 -ROE5Uyp46XnbCQcAapv+DndNqKD8hvaFa4mP8ept8jGsjcMN/CEXGwnY1UCLSudJ -JS+Km8DjaYgGSCgNHEFJId1Wl7D00ErPigWMhLtSf6+Pb09rtUxyW2y+yhGm4qty -XhDKMQRv5VIGHyexKobrHg/w1cgJk0ymvsi67PAAW9lkWPnEIGhzDLssE3zRQtpG -1zniMbB6+l8aol1Q5p9YvJ1kRQhlQnbJwc88CaEOpSzLwa/komV9J6aEa5gr1Qvg -c1WyJNBWjnFNpDrp64z743LsvGUV5PTHx622MhoY+W1DQp7oZgq2ZoZYMCiNEN8= -=656c +iQEcBAEBCAAGBQJUrngaAAoJEO1RxJ84ipLktRoH/jO0+2ZR7Vac/9T7f7BecwDa +nVf67jkmgsK/GXf+DoFMSQIa6EOuTvQo8dUVmbCYPuAO5ASAfXaaYU2xqSNyFM71 +oqcBKxJPt+ElLz5tQhrkSdwp2CoQbfa5cYNQbRpsTacio2/7ZBlRKcrtMVo0hU6t +qoQRLQf+hH8pJCAEYEiihzzYELLlYSvHtCrjfZbRCD2MUSprscGSpFoaJXn22R8C +kCE/EPDKQc0cFh2tgrf5hyiMVuBKaSry0qZQNodBs10J0cF7l/V8AmCExFDnrZ3e +qucxFasiR+wGN0AjHUeF7zXibYjW14wOQ/H3XnBV/hvFh8+07zMvWxXheyiR7xU= +=Rgbs -----END PGP SIGNATURE----- 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} ) +} -- 2.26.2