sci-libs/calculix-ccx: Version bump

6 files changed, 46 insertions, 58 deletions

diff --git a/sci-libs/calculix-ccx/ChangeLog b/sci-libs/calculix-ccx/ChangeLog
index ea6051d33..00b00e3d1 100644
--- a/sci-libs/calculix-ccx/ChangeLog
+++ b/sci-libs/calculix-ccx/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculix-ccx-2.1 (29 Jun 2010)
+
+  29 Jun 2010; Oliver Borm (boroli) <oli.borm@web.de>
+  -files/01_ccx_2.0_Makefile.patch, -calculix-ccx-2.0.ebuild,
+  -files/01_ccx_2.0_lapack.patch, +calculix-ccx-2.1.ebuild,
+  +files/01_ccx_2.1_Makefile.patch, +files/01_ccx_2.1_lapack.patch:
+  sci-libs/calculix-ccx: Version bump
+
   24 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   calculix-ccx-2.0.ebuild:
   QA fixes: ghostscript dependency
diff --git a/sci-libs/calculix-ccx/Manifest b/sci-libs/calculix-ccx/Manifest
index dc409a8ad..faf7f6ce3 100644
--- a/sci-libs/calculix-ccx/Manifest
+++ b/sci-libs/calculix-ccx/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 01_ccx_2.0_Makefile.patch 777 RMD160 52df5e553506717f1d88336bdb392e62d9630c3e SHA1 dda940009d1636bb06e2aaa4bb6b3e48698f85e0 SHA256 a319046784ee350107de7049864b43587e7a849e4a94c2e55a479fbbc3d1f6ff
-AUX 01_ccx_2.0_lapack.patch 754 RMD160 c8bd0da5279db170b6e2e69c3f4abab644468208 SHA1 f48f20a609982de46fdd216ef164a761d8e144c2 SHA256 e55b2d7d0bd2f6fbff4850334336c0f35bf66219b95a6bd859548d9419f05825
-DIST ccx_2.0.ps.tar.bz2 1752660 RMD160 ea4261f9cafdac8dfab1761dba1112c7b924d7b3 SHA1 b94251334b03f00ef8b18f8d50b490dc77c40099 SHA256 8b2a3703fd3523ac4c26cddc3c683a83f15dfdc08f5265780dba519e04dc439e
-DIST ccx_2.0.src.tar.bz2 656890 RMD160 7a6b91c75f079c70c01150aba3ddc5befc56c3a6 SHA1 48ca120e91221ae851a147519104a03bb6a9c047 SHA256 f44c9b319a8499b01eb091decc6d5b412622a5941958a50eb90d9ebb3dce7aac
-DIST ccx_2.0.test.tar.bz2 3136945 RMD160 eab87560d6032f8b4f68bcf4be899bb6685b6b7e SHA1 033613e9e6c83e6542340bdcb49abe9d01c58474 SHA256 c3fe39dcfb477799f900a1bf8d3d7b89356af3a7dc91ff38adc9bde5b1bef04d
-EBUILD calculix-ccx-2.0.ebuild 1484 RMD160 091fe04a5140c65b12979b97d64469328cd321c9 SHA1 4270c7822d4c4e75cb2f16200562cb510af37966 SHA256 a0a15fcdf7dda8f6b1b071bb98166001b5083df6e1e2c7ac16d2c5cd7f305ce9
-MISC ChangeLog 701 RMD160 242c929df8a8da0bcb9acf03ece36e003cfcc517 SHA1 fbf62ecb2245e064e3b1ffca39e6afa05276842a SHA256 178639b6d4d98538c6497a7a0510e8b8c855dcc973e14caeff274f80482623cf
+AUX 01_ccx_2.1_Makefile.patch 773 RMD160 687452b8b64c8cea60aab560bf19aa936e972b36 SHA1 643b9fd620d63e00eb0b17762158eec727f1538d SHA256 6e9064dd752d093645ceb51c25b995377951d79b895916a81b0134866c2edfaa
+AUX 01_ccx_2.1_lapack.patch 754 RMD160 c53feca5d6dc2bdde7327b309e75ef87ce606e28 SHA1 0750d3ffbf3c42408908c3bebe23590560cf8219 SHA256 f6d7b8a8ad14546372a609ca2d3ea55049f2266f11c548f8ed960d104dbd64d9
+DIST ccx_2.1.ps.tar.bz2 1762209 RMD160 022217b4cc8817fd7dc03952598bfd23a4e426fb SHA1 c15fe7f25121992e708adc846a253afeca7893b9 SHA256 ad92bc1ad52ea6b2b14f8b73a550e9b564abd38cb2333d0691cbfbc8f2370477
+DIST ccx_2.1.src.tar.bz2 681426 RMD160 875f0d058e94fd4ead22605bf415e1a365ed3c2d SHA1 b9dd25179256d41d07751892e8c185df6b47cf2d SHA256 35214971c2e29f0963451aebe6151d605670fe7892ca624a343bbc3a4cf11ade
+DIST ccx_2.1.test.tar.bz2 3284991 RMD160 d258f450d603cd6e79e3ae2926b7f5485613ea39 SHA1 8333757600634af93d3c6f03307225ef337df38d SHA256 79d99df3cc8f8dd9057e789ded4910ecec3221f922c422ded39c76a2715dcfad
+EBUILD calculix-ccx-2.1.ebuild 1487 RMD160 7ed0fc21b6bf29b4c07c20af72de8340f42119c3 SHA1 e2b40f2ae4a583d638a100b191f950f695d09bf8 SHA256 fbfd6d3bc01570dd44a60c09ef60c34d73372b8396c24865575e271a2712c9e7
+MISC ChangeLog 1017 RMD160 fb955bbaa28835c8a142edfd4db2306272c78cd7 SHA1 cbfd5e917b08461749369b86c77ac29033e29e6f SHA256 2ec86fc9972e5f82485504b28f67493e22b42ce5cef81b41a6ddcd70856dcfc4
 MISC metadata.xml 254 RMD160 30d6333b8e09aaec61aed6ae8b611cfa9900d7cf SHA1 e6556709eb1ae2a2754bdf8c024bf71c3645e421 SHA256 4ae623f80079d85124616ed1799cb6590d95257c6e4f373fb1b9d715fad04692
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQIcBAEBAgAGBQJMI6lsAAoJENwGBM22xffe/7kP/jcPxP2dUa3N2k3PPZkr+PxX
-LtZEHkpPqunl1MAQOl/m5QckjVc2BhgvXKA8Wm+PaGAymkr/m/fmZC0Ay2YSuUAP
-wY+OTLU5dd9BO+bIg6MBbDyFzsTBnfjlyShFYApcA6da0SrcxyQIuMnRR4xNyiSc
-zgbwexjwpGtUWsqkzZ58kuvc7eTYD3OYbgcbcjNfsYLm/t6ZtF3IO53Mo9kzX7NU
-Cd7fMPqL/oYvkDsP2++9sfLTCVWseDHNZ9GobuSeKflvFrFe5MMJsAghZC9Qsoeo
-A1ZKung4H/rpFmhkS/00nOnuAJUPMmBkI5o5mo/DpaMAUlSsYCXozIYnZN9F+Ku2
-Ovj9QrD8Swa4sO8sC65Vu/F4UtNeKt75UjsWoKmnhn+f8DeMIqr46HORfhr4AGme
-PKEYPP3jBcSh6KjsKQt66Chpu3UR1iP8sqYfAGuQm/8UHHDdj6d0ANMUt2J2HPxE
-bjteMPp+mdVzjmsBEoJboVVKBfT4mGqykHITUxwuz2adbq862EDVe4v82vvYOWvd
-LLBo66pYsns/iBzCCyJEZR5H3a+xPUYnUjjXveNhdiAFbmnzoxBtVxwJO2xWBrMK
-V79gqFgtND2hTL8l5mCYSobtp7t8qPrpLWGD9dl9sEoHRn0Fj5ymoNertFotTVsB
-HINE3OETNEDf1Jj3e0R7
-=eLcj
------END PGP SIGNATURE-----
diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.0.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.1.ebuild
index 208dc44b7..71b587f29 100644
--- a/sci-libs/calculix-ccx/calculix-ccx-2.0.ebuild
+++ b/sci-libs/calculix-ccx/calculix-ccx-2.1.ebuild
@@ -19,12 +19,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="arpack doc examples lapack threads"
 
