[gentoo-commits] proj/sci:master commit in: sci-misc/elmer-meshgen2d/, sci-misc/elmer-meshgen2d/files/

[Justin Lecher]

commit:     cda66a1a4d2ab6c0cc57c15d9090eb1c59080dd0
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 13:34:02 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 13:34:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cda66a1a

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 ++++++
 .../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 +++
 6 files changed, 87 insertions(+), 72 deletions(-)

diff --git a/sci-misc/elmer-meshgen2d/ChangeLog b/sci-misc/elmer-meshgen2d/ChangeLog
new file mode 100644
index 0000000..e50c27e
--- /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 <jlec@g.o>
+  -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/elmer-meshgen2d-5.4.1-r1.ebuild b/sci-misc/elmer-meshgen2d/elmer-meshgen2d-5.4.1-r1.ebuild
deleted file mode 100644
index 66f7210..0000000
--- 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 0000000..e8ec49e
--- /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 fafab98..e2cd948 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 0000000..49ab506
--- /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 0000000..897aa2e
--- /dev/null
+++ b/sci-misc/elmer-meshgen2d/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sci</herd>
+</pkgmetadata>