import from svn

12 files changed, 1196 insertions, 0 deletions

diff --git a/media-gfx/meshlab/ChangeLog b/media-gfx/meshlab/ChangeLog
new file mode 100644
index 0000000..4611314
--- /dev/null
+++ b/media-gfx/meshlab/ChangeLog
@@ -0,0 +1,67 @@
+# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*<PACKAGE_NAME>-<PACKAGE_VERSION>-<PACKAGE_RELEASE> (DD MMM YYYY)
+
+  DD MMM YYYY; YOUR_NAME <YOUR_EMAIL> changed_file1, changed_file2 :
+  Initial import.  Ebuild submitted by submitter_name <submitter_email>.
+  Note that the "changed_file" listing is optional if you are simply bumping
+  the rev of the ebuild and are only making changes to the .ebuild file
+  itself.  Also note that we now have a single unified paragraph rather than
+  having the first line separated from the rest by a newline.  Everything
+  should be in one block like this. (note by drobbins, 16 Jul 2002)
+
+  DD MMM YYYY; YOUR_NAME <YOUR_EMAIL> changed_file1, changed_file2: this is
+  an earlier ChangeLog entry.
+
+-- Explanation of ChangeLog format:
+
+  ***************************************************************************
+  THIS IS IMPORTANT: The ChangeLog format is a *chronological* account of all
+  changes made to a set of ebuilds. That means that the most recent ChangeLog
+  entry *always* goes at the top of the file. More explanation below.
+  ***************************************************************************
+
+  ***************************************************************************
+  ANOTHER IMPORTANT NOTE: There are some ChangeLogs that don't follow this
+  format and organize all changes under the "correct" "*" entry. This is not
+  correct. However, rather than making a concerted effort to fix these
+  ChangeLogs, we should spend our energy defining a comprehensive and strict
+  XML-based ChangeLog format which we then migrate to. But for any entries to
+  any ChangeLog that *you* make, please make sure to always add entries to the
+  top of the file like a good boy/girl. Even do this if it's clear that you're
+  adding an entry to a b0rked ChangeLog.
+  ***************************************************************************
+
+  This changelog is targeted to users. This means that the comments should be
+  well explained and written in clean English.
+
+  Every new version or revision of the package should be marked by a '*'
+  separator line as above to indicate where in the chronology it was first
+  added to our CVS tree. Any changes since the last revision, really _any
+  changes at all_ have to be added to the top of the file, underneath the
+  initial copyright and cvs header comments, in exactly the same format as this
+  comment. If you are modifying older ebuilds, simply note them as changed
+  files and add your entry to the top of the ChangeLog. Resist the temptation
+  to "organize" your ChangeLog entries by placing them under the "correct" "*"
+  entries -- this isn't the purpose of the "*" entries.
+
+  This means that you start with header line that has the following format,
+  indented two spaces:
+
+  DD MMM YYYY; your_name <your_email> changed_file1, changed_file2: Your
+  explanation should follow. It should be indented and wrapped at a line width
+  of 80 characters.  The changed_files can be omitted if they are obvious; for
+  example, if you are only modifying the .ebuild file and committing a new rev
+  of a package.  Any details about what exactly changed in the code should be
+  added as a message when the changes are committed to cvs, not in this file.
+
+-- A word regarding credit:
+
+  Please add credit information ("ebuild submitted by ...", "patch submitted
+  by ...") to the ChangeLog. Do not add this information to the ebuilds
+  themselves.
+
+  And remember: Give credit where credit is due. We're all doing this for
+  free, so the best we can hope (and expect!) to receive is credit.
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
new file mode 100644
index 0000000..9c5243c
--- /dev/null
+++ b/media-gfx/meshlab/Manifest
@@ -0,0 +1,13 @@
+AUX meshlab-1.2.3a-r5-use-system-libs-rpath.patch 14603 RMD160 68c32a0ef39af483d6d4a51617a883655a5ce9b7 SHA1 a95029a530ac1880c41862b36f81dc0d5a9fa1b5 SHA256 99ae7c3d91f45cca5dbfdb81045316efa397b3f3864b9d2b97866a3abaeef5a6
+AUX meshlab-1.3.0a-unbundle-libs-and-fix-rpath.patch 14382 RMD160 805216bf950b6cb29719357bb9e75a815366dac3 SHA1 7a5ee33b5b5559ea91682e9e790012cd6fa72259 SHA256 e2d5915ff511dab717dfec9bf0113d7a75ce3649b878dcf9f994133bb8dbc61a
+DIST MeshLabSrc_AllInc_v123a.tgz 11126723 RMD160 6443582eaefb2c98496914fbf1836bbebbb599da SHA1 17c5af3cd07b7c131d9e387e85337d50b7180a20 SHA256 3b515ddde7ff24a14ba32e3cbc755661cd7d58a4a2a467133d59fad001168427
+DIST MeshLabSrc_AllInc_v130a.tgz 12119277 RMD160 1d99dd52ecbfd1d8298182cbe7e799e6d5f91f8b SHA1 cc73758763a07036a768723ce7b95ae0bc5da038 SHA256 42404620bcb4fa8d3dc9576494343369feef4c2cc3d191f0007dbd530395ba5c
+EBUILD meshlab-1.2.3a-r1.ebuild 2150 RMD160 5ce5ae8ba2376589d5f62d921d061918d3f6deb7 SHA1 773f1008935e96b25d532c99d413fd60ed4ab707 SHA256 9acf13509e08476320eeeae20c001cd83be0c98918ec3a1734fe8e1029f20d9c
+EBUILD meshlab-1.2.3a-r2.ebuild 1753 RMD160 cb8bc2fdf8c4bc61c27931001b7aee28b6545c99 SHA1 91a1832d16cdd2d92190d90c9ce5fd812dcddc92 SHA256 6681563e2dff004a70fec1be1b9efa3a925d318bbb222f0445079702666b3898
+EBUILD meshlab-1.2.3a-r3.ebuild 1438 RMD160 088a7067ab8a94387e939d9278bf85c1e3985c0e SHA1 ee34bf62ef9d52b44604fe9fdaf195437b75f9f2 SHA256 e2fcecdef23fc803f0c07d2e79ffef1d467af48470dffd930aa5e16b2404ea2a
+EBUILD meshlab-1.2.3a-r4.ebuild 1435 RMD160 307f6441db280c1c6ba9c8996e99c5d52ead2493 SHA1 235b0225005eda45b82f079174c722c6b01f3f12 SHA256 cba9d2f702d908bf17ae2c2328d4d44c7770ea70676e572d0340dc583c2b4804
+EBUILD meshlab-1.2.3a-r5.ebuild 1452 RMD160 2f7023da74ebdef6472d9358994c43c335c114d8 SHA1 9a6bbe71ec428c3b42e2b05cb5cca7aa1688592e SHA256 f3c37360a5725bee88ff0ef01b85030067ba39150528dbd433d134f56c363de1
+EBUILD meshlab-1.2.3a-r6.ebuild 1444 RMD160 3c942e743b92b1117abfaa6d3b5d1764088e5c3a SHA1 b1f6436404ecb7a8f823132bba6810ed9c5f852b SHA256 1c6ed65b8b7d8086f4674a904bbb729234facbfff9dff93881a45786780be390
+EBUILD meshlab-1.3.0a.ebuild 1511 RMD160 3f04a6aa33894a2ef6b97c131d2965d6a85a2086 SHA1 90eeb8293eecd2037cd79aa4de55c7d004cdafce SHA256 af1d37786cede496bc32eee72fa9fdb14d1f51a8e98fdc634245f22dc671ffbc
+MISC ChangeLog 3658 RMD160 b46694ce0f8a7327a112d7d3749e5a5ec3c3e979 SHA1 4a4463924f20d3c15763455a66c9b05ff1c4a292 SHA256 140d10ec72e83274e3a844b6796f4abce81528c0adef66c628deaea8e5587e3c
+MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/media-gfx/meshlab/files/meshlab-1.2.3a-r5-use-system-libs-rpath.patch b/media-gfx/meshlab/files/meshlab-1.2.3a-r5-use-system-libs-rpath.patch
new file mode 100644
index 0000000..f96fe4b
--- /dev/null
+++ b/media-gfx/meshlab/files/meshlab-1.2.3a-r5-use-system-libs-rpath.patch
@@ -0,0 +1,322 @@
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/common/common.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/common/common.pro
+--- MeshLabSrc_AllInc_v123a/meshlab/src/common/common.pro	2010-05-05 14:54:06.000000000 +0200
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/common/common.pro	2010-05-16 14:39:04.000000000 +0200
+@@ -1,6 +1,5 @@
+ VCGDIR = ../../../vcglib
+-GLEWDIR = ../external/glew-1.5.1
+-GLEWCODE = $$GLEWDIR/src/glew.c
++GLEWDIR = /usr/include/GL
+ 
+ 
+ win32-msvc2005:DESTDIR = ../distrib
+@@ -19,14 +18,14 @@
+ macx:QMAKE_POST_LINK = "cp libcommon.* ../distrib/meshlab.app/Contents/MacOs/"
+ INCLUDEPATH *= ../.. \
+     $$VCGDIR \
+-    $$GLEWDIR/include
++    $$GLEWDIR
+ TEMPLATE = lib
+ linux-g++:CONFIG += dll
+ linux-g++:DESTDIR = ../distrib
+ linux-g++-32:CONFIG += dll
+ linux-g++-32:DESTDIR = ../distrib
+ linux-g++-64:CONFIG += dll
+-linux-g++-64:DESTDIR = ../distrib
++linux-g++-64:DESTDIR = ../distrib 
+ 
+ win32-msvc2005:CONFIG += staticlib
+ win32-msvc2008:CONFIG += staticlib
+@@ -54,5 +53,4 @@
+     filterscript.cpp \
+     GLLogStream.cpp \
+     meshmodel.cpp \
+-    pluginmanager.cpp \
+-    $$GLEWCODE
++    pluginmanager.cpp 
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_func/filter_func.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_func/filter_func.pro
+--- MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_func/filter_func.pro	2010-05-05 14:54:06.000000000 +0200
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_func/filter_func.pro	2010-05-16 13:29:44.000000000 +0200
+@@ -14,7 +14,7 @@
+ win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib

+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib

+ macx:LIBS            += ../../external/lib/macx/libmuparser.a

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

+-linux-g++-32:LIBS       += ../../external/lib/linux-g++-32/libmuparser.a

+-linux-g++-64:LIBS       += ../../external/lib/linux-g++-64/libmuparser.a

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

++linux-g++:LIBS       += -lmuparser

++linux-g++-32:LIBS       += -lmuparser

++linux-g++-64:LIBS       += -lmuparser

++win32-g++:LIBS		 += -lmuparser

+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_qhull/filter_qhull.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_qhull/filter_qhull.pro
+--- MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_qhull/filter_qhull.pro	2010-04-28 09:30:45.000000000 +0200
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_qhull/filter_qhull.pro	2010-06-13 23:21:55.000000000 +0200
+@@ -8,28 +8,14 @@
+ SOURCES       += filter_qhull.cpp \ 
+ 		qhull_tools.cpp 
+ 
+-HEADERS += 	../../external/qhull-2003.1/src/geom.h \
+-		../../external/qhull-2003.1/src/io.h \
+-		../../external/qhull-2003.1/src/mem.h \
+-		../../external/qhull-2003.1/src/merge.h \
+-		../../external/qhull-2003.1/src/poly.h \
+-		../../external/qhull-2003.1/src/qhull.h \
+-		../../external/qhull-2003.1/src/qset.h \
+-		../../external/qhull-2003.1/src/stat.h \
+-		../../external/qhull-2003.1/src/user.h 
+-
+-SOURCES +=	../../external/qhull-2003.1/src/geom.c \
+-		../../external/qhull-2003.1/src/geom2.c \
+-		../../external/qhull-2003.1/src/global.c \
+-		../../external/qhull-2003.1/src/io.c \
+-		../../external/qhull-2003.1/src/mem.c \
+-		../../external/qhull-2003.1/src/merge.c \
+-		../../external/qhull-2003.1/src/poly.c \
+-		../../external/qhull-2003.1/src/poly2.c \
+-		../../external/qhull-2003.1/src/qconvex.c \
+-		../../external/qhull-2003.1/src/qhull.c \
+-		../../external/qhull-2003.1/src/qset.c \
+-		../../external/qhull-2003.1/src/stat.c \
+-		../../external/qhull-2003.1/src/user.c 
++HEADERS += 	/usr/include/qhull/geom.h \
++		/usr/include/qhull/io.h \
++		/usr/include/qhull/mem.h \
++		/usr/include/qhull/merge.h \
++		/usr/include/qhull/poly.h \
++		/usr/include/qhull/qhull.h \
++		/usr/include/qhull/qset.h \
++		/usr/include/qhull/stat.h \
++		/usr/include/qhull/user.h 
+ 
+ TARGET        = filter_qhull
+\ No newline at end of file
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_qhull/qhull_tools.h MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_qhull/qhull_tools.h
+--- MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_qhull/qhull_tools.h	2010-04-28 09:30:45.000000000 +0200
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_qhull/qhull_tools.h	2010-06-13 23:24:24.000000000 +0200
+@@ -55,14 +55,14 @@
+ #endif

+ #include <stdio.h>

+ #include <stdlib.h>

+-#include "../../external/qhull-2003.1/src/qhull.h"

+-#include "../../external/qhull-2003.1/src/mem.h"

+-#include "../../external/qhull-2003.1/src/qset.h"

+-#include "../../external/qhull-2003.1/src/geom.h"

+-#include "../../external/qhull-2003.1/src/merge.h"

+-#include "../../external/qhull-2003.1/src/poly.h"

+-#include "../../external/qhull-2003.1/src/io.h"

+-#include "../../external/qhull-2003.1/src/stat.h"

++#include "qhull/qhull.h"

++#include "qhull/mem.h"

++#include "qhull/qset.h"

++#include "qhull/geom.h"

++#include "qhull/merge.h"

++#include "qhull/poly.h"

++#include "qhull/io.h"

++#include "qhull/stat.h"

+ #if defined(__cplusplus)

+ }

