sci-libs/openfoam-solvers: Added suggested DEPEND="${RDEPEND}", moved to EAPI 2, cleanup.

svn path=/sunrise/; revision=7742

4 files changed, 41 insertions, 33 deletions

diff --git a/sci-libs/openfoam-solvers/ChangeLog b/sci-libs/openfoam-solvers/ChangeLog
index 36ad0304d..42eb1ac3d 100644
--- a/sci-libs/openfoam-solvers/ChangeLog
+++ b/sci-libs/openfoam-solvers/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-libs/openfoam-solvers
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Jan 2009; Christian Ruppert (idl0r) <spooky85@gmail.com>
+  openfoam-solvers-1.4.1_p20080827.ebuild,
+  openfoam-solvers-1.5_p20080905.ebuild:
+  Added suggested DEPEND="${RDEPEND}", moved to EAPI 2, cleanup.
+
   08 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de>
   -openfoam-solvers-1.5.ebuild, +openfoam-solvers-1.5_p20080905.ebuild,
   +files/openfoam-solvers-1.5_p20080905.patch:
diff --git a/sci-libs/openfoam-solvers/Manifest b/sci-libs/openfoam-solvers/Manifest
index ed9184c15..b665c54ea 100644
--- a/sci-libs/openfoam-solvers/Manifest
+++ b/sci-libs/openfoam-solvers/Manifest
@@ -2,9 +2,9 @@ AUX OpenFOAM-1.5-compile.patch 15006 RMD160 ba8423526b5244e3c30d9d38830a2fe79e3c
 AUX openfoam-solvers-1.4.1_p20080827.patch 15090 RMD160 7d3f6b97e2f7ddb9d4a96d26894e3f3f0af75616 SHA1 50d45192e46c4cce6458091e0e1e715c32745001 SHA256 4555e1345df0e241b3536115118e4833fe0ae3bde0b7600446832725f43e3bdd
 AUX openfoam-solvers-1.5_p20080905.patch 9009 RMD160 5113997d5f0a9aad94bc66578b632c09e6d1ca31 SHA1 251eab17e96a0426e020d811a72d24c82f4df95d SHA256 18ea1f715e0dae1ed7baf9252d14d738b2a8c6bd0573d46ae849baa1f7075233
 AUX openfoam-solvers-compile-1.4.1_p20080827.patch 996 RMD160 0debfeb112bed547317d8d61a3fbdae1490050ba SHA1 87c9b4ace94e4eb7b0c16a39e041ec72fca7877e SHA256 1e6062ff63e4367067c229cc8348f5bbd5e6e96f2b9f109bbacb73f3f16310d5
