From 4aeee4e148bdab6e4b985309a8c7bb22621088e0 Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 12 Nov 2021 04:19:10 +0000 Subject: dev-lang/maude: drop 2.7-r1 Closes: https://bugs.gentoo.org/599374 Signed-off-by: Sam James --- dev-lang/maude/Manifest | 2 - dev-lang/maude/files/maude-2.5.0-prll.patch | 24 --------- .../maude/files/maude-2.7-bison-parse-param.patch | 39 -------------- .../files/maude-2.7-fix-build-with-gcc11.patch | 60 ---------------------- dev-lang/maude/maude-2.7-r1.ebuild | 59 --------------------- 5 files changed, 184 deletions(-) delete mode 100644 dev-lang/maude/files/maude-2.5.0-prll.patch delete mode 100644 dev-lang/maude/files/maude-2.7-bison-parse-param.patch delete mode 100644 dev-lang/maude/files/maude-2.7-fix-build-with-gcc11.patch delete mode 100644 dev-lang/maude/maude-2.7-r1.ebuild diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest index 79dca7d0994c..5e04c25d9c5c 100644 --- a/dev-lang/maude/Manifest +++ b/dev-lang/maude/Manifest @@ -1,6 +1,4 @@ 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 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 -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 - #include -@@ -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 -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 -} -- cgit v1.2.3-65-gdbad