From f646e47ce7406437af4891c1c6266a671a17c4ad Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Tue, 3 Dec 2013 11:01:48 +0100 Subject: sci-misc/elmer-elmergrid: Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; use correct phase functions; simplify configure; link against external metis Package-Manager: portage-2.2.7 --- sci-misc/elmer-elmergrid/ChangeLog | 12 +++++ sci-misc/elmer-elmergrid/Manifest | 4 +- .../elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild | 51 ---------------------- .../elmer-elmergrid-6.0_p4651.ebuild | 37 ++++++++++++++++ .../elmer-elmergrid/elmer-elmergrid-9999.ebuild | 46 +++++++++---------- sci-misc/elmer-elmergrid/metadata.xml | 5 +++ 6 files changed, 76 insertions(+), 79 deletions(-) create mode 100644 sci-misc/elmer-elmergrid/ChangeLog delete mode 100644 sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild create mode 100644 sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild create mode 100644 sci-misc/elmer-elmergrid/metadata.xml (limited to 'sci-misc/elmer-elmergrid') diff --git a/sci-misc/elmer-elmergrid/ChangeLog b/sci-misc/elmer-elmergrid/ChangeLog new file mode 100644 index 000000000..95ddc32eb --- /dev/null +++ b/sci-misc/elmer-elmergrid/ChangeLog @@ -0,0 +1,12 @@ +# ChangeLog for sci-misc/elmer-elmergrid +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*elmer-elmergrid-6.0_p4651 (03 Dec 2013) + + 03 Dec 2013; Justin Lecher -elmer-elmergrid-5.4.1.ebuild, + +elmer-elmergrid-6.0_p4651.ebuild, elmer-elmergrid-9999.ebuild, + +metadata.xml: + Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; use correct phase + functions; simplify configure; link against external metis + diff --git a/sci-misc/elmer-elmergrid/Manifest b/sci-misc/elmer-elmergrid/Manifest index 861db7ef2..1a895c9f0 100644 --- a/sci-misc/elmer-elmergrid/Manifest +++ b/sci-misc/elmer-elmergrid/Manifest @@ -1,3 +1 @@ -DIST elmer-elmergrid-5.4.1.tar.gz 691564 SHA256 f401dc06720f39bc55ea020c0ce5f0fffffe4236e83e13969ce879ce4362d31b SHA512 c0f297ec4c14d3dfa32e0f5a00d0956fb60d589ac3189e765a0e590837a4cd27eff732ba84de04fc9e55c6bb436e3249c292ad5503f3a5e620f48fb60ece926a WHIRLPOOL 2b236cef9cd5c5379aa1196a640bc2b80bb6df2997c38f2806dacd15a6a64271146e4c28d7bb5f3fdbea48cd19143ceb80c9348e734304bf857e5aace9813a1f -EBUILD elmer-elmergrid-5.4.1-r1.ebuild 1137 SHA256 1f657ac3eeb6b520ef2448e9a536f6f73058f6d5df475c40750bef0a6b87feee SHA512 3a08add2a285b1f899b2589ed2e4b4163a248d505ea18140f52b2d04f54498f5910b747592ffe238b4b0b14351fcfce6bc4e3dd7ba361cb66b71142d81df8629 WHIRLPOOL 7df8a808b3102b12c76db32d54d2ca3e3b3ab44f0d0623d80d2160d4d8f5e9befc4624f8238722f502562b18e10fd958fb36562b8c199364bc3a1f1a9b971fc0 -EBUILD elmer-elmergrid-9999.ebuild 1165 SHA256 8563c652ab6c9856ad6064b41df817db5aca32e81655d5c8876feca4355ed647 SHA512 a3bfa622f105d10d5cd3333d873e056d28a3e08c7845d0fd0196186fd8fa05c4136b4aa7b3676a15f605df1e0a6aefefc7e276648f8ff477b09f0dcf8195f341 WHIRLPOOL 4ee2b97fc08e4359f1e3b4052a0f336204a3ab0aa1f743d5384e74c8dd3bcf57a29dfc7b0a04ebd1eeaa63e7f5679a0b5681a382f6318272eda235cdc138e6d7 +DIST elmer-elmergrid-6.0_p4651.tar.gz 717102 SHA256 3ffd59716892aaeb2605a70c4ca00c872e2aff07ba9be0a50b09868bea75950c SHA512 64d1d907016f65fa324279cc0a73af818df1e86bd05f74e949b6e6166ad77787e465bb27b599767d7a31a3dd5f3744226a0cfbcf58e65693280eb1c59a11b87d WHIRLPOOL 9807abc30d566ce8c536465776d58e168377a04e05d77ed3e3a6d05ce39e7835e7e01a985ffdc8f01bd07ef7e64db21ab514dbd95461b1a32449bec306a6e461 diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild b/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild deleted file mode 100644 index 1e1bd6f8c..000000000 --- a/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit autotools eutils - -ELMER_ROOT="elmerfem" -MY_PN=${PN/elmer-/} - -DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, elmergrid" -HOMEPAGE="http://www.csc.fi/english/pages/elmer" -SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV}/${MY_PN}/?view=tar -> ${P}.tar.gz" -RESTRICT="mirror" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug" -DEPEND="sci-libs/matc - sys-libs/glibc" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PV}/elmergrid" - -src_unpack() { - unpack ${A} - cd "${S}" - # configure must be executable - chmod +x configure - eautoreconf -} - -src_compile() { - cd "${S}" - local myconf - export FC="gfortran" - export F77="gfortran" - use debug && - myconf="${myconf} --with-debug" || - myconf="${myconf} --without-debug" - myconf="$myconf --with-matc" - econf $myconf || die "econf failed" - emake || die "emake failed" -} - - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" -} diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild b/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild new file mode 100644 index 000000000..743d4eeaf --- /dev/null +++ b/sci-misc/elmer-elmergrid/elmer-elmergrid-6.0_p4651.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils multilib + +ELMER_ROOT="elmerfem" +MY_PN=${PN/elmer-/} + +DESCRIPTION="Finite element programs, libraries, and visualization tools - elmergrid" +HOMEPAGE="http://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" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +RDEPEND=" + sci-libs/matc + sci-libs/metis" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/elmergrid" + +src_configure() { + local myeconfargs=( + $(use_with debug) + --with-metis-libs="${EPREFIX}"/usr/$(get_libdir) + --with-metis-include="${EPREFIX}"/usr/include/metis + ) + autotools-utils_src_configure +} diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-9999.ebuild b/sci-misc/elmer-elmergrid/elmer-elmergrid-9999.ebuild index 67549e910..fe17b7903 100644 --- a/sci-misc/elmer-elmergrid/elmer-elmergrid-9999.ebuild +++ b/sci-misc/elmer-elmergrid/elmer-elmergrid-9999.ebuild @@ -1,48 +1,44 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI=5 -inherit autotools eutils subversion +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils subversion ELMER_ROOT="elmerfem" MY_PN=${PN/elmer-/} -DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, elmergrid" +DESCRIPTION="Finite element programs, libraries, and visualization tools - elmergrid" HOMEPAGE="http://www.csc.fi/english/pages/elmer" -#SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV}/${MY_PN}/?view=tar -> ${P}.tar.gz" SRC_URI="" -RESTRICT="mirror" ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}" ESVN_PROJECT="${MY_PN}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="" IUSE="debug" -DEPEND="sci-libs/matc - sys-libs/glibc" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${PV}/elmergrid" +RDEPEND=" + sci-libs/matc + sci-libs/metis" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/elmergrid" src_prepare() { - #unpack ${A} - cd "${S}" - # configure must be executable - #chmod +x configure - eautoreconf + subversion_src_prepare + autotools-utils_src_prepare } src_configure() { - cd "${S}" - local myconf - export FC="gfortran" - export F77="gfortran" - use debug && - myconf="${myconf} --with-debug" || - myconf="${myconf} --without-debug" - myconf="$myconf --with-matc" - econf $myconf || die "econf failed" + local myeconfargs=( + $(use_with debug) + --with-metis-libs="${EPREFIX}"/usr/$(get_libdir) + --with-metis-include="${EPREFIX}"/usr/include/metis + ) + autotools-utils_src_configure } diff --git a/sci-misc/elmer-elmergrid/metadata.xml b/sci-misc/elmer-elmergrid/metadata.xml new file mode 100644 index 000000000..897aa2e6b --- /dev/null +++ b/sci-misc/elmer-elmergrid/metadata.xml @@ -0,0 +1,5 @@ + + + + sci + -- cgit v1.2.3-65-gdbad