-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
-EBUILD openfoam-solvers-1.4.1_p20080827.ebuild 2624 RMD160 f61aec1dcf80aa4295ad894ede2af3ba1bab136c SHA1 6a7b3701e3d39744484afe69de684e7d9075ead7 SHA256 567fb499cd396e9058a56e60b5b0ab4a4f03c64bdd0fe3bd9c1de41b5ecddbd4
-EBUILD openfoam-solvers-1.5_p20080905.ebuild 1853 RMD160 e4db5f031efb3323b435de60c03a8f9c6d17c038 SHA1 9b3065cc7558170b6e6c97151262f4e45de3d40b SHA256 b940305f6f8577640e0c3184383e0889161ed0c4415d1f34190333d235a0a977
-MISC ChangeLog 2196 RMD160 3550c000389efb2a0116366089151f580c16c6a1 SHA1 fa429c02c1d89a013696506fe4a17f7cd8380d66 SHA256 2ae60cee9071fbaf72344da136ed45750029b18a13222392a957fe4859663757
+DIST OpenFOAM-1.4.1.General.tgz 148526808 RMD160 e25d8bdfa63f15eeeb7b9f1cef09cc26fb7bef74 SHA1 56bbbf5b33c49d08cda35088a65b24d7dc59014f SHA256 c765b36639b42c737bc9ba1ac13c0f66efe20ee4a9f71a6ef987e86ebd50da28
+DIST OpenFOAM-1.5.General.tgz 117334661 RMD160 bccaa9f8f99d31aa6c791d40b30dd9ad4f534041 SHA1 3577f562dc1f54bb32e1e0ef43f979418212c2f7 SHA256 d4cba2d9475523a53cea80b8d39da70d12bfffb9f46e2d1442946ba4a23efd31
+EBUILD openfoam-solvers-1.4.1_p20080827.ebuild 2697 RMD160 fbb6d5840189099425b31dc2b8f120c3053dc708 SHA1 ac78c961c2cb9ef0172d1555386bb76bc201e8d3 SHA256 e25e7d36b48a62a963fbed124bc92f2c4f9b8819789231fed54bfa6898da8ed9
+EBUILD openfoam-solvers-1.5_p20080905.ebuild 1845 RMD160 7d15ffea54f17385af732840d650891349edf634 SHA1 badd6a8bf32821b26ff9b03f9041d76fdc6b59d5 SHA256 dde6c6f82f62888f9501b357cb4f1eaa650e42bd495341a6574a483c8f76d737
+MISC ChangeLog 2408 RMD160 14ca73e174ad960d640203a6b4739e25c8c8e3d1 SHA1 f48825f0f27773596443d62820b1a27af9ab805a SHA256 cdcbc26c3807863c6e07a0fe67057ae402632ce29467be72fdc763ce889c2bc2
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/sci-libs/openfoam-solvers/openfoam-solvers-1.4.1_p20080827.ebuild b/sci-libs/openfoam-solvers/openfoam-solvers-1.4.1_p20080827.ebuild
index 857dcc3c5..54c5a2306 100644
--- a/sci-libs/openfoam-solvers/openfoam-solvers-1.4.1_p20080827.ebuild
+++ b/sci-libs/openfoam-solvers/openfoam-solvers-1.4.1_p20080827.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 java-pkg-2 versionator multilib toolchain-funcs
 
 MY_PN="OpenFOAM"
@@ -10,22 +12,25 @@ MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="OpenFOAM - solvers"
 HOMEPAGE="http://www.opencfd.co.uk/openfoam/"
-SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz"
+SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz -> ${MY_P}.General.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="!=sci-libs/openfoam-${MY_PV}*
+RDEPEND="!=sci-libs/openfoam-${MY_PV}*
 	!=sci-libs/openfoam-bin-${MY_PV}*
 	<virtual/jdk-1.5
 	=sci-libs/openfoam-kernel-${MY_PV}*"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.1"
 
 S=${WORKDIR}/${MY_P}
 INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
 
 pkg_setup() {
+	# just to be sure the right profile is selected (gcc-config)
 	if ! version_is_at_least 4.1 $(gcc-version) ; then
 		die "${PN} requires >=sys-devel/gcc-4.1 to compile."
 	fi
@@ -33,11 +38,7 @@ pkg_setup() {
 	java-pkg-2_pkg_setup
 }
 
-src_unpack() {
-	ln -s "${DISTDIR}"/${MY_P}.General.gtgz ${MY_P}.General.tgz
-	unpack ./${MY_P}.General.tgz
-
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}.patch
 	epatch "${FILESDIR}"/${PN}-compile-${PV}.patch
 }