+ #endif

+@@ -71,4 +71,4 @@
+ facetT *compute_delaunay(int dim, int numpoints, MeshModel &m);

+ bool compute_voronoi(int dim, int numpoints, MeshModel &m, MeshModel &pm,float threshold);

+ bool compute_alpha_shapes(int dim, int numpoints, MeshModel &m, MeshModel &pm,double alpha, bool alphashape);

+-int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP);
+\ No newline at end of file
++int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP);

+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlab/meshlab.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlab/meshlab.pro
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlab/meshlab.pro	2010-05-05 14:54:06.000000000 +0200
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlab/meshlab.pro	2010-06-19 18:06:04.000000000 +0200
+@@ -1,5 +1,5 @@
+ VCGDIR = ../../../vcglib
+-GLEWDIR = ../external/glew-1.5.1
++GLEWDIR = /usr/include/GL
+ #CONFIG += debug_and_release
+ DESTDIR = ../distrib
+ # uncomment to try Eigen
+@@ -7,7 +7,7 @@
+ # CONFIG += warn_off
+ INCLUDEPATH *= ../.. \
+     $$VCGDIR \
+-    $$GLEWDIR/include
++    $$GLEWDIR
+ DEPENDPATH += $$VCGDIR \
+     $$VCGDIR/vcg \
+     $$VCGDIR/wrap
+@@ -88,7 +88,7 @@
+ INCLUDEPATH += . \
+     .. \
+     ../../../vcglib \
+-    $$GLEWDIR/include
++    $$GLEWDIR
+ CONFIG += stl
+ 
+ macx:LIBS += ../common/libcommon.dylib
+@@ -107,12 +107,12 @@
+ #	win32-g++:release:LIBS 			+= -L../common/release -lcommon
+ #}
+ 
+-linux-g++:LIBS += -L../distrib -lcommon
+-linux-g++:QMAKE_RPATHDIR += ../distrib
+-linux-g++-32:LIBS += -L../distrib -lcommon
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib
+-linux-g++-64:LIBS += -L../distrib -lcommon
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib
++linux-g++:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
++linux-g++-32:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-32:QMAKE_RPATHDIR += ../usr/lib/meshlab
++linux-g++-64:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab
+ 
+ 
+ # uncomment in your local copy only in emergency cases.
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlab/meshlab.qrc MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlab/meshlab.qrc
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlab/meshlab.qrc	2010-04-30 15:10:45.000000000 +0200
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlab/meshlab.qrc	2010-05-16 12:58:12.000000000 +0200
+@@ -34,6 +34,5 @@
+         <file>images/100mesh.html</file>
+         <file>images/selected_face.png</file>
+         <file>images/selected_vert.png</file>
+-        <file>images/facebook.gif</file>
+     </qresource>
+ </RCC>
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro	2010-05-05 14:54:07.000000000 +0200
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro	2010-06-13 23:10:13.000000000 +0200
+@@ -24,7 +24,7 @@
+ 				

