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

[Jauhien Piatlicki]

commit:     7a9434d91f7e57436965c2f3510c45ced31a9e08
Author:     Rongcui Dong <carldong76 <AT> gmail <DOT> com>
AuthorDate: Fri Sep  5 12:42:52 2014 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Fri Sep  5 12:42:52 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7a9434d9

Version Bump

Package-Manager: portage-2.3.6-r9

---
 sci-libs/calculix-ccx/ChangeLog                    | 11 ++++++--
 ...ulix-ccx-2.2.ebuild => calculix-ccx-2.7.ebuild} | 19 ++++++-------
 .../calculix-ccx/files/01_ccx_2.2_Makefile.patch   | 23 ----------------
 .../calculix-ccx/files/01_ccx_2.2_lapack.patch     | 21 ---------------
 ...7_Makefile_custom_cc_flags_spooles_arpack.patch | 31 ++++++++++++++++++++++
 .../calculix-ccx/files/01_ccx_2.7_lapack.patch     | 11 ++++++++
 6 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/sci-libs/calculix-ccx/ChangeLog b/sci-libs/calculix-ccx/ChangeLog
index bf56c0d..96ad8ad 100644
--- a/sci-libs/calculix-ccx/ChangeLog
+++ b/sci-libs/calculix-ccx/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for sci-libs/calculix-ccx
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculix-ccx-2.7 (05 Sep 2014)
+
+  05 Sep 2014; Rongcui Dong <carldong76@×××××.com> +calculix-ccx-2.7.ebuild,
+  +files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch,
+  +files/01_ccx_2.7_lapack.patch, -calculix-ccx-2.2.ebuild,
+  -files/01_ccx_2.2_Makefile.patch, -files/01_ccx_2.2_lapack.patch:
+  Version Bump
+
   22 Feb 2013; Justin Lecher <jlec@g.o> calculix-ccx-2.2.ebuild,
   metadata.xml:
   Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
@@ -39,4 +47,3 @@
   +files/01_ccx_1.8_Makefile.patch, +files/01_ccx_1.8_lapack.patch,
   +calculix-ccx-1.8.ebuild, +metadata.xml:
   Reworked ebuild for bug 125773, thanks to pva
-

diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.2.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.7.ebuild
similarity index 74%
rename from sci-libs/calculix-ccx/calculix-ccx-2.2.ebuild
rename to sci-libs/calculix-ccx/calculix-ccx-2.7.ebuild
index ecfb386..5ed4d92 100644
--- a/sci-libs/calculix-ccx/calculix-ccx-2.2.ebuild
+++ b/sci-libs/calculix-ccx/calculix-ccx-2.7.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs flag-o-matic
 
 MY_P=ccx_${PV}
 
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="arpack doc examples lapack threads"
+IUSE="arpack doc examples lapack"
 
 RDEPEND="
 	arpack? ( sci-libs/arpack )
@@ -32,7 +32,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/CalculiX/${MY_P}/src
 
 src_prepare() {
-	epatch "${FILESDIR}"/01_${MY_P}_Makefile.patch
+	#epatch "${FILESDIR}"/01_${MY_P}_Makefile_spooles_arpack.patch
+	epatch "${FILESDIR}"/01_${MY_P}_Makefile_custom_cc_flags_spooles_arpack.patch
 	use lapack && epatch "${FILESDIR}"/01_${MY_P}_lapack.patch
 }
 
@@ -41,17 +42,17 @@ src_configure() {
 
 	export BLAS=$($(tc-getPKG_CONFIG) --libs blas)
 
-	export SPOOLESINC="-I/usr/include/spooles -DSPOOLES"
-	export SPOOLESLIB="-lspooles"
-	if use threads; then
-		export USE_MT="-DUSE_MT"
-		export SPOOLESLIB="-lspooles -lpthread"
-	fi
+	#export SPOOLESINC="-I/usr/include/spooles -DSPOOLES"
+	append-cflags "-I/usr/include/spooles -DSPOOLES"
+	#export SPOOLESLIB="-lspooles -lpthread"
+	export USE_MT="-DUSE_MT"
 
 	if use arpack; then
 		export ARPACK="-DARPACK"
 		export ARPACKLIB=$($(tc-getPKG_CONFIG) --libs arpack)
 	fi
+	export CC="$(tc-getCC)"
+	export FC="$(tc-getFC)"
 }
 
 src_install () {

diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.2_Makefile.patch b/sci-libs/calculix-ccx/files/01_ccx_2.2_Makefile.patch
deleted file mode 100644
index e759dda..0000000
--- a/sci-libs/calculix-ccx/files/01_ccx_2.2_Makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- CalculiX/ccx_2.1/src/Makefile.orig	2009-08-28 09:53:59.000000000 +0200
-+++ CalculiX/ccx_2.1/src/Makefile	2009-08-28 09:59:58.000000000 +0200
-@@ -1,5 +1,5 @@
- 
--CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
-+CFLAGS = -Wall -O3 $(SPOOLESINC) -DARCH="Linux" -DMATRIXSTORAGE $(ARPACK) $(USE_MT)
- FFLAGS = -Wall -O3 -fopenmp
- 
- CC=cc
-@@ -18,12 +18,7 @@
- OCCXC = $(SCCXC:.c=.o)
- OCCXMAIN = $(SCCXMAIN:.c=.o)
- 
--DIR=../../../SPOOLES.2.2
--
--LIBS = \
--       $(DIR)/spooles.a \
--	../../../ARPACK/libarpack_INTEL.a \
--       -lm -lc
-+LIBS = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) -lm -lc
- 
- ccx_2.2: $(OCCXMAIN) ccx_2.2.a  $(LIBS)
- 	./date.pl; $(CC) $(CFLAGS) -c ccx_2.2.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.2.a  -lpthread  $(LIBS)

diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.2_lapack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.2_lapack.patch
deleted file mode 100644
index f7bd035..0000000
--- a/sci-libs/calculix-ccx/files/01_ccx_2.2_lapack.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- CalculiX/ccx_2.1/src/Makefile.std	2009-08-28 09:59:31.000000000 +0200
-+++ CalculiX/ccx_2.1/src/Makefile	2009-08-28 09:59:58.000000000 +0200
-@@ -18,7 +18,7 @@
- OCCXC = $(SCCXC:.c=.o)
- OCCXMAIN = $(SCCXMAIN:.c=.o)
- 
--LIBS = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) -lm -lc
-+LIBS = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) $(LAPACK) -lm -lc
- 
- ccx_2.0: $(OCCXMAIN) ccx_2.0.a  $(LIBS)
- 	./date.pl; $(CC) $(CFLAGS) -c ccx_2.0.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.0.a  -lpthread  $(LIBS)
---- CalculiX/ccx_2.1/src/Makefile.inc.orig	2009-08-28 10:00:06.000000000 +0200
-+++ CalculiX/ccx_2.1/src/Makefile.inc	2009-08-28 10:00:33.000000000 +0200
-@@ -91,7 +91,6 @@
- deuldlag.f \
- dflux.f \
- dfluxes.f \
--dgesv.f \
- diamtr.f \
- distattach.f \
- distributedcouplings.f \

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
new file mode 100644
index 0000000..db3b301
--- /dev/null
+++ b/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch
@@ -0,0 +1,31 @@
+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 = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) -lm -lc -lpthread -lspooles
+ 
+ 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
new file mode 100644
index 0000000..cc83fca
--- /dev/null
+++ b/sci-libs/calculix-ccx/files/01_ccx_2.7_lapack.patch
@@ -0,0 +1,11 @@
+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 \