From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9D24F1382C5 for ; Tue, 13 Mar 2018 09:34:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 220CBE08DB; Tue, 13 Mar 2018 09:34:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E819CE08DB for ; Tue, 13 Mar 2018 09:33:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7741335C61 for ; Tue, 13 Mar 2018 09:33:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D97F259 for ; Tue, 13 Mar 2018 09:33:56 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1520933605.7d9eacdfc758857f89923f5b57e9f1b795186dd4.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/silo/Manifest sci-libs/silo/files/silo-4.9.1-qtlibs.patch sci-libs/silo/files/silo-4.9.1-tests.patch sci-libs/silo/silo-4.10.2.ebuild sci-libs/silo/silo-4.9.1.ebuild X-VCS-Directories: sci-libs/silo/ sci-libs/silo/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7d9eacdfc758857f89923f5b57e9f1b795186dd4 X-VCS-Branch: master Date: Tue, 13 Mar 2018 09:33:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 39a62746-7221-4a26-84ab-60b783a088ca X-Archives-Hash: 9b2fc7440e510236036d8f0aafe22415 commit: 7d9eacdfc758857f89923f5b57e9f1b795186dd4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 12 19:50:29 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 13 09:33:25 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9eacdf sci-libs/silo: Drop old Closes: https://bugs.gentoo.org/645434 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sci-libs/silo/Manifest | 1 - sci-libs/silo/files/silo-4.9.1-qtlibs.patch | 66 ----------------------------- sci-libs/silo/files/silo-4.9.1-tests.patch | 11 ----- sci-libs/silo/silo-4.10.2.ebuild | 38 ----------------- sci-libs/silo/silo-4.9.1.ebuild | 38 ----------------- 5 files changed, 154 deletions(-) diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest index f8335b91fb0..b6f65c970d1 100644 --- a/sci-libs/silo/Manifest +++ b/sci-libs/silo/Manifest @@ -1,2 +1 @@ DIST silo-4.10.2.tar.gz 13135900 BLAKE2B 6326a42df43c4bb6936522d1730db8ce45c6b74779cf37b7a5a0b7a72def9e9a4f174b68392adbda59936113ccac4ae5e7bf7266effb364eac7e5d0cff8bb37c SHA512 8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e -DIST silo-4.9.1.tar.gz 12038537 BLAKE2B 4c5bf6a4390333d659df96a302f6ee8f7a81325194cb6853c278e94b6c229da964103874c02fcb4b4f9f4985cf9b023ee3a553e1ca6237ccdbc5e7d9f64c1906 SHA512 512e16ec6bd62deb3596d918895a0c82606a9f519345e4c4abd1a19eb40172576b70313472b75ae4183ee9d86a0f19443504f232ca6e633b1652f9d547927b83 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 e8fc4284cac..00000000000 --- 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/files/silo-4.9.1-tests.patch b/sci-libs/silo/files/silo-4.9.1-tests.patch deleted file mode 100644 index 2e0a52191d0..00000000000 --- a/sci-libs/silo/files/silo-4.9.1-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 0c77dba873a..00000000000 --- a/sci-libs/silo/silo-4.10.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 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 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" - 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 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} ) -} 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 7c9677f1477..00000000000 --- 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 - -EAPI=5 - -inherit eutils - -DESCRIPTION="A mesh and field I/O library and scientific database" -HOMEPAGE="https://wci.llnl.gov/codes/${PN}" -SRC_URI="https://wci.llnl.gov/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} ) -}