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

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

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