From cda66a1a4d2ab6c0cc57c15d9090eb1c59080dd0 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Tue, 3 Dec 2013 14:34:02 +0100 Subject: sci-misc/elmer-meshgen2d: Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; use correct phase functions; simplify configure Package-Manager: portage-2.2.7 --- sci-misc/elmer-meshgen2d/ChangeLog | 13 ++++++ sci-misc/elmer-meshgen2d/Manifest | 4 +- .../elmer-meshgen2d-5.4.1-r1.ebuild | 49 ---------------------- .../elmer-meshgen2d-6.0_p4651.ebuild | 34 +++++++++++++++ .../elmer-meshgen2d/elmer-meshgen2d-9999.ebuild | 41 ++++++++---------- .../files/elmer-meshgen2d-6.0_p4651-oof.patch | 17 ++++++++ sci-misc/elmer-meshgen2d/metadata.xml | 5 +++ 7 files changed, 88 insertions(+), 75 deletions(-) create mode 100644 sci-misc/elmer-meshgen2d/ChangeLog delete mode 100644 sci-misc/elmer-meshgen2d/elmer-meshgen2d-5.4.1-r1.ebuild create mode 100644 sci-misc/elmer-meshgen2d/elmer-meshgen2d-6.0_p4651.ebuild create mode 100644 sci-misc/elmer-meshgen2d/files/elmer-meshgen2d-6.0_p4651-oof.patch create mode 100644 sci-misc/elmer-meshgen2d/metadata.xml (limited to 'sci-misc/elmer-meshgen2d') diff --git a/sci-misc/elmer-meshgen2d/ChangeLog b/sci-misc/elmer-meshgen2d/ChangeLog new file mode 100644 index 000000000..e50c27e34 --- /dev/null +++ b/sci-misc/elmer-meshgen2d/ChangeLog @@ -0,0 +1,13 @@ +# ChangeLog for sci-misc/elmer-meshgen2d +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*elmer-meshgen2d-6.0_p4651 (03 Dec 2013) + + 03 Dec 2013; Justin Lecher + -elmer-meshgen2d-5.4.1-r1.ebuild, +elmer-meshgen2d-6.0_p4651.ebuild, + elmer-meshgen2d-9999.ebuild, +files/elmer-meshgen2d-6.0_p4651-oof.patch, + +metadata.xml: + Bump EAPI; fix DESCRIPTION; drop keywords from live ebuild; use correct phase + functions; simplify configure + diff --git a/sci-misc/elmer-meshgen2d/Manifest b/sci-misc/elmer-meshgen2d/Manifest index 534071a02..8b83c109b 100644 --- a/sci-misc/elmer-meshgen2d/Manifest +++ b/sci-misc/elmer-meshgen2d/Manifest @@ -1,3 +1 @@ -DIST elmer-meshgen2d-5.4.1.tar.gz 1758287 SHA256 66b0da4021f76da746951bbba15727c754ee0f91f865dc80a500c175c65c74ca SHA512 7589b507445955226d7541499d57a19d17165039d66947beef14473d811a991576e8c975cacb93f413f638dd6be6a231c6c05f4751311903f26023437a21f560 WHIRLPOOL 46c402d82194cccfba8f35d63cbca9ef16b38466a98db190f02de0023df0b730e587fd6391a86d0978d1fd2173aef52733af4ce21537f8f9d6079b0ff8398aad -EBUILD elmer-meshgen2d-5.4.1-r1.ebuild 1092 SHA256 3ad76f3aa25ec1d255b85fc604f20ddf93faa78ceb491e935bf40f611732df4c SHA512 613395ac0c4654bddcfc6da21b402081df134990601a8ed52ecde27a171d989d8ded5ff6f48f5d2762f9962b81d7f10446e19a003e8d5ef0cca24990001994fc WHIRLPOOL 307dcfbc2991b40b5fa6f488ad2a57735bdd5a7ec9009bd3c985316c808bd4e4fa2c81e172551e6f9dec959980842e4fca2207edbca8f2bea9a65cbf698eeb94 -EBUILD elmer-meshgen2d-9999.ebuild 1120 SHA256 5cc4ca54ddaefc551b48b22abd1d11ebc3503c8e35065cf5cafa18d3ae9756bb SHA512 3b7503816cfe43cc88907e590b9555cf239fe70b4916b57027f91d812ff22e82b5f8cb5e59ad636a5e5d0e371cf597d916035519ef60d292cdd9b0beed5ca8a9 WHIRLPOOL 5980214f1cd808ed5552dccd50a408a38545a8cb21f8b98910de173970761f1a0de376d4498c26a46991684f9c0043f913495dde06cc762530f2c08ec578c9c1 +DIST elmer-meshgen2d-6.0_p4651.tar.gz 1758048 SHA256 8c8f5c86445ad78ddd3284e45b759b03331e65e6d949ee7d177de626b8c0316c SHA512 1522473ef314bb2e093e820f91194ee30d9e76aa693c2e258b0585246048c9c5368db56195838f27b6c31c286dfd32dae787be1079227e36ff1af07928075e30 WHIRLPOOL cd69f8a02a69f9cef0160c406a9f238bb08dd9d097d76a4657b3d4821e93e904790e8cc51fb487fce827846d8097f4a42e0c16f3d00d4c352d8dca475df00b58 diff --git a/sci-misc/elmer-meshgen2d/elmer-meshgen2d-5.4.1-r1.ebuild b/sci-misc/elmer-meshgen2d/elmer-meshgen2d-5.4.1-r1.ebuild deleted file mode 100644 index 66f721078..000000000 --- a/sci-misc/elmer-meshgen2d/elmer-meshgen2d-5.4.1-r1.ebuild +++ /dev/null @@ -1,49 +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, meshgen2d" -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="sys-libs/glibc" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PV}/meshgen2d" - -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" - 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-meshgen2d/elmer-meshgen2d-6.0_p4651.ebuild b/sci-misc/elmer-meshgen2d/elmer-meshgen2d-6.0_p4651.ebuild new file mode 100644 index 000000000..e8ec49efe --- /dev/null +++ b/sci-misc/elmer-meshgen2d/elmer-meshgen2d-6.0_p4651.ebuild @@ -0,0 +1,34 @@ +# 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 + +ELMER_ROOT="elmerfem" +MY_PN=${PN/elmer-/} + +DESCRIPTION="Finite element programs, libraries, and visualization tools - meshgen2d" +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" + +S="${WORKDIR}/meshgen2d" + +PATCHES=( + "${FILESDIR}"/${P}-oof.patch +) + +src_configure() { + local myeconfargs=( + $(use_with debug) + ) + autotools-utils_src_configure +} diff --git a/sci-misc/elmer-meshgen2d/elmer-meshgen2d-9999.ebuild b/sci-misc/elmer-meshgen2d/elmer-meshgen2d-9999.ebuild index fafab98be..e2cd9480d 100644 --- a/sci-misc/elmer-meshgen2d/elmer-meshgen2d-9999.ebuild +++ b/sci-misc/elmer-meshgen2d/elmer-meshgen2d-9999.ebuild @@ -1,46 +1,41 @@ -# 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, meshgen2d" +DESCRIPTION="Finite element programs, libraries, and visualization tools - meshgen2d" 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="~amd64 ~x86" IUSE="debug" -DEPEND="sys-libs/glibc" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${PV}/meshgen2d" +S="${WORKDIR}/meshgen2d" + +PATCHES=( + "${FILESDIR}"/${PN}-6.0_p4651-oof.patch +) 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" - econf $myconf || die "econf failed" + local myeconfargs=( + $(use_with debug) + ) + autotools-utils_src_configure } diff --git a/sci-misc/elmer-meshgen2d/files/elmer-meshgen2d-6.0_p4651-oof.patch b/sci-misc/elmer-meshgen2d/files/elmer-meshgen2d-6.0_p4651-oof.patch new file mode 100644 index 000000000..49ab50640 --- /dev/null +++ b/sci-misc/elmer-meshgen2d/files/elmer-meshgen2d-6.0_p4651-oof.patch @@ -0,0 +1,17 @@ + src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index d33d999..8111609 100755 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,7 +2,8 @@ + SUBDIRS=include + + INCLUDES = \ +- -I./include ++ -I$(srcdir)/include \ ++ -I$(builddir)/include + + bin_PROGRAMS = ElmerMesh2D Mesh2D + diff --git a/sci-misc/elmer-meshgen2d/metadata.xml b/sci-misc/elmer-meshgen2d/metadata.xml new file mode 100644 index 000000000..897aa2e6b --- /dev/null +++ b/sci-misc/elmer-meshgen2d/metadata.xml @@ -0,0 +1,5 @@ + + + + sci + -- cgit v1.2.3-65-gdbad