sci-libs/calculix-ccx: Reworked ebuild for bug 125773, thanks to pva

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1311 32389bae-6d03-0410-99cf-db05cde120eb

6 files changed, 157 insertions, 0 deletions

diff --git a/sci-libs/calculix-ccx/ChangeLog b/sci-libs/calculix-ccx/ChangeLog
new file mode 100644
index 000000000..031926f88
--- /dev/null
+++ b/sci-libs/calculix-ccx/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for sci-libs/calculix-ccx
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  15 Oct 2008; Oliver Borm (boroli) <oli.borm@web.de>
+  +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
new file mode 100644
index 000000000..a9344fad1
--- /dev/null
+++ b/sci-libs/calculix-ccx/Manifest
@@ -0,0 +1,8 @@
+AUX 01_ccx_1.8_Makefile.patch 1086 RMD160 b239890b5e71b2c7ef4304422e850bda83b82a66 SHA1 01c2a33a2e0f20d6c24fa13b549a91c03aff9171 SHA256 a654d3f096d674a035c293de60cee5c7b0ae7bc596d726dd66757185b2c6d790
+AUX 01_ccx_1.8_lapack.patch 646 RMD160 069ca164565e97671fe443967321302cfadb5c8b SHA1 1ab7106b635b4b09a5f1455cc19b03b8bb53d613 SHA256 bc700bb8e88aca6d1139ca20789365b7ab0beefc6f906cfa7cb325ef5caba8e8
+DIST ccx_1.8.ps.tar.bz2 1570848 RMD160 34508df079653d2360122186d05f0d0d01b9f2c1 SHA1 f6062a13c1de87c7b2718e2aa1ce7b66b9dab007 SHA256 b0ccc40e6de59dfa87d85f282dc786f9068c9a0302219a3900dba00e1eac1720
+DIST ccx_1.8.src.tar.bz2 591107 RMD160 d7c36b3e465d86d24b162bfd9aefe864f27a23c6 SHA1 2e16f4022d854bd791bf1f165635129a84473a70 SHA256 eed476daf2453340bafa14b0d49f9e9825c88fc66739fbf686b3c08c0ceaf0ff
+DIST ccx_1.8.test.tar.bz2 1401726 RMD160 fdc12099169199b94673458d80966155bfca16d4 SHA1 8e171dea52222f6c64638d9cdfa2c29dbd458395 SHA256 0038acb239abdb51288c26cb3ed9a65254cd05958f7ff4fa5a52547388fa20ac
+EBUILD calculix-ccx-1.8.ebuild 1743 RMD160 748350aaabb2b0d3374c5a35554bbc59c4dcd54d SHA1 4a79a6fcb48ca89b819e02a968e6890f0237b55e SHA256 632818cf49752c5341ee72f1ff534572b4416a5e9fdadd111c235ee40fd3427c
+MISC ChangeLog 336 RMD160 f58fc83d1ecbc43795cc5a00c286598b3ad51375 SHA1 4c671145d992c4b5ce86af8da0f686beb6935313 SHA256 48554cc9a26b6a8608295bf62fc9048eae589be0d50f021267df1dda5c3cdde9
+MISC metadata.xml 335 RMD160 d11f906cb5a6cef86777f34b96bb2daf3d1ed79d SHA1 af8e24ac02f9e4040282997bdb035ffa1dfe0853 SHA256 dc85f077b5ab766794e57d3e82cba25250b595e5cd914048e6b71a55a6b472ca
diff --git a/sci-libs/calculix-ccx/calculix-ccx-1.8.ebuild b/sci-libs/calculix-ccx/calculix-ccx-1.8.ebuild
new file mode 100644
index 000000000..ce72eacad
--- /dev/null
+++ b/sci-libs/calculix-ccx/calculix-ccx-1.8.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+MY_P=ccx_${PV}
+
+DESCRIPTION="A Free Software Three-Dimensional Structural Finite Element Program"
+HOMEPAGE="http://www.calculix.de/"
+SRC_URI="http://www.dhondt.de/${MY_P}.src.tar.bz2
+	doc? ( http://www.dhondt.de/${MY_P}.ps.tar.bz2 )
+	examples? ( http://www.dhondt.de/${MY_P}.test.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="arpack doc examples lapack spooles threads"
+
+DEPEND="arpack? ( >=sci-libs/arpack-96 )
+	doc? ( virtual/ghostscript )
+	lapack? ( virtual/lapack )
+	spooles? ( >=sci-libs/spooles-2.2 )
+	virtual/blas"
+
+S=${WORKDIR}/CalculiX
+
+pkg_setup() {
+	if use spooles && use !threads; then
+		die "ERROR: the threads USE flag requires spooles"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/01_${MY_P}_Makefile.patch
+	use lapack && epatch "${FILESDIR}"/01_${MY_P}_lapack.patch
+}
+
+src_compile () {
+	use lapack && export LAPACK=`pkg-config --libs lapack`
+
+	export BLAS=`pkg-config --libs blas`
+
+	if use spooles; then
+		export SPOOLESINC="-I/usr/include/spooles -DSPOOLES"
+		export SPOOLESLIB="-lspooles"
+		if use threads; then
+			export USE_MT="-DUSE_MT"
+			export SPOOLESLIB="-lspooles -lpthread"
+		fi
+	fi
+
+	if use arpack; then
+		export ARPACK="-DARPACK"
+		export ARPACKLIB="-larpack"
+	fi
+
+	cd ${MY_P}/src
+	emake || die "emake failed"
+}
+
+src_install () {
+	cd ${MY_P}/src
+	dobin ${MY_P} || die "dobin failed"
+	dosym ${MY_P} /usr/bin/ccx
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		cd "${S}/${MY_P}/doc"
+		ps2pdf ${MY_P}.ps ${MY_P}.pdf
+		doins ${MY_P}.pdf
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${S}"/${MY_P}/test/*
+	fi
+}
diff --git a/sci-libs/calculix-ccx/files/01_ccx_1.8_Makefile.patch b/sci-libs/calculix-ccx/files/01_ccx_1.8_Makefile.patch
new file mode 100644
index 000000000..300173371
--- /dev/null
+++ b/sci-libs/calculix-ccx/files/01_ccx_1.8_Makefile.patch
@@ -0,0 +1,31 @@
+diff -uhr CalculiX/ccx_1.8/src/Makefile CalculiX.mine/ccx_1.8/src/Makefile
+--- CalculiX/ccx_1.8/src/Makefile	2008-07-31 15:24:46.000000000 -0400
++++ CalculiX.mine/ccx_1.8/src/Makefile	2008-08-06 08:28:02.000000000 -0400
+@@ -1,6 +1,5 @@
+-
+-CFLAGS = -Wall -O  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
+-FFLAGS = -Wall -O 
++CFLAGS =  -Wall -O3 $(SPOOLESINC) -DARCH="Linux" -DMATRIXSTORAGE $(ARPACK) $(USE_MT)
++FFLAGS =  -Wall -O3
+ 
+ CC=cc
+ FC=gfortran
+@@ -462,16 +461,10 @@
+ OCCXC = $(SCCXC:.c=.o)
+ OCCXMAIN = $(SCCXMAIN:.c=.o)
+ 
+-DIR=../../../SPOOLES.2.2
+-
+-LIBS = \
+-       $(DIR)/spooles.a \
+-	../../../ARPACK/libarpack_INTEL.a \
+-       -lm
++LIBS = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) -lm 
+ 
+ ccx_1.8: $(OCCXMAIN) ccx_1.8.a  $(LIBS)
+-	./date.pl; $(CC) $(CFLAGS) -c ccx_1.8.c; gfortran -Wall -O -o $@ $(OCCXMAIN) ccx_1.8.a  $(LIBS)
++	./date.pl; $(CC) $(CFLAGS) -c ccx_1.8.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_1.8.a  $(LIBS)
+ 
+ ccx_1.8.a: $(OCCXF) $(OCCXC)
+ 	ar vr $@ $?
+-                                                                               
diff --git a/sci-libs/calculix-ccx/files/01_ccx_1.8_lapack.patch b/sci-libs/calculix-ccx/files/01_ccx_1.8_lapack.patch
new file mode 100644
index 000000000..27f4a1f74
--- /dev/null
+++ b/sci-libs/calculix-ccx/files/01_ccx_1.8_lapack.patch
@@ -0,0 +1,20 @@
+diff -uhr CalculiX/ccx_1.8/src/Makefile CalculiX.mine/ccx_1.8/src/Makefile
+--- CalculiX/ccx_1.8/src/Makefile	2008-08-06 08:31:53.000000000 -0400
++++ CalculiX.mine/ccx_1.8/src/Makefile	2008-08-06 08:33:57.000000000 -0400
+@@ -87,7 +87,6 @@
+ deuldlag.f \
+ dflux.f \
+ dfluxes.f \
+-dgesv.f \
+ diamtr.f \
+ distattach.f \
+ dKdm.f \
+@@ -461,7 +460,7 @@
+ OCCXC = $(SCCXC:.c=.o)
+ OCCXMAIN = $(SCCXMAIN:.c=.o)
+ 
+-LIBS = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) -lm 
++LIBS = $(SPOOLESLIB) $(ARPACKLIB) $(BLAS) $(LAPACK) -lm 
+ 
+ ccx_1.8: $(OCCXMAIN) ccx_1.8.a  $(LIBS)
+ 	./date.pl; $(CC) $(CFLAGS) -c ccx_1.8.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_1.8.a  $(LIBS)
diff --git a/sci-libs/calculix-ccx/metadata.xml b/sci-libs/calculix-ccx/metadata.xml
new file mode 100644
index 000000000..404ecb934
--- /dev/null
+++ b/sci-libs/calculix-ccx/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci</herd>
+	<use>
+		<flag name="arpack"> Add sparse eigen value support via sci-libs/arpack </flag>
+		<flag name="spooles"> Provides an improved solver via sci-libs/spooles </flag>
+	</use>
+</pkgmetadata>