sci-misc/salome-gui: Most USE-flags doesn't seem to be optional, changed default settings; added pyobject.patch

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

4 files changed, 38 insertions, 28 deletions

diff --git a/sci-misc/salome-gui/ChangeLog b/sci-misc/salome-gui/ChangeLog
index 2ce17e670..37a169776 100644
--- a/sci-misc/salome-gui/ChangeLog
+++ b/sci-misc/salome-gui/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Sep 2008; Oliver Borm (boroli) <oli.borm@web.de>
+  salome-gui-3.2.6.ebuild, +files/salome-gui-3.2.6_pyobject.patch:
+  Most USE-flags doesn't seem to be optional, changed default settings; added
+  pyobject.patch
+
   27 Aug 2008; Oliver Borm (boroli) <oli.borm@web.de>
   salome-gui-3.2.6.ebuild, -Changelog, +metadata.xml:
   Removed fetch restriction, removed hardcode
diff --git a/sci-misc/salome-gui/Manifest b/sci-misc/salome-gui/Manifest
index e83a16ffa..2645fda89 100644
--- a/sci-misc/salome-gui/Manifest
+++ b/sci-misc/salome-gui/Manifest
@@ -1,10 +1,11 @@
 AUX salome-gui-3.2.6-gcc-4.3.patch 2808 RMD160 18acd8191f87846712fe1a49a9cf0ede36c8d1e9 SHA1 aa0a2de9c868daee034f286d43074770313f3589 SHA256 363e9c3c194a7124a091ff6ddc8afc3a448de203a2a5cfbb26eb61ba815a97e8
 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_pyobject.patch 535 RMD160 fa4f7002be33a33ee6a4b3ff3e6ca09f982c0b92 SHA1 27174db2f84912b77cb117fd1bf7216e67a1088a SHA256 8d7589b22717ee3305917d6696ecbd899b1c67c1e71b83f7771924f8b7c3df43
 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 src3.2.6.tar.gz 88763725 RMD160 0a0b77aa538832265416605bf502df9e790b45b7 SHA1 e4736b8431d3a4f43541e09eed861f88a2a2f439 SHA256 1f4ae59538675242b179fa2af9bf9adeffe87c8d80d3e6798bca03eafc0bb258
-EBUILD salome-gui-3.2.6.ebuild 5144 RMD160 e7813c1f8a87dacb10cf62e1dd3f476da38f96f2 SHA1 bbbf60d884016011c943e8ca69b6c45e2a4c5707 SHA256 f9715485c36f204b5a3b10d6f1f1e14525283f314077a60e2be9d36507d8201c
-MISC ChangeLog 1116 RMD160 6e4f2afe136719d77d4142239842907a3c3c6be5 SHA1 093346b13ed57ed81b0522ae2c60b22c89026131 SHA256 12e74a5bf4dfec8a56f01265297d7b743057059e859bfc9f63a8b460f03d5d94
+EBUILD salome-gui-3.2.6.ebuild 4717 RMD160 52e955f2be56a68b7fbb1d53c5c224ab63b990a2 SHA1 c24b8fcb29b1131c7fdb829b41db7ca650122b15 SHA256 65d1ac44956a0d828ca3b9504ea77dfc0e15bbe55703065447d6b8fd07166ba8
+MISC ChangeLog 1333 RMD160 6219001044848c41ec0f2f61649a55a8c77e450a SHA1 8babe3ba1c5fe10a0831a143e6817ef0f94bd758 SHA256 4e940b65bd932fe37e4c8493c6083786df6c5fea69b9d8678b2f93206189d33f
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch b/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch
new file mode 100644
index 000000000..0607ae387
--- /dev/null
+++ b/sci-misc/salome-gui/files/salome-gui-3.2.6_pyobject.patch
@@ -0,0 +1,11 @@
+--- src3.2.6.orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx	2008-09-04 10:20:58.000000000 +0200
++++ src3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx	2008-09-04 10:21:43.000000000 +0200
+@@ -764,7 +764,7 @@
+       if ( PyDict_Check( res1 ) ) {
+         PyObject* key;
+         PyObject* value;
+-        int pos = 0;
++        Py_ssize_t pos = 0;
+         while ( PyDict_Next( res1, &pos, &key, &value ) ) {
+ 	  // parse the return value
+ 	  // it should be a map: {integer:integer}
diff --git a/sci-misc/salome-gui/salome-gui-3.2.6.ebuild b/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
index c7cecf1d1..80388f067 100644
--- a/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
+++ b/sci-misc/salome-gui/salome-gui-3.2.6.ebuild
@@ -11,13 +11,11 @@ SRC_URI="http://files.opencascade.com/Salome${PV}/src${PV}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="doc corba pyconsole glviewer plot2dviewer supervgraphviewer occviewer vtkviewer salomeobject opengl mpi debug"
+IUSE="debug doc mpi opengl vtkviewer"
 
 RDEPEND="opengl?  ( virtual/opengl )
 	 mpi?     ( sys-cluster/mpich2 )
-	 debug?   ( dev-util/cppunit )
-	 corba?   ( <=dev-python/omniorbpy-2.6
-	 	    <=net-misc/omniORB-4.1 )"
+	 debug?   ( dev-util/cppunit )"
 
 DEPEND="${RDEPEND}
 	 >=sci-misc/salome-kernel-${PV}"
@@ -29,8 +27,7 @@ GUI_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..."
@@ -39,17 +36,6 @@ src_unpack()
 		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
@@ -57,6 +43,11 @@ src_unpack()
 	epatch "${FILESDIR}"/${P}_qwt-4.patch
 	epatch "${FILESDIR}"/${P}_configure_in_base.patch
 
+	# Python 2.5 support
+	if version_is_at_least "2.5" "${PYVER}"; then
+		epatch "${FILESDIR}"/${P}_pyobject.patch
+	fi
+
 	# Gcc 4.3 support
 	if version_is_at_least "4.3" $(gcc-version) ; then
 		epatch "${FILESDIR}"/${P}-gcc-4.3.patch
@@ -78,8 +69,7 @@ src_unpack()
 }
 
 
-src_compile()
-{
+src_compile() {
 	local myconf=""
 	cd "${MY_S}"
 
@@ -94,6 +84,9 @@ src_compile()
 		append-flags -m64
 	fi
 
+	# Quick hack to fix the patch to vtkLibs
+	append-flags -L/usr/$(get_libdir)/python${PYVER}/site-packages/vtk
+
 	# Fix a bug concerning a missing header	
 	append-flags -I${MY_S}/../KERNEL_SRC_${PV}/src/Basics/Test
 
@@ -112,19 +105,19 @@ src_compile()
 	      --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 \
+	      --enable-corba-gen \
+	      --enable-pyConsole \
+	      --enable-glViewer \
+	      --enable-plot2dViewer \
+	      --enable-supervGraphViewer \
+	      --enable-occViewer \
+	      --enable-salomeObject \
 	      ${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