sci-misc/salome-med: Removed fetch restriction, removed hardcode

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1254 32389bae-6d03-0410-99cf-db05cde120eb

4 files changed, 23 insertions, 21 deletions

diff --git a/sci-misc/salome-med/Changelog b/sci-misc/salome-med/ChangeLog
index cf7ed20cb..12dc8f753 100644
--- a/sci-misc/salome-med/Changelog
+++ b/sci-misc/salome-med/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
+
+  27 Aug 2008; Oliver Borm (boroli) <oli.borm@web.de>
+  salome-med-3.2.6.ebuild, -Changelog, +metadata.xml:
+  Removed fetch restriction, removed hardcode
+
   29 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
   +salome-med-3.2.6-gcc-4.3.patch
   Added support to gcc-4.3. Patch provided by Bert Karwatzki <spasswolf@web.de>
@@ -8,4 +13,4 @@
   Initial import.
   +salome-med-3.2.6.ebuild, +salome-med-3.2.6_environ.patch, +salome-med-3.2.6_gcc4.patch, +salome-med-3.2.6.patch
   A major thank to Francois Dorin <f.dorin@free.fr>, Jon Hood <squinky86@gmail.com>, Dewald Pietersen <dewald.pieterse@gmail.com>, <etienne.lorriaux@gmail.com> and Richard Westwell <garlicbread@ntlworld.com> for their respective contributions and feedback. Without you guys, the Salome ebuilds would not exist today. Thanks!
-  See bug #155974 for more info
\ No newline at end of file
+  See bug #155974 for more info
diff --git a/sci-misc/salome-med/Manifest b/sci-misc/salome-med/Manifest
index 293435d51..681b4e6b6 100644
--- a/sci-misc/salome-med/Manifest
+++ b/sci-misc/salome-med/Manifest
@@ -2,6 +2,7 @@ AUX salome-med-3.2.6-gcc-4.3.patch 2565 RMD160 62ad0205e90c291eade1dd20706489d7e
 AUX salome-med-3.2.6.patch 1295 RMD160 0c9363c57a7ade8e631f42ba41ab9335bd37feae SHA1 b6938d6bf1990ab2325cba90f0eabaf6b9742d81 SHA256 af6defd83e9196bcf5df66e5dda0a64e1fd5cecf07259bd410ef0f91bb057b2b
 AUX salome-med-3.2.6_environ.patch 829 RMD160 b2d457296e389d0f26344d1667cbd39f95bced69 SHA1 e3b584cef8a149c2bc92e98892714617383b8271 SHA256 718ce88901ec43210dcf67e7b36cae6cd1bde6f7e334f316da73bf8368304556
 AUX salome-med-3.2.6_gcc4.patch 947 RMD160 c2af9d3fa5b8dd87baae7dab13798f71d61dd4f9 SHA1 16b58dbc90eb61835547f7c4987426fb295f242b SHA256 02f59ca69ee92a0a7378f0fa9662f00078fbcd8c4fa24f8c097ef5046787ed07
-DIST salome-3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-med-3.2.6.ebuild 4247 RMD160 640f3c04e7fe084dbba7e6f1ed057807f309413d SHA1 21b7a9d4b43b28c23f845bdc8aa68c567285897a SHA256 f982ec08f6b5ca180ecfdc455c8f13eea48bf3d3f631df31cbc263fe80e40fb2
-MISC Changelog 797 RMD160 3d732e18768005003db79c26f8d83e1bfba46e5c SHA1 326ec2b1ebe99f3673742ce32a93746f9298db8f SHA256 b04200127ad1db3573775ec3d1892e8c507740c9be81a64bd96dbb85949f8123
+DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
+EBUILD salome-med-3.2.6.ebuild 4002 RMD160 4ee5562a301b1b9ea61d9a7d9d491cc04bf00518 SHA1 7bc3fae73c0a296d1827b3fa200e7040c130a322 SHA256 8c01de0f9c404b11417865b37f9173d1e0a4f6bafb43cd3480110b38b80dbdfa
+MISC ChangeLog 954 RMD160 6198e34fc52a67d52af34c5ec42a3c73e4423e90 SHA1 ec2d63f9d9e7adda35b97639ba20b7c9669d11b1 SHA256 6dcc4b733b969c49ae50747ad876a8a2a4df078cc4a8c72a04c10ee753df32a4
+MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/salome-med/metadata.xml b/sci-misc/salome-med/metadata.xml
new file mode 100644
index 000000000..b229aec85
--- /dev/null
+++ b/sci-misc/salome-med/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+</pkgmetadata>
diff --git a/sci-misc/salome-med/salome-med-3.2.6.ebuild b/sci-misc/salome-med/salome-med-3.2.6.ebuild
index 991de35e7..6d0cc5868 100644
--- a/sci-misc/salome-med/salome-med-3.2.6.ebuild
+++ b/sci-misc/salome-med/salome-med-3.2.6.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Header:  $
 
 inherit autotools distutils eutils flag-o-matic toolchain-funcs versionator python multilib
 
 DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical Simulation. MED Component"
 HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="salome-3.2.6.tar.gz"
+SRC_URI="http://files.opencascade.com/Salome${PV}/src${PV}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="doc opengl mpi openpbs debug"
-RESTRICT="fetch"
 
 RDEPEND="opengl?  ( virtual/opengl )
 	 mpi?     ( sys-cluster/mpich2 )
@@ -19,8 +19,8 @@ RDEPEND="opengl?  ( virtual/opengl )
 	 openpbs? ( sys-cluster/torque )"
 
 DEPEND="${RDEPEND}
-	>=sci-misc/salome-kernel-3.2.6
-	>=sci-misc/salome-gui-3.2.6
+	>=sci-misc/salome-kernel-${PV}
+	>=sci-misc/salome-gui-${PV}
 	<=dev-python/omniorbpy-2.6
 	<=net-misc/omniORB-4.1
 	sci-libs/med"
@@ -33,15 +33,6 @@ INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
 MED_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
 export OPENPBS="/usr"
 
-pkg_nofetch()
-{
-	einfo "You have to download manually the source code. You can download it from :"
-	einfo "   http://www.salome-platform.org/download/dl326"
-	einfo ""
-	einfo "Put the archive in the \"/usr/portage/distfile\" directory and rename it \"salome-3.2.6.tar.gz\""
-}
-
-
 src_unpack()
 {
 	python_version
@@ -54,9 +45,9 @@ src_unpack()
 
 	unpack ${A}
 	cd "${MY_S}"
-	epatch ${FILESDIR}/${P}_gcc4.patch
-	epatch ${FILESDIR}/${P}.patch
-	epatch ${FILESDIR}/${P}_environ.patch
+	epatch "${FILESDIR}"/${P}_gcc4.patch
+	epatch "${FILESDIR}"/${P}.patch
+	epatch "${FILESDIR}"/${P}_environ.patch
 
 	# Gcc 4.3 support
 	if version_is_at_least "4.3" $(gcc-version) ; then
@@ -139,7 +130,7 @@ src_install()
 	insinto "${INSTALL_DIR}"
 	doins -r adm_local
 	if use doc; then
-		dodoc INSTALL LICENCE README
+		dodoc INSTALL README
 	fi
 }