aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
committerEtienne Lorriaux <etienne.lorriaux@gmail.com>2010-03-15 00:38:41 +0100
commit3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40 (patch)
tree0cc82498adcf7e3fdde6a370e4fdd4f510ca5167 /sci-misc/salome-geom
parentAdd hydra pm. #309353 (diff)
downloadsci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.gz
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.tar.bz2
sci-3a2287f3937bdfc1b2c7ba7f1950c64c47e59a40.zip
sci-misc/salome-* : Version bump (5.1.3) + removed broken 3.2.6
Diffstat (limited to 'sci-misc/salome-geom')
-rw-r--r--sci-misc/salome-geom/ChangeLog10
-rw-r--r--sci-misc/salome-geom/Manifest9
-rw-r--r--sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch78
-rw-r--r--sci-misc/salome-geom/files/salome-geom-3.2.6.patch39
-rw-r--r--sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch11
-rw-r--r--sci-misc/salome-geom/salome-geom-3.2.6.ebuild135
-rw-r--r--sci-misc/salome-geom/salome-geom-5.1.3.ebuild117
7 files changed, 141 insertions, 258 deletions
diff --git a/sci-misc/salome-geom/ChangeLog b/sci-misc/salome-geom/ChangeLog
index cfceee87c..4f6fb95ad 100644
--- a/sci-misc/salome-geom/ChangeLog
+++ b/sci-misc/salome-geom/ChangeLog
@@ -1,6 +1,14 @@
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*salome-geom-5.1.3 (14 Mar 2010)
+
+ 14 Mar 2010; Etienne Lorriaux <etienne.lorriaux@gmail.com>
+ -salome-geom-3.2.6.ebuild, -files/salome-geom-3.2.6-vtk-5.2.patch,
+ -files/salome-geom-3.2.6.patch, +salome-geom-5.1.3.ebuild,
+ +files/salome-geom-5.1.3-qt4-path.patch:
+ Version bump 5.1.3 + removed broken 3.2.6
+
20 Oct May 2008; Daniel Tourde <daniel.tourde@caelae.se>
+salome-geom-3.2.6-vtk-5.2.patch
Added support to vtk 5.2. Patch provided by Bert Karwatzki <spasswolf@web.de>
diff --git a/sci-misc/salome-geom/Manifest b/sci-misc/salome-geom/Manifest
index 78caef8bf..fc223c121 100644
--- a/sci-misc/salome-geom/Manifest
+++ b/sci-misc/salome-geom/Manifest
@@ -1,6 +1,5 @@
-AUX salome-geom-3.2.6-vtk-5.2.patch 2251 RMD160 f0d8bbbde9efe9baee35f78999dd434b158970e2 SHA1 6ead93912508c24c5408a7c5e2e89d4dee98dfe5 SHA256 32c7430375f80034d15a4e20e4ea6eefe02f16f7a1c09af940b8687e43626a6d
-AUX salome-geom-3.2.6.patch 1283 RMD160 04d75a8882a853f38aec7f9b26b0d9f64eb15154 SHA1 8db9ecd670cdf64921574f4b632b43daad5d602a SHA256 5e162b7c1ac10d4510b474beed0b502e700cc99d1ed5d11f107aaaea3b1cbf43
-DIST src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-geom-3.2.6.ebuild 3945 RMD160 a528faf12c742983a2b4b936de3f5bd1f3345d6b SHA1 0234133b9f500062510b1a75551d8d0a0f1b67b8 SHA256 51a64e320fd757272e68183082284e8c0b372caf89ba08838ed21454c5226deb
-MISC ChangeLog 808 RMD160 4ea7e9e8e8d95d41c3a8b289eea99c5c3d81fc72 SHA1 afd84e1f7e831ca03cf8d374393dcff5a61797a8 SHA256 7030b1d17095efaeb8a897f56e31863af06436bcc62569a340174063b8bb3787
+AUX salome-geom-5.1.3-qt4-path.patch 468 RMD160 6c964af8ff04e5677b15f8ead0750bb33ea1ea3d SHA1 05db7015702089319933e0e78b276c60fd1f2d07 SHA256 7c880879bb040dcbb11d34123ab5283e31ed998abff6e0f11b7c75377e52495e
+DIST src5.1.3.tar.gz 106470135 RMD160 f46ac847ab57c76df524ddf358b887662fc862cf SHA1 643c775f90277314983747e002918ee5b826db90 SHA256 78ce2acc9cfa474e030723674f4420c420fd2de926b1939455c3716f1fd48a2b
+EBUILD salome-geom-5.1.3.ebuild 3117 RMD160 3851d7a53d0bea5a78d8df1d3350957e167137c3 SHA1 e0d6ab2894f1c13a9b08f5da361ef56ab2022d02 SHA256 43e54f280bae94c600063fb4cc0542a530860f8986bb2216fd5a0654ff0a3e7f
+MISC ChangeLog 1121 RMD160 a8e3fe3c32a0d92c9e054182161e0f4c70888999 SHA1 749190f4c3ddc1dde5fe01453e5a4dc38e1fe150 SHA256 3d7fb0d29e64d239f92ba0a0793650b341778bd94ab0a909fcf64dcf984fa87b
MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch b/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch
deleted file mode 100644
index e0b4e8778..000000000
--- a/sci-misc/salome-geom/files/salome-geom-3.2.6-vtk-5.2.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -aur src3.2.6.old/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx src3.2.6/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx
---- src3.2.6.old/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx 2008-07-25 09:16:09.000000000 +0200
-+++ src3.2.6/GEOM_SRC_3.2.6/src/OBJECT/GEOM_OCCReader.cxx 2008-10-16 22:11:49.000000000 +0200
-@@ -88,7 +88,7 @@
- static Standard_Real HatcherConfusion2d = 1.e-8 ;
- static Standard_Real HatcherConfusion3d = 1.e-8 ;
-
--static Standard_Integer lastVTKpoint = 0;
-+static vtkIdType lastVTKpoint = 0;
- static Standard_Integer PlotCount = 0;
- static Standard_Real IsoRatio = 1.001;
- static Standard_Integer MaxPlotCount = 5;
-@@ -483,9 +483,9 @@
- {
- float coord[3];
- coord[0] = P.X(); coord[1] = P.Y(); coord[2] = P.Z();
-- Standard_Integer NewVTKpoint = Pts->InsertNextPoint(coord);
-+ vtkIdType NewVTKpoint = Pts->InsertNextPoint(coord);
-
-- int pts[2];
-+ vtkIdType pts[2];
- pts[0] = lastVTKpoint;
- pts[1] = NewVTKpoint;
-
-@@ -751,7 +751,7 @@
- aP2 = theNodesP(nbnodes);
-
- float coord[3];
-- int pts[2];
-+ vtkIdType pts[2];
-
- for(int j=1;j<nbnodes;j++) {
- gp_Pnt pt1 = theNodesP(j);
-@@ -783,7 +783,7 @@
- aP2 = theNodesPoly(nbnodes);
-
- float coord[3];
-- int pts[2];
-+ vtkIdType pts[2];
-
- for(int j=1;j<nbnodes;j++) {
- Standard_Integer id1 = Nodesidx(j);
-@@ -854,12 +854,12 @@
- float coord[3];
- coord[0] = xo; coord[1] = yo; coord[2] = zo;
-
-- int ptLoc = Pts->InsertNextPoint(coord);
-- int ptFirst = 0;
-- int ptPrev = 0;
-- int ptCur = 0;
-+ vtkIdType ptLoc = Pts->InsertNextPoint(coord);
-+ vtkIdType ptFirst = 0;
-+ vtkIdType ptPrev = 0;
-+ vtkIdType ptCur = 0;
-
-- int pts[2];
-+ vtkIdType pts[2];
-
- int NbPoints = 15;
- for (int i = 1; i <= NbPoints; i++, ptPrev = ptCur)
-@@ -947,7 +947,7 @@
-
- gp_Pnt P = BRep_Tool::Pnt( aVertex );
- float delta = 1, coord[3];
-- int pts[2];
-+ vtkIdType pts[2];
- // insert pt
- ZERO_COORD; coord[0] = +delta;
- pts[0] = Pts->InsertNextPoint(coord);
-@@ -1026,7 +1026,7 @@
- Standard_Integer N1,N2,N3;
- Triangles(i).Get(N1,N2,N3);
-
-- int pts[3];
-+ vtkIdType pts[3];
- pts[0] = N1-1; pts[1] = N2-1; pts[2] = N3-1;
- Cells->InsertNextCell(3,pts);
-
diff --git a/sci-misc/salome-geom/files/salome-geom-3.2.6.patch b/sci-misc/salome-geom/files/salome-geom-3.2.6.patch
deleted file mode 100644
index f537d9e37..000000000
--- a/sci-misc/salome-geom/files/salome-geom-3.2.6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./GEOM_SRC_3.2.6/build_configure.org 2007-04-24 18:40:50.000000000 +0200
-+++ ./GEOM_SRC_3.2.6/build_configure 2008-01-07 10:28:14.000000000 +0100
-@@ -116,7 +116,7 @@
-
- # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
- echo "" >> 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 "" >> configure.in_tmp1
- echo "AC_OUTPUT([ \\" >> configure.in_tmp1
---- ./GEOM_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:40:50.000000000 +0200
-+++ ./GEOM_SRC_3.2.6/adm_local/Makefile.in 2008-01-07 11:34:23.000000000 +0100
-@@ -27,12 +27,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:
-
---- ./GEOM_SRC_3.2.6/doc/salome/gui/Makefile.in.org 2007-04-24 18:40:50.000000000 +0200
-+++ ./GEOM_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-07 12:00:47.000000000 +0100
-@@ -29,7 +29,7 @@
- @COMMENCE@
-
- usr_docs:
-- cp -fr $(srcdir)/GEOM ./
-+# cp -fr $(srcdir)/GEOM ./
- -find $(PWD) -name CVS -prune -exec rm -rf {} \;
-
- docs: usr_docs
diff --git a/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch b/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch
new file mode 100644
index 000000000..0f4168613
--- /dev/null
+++ b/sci-misc/salome-geom/files/salome-geom-5.1.3-qt4-path.patch
@@ -0,0 +1,11 @@
+--- src5.1.3.orig/GEOM_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:00:58.281572535 +0100
++++ src5.1.3/GEOM_SRC_5.1.3/adm_local/unix/config_files/check_qt.m4 2010-03-06 21:03:34.110325466 +0100
+@@ -333,7 +333,7 @@
+
+ LIBS_old=$LIBS
+ if test "x$QTDIR" = "x/usr" ; then
+- QT_LIB_DIR=""
++ QT_LIB_DIR="-L/usr/lib${LIB_LOCATION_SUFFIX}/qt4"
+ elif test -d ${QTDIR}/lib; then
+ QT_LIB_DIR="-L$QTDIR/lib"
+ elif test -d ${QTDIR}/lib64; then
diff --git a/sci-misc/salome-geom/salome-geom-3.2.6.ebuild b/sci-misc/salome-geom/salome-geom-3.2.6.ebuild
deleted file mode 100644
index 34f9d4745..000000000
--- a/sci-misc/salome-geom/salome-geom-3.2.6.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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. GEOM component"
-HOMEPAGE="http://www.salome-platform.org"
-SRC_URI="http://files.opencascade.com/Salome${PV}/src${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc mpi opengl"
-
-RDEPEND="opengl? ( virtual/opengl )
- mpi? ( sys-cluster/mpich2 )
- debug? ( dev-util/cppunit )"
-
-DEPEND="${RDEPEND}
- >=sci-misc/salome-kernel-${PV}
- >=sci-misc/salome-gui-${PV}"
-
-MODULE_NAME="GEOM"
-MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
-INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-GEOM_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
-export OPENPBS="/usr"
-
-src_unpack() {
- python_version
- distutils_python_version
-
- 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}.patch
-
- # If vtk-5.O is used, include directory is named vtk-5.0 and not vtk
- if has_version ">=sci-libs/vtk-5.0" && has_version "<sci-libs/vtk-5.2" ; then
- einfo "vtk version 5 detected"
- append-flags -I/usr/include/vtk-5.0
- fi
- # If vtk-5.2 is used, include directory is named vtk-5.2 and not vtk
- if has_version ">=sci-libs/vtk-5.2" ; then
- einfo "vtk version 5 detected"
- append-flags -I/usr/include/vtk-5.2
- epatch "${FILESDIR}"/${P}-vtk-5.2.patch
- fi
-
-}
-
-
-src_compile() {
- local myconf=""
- cd "${MY_S}"
- rm -r -f autom4te.cache
- ./build_configure
-
- # CXXFLAGS are slightly modified to allow the compilation of
- # salome-geom 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 mpich
- # 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-mpich"
- 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
- fi
-}
-
-
-pkg_postinst() {
- elog "Run \`env-update && source /etc/profile\`"
- elog "now to set up the correct paths."
- elog ""
-}
diff --git a/sci-misc/salome-geom/salome-geom-5.1.3.ebuild b/sci-misc/salome-geom/salome-geom-5.1.3.ebuild
new file mode 100644
index 000000000..7bd21db3c
--- /dev/null
+++ b/sci-misc/salome-geom/salome-geom-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. GEOM 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 mpi opengl"
+
+RDEPEND="opengl? ( virtual/opengl )
+ mpi? ( || ( sys-cluster/openmpi[cxx]
+ sys-cluster/mpich2[cxx] ) )
+ debug? ( dev-util/cppunit )
+ >=sci-misc/salome-kernel-${PV}
+ >=sci-misc/salome-gui-${PV}
+ >=dev-python/omniorbpy-3.4
+ >=net-misc/omniORB-4.1.4
+ >=x11-libs/qt-core-4.5.2
+ >=x11-libs/qt-gui-4.5.2
+ >=x11-libs/qt-opengl-4.5.2
+ >=sci-libs/opencascade-6.3
+ >=dev-libs/boost-1.40.0
+ >=sci-libs/vtk-5.0[python]
+ >=sci-libs/hdf5-1.6.4"
+
+DEPEND="${RDEPEND}
+ >=app-doc/doxygen-1.5.6
+ media-gfx/graphviz
+ >=dev-python/docutils-0.4
+ dev-lang/swig"
+
+MODULE_NAME="GEOM"
+MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+GEOM_ROOT_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+
+PYVER=$(python_get_version)
+
+pkg_setup() {
+ [[ ${PYVER} > 2.4 ]] && \
+ ewarn "Python 2.4 is highly recommended for Salome..."
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-qt4-path.patch
+
+ cd "${MY_S}"
+ rm -r -f autom4te.cache
+ ./clean_configure
+ ./build_configure
+}
+
+src_configure() {
+ local vtk_suffix=""
+
+ has_version ">=sci-libs/vtk-5.0" && vtk_suffix="-5.0"
+ has_version ">=sci-libs/vtk-5.2" && vtk_suffix="-5.2"
+ has_version ">=sci-libs/vtk-5.4" && vtk_suffix="-5.4"
+
+ cd "${MY_S}"
+
+ 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 \
+ --with-vtk=${VTKHOME} \
+ --with-vtk-version=${vtk_suffix} \
+ --with-qt='/usr' \
+ $(use_enable debug ) \
+ $(use_enable debug debug ) \
+ $(use_enable !debug production ) \
+ $(use_with opengl opengl /usr) \
+ || die "econf failed"
+}
+
+src_compile() {
+ cd "${MY_S}"
+
+ MAKEOPTS="-j1" 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_local/Makefile
+ insinto "${INSTALL_DIR}"
+ doins -r adm_local
+
+ use doc && dodoc INSTALL
+}
+
+pkg_postinst() {
+ elog "Run \`env-update && source /etc/profile\`"
+ elog "now to set up the correct paths."
+ elog ""
+}