sci-misc/salome-* : Version bump (5.1.3) + removed broken 3.2.6

7 files changed, 190 insertions, 0 deletions

diff --git a/sci-misc/salome-yacs/ChangeLog b/sci-misc/salome-yacs/ChangeLog
new file mode 100644
index 000000000..d1470415b
--- /dev/null
+++ b/sci-misc/salome-yacs/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for sci-misc/salome-yacs
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*salome-yacs-5.1.3 (14 Mar 2010)
+
+  14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+  +salome-yacs-5.1.3.ebuild, +files/salome-yacs-5.1.3-ac_python_devel.patch,
+  +files/salome-yacs-5.1.3-lib_location.patch,
+  +files/salome-yacs-5.1.3-libdir.patch, +metadata.xml:
+  New entry as a component of salome-5.1.3
+
diff --git a/sci-misc/salome-yacs/Manifest b/sci-misc/salome-yacs/Manifest
new file mode 100644
index 000000000..ccd5000fa
--- /dev/null
+++ b/sci-misc/salome-yacs/Manifest
@@ -0,0 +1,7 @@
+AUX salome-yacs-5.1.3-ac_python_devel.patch 1284 RMD160 e595a81ae436cdb03d86acad61a0ab8087712836 SHA1 c8eb83c06ed7c185645aaa256fe6324ab75bf5d7 SHA256 26b49bb12a41174851f4179b9cba4341c7b5d52bda446c0b17eed527cbb2a52b
+AUX salome-yacs-5.1.3-lib_location.patch 663 RMD160 6e02098839ad76c09adb995bd71567b7dbe9a770 SHA1 54a16203762e03ad1d96bd4f67cc33c7d66dfd71 SHA256 a21deface225771ce0210506e190b82d69a486e41a417743d82794988188d5d4
+AUX salome-yacs-5.1.3-libdir.patch 988 RMD160 db03b310f8ab1a45586fc3a0d597147e359258fe SHA1 0073bba897ff0b59f5d768504432788fc7b5ab59 SHA256 080e5d8b945f275927db499d199b7bd7f3c5fcce28a4878b9f840e26dc745bba
+DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
+EBUILD salome-yacs-5.1.3.ebuild 2866 RMD160 6f0749afd78fa84d2150a83dc106d53dfaf29955 SHA1 0c377fd5c24387a4b5c075bee63c323f12b3afb5 SHA256 bd618f5c79344ee804c930344d2677d27cc9b227e8af76441515179cf3bf6336
+MISC ChangeLog 440 RMD160 25bfd70c64d7166dbfb077b8f8aedebfd4ddc272 SHA1 3319b1130823de86b0327366f527dee29e6b9416 SHA256 18f099554946fd7a79880752820d808f97bd4f658be37b8936c9515adf170bd1
+MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch
new file mode 100644
index 000000000..6c83be8e7
--- /dev/null
+++ b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-ac_python_devel.patch
@@ -0,0 +1,13 @@
+Files src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/.ac_python_devel.m4.swp and src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/.ac_python_devel.m4.swp differ
+diff -ur src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4 src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4
+--- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4	2010-03-08 20:51:25.810829226 +0100
++++ src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4	2010-03-08 20:53:41.330413913 +0100
+@@ -48,7 +48,7 @@
+ 	# Check for Python library path
+ 	AC_MSG_CHECKING([for Python library path])
+ 	python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+-	for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
++	for i in "$python_path/lib$LIB_LOCATION_SUFFIX" "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/config/" "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/" "$python_path/lib$LIB_LOCATION_SUFFIX/python/config/" "$python_path/lib$LIB_LOCATION_SUFFIX/python/" "$python_path/" ; do
+ 		python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
+ 		if test -n "$python_path" ; then
+ 			break
diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch
new file mode 100644
index 000000000..9eb803582
--- /dev/null
+++ b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-lib_location.patch
@@ -0,0 +1,14 @@
+diff -ur src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4 src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4
+--- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4	2010-03-08 20:39:54.160326435 +0100
++++ src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4	2010-03-08 20:40:58.590323448 +0100
+@@ -23,6 +23,10 @@
+ 
+   AC_CHECKING(for LIB_LOCATION_SUFFIX)
+   LIB_LOCATION_SUFFIX=""
++  case "$build_cpu" in
++  x86_64*)  LIB_LOCATION_SUFFIX="64" ;;
++  *)        LIB_LOCATION_SUFFIX="" ;;
++  esac
+   AC_SUBST(LIB_LOCATION_SUFFIX)
+   AC_MSG_RESULT(LIB_LOCATION_SUFFIX is $LIB_LOCATION_SUFFIX)
+ 
diff --git a/sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch
new file mode 100644
index 000000000..b4a2a50c8
--- /dev/null
+++ b/sci-misc/salome-yacs/files/salome-yacs-5.1.3-libdir.patch
@@ -0,0 +1,22 @@
+--- src5.1.3.orig/YACS_SRC_5.1.3/adm/unix/make_begin.am	2010-03-10 15:45:32.281101526 +0100
++++ src5.1.3/YACS_SRC_5.1.3/adm/unix/make_begin.am	2010-03-10 15:46:58.440251953 +0100
+@@ -22,7 +22,7 @@
+ 
+ # Standard directory for installation
+ salomeincludedir   = $(includedir)/salome
+-libdir             = $(prefix)/lib/salome
++libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
+ bindir             = $(prefix)/bin/salome
+ salomescriptdir    = $(bindir)
+ salomepythondir    = $(pythondir)/salome
+--- src5.1.3.orig/YACS_SRC_5.1.3/src/genericgui/Makefile.am	2010-03-10 16:26:05.424066867 +0100
++++ src5.1.3/YACS_SRC_5.1.3/src/genericgui/Makefile.am	2010-03-10 16:26:41.450302694 +0100
+@@ -16,7 +16,7 @@
+ #
+ #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+ #
+-libdir             = $(prefix)/lib/salome
++libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
+ bindir             = $(prefix)/bin/salome
+ 
+ lib_LTLIBRARIES = libGenericGui.la
diff --git a/sci-misc/salome-yacs/metadata.xml b/sci-misc/salome-yacs/metadata.xml
new file mode 100644
index 000000000..d369d068f
--- /dev/null
+++ b/sci-misc/salome-yacs/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-yacs/salome-yacs-5.1.3.ebuild b/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild
new file mode 100644
index 000000000..51b20d1e2
--- /dev/null
+++ b/sci-misc/salome-yacs/salome-yacs-5.1.3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:  $
+
+EAPI=2
+PYTHON_DEPEND="2:2.4"
+
+inherit distutils eutils
+
+DESCRIPTION="SALOME : The Open Source Integration Platform for Numerical
+Simulation. YACS component"
+HOMEPAGE="http://www.salome-platform.org"
+SRC_URI="http://www.stasyan.com/devel/distfiles/src${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug doc opengl"
+
+RDEPEND="opengl?  ( virtual/opengl )
+		 debug?   ( dev-util/cppunit )
+		 >=sci-misc/salome-kernel-${PV}
+		 >=sci-misc/salome-gui-${PV}
+		 >=dev-python/omniorbpy-3.4
+		 >=sci-libs/hdf5-1.6.4
+		 >=dev-libs/boost-1.40.0
+		 >=x11-libs/qt-core-4.5.2
+		 >=x11-libs/qt-gui-4.5.2
+		 >=x11-libs/qt-opengl-4.5.2
+		 >=dev-python/PyQt4-4.5.4
+		 >=x11-libs/qscintilla-2.4
+		 >=net-misc/omniORB-4.1.3
+		 dev-libs/expat"
+
+DEPEND="${RDEPEND}
+		doc? ( dev-python/sphinx )
+		>=app-doc/doxygen-1.5.6
+		media-gfx/graphviz
+		>=dev-python/docutils-0.4
+		dev-lang/swig
+		dev-libs/libxml2
+		>=dev-python/celementtree-1.0.5
+		>=dev-python/elementtree-1.2.6"
+
+MODULE_NAME="YACS"
+MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+export OPENPBS="/usr"
+
+PYVER=$(python_get_version)
+
+pkg_setup() {
+	[[ ${PYVER} > 2.4 ]] && \
+		ewarn "Python 2.4 is highly recommended for Salome..."
+}
+
+src_prepare() {
+	cd "${MY_S}"
+
+	epatch "${FILESDIR}"/"${P}"-ac_python_devel.patch
+	if use amd64; then
+		epatch "${FILESDIR}"/"${P}"-lib_location.patch
+		epatch "${FILESDIR}"/"${P}"-libdir.patch
+	fi
+
+	rm -r -f autom4te.cache
+	./clean_configure
+	./build_configure
+}
+
+src_configure() {
+	cd "${MY_S}"
+
+	econf --prefix=${INSTALL_DIR} \
+	      --datadir=${INSTALL_DIR}/share/salome \
+	      --docdir=${INSTALL_DIR}/doc/salome \
+		  --libdir=${INSTALL_DIR}/$(get_libdir)/salome \
+	      --infodir=${INSTALL_DIR}/share/info \
+		  --with-qt4=/usr \
+		  --with-qt4-libraries=/usr/$(get_libdir)/qt4 \
+		  --with-qsci4-includes=/usr/include/Qsci \
+	      $(use_enable debug ) \
+	      $(use_enable !debug production ) \
+	      $(use_with debug cppunit /usr ) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	cd "${MY_S}"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	cd "${MY_S}"
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	use amd64 && dosym ${INSTALL_DIR}/lib64 ${INSTALL_DIR}/lib
+
+	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/Makefile
+	insinto "${INSTALL_DIR}"
+	doins -r adm
+
+	use doc && dodoc AUTHORS INSTALL NEWS README
+}
+
+pkg_postinst() {
+	elog "Run \`env-update && source /etc/profile\`"
+	elog "now to set up the correct paths."
+	elog ""
+}