From 0e28f603780d3a8369989c354eb3b8127291bd6c Mon Sep 17 00:00:00 2001
From: oli <oli@32389bae-6d03-0410-99cf-db05cde120eb>
Date: Thu, 4 Sep 2008 12:31:50 +0000
Subject: sci-misc/salome-med: removed omniorb* dependencies, as they are
 already in salome-kernel

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1278 32389bae-6d03-0410-99cf-db05cde120eb
---
 sci-misc/salome-med/ChangeLog               |  4 ++++
 sci-misc/salome-med/Manifest                |  4 ++--
 sci-misc/salome-med/salome-med-3.2.6.ebuild | 15 ++++-----------
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'sci-misc/salome-med')

diff --git a/sci-misc/salome-med/ChangeLog b/sci-misc/salome-med/ChangeLog
index 12dc8f753..1d38119db 100644
--- a/sci-misc/salome-med/ChangeLog
+++ b/sci-misc/salome-med/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de>
+  salome-med-3.2.6.ebuild:
+  removed omniorb* dependencies, as they are already in salome-kernel
+
   27 Aug 2008; Oliver Borm (boroli) <oli.borm@web.de>
   salome-med-3.2.6.ebuild, -Changelog, +metadata.xml:
   Removed fetch restriction, removed hardcode
diff --git a/sci-misc/salome-med/Manifest b/sci-misc/salome-med/Manifest
index 681b4e6b6..7d92509e3 100644
--- a/sci-misc/salome-med/Manifest
+++ b/sci-misc/salome-med/Manifest
@@ -3,6 +3,6 @@ AUX salome-med-3.2.6.patch 1295 RMD160 0c9363c57a7ade8e631f42ba41ab9335bd37feae
 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 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
+EBUILD salome-med-3.2.6.ebuild 3889 RMD160 80f4d7b5d730c54b1a8582e327f4aa364f449bea SHA1 50636a16a2ecd2791a3ae53703982eedd87eb861 SHA256 3f29420ad6d0de040da328c530174a12ca60d531fcf695cca0ca8e046294490d
+MISC ChangeLog 1106 RMD160 c23cf8061b2e6702a5baa0c35d70bb3910cb64fb SHA1 573dd839daafe6b3e4fb889eaeda5e8677a57f36 SHA256 12d829ee63b22d487f8a374cb0c91218cfb9cecaba1a3cd525bdba8d9714d1cf
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
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 6d0cc5868..34e613156 100644
--- a/sci-misc/salome-med/salome-med-3.2.6.ebuild
+++ b/sci-misc/salome-med/salome-med-3.2.6.ebuild
@@ -11,7 +11,7 @@ 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"
+IUSE="debug doc mpi opengl openpbs"
 
 RDEPEND="opengl?  ( virtual/opengl )
 	 mpi?     ( sys-cluster/mpich2 )
@@ -21,20 +21,15 @@ RDEPEND="opengl?  ( virtual/opengl )
 DEPEND="${RDEPEND}
 	>=sci-misc/salome-kernel-${PV}
 	>=sci-misc/salome-gui-${PV}
-	<=dev-python/omniorbpy-2.6
-	<=net-misc/omniORB-4.1
 	sci-libs/med"
 
-# Note that Corba is apparently not optional in this module
-
 MODULE_NAME="MED"
 MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
 INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
 MED_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
 export OPENPBS="/usr"
 
-src_unpack()
-{
+src_unpack() {
 	python_version
 	distutils_python_version
 	ewarn "Python 2.4 is highly recommended for Salome..."
@@ -56,8 +51,7 @@ src_unpack()
 }
 
 
-src_compile()
-{
+src_compile() {
 	local myconf=""
 	cd "${MY_S}"
 	rm -r -f autom4te.cache
@@ -104,8 +98,7 @@ src_compile()
 }
 
 
-src_install()
-{
+src_install() {
 	cd "${MY_S}"
 
 	# Installation
-- 
cgit v1.2.3-65-gdbad