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

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

[Justin Lecher]

commit:     e8dd1dbc67151f09574a355fafe3fd0cca451797
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 09:46:35 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 09:48:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e8dd1dbc

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

Package-Manager: portage-2.2.7
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 sci-libs/matc/ChangeLog                                              | 5 +++++
 .../files/{matc-5.4.1-shared.patch => matc-6.0_p4651-shared.patch}   | 0
 sci-libs/matc/{matc-5.4.1.ebuild => matc-6.0_p4651.ebuild}           | 4 ++--
 sci-libs/matc/matc-9999.ebuild                                       | 4 ++--
 ...{elmer-elmergrid-5.4.1-r1.ebuild => elmer-elmergrid-5.4.1.ebuild} | 0
 5 files changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/sci-libs/matc/files/matc-5.4.1-shared.patch b/sci-libs/matc/files/matc-6.0_p4651-shared.patch
similarity index 100%
rename from sci-libs/matc/files/matc-5.4.1-shared.patch
rename to sci-libs/matc/files/matc-6.0_p4651-shared.patch

diff --git a/sci-libs/matc/matc-5.4.1.ebuild b/sci-libs/matc/matc-6.0_p4651.ebuild
similarity index 92%
rename from sci-libs/matc/matc-5.4.1.ebuild
rename to sci-libs/matc/matc-6.0_p4651.ebuild
index 077ea63..4297137 100644
--- a/sci-libs/matc/matc-5.4.1.ebuild
+++ b/sci-libs/matc/matc-6.0_p4651.ebuild
@@ -14,10 +14,10 @@ MY_PN=${PN/elmer-/}
 DESCRIPTION="Finite element programs, libraries, and visualization tools - math C 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
+	http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651 -> ${P}.tar.gz
 	doc? ( http://www.nic.funet.fi/pub/sci/physics/elmer/doc/MATCManual.pdf )"
 
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc debug static-libs"

diff --git a/sci-libs/matc/matc-9999.ebuild b/sci-libs/matc/matc-9999.ebuild
index 265e19a..b3a34ab 100644
--- a/sci-libs/matc/matc-9999.ebuild
+++ b/sci-libs/matc/matc-9999.ebuild
@@ -17,7 +17,7 @@ SRC_URI="doc? ( http://www.nic.funet.fi/pub/sci/physics/elmer/doc/MATCManual.pdf
 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="doc debug static-libs"
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${PN}
 
-PATCHES=( "${FILESDIR}"/${PN}-5.4.1-shared.patch )
+PATCHES=( "${FILESDIR}"/${PN}-6.0_p4651-shared.patch )
 
 src_prepare() {
 	subversion_src_prepare

diff --git a/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1-r1.ebuild b/sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild
similarity index 100%
rename from sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1-r1.ebuild
rename to sci-misc/elmer-elmergrid/elmer-elmergrid-5.4.1.ebuild