Version bump (see bug #128066).

(Portage version: 2.1.2_rc1-r5)

4 files changed, 155 insertions, 2 deletions

diff --git a/sci-mathematics/Macaulay2/ChangeLog b/sci-mathematics/Macaulay2/ChangeLog
index 0d73703105d8..0ac07e2d1842 100644
--- a/sci-mathematics/Macaulay2/ChangeLog
+++ b/sci-mathematics/Macaulay2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/Macaulay2
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.5 2005/03/23 16:19:35 seemant Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/ChangeLog,v 1.6 2006/11/12 20:11:09 markusle Exp $
+
+*Macaulay2-0.9.95 (12 Nov 2006)
+
+  12 Nov 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/Macaulay2-0.9.95-etags-gentoo.patch, +Macaulay2-0.9.95.ebuild:
+  Version bump (see bug #128066).
 
   23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> Macaulay2-0.9.2.ebuild:
   change dep from net-www/mozilla to www-client/mozilla
diff --git a/sci-mathematics/Macaulay2/Macaulay2-0.9.95.ebuild b/sci-mathematics/Macaulay2/Macaulay2-0.9.95.ebuild
new file mode 100644
index 000000000000..b8e9e4e21046
--- /dev/null
+++ b/sci-mathematics/Macaulay2/Macaulay2-0.9.95.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/Macaulay2/Macaulay2-0.9.95.ebuild,v 1.1 2006/11/12 20:11:09 markusle Exp $
+
+inherit eutils flag-o-matic toolchain-funcs autotools
+
+IUSE=""
+
+DESCRIPTION="research tool for commutative algebra and algebraic geometry"
+SRC_URI="http://www.math.uiuc.edu/Macaulay2/Downloads/${P}-src.tar.gz
+	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Factory/factory-3-0-2.tar.gz \
+	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/Libfac/libfac-3-0-2.tar.gz"
+
+HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND="sys-libs/gdbm
+	dev-libs/gmp
+	dev-libs/ntl
+	dev-libs/boehm-gc
+	virtual/blas
+	virtual/lapack
+	dev-util/ctags
+	sys-libs/ncurses"
+
+src_compile() {
+	epatch "${FILESDIR}"/${P}-etags-gentoo.patch
+
+	cd ${WORKDIR}/factory
+	econf --enable-NTL --prefix=${WORKDIR} || \
+		die "failed to configure factory"
+	emake || die "failed to build factory"
+	make install || die "failed to install factory"
+
+	cd ${WORKDIR}/libfac
+	CPPFLAGS="-I${WORKDIR}/include" ./configure --with-NOSTREAMIO \
+		--prefix=${WORKDIR} || die "failed to configure libfac"
+	make DEFS=-DHAVE_SINGULAR_ERROR || die "failed to build libfac"
+	make install || die "failed to install libfac"
+
+	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
+	cd ${WORKDIR}/${P}
+	sed -e "/^docm2RelDir/s:Macaulay2:${P}:" \
+		-i include/config.Makefile.in || \
+		die "failed to fix makefile"
+	make && CPPFLAGS="-I/usr/include/gc -I${WORKDIR}/include" \
+		LDFLAGS="-L${WORKDIR}/lib" \
+		./configure --prefix="${D}/usr" --disable-encap \
+		--with-lapacklibs="-llapack -lblas" || \
+		die "failed to configure Macaulay"
+	# fix install paths
+	make || die "failed to build Macaulay"
+}
+
+src_test() {
+	cd ${WORKDIR}/Macaulay2-0.9.2
+	make -k check || die "tests failed"
+}
+
+src_install () {
+	cd ${WORKDIR}/Macaulay2-0.9.2
+	make install || die "install failed"
+}
diff --git a/sci-mathematics/Macaulay2/files/Macaulay2-0.9.95-etags-gentoo.patch b/sci-mathematics/Macaulay2/files/Macaulay2-0.9.95-etags-gentoo.patch
new file mode 100644
index 000000000000..47e97185854d
--- /dev/null
+++ b/sci-mathematics/Macaulay2/files/Macaulay2-0.9.95-etags-gentoo.patch
@@ -0,0 +1,72 @@
+diff -Naur Macaulay2-0.9.95/Macaulay2/c/Makefile.in Macaulay2-0.9.95-new/Macaulay2/c/Makefile.in
+--- Macaulay2-0.9.95/Macaulay2/c/Makefile.in	2006-07-06 11:16:05.000000000 -0400
++++ Macaulay2-0.9.95-new/Macaulay2/c/Makefile.in	2006-11-11 10:13:07.000000000 -0500
+@@ -30,7 +30,7 @@
+ ############################## tags
+ all :: tags
+ tags : @srcdir@/TAGS
+-@srcdir@/TAGS: $(SRCFILES); cd @srcdir@ && etags $(SRCFILES)
++@srcdir@/TAGS: $(SRCFILES); cd @srcdir@ && exuberant-ctags $(SRCFILES)
+ ############################## cleaning
+ clean :
+ 	rm -f *.o scc1 scc.a grammar.output grammar.tab.h \
+diff -Naur Macaulay2-0.9.95/Macaulay2/d/Makefile.in Macaulay2-0.9.95-new/Macaulay2/d/Makefile.in
+--- Macaulay2-0.9.95/Macaulay2/d/Makefile.in	2006-07-15 18:35:12.000000000 -0400
++++ Macaulay2-0.9.95-new/Macaulay2/d/Makefile.in	2006-11-11 10:13:07.000000000 -0500
+@@ -314,7 +314,7 @@
+ tags: @srcdir@/TAGS
+ clean::; rm -f TAGS @srcdir@/TAGS
+ @srcdir@/TAGS: Makefile $(SRCFILES)
+-	cd @srcdir@ && etags $(shell ../util/echoout -r $(SRCFILES))
++	cd @srcdir@ && exuberant-ctags $(shell ../util/echoout -r $(SRCFILES))
+ 
+ clean ::; rm -f *.log a.out *.o *.sym *.a *.oo *.sig *.sg *.dep *.dp core gmon.out mapfile restart.tmp
+ distclean : clean; rm -f Makefile
+diff -Naur Macaulay2-0.9.95/Macaulay2/dumpdata/Makefile.in Macaulay2-0.9.95-new/Macaulay2/dumpdata/Makefile.in
+--- Macaulay2-0.9.95/Macaulay2/dumpdata/Makefile.in	2006-05-30 15:16:42.000000000 -0400
++++ Macaulay2-0.9.95-new/Macaulay2/dumpdata/Makefile.in	2006-11-11 10:13:07.000000000 -0500
+@@ -14,7 +14,7 @@
+ gdb: checkit; gdb checkit
+ all:: tags
+ tags: @srcdir@/TAGS
+-@srcdir@/TAGS: Makefile @srcdir@/*.h @srcdir@/*.c ; cd @srcdir@ && etags *.h *.c
++@srcdir@/TAGS: Makefile @srcdir@/*.h @srcdir@/*.c ; cd @srcdir@ && exuberant-ctags *.h *.c
+ clean::; rm -f *.o checkit core check-data *.a libdump.a
+ EXTRAOBJS :=
+ # EXTRAOBJS += mmap.o
+diff -Naur Macaulay2-0.9.95/Macaulay2/e/Makefile.in Macaulay2-0.9.95-new/Macaulay2/e/Makefile.in
+--- Macaulay2-0.9.95/Macaulay2/e/Makefile.in	2006-06-20 16:26:04.000000000 -0400
++++ Macaulay2-0.9.95-new/Macaulay2/e/Makefile.in	2006-11-11 10:13:07.000000000 -0500
+@@ -71,7 +71,7 @@
+ 		 @srcdir@/linalgGB/*.hpp @srcdir@/linalgGB/*.cpp \
+ 		 @srcdir@/f4/*.hpp @srcdir@/f4/*.cpp \
+ 		 statuscodes
+-	cd @srcdir@ && etags $(patsubst @srcdir@/%, %, $^)
++	cd @srcdir@ && exuberant-ctags $(patsubst @srcdir@/%, %, $^)
+ 
+ # the target 'initialize' is used by the Makefile in the parent directory
+ initialize all :: $(addsuffix .hpp, $(GENERATED_H))
+diff -Naur Macaulay2-0.9.95/Macaulay2/html-check-links/Makefile.in Macaulay2-0.9.95-new/Macaulay2/html-check-links/Makefile.in
+--- Macaulay2-0.9.95/Macaulay2/html-check-links/Makefile.in	2004-04-03 14:43:21.000000000 -0500
++++ Macaulay2-0.9.95-new/Macaulay2/html-check-links/Makefile.in	2006-11-11 10:13:07.000000000 -0500
+@@ -34,7 +34,7 @@
+ ifneq ($(DEPENDS),no)
+ include $(CFILES:.c=.dep)
+ endif
+-TAGS: $(SRC); etags $^
++TAGS: $(SRC); exuberant-ctags $^
+ lex.o : grammar.fixed.c
+ clean:; rm -f	*.o html-check-links *.dep y.tab.h lex.yy.c TAGS y.output \
+ 		core grammar.c grammar.tab.* lex.c grammar.fixed.* grammar.output
+diff -Naur Macaulay2-0.9.95/Macaulay2/regex/Makefile.in Macaulay2-0.9.95-new/Macaulay2/regex/Makefile.in
+--- Macaulay2-0.9.95/Macaulay2/regex/Makefile.in	2005-08-08 14:06:05.000000000 -0400
++++ Macaulay2-0.9.95-new/Macaulay2/regex/Makefile.in	2006-11-11 10:13:07.000000000 -0500
+@@ -33,7 +33,7 @@
+ 	@ echo " ** creating $@ from $<"
+ 	@ $(CC)  -MM $(CPPFLAGS) $< >$*-tmp.dep && <$*-tmp.dep sed 's/\($*\)\.o[ :]*/\1.o $@ : /' >$@ && rm $*-tmp.dep
+ 
+-@srcdir@/TAGS: $(CFILES); cd @srcdir@ && etags $(CFILES)
++@srcdir@/TAGS: $(CFILES); cd @srcdir@ && exuberant-ctags $(CFILES)
+ DEPENDS = yes
+ ifeq "$(DEPENDS)" "yes"
+ include $(CFILES:.c=.dep) $(CCFILES:.cpp=.dep)
diff --git a/sci-mathematics/Macaulay2/files/digest-Macaulay2-0.9.95 b/sci-mathematics/Macaulay2/files/digest-Macaulay2-0.9.95
new file mode 100644
index 000000000000..0a31d1cb256d
--- /dev/null
+++ b/sci-mathematics/Macaulay2/files/digest-Macaulay2-0.9.95
@@ -0,0 +1,9 @@
+MD5 83a7a7fbfa0bc016cc2525cc0f221694 Macaulay2-0.9.95-src.tar.gz 2875836
+RMD160 f3c5ad889e89d238ca3ede40e692bc42744861a8 Macaulay2-0.9.95-src.tar.gz 2875836
+SHA256 3fd4698d82de76a8356d24dfdba2775794231b5723ee3fda232ce2f0d1e6360a Macaulay2-0.9.95-src.tar.gz 2875836
+MD5 9b1fac924bc754339989d617946ea8c4 factory-3-0-2.tar.gz 503712
+RMD160 3cfaa7e438af75fb1c00501099c0d6c88fbfdd8b factory-3-0-2.tar.gz 503712
+SHA256 463a29232f9e187014bd53bb726cf1628f929ee830fa63d445dcc9a45403d8ed factory-3-0-2.tar.gz 503712
+MD5 d94415a24186bfd4bdb6df491a58d173 libfac-3-0-2.tar.gz 87369
+RMD160 847103ae3fcc870188630028965086c3933a2009 libfac-3-0-2.tar.gz 87369
+SHA256 3fae688d7471e137834e9f89e5677e2ded4d578942b54ce7efa536817799fa74 libfac-3-0-2.tar.gz 87369