From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/elmer-hutiter/, sci-libs/elmer-hutiter/files/
Date: Tue, 3 Dec 2013 14:53:01 +0000 (UTC) [thread overview]
Message-ID: <1386058896.e962f32ed979ded871322bbcba8f10de0710bc93.jlec@gentoo> (raw)
commit: e962f32ed979ded871322bbcba8f10de0710bc93
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 3 08:21:36 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 08:21:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e962f32e
sci-libs/elmer-hutiter: Bump EAPI; fix license; fix DESCRIPTION; drop keywords from live ebuild; use correct phase functions; simplify configure; build shared libraries
Package-Manager: portage-2.2.7
---
sci-libs/elmer-hutiter/ChangeLog | 12 +++++
.../elmer-hutiter/elmer-hutiter-5.4.1-r1.ebuild | 53 ---------------------
sci-libs/elmer-hutiter/elmer-hutiter-5.4.1.ebuild | 38 +++++++++++++++
sci-libs/elmer-hutiter/elmer-hutiter-9999.ebuild | 54 +++++++++-------------
.../files/elmer-hutiter-5.4.1-shared.patch | 33 +++++++++++++
sci-libs/elmer-hutiter/metadata.xml | 5 ++
6 files changed, 111 insertions(+), 84 deletions(-)
diff --git a/sci-libs/elmer-hutiter/ChangeLog b/sci-libs/elmer-hutiter/ChangeLog
new file mode 100644
index 0000000..ae14a71
--- /dev/null
+++ b/sci-libs/elmer-hutiter/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for sci-libs/elmer-hutiter
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*elmer-hutiter-5.4.1 (03 Dec 2013)
+
+ 03 Dec 2013; Justin Lecher <jlec@gentoo.org> +elmer-hutiter-5.4.1.ebuild,
+ -elmer-hutiter-5.4.1-r1.ebuild, elmer-hutiter-9999.ebuild,
+ +files/elmer-hutiter-5.4.1-shared.patch, +metadata.xml:
+ Bump EAPI; fix license; fix DESCRIPTION; drop keywords from live ebuild; use
+ correct phase functions; simplify configure; build shared libraries
+
diff --git a/sci-libs/elmer-hutiter/elmer-hutiter-5.4.1-r1.ebuild b/sci-libs/elmer-hutiter/elmer-hutiter-5.4.1-r1.ebuild
deleted file mode 100644
index c9be1bc..0000000
--- a/sci-libs/elmer-hutiter/elmer-hutiter-5.4.1-r1.ebuild
+++ /dev/null
@@ -1,53 +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, hutiter library"
-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"
-ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/"
-ESVN_PROJECT="${MY_PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-DEPEND="sys-libs/glibc
- virtual/blas"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PV}/hutiter"
-
-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"
- myconf="$myconf --with-blas"
- 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-libs/elmer-hutiter/elmer-hutiter-5.4.1.ebuild b/sci-libs/elmer-hutiter/elmer-hutiter-5.4.1.ebuild
new file mode 100644
index 0000000..fbf90d4
--- /dev/null
+++ b/sci-libs/elmer-hutiter/elmer-hutiter-5.4.1.ebuild
@@ -0,0 +1,38 @@
+# 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 toolchain-funcs
+
+ELMER_ROOT="elmerfem"
+MY_PN=${PN/elmer-/}
+
+DESCRIPTION="Finite element programs, libraries, and visualization tools - hutiter library"
+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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug static-libs"
+
+RDEPEND="virtual/blas"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}"/hutiter
+
+PATCHES=( "${FILESDIR}"/${P}-shared.patch )
+
+src_configure() {
+ local myeconfargs=(
+ --enable-shared
+ $(use_with debug) \
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+ )
+ autotools-utils_src_configure
+}
diff --git a/sci-libs/elmer-hutiter/elmer-hutiter-9999.ebuild b/sci-libs/elmer-hutiter/elmer-hutiter-9999.ebuild
index d0f90b9..17125e1 100644
--- a/sci-libs/elmer-hutiter/elmer-hutiter-9999.ebuild
+++ b/sci-libs/elmer-hutiter/elmer-hutiter-9999.ebuild
@@ -1,48 +1,40 @@
-# 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 toolchain-funcs subversion
ELMER_ROOT="elmerfem"
MY_PN=${PN/elmer-/}
-DESCRIPTION="Elmer is a collection of finite element programs, libraries, and visualization tools, hutiter library"
+DESCRIPTION="Finite element programs, libraries, and visualization tools - hutiter library"
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"
+LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-DEPEND="sys-libs/glibc
- virtual/blas"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PV}/hutiter"
-
-src_prepare() {
- #unpack ${A}
- cd "${S}"
- # configure must be executable
- #chmod +x configure
- eautoreconf
-}
+KEYWORDS=""
+IUSE="debug static-libs"
+
+RDEPEND="virtual/blas"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}"/hutiter
+
+PATCHES=( "${FILESDIR}"/${PN}-5.4.1-shared.patch )
src_configure() {
- cd "${S}"
- local myconf
- export FC="gfortran"
- export F77="gfortran"
- myconf="$myconf --with-blas"
- use debug &&
- myconf="${myconf} --with-debug" ||
- myconf="${myconf} --without-debug"
- econf $myconf || die "econf failed"
+ local myeconfargs=(
+ --enable-shared
+ $(use_with debug) \
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+ )
+ autotools-utils_src_configure
}
diff --git a/sci-libs/elmer-hutiter/files/elmer-hutiter-5.4.1-shared.patch b/sci-libs/elmer-hutiter/files/elmer-hutiter-5.4.1-shared.patch
new file mode 100644
index 0000000..cc7e0cd
--- /dev/null
+++ b/sci-libs/elmer-hutiter/files/elmer-hutiter-5.4.1-shared.patch
@@ -0,0 +1,33 @@
+ src/Makefile.am | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bdfb73f..8800d1a 100755
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -49,8 +49,9 @@ COMMON_SRCS = \
+
+
+
+-lib_LIBRARIES = libhuti.a
+-libhuti_a_SOURCES = $(COMMON_SRCS)
++lib_LTLIBRARIES = libhuti.la
++libhuti_la_SOURCES = $(COMMON_SRCS)
++libhuti_la_LIBADD =
+
+ #################################################################################
+ # If sources are missing generate them with the preprocessor.
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 5b25b28..7356ca4 100755
+--- a/configure.in
++++ b/configure.in
+@@ -1,5 +1,5 @@
+ AC_INIT(src/huti_cg.src)
+-
++LT_INIT
+ dnl AC_PREREQ(2.59c)
+
+ AC_CANONICAL_HOST
diff --git a/sci-libs/elmer-hutiter/metadata.xml b/sci-libs/elmer-hutiter/metadata.xml
new file mode 100644
index 0000000..897aa2e
--- /dev/null
+++ b/sci-libs/elmer-hutiter/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>
next reply other threads:[~2013-12-03 14:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-03 14:53 Justin Lecher [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-12-03 14:53 [gentoo-commits] proj/sci:master commit in: sci-libs/elmer-hutiter/, sci-libs/elmer-hutiter/files/ Justin Lecher
2021-01-30 14:30 Andrew Ammerlaan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386058896.e962f32ed979ded871322bbcba8f10de0710bc93.jlec@gentoo \
--to=jlec@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox