[gentoo-commits] proj/sci:master commit in: sci-libs/calculix-cgx/files/, sci-libs/calculix-ccx/files/, ...
commit: 90afbee2f7a8457590f89b4866a4c1ae5364f41a
Author: Aisha Tammy aisha cc>
AuthorDate: Sun Sep 27 23:41:25 2020 +
Commit: Aisha Tammy aisha cc>
CommitDate: Sun Sep 27 23:41:25 2020 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=90afbee2
sci-libs/calculix-c{c,g}x: drop dead packages
depend on spooles which was defunct in 1999
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy aisha.cc>
sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild | 74 --
...0_Makefile_custom_cc_flags_spooles_arpack.patch | 35 --
sci-libs/calculix-ccx/metadata.xml | 11
sci-libs/calculix-cgx/calculix-cgx-2.10.ebuild | 58 -
.../01_cgx_2.10_Makefile_custom_cxx_flags.patch| 73 -
.../02_cgx_2.10_menu_fix-freeglut_2.8.1.patch | 72 -
sci-libs/calculix-cgx/metadata.xml | 8 ---
7 files changed, 331 deletions(-)
diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild
b/sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild
deleted file mode 100644
index 9b7efa9f3..0
--- a/sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs flag-o-matic fortran-2
-
-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 openmp threads"
-
-RDEPEND="
- arpack? ( >=sci-libs/arpack-3.1.3 )
- >=sci-libs/spooles-2.2[threads=]
- virtual/lapack
- virtual/blas"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-text/ghostscript-gpl )"
-
-S=${WORKDIR}/CalculiX/${MY_P}/src
-
-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.
- # Keeping things this way in case we change pkgconfig for arpack
- export LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
-
- append-cflags "-I/usr/include/spooles -DSPOOLES"
- 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)
- append-cflags "-DARPACK"
- fi
- export CC="$(tc-getCC)"
- export FC="$(tc-getFC)"
-}
-
-src_install () {
- dobin ${MY_P}
- dosym ${MY_P} /usr/bin/ccx
-
- if use doc; then
- cd "${S}/../doc" || die
- ps2pdf ${MY_P}.ps ${MY_P}.pdf || die "ps2pdf failed"
- dodoc ${MY_P}.pdf
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${S}"/../test/*
- fi
-}
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
deleted file mode 100644
index 83caf80f9..0
---
a/sci-libs/calculix-ccx/files/01_ccx_2.10_Makefile_custom_cc_flags_spooles_arpack.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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/metadata.xml
b/sci-libs/calculix-ccx/metadata.xml
deleted file mode 100644
index a62eacf73..0
---
[gentoo-commits] proj/sci:master commit in: sci-libs/calculix-cgx/files/, sci-libs/calculix-ccx/files/, ...
commit: e93aea35f5392272ade15fc3df09441cc411d457
Author: Grégory Salvan gmail com>
AuthorDate: Mon Mar 7 05:19:31 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Tue Mar 22 13:55:12 2016 +
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 000..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..000
---
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.0 -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 =
