aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-20 21:31:04 +0000
committerdanieltourde <danieltourde@32389bae-6d03-0410-99cf-db05cde120eb>2008-05-20 21:31:04 +0000
commit779c2abe95900f87408ba4791870c7dc8a151388 (patch)
treebf71a84ebd5f3eb23d6cd1883f76415ce498971e /sci-misc
parentInitial update. There is still some work to do but it starts to get shape! ;) (diff)
downloadsci-779c2abe95900f87408ba4791870c7dc8a151388.tar.gz
sci-779c2abe95900f87408ba4791870c7dc8a151388.tar.bz2
sci-779c2abe95900f87408ba4791870c7dc8a151388.zip
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@1076 32389bae-6d03-0410-99cf-db05cde120eb
Diffstat (limited to 'sci-misc')
-rw-r--r--sci-misc/salome-gui/Changelog7
-rw-r--r--sci-misc/salome-gui/Manifest10
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6.patch80
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch118
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch50
-rw-r--r--sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch46
-rw-r--r--sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch176
-rw-r--r--sci-misc/salome-gui/salome-gui-3.2.6.ebuild178
8 files changed, 665 insertions, 0 deletions
diff --git a/sci-misc/salome-gui/Changelog b/sci-misc/salome-gui/Changelog
new file mode 100644
index 000000000..994c40618
--- /dev/null
+++ b/sci-misc/salome-gui/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-gui-3.2.6.ebuild, +salome-gui-3.2.6.patch, +salome-gui-3.2.6_sip-4.1.7.patch, +salome-gui-3.2.6_configure_in_base.patch, +salome-gui-3.2.6_qwt-4.patch, +salome-gui-vtk-5.0.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-gui/Manifest b/sci-misc/salome-gui/Manifest
new file mode 100644
index 000000000..69d0c99e9
--- /dev/null
+++ b/sci-misc/salome-gui/Manifest
@@ -0,0 +1,10 @@
+AUX icon/salome-gui-icon.png 1934 RMD160 700c6d3a96df0576582af4c2d77f1588cf385ab6 SHA1 4aca0bb3b2331ec4253fdc299777012501841508 SHA256 df2ee182545ccaf1081bd3687b984ccd0b4d0166698cd7a403f138055bcb8ec2
+AUX icon/salome-gui.desktop 231 RMD160 d52cff811bd6ba023665142fef42772cdc9183c6 SHA1 d503d9d15daa2da5a6958fdda35c1800e4388518 SHA256 6db6029c7b4cca981473defae3b004de37ef7772d7a3b26595dead8933dca5a1
+AUX salome-gui-3.2.6.patch 3012 RMD160 22fb336711a1247d5cc072128e4464beb7fa5df9 SHA1 5a9228794bb143d75c9d1bba7c8cdf46ab6f47bc SHA256 6fe97d1363d257cddd40ce284d4b84f58849a3f75955bd792091b02d9a034ec0
+AUX salome-gui-3.2.6_configure_in_base.patch 4588 RMD160 feab6b36319891f65665280d8f6e3e50078ec2f9 SHA1 abf258e19af6601f64215b9d0cc1fadc942f8025 SHA256 2ce9d880a0d7a4be6fca4ac5c1d2b927bd80c25aae41c4ee56eef2007dfe42d4
+AUX salome-gui-3.2.6_qwt-4.patch 1853 RMD160 921d470a2aa3be47113c6c0f1cf6d913d08ae47f SHA1 7a35b01bcda7d63b357fd67bd48be16cbf4438fb SHA256 c7fc34c220f4d19896783f43e444de245eae5d8464315fa55d0093adfc0e2b97
+AUX salome-gui-3.2.6_sip-4.1.7.patch 785 RMD160 0531e5ab612a973359ed96ce6afdbe09c0894678 SHA1 35207f32922b48782b08b17e85dcae596cfb2123 SHA256 daf7c76dfead2da15a4857849d119843ae5702f163c5d4a45404cdd8fd706185
+AUX salome-gui-vtk-5.0.patch 8618 RMD160 e529f86abaad3991ba9e4d9664bf0b55dd9a6bbc SHA1 02cfa2dea47e8d3b8eff50ab90fb6acf2e15befd SHA256 15489b2ee67611077a7e988fcafdab20dab59335a34519baef6797ac4b4e2c30
+DIST salome-3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
+EBUILD salome-gui-3.2.6.ebuild 5424 RMD160 8815cfdd1cc506bd3b0d0fe2bd6ce15629cdde11 SHA1 51b5465a2ff1c7785ef4adbc71951c67ca4efb0f SHA256 3ed50c08391f226b4c71a73f404732aa7b11bbfae3fb5df1d485497552b670b5
+MISC Changelog 700 RMD160 75ac10e4194b031de66f4074db142fac457de22a SHA1 1b7c0d8d4dcaba18759e393fa735e49407b5ae22 SHA256 7f46259f6a01c5e611b30b21601edbe9822d7674bedbabbf382bb915ac9accad
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6.patch
new file mode 100644
index 000000000..8170914cd
--- /dev/null
+++ b/sci-misc/salome-gui/files/salome-gui-3.2.6.patch
@@ -0,0 +1,80 @@
+--- GUI_SRC_3.2.6/doc/salome/gui/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200
++++ GUI_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-03 12:51:11.000000000 +0100
+@@ -28,7 +28,7 @@
+ @COMMENCE@
+
+ usr_docs:
+- cp -fr $(srcdir)/GUI ./
++# cp -fr $(srcdir)/GUI ./
+ -find $(PWD) -name CVS -prune -exec rm -rf {} \;
+
+ docs: usr_docs
+--- ./GUI_SRC_3.2.6/adm_local/Makefile.in.org 2007-04-24 18:41:04.000000000 +0200
++++ ./GUI_SRC_3.2.6/adm_local/Makefile.in 2007-09-26 23:23:59.000000000 +0200
+@@ -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:
+
+--- ./GUI_SRC_3.2.6/build_configure.org 2007-04-24 18:41:04.000000000 +0200
++++ ./GUI_SRC_3.2.6/build_configure 2007-05-26 12:29:53.000000000 +0200
+@@ -109,7 +109,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
+diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4 src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4
+--- ./GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4.org 2007-11-25 19:13:29.000000000 +0100
++++ ./GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4 2007-11-25 19:15:45.000000000 +0100
+@@ -50,6 +50,10 @@
+ SIP_VERS=v4_new ;;
+ 4.5*)
+ SIP_VERS=v4_new ;;
++ 4.6*)
++ SIP_VERS=v4_new ;;
++ 4.7*)
++ SIP_VERS=v4_new ;;
+ *)
+ AC_MSG_RESULT(sip version $version not supported)
+ SIP_VERS=unsupported ;;
+diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in
+--- ./GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in.org 2007-11-25 19:13:29.000000000 +0100
++++ ./GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in 2007-11-25 19:14:50.000000000 +0100
+@@ -41,6 +41,9 @@
+ ifeq ($(QT_VERS),Qt_3_3_7)
+ QT_VERS = Qt_3_3_0
+ endif
++ifeq ($(QT_VERS),Qt_3_3_8)
++QT_VERS = Qt_3_3_0
++endif
+
+ # Sip flags
+ SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
+diff -aburN src3.2.6_orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
+--- ./GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in.org 2007-11-25 19:13:29.000000000 +0100
++++ ./GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in 2007-11-25 19:14:21.000000000 +0100
+@@ -44,6 +44,10 @@
+ QT_VERS = Qt_3_3_0
+ endif
+
++ifeq ($(QT_VERS),Qt_3_3_8)
++QT_VERS = Qt_3_3_0
++endif
++
+ # Sip flags
+ SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
+
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch
new file mode 100644
index 000000000..71044edad
--- /dev/null
+++ b/sci-misc/salome-gui/files/salome-gui-3.2.6_configure_in_base.patch
@@ -0,0 +1,118 @@
+Seulement dans src3.2.6/GUI_SRC_3.2.6: #configure.in.base#
+diff -abur src3.2.6_orig/GUI_SRC_3.2.6/configure.in.base src3.2.6/GUI_SRC_3.2.6/configure.in.base
+--- src3.2.6_orig/GUI_SRC_3.2.6/configure.in.base 2007-04-24 18:41:04.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/configure.in.base 2008-03-24 16:41:34.000000000 +0100
+@@ -35,37 +35,82 @@
+ ########################################################################
+ # Check --disable-corba-gen and other --disable-* options
+
+-GUI_DISABLE_CORBA="no"
+-DISABLE_PYCONSOLE="no"
+-DISABLE_GLVIEWER="no"
+-DISABLE_PLOT2DVIEWER="no"
+-DISABLE_SUPERVGRAPHVIEWER="no"
+-DISABLE_OCCVIEWER="no"
+-DISABLE_VTKVIEWER="no"
+-DISABLE_SALOMEOBJECT="no"
+-
+-for option
+-do
+- case $option in
+- -disable-corba-gen=yes | --disable-corba-gen=yes | -disable-corba-gen | --disable-corba-gen)
+- GUI_DISABLE_CORBA="yes";;
+- -disable-pyConsole=yes | --disable-pyConsole=yes | -disable-pyConsole | --disable-pyConsole)
+- DISABLE_PYCONSOLE="yes";;
+- -disable-glViewer=yes | --disable-glViewer=yes | -disable-glViewer | --disable-glViewer)
+- DISABLE_GLVIEWER="yes";;
+- -disable-plot2dViewer=yes | --disable-plot2dViewer=yes | -disable-plot2dViewer | --disable-plot2dViewer)
+- DISABLE_PLOT2DVIEWER="yes";;
+- -disable-supervGraphViewer=yes | --disable-supervGraphViewer=yes | \
+- -disable-supervGraphViewer | --disable-supervGraphViewer)
+- DISABLE_SUPERVGRAPHVIEWER="yes";;
+- -disable-occViewer=yes | --disable-occViewer=yes | -disable-occViewer | --disable-occViewer)
+- DISABLE_OCCVIEWER="yes";;
+- -disable-vtkViewer=yes | --disable-vtkViewer=yes | -disable-vtkViewer | --disable-vtkViewer)
+- DISABLE_VTKVIEWER="yes";;
+- -disable-salomeObject=yes | --disable-salomeObject=yes | -disable-salomeObject | --disable-salomeObject)
+- DISABLE_SALOMEOBJECT="yes";;
+- esac
+-done
++AC_ARG_ENABLE([corba-gen],
++ [--enable-corba-gen],
++ [if test x$enableval = "xyes"; then
++ GUI_DISABLE_CORBA="no";
++ elif test x$enableval = "xno"; then
++ GUI_DISABLE_CORBA="yes";
++ else
++ echo "Error : unknown value : $enableval"
++ exit 1
++ fi])
++
++AC_ARG_ENABLE([pyConsole],
++ [--enable-pyConsole],
++ [if test x$enableval = "xyes"; then
++ DISABLE_PYCONSOLE="no";
++ elif test x$enableval = "xno"; then
++ DISABLE_PYCONSOLE="yes";
++ else
++ echo "Error : unknown value : $enableval"
++ exit 1
++ fi])
++
++AC_ARG_ENABLE([glViewer],
++ [--enable-glViewer],
++ [if test x$enableval = "xyes"; then
++ DISABLE_GLVIEWER="no";
++ elif test x$enableval = "xno"; then
++ DISABLE_GLVIEWER="yes";
++ else
++ echo "Error : unknown value : $enableval"
++ exit 1
++ fi])
++
++AC_ARG_ENABLE([plot2dViewer],
++ [--enable-plot2dViewer],
++ [if test x$enableval = "xyes"; then
++ DISABLE_PLOT2DVIEWER="no";
++ elif test x$enableval = "xno"; then
++ DISABLE_PLOT2DVIEWER="yes";
++ else
++ echo "Error : unknown value : $enableval"
++ exit 1
++ fi])
++
++AC_ARG_ENABLE([supervGraphViewer],
++ [--enable-supervGraphViewer],
++ [if test x$enableval = "xyes"; then
++ DISABLE_SUPERVGRAPHVIEWER="no";
++ elif test x$enableval = "xno"; then
++ DISABLE_SUPERVGRAPHVIEWER="yes";
++ else
++ echo "Error : unknown value : $enableval"
++ exit 1
++ fi])
++
++AC_ARG_ENABLE([occViewer],
++ [--enable-occViewer],
++ [if test x$enableval = "xyes"; then
++ DISABLE_OCCVIEWER="no";
++ elif test x$enableval = "xno"; then
++ DISABLE_OCCVIEWER="yes";
++ else
++ echo "Error : unknown value : $enableval"
++ exit 1
++ fi])
++
++AC_ARG_ENABLE([salomeObject],
++ [--enable-salomeObject],
++ [if test x$enableval = "xyes"; then
++ DISABLE_SALOMEOBJECT="no";
++ elif test x$enableval = "xno"; then
++ DISABLE_SALOMEOBJECT="yes";
++ else
++ echo "Error : unknown value : $enableval"
++ exit 1
++ fi])
+
+ dnl
+ dnl Initialize source and build root directories
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch
new file mode 100644
index 000000000..c4c703cd9
--- /dev/null
+++ b/sci-misc/salome-gui/files/salome-gui-3.2.6_qwt-4.patch
@@ -0,0 +1,50 @@
+--- GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4.org 2008-02-19 14:43:03.000000000 +0100
++++ GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4 2008-02-19 14:46:31.000000000 +0100
+@@ -27,17 +27,17 @@
+ exits_ok=no
+ if test "x$exits_ok" = "xno"; then
+ for d in /usr/local /usr ; do
+- AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so,exits_ok=yes,exits_ok=no)
++ AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/libqwt.so.4,exits_ok=yes,exits_ok=no)
+ if test "x$exits_ok" = "xyes"; then
+ QWTHOME=$d
+- AC_MSG_RESULT(libqwt.so detected in $d/lib)
++ AC_MSG_RESULT(libqwt.so.4 detected in $d/lib)
+ fi
+ done
+ fi
+ if test "x$exits_ok" = "xno"; then
+ for d in `echo $LD_LIBRARY_PATH | sed -e "s/:/ /g"` ; do
+- if test -f $d/libqwt.so ; then
+- AC_MSG_RESULT(libqwt.so detected in $d)
++ if test -f $d/libqwt.so.4 ; then
++ AC_MSG_RESULT(libqwt.so.4 detected in $d)
+ QWTHOME=$d
+ QWTHOME=`echo ${QWTHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+ exits_ok=yes
+--- GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4_orig 2008-01-06 12:46:14.000000000 +0100
++++ GUI_SRC_3.2.6/adm_local/unix/config_files/check_qwt.m4 2008-01-06 13:16:14.000000000 +0100
+@@ -96,9 +96,9 @@
+ fi
+ if test "x$QWTHOME" = "x/usr"
+ then
+- LIBS="$LIBS -lqwt"
++ LIBS="$LIBS -l:libqwt.so.4"
+ else
+- LIBS="$LIBS -L$QWTHOME/lib -lqwt"
++ LIBS="$LIBS -L$QWTHOME/lib -l:libqwt.so.4"
+ fi
+
+ CXXFLAGS_old=$CXXFLAGS
+@@ -126,9 +126,9 @@
+ QWT_INCLUDES="-I$QWT_INCLUDES"
+ if test "x$QWTHOME" = "x/usr"
+ then
+- QWT_LIBS=" -lqwt"
++ QWT_LIBS=" -l:libqwt.so.4"
+ else
+- QWT_LIBS="-L$QWTHOME/lib -lqwt"
++ QWT_LIBS=" -L$QWTHOME/lib -l:libqwt.so.4"
+ fi
+
+ AC_SUBST(QWT_INCLUDES)
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch
new file mode 100644
index 000000000..f389a65a4
--- /dev/null
+++ b/sci-misc/salome-gui/files/salome-gui-3.2.6_sip-4.1.7.patch
@@ -0,0 +1,46 @@
+--- GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip 2007-12-21 23:04:12.000000000 +0100
++++ GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4.sip 2007-12-21 23:05:26.000000000 +0100
+@@ -63,6 +63,43 @@
+ PT_User
+ };
+
++%ModuleCode
++
++enum MenuName {
++ File = 1,
++ View = 2,
++ Edit = 3,
++ Preferences = 4,
++ Tools = 5,
++ Window = 6,
++ Help = 7
++};
++
++enum WindowType {
++ WT_ObjectBrowser,
++ WT_PyConsole,
++ WT_LogWindow,
++ WT_User
++};
++
++enum PrefType {
++ PT_Space,
++ PT_Bool,
++ PT_Color,
++ PT_String,
++ PT_Selector,
++ PT_DblSpin,
++ PT_IntSpin,
++ PT_Double,
++ PT_Integer,
++ PT_GroupBox,
++ PT_Font,
++ PT_DirList,
++ PT_File,
++ PT_User
++};
++%End
++
+ class QtxAction : QAction
+ {
+ %TypeHeaderCode
diff --git a/sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch b/sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch
new file mode 100644
index 000000000..032ed937f
--- /dev/null
+++ b/sci-misc/salome-gui/files/salome-gui-vtk-5.0.patch
@@ -0,0 +1,176 @@
+--- ./src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4.org 2007-04-24 18:41:04.000000000 +0200
++++ ./src3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 2007-05-26 12:32:50.000000000 +0200
+@@ -76,7 +76,7 @@
+ if test -z $VTKHOME
+ then
+ AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled)
+- if test -f /usr/include/vtk/vtkPlane.h ; then
++ if test -f /usr/include/vtk-5.0/vtkPlane.h ; then
+ AC_MSG_RESULT(trying /usr)
+ VTKHOME="/usr"
+ fi
+@@ -84,9 +84,9 @@
+
+ if test ! -z $VTKHOME
+ then
+- LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES"
+- LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $LOCAL_LIBS"
+- TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $TRY_LINK_LIBS"
++ LOCAL_INCLUDES="-I$VTKHOME/include/vtk-5.0 $LOCAL_INCLUDES"
++ LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.0 -L/usr/lib/python2.4/site-packages/vtk $LOCAL_LIBS"
++ TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.0 -L/usr/lib/python2.4/site-packages/vtk/ $TRY_LINK_LIBS"
+ fi
+
+ dnl vtk headers
+@@ -142,4 +142,4 @@
+ # Save cache
+ AC_CACHE_SAVE
+
+-])dnl
+\ No newline at end of file
++])dnl
+Seulement dans ./src3.2.6/GUI_SRC_3.2.6: autom4te.cache
+Seulement dans ./src3.2.6/GUI_SRC_3.2.6: configure
+Seulement dans ./src3.2.6/GUI_SRC_3.2.6: configure.in
+Seulement dans ./src3.2.6/GUI_SRC_3.2.6: salome_adm
+diff -abur /home/francois/Desktop/salome/src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
+--- ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip 2007-04-24 18:41:04.000000000 +0200
++++ ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip 2007-11-26 00:18:40.000000000 +0100
+@@ -13,7 +13,7 @@
+
+ class SALOME_Selection : QObject
+ {
+-%HeaderCode
++%TypeHeaderCode
+ #include <SalomePyQt.h>
+ %End
+
+@@ -75,7 +75,7 @@
+
+ class SalomePyQt
+ {
+-%HeaderCode
++%TypeHeaderCode
+ #include <SalomePyQt.h>
+ %End
+
+Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt: SalomePyQt.sip~
+diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+--- ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2007-04-24 18:41:04.000000000 +0200
++++ ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2007-11-25 23:34:31.000000000 +0100
+@@ -46,8 +46,8 @@
+ #include "sipSalomePyQtGUIDeclSalomePyQtGUI.h"
+ #endif
+
+-#include <sipqtQWidget.h>
+-#include <sipqtQPopupMenu.h>
++//#include <sipqtQWidget.h>
++//#include <sipqtQPopupMenu.h>
+
+ #include <CORBA.h>
+
+Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI: SALOME_PYQT_Module.cxx~
+diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx
+--- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2007-04-24 18:41:04.000000000 +0200
++++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2007-11-25 21:39:54.000000000 +0100
+@@ -119,8 +119,8 @@
+ vtkIdType aPntStartId = 0;
+ vtkIdType aCellStartId = 0;
+
+- for(vtkIdType aDataSetId = 0; aDataSetId < this->NumberOfInputs; ++aDataSetId){
+- vtkDataSet* aDataSet = (vtkDataSet *)(this->Inputs[aDataSetId]);
++ for(vtkIdType aDataSetId = 0; aDataSetId < this->InputList->GetNumberOfItems(); ++aDataSetId){
++ vtkDataSet* aDataSet = (vtkDataSet *)(this->GetInput(aDataSetId));
+ // Do mapping of the nodes
+ if(!GetSharedPointsDataSet()){
+ vtkIdType aNbPnts = aDataSet->GetNumberOfPoints();
+@@ -265,11 +265,11 @@
+
+ numCells = 0;
+
+- vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs);
++ vtkDataSetAttributes::FieldList cellList(this->InputList->GetNumberOfItems());
+ int firstCD=1;
+
+- for (idx = 0; idx < this->NumberOfInputs; ++idx) {
+- ds = (vtkDataSet *)(this->Inputs[idx]);
++ for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) {
++ ds = (vtkDataSet *)(this->GetInput(idx));
+ if (ds != NULL) {
+ if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 ) {
+ continue; //no input, just skip
+@@ -308,8 +308,8 @@
+ output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData());
+
+ // 2.cells
+- for (idx = 0; idx < this->NumberOfInputs; ++idx) {
+- ds = (vtkDataSet *)(this->Inputs[idx]);
++ for (idx = 0; idx < this->InputList->GetNumberOfItems(); ++idx) {
++ ds = (vtkDataSet *)(this->GetInput(idx));
+ if (ds != NULL) {
+ numCells = ds->GetNumberOfCells();
+ cd = ds->GetCellData();
+Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_AppendFilter.cxx~
+diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
+--- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx 2007-04-24 18:41:04.000000000 +0200
++++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx 2007-11-25 20:53:53.000000000 +0100
+@@ -240,7 +240,7 @@
+ for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){
+ aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
+ }
+- anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
++ anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
+ anOutput->SetPoints(anInput->GetPoints());
+ aCellLocationsArray->Delete();
+ }
+@@ -329,7 +329,7 @@
+ for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){
+ aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts));
+ }
+- anOutput->SetCells(aCellTypesArray,aCellLocationsArray,aConnectivity);
++ anOutput->SetCells(aCellTypesArray,(vtkIdTypeArray*)aCellLocationsArray,aConnectivity);
+ anOutput->SetPoints(anInput->GetPoints());
+ aCellLocationsArray->Delete();
+ }
+Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_ExtractUnstructuredGrid.cxx~
+diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx
+--- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx 2007-04-24 18:41:04.000000000 +0200
++++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx 2007-11-25 20:55:38.000000000 +0100
+@@ -80,7 +80,7 @@
+ VTKViewer_GeometryFilter
+ ::Execute()
+ {
+- vtkDataSet *input= this->GetInput();
++ vtkDataSet *input= (vtkDataSet*) this->GetInput();
+ vtkIdType numCells=input->GetNumberOfCells();
+
+ if (numCells == 0)
+Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_GeometryFilter.cxx~
+diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx
+--- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx 2007-04-24 18:41:04.000000000 +0200
++++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx 2007-11-25 21:40:41.000000000 +0100
+@@ -58,7 +58,7 @@
+ vtkFloatingPointType center[3], *p, pt[3];
+ vtkPointData *pd, *outPD;;
+ vtkIdList *ptIds, *newPtIds;
+- vtkDataSet *input= this->GetInput();
++ vtkDataSet *input= (vtkDataSet*) this->GetInput();
+ vtkUnstructuredGrid *output = this->GetOutput();
+ vtkIdType tenth;
+ vtkFloatingPointType decimal;
+Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_ShrinkFilter.cxx~
+diff -abur ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx
+--- ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx 2007-04-24 18:41:04.000000000 +0200
++++ ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx 2007-11-25 21:41:40.000000000 +0100
+@@ -43,8 +43,8 @@
+ vtkPoints *inPts;
+ vtkPoints *newPts;
+ int numPts, numCells;
+- vtkPointSet *input = this->GetInput();
+- vtkPointSet *output = this->GetOutput();
++ vtkPointSet *input = (vtkPointSet*) this->GetInput();
++ vtkPointSet *output = (vtkPointSet*) this->GetOutput();
+ vtkPointData *pd=input->GetPointData(), *outPD=output->GetPointData();
+ vtkCellData *cd=input->GetCellData(), *outCD=output->GetCellData();
+ output->CopyStructure( input );
+Seulement dans ./src3.2.6/GUI_SRC_3.2.6/src/VTKViewer: VTKViewer_TransformFilter.cxx~
diff --git a/sci-misc/salome-gui/salome-gui-3.2.6.ebuild b/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
new file mode 100644
index 000000000..b20f719ba
--- /dev/null
+++ b/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
@@ -0,0 +1,178 @@
+# 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. GUI 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 corba pyconsole glviewer plot2dviewer supervgraphviewer occviewer vtkviewer salomeobject opengl mpi debug"
+RESTRICT="fetch"
+
+RDEPEND="opengl? ( virtual/opengl )
+ mpi? ( sys-cluster/mpich2 )
+ debug? ( dev-util/cppunit )
+ corba? ( <=dev-python/omniorbpy-2.6
+ <=net-misc/omniORB-4.1 )"
+
+DEPEND="${RDEPEND}
+ >=sci-misc/salome-kernel-3.2.6"
+
+MODULE_NAME="GUI"
+MY_S="${WORKDIR}/src${PV}/${MODULE_NAME}_SRC_${PV}"
+INSTALL_DIR="/opt/salome-${PV}/${MODULE_NAME}"
+GUI_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
+
+ if ! use salomeobject ; then
+ if use plot2dviewer ; then
+ die "plot2dviewer use flag has been enabled, but salomeobject is disabled\n" \
+ "please enable salomeobject use flag before continuing"
+ fi
+ if use supervgraphviewer ; then
+ die "plot2dviewer use flag has been enabled, but salomeobject is disabled\n" \
+ "please enable salomeobject use flag before continuing"
+ fi
+ fi
+
+
+ unpack ${A}
+ cd "${WORKDIR}/src${PV}"
+ epatch "${FILESDIR}"/${P}.patch
+ epatch "${FILESDIR}"/${P}_sip-4.1.7.patch
+ epatch "${FILESDIR}"/${P}_qwt-4.patch
+ epatch "${FILESDIR}"/${P}_configure_in_base.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" ; then
+ einfo "vtk version 5 detected"
+ append-flags -I/usr/include/vtk-5.0
+ epatch "${FILESDIR}"/salome-gui-vtk-5.0.patch
+ else
+ einfo "vtk version 4 or prior detected";
+ fi
+
+ cd "${MY_S}"
+
+ rm -r -f autom4te.cache
+ ./build_configure
+}
+
+
+src_compile()
+{
+ local myconf=""
+ cd "${MY_S}"
+
+ # CXXFLAGS are slightly modified to allow the compilation of
+ # salome-gui 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
+
+ # Fix a bug concerning a missing header
+ append-flags -I${MY_S}/../KERNEL_SRC_${PV}/src/Basics/Test
+
+ # 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) \
+ $(use_enable salomeobject salomeObject) \
+ $(use_enable vtkviewer vtkViewer) \
+ $(use_enable occviewer occViewer) \
+ $(use_enable supervgraphviewer supervGraphViewer) \
+ $(use_enable plot2dviewer plot2dViewer) \
+ $(use_enable glviewer glViewer) \
+ $(use_enable pyconsole pyConsole) \
+ $(use_enable corba corba-gen) \
+ || 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 AUTHORS ChangeLog COPYING INSTALL LICENCE NEWS README README.FIRST.txt
+ fi
+
+ # Install icon and .desktop for menu entry
+ doicon "${FILESDIR}"/icon/${PN}-icon.png
+ domenu "${FILESDIR}"/icon/${PN}.desktop
+}
+
+pkg_postinst() {
+ elog "Run \`env-update && source /etc/profile\`"
+ elog "now to set up the correct paths."
+ elog ""
+}