Version bump. Rewrote from scratch. Closing bug #324561 and bug #335468.

(Portage version: 2.1.9.42/cvs/Linux x86_64)

4 files changed, 105 insertions, 30 deletions

diff --git a/sci-libs/scotch/files/Makefile.inc b/sci-libs/scotch/files/Makefile.inc
deleted file mode 100644
index 7285c467983b..000000000000
--- a/sci-libs/scotch/files/Makefile.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-EXE	=
-LIB	= .a
-OBJ	= .o
-
-MAKE	= make
-AR	= ar
-ARFLAGS	= -ruv
-CAT	= cat
-CC	= gcc
-CCP     = mpicc
-CFLAGS	= -g -O3 -I. -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD
-LDFLAGS	=  -lz -lm -lrt
-CP	= cp
-LEX	= flex
-LN     = ln
-MKDIR  = mkdir
-MV	= mv
-RANLIB	= ranlib
-YACC	= bison -y
diff --git a/sci-libs/scotch/files/Makefile.inc.in b/sci-libs/scotch/files/Makefile.inc.in
new file mode 100644
index 000000000000..85e3b6be6785
--- /dev/null
+++ b/sci-libs/scotch/files/Makefile.inc.in
@@ -0,0 +1,19 @@
+EXE	=
+LIB	= .a
+OBJ	= .o
+
+AR	= @AR@
+ARFLAGS	= -ruv
+CAT	= cat
+CCS	= @CC@
+CCP     = mpicc
+CCD     = @CC@
+CFLAGS	= @CFLAGS@ $(PICFLAGS) -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME
+LIBS	= -lz -lm -lrt
+CP	= cp
+LEX	= flex
+LN	= ln
+MKDIR	= mkdir
+MV	= mv
+RANLIB	= @RANLIB@
+YACC	= bison -y
diff --git a/sci-libs/scotch/files/mmkt-typo.patch b/sci-libs/scotch/files/mmkt-typo.patch
deleted file mode 100644
index a3371739cbc0..000000000000
--- a/sci-libs/scotch/files/mmkt-typo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scotch-5.1.6.dfsg.orig/src/libscotch/library_graph_io_mmkt_f.c	2008-03-14 18:15:59.000000000 +0000
-+++ scotch-5.1.6.dfsg/src/libscotch/library_graph_io_mmkt_f.c	2008-07-21 15:12:48.000000000 +0000
-@@ -121,7 +121,7 @@
- */
- 
- FORTRAN (                                             \
--SCOTCHFGRAPHGEOMSAVEMMKT, scotchfgraphgeomsavechac, ( \
-+SCOTCHFGRAPHGEOMSAVEMMKT, scotchfgraphgeomsavemmkt, ( \
- const SCOTCH_Graph * const  grafptr,                  \
- const SCOTCH_Geom * const   geomptr,                  \
- const int * const           filegrfptr,               \
diff --git a/sci-libs/scotch/files/respect-ldflags.patch b/sci-libs/scotch/files/respect-ldflags.patch
new file mode 100644
index 000000000000..74860051c6ee
--- /dev/null
+++ b/sci-libs/scotch/files/respect-ldflags.patch
@@ -0,0 +1,86 @@
+diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile
+--- src.orig/esmumps/Makefile	2011-03-04 21:33:24.000000000 +0000
++++ src/esmumps/Makefile	2011-03-04 23:38:01.000000000 +0000
+@@ -44,7 +44,7 @@
+ 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
+ 
+ %$(EXE)	:	%.c
+-		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit
++		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
+ 
+ ##
+ ##  Project rules.
+@@ -57,9 +57,10 @@
+ 					libesmumps$(LIB)							\
+ 					main_esmumps$(EXE)
+ 
+-ptscotch			:	clean
++ptscotch			:	clean common.h
++					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
++					 libesmumps$(LIB);
+ 					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
+-					libesmumps$(LIB)										\
+ 					main_esmumps$(EXE)
+ 
+ install				:
+diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile
+--- src.orig/libscotch/Makefile	2011-03-04 21:33:24.000000000 +0000
++++ src/libscotch/Makefile	2011-03-04 21:55:27.000000000 +0000
+@@ -43,7 +43,7 @@
+ 				$(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@)
+ 
+ %$(EXE)	:	%.c
+-		 		$(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
++		 		$(CC) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
+ 
+ ##
+ ##  Project rules.
+@@ -2515,7 +2515,7 @@
+ 					mapping.h				\
+ 					order.h					\
+ 					parser.h
+-			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
++			 		$(CCD) $(CFLAGS) $(LDLFAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LIBS)
+ 
+ scotch.h			:	dummysizes$(EXE)			\
+ 					library.h
+diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile
+--- src.orig/libscotchmetis/Makefile	2011-03-04 21:33:24.000000000 +0000
++++ src/libscotchmetis/Makefile	2011-03-04 21:56:06.000000000 +0000
+@@ -44,7 +44,7 @@
+ 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
+ 
+ %$(EXE)	:	%.c
+-		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS)
++		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) $(LIBS) -o $(@)
+ 
+ ##
+ ##  Project rules.
+diff -Nur src.orig/scotch/Makefile src/scotch/Makefile
+--- src.orig/scotch/Makefile	2011-03-04 21:33:24.000000000 +0000
++++ src/scotch/Makefile	2011-03-04 21:58:59.000000000 +0000
+@@ -41,13 +41,13 @@
+ include ../Makefile.inc
+ 
+ %$(EXE)	:	%$(OBJ)
+-		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
++		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
+ 
+ %$(OBJ)	:	%.c
+ 				$(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
+ 
+ %$(EXE)	:	%.c
+-		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
++		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
+ 
+ ##
+ ##  Project rules.
+@@ -314,7 +314,7 @@
+ 					gout_o.c				\
+ 					$(includedir)/scotch.h			\
+ 					$(libdir)/libscotch$(LIB)
+-					$(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
++					$(CC) $(CFLAGS) $(LDFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@)
+ 
+ gpart$(EXE)			:	gmap$(EXE)
+ 					-$(RM) gpart$(EXE)