media-gfx/meshlab: EAPI 6 bump ,fix bug #614776

- Add patch structuresynth build failure
Submitted-by: CaptainBlood <luc_pierard_de_maujouy@yahoo.fr>

- Fix slot glew

Package-Manager: Portage-2.3.6, Repoman-2.3.1

12 files changed, 50 insertions, 36 deletions

diff --git a/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch b/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch
index b918ca52ec45..6329f23e7949 100644
--- a/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch
+++ b/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch
@@ -1,7 +1,7 @@
 diff --git vcglib/wrap/ply/plystuff.h vcglib/wrap/ply/plystuff.h
 index 3e41e63..4af9508 100644
---- vcglib/wrap/ply/plystuff.h
-+++ vcglib/wrap/ply/plystuff.h
+--- a/vcglib/wrap/ply/plystuff.h
++++ b/vcglib/wrap/ply/plystuff.h
 @@ -75,6 +75,7 @@ using namespace vcg;
  #define pb_close  _close
  #define DIR_SEP "\\"
diff --git a/media-gfx/meshlab/files/1.3.3/lapack.patch b/media-gfx/meshlab/files/1.3.3/lapack.patch
index 81c094634050..e2742eb99991 100644
--- a/media-gfx/meshlab/files/1.3.3/lapack.patch
+++ b/media-gfx/meshlab/files/1.3.3/lapack.patch
@@ -1,6 +1,6 @@
 diff -Nur meshlab.orig/src/external/levmar-2.3/lm.h meshlab/src/external/levmar-2.3/lm.h
---- meshlab.orig/src/external/levmar-2.3/lm.h	2010-04-28 17:30:47.000000000 +1000
-+++ meshlab/src/external/levmar-2.3/lm.h	2010-05-13 20:17:35.488505907 +1000
+--- a/meshlab/src/external/levmar-2.3/lm.h	2010-04-28 17:30:47.000000000 +1000
++++ b/meshlab/src/external/levmar-2.3/lm.h	2010-05-13 20:17:35.488505907 +1000
 @@ -27,7 +27,6 @@
  
  /* specify whether to use LAPACK or not. The first option is strongly recommended */
