sci-libs/openfoam-src: Changed to EAPI=2 and added some new patches

svn path=/sunrise/; revision=7847

3 files changed, 19 insertions, 17 deletions

diff --git a/sci-libs/openfoam-src/ChangeLog b/sci-libs/openfoam-src/ChangeLog
index a88cf5f9b..e8a3f78f4 100644
--- a/sci-libs/openfoam-src/ChangeLog
+++ b/sci-libs/openfoam-src/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/openfoam-src
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Feb 2009; Oliver Borm (boroli) <oli.borm@web.de>
+  -openfoam-src-1.5_p20080905.ebuild, +openfoam-src-1.5_p20090204.ebuild:
+  Changed to EAPI=2 and added some new patches
+
   08 Sep 2008; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   openfoam-src-1.5_p20080905.ebuild:
   Use ${P} in SRC_URI
diff --git a/sci-libs/openfoam-src/Manifest b/sci-libs/openfoam-src/Manifest
index ce29493f6..a153bc62d 100644
--- a/sci-libs/openfoam-src/Manifest
+++ b/sci-libs/openfoam-src/Manifest
@@ -1,10 +1,10 @@
 AUX OpenFOAM-1.5-compile.patch 15006 RMD160 ba8423526b5244e3c30d9d38830a2fe79e3c2a1a SHA1 7d275039cea1fe8a3c28fafeda1fef3665360f83 SHA256 6cb940b6c559a846ec65184db8f7c7966d1bef105d5bdad6ca4afd3f1b4d5b89
 AUX openfoam-src-compile-1.4.1_p20080827.patch 6143 RMD160 ab03b9d55ee2d6eb3515fe2430e42f2204177bb9 SHA1 8301b591701f2bf6cb182f1cd415d0348e46d98b SHA256 999098d347d417ff88724ea30c6a18b7cc3a8bbecfcb23b5cfdcbe17afdb58c4
 DIST OpenFOAM-1.4.1.General.gtgz 148526808 RMD160 e25d8bdfa63f15eeeb7b9f1cef09cc26fb7bef74 SHA1 56bbbf5b33c49d08cda35088a65b24d7dc59014f SHA256 c765b36639b42c737bc9ba1ac13c0f66efe20ee4a9f71a6ef987e86ebd50da28
-DIST OpenFOAM-1.5.General.gtgz 117334661 RMD160 bccaa9f8f99d31aa6c791d40b30dd9ad4f534041 SHA1 3577f562dc1f54bb32e1e0ef43f979418212c2f7 SHA256 d4cba2d9475523a53cea80b8d39da70d12bfffb9f46e2d1442946ba4a23efd31
+DIST OpenFOAM-1.5.General.tgz 117334661 RMD160 bccaa9f8f99d31aa6c791d40b30dd9ad4f534041 SHA1 3577f562dc1f54bb32e1e0ef43f979418212c2f7 SHA256 d4cba2d9475523a53cea80b8d39da70d12bfffb9f46e2d1442946ba4a23efd31
 DIST openfoam-src-1.4.1_p20080827.patch 31197 RMD160 83bbf48def96090dfe5ba37e702a3ce4ce3f331a SHA1 ece3c78b456ec4e82374c53c82aaa9bc2b45b5bc SHA256 3c3702a7539ca2d54ce09e4cdd14b8425d598d6ff8c811dea7d407c8a5bfa9cd
-DIST openfoam-src-1.5_p20080905.patch 1426533 RMD160 be6ed4f3a40f40a42adcd5912d18938da79be9c3 SHA1 a2d71121d2acd79f7e90e8e71a78d42816f3ca3f SHA256 66d148af4d5b5c7ca9d43dbdd36c97341971657b68817912b23023ea13e1d0ae
+DIST openfoam-src-1.5_p20090204.patch 1431520 RMD160 74c249208d4586553b5d1a02e657b3909a05afc0 SHA1 09c7662149752d7c7fe7ad1e3290140476c3fc80 SHA256 d60978d4e15a97be49ece13c612bb317edeef0934a0654b0f1d234c9e65a246b
 EBUILD openfoam-src-1.4.1_p20080827.ebuild 1017 RMD160 92002e868c46cb7f95172dd17f8d22dc7d776546 SHA1 7a0d3ee01a43810baf22fc6dee20ad076d3c3b57 SHA256 fdd3fceefe397819476366c71253851f91be4bd9e36a1bb2764e9e6774e54774
-EBUILD openfoam-src-1.5_p20080905.ebuild 978 RMD160 ed996646a401eeed4c3d4971333e5dcbd8fe193d SHA1 942e284365a2040d61e6e369304cadd94d46c48d SHA256 98b53f2191d6c16141562fa856f2007991e1cfd61e29ca17250328df69ead42f
-MISC ChangeLog 2388 RMD160 afac61ab639f3f598a52e26ca642029382f2dd73 SHA1 565502e8be4657f6a4fde0e7ef67c3c3f6da44a9 SHA256 d610c74d44bf4c74b8452e7334df5ce5e9ef0640247781ea48085cc439dff7d1
+EBUILD openfoam-src-1.5_p20090204.ebuild 902 RMD160 99967e9a551f2c0531807889bd283c1deb909c39 SHA1 bacf4d18bd0a621eeb436fe1ab3aa8ce790539f8 SHA256 8986287f8ebc46f051b45d2903a8dad9df88599482b40111b8d7904f728d5dfe
+MISC ChangeLog 2564 RMD160 c5854b6b4ef5de2f10503b417fb04388975b42e5 SHA1 968a515010c5720863691fcf98574ce0c4bb0fc9 SHA256 3c23101cc60c090d657da35065a8d29416fdbf3e037ee717690c847858e3cb1f
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/sci-libs/openfoam-src/openfoam-src-1.5_p20080905.ebuild b/sci-libs/openfoam-src/openfoam-src-1.5_p20090204.ebuild
index 8c093bdb7..5d4754200 100644
--- a/sci-libs/openfoam-src/openfoam-src-1.5_p20080905.ebuild
+++ b/sci-libs/openfoam-src/openfoam-src-1.5_p20090204.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header:  $
 
+EAPI=2
+
 inherit eutils versionator multilib
 
 MY_PN="OpenFOAM"
@@ -10,32 +12,28 @@ MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="OpenFOAM - sources"
 HOMEPAGE="http://www.opencfd.co.uk/openfoam/"
-SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz
-	http://omploader.org/vcWF0/${P}.patch"
+SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz -> ${MY_P}.General.tgz
+	http://omploader.org/vMTdsOA/${P}.patch"
 
 LICENSE="GPL-2"
 SLOT="1.5"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="|| ( =sci-libs/openfoam-meta-${MY_PV}* =sci-libs/openfoam-${MY_PV}* =sci-libs/openfoam-bin-${MY_PV}* )"
+RDEPEND="|| ( =sci-libs/openfoam-meta-${MY_PV}* =sci-libs/openfoam-${MY_PV}* =sci-libs/openfoam-bin-${MY_PV}* )"
 
 S=${WORKDIR}/${MY_P}
+INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
 
-src_unpack() {
-	ln -s "${DISTDIR}"/${MY_P}.General.gtgz ${MY_P}.General.tgz
-	unpack ./${MY_P}.General.tgz
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${MY_P}-compile.patch
-
 	epatch "${DISTDIR}"/${P}.patch
 }
 
 src_install() {
-	insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/src
+	insinto ${INSDIR}/src
 	doins -r src/*
 
-	insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/applications
+	insinto ${INSDIR}/applications
 	doins -r applications/*
 }