commit:     026f729e9c13dcc76ea0f43d97342b1164a7271e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 11 20:04:30 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 20:04:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=026f729e

dev-lang/maude: Version bump to 2.7

Gentoo-Bug: 540210
* EAPI=6
* Remove 'autotools-utils.eclass'
* Add patch from Debian to fix Bison bug

Package-Manager: portage-2.2.27

 dev-lang/maude/Manifest                            |  1 +
 .../maude/files/maude-2.7-bison-parse-param.patch  | 39 ++++++++++++++
 dev-lang/maude/maude-2.7.ebuild                    | 59 ++++++++++++++++++++++
 3 files changed, 99 insertions(+)

diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest
index 5568f9f..c2855e4 100644
--- a/dev-lang/maude/Manifest
+++ b/dev-lang/maude/Manifest
@@ -1,2 +1,3 @@
 DIST Maude-2.6.tar.gz 1600026 SHA256 
a5ba79bf3d30565c874e80b3531b51a7e835b600e86cac82508a6eb9e15f4aa0 SHA512 
3931a540f72acdf2de532eff7b55ba4c9496b38a4b036f4e37d16b860f87728d6df5b9e377fd3489e55f7c369bca5eb9cded9b7a75032c410eff9a6e85da3fab
 WHIRLPOOL 
9bc2011cb167ac5a451fc043fcaccbbfbfb5cb71bbb804021c7286a6f315d8c6778b6a385c5c6e5566db18051e8c817f93f099f39e3077bd414b83cc8e78be9b
+DIST Maude-2.7.tar.gz 1663708 SHA256 
f5da81556c3180aee6a9cf4cef2f0b9bb2ff3b7fcc7bb103cb4ac3f5770b2b89 SHA512 
eb5225a7ec75df5f79d1e9c0d78c33427c0cf07bea83dae9e559d6d4cfc85fb03985596daf0c9c8794b34859510482f93b855254c1a3c650ee7520a3530a2070
 WHIRLPOOL 
252b51f303e7d5d22226bbfa96e8a62bd94bccc92403f40fce990ce6d0e3e57305b9f823ef3cf5f43f4386a4ce326032c7c17e47a0a4ad8bf86538e2e1435fa3
 DIST maude-2.6-extras.tar.xz 3157004 SHA256 
64cd72026c345ff1c1edeca64f9a9fce8067e6df5eccdaeee4bfe7a0f07d3102 SHA512 
0533f0f226057d2668052f360245f296d36129ec242ff0bfa91fada9db5bc347d276d3468c86fbac92f019f3a2f152c7cb4e58a7f1265c1fb5a8b1b496fac5cd
 WHIRLPOOL 
7a5ea0bf49132ecb3b88f26432c8aedb7ce2f9632f4e9cbb5fa08ab36b65c9a165d58e4a880e8ea97eff91280e28fb01e224a61539b73b898f3e9b4cba34ce44

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
new file mode 100644
index 0000000..2aa77f0
--- /dev/null
+++ b/dev-lang/maude/files/maude-2.7-bison-parse-param.patch
@@ -0,0 +1,39 @@
+Author: Jakub Wilk <jw...@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/maude-2.7.ebuild b/dev-lang/maude/maude-2.7.ebuild
new file mode 100644
index 0000000..b48d92e
--- /dev/null
+++ b/dev-lang/maude/maude-2.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools versionator
+
+MYP="${PN/m/M}-$(get_version_component_range 1-2)"
+
+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/${MYP}.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=
+       dev-libs/libsigsegv
+       dev-libs/libtecla
+       sci-libs/buddy"
+DEPEND="${RDEPEND}
+       sys-devel/bison
+       sys-devel/flex"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-2.5.0-prll.patch"
+       "${FILESDIR}/${PN}-2.6-search-datadir.patch"
+       "${FILESDIR}/${PN}-2.7-bison-parse-param.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 "${WORKDIR}"/${PN}-2.6-extras/pdfs/*
+       if use examples; then
+               insinto /usr/share/doc/${PF}/examples
+               doins -r "${WORKDIR}"/${PN}-2.6-extras/{manual,primer}-examples
+       fi
+}

Reply via email to