* [gentoo-commits] proj/sci:master commit in: sci-libs/calculix-ccx/
@ 2013-02-22 10:15 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2013-02-22 10:15 UTC (permalink / raw
To: gentoo-commits
commit: bf3fe7bcf8712d3a50d29b0ef33598c9a781f503
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 09:56:35 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 09:56:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bf3fe7bc
sci-libs/calculix-ccx: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; bump to EAPI=5; add missing dep on virtual/pkgconfig; use pkgconfig to detect arpack
Package-Manager: portage-2.2.0_alpha163
---
sci-libs/calculix-ccx/ChangeLog | 8 +++++++-
sci-libs/calculix-ccx/calculix-ccx-2.2.ebuild | 19 +++++++++++--------
sci-libs/calculix-ccx/metadata.xml | 8 ++++----
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/sci-libs/calculix-ccx/ChangeLog b/sci-libs/calculix-ccx/ChangeLog
index a8dbeff..bf56c0d 100644
--- a/sci-libs/calculix-ccx/ChangeLog
+++ b/sci-libs/calculix-ccx/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for sci-libs/calculix-ccx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Feb 2013; Justin Lecher <jlec@gentoo.org> calculix-ccx-2.2.ebuild,
+ metadata.xml:
+ Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+ bump to EAPI=5; add missing dep on virtual/pkgconfig; use pkgconfig to detect
+ arpack
+
*calculix-ccx-2.2 (29 Oct 2010)
29 Oct 2010; Oliver Borm (boroli) <oli.borm@web.de>
diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.2.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.2.ebuild
index 71b587f..0a3ea9d 100644
--- a/sci-libs/calculix-ccx/calculix-ccx-2.2.ebuild
+++ b/sci-libs/calculix-ccx/calculix-ccx-2.2.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=5
-inherit eutils
+inherit eutils toolchain-funcs
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
+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 )"
@@ -19,11 +20,13 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="arpack doc examples lapack threads"
-RDEPEND="arpack? ( >=sci-libs/arpack-96 )
+RDEPEND="
+ arpack? ( sci-libs/arpack )
lapack? ( virtual/lapack )
>=sci-libs/spooles-2.2
virtual/blas"
DEPEND="${RDEPEND}
+ virtual/pkgconfig
doc? ( app-text/ghostscript-gpl )"
S=${WORKDIR}/CalculiX/${MY_P}/src
@@ -34,9 +37,9 @@ src_prepare() {
}
src_configure() {
- use lapack && export LAPACK=`pkg-config --libs lapack`
+ use lapack && export LAPACK=$($(tc-getPKG_CONFIG) --libs lapack)
- export BLAS=`pkg-config --libs blas`
+ export BLAS=$($(tc-getPKG_CONFIG) --libs blas)
export SPOOLESINC="-I/usr/include/spooles -DSPOOLES"
export SPOOLESLIB="-lspooles"
@@ -47,7 +50,7 @@ src_configure() {
if use arpack; then
export ARPACK="-DARPACK"
- export ARPACKLIB="-larpack"
+ export ARPACKLIB=$($(tc-getPKG_CONFIG) --libs arpack)
fi
}
diff --git a/sci-libs/calculix-ccx/metadata.xml b/sci-libs/calculix-ccx/metadata.xml
index c201d7b..f9a85f7 100644
--- a/sci-libs/calculix-ccx/metadata.xml
+++ b/sci-libs/calculix-ccx/metadata.xml
@@ -1,8 +1,8 @@
<?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>
- </use>
+ <herd>sci</herd>
+ <use>
+ <flag name="arpack"> Add sparse eigen value support via sci-libs/arpack </flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/calculix-ccx/
@ 2014-09-07 10:11 Jauhien Piatlicki
0 siblings, 0 replies; 6+ messages in thread
From: Jauhien Piatlicki @ 2014-09-07 10:11 UTC (permalink / raw
To: gentoo-commits
commit: 4e62a2744621cf80d94ec4a420df5e2cca9e6a13
Author: Rongcui Dong <carldong76 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 7 02:18:00 2014 +0000
Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Sun Sep 7 02:18:00 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4e62a274
Fixed calculix-ccx link to arpack
---
sci-libs/calculix-ccx/ChangeLog | 6 ++++++
.../{calculix-ccx-2.7.ebuild => calculix-ccx-2.7-r1.ebuild} | 1 +
2 files changed, 7 insertions(+)
diff --git a/sci-libs/calculix-ccx/ChangeLog b/sci-libs/calculix-ccx/ChangeLog
index 96ad8ad..7eccdea 100644
--- a/sci-libs/calculix-ccx/ChangeLog
+++ b/sci-libs/calculix-ccx/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*calculix-ccx-2.7-r1 (07 Sep 2014)
+
+ 07 Sep 2014; Rongcui Dong <carldong76@gmail.com> +calculix-ccx-2.7-r1.ebuild,
+ -calculix-ccx-2.7.ebuild:
+ Fixed arpack linking problem
+
*calculix-ccx-2.7 (05 Sep 2014)
05 Sep 2014; Rongcui Dong <carldong76@gmail.com> +calculix-ccx-2.7.ebuild,
diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.7.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild
similarity index 98%
rename from sci-libs/calculix-ccx/calculix-ccx-2.7.ebuild
rename to sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild
index 5ed4d92..2394647 100644
--- a/sci-libs/calculix-ccx/calculix-ccx-2.7.ebuild
+++ b/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild
@@ -50,6 +50,7 @@ src_configure() {
if use arpack; then
export ARPACK="-DARPACK"
export ARPACKLIB=$($(tc-getPKG_CONFIG) --libs arpack)
+ append-cflags "${ARPACK}"
fi
export CC="$(tc-getCC)"
export FC="$(tc-getFC)"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/calculix-ccx/
@ 2015-05-23 15:53 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2015-05-23 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 8bacdcf512ed180f3fcc358772e267289f902096
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat May 23 13:06:32 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat May 23 13:06:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=8bacdcf5
sci-libs/calculix-ccx: Add missing die
Package-Manager: portage-2.2.18
sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild
index a511dc9..5dc1f00 100644
--- a/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild
+++ b/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -59,7 +59,7 @@ src_install () {
dosym ${MY_P} /usr/bin/ccx
if use doc; then
- cd "${S}/../doc"
+ cd "${S}/../doc" || die
ps2pdf ${MY_P}.ps ${MY_P}.pdf
dodoc ${MY_P}.pdf
fi
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/calculix-ccx/
@ 2015-05-23 17:11 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2015-05-23 17:11 UTC (permalink / raw
To: gentoo-commits
commit: b36d2b96f9048acd68730785167179418863301b
Author: Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Sat May 23 17:03:31 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat May 23 17:03:31 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b36d2b96
sci-libs/calculix-ccx: inherit fortran-2 as well
thanks to jlec for notice
sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild
index 61feea2..0702022 100644
--- a/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild
+++ b/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic fortran-2
MY_P=ccx_${PV/_/}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/calculix-ccx/
@ 2015-11-28 18:59 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2015-11-28 18:59 UTC (permalink / raw
To: gentoo-commits
commit: 25480697060597369927ecd9794bccd55a87e5c1
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 18:24:05 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 18:24:05 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=25480697
sci-libs/calculix-ccx: Drop old
GitHub: resolves gentoo-science/sci#420
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild | 71 ------------------------
1 file changed, 71 deletions(-)
diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild
deleted file mode 100644
index e296ebd..0000000
--- a/sci-libs/calculix-ccx/calculix-ccx-2.7-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic
-
-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 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
-
-src_prepare() {
- epatch "${FILESDIR}"/01_${MY_P}_Makefile_custom_cc_flags_spooles_arpack.patch
- epatch "${FILESDIR}"/01_${MY_P}_lapack.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 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
- dodoc ${MY_P}.pdf
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${S}"/../test/*
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/calculix-ccx/
@ 2017-01-29 11:59 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2017-01-29 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 0f57c204e1d5980cc96cbb04f2090ea2235d3f82
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 11:47:44 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 11:59:23 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=0f57c204
sci-libs/calculix-ccx: Drop Trailing whitespace
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild
index c9eb261..d6770ca 100644
--- a/sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild
+++ b/sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -44,7 +44,7 @@ src_configure() {
if use threads; then
append-cflags "-DUSE_MT"
fi
-
+
if use openmp; then
append-fflags "-fopenmp"
append-cflags "-fopenmp"
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-29 11:59 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-23 17:11 [gentoo-commits] proj/sci:master commit in: sci-libs/calculix-ccx/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2017-01-29 11:59 Justin Lecher
2015-11-28 18:59 Justin Lecher
2015-05-23 15:53 Justin Lecher
2014-09-07 10:11 Jauhien Piatlicki
2013-02-22 10:15 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox