gentoo resync : 02.02.2022

4 files changed, 28 insertions, 45 deletions

diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index d1ce7850acbe..df290b0febf7 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -1,8 +1,8 @@
-AUX silo-4.11-autoreconf.patch 1692 BLAKE2B 23d9ef8806f655874bedb3a0bf3d839e61e4da06a95457bdacb6ddf54da46ceeb563b8bb623b8c6edd9c13eb110ffab07c146e1e04f4ac537a3eac0952942e44 SHA512 0c1eb37267c116180ce6f54dfdb998eceaf865bd4a544da01e29a56cd1cf0846af14518780888c029ea5fc37b02e07b146ec7dcb8bea759869aa1235fbd79a22
 AUX silo-4.11-hdf5.patch 1927 BLAKE2B 7c712cf43f4f8b1b4ac502afbde68de105e5cba34767f9faa523d9fdfa185b8eb6675cfb5c678d0dd9c27a12a5693b9ca6c2d3ee6d3af146db3d2039479ffe8b SHA512 7c34856634daade9976a71cb70286cc735a29a6082f67efcbf61ffcab4f8620a447daace8ae49eb7b6100b8d8c7ed482a3aafa4269a29b70c8da8829815bcbb4
 AUX silo-4.11-test-disable-largefile.patch 913 BLAKE2B b8c244bbe4df98e8a90af306894290c3103d9763610bf720c77fd22ff8ca9f1cdfc8d69176a9d330552e690ba38af72cd32f46bf4047351704d57644a24e3a03 SHA512 320cc6a110a0c1a641aa053ef642cfacafa0e22e76373d10bc214f7cc716619a2229062ee5dffd92ebb16bd02b3c0d5a6137380be5e88bcfd2fef45284436455
 AUX silo-4.11-tests.patch 909 BLAKE2B 0472a4ea51ca60285415b4da0cdfb5cd0cc8b75289abdf6040640d39dd5f528797ec8a36cc1681785c0945f379cfe2ce3ef0d1b9998b36cf38f797f7c0cd173a SHA512 d29efc8b0edfb996e3a1d7a7dbab6f15a60d3481135625852084d30c2f89f5a9a7bcd937619f01c31a301bca3250e4632e87ea5056f54be5613ad6ead008c8eb
 AUX silo-4.11-testsuite-python-write.patch 827 BLAKE2B a2cfc512ff5aaffec6af29a5de16c9c827d7488dcaae8e808ead2a8d9d6dc5f0fddea821d9b6cd170d2657d98a13d9b79faa8bad0fbb11150099a1b7b489beb3 SHA512 6ff64305f7c72be9683494c8095fe192273d06bafe027d18ca0a71fcd1579af71100e31381b65d2f9d6b805bcb95a6a9b85aeec5e99bc4d2dac93b828977f98e
+AUX silo-4.11-widgets.patch 390 BLAKE2B 72a6e08cbbcfb17a11c3d56a59aaa5c5931f888eda64fc93b6e6ec07a78411bf3a3c51b848dd452da8cdb090cb3722d8e36806d5f350a35650be3487319bb3d9 SHA512 8485f49e84530f0212c680c370c562a2f77be16d0abcd7571ee8d0216da8992060c0fe7d90c819f6ac6560b655255e5d3f7ce11d9f4b56e2cf6aaceea55e0177
 DIST silo-4.11-bsd.tgz 13298515 BLAKE2B fcf2e7912381e57d1a64644d3cee4dea50302c12704eaf0ee9e2569b7bc29b1d5c9df66878744ffc2cc04e16834fdf1cd4d677983af36005e4ecf0918c6283d5 SHA512 f642dd21dacffa147aea54d6f8669c704772d5640d6eb7eeff1d7e5e5d37ddbde250d78bad30e9478dcfec63a86863243d7a56cd9b692eaefdd7a89b34df35d0
