gentoo resync : 15.06.2021

3 files changed, 64 insertions, 2 deletions

diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest
index ffdad1733058..afafdba2b81f 100644
--- a/dev-lang/maude/Manifest
+++ b/dev-lang/maude/Manifest
@@ -2,7 +2,8 @@ AUX maude-2.5.0-prll.patch 627 BLAKE2B 7a6b32561207a3f8fb13ad955f386970cfba84e9f
 AUX maude-2.6-search-datadir.patch 1124 BLAKE2B 620382dd567eb4bf2c944af83a209cc01b6b571024da0435995ab76c10ee0c1527a68d21ed171696d659092bb2a3cfb0593ceaded7d96351da2c0e067f4d4fcb SHA512 3bdaa49e6312d965c753450c5fec39c1175e6a5a57c570bce56f10d6bf3a56027fc8eb17c3d899aa752d4094eae4bbc7d1eec0022adc656894beef759c151cc5
 AUX maude-2.7-AR.patch 206 BLAKE2B a43c072a46543f877afd4d7c809e1a9760fa3011a12eff16dfd68f254f007c3294a187af293643fba866ea105bb8b27fbe65553618571b24735beae0203c2465 SHA512 4cd4931b3dbfca8b3972a130fd710c7b3535e1f2ceb80fd610b7c9afb2ece3dbaec3dec4c6a7c806f6a411b748d7c911b00cc572bd3343bbf953b80028987173
 AUX maude-2.7-bison-parse-param.patch 1027 BLAKE2B b8144c07c219987cd09d3555f05868d91c0727d905efd63ffe6cbdd0d9265c91a470db424b9f9719f7b0edb9f186656b6bab61e44cb40166c9d7802bd98ce368 SHA512 553c1e96fd72687025b71d04c476d853e0e2c8bab48f91f98ce1cb515562d27b7bbcb4e20ffb56c2dc3c7ee9cdbfe7c2da1d6d609b4bba34823c0637375f012c
+AUX maude-2.7-fix-build-with-gcc11.patch 2017 BLAKE2B 392125bbe74805b75cdf3b7465525cc73654028b5ced5064436d9107f5bc5e58bdc8a450a4fa97f1142a21d9bb242c8c914e7f7567cfadd38fd2901011c8e5cc SHA512 08b76d9dec638bb129c166695ffc0095bbe3001a337ce19e11a53a87e5ffcf45e750d075a5c91fc10c0a754c8153d1cc9e559066178b88b0e2f63ae40758b2a7
 DIST Maude-2.7.tar.gz 1663708 BLAKE2B 5fd87cbd7ef2f86f4a7095334fd996109c72caaed44a894138803b76220325400920654924cb8645ed846b4d997dd2cf827d489ef7c4eef73ee22cb4e6e5a5dc SHA512 eb5225a7ec75df5f79d1e9c0d78c33427c0cf07bea83dae9e559d6d4cfc85fb03985596daf0c9c8794b34859510482f93b855254c1a3c650ee7520a3530a2070
 DIST maude-2.6-extras.tar.xz 3157004 BLAKE2B d735366071194eb7fd22c11628672aba38cc8c7f4460e4ec8806e27c2e1416e1a2a5fa93efd01c305bf36e0ce799578688c5ac87b5459e979323df6f60305902 SHA512 0533f0f226057d2668052f360245f296d36129ec242ff0bfa91fada9db5bc347d276d3468c86fbac92f019f3a2f152c7cb4e58a7f1265c1fb5a8b1b496fac5cd
-EBUILD maude-2.7.ebuild 1348 BLAKE2B 6214e6e6788f6fc32338ffc4db885bcd34f82f15a281ab63e075b869e62b1445fa23be192773792adedff8744aa72e223773383408b45e43b49218631e3257b6 SHA512 c35d5b791d2ae2d7407f2cdccf7ea5ef6a02de9d3352a79790ba7fd43322536a9417d3419fe4067612866fa5da216777466af8468d5528d2858fa262afa8b07f
+EBUILD maude-2.7.ebuild 1400 BLAKE2B d77aeef190b5bc69ae81a5f6ff5f086b7cbccbab4e7e08995cdb56a11842c7bf30a8f1a2f610bc60308a8adc280f0c02a0c8620d2623d653a4a608e2f4466ba2 SHA512 c80d9fb1debdce70a7bb56d4a16926f57f7ee7f57ebcb94dea4e64d073c8875cd197052a2c2aa5d283224688b19d3d6ede98e5ee777861a737b0a25a1a355d2a
 MISC metadata.xml 708 BLAKE2B 45ec7072bcd0509e34ef2b5d3abd3a67abe84cf91f6dbc9e45fdc3d07bf4bebe520c40440b977e2eabdd06ec1d9fede487c74cc69df57819975cd75f8ca75016 SHA512 da572363e08716b890656c160e415a4e01bd0a0effaaa3a535108295fdbbc67210315b9c0f81e4fd4c9dc8a8b8a3cc454f5d2225be0d666dbc630752ea0e2cc2
