6 files changed, 4 insertions, 191 deletions
diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest
index 22a107639dc4..bb5f89dab847 100644
--- a/dev-lang/maude/Manifest
+++ b/dev-lang/maude/Manifest
@@ -1,15 +1,9 @@
-AUX maude-2.5.0-prll.patch 627 BLAKE2B 7a6b32561207a3f8fb13ad955f386970cfba84e9fbd59792a832a268e5350ef2f451a62d64bbc19e191deb756a9100f221e8e6ea493fdbfdaaa8640ca0ff3545 SHA512 640dc2d784b3010af41ea7c186f27ef71d96efa26ab68b9371a990c442ca4d33d7925cf9c2a096487c1d7bc38e920333a71d969aa683ee2231d3ce954a9ff1e4
 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
 AUX maude-3.1-prll.patch 537 BLAKE2B 52e74b5e0bee9a8a82d8b2bb3d6274e19c9aa74eba87efeb064592ffcaa44186e4e61fd47387f9c4958ccfd3549b22e5512f008a560c36dbaf55881c6ff33c1a SHA512 d528eb34b369cd796d2f41ef788543333911a39f0e13e1ab8deabe6886f33ee812b95d603bc65101dde28051f0a458e0c1160b0c734cc727f70df4244e33232e
 DIST Full-Maude-3.1.zip 161211 BLAKE2B 2aad284e1f2bc6e701154bd72c6eff1433fd040fd0f97252485c954b5e1fb33f71555c5587ceec2f3f3e44c8d7b760c9f62f40f53577f19c4cc51a2159b01674 SHA512 fb0c0e30d3df830b60ece67c2fc5655c5e3f1377a269ce8acfc45fdfa0d42f3fe3fbf4038758b35598d82e7f47af5f24507b3ebe2a30dcb8722e61e6315248c3
-DIST Maude-2.7.tar.gz 1663708 BLAKE2B 5fd87cbd7ef2f86f4a7095334fd996109c72caaed44a894138803b76220325400920654924cb8645ed846b4d997dd2cf827d489ef7c4eef73ee22cb4e6e5a5dc SHA512 eb5225a7ec75df5f79d1e9c0d78c33427c0cf07bea83dae9e559d6d4cfc85fb03985596daf0c9c8794b34859510482f93b855254c1a3c650ee7520a3530a2070
 DIST Maude-3.1-manual-book-examples.zip 267629 BLAKE2B cb4c5d067b8b6787a575ec1e00bfdbfb846c787f4c48b207d9609db57c968acdd97f431110103aa16d764e8e1b59f0eb1f66df53d3b78562cf430f3a57b5541c SHA512 69980145a41afd49e4a2c77a596d7fa91ed8e5acca049d799cdb0f265d95f1c3215776edb3a3ae94d84309c94735c7a187f681c2a2d3aa2fe0a7563634d34efa
 DIST Maude-3.1-manual.pdf 2916925 BLAKE2B da7f0d5bef8bff2e1f1afecd4bc7d062992d6a27e5437f488a50d35bce144a3ddb029bed3271d9696a36e6ab13b5a4f815e1a257a81005eb65d2927526630a29 SHA512 8b4b9bff8d266fad7b42b37c79cd72e4b642483298631f35a52b8bd669f318654382232b0da62485dc198789215fd5a364b583320789754eac9159d4cc2689ca
 DIST Maude-3.1.tar.gz 2335693 BLAKE2B 3bc9744d95448e4dfc2f818944ab66dad84b026ad18a4324b25eafc82f6c2c637b81fa73d03da61ee7f3753bb3c650e1838b56c502c85c91e2507a697bcfbbc0 SHA512 34dba3c3b7eed48d0c82c6d5e4dade08bd11dc57b436f04e94842000809b9b6086f8077bccbfac0313e4a4f361b03c3ef3d56e6df6242ae42427dd674566a3bc
-DIST maude-2.6-extras.tar.xz 3157004 BLAKE2B d735366071194eb7fd22c11628672aba38cc8c7f4460e4ec8806e27c2e1416e1a2a5fa93efd01c305bf36e0ce799578688c5ac87b5459e979323df6f60305902 SHA512 0533f0f226057d2668052f360245f296d36129ec242ff0bfa91fada9db5bc347d276d3468c86fbac92f019f3a2f152c7cb4e58a7f1265c1fb5a8b1b496fac5cd
-EBUILD maude-2.7-r1.ebuild 1403 BLAKE2B 8cafabe903ec3449810d2e806432a8deb96682dbc9e12f904fd5cdf5088f767084287a2cc257b82d57932d4eaf6934817f43cd7e4c7a7d1e025ec6fc483a3aed SHA512 393cef3c42762a13b2dd3df0f1084675c487c51eff72bf454931db4f1276f5fd167bee336522192eab1d9a04351927a5885ab4ddaaaac76f65b95d2e4324a8a4
-EBUILD maude-3.1.ebuild 1455 BLAKE2B 9475bf3afe5ec351c27620f1898ee7fbf3f7ae1a6f586883db0dd57eca225cbb0e939658aa8e7647f283e431aebc525619837f1bd979a8be1e765cf7df01c072 SHA512 549de110093582f93bf5f96f47b761d1dbc82a1d6ec69d317c32279204337ebdf2f37bf030355933365e49cfcc2a32bda4bea92d830f971db0e7b7b84a8cc9b3
+EBUILD maude-3.1-r1.ebuild 1486 BLAKE2B a6c90dea75847209a5a97b62ff0810705c14a58adeb81170f9e599eed6751bf8ca9985ab2f62858279f9e79465f7821fe7117d65c55114a64233586584d5d204 SHA512 c69ec284977fb614100fd253480ab2e6f15ed6a3717207a1b8a4b1b33226a6628b96a4062b1050769cfc64ea02d234fbb8b8d3c56f9b7d98bf3cf15c3af28e5f
 MISC metadata.xml 709 BLAKE2B fa75819761280758c0e5a818029b963994504ba036eb57144224b01b51565072fce2f0879fd2ba035b3d98c6f552bed2f510acacf6d70844c814d4cdc43bb7b9 SHA512 8b0b153301327bb1fa1f9ae895c1451135e2ebac891320532c3937bee0d59cfd5a5cfec18febd23cc9d2b1e5a9d12c98ca1c8276ec143482644e857c39f70143
diff --git a/dev-lang/maude/files/maude-2.5.0-prll.patch b/dev-lang/maude/files/maude-2.5.0-prll.patch
deleted file mode 100644
index 5499af3eb764..000000000000
--- a/dev-lang/maude/files/maude-2.5.0-prll.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/Mixfix/Makefile.am b/src/Mixfix/Makefile.am
-index d811631..295f0c6 100644
---- a/src/Mixfix/Makefile.am
-+++ b/src/Mixfix/Makefile.am
-@@ -72,7 +72,7 @@ libmixfix_a_SOURCES = \
- EXTRA_libmixfix_a_SOURCES = \
- 	compiler.cc
- 
--BUILT_SOURCES = surface.yy surface.cc surface.h lexer.cc
-+BUILT_SOURCES = surface.cc lexer.cc
- CLEANFILES = surface.yy surface.cc surface.h lexer.cc
- 
- surface.yy: \
-@@ -87,7 +87,9 @@ surface.yy: \
- 	$(srcdir)/bottom.yy \
- 	> surface.yy
- 
--surface.cc surface.h: surface.yy
-+surface.h: surface.yy
-+
-+surface.cc: surface.h
- 	$(BISON) -dv surface.yy -o surface.c
- 	mv surface.c surface.cc
- 
diff --git a/dev-lang/maude/files/maude-2.7-bison-parse-param.patch b/dev-lang/maude/files/maude-2.7-bison-parse-param.patch
deleted file mode 100644
index 2aa77f01c4e8..000000000000
--- a/dev-lang/maude/files/maude-2.7-bison-parse-param.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Author: Jakub Wilk <jwilk@debian.org>
-Last-Update: Tue, 20 May 2014 13:35:26 +0200
-Bug-Debian: http://bugs.debian.org/733407
-Description: this is quick and dirty patch to use %parse-param instead
- of deprecated YYPARSE_PARAM (and eventually removed in Bison 3.0).
- %parse-param was added in bison 1.875, over a decade ago, so no
- Build-Depends adjustments are needed. :-)
-
---- a/src/Mixfix/top.yy
-+++ b/src/Mixfix/top.yy
-@@ -24,6 +24,8 @@
- //	Parser for Maude surface syntax.
- //
- 
-+%parse-param {void* YYPARSE_PARAM}
-+
- %{
- #include <string>
- #include <stack>
-@@ -91,7 +93,7 @@ SyntaxContainer* oldSyntaxContainer = 0;
- Int64 number;
- Int64 number2;
- 
--static void yyerror(char *s);
-+static void yyerror(void *, char *s);
- 
- void cleanUpModuleExpression();
- void cleanUpParser();
---- a/src/Mixfix/bottom.yy
-+++ b/src/Mixfix/bottom.yy
-@@ -23,7 +23,7 @@
- %%
- 
- static void
--yyerror(char *s)
-+yyerror(void *, char *s)
- {
-   if (!(UserLevelRewritingContext::interrupted()))
-     IssueWarning(LineNumber(lineNumber) << ": " << s);
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
deleted file mode 100644
index b903d50e22bc..000000000000
--- a/dev-lang/maude/files/maude-2.7-fix-build-with-gcc11.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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-r1.ebuild b/dev-lang/maude/maude-2.7-r1.ebuild
deleted file mode 100644
index 6f5a91ef333c..000000000000
--- a/dev-lang/maude/maude-2.7-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="High-level specification language for equational and logic programming"
-HOMEPAGE="http://maude.cs.uiuc.edu/"
-SRC_URI="
-	http://maude.cs.illinois.edu/w/images/2/2d/${P^}.tar.gz
-	https://dev.gentoo.org/~jlec/distfiles/${PN}-2.6-extras.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples"
-
-RDEPEND="
-	dev-libs/gmp:0=[cxx(+)]
-	dev-libs/libsigsegv
-	dev-libs/libtecla
-	sci-libs/buddy"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.0-prll.patch"
-	"${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() {
-	default
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" src/Mixfix/global.hh || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# install data and full maude
-	insinto /usr/share/${PN}
-	doins -r src/Main/*.maude
-	doins "${WORKDIR}"/${PN}-2.6-extras/full-maude.maude
-
-	# install docs and examples
-	use doc && dodoc -r "${WORKDIR}"/${PN}-2.6-extras/pdfs/.
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/${PN}-2.6-extras/{manual,primer}-examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-lang/maude/maude-3.1.ebuild b/dev-lang/maude/maude-3.1-r1.ebuild
index 2fa97a9809b1..1eb40d341405 100644
--- a/dev-lang/maude/maude-3.1.ebuild
+++ b/dev-lang/maude/maude-3.1-r1.ebuild
@@ -21,8 +21,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples"
 
 RDEPEND="
-	dev-libs/gmp:0=[cxx(+)]
-	dev-libs/libsigsegv
+	dev-libs/gmp:=[cxx(+)]
 	dev-libs/libtecla
 	sci-libs/buddy"
 DEPEND="${RDEPEND}"
@@ -45,6 +44,8 @@ src_configure() {
 	local myconf=(
 		--datadir="${EPREFIX}/usr/share/${PN}"
 		--without-yices2
+		# Breaks glibc-2.34 support
+		--without-libsigsegv
 	)
 	econf "${myconf[@]}"
 }