* [gentoo-commits] proj/sci:master commit in: sci-libs/elmer-eio/files/, sci-libs/elmer-eio/
@ 2013-12-03 14:53 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-12-03 14:53 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/elmer-eio/files/, sci-libs/elmer-eio/
@ 2013-12-03 14:53 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-12-03 14:53 UTC (permalink / raw
To: gentoo-commits
commit: dcca7025aecde8efa0c08605c52f070d1495499b
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 3 09:32:05 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 09:32:05 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dcca7025
sci-libs/elmer-eio: Fix version; force execution of all phases
Package-Manager: portage-2.2.7
---
sci-libs/elmer-eio/ChangeLog | 5 +++++
.../{elmer-eio-5.4.1.ebuild => elmer-eio-6.0_p4651.ebuild} | 2 +-
sci-libs/elmer-eio/elmer-eio-9999.ebuild | 7 ++++++-
...mer-eio-5.4.1-shared.patch => elmer-eio-6.0_p4651-shared.patch} | 0
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/sci-libs/elmer-eio/ChangeLog b/sci-libs/elmer-eio/ChangeLog
index 0c94133..a8ee6aa 100644
--- a/sci-libs/elmer-eio/ChangeLog
+++ b/sci-libs/elmer-eio/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 Dec 2013; Justin Lecher <jlec@gentoo.org> -elmer-eio-5.4.1.ebuild,
+ +elmer-eio-6.0_p4651.ebuild, elmer-eio-9999.ebuild,
+ -files/elmer-eio-5.4.1-shared.patch, +files/elmer-eio-6.0_p4651-shared.patch:
+ Fix version; force execution of all phases
+
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
diff --git a/sci-libs/elmer-eio/elmer-eio-5.4.1.ebuild b/sci-libs/elmer-eio/elmer-eio-6.0_p4651.ebuild
similarity index 90%
rename from sci-libs/elmer-eio/elmer-eio-5.4.1.ebuild
rename to sci-libs/elmer-eio/elmer-eio-6.0_p4651.ebuild
index 16ba681..fb3ea49 100644
--- a/sci-libs/elmer-eio/elmer-eio-5.4.1.ebuild
+++ b/sci-libs/elmer-eio/elmer-eio-6.0_p4651.ebuild
@@ -13,7 +13,7 @@ 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"
+SRC_URI="http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651 -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/sci-libs/elmer-eio/elmer-eio-9999.ebuild b/sci-libs/elmer-eio/elmer-eio-9999.ebuild
index 2aa788a..da27e58 100644
--- a/sci-libs/elmer-eio/elmer-eio-9999.ebuild
+++ b/sci-libs/elmer-eio/elmer-eio-9999.ebuild
@@ -24,7 +24,12 @@ IUSE="debug static-libs"
S="${WORKDIR}/eio"
-PATCHES=( "${FILESDIR}"/${P}-shared.patch )
+PATCHES=( "${FILESDIR}"/${PN}-6.0_p4651-shared.patch )
+
+src_prepare() {
+ subversion_src_prepare
+ autotools-utils_src_prepare
+}
src_configure() {
local myeconfargs=(
diff --git a/sci-libs/elmer-eio/files/elmer-eio-5.4.1-shared.patch b/sci-libs/elmer-eio/files/elmer-eio-6.0_p4651-shared.patch
similarity index 100%
rename from sci-libs/elmer-eio/files/elmer-eio-5.4.1-shared.patch
rename to sci-libs/elmer-eio/files/elmer-eio-6.0_p4651-shared.patch
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-03 14:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-03 14:53 [gentoo-commits] proj/sci:master commit in: sci-libs/elmer-eio/files/, sci-libs/elmer-eio/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2013-12-03 14:53 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox