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

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

commit:     09f2ad6a399b14f6f2c3bb821d10bdc1b9d6440e
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 09:38:41 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 09:38:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=09f2ad6a

sci-libs/elmer-hutiter: Fix version; force execution of all phases; Fix LICENSE

Package-Manager: portage-2.2.7

---
 sci-libs/elmer-hutiter/ChangeLog                                 | 6 ++++++
 ...elmer-hutiter-5.4.1.ebuild => elmer-hutiter-6.0_p4651.ebuild} | 4 ++--
 sci-libs/elmer-hutiter/elmer-hutiter-9999.ebuild                 | 9 +++++++--
 ...r-5.4.1-shared.patch => elmer-hutiter-6.0_p4651-shared.patch} | 0
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/sci-libs/elmer-hutiter/ChangeLog b/sci-libs/elmer-hutiter/ChangeLog
index ae14a71..dc6c5af 100644
--- a/sci-libs/elmer-hutiter/ChangeLog
+++ b/sci-libs/elmer-hutiter/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Dec 2013; Justin Lecher <jlec@gentoo.org> -elmer-hutiter-5.4.1.ebuild,
+  +elmer-hutiter-6.0_p4651.ebuild, elmer-hutiter-9999.ebuild,
+  -files/elmer-hutiter-5.4.1-shared.patch,
+  +files/elmer-hutiter-6.0_p4651-shared.patch:
+  Fix version; force execution of all phases; Fix LICENSE
+
 *elmer-hutiter-5.4.1 (03 Dec 2013)
 
   03 Dec 2013; Justin Lecher <jlec@gentoo.org> +elmer-hutiter-5.4.1.ebuild,

diff --git a/sci-libs/elmer-hutiter/elmer-hutiter-5.4.1.ebuild b/sci-libs/elmer-hutiter/elmer-hutiter-6.0_p4651.ebuild
similarity index 90%
rename from sci-libs/elmer-hutiter/elmer-hutiter-5.4.1.ebuild
rename to sci-libs/elmer-hutiter/elmer-hutiter-6.0_p4651.ebuild
index fbf90d4..26e9882 100644
--- a/sci-libs/elmer-hutiter/elmer-hutiter-5.4.1.ebuild
+++ b/sci-libs/elmer-hutiter/elmer-hutiter-6.0_p4651.ebuild
@@ -13,9 +13,9 @@ 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"
+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"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug static-libs"

diff --git a/sci-libs/elmer-hutiter/elmer-hutiter-9999.ebuild b/sci-libs/elmer-hutiter/elmer-hutiter-9999.ebuild
index 17125e1..cbeef82 100644
--- a/sci-libs/elmer-hutiter/elmer-hutiter-9999.ebuild
+++ b/sci-libs/elmer-hutiter/elmer-hutiter-9999.ebuild
@@ -17,7 +17,7 @@ SRC_URI=""
 ESVN_REPO_URI="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk/${MY_PN}"
 ESVN_PROJECT="${MY_PN}"
 
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="debug static-libs"
@@ -28,7 +28,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/hutiter
 
-PATCHES=( "${FILESDIR}"/${PN}-5.4.1-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-hutiter/files/elmer-hutiter-5.4.1-shared.patch b/sci-libs/elmer-hutiter/files/elmer-hutiter-6.0_p4651-shared.patch
similarity index 100%
rename from sci-libs/elmer-hutiter/files/elmer-hutiter-5.4.1-shared.patch
rename to sci-libs/elmer-hutiter/files/elmer-hutiter-6.0_p4651-shared.patch