[gentoo-commits] proj/sci:master commit in: sci-libs/calculix-cgx/files/, sci-libs/calculix-ccx/files/, ...

[Justin Lecher]

commit:     e93aea35f5392272ade15fc3df09441cc411d457
Author:     Grégory Salvan <apieum <AT> gmail <DOT> com>
AuthorDate: Mon Mar  7 05:19:31 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 13:55:12 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e93aea35

sci-libs/calculix-ccx-2.10 sci-libs/calculix-cgx-2.10 version bump (ref #602)

 ...-ccx-2.8_p2.ebuild => calculix-ccx-2.10.ebuild} | 15 ++++++----
 ...0_Makefile_custom_cc_flags_spooles_arpack.patch | 35 ++++++++++++++++++++++
 ...7_Makefile_custom_cc_flags_spooles_arpack.patch | 31 -------------------
 .../calculix-ccx/files/01_ccx_2.7_lapack.patch     | 11 -------
 ...2_Makefile_custom_cc_flags_spooles_arpack.patch | 32 --------------------
 ...-cgx-2.7-r1.ebuild => calculix-cgx-2.10.ebuild} | 31 +++++++++----------
 ...=> 01_cgx_2.10_Makefile_custom_cxx_flags.patch} | 33 ++++++++++----------
 ...h => 02_cgx_2.10_menu_fix-freeglut_2.8.1.patch} | 35 +++++++++++-----------
 8 files changed, 93 insertions(+), 130 deletions(-)

diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild
similarity index 87%
rename from sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild
rename to sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild
index f643dc9..c9eb261 100644
--- a/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild
+++ b/sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils toolchain-funcs flag-o-matic fortran-2
 
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="arpack doc examples threads"
+IUSE="arpack doc examples openmp threads"
 
 RDEPEND="
 	arpack? ( >=sci-libs/arpack-3.1.3 )
@@ -31,9 +31,9 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/CalculiX/${MY_P}/src
 
