Merge remote-tracking branch 'github/master'

Heather · Sep 5, 2014 · 6a3a422 · 6a3a422
2 parents 6255d4a + 0b4cfd3
commit 6a3a422
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 82 deletions.
diff --git 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 <[email protected]> +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 <[email protected]> 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/Manifest b/sci-libs/calculix-ccx/Manifest
@@ -1,3 +1,3 @@
-DIST ccx_2.2.ps.tar.bz2 1828966 SHA256 13b3341bf059732059396061ce006a28c1296f085adba6624972e4899eca25fa
-DIST ccx_2.2.src.tar.bz2 719861 SHA256 88672b95b8241041cc12e90f8d7e3ad9cb05b11dbb07ae4f0230355f31dece0e
-DIST ccx_2.2.test.tar.bz2 8101987 SHA256 1a95a08e6abbccdb72964d01466151513651a8bd66f7f1c29db7d3ace3827696
+DIST ccx_2.7.ps.tar.bz2 2395486 SHA256 e757b93d6279d49aa33c623a4d598382c55f1b35a4f0ffa43b2651c1f2baccc5 SHA512 987b5fb33ebbf8ebc989e276d7fe7c33edae8b72c52c3ad06c4a5c31476082b1a225387636ecc312b1cac5f6cbc4873bd94c74eb6cdb8f36b506db316c5089aa WHIRLPOOL 8a49560523f4045263e0ddc8dfb47ce32dc7fada099abe1998a95835f880eeefdf06097dc70fb3beed26a326a33781514089145d088205a45b02ac1cfc3db908
+DIST ccx_2.7.src.tar.bz2 825264 SHA256 85fa68ec855e4e445f01be011f4cada238043ba4c5b7eaa38e19777bce2382d7 SHA512 e66c7df2d5c195112bf117aaf11ed9d1e9fc73b530a828f0f45a5574accc4093683307a637bba38cb9af1063a5b3f507e53570c970e38c48893758612de52cc8 WHIRLPOOL 5df3cada0ba41a5c2015907884c14f0e2d1c272e55a8b9c044f303c073624e7b5083a5605a83965505246ded428a0a291cf932520f2d404dd147f1711829282c
+DIST ccx_2.7.test.tar.bz2 8450942 SHA256 e339c9093b876c43b4a9b4a8ee80af60eb4146a1a89ff01f1dcf2f13aaaeb0d5 SHA512 01830b50524da5116c1dea8867ed8178577e665e29fffc33394490023111cebc3739293e2de5ec89b73c62ed913aa6a80bec58dcb989d9f24aa781f61e679afc WHIRLPOOL 320517c68da32ccca0fcc1bb8ee12357a1978f1d32e9ec989a63fbd82d5aab0b84d2978b46a555b1b0d3e3ea83b65ac6b5adaa1b8721b53bd19b1f70a041cbfd
diff --git a/...libs/calculix-ccx/calculix-ccx-2.2.ebuild → ...libs/calculix-ccx/calculix-ccx-2.7.ebuild b/...libs/calculix-ccx/calculix-ccx-2.2.ebuild → ...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
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
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
@@ -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
@@ -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 \
diff --git a/sci-libs/calculix-cgx/ChangeLog b/sci-libs/calculix-cgx/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for sci-libs/calculix-cgx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculix-cgx-2.7 (05 Sep 2014)
+
+  05 Sep 2014; Rongcui Dong <[email protected]> +calculix-cgx-2.7.ebuild,
+  +files/01_cgx_2.7_Makefile_custom_cxx_flags.patch, -calculix-cgx-2.2.ebuild,
+  -files/01_cgx_2.2_Makefile.patch:
+  Version bump
+
 *calculix-cgx-2.2 (29 Oct 2010)
 
   29 Oct 2010; Oliver Borm (boroli) <[email protected]>
@@ -30,4 +37,3 @@
   15 Oct 2008; Oliver Borm (boroli) <[email protected]>
   +files/01_cgx_1.8_Makefile.patch, +calculix-cgx-1.8.ebuild, +metadata.xml:
   Reworked ebuild for bug 125775, thanks to pva