diff --git a/media-gfx/meshlab/files/1.3.3/meshrender.patch b/media-gfx/meshlab/files/1.3.3/meshrender.patch
index 382e21ca2f0d..33eb1cbf7038 100644
--- a/media-gfx/meshlab/files/1.3.3/meshrender.patch
+++ b/media-gfx/meshlab/files/1.3.3/meshrender.patch
@@ -1,5 +1,5 @@
---- meshlab/src/meshlabplugins/render_gdp/meshrender.cpp	2014-02-07 10:38:28.000000000 +0100
-+++ meshlab/src/meshlabplugins/render_gdb/meshrender.cpp	2015-11-15 22:17:39.848179962 +0100
+--- a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp	2014-02-07 10:38:28.000000000 +0100
++++ b/meshlab/src/meshlabplugins/render_gdb/meshrender.cpp	2015-11-15 22:17:39.848179962 +0100
 @@ -36,8 +36,11 @@
  	/*QAction * qaNone = new QAction("None", this); 
  	qaNone->setCheckable(false);
diff --git a/media-gfx/meshlab/files/1.3.3/mpir.patch b/media-gfx/meshlab/files/1.3.3/mpir.patch
index a3f8d051d891..fae203e18a18 100644
--- a/media-gfx/meshlab/files/1.3.3/mpir.patch
+++ b/media-gfx/meshlab/files/1.3.3/mpir.patch
@@ -1,6 +1,6 @@
 diff -Nur meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro meshlab/src/meshlabplugins/filter_csg/filter_csg.pro
---- meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro	2014-04-02 02:59:31.000000000 +1100
-+++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro	2014-06-01 21:10:24.521095356 +1000
+--- a/meshlab/src/meshlabplugins/filter_csg/filter_csg.pro	2014-04-02 02:59:31.000000000 +1100
++++ b/meshlab/src/meshlabplugins/filter_csg/filter_csg.pro	2014-06-01 21:10:24.521095356 +1000
 @@ -18,6 +18,4 @@
  win32-msvc2008:LIBS		 += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
  win32-msvc2010:LIBS		 += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
diff --git a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
index 00f3ba8c1822..853015da4d06 100644
--- a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
+++ b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
@@ -1,5 +1,5 @@
---- meshlab/src/common/pluginmanager.cpp~	2014-04-01 17:07:40.000000000 +0200
-+++ meshlab/src/common/pluginmanager.cpp	2015-11-15 20:58:53.708227793 +0100
+--- a/meshlab/src/common/pluginmanager.cpp	2014-04-01 17:07:40.000000000 +0200
++++ b/meshlab/src/common/pluginmanager.cpp	2015-11-15 20:58:53.708227793 +0100
 @@ -178,7 +178,11 @@
  
  QString PluginManager::getBaseDirPath()
diff --git a/media-gfx/meshlab/files/1.3.3/qt-4.8.patch b/media-gfx/meshlab/files/1.3.3/qt-4.8.patch
index e820aceb5bbe..bb1113a5c617 100644
--- a/media-gfx/meshlab/files/1.3.3/qt-4.8.patch
+++ b/media-gfx/meshlab/files/1.3.3/qt-4.8.patch
@@ -1,6 +1,6 @@
 diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
---- meshlab.orig/src/meshlab/meshlab.pro	2011-02-15 20:39:47.000000000 +1100
-+++ meshlab/src/meshlab/meshlab.pro	2012-01-07 11:57:18.055586086 +1100
+--- a/meshlab/src/meshlab/meshlab.pro	2011-02-15 20:39:47.000000000 +1100
++++ b/meshlab/src/meshlab/meshlab.pro	2012-01-07 11:57:18.055586086 +1100
 @@ -85,6 +85,7 @@
  QT += xmlpatterns
  QT += network
diff --git a/media-gfx/meshlab/files/1.3.3/rfx.patch b/media-gfx/meshlab/files/1.3.3/rfx.patch
index 9cac55959910..0d7d03d3f09e 100644
--- a/media-gfx/meshlab/files/1.3.3/rfx.patch
+++ b/media-gfx/meshlab/files/1.3.3/rfx.patch
@@ -1,5 +1,5 @@
---- meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp~	2014-02-07 10:38:29.000000000 +0100
-+++ meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp	2015-11-16 00:07:34.868113218 +0100
+--- a/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp	2014-02-07 10:38:29.000000000 +0100
++++ b/meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp	2015-11-16 00:07:34.868113218 +0100
 @@ -55,7 +55,11 @@
  
  void RenderRFX::initActionList()
diff --git a/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch
index 59f3333a7311..1fbf686980be 100644
--- a/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch
+++ b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch
@@ -1,5 +1,5 @@
---- meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp~	2013-05-22 17:08:53.000000000 +0200
-+++ meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp	2015-11-15 23:18:04.678143277 +0100
+--- a/meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp	2013-05-22 17:08:53.000000000 +0200
++++ b/meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp	2015-11-15 23:18:04.678143277 +0100
 @@ -63,7 +63,12 @@
  
  void RmMeshShaderRenderPlugin::initActionList() {
diff --git a/media-gfx/meshlab/files/1.3.3/rpath.patch b/media-gfx/meshlab/files/1.3.3/rpath.patch
index 31ed26b0344e..473d2a8fa480 100644
--- a/media-gfx/meshlab/files/1.3.3/rpath.patch
+++ b/media-gfx/meshlab/files/1.3.3/rpath.patch
@@ -1,6 +1,6 @@
 diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
---- meshlab.orig/src/meshlab/meshlab.pro	2012-05-31 00:32:44.000000000 +1000
-+++ meshlab/src/meshlab/meshlab.pro	2012-08-06 21:26:01.405784190 +1000
+--- a/meshlab/src/meshlab/meshlab.pro	2012-05-31 00:32:44.000000000 +1000
++++ b/meshlab/src/meshlab/meshlab.pro	2012-08-06 21:26:01.405784190 +1000
 @@ -130,11 +130,11 @@
  #}
  
@@ -20,8 +20,8 @@ diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
  # uncomment in your local copy only in emergency cases.
  # We should never be too permissive
 diff -Nur meshlab.orig/src/meshlabserver/meshlabserver.pro meshlab/src/meshlabserver/meshlabserver.pro
---- meshlab.orig/src/meshlabserver/meshlabserver.pro	2011-10-15 03:34:48.000000000 +1100
-+++ meshlab/src/meshlabserver/meshlabserver.pro	2012-08-06 21:26:34.609557938 +1000
+--- a/meshlab/src/meshlabserver/meshlabserver.pro	2011-10-15 03:34:48.000000000 +1100
++++ b/meshlab/src/meshlabserver/meshlabserver.pro	2012-08-06 21:26:34.609557938 +1000
 @@ -26,11 +26,11 @@
  win32-msvc2010:  LIBS += -L../distrib -lcommon
  win32-g++:  LIBS += -L../distrib -lcommon
diff --git a/media-gfx/meshlab/files/1.3.3/structuresynth.patch b/media-gfx/meshlab/files/1.3.3/structuresynth.patch
new file mode 100644
index 000000000000..e5d6d2baea9c
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/structuresynth.patch
@@ -0,0 +1,11 @@
+--- a/meshlab/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp	2014-02-07 12:38:23.000000000 +0300
++++ b/meshlab/src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp	2017-08-10 21:00:02.819783756 +0300
+@@ -122,7 +122,7 @@
+ 						currentT = p;
+ 
+ 						// We do not intersect grid.
+-						if (!found) return false;
++						if (!found) return NULL;
+ 				}
+ 
+ 				stepX = (dir.x() > 0) ? 1 : -1;
diff --git a/media-gfx/meshlab/meshlab-1.3.2.ebuild b/media-gfx/meshlab/meshlab-1.3.2.ebuild
index f2f3eb354eb9..587c5dbe2632 100644
--- a/media-gfx/meshlab/meshlab-1.3.2.ebuild
+++ b/media-gfx/meshlab/meshlab-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ DEPEND="dev-cpp/eigen:3
 	dev-cpp/muParser
 	dev-qt/qtcore:4
 	dev-qt/qtopengl:4
-	media-libs/glew
+	media-libs/glew:0=
 	media-libs/qhull
 	=media-libs/lib3ds-1*
 	media-libs/openctm
diff --git a/media-gfx/meshlab/meshlab-1.3.3.ebuild b/media-gfx/meshlab/meshlab-1.3.3-r1.ebuild
index 8c1c340e1fe8..8cfb26c0df4c 100644
--- a/media-gfx/meshlab/meshlab-1.3.3.ebuild
+++ b/media-gfx/meshlab/meshlab-1.3.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils versionator multilib
+inherit eutils versionator
 
 DESCRIPTION="A mesh processing system"
 HOMEPAGE="http://meshlab.sourceforge.net/"
@@ -19,7 +19,7 @@ DEPEND="dev-cpp/eigen:3
 	dev-qt/qtcore:4
 	dev-qt/qtopengl:4
 	dev-qt/qtxmlpatterns:4
-	media-libs/glew
+	media-libs/glew:0=
 	media-libs/qhull
 	=media-libs/lib3ds-1*
 	media-libs/openctm
@@ -30,17 +30,20 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/meshlab/src"
 
+PATCHES=( "${FILESDIR}/${PV}/gcc-4.7.patch"
+	  "${FILESDIR}/${PV}/lapack.patch"
+	  "${FILESDIR}/${PV}/mpir.patch"
+	  "${FILESDIR}/${PV}/qt-4.8.patch"
+	  "${FILESDIR}/${PV}/rpath.patch"
+	  "${FILESDIR}/${PV}/pluginmanager.patch"
+	  "${FILESDIR}/${PV}/meshrender.patch"
+	  "${FILESDIR}/${PV}/rmmeshrender.patch"
+	  "${FILESDIR}/${PV}/rfx.patch"
+	  "${FILESDIR}/${PV}/structuresynth.patch" )
+
 src_prepare() {
-	cd "${WORKDIR}"
-	epatch	"${FILESDIR}/${PV}"/gcc-4.7.patch \
-		"${FILESDIR}/${PV}"/lapack.patch \
-		"${FILESDIR}/${PV}"/mpir.patch \
-		"${FILESDIR}/${PV}"/qt-4.8.patch \
-		"${FILESDIR}/${PV}"/rpath.patch \
-		"${FILESDIR}/${PV}"/pluginmanager.patch \
-		"${FILESDIR}/${PV}"/meshrender.patch \
-		"${FILESDIR}/${PV}"/rmmeshrender.patch \
-		"${FILESDIR}/${PV}"/rfx.patch
+	cd "${WORKDIR}" || die
+	default
 }
 
 src_configure() {