Compiles with gcc 3.4 after some gcc bugfixing, see bug #64666

6 files changed, 94 insertions, 66 deletions

diff --git a/dev-lang/maude/ChangeLog b/dev-lang/maude/ChangeLog
index 5795900a3b63..4b2d1bf7df7d 100644
--- a/dev-lang/maude/ChangeLog
+++ b/dev-lang/maude/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-lang/maude
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/ChangeLog,v 1.5 2004/08/30 16:25:25 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/ChangeLog,v 1.6 2004/10/11 06:44:25 phosphan Exp $
+
+*maude-2.1.1-r2 (11 Oct 2004)
+
+  11 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +files/2.1.1-gcc3.4.patch, +maude-2.1.1-r2.ebuild, -maude-2.1.ebuild:
+  Much better patch provided by Steven Eker. Thanks!
+
+*maude-2.1.1-r1 (04 Oct 2004)
+
+  04 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> +maude-2.1.1-r1.ebuild,
+  -maude-2.1.ebuild:
+  Patched for gcc 3.4, but still masked - current gcc does not yet have
+  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17259
+  fixed. Should work with gcc 3.4.3.
 
   30 Aug 2004; David Holm <dholm@gentoo.org> maude-2.1.1.ebuild:
   Added to ~ppc.
diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest
index c14f5fa620a5..f97e17b9928c 100644
--- a/dev-lang/maude/Manifest
+++ b/dev-lang/maude/Manifest
@@ -1,7 +1,10 @@
-MD5 10bb2d231f18df6952ff9e0834cce0d2 ChangeLog 814
-MD5 b94a55681beda4451273757cca420db5 maude-2.1.ebuild 1485
-MD5 40e5ec90608b2221625c50399a8f1f5a metadata.xml 612
+MD5 abbb01a22ac9b8885862efc279ee18df maude-2.1.1-r1.ebuild 1501
 MD5 4189ecedff941949354e55b06e83d0af maude-2.1.1.ebuild 1324
+MD5 2b8693ff4d2a5e46f26a92d72cc497f5 maude-2.1.1-r2.ebuild 1450
+MD5 b0611c4c069740269135183dbf663ac0 ChangeLog 1105
+MD5 40e5ec90608b2221625c50399a8f1f5a metadata.xml 612
 MD5 ef113f0269722dd261f4d017bdda4127 files/23maude 27
-MD5 694819c2b6d60c1350e72b9ee725bff8 files/digest-maude-2.1 311
+MD5 d095ff8ee883a707b0783c6f8e47c789 files/digest-maude-2.1.1-r1 209
+MD5 5fdcf01ac8efe5c12f7fb581494b2b5f files/digest-maude-2.1.1-r2 138
+MD5 fd79afe5e64ae842aa9be90a1b056d25 files/2.1.1-gcc3.4.patch 7809
 MD5 5fdcf01ac8efe5c12f7fb581494b2b5f files/digest-maude-2.1.1 138