-EBUILD silo-4.11.ebuild 1098 BLAKE2B 817d224691f2087511604b2d061a72a684ca09baca3d5b463fb9e275267484798eb0d47a989f8502d431111a1834b41b342d98350d4587557f13693b17d44ed7 SHA512 8da126e5136ff7dc4587ab2f815d3eb046ca69882023595a7d9407e602c4d90538146b542a886dfe77138cc3e5a9209b26cce35bdec2087811db8bd17eccb9be
+EBUILD silo-4.11-r1.ebuild 1401 BLAKE2B f26c719aaef1be343cb4acd1683b01dbd8a015367ba68925363125a784c6025be8a8e6fc4585ad8c9b614b4f3d6b7122f738abea32e25f18d2448fa5958ffa54 SHA512 e34ed55bc7bf679b158a21677ae30225832b269d99fca8763310286b69201952d9ea1fb9b7d12805d29af195df092916b7b5aa2a1bc7168d811da0591094c53d
 MISC metadata.xml 729 BLAKE2B 0bab9cb0101f967456a70472cb819b0eb43eb8444ae5260d33c3dc3f8f49480594609698110155dc6a12ef93ff6acf539b02f2cbfebc496fa0b641ed36738715 SHA512 3131fb65d7c9048d5a3b49ca9ce1ce790ca4b34c588b8bd72fc48a9facc995b1da1a8ac7ae4601db1c6cd14313f6d32084eaf101e95f2279df8e3316c3467514
diff --git a/sci-libs/silo/files/silo-4.11-autoreconf.patch b/sci-libs/silo/files/silo-4.11-autoreconf.patch
deleted file mode 100644
index 371b346e921c..000000000000
--- a/sci-libs/silo/files/silo-4.11-autoreconf.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Author: Alastair McKinstry <mckinstry@debian.org>
-Description: Fixes needed for autoreconf to work on Debian
- When autoreconf is run, VL_LIB_READLINE is lost from aclocal, so included in config/
- Also include AX_CHECK_COMPLER_FLAG() which is not in autoconf (just autoconf-archive)
- AX_CHECK_COMPILER_FLAGS() is obsolete
-Last-Updated: 2021-01-14
-Forwarded: no
-Link: https://sources.debian.org/patches/silo-llnl/4.11-2/autoreconf.patch/
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -195,6 +195,8 @@
- dnl This allows multiple src-dir builds within one host.
- AC_PREFIX_DEFAULT("SILO_TOP_SRC_DIR")
- 
-+AC_PROG_F77
-+
- dnl
- dnl Handle the python module right away to determine if we need shared libs.
- dnl Ordinarily, we default to static libs
-@@ -618,10 +620,10 @@
- # it is an argument to the -D argument. So, I think this is
- # just totally bogus!
- # Default to large file support
--AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
--AX_CHECK_COMPILER_FLAGS("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
--AX_CHECK_COMPILER_FLAGS("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
--AX_CHECK_COMPILER_FLAGS("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
-+AX_CHECK_COMPILE_FLAG("-D_LARGEFILE_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE";)
-+AX_CHECK_COMPILE_FLAG("-D_LARGEFILE64_SOURCE",CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE";)
-+AX_CHECK_COMPILE_FLAG("-D_FILE_OFFSET_BITS=64",CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64";)
-+AX_CHECK_COMPILE_FLAG("-Wdeclaration-after-statement",CFLAGS="$CFLAGS -Wdeclaration-after-statement";)
- 
- #
- # Note: regardless of what the stuff above regarding large file support
diff --git a/sci-libs/silo/files/silo-4.11-widgets.patch b/sci-libs/silo/files/silo-4.11-widgets.patch
new file mode 100644
index 000000000000..46ef1834ca22
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11-widgets.patch
@@ -0,0 +1,11 @@
+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/silo-4.11.ebuild b/sci-libs/silo/silo-4.11-r1.ebuild
index e7a7f142d2aa..3372e92a569c 100644
--- a/sci-libs/silo/silo-4.11.ebuild
+++ b/sci-libs/silo/silo-4.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit fortran-2
+inherit flag-o-matic fortran-2
 
 DESCRIPTION="A mesh and field I/O library and scientific database"
 HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo"
@@ -14,26 +14,31 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="browser +hdf5 +silex"
-# Waiting for fix/answer upstream
-# See https://github.com/LLNL/Silo/issues/234
-RESTRICT="test"
 
+# 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}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-autoreconf.patch
 	"${FILESDIR}"/${P}-hdf5.patch
 	"${FILESDIR}"/${P}-test-disable-largefile.patch
 	"${FILESDIR}"/${P}-tests.patch
 	"${FILESDIR}"/${P}-testsuite-python-write.patch
+	"${FILESDIR}"/${P}-widgets.patch
 )
 
 src_configure() {
+	# 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)
+
 	econf \
 		--enable-install-lite-headers \
 		--enable-shared \
@@ -42,6 +47,8 @@ src_configure() {
 		$(use_with hdf5 hdf5 "${EPREFIX}"/usr/include,"${EPREFIX}"/usr/$(get_libdir) )
 }
 
-# src_test() {
-#	emake -C tests check
-# }
+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
+}