[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/

[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/

[Andrew Ammerlaan]

commit:     7264a82f4aae8946561949ace590762e13a9c89d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Jan 13 20:50:37 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Jan 13 20:50:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7264a82f

sci-libs/elmer-fem: use https for homepage

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild | 4 ++--
 sci-misc/elmer-fem/elmer-fem-9999.ebuild      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild b/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
index ebc4ea74a..97a786a1b 100644
--- a/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
+++ b/sci-misc/elmer-fem/elmer-fem-6.0_p4651.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ ELMER_ROOT="elmerfem"
 MY_PN=${PN/elmer-/}
 
 DESCRIPTION="Finite element programs, libraries, and visualization tools - main fem"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer"
+HOMEPAGE="https://www.csc.fi/english/pages/elmer"
 SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651 -> ${P}.tar.gz"
 
 LICENSE="GPL-2"

diff --git a/sci-misc/elmer-fem/elmer-fem-9999.ebuild b/sci-misc/elmer-fem/elmer-fem-9999.ebuild
index 8683aed51..9251d5043 100644
--- a/sci-misc/elmer-fem/elmer-fem-9999.ebuild
+++ b/sci-misc/elmer-fem/elmer-fem-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ ELMER_ROOT="elmerfem"
 MY_PN=${PN/elmer-/}
 
 DESCRIPTION="Finite element programs, libraries, and visualization tools - main fem"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer"
+HOMEPAGE="https://www.csc.fi/english/pages/elmer"
 SRC_URI=""
 ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}"
 ESVN_PROJECT="${MY_PN}"

[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/

[Andrew Ammerlaan]

commit:     66376d24e683275dbb164b215bdbfc026dd9395c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 30 14:28:49 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 30 14:28:49 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=66376d24

sci-misc/elmer-fem: add post use flag for ElmerPOST

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-misc/elmer-fem/elmer-fem-9.0.ebuild | 7 ++++++-
 sci-misc/elmer-fem/metadata.xml         | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sci-misc/elmer-fem/elmer-fem-9.0.ebuild b/sci-misc/elmer-fem/elmer-fem-9.0.ebuild
index 8db83bd30..b576bbdb6 100644
--- a/sci-misc/elmer-fem/elmer-fem-9.0.ebuild
+++ b/sci-misc/elmer-fem/elmer-fem-9.0.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="ice gui matc mpi test"
+IUSE="ice gui matc mpi post test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -26,6 +26,10 @@ RDEPEND="
 	virtual/lapack
 	!sci-libs/arpack
 	mpi? ( sys-cluster/openmpi )
+	post? (
+		dev-lang/tcl:0=
+		dev-lang/tk:0=
+	)
 	gui? ( x11-libs/qwt:6 )
 "
 DEPEND="${RDEPEND}"
@@ -57,6 +61,7 @@ src_configure() {
 		-DWITH_OpenMP="$(usex mpi)"
 		-DWITH_MATC="$(usex matc)"
 		-DWITH_ElmerIce="$(usex ice)"
+		-DWITH_ELMERPOST="$(usex post)"
 		-DWITH_ELMERGUI="$(usex gui)"
 		-DWITH_QT5="$(usex gui)"
 		-DWITH_QWT="$(usex gui)"

diff --git a/sci-misc/elmer-fem/metadata.xml b/sci-misc/elmer-fem/metadata.xml
index ddc96e650..341020564 100644
--- a/sci-misc/elmer-fem/metadata.xml
+++ b/sci-misc/elmer-fem/metadata.xml
@@ -12,5 +12,6 @@
 		<flag name="gui">Build the ElmerGUI</flag>
 		<flag name="matc">Build the Elmer matc library</flag>
 		<flag name="ice">Build ElmerICE</flag>
+		<flag name="post">Build ElmerPOST</flag>
 	</use>
 </pkgmetadata>

[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/

[Andrew Ammerlaan]

commit:     7d85f8b46bafbba14fc9fe866630fc78b6ee5d33
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 10:24:41 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 10:25:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7d85f8b4

sci-misc/elmer-fem: http --> https

drop unused eclass

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild b/sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild
index c1ec06737..6d810ed14 100644
--- a/sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild
+++ b/sci-misc/elmer-fem/elmer-fem-9.0-r1.ebuild
@@ -5,13 +5,13 @@ EAPI=8
 
 FORTRAN_STANDARD=90
 
-inherit fortran-2 flag-o-matic cmake multilib
+inherit fortran-2 flag-o-matic cmake
 
 ELMER_ROOT="elmerfem"
 MY_PN=${PN/elmer-/}
 
 DESCRIPTION="Finite element programs, libraries, and visualization tools"
-HOMEPAGE="https://www.csc.fi/web/elmer http://www.elmerfem.org/blog/"
+HOMEPAGE="https://www.csc.fi/web/elmer https://www.elmerfem.org/blog/"
 SRC_URI="https://github.com/ElmerCSC/elmerfem/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"

[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-fem/

[Andrew Ammerlaan]

commit:     0f2b7f545c360f6ffc87ae81c6ce57f11f9392a6
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 16 10:53:04 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 16 10:53:04 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=0f2b7f54

sci-misc/elmer-fem: drop old

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-misc/elmer-fem/elmer-fem-9.0.ebuild | 73 ---------------------------------
 1 file changed, 73 deletions(-)

diff --git a/sci-misc/elmer-fem/elmer-fem-9.0.ebuild b/sci-misc/elmer-fem/elmer-fem-9.0.ebuild
deleted file mode 100644
index b576bbdb6..000000000
--- a/sci-misc/elmer-fem/elmer-fem-9.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_STANDARD=90
-
-inherit fortran-2 flag-o-matic cmake multilib
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools"
-HOMEPAGE="https://www.csc.fi/web/elmer http://www.elmerfem.org/blog/"
-SRC_URI="https://github.com/ElmerCSC/elmerfem/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ice gui matc mpi post test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	!sci-libs/arpack
-	mpi? ( sys-cluster/openmpi )
-	post? (
-		dev-lang/tcl:0=
-		dev-lang/tk:0=
-	)
-	gui? ( x11-libs/qwt:6 )
-"
-DEPEND="${RDEPEND}"
-# Note this seems to only configure correctly with the elmer version of umfpack
-# But this doesn't stop it from compiling / working without it
-
-PATCHES=(
-	"${FILESDIR}/${PN}-ElmerIce-compile.patch"
-)
-
-S="${WORKDIR}/elmerfem-release-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i '/#include <QPainter>/a #include <QPainterPath>' ElmerGUI/Application/twod/renderarea.cpp || die
-	test-flag-FC -fallow-argument-mismatch && append-fflags -fallow-argument-mismatch
-	test-flag-FC -fallow-invalid-boz && append-fflags -fallow-invalid-boz
-	# TODO: fix the tests, fails in compile phase: multiple rules to make target
-	rm -r fem/tests/* || die
-	touch fem/tests/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMPI_Fortran_COMPILE_FLAGS="$FCFLAGS"
-		-DCMAKE_Fortran_FLAGS="$FCFLAGS"
-		-DELMER_INSTALL_LIB_DIR="/usr/$(get_libdir)"
-		-DWITH_MPI="$(usex mpi)"
-		-DWITH_OpenMP="$(usex mpi)"
-		-DWITH_MATC="$(usex matc)"
-		-DWITH_ElmerIce="$(usex ice)"
-		-DWITH_ELMERPOST="$(usex post)"
-		-DWITH_ELMERGUI="$(usex gui)"
-		-DWITH_QT5="$(usex gui)"
-		-DWITH_QWT="$(usex gui)"
-		-DQWT_INCLUDE_DIR="/usr/include/qwt6"
-		-DQWT_LIBRARY="/usr/$(get_libdir)/libqwt6-qt5.so"
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake_src_configure
-}