-
diff --git a/sci-libs/calculix-cgx/Manifest b/sci-libs/calculix-cgx/Manifest
@@ -1,2 +1,2 @@
-DIST cgx_2.2.all.tar.bz2 1357357 SHA256 216a1102ac3d7765d10f1f4c78db11e974e50615d6cf08b4019000b6119a019a
-DIST cgx_2.2.ps.bz2 356718 SHA256 29ca4ac8bf613782eacc268084a0b2db5c6b4fdf14e345280d55a20d8754213b
+DIST cgx_2.7.all.tar.bz2 1660205 SHA256 5378a664b52e64910afb896885fe63e1a2e639f3b4e0256eef4e71e96c6a10d2 SHA512 2e0fb80d4bb2d1a8f0ce5d04e542b42d3a616702fa176eaf533959f8e968a181877c79f5bb9f88980684004a766c3eb91fb9e393511ee787efe6632308004ced WHIRLPOOL ac57eeba70a8999014650f4360699bf671b71b3d402d297653d893aad45b5bbe89f363fe07fde8bdf999324af81fa5f0a699eddf0412040a71c97f6e57d88074
+DIST cgx_2.7.pdf 1082452 SHA256 8af937b79236085e6caf5b9b399cafaebda7a9dda0193522cd00ed5a09d18363 SHA512 49ff74be3ccf68f10a240093cf9fae2bcabaeb8acfe3511926df7fe3523f0ff66a130b2fa727504ff4787589ba6ee65ced76d229c315ad7306cbc665bc055c60 WHIRLPOOL 981890f2c7ee5e00de65f8a13a2eae097689bdc5f58956a2864c525950c68683794952f92149334a2e6538dcde47ff369194c644f5371cce4b9be9f6d27fec41
diff --git a/...libs/calculix-cgx/calculix-cgx-2.2.ebuild → ...libs/calculix-cgx/calculix-cgx-2.7.ebuild b/...libs/calculix-cgx/calculix-cgx-2.2.ebuild → ...libs/calculix-cgx/calculix-cgx-2.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
 inherit eutils
 
@@ -11,38 +11,39 @@ MY_P=cgx_${PV}
 DESCRIPTION="A Free Software Three-Dimensional Structural Finite Element Program"
 HOMEPAGE="http://www.calculix.de/"
 SRC_URI="http://www.dhondt.de/${MY_P}.all.tar.bz2
-	doc? ( http://www.dhondt.de/${MY_P}.ps.bz2 )"
+	doc? ( http://www.dhondt.de/${MY_P}.pdf )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc examples nptl"
+# nptl removed since I cannot work around it
+IUSE="doc examples"
 
-RDEPEND="media-libs/mesa[nptl=]
+RDEPEND="media-libs/mesa[nptl]
 	>=media-libs/freeglut-1.0"
 DEPEND="${RDEPEND}
 	doc? ( app-text/ghostscript-gpl )"
 
 S=${WORKDIR}/CalculiX/${MY_P}/src/
 
 src_prepare() {
-	epatch "${FILESDIR}"/01_${MY_P}_Makefile.patch
+	epatch "${FILESDIR}"/01_${MY_P}_Makefile_custom_cxx_flags.patch
 }
 
 src_configure () {
-	if use nptl; then
-		export PTHREAD="-lpthread"
-	else
-		export PTHREAD=""
-	fi
+	# Does not compile without -lpthread
+	#if use nptl; then
+	export PTHREAD="-lpthread"
+	#else
+	#	export PTHREAD=""
+	#fi
 }
 
 src_install () {
 	dobin cgx
 
 	if use doc; then
 		cd "${WORKDIR}"
-		ps2pdf ${MY_P}.ps ${MY_P}.pdf
 		dodoc ${MY_P}.pdf
 	fi
 

diff --git a/...culix-cgx/files/01_cgx_2.2_Makefile.patch → ...1_cgx_2.7_Makefile_custom_cxx_flags.patch b/...culix-cgx/files/01_cgx_2.2_Makefile.patch → ...1_cgx_2.7_Makefile_custom_cxx_flags.patch
@@ -1,17 +1,29 @@
---- CalculiX/cgx_2.0/src/Makefile.orig	2009-08-28 10:24:52.000000000 +0200
-+++ CalculiX/cgx_2.0/src/Makefile	2009-08-28 10:26:39.000000000 +0200
-@@ -7,8 +7,8 @@
-   -I/usr/X11/include 
+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
+@@ -1,15 +1,15 @@
+-CFLAGS = -O3 -Wall \
++CFLAGS := -O3 -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)
 
- LFLAGS = \
+-LFLAGS = \
 -  -L/usr/lib64 -lGL -lGLU \
--  -L/usr/X11R6/lib64 -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
+-  -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 $(PTHREAD) -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
-   -lm 
++  -L/usr/X11R6/lib -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
++  -lm $(PTHREAD) -lrt $(LFLAGS)
+
 
  # on 32bit systems change lib64 to lib
-@@ -18,41 +18,6 @@
+@@ -19,41 +19,6 @@ LFLAGS = \
  include Makefile.inc
 
  SUTIL = \
@@ -51,5 +63,14 @@
 - ../../glut-3.5/src/glut_init.c \
 - ../../glut-3.5/src/glut_util.c \
   uselibSNL.cpp \
+  generateTet.cpp \
   ../../libSNL/src/*.cpp
+@@ -62,7 +27,7 @@ OLIB = $(SLIB:.c=.o)
+ OUTIL = $(SUTIL:.c=.o)
+
+ cgx: $(OLIB) $(OUTIL)
+-	g++   $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
++	$(CXX)   $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
+
+