[gentoo-commits] proj/sci:master commit in: sci-libs/elmer-eio/files/, sci-libs/elmer-eio/

["Justin Lecher" <jlec@gentoo.org>]

commit:     4e8bd92cd299c642f9c7fe12cf3cfa144c7e3255
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 08:26:50 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 08:26:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4e8bd92c

sci-libs/elmer-eio: Use autotools-utils.eclass and handle static-libs

Package-Manager: portage-2.2.7

---
 sci-libs/elmer-eio/ChangeLog                       |  4 +++
 sci-libs/elmer-eio/elmer-eio-5.4.1.ebuild          | 17 ++++++----
 sci-libs/elmer-eio/elmer-eio-9999.ebuild           | 16 ++++++----
 .../elmer-eio/files/elmer-eio-5.4.1-shared.patch   | 37 ++++++++++++++++++++++
 4 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/sci-libs/elmer-eio/ChangeLog b/sci-libs/elmer-eio/ChangeLog
index 7c603f4..0c94133 100644
--- a/sci-libs/elmer-eio/ChangeLog
+++ b/sci-libs/elmer-eio/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   03 Dec 2013; Justin Lecher <jlec@gentoo.org> elmer-eio-5.4.1.ebuild,
+  elmer-eio-9999.ebuild, +files/elmer-eio-5.4.1-shared.patch:
+  Use autotools-utils.eclass and handle static-libs
+
+  03 Dec 2013; Justin Lecher <jlec@gentoo.org> elmer-eio-5.4.1.ebuild,
   -elmer-eio-5.4.1-r1.ebuild, elmer-eio-9999.ebuild:
   Fix DESCRIPTION
 

diff --git a/sci-libs/elmer-eio/elmer-eio-5.4.1.ebuild b/sci-libs/elmer-eio/elmer-eio-5.4.1.ebuild
index addcacf..16ba681 100644
--- a/sci-libs/elmer-eio/elmer-eio-5.4.1.ebuild
+++ b/sci-libs/elmer-eio/elmer-eio-5.4.1.ebuild
@@ -4,7 +4,9 @@
 
 EAPI=5
 
-inherit autotools eutils
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
 
 ELMER_ROOT="elmerfem"
 MY_PN=${PN/elmer-/}
@@ -12,19 +14,20 @@ MY_PN=${PN/elmer-/}
 DESCRIPTION="Finite element programs, libraries, and visualization tools - elmer I/O 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"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug static-libs"
 
 S="${WORKDIR}/eio"
 
-src_prepare() {
-	eautoreconf
-}
+PATCHES=( "${FILESDIR}"/${P}-shared.patch )
 
 src_configure() {
-	econf $(use_with debug)
+	local myeconfargs=(
+		--enable-shared
+		$(use_with debug)
+	)
+	autotools-utils_src_configure
 }

diff --git a/sci-libs/elmer-eio/elmer-eio-9999.ebuild b/sci-libs/elmer-eio/elmer-eio-9999.ebuild
index c5fd872..2aa788a 100644
--- a/sci-libs/elmer-eio/elmer-eio-9999.ebuild
+++ b/sci-libs/elmer-eio/elmer-eio-9999.ebuild
@@ -4,7 +4,9 @@
 
 EAPI=5
 
-inherit autotools eutils subversion
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils subversion
 
 ELMER_ROOT="elmerfem"
 MY_PN=${PN/elmer-/}
@@ -18,14 +20,16 @@ ESVN_PROJECT="${MY_PN}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
+IUSE="debug static-libs"
 
 S="${WORKDIR}/eio"
 
-src_prepare() {
-	eautoreconf
-}
+PATCHES=( "${FILESDIR}"/${P}-shared.patch )
 
 src_configure() {
-	econf $(use_with debug)
+	local myeconfargs=(
+		--enable-shared
+		$(use_with debug)
+	)
+	autotools-utils_src_configure
 }

diff --git a/sci-libs/elmer-eio/files/elmer-eio-5.4.1-shared.patch b/sci-libs/elmer-eio/files/elmer-eio-5.4.1-shared.patch
new file mode 100644
index 0000000..f5a701c
--- /dev/null
+++ b/sci-libs/elmer-eio/files/elmer-eio-5.4.1-shared.patch
@@ -0,0 +1,37 @@
+ configure.in    | 2 +-
+ src/Makefile.am | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index ac5ce92..cd8fc53 100755
+--- a/configure.in
++++ b/configure.in
+@@ -1,5 +1,5 @@
+ AC_INIT(src/eio_api_f.cpp)
+-
++LT_INIT
+ dnl the fortran stuff needs to be pretty new to work on SunOS
+ dnl AC_PREREQ(2.59c)
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1836aba..4d73a4b 100755
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,8 +15,8 @@ COMMON_SRCS =  \
+ 	EIOPartWriter.cpp \
+ 	EIOSolverAgent.cpp 
+ 
+-libeioc_a_SOURCES = $(COMMON_SRCS) eio_api_c.cpp
+-libeiof_a_SOURCES = $(COMMON_SRCS) eio_api_f.cpp
++libeioc_la_SOURCES = $(COMMON_SRCS) eio_api_c.cpp
++libeiof_la_SOURCES = $(COMMON_SRCS) eio_api_f.cpp
+ 
+ # if USE_SHARED_LIBS
+ # noinst_LIBRARIES = libeioc.a libeiof.a
+@@ -28,5 +28,5 @@ libeiof_a_SOURCES = $(COMMON_SRCS) eio_api_f.cpp
+ # libeiof.$(SHLEXT): libeiof.a
+ # 	$(SH_LD2) $(SH_LDFLAGS) $(B64FLAGS) $(LDFLAGS) -o $@ libeiof.a
+ # else
+-lib_LIBRARIES = libeioc.a libeiof.a
++lib_LTLIBRARIES = libeioc.la libeiof.la
+ # endif