diff --git a/dev-lang/maude/files/maude-2.7-fix-build-with-gcc11.patch b/dev-lang/maude/files/maude-2.7-fix-build-with-gcc11.patch
new file mode 100644
index 000000000000..b903d50e22bc
--- /dev/null
+++ b/dev-lang/maude/files/maude-2.7-fix-build-with-gcc11.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/787851
+
+From 6d448928a88f586195dadd9fae9cb1b19e589d94 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 15 Jun 2021 03:05:34 +0000
+Subject: [PATCH] Fix build with GCC 11
+diff --git a/src/ObjectSystem/configSymbol.hh b/src/ObjectSystem/configSymbol.hh
+index 90b00d9..d037dab 100644
+--- a/src/ObjectSystem/configSymbol.hh
++++ b/src/ObjectSystem/configSymbol.hh
+@@ -50,7 +50,7 @@ public:
+ private:
+   struct symbolLt
+   {
+-    bool operator()(const Symbol* d1, const Symbol* d2)
++    bool operator()(const Symbol* d1, const Symbol* d2) const
+     {
+       return d1->compare(d2) < 0;
+     }
+diff --git a/src/ObjectSystem/objectMap.cc b/src/ObjectSystem/objectMap.cc
+index 0dbcaf0..722aa29 100644
+--- a/src/ObjectSystem/objectMap.cc
++++ b/src/ObjectSystem/objectMap.cc
+@@ -50,7 +50,7 @@ ConfigSymbol::MessageQueue::markReachableNodes() const
+ 
+ struct ConfigSymbol::dagNodeLt
+ {
+-  bool operator()(const DagNode* d1, const DagNode* d2)
++  bool operator()(const DagNode* d1, const DagNode* d2) const
+     {
+       return d1->compare(d2) < 0;
+     }
+diff --git a/src/ObjectSystem/objectSystemRewritingContext.hh b/src/ObjectSystem/objectSystemRewritingContext.hh
+index 33785ec..32f4d94 100644
+--- a/src/ObjectSystem/objectSystemRewritingContext.hh
++++ b/src/ObjectSystem/objectSystemRewritingContext.hh
+@@ -62,7 +62,7 @@ protected:
+ private:
+   struct dagNodeLt
+   {
+-    bool operator()(const DagNode* d1, const DagNode* d2)
++    bool operator()(const DagNode* d1, const DagNode* d2) const
+     {
+       return d1->compare(d2) < 0;
+     }
+diff --git a/src/Mixfix/entity.hh b/src/Mixfix/entity.hh
+index eb8ad58..a221de4 100644
+--- a/src/Mixfix/entity.hh
++++ b/src/Mixfix/entity.hh
+@@ -53,7 +53,7 @@ public:
+ private:
+   struct UserLt
+   {
+-    bool operator()(const User* user1, const User* user2)
++    bool operator()(const User* user1, const User* user2) const
+     {
+       //
+       //   Direct < comparison of unrelated pointers is undefined. But since the casting
+--
+2.32.0
diff --git a/dev-lang/maude/maude-2.7.ebuild b/dev-lang/maude/maude-2.7.ebuild
index 01957fb2a5e5..72d88da7e51b 100644
--- a/dev-lang/maude/maude-2.7.ebuild
+++ b/dev-lang/maude/maude-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.6-search-datadir.patch"
 	"${FILESDIR}/${PN}-2.7-bison-parse-param.patch"
 	"${FILESDIR}/${PN}-2.7-AR.patch"
+	"${FILESDIR}/${PN}-2.7-fix-build-with-gcc11.patch"
 )
 
 src_prepare() {