+ TARGET        = filter_isoparametrization

+ INCLUDEPATH  += ./  \

+-                ../../external/levmar-2.3/

++                /usr/include/levmar/

+ 

+ win32-msvc2005:QMAKE_CXXFLAGS   +=  /openmp -D_USE_OMP

+ win32-msvc2008:QMAKE_CXXFLAGS   +=  /openmp -D_USE_OMP

+@@ -40,9 +40,9 @@
+ win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/levmar.lib

+ win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/levmar.lib

+ win32-g++:LIBS		+= -L../../external/lib/win32-gcc -llevmar

+-linux-g++:LIBS		+= -L../../external/lib/linux-g++ -llevmar

+-linux-g++-32:LIBS		+= -L../../external/lib/linux-g++-32 -llevmar

+-linux-g++-64:LIBS		+= -L../../external/lib/linux-g++-64 -llevmar

++linux-g++:LIBS		+= -llevmar

++linux-g++-32:LIBS	+= -llevmar

++linux-g++-64:LIBS	+= -llevmar

+ macx:LIBS += ../../external/lib/macx/liblevmar.a

+ 

+ # Please never ever uncomment this...

+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro	2010-05-05 14:54:07.000000000 +0200
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro	2010-05-16 13:02:34.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+ TARGET        = io_3ds
+ 
+-INCLUDEPATH += ../../external/lib3ds-1.3.0/
++INCLUDEPATH += /usr/include/lib3ds #../../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/ 
+@@ -25,9 +25,9 @@
+ 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
+-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
+-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
+-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
++linux-g++:LIBS += -l3ds
++linux-g++-32:LIBS += -l3ds
++linux-g++-64:LIBS += -l3ds
+ 
+ # unix:LIBS		+= -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
+ 
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro	2010-05-05 14:54:07.000000000 +0200
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro	2010-05-16 13:09:22.000000000 +0200
+@@ -30,16 +30,16 @@
+ win32-msvc2005:LIBS	   += ../../external/lib/win32-msvc2005/bz2.lib
+ win32-msvc2008:LIBS	   += ../../external/lib/win32-msvc2008/bz2.lib
+ win32-g++:LIBS	+= ../../external/lib/win32-gcc/libbz2.a
+-linux-g++:LIBS	+= ../../external/lib/linux-g++/libbz2.a
+-linux-g++-32:LIBS	+= ../../external/lib/linux-g++-32/libbz2.a
+-linux-g++-64:LIBS	+= ../../external/lib/linux-g++-64/libbz2.a
++linux-g++:LIBS	+= -lbz2
++linux-g++-32:LIBS	+= -lbz2
++linux-g++-64:LIBS	+= -lbz2
+ 
+ win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
+ win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5
+ win32-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5
+-linux-g++:INCLUDEPATH	+= ../../external/bzip2-1.0.5
+-linux-g++-32:INCLUDEPATH	+= ../../external/bzip2-1.0.5
+-linux-g++-64:INCLUDEPATH	+= ../../external/bzip2-1.0.5
++#linux-g++:INCLUDEPATH	+= ../../external/bzip2-1.0.5
++#linux-g++-32:INCLUDEPATH	+= ../../external/bzip2-1.0.5
++#linux-g++-64:INCLUDEPATH	+= ../../external/bzip2-1.0.5
+ 
+ mac:LIBS   += -lbz2
+ 
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlabserver/meshlabserver.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabserver/meshlabserver.pro
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlabserver/meshlabserver.pro	2010-05-05 14:54:06.000000000 +0200
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabserver/meshlabserver.pro	2010-06-19 18:08:02.000000000 +0200
+@@ -1,4 +1,4 @@
+-GLEWDIR = ../external/glew-1.5.1
++GLEWDIR = /usr/include/GL
+ 
+ HEADERS        = 
+ 
+@@ -20,13 +20,13 @@
+ 
+ win32-msvc2005:  LIBS += -L../distrib -lcommon
+ win32-msvc2008:  LIBS += -L../distrib -lcommon
+-win32-g++:  LIBS += -L../distrib -lcommon
+-linux-g++:  LIBS += -L../distrib -lcommon
+-linux-g++:QMAKE_RPATHDIR += ../distrib
+-linux-g++-32:  LIBS += -L../distrib -lcommon
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib
+-linux-g++-64:  LIBS += -L../distrib -lcommon
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib
++win32-g++:  LIBS += -L../distrib -lcommon 
++linux-g++:  LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
++linux-g++-32:  LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-32:QMAKE_RPATHDIR += /usr/lib/meshlab
++linux-g++-64:  LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab
+ #CONFIG (release,debug | release) {
+ #	win32-msvc2005:release:  LIBS += -L../common/release -lcommon
+ #	win32-msvc2008:release:  LIBS += -L../common/release -lcommon
+@@ -38,7 +38,7 @@
+ 
+ #DEFINES += GLEW_STATIC
+ 
+-INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include
++INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR
+ CONFIG += stl 
+ CONFIG += console
+ 
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/shared.pri MeshLabSrc_AllInc_v123a-patched/meshlab/src/shared.pri
+--- MeshLabSrc_AllInc_v123a/meshlab/src/shared.pri	2010-05-05 14:54:07.000000000 +0200
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/shared.pri	2010-05-16 14:39:36.000000000 +0200
+@@ -6,7 +6,7 @@
+ QT += xml
+ 
+ VCGDIR  = ../../../../vcglib
+-GLEWDIR = ../../external/glew-1.5.1
++GLEWDIR = /usr/include/GL
+ 
+ mac:LIBS += ../../common/libcommon.dylib
+ 
+@@ -15,9 +15,9 @@
+ win32-msvc2005:  LIBS += ../../distrib/common.lib
+ win32-msvc2008:  LIBS += ../../distrib/common.lib
+ win32-g++:LIBS += -L../../distrib -lcommon
+-linux-g++:LIBS += -L../../distrib -lcommon
+-linux-g++-32:LIBS += -L../../distrib -lcommon
+-linux-g++-64:LIBS += -L../../distrib -lcommon
++linux-g++:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-32:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-64:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW
+ 
+ #CONFIG(debug, debug|release) {
+ #	win32-msvc2005:  LIBS += ../../common/debug/common.lib
diff --git a/media-gfx/meshlab/files/meshlab-1.3.0a-unbundle-libs-and-fix-rpath.patch b/media-gfx/meshlab/files/meshlab-1.3.0a-unbundle-libs-and-fix-rpath.patch
new file mode 100644
index 0000000..ee04cb7
--- /dev/null
+++ b/media-gfx/meshlab/files/meshlab-1.3.0a-unbundle-libs-and-fix-rpath.patch
@@ -0,0 +1,316 @@
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/common/common.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/common/common.pro
+--- MeshLabSrc_AllInc_v130a/meshlab/src/common/common.pro	2011-01-25 08:49:48.000000000 +0100
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/common/common.pro	2011-07-10 19:12:37.000000000 +0200
+@@ -1,6 +1,5 @@
+ VCGDIR = ../../../vcglib
+-GLEWDIR = ../external/glew-1.5.1
+-GLEWCODE = $$GLEWDIR/src/glew.c
++GLEWDIR = /usr/include/GL
+ 
+ 
+ win32-msvc2005:DESTDIR = ../distrib
+@@ -35,7 +34,7 @@
+ cp libcommon.* ../distrib/meshlab.app/Contents/MacOS/"
+ INCLUDEPATH *= ../.. \
+     $$VCGDIR \
+-    $$GLEWDIR/include
++    $$GLEWDIR
+ TEMPLATE = lib
+ linux-g++:CONFIG += dll
+ linux-g++:DESTDIR = ../distrib
+@@ -83,5 +82,4 @@
+ 	scriptinterface.cpp \
+ 	mlparameter.cpp \
+ 	xmlfilterinfo.cpp \
+-    $$GLEWCODE \
+     meshlabdocumentxml.cpp
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/external/external.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/external/external.pro
+--- MeshLabSrc_AllInc_v130a/meshlab/src/external/external.pro	2011-01-25 08:49:46.000000000 +0100
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/external/external.pro	2011-07-10 19:58:22.000000000 +0200
+@@ -2,9 +2,4 @@
+ 
+ TEMPLATE      = subdirs
+ 
+-SUBDIRS       = lib3ds-1.3.0/lib3ds \
+-                bzip2-1.0.5/bzip2-1.0.5.pro \
+-                muparser_v132/src \
+-                levmar-2.3/levmar-2.3.pro \
+-                structuresynth/structuresynth.pro
+-#                openkinect/openkinect.pro
++SUBDIRS       = structuresynth/structuresynth.pro
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_func/filter_func.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_func/filter_func.pro
+--- MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_func/filter_func.pro	2011-01-25 08:49:30.000000000 +0100
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_func/filter_func.pro	2011-07-10 19:50:52.000000000 +0200
+@@ -14,7 +14,7 @@
+ win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib

+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib

+ macx:LIBS            += ../../external/lib/macx/libmuparser.a

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

+-linux-g++-32:LIBS       += ../../external/lib/linux-g++-32/libmuparser.a

+-linux-g++-64:LIBS       += ../../external/lib/linux-g++-64/libmuparser.a

+++linux-g++:LIBS       += -lmuparser

+++linux-g++-32:LIBS       += -lmuparser

+++linux-g++-64:LIBS       += -lmuparser

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

+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_qhull/filter_qhull.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_qhull/filter_qhull.pro
+--- MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_qhull/filter_qhull.pro	2011-01-25 08:49:27.000000000 +0100
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_qhull/filter_qhull.pro	2011-07-10 19:34:15.000000000 +0200
+@@ -8,28 +8,14 @@
+ SOURCES       += filter_qhull.cpp \ 
+ 		qhull_tools.cpp 
+ 
+-HEADERS += 	../../external/qhull-2003.1/src/geom.h \
+-		../../external/qhull-2003.1/src/io.h \
+-		../../external/qhull-2003.1/src/mem.h \
+-		../../external/qhull-2003.1/src/merge.h \
+-		../../external/qhull-2003.1/src/poly.h \
+-		../../external/qhull-2003.1/src/qhull.h \
+-		../../external/qhull-2003.1/src/qset.h \
+-		../../external/qhull-2003.1/src/stat.h \
+-		../../external/qhull-2003.1/src/user.h 
++HEADERS += 	/usr/include/qhull/geom.h \
++		/usr/include/qhull/io.h \
++		/usr/include/qhull/mem.h \
++		/usr/include/qhull/merge.h \
++		/usr/include/qhull/poly.h \
++		/usr/include/qhull/qhull.h \
++		/usr/include/qhull/qset.h \
++		/usr/include/qhull/stat.h \
++		/usr/include/qhull/user.h 
+ 
+-SOURCES +=	../../external/qhull-2003.1/src/geom.c \
+-		../../external/qhull-2003.1/src/geom2.c \
+-		../../external/qhull-2003.1/src/global.c \
+-		../../external/qhull-2003.1/src/io.c \
+-		../../external/qhull-2003.1/src/mem.c \
+-		../../external/qhull-2003.1/src/merge.c \
+-		../../external/qhull-2003.1/src/poly.c \
+-		../../external/qhull-2003.1/src/poly2.c \
+-		../../external/qhull-2003.1/src/qconvex.c \
+-		../../external/qhull-2003.1/src/qhull.c \
+-		../../external/qhull-2003.1/src/qset.c \
+-		../../external/qhull-2003.1/src/stat.c \
+-		../../external/qhull-2003.1/src/user.c 
+-
+-TARGET        = filter_qhull
+\ No newline at end of file
++TARGET        = filter_qhull
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_qhull/qhull_tools.h MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_qhull/qhull_tools.h
+--- MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_qhull/qhull_tools.h	2011-01-25 08:49:27.000000000 +0100
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_qhull/qhull_tools.h	2011-07-10 19:35:37.000000000 +0200
+@@ -55,14 +55,14 @@
+ #endif