-DEPEND="arpack? ( >=sci-libs/arpack-96 )
-	doc? ( app-text/ghostscript-gpl )
+RDEPEND="arpack? ( >=sci-libs/arpack-96 )
 	lapack? ( virtual/lapack )
 	>=sci-libs/spooles-2.2
 	virtual/blas"
-RDEPEND=${DEPEND}
+DEPEND="${RDEPEND}
+	doc? ( app-text/ghostscript-gpl )"
 
 S=${WORKDIR}/CalculiX/${MY_P}/src
 
diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.0_Makefile.patch b/sci-libs/calculix-ccx/files/01_ccx_2.0_Makefile.patch
deleted file mode 100644
index 5972bd15c..000000000
--- a/sci-libs/calculix-ccx/files/01_ccx_2.0_Makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- CalculiX/ccx_2.0/src/Makefile.orig	2009-08-28 09:53:59.000000000 +0200
-+++ CalculiX/ccx_2.0/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.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)
diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.1_Makefile.patch b/sci-libs/calculix-ccx/files/01_ccx_2.1_Makefile.patch
new file mode 100644
index 000000000..e1b9a3ad7
--- /dev/null
+++ b/sci-libs/calculix-ccx/files/01_ccx_2.1_Makefile.patch
@@ -0,0 +1,23 @@
+--- 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 -O  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
++CFLAGS = -Wall -O3 $(SPOOLESINC) -DARCH="Linux" -DMATRIXSTORAGE $(ARPACK) $(USE_MT)
+ FFLAGS = -Wall -O -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.1: $(OCCXMAIN) ccx_2.1.a  $(LIBS)
+ 	./date.pl; $(CC) $(CFLAGS) -c ccx_2.1.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.1.a  -lpthread  $(LIBS)
diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.0_lapack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.1_lapack.patch
index 679fd17eb..f7bd03508 100644
--- a/sci-libs/calculix-ccx/files/01_ccx_2.0_lapack.patch
+++ b/sci-libs/calculix-ccx/files/01_ccx_2.1_lapack.patch
@@ -1,5 +1,5 @@
---- CalculiX/ccx_2.0/src/Makefile.std	2009-08-28 09:59:31.000000000 +0200
-+++ CalculiX/ccx_2.0/src/Makefile	2009-08-28 09:59:58.000000000 +0200
+--- 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)
@@ -9,9 +9,9 @@
  
  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.0/src/Makefile.inc.orig	2009-08-28 10:00:06.000000000 +0200
-+++ CalculiX/ccx_2.0/src/Makefile.inc	2009-08-28 10:00:33.000000000 +0200
-@@ -85,7 +85,6 @@
+--- 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 \