Version Bump, #250655

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 98 insertions, 83 deletions

diff --git a/dev-lang/maude/ChangeLog b/dev-lang/maude/ChangeLog
index 03555a833931..2b418b3a1aaf 100644
--- a/dev-lang/maude/ChangeLog
+++ b/dev-lang/maude/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/maude
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/ChangeLog,v 1.13 2009/09/23 16:52:13 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/ChangeLog,v 1.14 2010/06/23 14:24:31 jlec Exp $
+
+*maude-2.5.0 (23 Jun 2010)
+
+  23 Jun 2010; Justin Lecher <jlec@gentoo.org> -maude-2.1.1-r2.ebuild,
+  maude-2.3.0.ebuild, +maude-2.5.0.ebuild, +files/maude-2.5.0-prll.patch:
+  Version Bump, #250655
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> maude-2.1.1-r2.ebuild:
   Remove virtual/libc
diff --git a/dev-lang/maude/files/maude-2.5.0-prll.patch b/dev-lang/maude/files/maude-2.5.0-prll.patch
new file mode 100644
index 000000000000..5499af3eb764
--- /dev/null
+++ b/dev-lang/maude/files/maude-2.5.0-prll.patch
@@ -0,0 +1,24 @@
+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/maude-2.1.1-r2.ebuild b/dev-lang/maude/maude-2.1.1-r2.ebuild
deleted file mode 100644
index fdcced2e8c08..000000000000
--- a/dev-lang/maude/maude-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 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.6 2009/09/23 16:52:13 patrick Exp $
-
-inherit toolchain-funcs 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="sci-libs/buddy
-	dev-libs/libtecla
-	>=dev-libs/gmp-4.1.3"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	|| ( >=sys-devel/gcc-3.4.3
-		=sys-devel/gcc-3.3* )"
-
-pkg_setup() {
-	if [ "$(gcc-version)" = "3.4" ]; then
-		if [ "$(gcc-micro-version)" -lt 3 ]; then
-			eerror "Need gcc 3.3.x or >= 3.4.3"
-			die "Wrong gcc version"
-		fi
-	fi
-}
-
-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.
-	doenvd "${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.3.0.ebuild b/dev-lang/maude/maude-2.3.0.ebuild
index c5d66a52fbf5..c0a455ae5bb0 100644
--- a/dev-lang/maude/maude-2.3.0.ebuild
+++ b/dev-lang/maude/maude-2.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.3.0.ebuild,v 1.3 2009/02/10 05:01:37 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.3.0.ebuild,v 1.4 2010/06/23 14:24:31 jlec Exp $
 
 inherit toolchain-funcs eutils versionator
 
@@ -14,7 +14,7 @@ SRC_URI="http://maude.cs.uiuc.edu/download/current/${MY_PN}-${MY_PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="doc"
 
diff --git a/dev-lang/maude/maude-2.5.0.ebuild b/dev-lang/maude/maude-2.5.0.ebuild
new file mode 100644
index 000000000000..b80b8825ba99
--- /dev/null
+++ b/dev-lang/maude/maude-2.5.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.5.0.ebuild,v 1.1 2010/06/23 14:24:31 jlec Exp $
+
+EAPI="3"
+
+inherit autotools eutils toolchain-funcs versionator
+
+MY_PN="${PN/m/M}"
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Maude - A high-level specification language"
+HOMEPAGE="http://maude.cs.uiuc.edu/"
+SRC_URI="http://maude.cs.uiuc.edu/download/current/${MY_PN}-${MY_PV}.tar.gz
+		mirror://gentoo/${P}-extras.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="doc"
+
+RDEPEND="
+	>=dev-libs/gmp-4.1.3
+	dev-libs/libsigsegv
+	dev-libs/libtecla
+	sci-libs/buddy"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}"/${MY_PN}-${MY_PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-prll.patch
+	eautoreconf
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+
+	insinto /usr/share/${PN}
+	doins -r src/Main/*.maude \
+		|| die "failed to install data files"
+
+	# Sets the full maude library path.
+	doenvd "${FILESDIR}"/23maude || die
+
+	# install full maude
+	cd "${WORKDIR}"/${P}-extras
+	doins full-maude.maude || die
+
+	# install docs and examples
+	if use doc; then
+		insinto /usr/share/doc/${P}
+		doins -r pdfs/*  || die "failed to install pdf files"
+
+		insinto /usr/share/${PN}/
+		doins -r manual-examples primer-examples \
+			|| die "failed to install example files"
+	fi
+}