-src_prepare (){
-	epatch "${FILESDIR}/01_${MY_P}_Makefile_custom_cc_flags_spooles_arpack.patch"
-}
+PATCHES=(
+	"${FILESDIR}/01_${MY_P}_Makefile_custom_cc_flags_spooles_arpack.patch"
+)
 
 src_configure() {
 	# Technically we currently only need this when arpack is not used.
@@ -44,6 +44,11 @@ src_configure() {
 	if use threads; then
 		append-cflags "-DUSE_MT"
 	fi
+	
+	if use openmp; then
+		append-fflags "-fopenmp"
+		append-cflags "-fopenmp"
+	fi
 
 	if use arpack; then
 		export ARPACKLIB=$($(tc-getPKG_CONFIG) --libs arpack)

diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.10_Makefile_custom_cc_flags_spooles_arpack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.10_Makefile_custom_cc_flags_spooles_arpack.patch
new file mode 100644
index 0000000..83caf80
--- /dev/null
+++ b/sci-libs/calculix-ccx/files/01_ccx_2.10_Makefile_custom_cc_flags_spooles_arpack.patch
@@ -0,0 +1,35 @@
+Fix Makefile to make it use custom CFLAGS and system libraries.
+
+diff -uwrN ccx_2.10.ORIG/src/Makefile ccx_2.10/src/Makefile
+--- src/Makefile	2016-03-07 04:57:09.462878788 +0100
++++ ccx_2.10/src/Makefile	2016-03-07 06:05:44.150786978 +0100
+@@ -1,9 +1,6 @@
+ 
+-CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
+-FFLAGS = -Wall -O3 -fopenmp
+-
+-CC=cc
+-FC=gfortran
++CFLAGS := -Wall -DARCH="Linux" -DMATRIXSTORAGE $(CFLAGS)
++FFLAGS := -Wall $(FFLAGS)
+ 
+ .c.o :
+ 	$(CC) $(CFLAGS) -c $<
+@@ -18,15 +15,10 @@
+ OCCXC = $(SCCXC:.c=.o)
+ OCCXMAIN = $(SCCXMAIN:.c=.o)
+ 
+-DIR=../../../SPOOLES.2.2
+-
+-LIBS = \
+-       $(DIR)/spooles.a \
+-	../../../ARPACK/libarpack_INTEL.a \
+-       -lpthread -lm -lc
++LIBS = $(ARPACKLIB) $(LAPACK) -lm -lc -lspooles -lpthread
+ 
+ ccx_2.10: $(OCCXMAIN) ccx_2.10.a  $(LIBS)
+-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.10.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.10.a $(LIBS)
++	./date.pl; $(CC) $(CFLAGS) -c ccx_2.10.c; $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.10.a $(LIBS)
+ 
+ ccx_2.10.a: $(OCCXF) $(OCCXC)
+ 	ar vr $@ $?

diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch
deleted file mode 100644
index b042634..0000000
--- a/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -rupN CalculiX/ccx_2.7/src/Makefile CalculiX.patched/ccx_2.7/src/Makefile
---- CalculiX/ccx_2.7/src/Makefile	2014-03-02 09:33:28.000000000 -0500
-+++ CalculiX.patched/ccx_2.7/src/Makefile	2014-09-04 16:49:28.456612880 -0400
-@@ -1,9 +1,8 @@
-+CFLAGS := -Wall -O3 -DARCH="Linux" -DMATRIXSTORAGE $(CFLAGS)
-+FFLAGS := -Wall -O3 $(FFLAGS)
- 
--CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
--FFLAGS = -Wall -O3
--
--CC=cc
--FC=gfortran
-+#CC:=cc
-+#FC:=gfortran
- 
- .c.o :
- 	$(CC) $(CFLAGS) -c $<
-@@ -18,12 +17,7 @@ OCCXF = $(SCCXF:.f=.o)
- OCCXC = $(SCCXC:.c=.o)
- OCCXMAIN = $(SCCXMAIN:.c=.o)
- 
--DIR=../../../SPOOLES.2.2
--
--LIBS = \
--       $(DIR)/spooles.a \
--	../../../ARPACK/libarpack_INTEL.a \
--       -lpthread -lm -lc
-+LIBS = $(ARPACKLIB) $(LAPACK) -lm -lc -lspooles -lpthread
- 
- ccx_2.7: $(OCCXMAIN) ccx_2.7.a  $(LIBS)
- 	./date.pl; $(CC) $(CFLAGS) -c ccx_2.7.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.7.a $(LIBS)

diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.7_lapack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.7_lapack.patch
deleted file mode 100644
index cc83fca..0000000
--- a/sci-libs/calculix-ccx/files/01_ccx_2.7_lapack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rupN CalculiX/ccx_2.7/src/Makefile.inc CalculiX.patch/ccx_2.7/src/Makefile.inc
---- CalculiX/ccx_2.7/src/Makefile.inc	2014-03-02 09:33:27.000000000 -0500
-+++ CalculiX.patch/ccx_2.7/src/Makefile.inc	2014-08-30 11:18:14.914823360 -0400
-@@ -128,7 +128,6 @@ depvars.f \
- deuldlag.f \
- dflux.f \
- dfluxs.f \
--dgesv.f \
- distattach.f \
- distattach_3d.f \
- distattachline.f \

diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.8p2_Makefile_custom_cc_flags_spooles_arpack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.8p2_Makefile_custom_cc_flags_spooles_arpack.patch
deleted file mode 100644
index a47fdc6..0000000
--- a/sci-libs/calculix-ccx/files/01_ccx_2.8p2_Makefile_custom_cc_flags_spooles_arpack.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix Makefile to make it use custom CFLAGS and system libraries.
-
---- CalculiX.orig/ccx_2.8p2/src/Makefile	2015-05-21 11:04:58.125111330 +0300
-+++ CalculiX/ccx_2.8p2/src/Makefile	2015-05-21 11:08:26.848130631 +0300
-@@ -1,9 +1,9 @@
- 
--CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
--FFLAGS = -Wall -O3 -fopenmp
-+CFLAGS := -Wall -O3 -DARCH="Linux" -DMATRIXSTORAGE $(CFLAGS)
-+FFLAGS := -Wall -O3 $(FFLAGS)
- 
--CC=cc
--FC=gfortran
-+#CC=cc
-+#FC=gfortran
- 
- .c.o :
- 	$(CC) $(CFLAGS) -c $<
-@@ -18,12 +18,7 @@
- OCCXC = $(SCCXC:.c=.o)
- OCCXMAIN = $(SCCXMAIN:.c=.o)
- 
--DIR=../../../SPOOLES.2.2
--
--LIBS = \
--       $(DIR)/spooles.a \
--	../../../ARPACK/libarpack_INTEL.a \
--       -lpthread -lm -lc
-+LIBS = $(ARPACKLIB) $(LAPACK) -lm -lc -lspooles -lpthread
- 
- ccx_2.8p2: $(OCCXMAIN) ccx_2.8p2.a  $(LIBS)
- 	./date.pl; $(CC) $(CFLAGS) -c ccx_2.8p2.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.8p2.a $(LIBS)

diff --git a/sci-libs/calculix-cgx/calculix-cgx-2.7-r1.ebuild b/sci-libs/calculix-cgx/calculix-cgx-2.10.ebuild
similarity index 69%
rename from sci-libs/calculix-cgx/calculix-cgx-2.7-r1.ebuild
rename to sci-libs/calculix-cgx/calculix-cgx-2.10.ebuild
index d007036..0535bb8 100644
--- a/sci-libs/calculix-cgx/calculix-cgx-2.7-r1.ebuild
+++ b/sci-libs/calculix-cgx/calculix-cgx-2.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils
 
@@ -20,35 +20,36 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
 RDEPEND="media-libs/mesa[nptl]
-	>=media-libs/freeglut-1.0"
+	>=media-libs/freeglut-1.0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libSM
+	x11-libs/libICE"
 DEPEND="${RDEPEND}
 	doc? ( app-text/ghostscript-gpl )"
 
 S=${WORKDIR}/CalculiX/${MY_P}/src/
 
-src_unpack() {
-	default
-	cp "${DISTDIR}/${MY_P}.pdf" "${S}"
-}
-src_prepare() {
-	epatch "${FILESDIR}"/01_${MY_P}_Makefile_custom_cxx_flags.patch
-	epatch "${FILESDIR}"/02_${MY_P}_menu_fix-freeglut_2.8.1.patch
-}
+PATCHES=(
+	"${FILESDIR}"/01_${MY_P}_Makefile_custom_cxx_flags.patch
+	"${FILESDIR}"/02_${MY_P}_menu_fix-freeglut_2.8.1.patch
+)
 
 src_configure () {
 	# Does not compile without -lpthread
-	#if use nptl; then
 	export PTHREAD="-lpthread"
-	#else
-	#	export PTHREAD=""
-	#fi
+	export LFLAGS="-L/usr/$(get_libdir) ${LFLAGS}"
 }
 
 src_install () {
 	dobin cgx
 
 	if use doc; then
-		dodoc ${MY_P}.pdf
+		dodoc "${DISTDIR}/${MY_P}.pdf"
 	fi
 
 	if use examples; then

diff --git a/sci-libs/calculix-cgx/files/01_cgx_2.7_Makefile_custom_cxx_flags.patch b/sci-libs/calculix-cgx/files/01_cgx_2.10_Makefile_custom_cxx_flags.patch
similarity index 72%
rename from sci-libs/calculix-cgx/files/01_cgx_2.7_Makefile_custom_cxx_flags.patch
rename to sci-libs/calculix-cgx/files/01_cgx_2.10_Makefile_custom_cxx_flags.patch
index 0c97613..d6e22f9 100644
--- a/sci-libs/calculix-cgx/files/01_cgx_2.7_Makefile_custom_cxx_flags.patch
+++ b/sci-libs/calculix-cgx/files/01_cgx_2.10_Makefile_custom_cxx_flags.patch
@@ -1,30 +1,30 @@
-diff -rupN CalculiX/cgx_2.7/src/Makefile CalculiX.patched/cgx_2.7/src/Makefile
---- CalculiX/cgx_2.7/src/Makefile	2014-02-18 13:47:05.000000000 -0500
-+++ CalculiX.patched/cgx_2.7/src/Makefile	2014-09-04 17:08:58.043266103 -0400
+diff -uwrN cgx_2.10.ORIG/src/Makefile cgx_2.10/src/Makefile
+--- src/Makefile	2016-01-13 12:41:40.398930000 +0100
++++ cgx_2.10/src/Makefile	2016-03-08 11:02:59.591853482 +0100
 @@ -1,15 +1,15 @@
 -CFLAGS = -O3 -Wall \
-+CFLAGS := -O3 -Wall \
++CFLAGS += -Wall \
    -I./ \
    -I/usr/include \
    -I/usr/include/GL \
    -I../../libSNL/src \
    -I../../glut-3.5/src \
 -  -I/usr/X11/include 
-+  -I/usr/X11/include $(CFLAGS)
++  -I/usr/include/X11
  
 -LFLAGS = \
 -  -L/usr/lib64 -lGL -lGLU \
 -  -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
 -  -lm -lpthread -lrt
-+LFLAGS := \
-+  -L/usr/lib -lGL -lGLU -lglut \
-+  -L/usr/X11R6/lib -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
-+  -lm $(PTHREAD) -lrt $(LFLAGS)
++LFLAGS += \
++  -lGL -lGLU -lglut\
++  -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
++  -lm $(PTHREAD) -lrt
  
  
  # on 32bit systems change lib64 to lib
-@@ -19,41 +19,6 @@ LFLAGS = \
- include Makefile.inc
+@@ -22,41 +22,6 @@
+  userFunction.c
  
  SUTIL = \
 - ../../glut-3.5/src/layerutil.c \
@@ -65,12 +65,9 @@ diff -rupN CalculiX/cgx_2.7/src/Makefile CalculiX.patched/cgx_2.7/src/Makefile
   uselibSNL.cpp \
   generateTet.cpp \
   ../../libSNL/src/*.cpp
-@@ -62,7 +27,7 @@ OLIB = $(SLIB:.c=.o)
+@@ -66,7 +31,7 @@
  OUTIL = $(SUTIL:.c=.o)
  
- cgx: $(OLIB) $(OUTIL)
--	g++   $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
-+	$(CXX)   $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
- 
- 
- 
+ cgx: $(OLIB) $(OUTIL) $(OULIB)
+-	g++  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
++	$(CXX) $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@

diff --git a/sci-libs/calculix-cgx/files/02_cgx_2.7_menu_fix-freeglut_2.8.1.patch b/sci-libs/calculix-cgx/files/02_cgx_2.10_menu_fix-freeglut_2.8.1.patch
similarity index 59%
rename from sci-libs/calculix-cgx/files/02_cgx_2.7_menu_fix-freeglut_2.8.1.patch
rename to sci-libs/calculix-cgx/files/02_cgx_2.10_menu_fix-freeglut_2.8.1.patch
index 8f304af..ff440b4 100644
--- a/sci-libs/calculix-cgx/files/02_cgx_2.7_menu_fix-freeglut_2.8.1.patch
+++ b/sci-libs/calculix-cgx/files/02_cgx_2.10_menu_fix-freeglut_2.8.1.patch
@@ -1,7 +1,7 @@
-diff -rupN CalculiX/cgx_2.7/src/cgx.c CalculiX.patched/cgx_2.7/src/cgx.c
---- CalculiX/cgx_2.7/src/cgx.c	2014-02-18 13:43:53.000000000 -0500
-+++ CalculiX.patched/cgx_2.7/src/cgx.c	2014-09-07 10:59:21.396969109 -0400
-@@ -240,6 +240,9 @@ int   subsubmenu_entity=-1, subsubmenu_p
+diff -uwrN cgx_2.10.ORIG/src/cgx.c cgx_2.10/src/cgx.c
+--- src/cgx.c   2016-03-04 20:40:43.429549000 +0100
++++ cgx_2.10/src/cgx.c   2016-03-08 10:53:56.816865592 +0100
+@@ -242,6 +242,9 @@
  int   subsubmenu_animTune=-1, subsubmenu_animSteps=-1;
  int   subsubmenu_animPeriod=-1;
  
@@ -11,20 +11,20 @@ diff -rupN CalculiX/cgx_2.7/src/cgx.c CalculiX.patched/cgx_2.7/src/cgx.c
  GLfloat lmodel_twoside[] = { GL_TRUE };
  GLfloat lmodel_oneside[] = { GL_FALSE };
  double dx ,dy;                                      /* Mauskoordinaten im bereich +-1*/
-@@ -397,6 +400,12 @@ void allocUtilityData(void)
+@@ -400,7 +403,11 @@
+ #endif
  }
  
- 
+-
 +void queueRecompileEntitiesInMenu(int lc) 
 +{
 +  recompileFlag = 1;
 +  recompileMenu = lc;
 +}
-+
- 
  
- #if INX_MODE
-@@ -3105,7 +3114,7 @@ void selectDataset( int selection )
+ /* the node pointer must not be changed inside the function. Since that is the case the *node is changed to *node_dummy
+    and the global *node is used which is always correct so far */
+@@ -3201,7 +3208,7 @@
        seqLC[2]=anz->l-1;
    }/* no sequence until a new entity is selected and all data are prepared */
  
@@ -33,7 +33,7 @@ diff -rupN CalculiX/cgx_2.7/src/cgx.c CalculiX.patched/cgx_2.7/src/cgx.c
  }
  
  
