Initial update. There is still some work to do but it starts to get shape! ;)

See bug #155974

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

6 files changed, 239 insertions, 0 deletions

diff --git a/sci-misc/salome-med/Changelog b/sci-misc/salome-med/Changelog
new file mode 100644
index 000000000..4199b54ce
--- /dev/null
+++ b/sci-misc/salome-med/Changelog
@@ -0,0 +1,7 @@
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+  20 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
+  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
diff --git a/sci-misc/salome-med/Manifest b/sci-misc/salome-med/Manifest
new file mode 100644
index 000000000..13dc1ccf6
--- /dev/null
+++ b/sci-misc/salome-med/Manifest
@@ -0,0 +1,5 @@
+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 4129 RMD160 8f3fc72c05a0301efaf3dfcf7255bceceddb1883 SHA1 0d285d0c003dd6d66c8f085e8cb946221a1b01f6 SHA256 84a565c476d89f3cf678d85019532c9585f6aa2c1f0b665b5a001e32b7de2ffc
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6.patch b/sci-misc/salome-med/files/salome-med-3.2.6.patch
new file mode 100644
index 000000000..7ffd0ac23
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-3.2.6.patch
@@ -0,0 +1,28 @@
+--- ./MED_SRC_3.2.6/adm_local/Makefile.in.org     2007-04-24 18:40:51.000000000 +0200
++++ ./MED_SRC_3.2.6/adm_local/Makefile.in 2008-01-04 15:51:44.000000000 +0100
+@@ -26,12 +26,12 @@
+ all: resources
+
+ install:
+-	cp -rf @top_srcdir@/adm_local @prefix@
++#	cp -rf @top_srcdir@/adm_local @prefix@
+
+ bin:
+
+ resources :
+-	cp -rf @top_srcdir@/adm_local $(top_builddir)
++#	cp -rf @top_srcdir@/adm_local $(top_builddir)
+
+ inc:
+
+--- ./MED_SRC_3.2.6/build_configure.org 2007-04-24 18:40:51.000000000 +0200
++++ ./MED_SRC_3.2.6/build_configure     2008-01-04 15:14:30.000000000 +0100
+@@ -174,7 +174,7 @@
+ # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in  files
+ echo ""                                                          >> configure.in_tmp1
+ echo 'if test ${MED_WITH_KERNEL} = yes; then'                    >> configure.in_tmp1
+-echo '    ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
++echo '    cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
+ echo 'else'                                                      >> configure.in_tmp1
+ echo '    ln -fsn ${ROOT_SRCDIR}/adm_local_without_kernel ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
+ echo 'fi'                                                        >> configure.in_tmp1
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch b/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch
new file mode 100644
index 000000000..8af83ea5a
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-3.2.6_environ.patch
@@ -0,0 +1,27 @@
+--- src/MedClient/test/environ/Makefile.in_orig	2008-01-04 17:11:06.000000000 +0100
++++ src/MedClient/test/environ/Makefile.in	2008-01-04 17:12:08.000000000 +0100
+@@ -29,6 +29,7 @@
+ top_builddir=../../../..
+ srcdir=@srcdir@
+ VPATH=.:@srcdir@
++prefix=@prefix@
+ 
+ BIN=	runEnvironTests 
+ 
+@@ -53,11 +54,11 @@
+ 	chmod +x csh/*
+ 
+ install:
+-	mkdir -p @prefix@/Tests/environ
+-	cp -rf ${BIN} csh @prefix@/Tests/environ
+-	cd @prefix@/Tests/environ ; chmod u+x ${BIN}
+-	cp -f ${top_builddir}/bin/runTestMedCorba @prefix@/bin
+-	chmod +x @prefix@/bin/runTestMedCorba
++	mkdir -p ${prefix}/Tests/environ
++	cp -rf ${BIN} csh ${prefix}/Tests/environ
++	cd ${prefix}/Tests/environ ; chmod u+x ${BIN}
++	cp -f ${top_builddir}/bin/runTestMedCorba ${prefix}/bin
++	chmod +x ${prefix}/bin/runTestMedCorba
+ 
+ ./%: @srcdir@/%.in
+ 	cd $(top_builddir) ; \
diff --git a/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch b/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch
new file mode 100644
index 000000000..7ec5dac34
--- /dev/null
+++ b/sci-misc/salome-med/files/salome-med-3.2.6_gcc4.patch
@@ -0,0 +1,26 @@
+--- src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx	2007-11-26 23:27:29.000000000 +0100
++++ src3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx	2007-11-26 23:28:23.000000000 +0100
+@@ -222,7 +222,7 @@
+ 	case MED_FLOAT64 :
+ 	  if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_FLOAT64,
+ 				  interlace,ncomp,numco,
+-				  psize,pflmod,pfltab,ngauss,val)< 0)
++				  psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
+ 	    goto ERROR;
+ 	  break;
+ 
+@@ -230,12 +230,12 @@
+ #if defined(F77INT64)
+ 	  if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_INT64,
+ 				  interlace,ncomp,numco,
+-				  psize,pflmod,pfltab,ngauss,val)< 0)
++				  psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
+ 	    goto ERROR;
+ #else
+ 	  if ( _MEDdatasetNumLire(datagroup3,MED_NOM_CO,MED_INT32,
+ 				  interlace,ncomp,numco,
+-				  psize,pflmod,pfltab,ngauss,val)< 0)
++				  psize,pflmod,(med_size*)pfltab,ngauss,val)< 0)
+ 	    goto ERROR;
+ #endif
+ 	  break;
diff --git a/sci-misc/salome-med/salome-med-3.2.6.ebuild b/sci-misc/salome-med/salome-med-3.2.6.ebuild
new file mode 100644
index 000000000..94f2352e6
--- /dev/null
+++ b/sci-misc/salome-med/salome-med-3.2.6.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="doc opengl mpi openpbs debug"
+RESTRICT="fetch"
+
+RDEPEND="opengl?  ( virtual/opengl )
+	 mpi?     ( sys-cluster/mpich2 )
+	 debug?   ( dev-util/cppunit )
+	 openpbs? ( sys-cluster/torque )"
+
+DEPEND="${RDEPEND}
+	>=sci-misc/salome-kernel-3.2.6
+	>=sci-misc/salome-gui-3.2.6
+	<=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"
+
+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
+	distutils_python_version
+	ewarn "Python 2.4 is highly recommended for Salome..."
+
+	if ! built_with_use sci-libs/vtk python ; then
+		die "You must rebuild sci-libs/vtk with python USE flag"
+	fi
+
+	unpack ${A}
+	cd "${MY_S}"
+	epatch ${FILESDIR}/${P}_gcc4.patch
+	epatch ${FILESDIR}/${P}.patch
+	epatch ${FILESDIR}/${P}_environ.patch
+}
+
+
+src_compile()
+{
+	local myconf=""
+	cd "${MY_S}"
+	rm -r -f autom4te.cache
+	./build_configure
+
+	# CXXFLAGS are slightly modified to allow the compilation of
+	# salome-med with OpenCascade and gcc-4.1.x
+	if version_is_at_least "4.1" $(gcc-version) ; then
+		append-flags -ffriend-injection -fpermissive
+	fi
+
+	# Compiler and linker flags
+	if use amd64 ; then
+		append-flags -m64
+	fi
+
+	# Specifying --without-<flag> for mpi / mpich / openpbs
+	# has the same effect as turning it on
+	# so we just ommit it if it's not required to turn it off
+	if use mpi ; then
+		myconf="${myconf} --with-mpi --with-mpich"
+	fi
+	if use openpbs ; then
+		myconf="${myconf} --with-openpbs"
+	fi
+
+	# Configuration
+	econf --prefix=${INSTALL_DIR} \
+	      --datadir=${INSTALL_DIR}/share/salome \
+	      --docdir=${INSTALL_DIR}/doc/salome \
+	      --infodir=${INSTALL_DIR}/share/info \
+	      --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
+	      --with-python-site=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
+	      --with-python-site-exec=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome \
+	      ${myconf} \
+	      $(use_enable debug ) \
+	      $(use_enable !debug production ) \
+	      $(use_with debug cppunit /usr ) \
+	      $(use_with opengl opengl /usr) \
+	|| die "configuration failed"
+
+	# Compilation
+	MAKEOPTS="-j1" emake || die "Compilation failed"
+}
+
+
+src_install()
+{
+	cd "${MY_S}"
+
+	# Installation
+	emake prefix="${D}/${INSTALL_DIR}" \
+	      docdir="${D}/${INSTALL_DIR}/doc/salome" \
+	      infodir="${D}/${INSTALL_DIR}/share/info" \
+	      datadir="${D}/${INSTALL_DIR}/share/salome" \
+	      libdir="${D}/${INSTALL_DIR}/$(get_libdir)/salome" \
+	      pythondir="${D}/${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages" install \
+	|| die "emake install failed"
+
+	if use amd64 ; then
+		dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
+	fi
+
+	echo "${MODULE_NAME}_ROOT_DIR=${INSTALL_DIR}" > ./90${P}
+	echo "LDPATH=${INSTALL_DIR}/$(get_libdir)/salome" >> ./90${P}
+	echo "PATH=${INSTALL_DIR}/bin/salome" >> ./90${P}
+	echo "PYTHONPATH=${INSTALL_DIR}/$(get_libdir)/python${PYVER}/site-packages/salome" >> ./90${P}
+	doenvd 90${P}
+	rm adm_local/Makefile adm_local/unix/make_commence adm_local/unix/make_conclude adm_local/unix/make_omniorb
+	insinto "${INSTALL_DIR}"
+	doins -r adm_local
+	if use doc; then
+		dodoc INSTALL LICENCE README
+	fi
+}
+
+pkg_postinst() {
+	elog "Run \`env-update && source /etc/profile\`"
+	elog "now to set up the correct paths."
+	elog ""
+}
+