+ #include <stdio.h>

+ #include <stdlib.h>

+-#include "../../external/qhull-2003.1/src/qhull.h"

+-#include "../../external/qhull-2003.1/src/mem.h"

+-#include "../../external/qhull-2003.1/src/qset.h"

+-#include "../../external/qhull-2003.1/src/geom.h"

+-#include "../../external/qhull-2003.1/src/merge.h"

+-#include "../../external/qhull-2003.1/src/poly.h"

+-#include "../../external/qhull-2003.1/src/io.h"

+-#include "../../external/qhull-2003.1/src/stat.h"

++#include "qhull/qhull.h"

++#include "qhull/mem.h"

++#include "qhull/qset.h"

++#include "qhull/geom.h"

++#include "qhull/merge.h"

++#include "qhull/poly.h"

++#include "qhull/io.h"

++#include "qhull/stat.h"

+ #if defined(__cplusplus)

+ }

+ #endif

+@@ -71,4 +71,4 @@
+ facetT *compute_delaunay(int dim, int numpoints, MeshModel &m);

+ bool compute_voronoi(int dim, int numpoints, MeshModel &m, MeshModel &pm,float threshold);

+ bool compute_alpha_shapes(int dim, int numpoints, MeshModel &m, MeshModel &pm,double alpha, bool alphashape);

+-int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP);
+\ No newline at end of file
++int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP);

+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/meshlab/meshlab.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlab/meshlab.pro
+--- MeshLabSrc_AllInc_v130a/meshlab/src/meshlab/meshlab.pro	2011-02-15 10:39:47.000000000 +0100
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlab/meshlab.pro	2011-07-10 19:21:33.000000000 +0200
+@@ -1,5 +1,5 @@
+ VCGDIR = ../../../vcglib
+-GLEWDIR = ../external/glew-1.5.1
++GLEWDIR = /usr/include/GL
+ #CONFIG += debug_and_release
+ DESTDIR = ../distrib
+ 
+@@ -8,7 +8,7 @@
+ # CONFIG += warn_off
+ INCLUDEPATH *= ../.. \
+     $$VCGDIR \
+-    $$GLEWDIR/include
++    $$GLEWDIR
+ DEPENDPATH += $$VCGDIR \
+     $$VCGDIR/vcg \
+     $$VCGDIR/wrap
+@@ -108,7 +108,7 @@
+ INCLUDEPATH += . \
+     .. \
+     ../../../vcglib \
+-    $$GLEWDIR/include
++    $$GLEWDIR
+ CONFIG += stl
+ 
+ macx:LIBS += ../common/libcommon.dylib
+@@ -128,12 +128,12 @@
+ #	win32-g++:release:LIBS 			+= -L../common/release -lcommon
+ #}
+ 
+-linux-g++:LIBS += -L../distrib -lcommon
+-linux-g++:QMAKE_RPATHDIR += ../distrib
+-linux-g++-32:LIBS += -L../distrib -lcommon
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib
+-linux-g++-64:LIBS += -L../distrib -lcommon
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib
++linux-g++:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
++linux-g++-32:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-32:QMAKE_RPATHDIR += ../usr/lib/meshlab
++linux-g++-64:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab
+ 
+ 
+ # uncomment in your local copy only in emergency cases.
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
+--- MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro	2011-01-25 08:50:05.000000000 +0100
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro	2011-07-10 19:50:20.000000000 +0200
+@@ -24,7 +24,7 @@
+ 				

+ TARGET        = filter_isoparametrization

+ INCLUDEPATH  += ./  \

+-                ../../external/levmar-2.3/

++                /usr/include/levmar/

+ 

+ win32-msvc2005:QMAKE_CXXFLAGS   +=  /openmp -D_USE_OMP

+ win32-msvc2008:QMAKE_CXXFLAGS   +=  /openmp -D_USE_OMP

+@@ -41,9 +41,10 @@
+ win32-msvc2005:LIBS	+= ../../external/lib/win32-msvc2005/levmar.lib

+ win32-msvc2008:LIBS	+= ../../external/lib/win32-msvc2008/levmar.lib

+ win32-g++:LIBS		+= -L../../external/lib/win32-gcc -llevmar

+-linux-g++:LIBS		+= -L../../external/lib/linux-g++ -llevmar

+-linux-g++-32:LIBS		+= -L../../external/lib/linux-g++-32 -llevmar

+-linux-g++-64:LIBS		+= -L../../external/lib/linux-g++-64 -llevmar

++linux-g++:LIBS		+= -llevmar

++linux-g++-32:LIBS	+= -llevmar

++linux-g++-64:LIBS	+= -llevmar

++

+ macx:LIBS += ../../../src/external/lib/macx/liblevmar.a

+ 

+ # Please never ever uncomment this...