-@@ -3133,7 +3142,15 @@ void createNewMainMenu(void)
+@@ -3229,7 +3236,15 @@
    glutSetWindow( activWindow);
  }
  
@@ -50,7 +50,7 @@ diff -rupN CalculiX/cgx_2.7/src/cgx.c CalculiX.patched/cgx_2.7/src/cgx.c
  
  void recompileEntitiesInMenu(int lc)
  {
-@@ -5486,6 +5503,7 @@ int main ( int argc, char **argv )
+@@ -5918,6 +5933,7 @@
    glutSpecialFunc ( specialKeyboard );
    glutEntryFunc ( entryfunktion );
    glutPassiveMotionFunc ( Mouse );
@@ -58,16 +58,15 @@ diff -rupN CalculiX/cgx_2.7/src/cgx.c CalculiX.patched/cgx_2.7/src/cgx.c
    glDisable(GL_DITHER);
    glLightModelfv(GL_LIGHT_MODEL_TWO_SIDE, lmodel_oneside);
    glCullFace ( GL_BACK );
-diff -rupN CalculiX/cgx_2.7/src/extUtil.h CalculiX.patched/cgx_2.7/src/extUtil.h
---- CalculiX/cgx_2.7/src/extUtil.h	2014-02-18 13:44:22.000000000 -0500
-+++ CalculiX.patched/cgx_2.7/src/extUtil.h	2014-09-07 10:54:05.816962047 -0400
-@@ -34,7 +34,8 @@ void printf_fflush(const char *fmt,...);
+diff -uwrN cgx_2.10.ORIG/src/extUtil.h cgx_2.10/src/extUtil.h
+--- src/extUtil.h   2016-02-13 02:21:44.342442000 +0100
++++ cgx_2.10/src/extUtil.h   2016-03-08 10:55:36.194863375 +0100
+@@ -34,7 +34,7 @@
  }
    #endif
  #else
 -  #include <GL/glut_cgx.h>
-+  //#include <GL/glut_cgx.h>
 +  #include <GL/glut.h>
  #endif
  
- #define     PI          3.14159265358979323846264338327950288
+ #define     PI          3.14159265358979323846264338327950288
\ No newline at end of file