gentoo resync : 31.08.2021

3 files changed, 45 insertions, 1 deletions

diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 4d0b80204ec1..62b8f8d053fc 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,4 +1,5 @@
+AUX espresso-4.1.3-gcc-11.patch 1134 BLAKE2B 40072bba384002ab091427d3c358248fba4b0d581be4d56c37cd76406c6da7933016c878139ec6d67e64a45854eb2723712e8ea048013fb8551e196d95f969ff SHA512 c42abfea997a58e70cb79ad554b2a40fa28d844f4d5ed262cc8a7e4420aa5d6e55fd0349fe19cd3654a8b86335b85212ccc3fe927c7418742f4a2e3310ce8f96
 DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
-EBUILD espresso-4.1.3.ebuild 2703 BLAKE2B f1b9f9798f07d6b5f64a23bccc1364609f05c2f1b9090ed478e208fc725f3e351bb0899414d2fea3d7a7dfb787fcb4f0e5c9436b520561b8021479971b743543 SHA512 c62e72e432146556e446616702251acb67142982100d4525fb323bd12de0f1cca8e53169b576de729d09e1964b92a2b06b96362fe70aeeff9bf5f326f54ed6df
+EBUILD espresso-4.1.3.ebuild 2767 BLAKE2B 0ccf402e5234a75cf7c0b38eeb4d5e705a573e7ac08c734ca4cbc0230734646bb2ea17b0ad096fefe309a6387b5edf99e4168f586b2a675a0287f065821c7fe9 SHA512 576bb3bd73ba9b274b23c5df9bc6e20cdfaafbe3c6d1895dacb111f3bf29fa32eda3fe8ee1d85b7d120c49e9112ed0b6584628d4a164ca11ece980d8dea09c7a
 EBUILD espresso-9999.ebuild 2703 BLAKE2B f1b9f9798f07d6b5f64a23bccc1364609f05c2f1b9090ed478e208fc725f3e351bb0899414d2fea3d7a7dfb787fcb4f0e5c9436b520561b8021479971b743543 SHA512 c62e72e432146556e446616702251acb67142982100d4525fb323bd12de0f1cca8e53169b576de729d09e1964b92a2b06b96362fe70aeeff9bf5f326f54ed6df
 MISC metadata.xml 476 BLAKE2B 6c074886e03a8645cb40176234cfff18ec75c0c3faa9c72f2cce228cdcbb113eb870eb0aebde8c0c378aee65e54606addb114361255df082a00e4289cd9f0db1 SHA512 d50a5262cccf20c2949d76fbd7a17166985b018d7686deade58a2d748a91754f5691df28800f7d19f3c3f2a78755d3e90cf93f6273be849deea47ee9d7de0258
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index 19e9be04e85a..4c60379b475a 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -49,6 +49,10 @@ DOCS=( AUTHORS NEWS README ChangeLog )
 
 S="${WORKDIR}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-11.patch
+)
+
 src_prepare() {
 	use cuda && cuda_src_prepare
 	cmake_src_prepare
@@ -79,6 +83,8 @@ src_install() {
 
 	cmake_src_install
 
+	python_optimize
+
 	insinto /usr/share/${PN}/
 	doins "${BUILD_DIR}/myconfig-sample.hpp"
 
diff --git a/sci-physics/espresso/files/espresso-4.1.3-gcc-11.patch b/sci-physics/espresso/files/espresso-4.1.3-gcc-11.patch
new file mode 100644
index 000000000000..fcda88e9b8b8
--- /dev/null
+++ b/sci-physics/espresso/files/espresso-4.1.3-gcc-11.patch
@@ -0,0 +1,37 @@
+https://src.fedoraproject.org/rpms/espresso/blob/f34/f/espresso-gcc11.patch
+--- a/src/core/communication.hpp
++++ b/src/core/communication.hpp
+@@ -49,6 +49,8 @@
+  *  to \ref CALLBACK_LIST.
+  */
+ 
++#include <cstddef>
++
+ #include "MpiCallbacks.hpp"
+ 
+ /* Includes needed by callbacks. */
+diff --git a/src/script_interface/ParallelScriptInterface.hpp b/src/script_interface/ParallelScriptInterface.hpp
+index c33e67d..02ad815 100644
+--- a/src/script_interface/ParallelScriptInterface.hpp
++++ b/src/script_interface/ParallelScriptInterface.hpp
+@@ -23,6 +23,7 @@
+ #define SCRIPT_INTERFACE_PARALLEL_SCRIPT_INTERFACE_HPP
+ 
+ #include <utility>
++#include <limits>
+ 
+ #include "MpiCallbacks.hpp"
+ #include "ScriptInterface.hpp"
+diff --git a/src/utils/include/utils/NumeratedContainer.hpp b/src/utils/include/utils/NumeratedContainer.hpp
+index 1d99098..1191a79 100644
+--- a/src/utils/include/utils/NumeratedContainer.hpp
++++ b/src/utils/include/utils/NumeratedContainer.hpp
+@@ -24,6 +24,7 @@
+  *  Keep an enumerated list of T objects, managed by the class.
+  */
+ 
++#include <cstddef>
+ #include <cassert>
+ #include <set>
+ #include <unordered_map>
+