@@ -72,14 +73,14 @@ src_compile() {
 src_install() {
 	insopts -m0755
 	insinto ${INSDIR}/applications/bin
-	doins -r applications/bin/${WM_OPTIONS}/*
+	doins -r applications/bin/${WM_OPTIONS}/* || die "doins failed"
 
-	insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/lib
-	doins -r lib/${WM_OPTIONS}/*
+	insinto ${INSDIR}/lib
+	doins -r lib/${WM_OPTIONS}/* || die "doins failed"
 
 	find "${S}"/applications -type d \( -name "${WM_OPTIONS}" -o -name linuxDebug -o -name linuxOpt \)  | xargs rm -rf
 
 	insopts -m0644
 	insinto ${INSDIR}/applications
-	doins -r applications/solvers
+	doins -r applications/solvers || die "doins failed"
 }
diff --git a/sci-libs/openfoam-solvers/openfoam-solvers-1.5_p20080905.ebuild b/sci-libs/openfoam-solvers/openfoam-solvers-1.5_p20080905.ebuild
index f32541c67..93ae81bd0 100644
--- a/sci-libs/openfoam-solvers/openfoam-solvers-1.5_p20080905.ebuild
+++ b/sci-libs/openfoam-solvers/openfoam-solvers-1.5_p20080905.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 toolchain-funcs
 
 MY_PN="OpenFOAM"
@@ -10,44 +12,44 @@ MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="OpenFOAM - solvers"
 HOMEPAGE="http://www.opencfd.co.uk/openfoam/"
-SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz"
+SRC_URI="mirror://sourceforge/foam/${MY_P}.General.gtgz -> ${MY_P}.General.tgz"
 
 LICENSE="GPL-2"
 SLOT="1.5"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="!=sci-libs/openfoam-${MY_PV}*
+RDEPEND="!=sci-libs/openfoam-${MY_PV}*
 	!=sci-libs/openfoam-bin-${MY_PV}*
 	=sci-libs/openfoam-kernel-${MY_PV}*"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.1"
 
 S=${WORKDIR}/${MY_P}
+INSDIR="/usr/$(get_libdir)/${MY_PN}/${MY_P}"
 
 pkg_setup() {
+	# just to be sure the right profile is selected (gcc-config)
 	if ! version_is_at_least 4.1 $(gcc-version) ; then
 		die "${PN} requires >=sys-devel/gcc-4.1 to compile."
 	fi
 }
 
-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 "${FILESDIR}"/${P}.patch
 }
 
 src_compile() {
-	cp -a /usr/$(get_libdir)/${MY_PN}/${MY_P}/etc/{bashrc,settings.sh} etc/. || "cannot copy bashrc"
+	cp -a ${INSDIR}/etc/{bashrc,settings.sh} etc/. || "cannot copy bashrc"
 
 	# This is a hack, due to the meta ebuild:
-	sed -i -e "s|FOAM_LIB=\$WM_PROJECT_DIR/lib|FOAM_LIB=/usr/$(get_libdir)/${MY_PN}/${MY_P}/lib|"	\
+	sed -i -e "s|FOAM_LIB=\$WM_PROJECT_DIR/lib|FOAM_LIB=${INSDIR}/lib|"	\
 		-e "s|FOAM_LIBBIN=\$FOAM_LIB|FOAM_LIBBIN=\$WM_PROJECT_DIR/lib|"	\
 		-e "s|_foamAddLib \$FOAM_USER_LIBBIN|_foamAddLib \$FOAM_LIB|"	\
 		etc/settings.sh || die "could not replace paths"
 
-	sed -i -e "s|-L\$(LIB_WM_OPTIONS_DIR)|-L\$(LIB_WM_OPTIONS_DIR) -L/usr/$(get_libdir)/${MY_PN}/${MY_P}/lib|" \
+	sed -i -e "s|-L\$(LIB_WM_OPTIONS_DIR)|-L\$(LIB_WM_OPTIONS_DIR) -L${INSDIR}/lib|" \
 		wmake/Makefile || die "could not replace search paths"
 
 	export FOAM_INST_DIR="${WORKDIR}"
@@ -59,9 +61,9 @@ src_compile() {
 
 src_install() {
 	insopts -m0755
-	insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/applications/bin
-	doins -r applications/bin/*
+	insinto ${INSDIR}/applications/bin
+	doins -r applications/bin/* || die "doins failed"
 
-	insinto /usr/$(get_libdir)/${MY_PN}/${MY_P}/lib
-	doins -r lib/*
+	insinto ${INSDIR}/lib
+	doins -r lib/* || die "doins failed"
 }