commit: f5dc3ecbdfd172d765cd455626f537370f4bb93d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Sep 29 16:10:19 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Oct 5 11:47:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5dc3ecb
sci-libs/silo: treeclean Closes: https://bugs.gentoo.org/955270 (pkgremoved) Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> profiles/package.mask | 5 -- sci-libs/silo/Manifest | 1 - sci-libs/silo/files/silo-4.11-qtbindir.patch | 43 --------------- .../files/silo-4.11-test-disable-largefile.patch | 23 -------- sci-libs/silo/files/silo-4.11-tests.patch | 26 --------- .../files/silo-4.11-testsuite-python-write.patch | 27 ---------- sci-libs/silo/files/silo-4.11-widgets.patch | 11 ---- sci-libs/silo/files/silo-4.11.1-gcc14-tests.patch | 45 ---------------- sci-libs/silo/metadata.xml | 22 -------- sci-libs/silo/silo-4.11.1-r1.ebuild | 63 ---------------------- 10 files changed, 266 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index d4c62de43669..1b2d8271ae1e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -252,11 +252,6 @@ dev-python/locket dev-python/partd dev-python/spur -# Andreas Sturmlechner <[email protected]> (2025-09-05) -# Qt5-based library without revdeps. Needs a dedicated maintainer. -# Bug #955270. Removal on 2025-10-05. -sci-libs/silo - # Eli Schwartz <[email protected]> (2025-09-01) # Effectively unmaintained in Gentoo. Upstream dead for 8 years. Stuck # on py3.11, but no testsuite and still has py2-specific source code so diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest deleted file mode 100644 index d1ea20f6ccc3..000000000000 --- a/sci-libs/silo/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST silo-4.11.1-bsd.tar.xz 4581480 BLAKE2B 577bb9e367cae08496ec2062ce7b1fc6ebd04a8221bfb304585ea8b338502793a8ba43c14dbf8a7fd1f61b3c8a3a7886da1e9a7f9a1972d2a9cb69d5e36362e3 SHA512 e4ecfc434b43ea0bd2e3cda469f5e232b0bdfd25a44da04e77f2213ff20fd4158bc085d16b10de22d9a4be0ce822899e2b7f20c53b4d4bd941f92357a873c4a2 diff --git a/sci-libs/silo/files/silo-4.11-qtbindir.patch b/sci-libs/silo/files/silo-4.11-qtbindir.patch deleted file mode 100644 index 70a62a9b8ec8..000000000000 --- a/sci-libs/silo/files/silo-4.11-qtbindir.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/configure 2021-09-11 00:22:52.000000000 +0200 -+++ b/configure 2022-10-16 17:03:52.235916191 +0200 -@@ -25725,7 +25725,10 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt" >&5 - $as_echo_n "checking for Qt... " >&6; } - # If we have Qt5 or later in the path, we're golden -- ver=`qmake --version | grep -o "Qt version ."` -+ if [[ -z $QMAKE ]]; then -+ QMAKE=qmake -+ fi -+ ver=`$QMAKE --version | grep -o "Qt version ."` - if test "$ver" ">" "Qt version 4"; then - have_qt=yes - # This pro file dumps qmake's variables, but it only works on Qt 5 or later -@@ -25750,21 +25753,21 @@ - percent.commands = @echo -n "\$(\$(@))\ " - QMAKE_EXTRA_TARGETS += percent - EOF -- qmake $am_have_qt_pro -o $am_have_qt_makefile -+ $QMAKE $am_have_qt_pro -o $am_have_qt_makefile - QT_CXXFLAGS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile CXXFLAGS INCPATH | tr -d '"'` - QT_LIBS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile LIBS` - rm $am_have_qt_pro $am_have_qt_makefile - rmdir $am_have_qt_dir - - # Look for specific tools in $PATH -- QT_MOC=`which moc` -- QT_UIC=`which uic` -- QT_RCC=`which rcc` -- QT_LRELEASE=`which lrelease` -- QT_LUPDATE=`which lupdate` -+ QT_MOC=$QT_BIN_DIR/moc -+ QT_UIC=$QT_BIN_DIR/uic -+ QT_RCC=$QT_BIN_DIR/rcc -+ QT_LRELEASE=$QT_BIN_DIR/lrelease -+ QT_LUPDATE=$QT_BIN_DIR/lupdate - - # Get Qt version from qmake -- QT_DIR=`qmake --version | grep -o -E /.+` -+ QT_DIR=`$QMAKE --version | grep -o -E /.+` - - # All variables are defined, report the result - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_qt: diff --git a/sci-libs/silo/files/silo-4.11-test-disable-largefile.patch b/sci-libs/silo/files/silo-4.11-test-disable-largefile.patch deleted file mode 100644 index 953453e12fe0..000000000000 --- a/sci-libs/silo/files/silo-4.11-test-disable-largefile.patch +++ /dev/null @@ -1,23 +0,0 @@ -Author: Alastair McKinstry <[email protected]> -Description: Disable largefile test. Seems to fail on rounding error -Forwarded: yes -Last-Updated: 2011-06-09 -Link: https://sources.debian.org/patches/silo-llnl/4.11-2/test-disable-largefile.patch/ - ---- a/tests/testsuite.at -+++ b/tests/testsuite.at -@@ -324,10 +324,10 @@ - AT_SETUP(xversion) - AT_CHECK(test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testxvers `pwd`,,ignore,ignore) - AT_CLEANUP --AT_SETUP(largefile) --AT_KEYWORDS(large) --AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND largefile,,ignore,ignore) --AT_CLEANUP -+#AT_SETUP(largefile) -+#AT_KEYWORDS(large) -+#AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND largefile,,ignore,ignore) -+#AT_CLEANUP - #AT_SETUP(memfile_simple) - #AT_CHECK(testall -small $STARGS,,ignore) - #AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND memfile_simple $STARGS,,ignore,ignore) diff --git a/sci-libs/silo/files/silo-4.11-tests.patch b/sci-libs/silo/files/silo-4.11-tests.patch deleted file mode 100644 index a093d318ded6..000000000000 --- a/sci-libs/silo/files/silo-4.11-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -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/libsiloh5.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) \ - -Author: Alastair McKinstry <[email protected]> -Description: bash is needed to execute this testscript for test 62. -Last-Updated: 2011-04-11 -Forwarded: no -Link: https://sources.debian.org/patches/silo-llnl/4.11-2/testsuite-fix.patch/ - ---- a/tests/testdtypes -+++ b/tests/testdtypes -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - # Copyright (C) 1994-2016 Lawrence Livermore National Security, LLC. - # LLNL-CODE-425250. diff --git a/sci-libs/silo/files/silo-4.11-testsuite-python-write.patch b/sci-libs/silo/files/silo-4.11-testsuite-python-write.patch deleted file mode 100644 index ac0bc859068a..000000000000 --- a/sci-libs/silo/files/silo-4.11-testsuite-python-write.patch +++ /dev/null @@ -1,27 +0,0 @@ -Author: Alastair McKinstry <[email protected]> -Description: Python code seems to be broken. Disable test and inform upstream. -Last-Updated: 2011-06-09 -Forwarded: yes -Link: https://sources.debian.org/patches/silo-llnl/4.11-2/testsuite-python-write.patch/ - ---- a/tests/test_write.py -+++ b/tests/test_write.py -@@ -52,11 +52,13 @@ - db = Silo.Create("foo.silo", "test file") - db.Write("t1", 12) - db.Write("t2", "hello") --db.Write("t3", (13,)) --db.Write("t4", 14.5) --db.Write("t5", (1.2, 10)) --db.Write("t6", (1.2, 10.2)) --db.Write("t7", (10, 1.2)) -+# Disable writes with floating point. Seem to break on python2.7 -+# --amck, 2011-06-09 -+#db.Write("t3", (13,)) -+#db.Write("t4", 14.5) -+#db.Write("t5", (1.2, 10)) -+#db.Write("t6", (1.2, 10.2)) -+#db.Write("t7", (10, 1.2)) - db.Write("t8", "a") - db.MkDir("a") - db.Write("a/t8", "x2") diff --git a/sci-libs/silo/files/silo-4.11-widgets.patch b/sci-libs/silo/files/silo-4.11-widgets.patch deleted file mode 100644 index 46ef1834ca22..000000000000 --- a/sci-libs/silo/files/silo-4.11-widgets.patch +++ /dev/null @@ -1,11 +0,0 @@ -On a minimal QT installation, widgets may not necessarily be -added and it needs to be explicitely done. Modifying ./configure -directly given tarball lacks some files to run eautoreconf. - -https://bugs.gentoo.org/831361 ---- a/configure -+++ b/configure -@@ -25748,2 +25748,3 @@ - qtHaveModule(testlib): QT += testlib -+qtHaveModule(widgets): QT += widgets - percent.target = % diff --git a/sci-libs/silo/files/silo-4.11.1-gcc14-tests.patch b/sci-libs/silo/files/silo-4.11.1-gcc14-tests.patch deleted file mode 100644 index 1e729ee74e32..000000000000 --- a/sci-libs/silo/files/silo-4.11.1-gcc14-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://github.com/LLNL/Silo/pull/371 - -From f0737787eb02093defc30de05a731ffe63c4c6f4 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Sun, 17 Mar 2024 07:35:36 +0000 -Subject: [PATCH] tests: add missing header for `difftime` -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With GCC 14, which makes implicit function declarations an error by default: -``` -TestReadMask.c: In function ‘ElapsedTime’: -TestReadMask.c:746:15: error: implicit declaration of function ‘difftime’ [-Wimplicit-function-declaration] - 746 | ms = (int)difftime(end_time.tv_sec, start_time.tv_sec); - | ^~~~~~~~ -TestReadMask.c:62:1: note: ‘difftime’ is defined in header ‘<time.h>’; this is probably fixable by adding ‘#include <time.h>’ - 61 | #include <std.c> - +++ |+#include <time.h> - 62 | -``` - -Fix the include guards and include <time.h> unconditionally (for difftime) and <string.h> -unconditionally too (for memcpy). - -Signed-off-by: Sam James <[email protected]> ---- a/tests/TestReadMask.c -+++ b/tests/TestReadMask.c -@@ -51,13 +51,12 @@ product endorsement purposes. - */ - #include <stdio.h> - #include <silo.h> -+#include <string.h> - #ifndef WIN32 - #include <sys/time.h> --#else --#include <string.h> --#include <time.h> - #endif - #include <sys/timeb.h> -+#include <time.h> - #include <std.c> - - /* To compile this program on hyper, here is the command: - diff --git a/sci-libs/silo/metadata.xml b/sci-libs/silo/metadata.xml deleted file mode 100644 index a60d491c0107..000000000000 --- a/sci-libs/silo/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <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="browser">Enable browser support</flag> - <flag name="silex">Build silex data browser</flag> - </use> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Cluster Project</name> - </maintainer> - <upstream> - <remote-id type="github">LLNL/Silo</remote-id> - </upstream> -</pkgmetadata> diff --git a/sci-libs/silo/silo-4.11.1-r1.ebuild b/sci-libs/silo/silo-4.11.1-r1.ebuild deleted file mode 100644 index 7028cae194f0..000000000000 --- a/sci-libs/silo/silo-4.11.1-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic fortran-2 qmake-utils - -DESCRIPTION="A mesh and field I/O library and scientific database" -HOMEPAGE="https://software.llnl.gov/Silo/"; -SRC_URI="https://github.com/LLNL/Silo/releases/download/${PV}/${P}-bsd.tar.xz"; -S="${WORKDIR}/${P}-bsd" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="browser +hdf5 +silex" - -# see bugs 656432 and 741741 -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - net-dialup/lrzsz - virtual/szip - hdf5? ( sci-libs/hdf5:= ) -" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}"/${PN}-4.11-test-disable-largefile.patch - "${FILESDIR}"/${PN}-4.11-tests.patch - "${FILESDIR}"/${PN}-4.11-testsuite-python-write.patch - "${FILESDIR}"/${PN}-4.11-widgets.patch - "${FILESDIR}"/${PN}-4.11-qtbindir.patch - "${FILESDIR}"/${PN}-4.11.1-gcc14-tests.patch -) - -src_configure() { - # bug #862927 and https://github.com/LLNL/Silo/issues/248 - append-flags -fno-strict-aliasing - filter-lto - - # add fflags for fixing test bug on matf77.f - # see https://github.com/LLNL/Silo/issues/234 - append-fflags $(test-flags-F77 -fallow-argument-mismatch) - - CONFIG_SHELL="${BROOT}"/bin/bash \ - QMAKE=$(qt5_get_bindir)/qmake \ - QT_BIN_DIR=$(qt5_get_bindir) \ - econf \ - --enable-install-lite-headers \ - --enable-shared \ - $(use_enable silex silex ) \ - $(use_enable browser browser ) \ - $(use_with hdf5 hdf5 "${EPREFIX}"/usr/include,"${EPREFIX}"/usr/$(get_libdir) ) -} - -src_test() { - # see https://github.com/LLNL/Silo/issues/236 - # some tests are skipped by default so we are gonna drop them directly - emake ATARGS="1-34 36-44 50-51 66-76 78-81" -C tests check -}