+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
+--- MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro	2011-01-25 08:49:55.000000000 +0100
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro	2011-07-10 19:28:11.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+ TARGET        = io_3ds
+ 
+-INCLUDEPATH += ../../external/lib3ds-1.3.0/
++INCLUDEPATH += /usr/include/lib3ds/
+ 
+ # Notes on the paths of lib3ds files.
+ # Once you have compiled the library put the lib files in a dir named lib/XXX/ 
+@@ -25,9 +25,9 @@
+ 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
+-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
+-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
+-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
++linux-g++:LIBS += -l3ds
++linux-g++-32:LIBS += -l3ds
++linux-g++-64:LIBS += -l3ds
+ 
+ # unix:LIBS		+= -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
+ 
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro
+--- MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro	2011-01-25 08:50:02.000000000 +0100
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro	2011-07-10 19:29:27.000000000 +0200
+@@ -30,16 +30,16 @@
+ win32-msvc2005:LIBS	   += ../../external/lib/win32-msvc2005/bz2.lib
+ win32-msvc2008:LIBS	   += ../../external/lib/win32-msvc2008/bz2.lib
+ win32-g++:LIBS	+= ../../external/lib/win32-gcc/libbz2.a
+-linux-g++:LIBS	+= ../../external/lib/linux-g++/libbz2.a
+-linux-g++-32:LIBS	+= ../../external/lib/linux-g++-32/libbz2.a
+-linux-g++-64:LIBS	+= ../../external/lib/linux-g++-64/libbz2.a
++linux-g++:LIBS	+= -lbz2
++linux-g++-32:LIBS	+= -lbz2
++linux-g++-64:LIBS	+= -lbz2
+ 
+ win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
+ win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5
+ win32-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5
+-linux-g++:INCLUDEPATH	+= ../../external/bzip2-1.0.5
+-linux-g++-32:INCLUDEPATH	+= ../../external/bzip2-1.0.5
+-linux-g++-64:INCLUDEPATH	+= ../../external/bzip2-1.0.5
++#linux-g++:INCLUDEPATH	+= ../../external/bzip2-1.0.5
++#linux-g++-32:INCLUDEPATH	+= ../../external/bzip2-1.0.5
++#linux-g++-64:INCLUDEPATH	+= ../../external/bzip2-1.0.5
+ 
+ mac:LIBS   += -lbz2
+ 
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/meshlabserver/meshlabserver.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabserver/meshlabserver.pro
+--- MeshLabSrc_AllInc_v130a/meshlab/src/meshlabserver/meshlabserver.pro	2011-01-25 08:49:46.000000000 +0100
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabserver/meshlabserver.pro	2011-07-10 19:23:02.000000000 +0200
+@@ -1,4 +1,4 @@
+-GLEWDIR = ../external/glew-1.5.1
++GLEWDIR = /usr/include/GL
+ 
+ HEADERS        = 
+ 
+@@ -25,12 +25,12 @@
+ win32-msvc2008:  LIBS += -L../distrib -lcommon
+ win32-msvc2010:  LIBS += -L../distrib -lcommon
+ win32-g++:  LIBS += -L../distrib -lcommon
+-linux-g++:  LIBS += -L../distrib -lcommon
+-linux-g++:QMAKE_RPATHDIR += ../distrib
+-linux-g++-32:  LIBS += -L../distrib -lcommon
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib
+-linux-g++-64:  LIBS += -L../distrib -lcommon
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib
++linux-g++:  LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab
++linux-g++-32:  LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-32:QMAKE_RPATHDIR += /usr/lib/meshlab
++linux-g++-64:  LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab
+ #CONFIG (release,debug | release) {
+ #	win32-msvc2005:release:  LIBS += -L../common/release -lcommon
+ #	win32-msvc2008:release:  LIBS += -L../common/release -lcommon
+@@ -43,7 +43,7 @@
+ 
+ #DEFINES += GLEW_STATIC
+ 
+-INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include
++INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR
+ CONFIG += stl 
+ CONFIG += console
+ 
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/shared.pri MeshLabSrc_AllInc_v130a_patched/meshlab/src/shared.pri
+--- MeshLabSrc_AllInc_v130a/meshlab/src/shared.pri	2011-01-25 08:50:20.000000000 +0100
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/shared.pri	2011-07-10 19:04:25.000000000 +0200
+@@ -8,7 +8,7 @@
+ QT += script
+ 
+ VCGDIR  = ../../../../vcglib
+-GLEWDIR = ../../external/glew-1.5.1
++GLEWDIR = /usr/include/GL
+ 
+ mac:LIBS += ../../common/libcommon.dylib
+ 
+@@ -17,9 +17,9 @@
+ win32-msvc2005:  LIBS += ../../distrib/common.lib
+ win32-msvc2008:  LIBS += ../../distrib/common.lib
+ win32-g++:LIBS += -L../../distrib -lcommon
+-linux-g++:LIBS += -L../../distrib -lcommon
+-linux-g++-32:LIBS += -L../../distrib -lcommon
+-linux-g++-64:LIBS += -L../../distrib -lcommon
++linux-g++:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-32:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW
++linux-g++-64:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW
+ 
+ #CONFIG(debug, debug|release) {
+ #	win32-msvc2005:  LIBS += ../../common/debug/common.lib
diff --git a/media-gfx/meshlab/meshlab-1.2.3a-r1.ebuild b/media-gfx/meshlab/meshlab-1.2.3a-r1.ebuild
new file mode 100644
index 0000000..52a1c53
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-1.2.3a-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils qt4-r2
+
+DESCRIPTION="MeshLab is a mesh processing system for the editing of large unstructured 3D triangular meshes."
+HOMEPAGE="http://meshlab.sourceforge.net/"
+SRC_URI="mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.2.3/MeshLabSrc_AllInc_v123a.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+DEPEND="
+	>=dev-cpp/muParser-1.32-r1
+	>=media-libs/glew-1.5.1
+	>=media-libs/lib3ds-1.3.0
+	>=media-libs/qhull-2003.1-r1
+	>=x11-libs/qt-core-4.4
+	x11-libs/qt-opengl"
+RDEPEND="${DEPEND}"
+
+#MY_PV=${PV//./}
+#S="${WORKDIR}/MeshLabSrc_AllInc_v${MY_PV}"
+
+S="${WORKDIR}"
+
+EPATCH_OPTS="-p1"
+PATCHES=(
+	"${FILESDIR}/${PF}-use-system-libs-rpath.patch"
+)
+
+src_configure() {
+	cd "${S}"/meshlab/src/external/levmar-2.3
+	eqmake4 levmar-2.3.pro
+
+	cd "${S}"/meshlab/src/external/muparser_v130/src
+	eqmake4 src.pro
+
+	cd "${S}"/meshlab/src
+	eqmake4 meshlabv12.pro
+}
+
+src_compile() {
+	cd "${S}"/meshlab/src/external/levmar-2.3
+	emake || die "emake in levmar-2.3 failed"
+
+	cd "${S}"/meshlab/src/external/muparser_v130/src
+	emake || die "emake in muparser_v130 failed"
+
+	cd "${S}"/meshlab/src
+	emake || die "emake in src failed"
+}
+
+src_install() {
+	# upstream does not provide any installation tools
+	# the following is reverse engineered
+
+	dodir /usr/lib/meshlab
+
+	exeinto /usr/lib/meshlab
+	doexe "meshlab/src/distrib/meshlab"
+	doexe "meshlab/src/distrib/meshlabserver"
+
+	doexe "meshlab/src/distrib/libcommon.so.1.0.0"
+	dosym libcommon.so.1.0.0 /usr/lib/meshlab/libcommon.so.1
+	dosym libcommon.so.1 /usr/lib/meshlab/libcommon.so
+
+	dodir /usr/lib/meshlab/plugins
+	exeinto /usr/lib/meshlab/plugins
+	for f in "meshlab/src/distrib/plugins/*.so"
+	do
+		doexe $f
+	done
+
+	dodir /usr/lib/meshlab/shaders
+	insinto /usr/lib/meshlab/shaders
+	for f in "meshlab/src/distrib/shaders/*"
+	do
+		doins -r $f
+	done
+
+	cat > ${T}/meshlab <<-EOF
+#!/bin/bash
+/usr/lib/meshlab/meshlab
+EOF
+
+	cat > ${T}/meshlabserver <<-EOF
+#!/bin/bash
+/usr/lib/meshlab/meshlabserver
+EOF
+
+	exeinto /usr/bin
+	doexe "${T}/meshlab"
+	doexe "${T}/meshlabserver"
+}
diff --git a/media-gfx/meshlab/meshlab-1.2.3a-r2.ebuild b/media-gfx/meshlab/meshlab-1.2.3a-r2.ebuild
new file mode 100644
index 0000000..40a9e6d
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-1.2.3a-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# TODO: use versionator; first talk to upstream to cleanup their naming
+# TODO: add slot for version 2, append -${SLOT}
+
+EAPI=2
+
+inherit eutils multilib qt4-r2 versionator
+
+DESCRIPTION="A mesh processing system for the editing of large unstructured 3D triangular meshes."
+HOMEPAGE="http://meshlab.sourceforge.net/"
+SRC_URI="mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.2.3/MeshLabSrc_AllInc_v123a.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="media-libs/glew
+	sci-libs/levmar
+	media-libs/lib3ds
+	>=media-libs/qhull-2003.1-r1
+	x11-libs/qt-core:4
+	x11-libs/qt-opengl:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/meshlab/src
+
+PATCHES=(
+	"${FILESDIR}/${P}-use-system-libs-rpath.patch"
+)
+
+src_configure() {
+	# NOTE: we keep the bundled libs for now, they are quite small in space and cpu time
+	eqmake4 external/levmar-2.3/levmar-2.3.pro -o "${S}"/external/levmar-2.3/Makefile
+	eqmake4 external/muparser_v130/src/src.pro -o "${S}"/external/muparser_v130/src/Makefile
+	eqmake4 meshlabv12.pro
+}
+
+src_compile() {
+	emake -C external/levmar-2.3 || die
+	emake -C external/muparser_v130/src || die
+	emake || die
+}
+
+src_install() {
+	local my_libdir=/usr/$(get_libdir)/meshlab
+
+	exeinto ${my_libdir}
+	doexe distrib/{libcommon.so.1.0.0,meshlab{,server}} || die
+	dosym libcommon.so.1.0.0 ${my_libdir}/libcommon.so.1 || die
+	dosym libcommon.so.1 ${my_libdir}/libcommon.so || die
+	dosym ${my_libdir}/meshlab /usr/bin/meshlab || die
+	dosym ${my_libdir}/meshlabserver /usr/bin/meshlabserver || die
+
+	exeinto ${my_libdir}/plugins
+	doexe distrib/plugins/*.so || die
+
+	insinto ${my_libdir}/shaders
+	doins -r distrib/shaders/* || die
+}
diff --git a/media-gfx/meshlab/meshlab-1.2.3a-r3.ebuild b/media-gfx/meshlab/meshlab-1.2.3a-r3.ebuild
new file mode 100644
index 0000000..cc12322
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-1.2.3a-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# TODO: use versionator; first talk to upstream to cleanup their naming
+# TODO: add slot for version 2, append -${SLOT}
+
+EAPI=2
+
+inherit eutils multilib qt4-r2 versionator
+
+DESCRIPTION="A mesh processing system for the editing of large unstructured 3D triangular meshes."
+HOMEPAGE="http://meshlab.sourceforge.net/"
+SRC_URI="mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.2.3/MeshLabSrc_AllInc_v123a.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="media-libs/glew
+	sci-libs/levmar
+	media-libs/lib3ds
+	>=dev-cpp/muParser-1.30
+	=media-libs/qhull-2003.1
+	x11-libs/qt-core:4
+	x11-libs/qt-opengl:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/meshlab/src
+
+PATCHES=(
+	"${FILESDIR}/${PF}-use-system-libs-rpath.patch"
+)
+
+src_configure() {
+	eqmake4 meshlabv12.pro
+}
+
+#src_compile() {
+#	emake || die
+#}
+
+src_install() {
+	local my_libdir=/usr/$(get_libdir)/meshlab
+
+	exeinto ${my_libdir}
+	doexe distrib/{libcommon.so.1.0.0,meshlab{,server}} || die
+	dosym libcommon.so.1.0.0 ${my_libdir}/libcommon.so.1 || die
+	dosym libcommon.so.1 ${my_libdir}/libcommon.so || die
+	dosym ${my_libdir}/meshlab /usr/bin/meshlab || die
+	dosym ${my_libdir}/meshlabserver /usr/bin/meshlabserver || die
+
+	exeinto ${my_libdir}/plugins
+	doexe distrib/plugins/*.so || die
+
+	insinto ${my_libdir}/shaders
+	doins -r distrib/shaders/* || die
+}
diff --git a/media-gfx/meshlab/meshlab-1.2.3a-r4.ebuild b/media-gfx/meshlab/meshlab-1.2.3a-r4.ebuild
new file mode 100644
index 0000000..511d185
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-1.2.3a-r4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# TODO: use versionator; first talk to upstream to cleanup their naming
+# TODO: add slot for version 2, append -${SLOT}
+
+EAPI=2
+
+inherit eutils multilib qt4-r2 versionator
+
+DESCRIPTION="A mesh processing system for the editing of large unstructured 3D triangular meshes."
+HOMEPAGE="http://meshlab.sourceforge.net/"
+SRC_URI="mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.2.3/MeshLabSrc_AllInc_v123a.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="media-libs/glew
+	sci-libs/levmar
+	media-libs/lib3ds
+	>=dev-cpp/muParser-1.30
+	<=media-libs/qhull-2003.1-r1
+	x11-libs/qt-core:4
+	x11-libs/qt-opengl:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/MeshLabSrc_AllInc_v${PV//./}/meshlab/src
+
+PATCHES=(
+	"${FILESDIR}/${PF}-use-system-libs-rpath.patch"
+)
+
+src_configure() {
+	eqmake4 meshlabv12.pro
+}
+
+src_install() {
+	local my_libdir=/usr/$(get_libdir)/meshlab
+
+	exeinto ${my_libdir}
+	doexe distrib/{libcommon.so.1.0.0,meshlab{,server}} || die
+	dosym libcommon.so.1.0.0 ${my_libdir}/libcommon.so.1 || die
+	dosym libcommon.so.1 ${my_libdir}/libcommon.so || die
+	dosym ${my_libdir}/meshlab /usr/bin/meshlab || die
+	dosym ${my_libdir}/meshlabserver /usr/bin/meshlabserver || die
+
+	exeinto ${my_libdir}/plugins
+	doexe distrib/plugins/*.so || die
+
+	insinto ${my_libdir}/shaders
+	doins -r distrib/shaders/* || die
+}
diff --git a/media-gfx/meshlab/meshlab-1.2.3a-r5.ebuild b/media-gfx/meshlab/meshlab-1.2.3a-r5.ebuild
new file mode 100644
index 0000000..4a072a7
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-1.2.3a-r5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# TODO: use versionator; first talk to upstream to cleanup their naming
+# TODO: add slot for version 2, append -${SLOT}
+
+EAPI=2
+
+inherit eutils multilib qt4-r2 versionator
+
+DESCRIPTION="A mesh processing system for the editing of large unstructured 3D triangular meshes."
+HOMEPAGE="http://meshlab.sourceforge.net/"
+SRC_URI="mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.2.3/MeshLabSrc_AllInc_v123a.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=">=sys-devel/gcc-4.4
+	media-libs/glew
+	sci-libs/levmar
+	media-libs/lib3ds
+	>=dev-cpp/muParser-1.30
+	<media-libs/qhull-2010.1
+	x11-libs/qt-core:4
+	x11-libs/qt-opengl:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/MeshLabSrc_AllInc_v${PV//./}/meshlab/src
+
+PATCHES=(
+	"${FILESDIR}/${PF}-use-system-libs-rpath.patch"
+)
+
+src_configure() {
+	eqmake4 meshlabv12.pro
+}
+
+src_install() {
+	local my_libdir=/usr/$(get_libdir)/meshlab
+
+	exeinto ${my_libdir}
+	doexe distrib/{libcommon.so.1.0.0,meshlab{,server}} || die
+	dosym libcommon.so.1.0.0 ${my_libdir}/libcommon.so.1 || die
+	dosym libcommon.so.1 ${my_libdir}/libcommon.so || die
+	dosym ${my_libdir}/meshlab /usr/bin/meshlab || die
+	dosym ${my_libdir}/meshlabserver /usr/bin/meshlabserver || die
+
+	exeinto ${my_libdir}/plugins
+	doexe distrib/plugins/*.so || die
+
+	insinto ${my_libdir}/shaders
+	doins -r distrib/shaders/* || die
+}
diff --git a/media-gfx/meshlab/meshlab-1.2.3a-r6.ebuild b/media-gfx/meshlab/meshlab-1.2.3a-r6.ebuild
new file mode 100644
index 0000000..d3e4cb1
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-1.2.3a-r6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# TODO: use versionator; first talk to upstream to cleanup their naming
+# TODO: add slot for version 2, append -${SLOT}
+
+EAPI=2
+
+inherit eutils multilib qt4-r2 versionator
+
+DESCRIPTION="A mesh processing system for the editing of large unstructured 3D triangular meshes."
+HOMEPAGE="http://meshlab.sourceforge.net/"
+SRC_URI="mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.2.3/MeshLabSrc_AllInc_v123a.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=">=sys-devel/gcc-4.4
+	media-libs/glew
+	sci-libs/levmar
+	media-libs/lib3ds
+	>=dev-cpp/muParser-1.30
+	media-libs/qhull
+	x11-libs/qt-core:4
+	x11-libs/qt-opengl:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/MeshLabSrc_AllInc_v${PV//./}/meshlab/src
+
+PATCHES=(
+	"${FILESDIR}/${PF}-use-system-libs-rpath.patch"
+)
+
+src_configure() {
+	eqmake4 meshlabv12.pro
+}
+
+src_install() {
+	local my_libdir=/usr/$(get_libdir)/meshlab
+
+	exeinto ${my_libdir}
+	doexe distrib/{libcommon.so.1.0.0,meshlab{,server}} || die
+	dosym libcommon.so.1.0.0 ${my_libdir}/libcommon.so.1 || die
+	dosym libcommon.so.1 ${my_libdir}/libcommon.so || die
+	dosym ${my_libdir}/meshlab /usr/bin/meshlab || die
+	dosym ${my_libdir}/meshlabserver /usr/bin/meshlabserver || die
+
+	exeinto ${my_libdir}/plugins
+	doexe distrib/plugins/*.so || die
+
+	insinto ${my_libdir}/shaders
+	doins -r distrib/shaders/* || die
+}
diff --git a/media-gfx/meshlab/meshlab-1.3.0a.ebuild b/media-gfx/meshlab/meshlab-1.3.0a.ebuild
new file mode 100644
index 0000000..23c248b
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-1.3.0a.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# TODO: use versionator; first talk to upstream to cleanup their naming
+# TODO: add slot for version 2, append -${SLOT}
+
+EAPI=2
+
+inherit eutils multilib qt4-r2 versionator
+
+DESCRIPTION="A mesh processing system for the editing of large unstructured 3D triangular meshes."
+HOMEPAGE="http://meshlab.sourceforge.net/"
+SRC_URI="mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.0/MeshLabSrc_AllInc_v130a.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=">=sys-devel/gcc-4.3
+	media-libs/glew
+	sci-libs/levmar
+	media-libs/lib3ds
+	>=dev-cpp/muParser-1.30
+	media-libs/qhull
+	x11-libs/qt-core:4
+	x11-libs/qt-opengl:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/meshlab/src
+
+PATCHES=(
+	"${FILESDIR}/${PF}-unbundle-libs-and-fix-rpath.patch"
+)
+
+src_configure() {
+	eqmake4 external/external.pro
+	eqmake4 meshlab_full.pro
+}
+
+src_compile() {
+	cd external && emake
+	cd .. && emake
+}
+
+src_install() {
+	local my_libdir=/usr/$(get_libdir)/meshlab
+
+	exeinto ${my_libdir}
+	doexe distrib/{libcommon.so.1.0.0,meshlab{,server}} || die
+	dosym libcommon.so.1.0.0 ${my_libdir}/libcommon.so.1 || die
+	dosym libcommon.so.1 ${my_libdir}/libcommon.so || die
+	dosym ${my_libdir}/meshlab /usr/bin/meshlab || die
+	dosym ${my_libdir}/meshlabserver /usr/bin/meshlabserver || die
+
+	exeinto ${my_libdir}/plugins
+	doexe distrib/plugins/*.so || die
+
+	insinto ${my_libdir}/shaders
+	doins -r distrib/shaders/* || die
+}
diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml
new file mode 100644
index 0000000..46a44e5
--- /dev/null
+++ b/media-gfx/meshlab/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!-- 
+$Header: /var/cvsroot/gentoo-x86/skel.metadata.xml,v 1.18 2008/07/28 19:27:05 cardoe Exp $
+
+This is the example metadata file.
+The root element of this file is <pkgmetadata>. Within this element a 
+number of subelements are allowed: herd, maintainer, and 
+longdescription. herd is a required subelement.
+
+For a full description look at:
+http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml?part=2&chap=4
+
+
+Before committing, please remove the comments from this file. They are 
+not relevant for general metadata.xml files.
+-->
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>@gentoo.org</email>
+<!--  <description>Description of the maintainership</description> -->
+</maintainer>
+<!-- <longdescription>Long description of the package</longdescription> -->
+<!--
+<use>
+  <flag name='flag'>Description of how USE='flag' affects this package</flag>
+  <flag name='userland_GNU'>Description of how USERLAND='GNU' affects this
+	  package</flag>
+  <flag name='aspell'>Uses <pkg>app-text/aspell</pkg> for spell checking.
+	  Requires an installed dictionary from <cat>app-dicts</cat></flag>
+</use>
+-->
+</pkgmetadata>