media-gfx/meshlab: updated the ebuild according

Package-Manager: Portage-2.3.24, Repoman-2.3.6

3 files changed, 16 insertions, 18 deletions

diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 2b88a3dea..7a39feb73 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -1,3 +1,3 @@
-AUX 9999-use-external-libs.patch 6870 BLAKE2B 910a51468b2993f0682eb98b377dcf7266239783b910355bfb396d8bde0c511d18582fb3c5a49ca304d5f004da76497842bea6783ae5a6149753b5cdb210b702 SHA512 15027e3deb23565eef04c768c06a15acb1e8f89a51f4659e55fd3d82f7b4d46a67f17ef6d1dedfaf6e609718eebd36896ad01d0d56fe9fcf4e99b86c658c76f2
-EBUILD meshlab-9999.ebuild 1927 BLAKE2B 56e1ba65bce5f8e0521b1cc95d25f4e2276b8868c310295db38e97f19e6cf41ce23673c4268c8841be1dbfead9ff45a30a181c99503d8691019e00d3a51dc2ee SHA512 baa34bb41ad4a723ef27b650de475955330978091e896b062d915dbb0b5ba37ad5e65676af1a85fa75f0d98edff369e8a448fbf48524fea65aacf2e92e412f2a
+AUX 9999-use-external-libs.patch 6780 BLAKE2B 2d1bf5f1a4e988089ee0673716a6873b44bd0937567f631c8801b91ef09aebb0077a828f95f301e12220064a3a4c7f4c7f2628f981c2ff05c6863d57b54df001 SHA512 680c9d6d41c1b05b839ddb07caff5ae9facc793f8898253a4f8b5613f3ddba140a045562280a3115fbfad2e2dbad3af9599298998b2e3de4277cfbf6d3829d7a
+EBUILD meshlab-9999.ebuild 1926 BLAKE2B c08e48fb587c2acb88315e21c572f665a77d4d85df90a61483b8f2666fcb20828608fd147028ace000e7abdab43aed9697828094251bccd8327567e853cb0151 SHA512 2b87ea26dfb787716474e3f98676c611a43fea9e56b9a8f379b60cef3ee0d541f74c3ec16c88e42a8d1f7cc7da548676ba378ebe3d47d9d3043f9593a7f72224
 MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25
diff --git a/media-gfx/meshlab/files/9999-use-external-libs.patch b/media-gfx/meshlab/files/9999-use-external-libs.patch
index 2baa2cb51..2a39451d4 100644
--- a/media-gfx/meshlab/files/9999-use-external-libs.patch
+++ b/media-gfx/meshlab/files/9999-use-external-libs.patch
@@ -50,7 +50,7 @@ index fa9dcdc8..57352f4e 100644
  CONFIG += c++11
  
 diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
-index f6a1d7ee..90a7b449 100644
+index 2661143f..0df2cd77 100644
 --- a/meshlab/meshlab.pro
 +++ b/meshlab/meshlab.pro
 @@ -1,7 +1,6 @@
@@ -72,7 +72,7 @@ index f6a1d7ee..90a7b449 100644
  DEPENDPATH += $$VCGDIR \
      $$VCGDIR/vcg \
      $$VCGDIR/wrap
-@@ -153,11 +150,11 @@ win32-g++:LIBS        	+= -L../external/lib/win32-gcc -ljhead -L../distrib -lcom
+@@ -154,11 +151,11 @@ win32-g++:LIBS        	+= -L../external/lib/win32-gcc -ljhead -L../distrib -lcom
  #	win32-g++:release:LIBS 			+= -L../common/release -lcommon
  #}
  
@@ -88,19 +88,18 @@ index f6a1d7ee..90a7b449 100644
  
  # uncomment in your local copy only in emergency cases.
 diff --git a/meshlabplugins/filter_func/filter_func.pro b/meshlabplugins/filter_func/filter_func.pro
-index 14df20f1..ca9d6a2d 100644
+index ef6b654c..026c66be 100644
 --- a/meshlabplugins/filter_func/filter_func.pro
 +++ b/meshlabplugins/filter_func/filter_func.pro
-@@ -6,8 +6,6 @@ SOURCES       += filter_func.cpp
+@@ -8,7 +8,6 @@ TARGET        = filter_func
  

- TARGET        = filter_func

  

+ DEFINES += _UNICODE

 -INCLUDEPATH += ../../external/muparser_v225/include

--

+ 

  # Note: we need static libs so when building muparser lib use 

  # ./configure --enable-shared=no

- 

-@@ -20,7 +18,4 @@ win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/muparser.lib
+@@ -22,7 +21,4 @@ win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/muparser.lib
  win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/muparser.lib

  

  macx:LIBS            += $$MACLIBDIR/libmuparser.a

@@ -109,23 +108,22 @@ index 14df20f1..ca9d6a2d 100644
 -linux-g++-64:LIBS       += $$PWD/../../external/lib/linux-g++-64/libmuparser.a

  win32-g++:LIBS		 += ../../external/lib/win32-gcc/libmuparser.a

 diff --git a/meshlabplugins/io_3ds/io_3ds.pro b/meshlabplugins/io_3ds/io_3ds.pro
-index 85b4a744..5ed78ab1 100644
+index 85b4a744..2cfad82d 100644
 --- a/meshlabplugins/io_3ds/io_3ds.pro
 +++ b/meshlabplugins/io_3ds/io_3ds.pro
-@@ -10,12 +10,8 @@ HEADERS		= meshio.h \
+@@ -10,11 +10,9 @@ HEADERS		= meshio.h \
  				
  SOURCES       += 	meshio.cpp \
  			
 -DEFINES += LIB3DS_STATIC
--
+ 
  TARGET        = io_3ds
  
 -INCLUDEPATH += ../../external/lib3ds-1.3.0/
--
+ 
  # Notes on the paths of lib3ds files.
  # Once you have compiled the library put the lib files in a dir named lib/XXX/ 
- # where XXX is the name of your system according to the QT naming style.
-@@ -26,9 +22,6 @@ win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/3ds.lib
+@@ -26,9 +24,6 @@ win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/3ds.lib
  win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/3ds.lib
  win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/3ds.lib
  win32-g++:LIBS		+= ../../external/lib/win32-gcc/lib3ds.a
diff --git a/media-gfx/meshlab/meshlab-9999.ebuild b/media-gfx/meshlab/meshlab-9999.ebuild
index 4a0ac045e..a63023f10 100644
--- a/media-gfx/meshlab/meshlab-9999.ebuild
+++ b/media-gfx/meshlab/meshlab-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,7 @@ src_unpack() {
 	git-r3_fetch ${GIT_REPO_MESHLAB} refs/heads/master
 	git-r3_checkout ${GIT_REPO_MESHLAB} "${WORKDIR}/${PN}"
 
-	git-r3_fetch ${GIT_REPO_VCGLIB} refs/heads/master
+	git-r3_fetch ${GIT_REPO_VCGLIB} refs/heads/devel
 	git-r3_checkout ${GIT_REPO_VCGLIB} "${WORKDIR}/vcglib"
 }