diff --git a/dev-lang/maude/files/digest-maude-2.1 b/dev-lang/maude/files/digest-maude-2.1
deleted file mode 100644
index 8c856b334e80..000000000000
--- a/dev-lang/maude/files/digest-maude-2.1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 afbd5f7764e6b3d8219818ce063e54c6 Maude-2.1.tar.gz 1167277
-MD5 c41729cccc07c71aaecdd0d360324bf4 full-maude.maude 531827
-MD5 f5988a7eaeab4108512a7c8a99157018 maude-manual.pdf 1406186
-MD5 43c0cd169496f87e0399f6110f5053b2 maude-manual.ps 5019442
-MD5 0fbf15aa89fb8907b4568e57935ceed4 maude-examples.tar.gz 12634
diff --git a/dev-lang/maude/files/digest-maude-2.1.1-r2 b/dev-lang/maude/files/digest-maude-2.1.1-r2
new file mode 100644
index 000000000000..4bb2bf00aab9
--- /dev/null
+++ b/dev-lang/maude/files/digest-maude-2.1.1-r2
@@ -0,0 +1,2 @@
+MD5 36defbee8ea213ea5c1a8ab8d3728767 maude-2.1.1.tar.bz2 874308
+MD5 d5c3d8ed35ec65be3253897d9b4c135a maude-full-doc-2.1.1.tar.bz2 3047855
diff --git a/dev-lang/maude/maude-2.1.1-r2.ebuild b/dev-lang/maude/maude-2.1.1-r2.ebuild
new file mode 100644
index 000000000000..1113f80f452f
--- /dev/null
+++ b/dev-lang/maude/maude-2.1.1-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.1.1-r2.ebuild,v 1.1 2004/10/11 06:44:25 phosphan Exp $
+
+inherit eutils
+
+DESCRIPTION="Maude - A high-level specification language"
+HOMEPAGE="http://maude.cs.uiuc.edu/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${PN}-full-doc-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="doc"
+
+RDEPEND="virtual/libc
+	dev-libs/buddy
+	dev-libs/libtecla
+	>=dev-libs/gmp-4.1.3
+	>=sys-devel/gcc-3.4.3"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.4.patch
+}
+
+src_compile() {
+	# econf/emake fails with a "file not found" error.
+	./configure --bindir=/usr/bin --datadir=/usr/share/${PN} || die
+	make || die
+}
+
+src_install() {
+	make install DESTDIR=${D}
+	dodoc AUTHORS ChangeLog NEWS README
+
+	# Sets the full maude library path.
+	insinto /etc/env.d
+	doins ${FILESDIR}/23maude
+
+	cd ${WORKDIR}/${PN}-full-doc-${PV}
+
+	# Full maude library
+	insinto /usr/share/${PN}
+	doins full-maude.maude
+
+	insinto /usr/share/doc/${P}/pdf
+	doins maude-manual.pdf maude-primer.pdf
+	insinto /usr/share/doc/${P}/ps
+	doins maude-manual.ps
+
+	if use doc; then
+		insinto /usr/share/${PN}/examples
+		doins maude-examples/*
+		insinto /usr/share/${PN}/primer-examples
+		doins examples/*
+	fi
+}
+
+src_test() {
+	pwd
+	make check || die
+}
diff --git a/dev-lang/maude/maude-2.1.ebuild b/dev-lang/maude/maude-2.1.ebuild
deleted file mode 100644
index 6266f5a15cf3..000000000000
--- a/dev-lang/maude/maude-2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.1.ebuild,v 1.3 2004/07/02 04:28:16 eradicator Exp $
-
-DESCRIPTION="Maude - A high-level specification language"
-HOMEPAGE="http://maude.cs.uiuc.edu/"
-SRC_URI="http://maude.cs.uiuc.edu/download/current/Maude-${PV}.tar.gz
-		 http://maude.cs.uiuc.edu/download/current/full-maude.maude
-		 http://maude.cs.uiuc.edu/maude2-manual/maude-manual.pdf
-		 http://maude.cs.uiuc.edu/maude2-manual/maude-manual.ps
-		 http://maude.cs.uiuc.edu/maude2-manual/maude-examples.tar.gz"
-		# It's a bit scary, but they do in fact not
-		# provide these things with version numbers
-		# included!
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-
-RDEPEND="virtual/libc
-	dev-libs/buddy
-	dev-libs/libtecla
-	dev-libs/gmp"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S=${WORKDIR}/Maude-${PV}
-
-src_compile() {
-	# econf/emake fails with a "file not found" error.
-	./configure --bindir=/usr/bin --datadir=/usr/share/${PN} || die
-	make || die
-}
-
-src_install() {
-	make install DESTDIR=${D}
-
-	dodoc AUTHORS ChangeLog NEWS README
-	insinto /usr/share/doc/${P}/pdf
-	doins ${DISTDIR}/maude-manual.pdf
-	insinto /usr/share/doc/${P}/ps
-	doins ${DISTDIR}/maude-manual.ps
-
-	insinto /usr/share/${PN}
-	doins ${DISTDIR}/full-maude.maude
-
-	insinto /usr/share/${PN}/examples
-	doins ${WORKDIR}/maude-examples/*
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/23maude
-}