Modernized ebuild and fixed parallel make issue (fixes bug #298208).

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

4 files changed, 165 insertions, 12 deletions

diff --git a/sci-mathematics/otter/ChangeLog b/sci-mathematics/otter/ChangeLog
index 297f671acbf1..f5b97429901b 100644
--- a/sci-mathematics/otter/ChangeLog
+++ b/sci-mathematics/otter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/otter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/otter/ChangeLog,v 1.12 2010/01/02 18:20:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/otter/ChangeLog,v 1.13 2010/01/13 02:29:46 markusle Exp $
+
+*otter-3.3-r2 (13 Jan 2010)
+
+  13 Jan 2010; Markus Dittrich <markusle@gentoo.org> +otter-3.3-r2.ebuild,
+  +files/otter-3.3-build.patch:
+  Modernized ebuild and fixed parallel make issue (fixes bug #298208).
+  Thanks much to Kacper Kowalik for his patches.
 
   02 Jan 2010; Christian Faulhammer <fauli@gentoo.org> otter-3.3-r1.ebuild:
   Transfer Prefix keywords
diff --git a/sci-mathematics/otter/Manifest b/sci-mathematics/otter/Manifest
index b527ba6b3cd9..54caa184b074 100644
--- a/sci-mathematics/otter/Manifest
+++ b/sci-mathematics/otter/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX otter-3.3-build.patch 3072 RMD160 901d9b65655df6055d40c09b73acf42398b2e80e SHA1 9bd742281d887bf2dd5edc5e7ecbf2914d4fbea3 SHA256 03f1adfca5d49f0bb3d688e8b68341242213d1213e50697eda9c0cc85a7c6bca
 DIST otter-3.3.tar.gz 2809092 RMD160 160bd64bb799daf7d7c658b28c4fba7ca6d118fa SHA1 b02a6be1fa1c4f30be2327450f5af21812f03b50 SHA256 40d7399e96491bcdabce1427c58945b3cfa414e1cefb8edae7bbea02dd6c0249
 EBUILD otter-3.3-r1.ebuild 832 RMD160 c17f5b547813a406ab8fc3ea4819e0a5b6d81e33 SHA1 9b3f2059218a42c1133038ed13f8bcf7f932ff9e SHA256 8c927b257d4b2aed8b5c709079df29b869dc82b0b16bc50c4217c87f4fc3f54e
-MISC ChangeLog 2838 RMD160 e8c04cbe4181d99ce247e49fe005f7109e18c6c8 SHA1 cf0b328ec1e51b1a290d04bb496878c7cc7c6fa8 SHA256 4f038fd31562bc2d3d274fddf3538a070dc1036ed34c592fba07fbd415ff4ee2
+EBUILD otter-3.3-r2.ebuild 1096 RMD160 3358e4c52b96b0878bc8133d7eee3fdfcb47a38f SHA1 9c49b8d21a0b7ea7e5246d3b7a30dd50c89f58a2 SHA256 a07c5265b61998400afe673372edb2b5cab07f64628c62c4126a2374f5183fab
+MISC ChangeLog 3098 RMD160 f1792ea88b0ac9c6fb2a05d5da14f3cf46c080d9 SHA1 dc178a5d238b061da5beede6ea61d1248d3af9ca SHA256 990908f8c82af1c21dc3a4db979d01f180fcd8b82024e16e78a83b12124d3d53
 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks/jmoACgkQNQqtfCuFneNMbwCfbf0ZX5v8xDfBMwXbxVbQNsax
-/HUAn2V+MLeu4LSBctkSpKoGwGrGq2hZ
-=U7fW
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/otter/files/otter-3.3-build.patch b/sci-mathematics/otter/files/otter-3.3-build.patch
new file mode 100644
index 000000000000..b933d86252d6
--- /dev/null
+++ b/sci-mathematics/otter/files/otter-3.3-build.patch
@@ -0,0 +1,114 @@
+diff -Naur otter-3.3/mace2/Makefile otter-3.3.new/mace2/Makefile
+--- otter-3.3/mace2/Makefile	2003-08-06 10:18:09.000000000 -0400
++++ otter-3.3.new/mace2/Makefile	2010-01-12 19:41:44.000000000 -0500
+@@ -1,8 +1,8 @@
+ DFLAGS = -DTP_NAMES -DTP_SIGNAL -DTP_RUSAGE
+ 
+-CC = gcc
++#CC = gcc
+ 
+-CFLAGS = -O $(DFLAGS)
++CFLAGS += $(DFLAGS)
+ 
+ # CFLAGS = -g $(DFLAGS)
+ 
+@@ -12,20 +12,17 @@
+ OBJECTS = clock.o avail.o opts.o stats.o miscellany.o flatten.o\
+ 	dp.o generate.o print.o part.o
+ 
+-all: mace2 anldp install clean
++all: mace2 anldp 
+ 
+ mace2: mace2.o $(OBJECTS)
+-	$(CC) $(CFLAGS) mace2.o $(OBJECTS) ../source/libotter.a -o mace2 
++	$(CC) $(CFLAGS) $(LDFLAGS) mace2.o $(OBJECTS) ../source/libotter.a -o ../bin/mace2 
+ 
+ anldp: anldp.o $(OBJECTS)
+-	$(CC) $(CFLAGS) anldp.o $(OBJECTS) ../source/libotter.a -o anldp 
++	$(CC) $(CFLAGS) $(LDFLAGS) anldp.o $(OBJECTS) ../source/libotter.a -o ../bin/anldp 
+ 
+ mace2.o anldp.o $(OBJECTS): Mace2.h Clock.h Avail.h Opts.h Stats.h\
+ 	Miscellany.h Dp.h Generate.h Flatten.h Part.h
+ 
+-install:
+-	/bin/mv mace2 anldp ../bin
+-
+ clean:
+ 	/bin/rm -f *.o
+ 
+diff -Naur otter-3.3/source/Makefile otter-3.3.new/source/Makefile
+--- otter-3.3/source/Makefile	2003-08-06 21:48:29.000000000 -0400
++++ otter-3.3.new/source/Makefile	2010-01-12 19:58:16.000000000 -0500
+@@ -66,7 +66,7 @@
+ # Specify the C compiler.  I recommend gcc (GNU C Compiler) if you have it.
+ # In many Linux environments, cc is just a symlink to gcc.
+ 
+-CC = gcc
++#CC = gcc
+ 
+ #############################################################################
+ #
+@@ -74,7 +74,7 @@
+ #
+ # optimized
+ 
+-CFLAGS = -O $(DFLAGS)
++CFLAGS += $(DFLAGS)
+ 
+ #
+ # check for strict ANSI conformance with Solaris cc:
+@@ -108,19 +108,20 @@
+ 
+ #############################################################################
+ 
+-all: otter install clean
++all: formed
++
++formed: otter
++	+make -C formed clean
++	+make -C formed
+ 
+ otter: main.o libotter.a
+-	$(CC) $(CFLAGS) main.o libotter.a -o otter
++	$(CC) $(CFLAGS) $(LDFLAGS) main.o libotter.a -o ../bin/otter
+ 
+ libotter.a: $(OBJECTS)
+ 	$(AR) rs libotter.a $(OBJECTS)
+ 
+ main.o $(OBJECTS): header.h types.h macros.h cos.h proto.h foreign.h lisp.h
+ 
+-install:
+-	/bin/mv otter ../bin
+-
+ clean:
+ 	/bin/rm -f *.o
+ 
+diff -Naur otter-3.3/source/formed/Makefile otter-3.3.new/source/formed/Makefile
+--- otter-3.3/source/formed/Makefile	2003-07-21 15:34:44.000000000 -0400
++++ otter-3.3.new/source/formed/Makefile	2010-01-12 19:37:46.000000000 -0500
+@@ -1,14 +1,14 @@
+ 
+ DFLAGS = -DTP_NAMES -DTP_SIGNAL -DTP_FORK -DTP_RUSAGE
+ 
+-CC = gcc
++#CC = gcc
+ 
+ #############################################################################
+ # Specify the compiler flags; include DFLAGS (above)
+ #
+ # optimized
+ 
+-CFLAGS = -O $(DFLAGS)
++CFLAGS += $(DFLAGS)
+ 
+ #
+ # save symbols for debuggers
+@@ -40,7 +40,7 @@
+ XLIBS = -L/usr/X11R6/lib -lXaw 
+ 
+ formed: formed.o display.o callback.o
+-	$(CC) $(CFLAGS) formed.o display.o callback.o \
++	$(CC) $(CFLAGS) $(LDFLAGS) formed.o display.o callback.o \
+ 	../libotter.a $(XLIBS) -o formed
+ 
+ display.o callback.o formed.o: formed.h
diff --git a/sci-mathematics/otter/otter-3.3-r2.ebuild b/sci-mathematics/otter/otter-3.3-r2.ebuild
new file mode 100644
index 000000000000..bc683123880c
--- /dev/null
+++ b/sci-mathematics/otter/otter-3.3-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/otter/otter-3.3-r2.ebuild,v 1.1 2010/01/13 02:29:46 markusle Exp $
+
+EAPI="2"
+inherit eutils
+
+DESCRIPTION="An Automated Deduction System."
+SRC_URI="http://www-unix.mcs.anl.gov/AR/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www-unix.mcs.anl.gov/AR/otter/"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+LICENSE="otter"
+SLOT="0"
+IUSE=""
+DEPEND="virtual/libc"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	cd source
+	CC=$(tc-getCC) emake || die "emake failed"
+	cd "${S}"/mace2
+	CC=$(tc-getCC) emake || die "emake in mace2 failed"
+}
+
+src_install() {
+	dobin bin/* source/formed/formed \
+		|| die "failed to install binaries"
+	dodoc README* Legal Changelog Contents \
+		|| die "failed to install regular docs"
+	insinto /usr/share/doc/${PF}
+	doins documents/*.pdf \
+		|| die "failed to install pdf docs"
+	insinto /usr/share/${PN}/
+	doins -r examples examples-mace2 \
+		|| die "failed to install examples"
+}