gentoo auto-resync : 16:10:2022 - 19:53:15

4 files changed, 50 insertions, 2 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 4a222dec2900..04e732b63289 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest
index df290b0febf7..9be2a146fc5c 100644
--- a/sci-libs/silo/Manifest
+++ b/sci-libs/silo/Manifest
@@ -1,8 +1,9 @@
 AUX silo-4.11-hdf5.patch 1927 BLAKE2B 7c712cf43f4f8b1b4ac502afbde68de105e5cba34767f9faa523d9fdfa185b8eb6675cfb5c678d0dd9c27a12a5693b9ca6c2d3ee6d3af146db3d2039479ffe8b SHA512 7c34856634daade9976a71cb70286cc735a29a6082f67efcbf61ffcab4f8620a447daace8ae49eb7b6100b8d8c7ed482a3aafa4269a29b70c8da8829815bcbb4
+AUX silo-4.11-qtbindir.patch 1622 BLAKE2B 223f8551aa9b7d03f5ac62c7609e20c7d20b59c6b16103586473d6ca97b1f219274ab31dc7564367dee15aafd33044d719f27e674092a39b13c592e53ba0587d SHA512 79443dd2bf456b15f8f98c3f3ab5b3770bc77ade99e22b4384778666b70b50c007902ab6857dde4d2f82ca8c6d05d881d369d364226c26819b625f0b92688558
 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-r1.ebuild 1401 BLAKE2B f26c719aaef1be343cb4acd1683b01dbd8a015367ba68925363125a784c6025be8a8e6fc4585ad8c9b614b4f3d6b7122f738abea32e25f18d2448fa5958ffa54 SHA512 e34ed55bc7bf679b158a21677ae30225832b269d99fca8763310286b69201952d9ea1fb9b7d12805d29af195df092916b7b5aa2a1bc7168d811da0591094c53d
+EBUILD silo-4.11-r1.ebuild 1547 BLAKE2B 1cda073f5fe092f44361ef5fed0874367990d48a1e11a66b6e1c6afdaf8d62fbf1a0fa96128edf7cb78e07f8309e4ef56e005ff91fd0c89f48dcc88d28f128d6 SHA512 6a7f6d2891dcffec9c49e89734daa0268d2e5fd6d2e2124d6f62eb4d6f74baa5dad747c849a45d7b155b0a266e139d51bb6df552293e1b7678cb7eefb9a0f713
 MISC metadata.xml 729 BLAKE2B 0bab9cb0101f967456a70472cb819b0eb43eb8444ae5260d33c3dc3f8f49480594609698110155dc6a12ef93ff6acf539b02f2cbfebc496fa0b641ed36738715 SHA512 3131fb65d7c9048d5a3b49ca9ce1ce790ca4b34c588b8bd72fc48a9facc995b1da1a8ac7ae4601db1c6cd14313f6d32084eaf101e95f2279df8e3316c3467514
diff --git a/sci-libs/silo/files/silo-4.11-qtbindir.patch b/sci-libs/silo/files/silo-4.11-qtbindir.patch
new file mode 100644
index 000000000000..70a62a9b8ec8
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.11-qtbindir.patch
@@ -0,0 +1,43 @@
+--- 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/silo-4.11-r1.ebuild b/sci-libs/silo/silo-4.11-r1.ebuild
index 3372e92a569c..bfae9dec06c8 100644
--- a/sci-libs/silo/silo-4.11-r1.ebuild
+++ b/sci-libs/silo/silo-4.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic fortran-2
+inherit flag-o-matic fortran-2 qmake-utils
 
 DESCRIPTION="A mesh and field I/O library and scientific database"
 HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo"
@@ -25,6 +25,7 @@ RDEPEND="
 	hdf5? ( sci-libs/hdf5 )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-hdf5.patch
@@ -32,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-tests.patch
 	"${FILESDIR}"/${P}-testsuite-python-write.patch
 	"${FILESDIR}"/${P}-widgets.patch
+	"${FILESDIR}"/${P}-qtbindir.patch
 )
 
 src_configure() {
@@ -39,6 +41,8 @@ src_configure() {
 	# see https://github.com/LLNL/Silo/issues/234
 	append-fflags $(test-flags-F77 -fallow-argument-mismatch)
 
+	QMAKE=$(qt5_get_bindir)/qmake \
+	QT_BIN_DIR=$(qt5_get_bindir) \
 	econf \
 		--enable-install-lite-headers \
 		--enable-shared \