import from svn

34 files changed, 1865 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>
diff --git a/media-libs/alembic/Manifest b/media-libs/alembic/Manifest
new file mode 100644
index 0000000..248d2f8
--- /dev/null
+++ b/media-libs/alembic/Manifest
@@ -0,0 +1,3 @@
+DIST Alembic_1.0_2011080800.tgz 589273 RMD160 644f5e735cea8ae0412dc060bf861590d2ac7e24 SHA1 dd1e8340ce4c69d5c4ccb7364537bc4e8653baa1 SHA256 e15f1ad07c873ac27dd08812ae481c46f87b456f936d38d0224f91fdd1c47487
+EBUILD alembic-1.0.2011080800.ebuild 2230 RMD160 3fdc0b19d8a59fdb8a34ac020d8203d1b1f80393 SHA1 d1642421da25da097b1c67c903426b6a5066129f SHA256 0fa2bc72baefc2e068761122b03e7bd06731822cec0752f7379bdbbd1ab1531b
+EBUILD alembic-9999.ebuild 2041 RMD160 de599413bfd7288f9677743dc44287bd18276ee2 SHA1 1f1acbd5537952f324f5dccd11079e401f6574ab SHA256 363446482e107d4ab87c513327e23341fe1524911dcc424f0e556c086fd01198
diff --git a/media-libs/alembic/alembic-1.0.2011080800.ebuild b/media-libs/alembic/alembic-1.0.2011080800.ebuild
new file mode 100644
index 0000000..67495c8
--- /dev/null
+++ b/media-libs/alembic/alembic-1.0.2011080800.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# TODO: replace the alembic_bootstrap.py with proper gentoo methods (cmake eclass)
+# TODO: add tests, add help
+
+EAPI=2
+
+inherit eutils versionator
+
+DESCRIPTION="Alembic is an open framework for storing and sharing 3D geometry data that includes a C++ library, a file format, and client plugins and applications."
+HOMEPAGE="http://code.google.com/p/alembic"
+
+MY_PN="Alembic"
+MY_PV=$(replace_version_separator 2 '_')
+MY_P="${MY_PN}_${MY_PV}"
+
+SRC_URI="http://alembic.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples doc"
+RDEPEND=""
+DEPEND=">=dev-util/cmake-2.8
+	>=dev-libs/boost-1.44[static-libs]
+	>=media-libs/ilmbase-1.0.1[static-libs]
+	>=sci-libs/hdf5-1.8.7[-mpi]
+	doc? ( >=app-doc/doxygen-1.7.3 )"
+
+TMPBUILD="${WORKDIR}/alembic-build"
+TMPINSTALL="${WORKDIR}/alembic-install"
+
+src_configure() {
+	mkdir ${TMPBUILD} && cd ${TMPBUILD}
+	S=${TMPBUILD}
+	
+	python ${WORKDIR}/${MY_P}/build/bootstrap/alembic_bootstrap.py \
+		--disable-prman --disable-maya --disable-arnold \
+		--hdf5_include_dir=/usr/include \
+		--hdf5_hdf5_library=/usr/lib/libhdf5.a \
+		--boost_include_dir=${LIBS}/boost_install/include \
+		--boost_thread_library=/usr/lib/libboost_thread-mt.a \
+		--zlib_include_dir=/usr/include \
+		--zlib_library=/usr/lib/libz.a \
+		--ilmbase_include_dir=/usr/include/OpenEXR \
+		--ilmbase_imath_library=/usr/lib/libImath.a \
+		.
+}
+
+src_compile() {
+	emake
+	
+	if use examples; then
+		cd ${S}/examples
+		emake all
+	fi
+}
+
+src_install() {
+	mkdir ${TMPINSTALL}
+	
+	cd ${S}
+	emake DESTDIR=${TMPINSTALL} install
+
+	dolib.a ${TMPINSTALL}/usr/local/alembic-1.0.0/lib/static/*.a
+	cp -r ${TMPINSTALL}/usr/local/alembic-1.0.0/include/Alembic ${D}/usr/include
+
+	if use examples; then
+		dobin ${TMPBUILD}/examples/bin/AbcEcho/abcecho
+		dobin ${TMPBUILD}/examples/bin/AbcEcho/abcechobounds
+		dobin ${TMPBUILD}/examples/bin/AbcStitcher/abcstitcher
+		dobin ${TMPBUILD}/examples/bin/SimpleAbcViewer/SimpleAbcViewer
+	fi
+
+	dodoc ${WORKDIR}/${MY_P}/{ACKNOWLEDGEMENTS,FEEDBACK,LICENSE,MANIFEST,NEWS,README}.txt 
+
+	if use doc; then
+		cd ${WORKDIR}/${MY_P}
+		doxygen
+		dohtml -r doc/html/*
+	fi
+}
\ No newline at end of file
diff --git a/media-libs/colladadom/Manifest b/media-libs/colladadom/Manifest
new file mode 100644
index 0000000..1127b56
--- /dev/null
+++ b/media-libs/colladadom/Manifest
@@ -0,0 +1,2 @@
+DIST collada-dom-2.2.zip 29651798 RMD160 b2d4387dfe97d97b30b702f39e4ee312dba6d13a SHA1 e6b72ca4c0327fbc342ab87a1d9d76530a980b5d SHA256 3cba41643815045bc9073d1d0ca0337eeda79ce03a31f249078e04973eeecff5
+EBUILD colladadom-2.2.ebuild 787 RMD160 29def9e59a53e037a55246153e9a46dbff64f078 SHA1 0cb86083bb25ee7e09e6e560c1594f882d9c2b59 SHA256 79a5f2cd8d4cf6a72b4d60b8ca98a19fafd3c23f58941d17ef5ed44f759303ed
diff --git a/media-libs/colladadom/colladadom-2.2.ebuild b/media-libs/colladadom/colladadom-2.2.ebuild
new file mode 100644
index 0000000..9c1b9df
--- /dev/null
+++ b/media-libs/colladadom/colladadom-2.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document."
+HOMEPAGE="http://sourceforge.net/projects/collada-dom/"
+
+SRC_URI="mirror://sourceforge/collada-dom/files/Collada%20DOM/Collada%20DOM%202.2/collada-dom-2.2.zip"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+DEPEND="virtual/opengl
+	virtual/glut
+	media-gfx/nvidia-cg-toolkit
+"
+RDEPEND="${DEPEND}"
+
+EPATCH_OPTS=""
+PATCHES=()
+
+S="${WORKDIR}/collada-dom"
+
+#src_configure() {
+#}
+
+src_compile() {
+	emake -f Makefile.linux || die "emake failed"
+}
+
+#src_install() {
+#}
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
new file mode 100644
index 0000000..49d3550
--- /dev/null
+++ b/media-libs/glfw/Manifest
@@ -0,0 +1,4 @@
+AUX glfw-2.7.2-compile.patch 1115 RMD160 bc2f9a5aa05017f869d6b1c5deea79c88f3ead4d SHA1 f595dc8f44d3c14e62922967e36fb9d441415977 SHA256 89bd4c770e1187526eb747d0d39e8f024be76f96829e86330366a5260d7fb931
+AUX glfw-2.7.2-dyn.patch 806 RMD160 fa6cfd4f6770acd154e4cb73ccc5656395e5b824 SHA1 a845f0d5e1753e5bd73eb097af109a10f3726eea SHA256 9efb0b7d14c62e636c8896c278773afa1b09aef8ddfa945038407ae2b64e29a6
+DIST glfw-2.7.2.tar.bz2 902680 RMD160 409a0ebb121b8d13f30e0d626ca48ba141f06ff4 SHA1 19033c4d55ec98e85bb96954dddf213006857516 SHA256 c328f43351a1f935661d95970730a551d3207d6067260809155efb1a67eab537
+EBUILD glfw-2.7.2.ebuild 1950 RMD160 d5a7eab221e5ab61e44480420a38182a9f8cbcd7 SHA1 fbbf669aa78d5e03947cb530c8e6e7550c28a1e9 SHA256 97070c1a4816c56ab3ade1f3487946adfd7531872c56f5261911b019fc55a184
diff --git a/media-libs/glfw/files/glfw-2.7.2-compile.patch b/media-libs/glfw/files/glfw-2.7.2-compile.patch
new file mode 100644
index 0000000..f212f96
--- /dev/null
+++ b/media-libs/glfw/files/glfw-2.7.2-compile.patch
@@ -0,0 +1,38 @@
+--- compile.sh.old	2011-08-19 11:20:37.927080832 +0200
++++ compile.sh	2011-08-19 11:21:59.910080833 +0200
+@@ -88,7 +88,7 @@
+ case "x`uname 2> /dev/null`" in
+ xLinux)
+   GLFW_LIB_CFLAGS="$GLFW_LIB_CFLAGS -D_GLFW_USE_LINUX_JOYSTICKS"
+-  SOFLAGS="-shared -Wl,-soname,libglfw.so"
++  SOFLAGS="-shared -Wl,-soname,libglfw.so.2.7"
+   echo "Linux" 1>&6
+   ;;
+ xDarwin)
+@@ -96,7 +96,7 @@
+   echo "Mac OS X" 1>&6
+   ;;
+ *)
+-  SOFLAGS="-shared -soname libglfw.so"
++  SOFLAGS="-shared -soname libglfw.so.2.7"
+   echo "Generic Unix" 1>&6
+   ;;
+ esac
+@@ -627,7 +627,7 @@
+ CFLAGS = $GLFW_BIN_CFLAGS $GLFW_CFLAGS
+ 
+ LIB      = ../lib/x11/libglfw.a
+-SOLIB    = ../lib/x11/libglfw.so
++SOLIB    = ../lib/x11/libglfw.so.2.7
+ LFLAGS   = \$(LIB) $GLFW_LIB_LFLAGS $GLFW_BIN_LFLAGS $GLFW_LFLAGS
+ SO_LFLAGS = \$(SOLIB) $GLFW_BIN_LFLAGS $GLFW_LFLAGS
+ 
+@@ -652,7 +652,7 @@
+ CFLAGS = $GLFW_BIN_CFLAGS $GLFW_CFLAGS
+ 
+ LIB      = ../lib/x11/libglfw.a
+-SOLIB    = ../lib/x11/libglfw.so
++SOLIB    = ../lib/x11/libglfw.so.2.7
+ LFLAGS   = \$(LIB) $GLFW_LIB_LFLAGS $GLFW_BIN_LFLAGS $GLFW_LFLAGS
+ SO_LFLAGS = \$(SOLIB) $GLFW_BIN_LFLAGS $GLFW_LFLAGS
+ 
diff --git a/media-libs/glfw/files/glfw-2.7.2-dyn.patch b/media-libs/glfw/files/glfw-2.7.2-dyn.patch
new file mode 100644
index 0000000..e524e6d
--- /dev/null
+++ b/media-libs/glfw/files/glfw-2.7.2-dyn.patch
@@ -0,0 +1,20 @@
+--- lib/x11/Makefile.x11.in.old	2011-08-19 11:14:45.190080831 +0200
++++ lib/x11/Makefile.x11.in	2011-08-19 11:14:08.950080832 +0200
+@@ -8,7 +8,7 @@
+ ##########################################################################
+ # Default: Build GLFW static library
+ ##########################################################################
+-all: libglfw.a libglfw.so
++all: libglfw.a libglfw.so.2.7
+ 
+ 
+ ##########################################################################
+@@ -118,7 +118,7 @@
+ ##########################################################################
+ # Rule for building shared library
+ ##########################################################################
+-libglfw.so: $(SHARED_OBJS)
++libglfw.so.2.7: $(SHARED_OBJS)
+ 	$(CC) $(SOFLAGS) -o $@ $(SHARED_OBJS) $(LFLAGS) $(LIBS)
+ 
+ 
diff --git a/media-libs/glfw/glfw-2.7.2.ebuild b/media-libs/glfw/glfw-2.7.2.ebuild
new file mode 100644
index 0000000..3cd434e
--- /dev/null
+++ b/media-libs/glfw/glfw-2.7.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glfw/glfw-2.6.ebuild,v 1.6 2010/09/13 12:09:46 tupone Exp $
+
+EAPI=2
+inherit eutils multilib
+
+DESCRIPTION="The Portable OpenGL FrameWork"
+HOMEPAGE="http://glfw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+DEPEND="x11-libs/libXrandr
+	virtual/opengl"
+
+S=${WORKDIR}/${P}
+
+src_prepare() {
+	sed -i -e "s:\"docs/:\"/usr/share/doc/${PF}/pdf/:" readme.html || die "sed failed"
+	epatch "${FILESDIR}/${PF}-dyn.patch"
+	epatch "${FILESDIR}/${PF}-compile.patch"
+}
+
+src_configure() {
+	sh compile.sh
+}
+
+src_compile() {
+	emake -C lib/x11 PREFIX=/usr -f Makefile.x11 all libglfw.pc || die "emake failed" 
+	if use examples; then
+		emake -C examples -f Makefile.x11 all || die "emake failed" 
+	fi
+}
+
+src_install() {
+	dolib.a lib/x11/libglfw.a || die "dolib.a failed"
+	dolib.so lib/x11/libglfw.so.2.7 || die "dolib.so failed"
+	dosym libglfw.so.2.7 /usr/$(get_libdir)/libglfw.so
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins lib/x11/libglfw.pc || die "doins failed"
+	insinto /usr/include/GL
+	doins include/GL/glfw.h || die "doins failed"
+	
+	dohtml -r readme.html
+	#insinto /usr/share/doc/${PF}/html/images
+	#doins images/*
+	insinto /usr/share/doc/${PF}/pdf
+	doins docs/*.pdf
+
+	if use examples; then
+		local f
+		local MY_EXAMPLES="boing gears listmodes mipmaps
+			mtbench mthello particles pong3d splitview
+			triangle wave"
+		local MY_PICS="mipmaps.tga pong3d_field.tga pong3d_instr.tga
+			pong3d_menu.tga pong3d_title.tga
+			pong3d_winner1.tga pong3d_winner2.tga"
+
+		insinto /usr/share/doc/${PF}/examples
+
+		doins examples/Makefile.x11
+		for f in $MY_EXAMPLES; do
+			doins examples/${f}.c
+		done
+		for f in $MY_PICS; do
+			doins examples/${f}
+		done
+
+		insopts -m0755
+		for f in $MY_EXAMPLES; do
+			doins examples/${f}
+		done
+	fi
+}
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
new file mode 100644
index 0000000..4e69392
--- /dev/null
+++ b/media-libs/opencollada/Manifest
@@ -0,0 +1,2 @@
+AUX opencollada-r736-expat-and-include-fixes.patch 1622 RMD160 121524c0cc9c376bef119a871fdd1b9ce3b2889d SHA1 51f1bf309f296960f95ad81bf897e82180535244 SHA256 49e5897338ebdb15757eadd7f7448b662a115204ee99327a1d2b5b969eeb409e
+EBUILD opencollada-9999.ebuild 817 RMD160 5498e42844d50f7b33ddd3cf3986018364f30bba SHA1 9fff10dbae1c002cbd308f1b247c07ce56262a3b SHA256 a91dd588b2770ad37280dfff7ab9c40f401e25bcc5d9b6e4c92f870af281237a
diff --git a/media-libs/opencollada/files/opencollada-r736-expat-and-include-fixes.patch b/media-libs/opencollada/files/opencollada-r736-expat-and-include-fixes.patch
new file mode 100644
index 0000000..d23aa69
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-r736-expat-and-include-fixes.patch
@@ -0,0 +1,47 @@
+Index: common/libBuffer/src/CommonFWriteBufferFlusher.cpp
+===================================================================
+--- common/libBuffer/src/CommonFWriteBufferFlusher.cpp	(revision 736)
++++ common/libBuffer/src/CommonFWriteBufferFlusher.cpp	(working copy)
+@@ -10,7 +10,8 @@
+ 
+ #include "CommonFWriteBufferFlusher.h"
+ 
+- #include <errno.h>
++#include <errno.h>
++#include <cstdio>
+ 
+ namespace Common
+ {
+Index: dae2ogre/include/DAE2OgreSerializer.h
+===================================================================
+--- dae2ogre/include/DAE2OgreSerializer.h	(revision 736)
++++ dae2ogre/include/DAE2OgreSerializer.h	(working copy)
+@@ -30,6 +30,8 @@
+ #ifndef __DAE2OGRE_OGRESERIALIZER_H__

+ #define __DAE2OGRE_OGRESERIALIZER_H__

+ 

++#include <cstdio>

++

+ #include "DAE2OgrePrerequisites.h"

+ 

+ namespace DAE2Ogre

+Index: Externals/expat/SConscript
+===================================================================
+--- Externals/expat/SConscript	(revision 736)
++++ Externals/expat/SConscript	(working copy)
+@@ -11,7 +11,7 @@
+ targetPath = outputDir + libName
+ 
+ 
+-incDirs = ['include/']
++incDirs = ['include/', '.']
+ 
+ src = [ variantDir + str(p) for p in  Glob(srcDir + '*.c')]   
+ VariantDir(variant_dir=variantDir + srcDir, src_dir=srcDir, duplicate=False)
+@@ -19,5 +19,5 @@
+ if env['SHAREDLIB']:
+     SharedLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS'])
+ else:
+-    StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS'])
++    StaticLibrary(target=targetPath, source=src, CPPPATH=incDirs, CCFLAGS=env['CPPFLAGS'] + ' -DHAVE_EXPAT_CONFIG_H')
+ 
diff --git a/media-libs/opencollada/opencollada-9999.ebuild b/media-libs/opencollada/opencollada-9999.ebuild
new file mode 100644
index 0000000..0573425
--- /dev/null
+++ b/media-libs/opencollada/opencollada-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+inherit subversion
+
+DESCRIPTION="OpenCOLLADA is a stream based reader and writer library for COLLADA files"
+HOMEPAGE="http://www.opencollada.org/"
+LICENSE="MIT"
+
+ESVN_REPO_URI="http://opencollada.googlecode.com/svn/trunk"
+ESVN_PROJECT="opencollada-trunk"
+ESVN_PATCHES="${FILESDIR}/opencollada-r736-expat-and-include-fixes.patch"
+
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	# call configure for bundled expat to generate a missing header file
+	cd $S/Externals/expat
+	sh configure
+	
+	cd $S
+	scons RELEASE=1 XMLPARSER=expat PCRENATIVE=0 || die "emake failed"
+}
+
+#src_install() {
+	#dodir /usr/include/opencollada/
+	#dodir /usr/lib/opencollada/
+#}
diff --git a/media-libs/opensg/Manifest b/media-libs/opensg/Manifest
new file mode 100644
index 0000000..cc995f6
--- /dev/null
+++ b/media-libs/opensg/Manifest
@@ -0,0 +1,6 @@
+AUX opensg-2.0_alpha2284-fix-gdal-png.patch 2161 RMD160 9e0369fdca0591f568218607f50204fe822c861e SHA1 7233c5ecfcf1bb673397c3f848fa8006444c5531 SHA256 a0bf320fe191176007c35d1954d8f9a85e98febf0ccb5600c91f9bbde708b57d
+AUX opensg-fix-gdal-includes.patch 1249 RMD160 8a24de16050faa3603b728aee5959de8856dc153 SHA1 87d21aea8bab1951986516c2159315588b6e6057 SHA256 ccfb4aa874c8455f6ffc47f30877aba3f8af06ad93d4f5d4e16b0d465d2c6f26
+DIST opensg-2.0_alpha2284.tar.bz2 9746821 RMD160 a46e7e09c7f60a1ec9e1c8bce877cf81d0e246c8 SHA1 af3beac3cbbdf054233ad7a07a0372f6f2033689 SHA256 a96f45d113aa51ff8209a5aa7a7f5e861e4e2776c606f1b9da4b521414dcbb28
+EBUILD opensg-2.0_alpha2284.ebuild 1526 RMD160 454eeafff34bd38bb47695b78699f9dd2023f4ef SHA1 29641b930f7e12bd8634540e467822a307f5be61 SHA256 68e9470f5ff772d3ae3acdf67600795083aee4265fa8267b99dc4c7abf7338b7
+MISC ChangeLog 3658 RMD160 b46694ce0f8a7327a112d7d3749e5a5ec3c3e979 SHA1 4a4463924f20d3c15763455a66c9b05ff1c4a292 SHA256 140d10ec72e83274e3a844b6796f4abce81528c0adef66c628deaea8e5587e3c
+MISC opensg-2.0_alpha2321.ebuild.disabled 1531 RMD160 78f1177a2c18ffebe3217a89d8d94e018e424916 SHA1 8510956d2ac70e2f2aa8ea0ea3b1b8a1fbf4218f SHA256 0bfbc1055af8820e899716fdbe4a8972d6618ab4e44da824e4a05f8f392ed79b
diff --git a/media-libs/opensg/files/opensg-2.0_alpha2284-fix-gdal-png.patch b/media-libs/opensg/files/opensg-2.0_alpha2284-fix-gdal-png.patch
new file mode 100644
index 0000000..6f9fe7a
--- /dev/null
+++ b/media-libs/opensg/files/opensg-2.0_alpha2284-fix-gdal-png.patch
@@ -0,0 +1,51 @@
+diff -urN opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGGDALImageFileType.cpp opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGGDALImageFileType.cpp
+--- opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGGDALImageFileType.cpp	2009-11-30 09:59:08.000000000 +0100
++++ opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGGDALImageFileType.cpp	2010-07-28 14:09:40.000000000 +0200
+@@ -48,9 +48,9 @@
+ #include "OSGGeoReferenceAttachment.h"
+ 
+ #ifdef OSG_WITH_GDAL
+-#include "gdal/gdal_priv.h"
+-#include "gdal/ogr_srs_api.h"
+-#include "gdal/cpl_multiproc.h"
++#include "gdal_priv.h"
++#include "ogr_srs_api.h"
++#include "cpl_multiproc.h"
+ #endif
+ 
+ 
+diff -urN opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGGDALImageFileType.h opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGGDALImageFileType.h
+--- opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGGDALImageFileType.h	2009-11-30 07:49:49.000000000 +0100
++++ opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGGDALImageFileType.h	2010-07-28 14:09:59.000000000 +0200
+@@ -48,8 +48,8 @@
+ #include "boost/shared_ptr.hpp"
+ 
+ #ifdef OSG_WITH_GDAL
+-#include "gdal/gdal_priv.h"
+-#include "gdal/ogr_srs_api.h"
++#include "gdal_priv.h"
++#include "ogr_srs_api.h"
+ #endif
+ 
+ OSG_BEGIN_NAMESPACE
+diff -urN opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGPNGImageFileType.cpp opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGPNGImageFileType.cpp
+--- opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGPNGImageFileType.cpp	2009-10-05 23:40:17.000000000 +0200
++++ opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGPNGImageFileType.cpp	2010-07-28 13:56:14.000000000 +0200
+@@ -206,7 +206,7 @@
+     // Convert < 8 bit to 8 bit
+     if(color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+     {
+-        png_set_gray_1_2_4_to_8(png_ptr);
++        png_set_expand_gray_1_2_4_to_8(png_ptr);
+         bit_depth = 8;
+     }
+ 
+@@ -683,7 +683,7 @@
+     // Convert < 8 bit to 8 bit
+     if(color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+     {
+-        png_set_gray_1_2_4_to_8(png_ptr);
++        png_set_expand_gray_1_2_4_to_8(png_ptr);
+         bit_depth = 8;
+     }
+ 
diff --git a/media-libs/opensg/opensg-2.0_alpha2284.ebuild b/media-libs/opensg/opensg-2.0_alpha2284.ebuild
new file mode 100644
index 0000000..1cbebfe
--- /dev/null
+++ b/media-libs/opensg/opensg-2.0_alpha2284.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="OpenSG is a portable scenegraph system to create realtime graphics programs, e.g. for virtual reality applications."
+HOMEPAGE="http://www.opensg.org/"
+
+SRC_URI="http://vision.ee.ethz.ch/shaegler/gentoo/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+
+SLOT="2"
+KEYWORDS="~x86"
+
+IUSE="tests doc examples"
+DEPEND="virtual/opengl
+	media-libs/freeglut
+	media-libs/glew
+	
+	sys-devel/flex
+	sys-devel/bison
+
+	dev-libs/boost
+	sys-libs/zlib
+	media-libs/freetype
+	media-libs/tiff
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/openexr
+	sci-libs/gdal
+
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+
+	sci-libs/vtk
+
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${DEPEND}"
+
+EPATCH_OPTS="-p1"
+PATCHES=(
+    "${FILESDIR}/${P}-fix-gdal-png.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DOSG_USE_OSGSUPPORT_LIBS=OFF
+		-DBOOST_ROOT=/usr
+		-DOSG_DOXY_DOC_TYPE=User
+		-DOSGBUILD_EXAMPLES_SIMPLE=ON
+		-DOSGBUILD_EXAMPLES_ADVANCED=ON
+		-DCOLLADA_ROOT_DIR=/opt/collada-dom
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		cd "${CMAKE_BUILD_DIR}"
+		emake Doc || die "building documentation failed"
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use doc; then
+		cd "${CMAKE_BUILD_DIR}"/Doc
+		dohtml -r html/* || die "dohtml failed"
+	fi
+	if use examples; then
+		cd "${CMAKE_BUILD_DIR}"/demos
+		dobin mandelbrot/mandelbrot opengl/quaternion_demo || die "dobin failed"
+	fi
+}
diff --git a/profiles/repo_name b/profiles/repo_name
new file mode 100644
index 0000000..f7c91be
--- /dev/null
+++ b/profiles/repo_name
@@ -0,0 +1 @@
+mistafunk
diff --git a/sci-libs/levmar/Manifest b/sci-libs/levmar/Manifest
new file mode 100644
index 0000000..845f730
--- /dev/null
+++ b/sci-libs/levmar/Manifest
@@ -0,0 +1,7 @@
+AUX 2.5-cmake-shared.patch 1076 RMD160 5958b6ec63f696616ebf4733d50361fd26d9712d SHA1 d1d00c4a782261ea3edf7aef0f16a8619ad98245 SHA256 5ce12fbffba7a710bcd80c43f6be3dc4bad977973ddc1bb6e960c90c2cb1db32
+AUX 2.5-cmake.patch 563 RMD160 1f5d7dcb5ee52b578903a7367675d53b93aada68 SHA1 02329c868c946f96230a85b3638e3cd81c6f72a1 SHA256 8e9dfde5cf98d384aa31c3951336a19d830a76a025a151ff739666a39240a344
+AUX 2.5-f2c_main.patch 227 RMD160 3f1fd800a50fd6c5e12596f4f26cfab2f1a25a1e SHA1 ff1d03df3f89eab7da4648b690a363620853294c SHA256 21deeb289b245df3981c9264ee54260cc4ac791424e7adf741a6181de28cea11
+AUX 2.5-make-shared.patch 1212 RMD160 19e463acd4afba8dd7c2b235762ab08ddcf47dfc SHA1 48cee951743f1d661dd3df5a13e12356ae2e0de7 SHA256 4c39c51b9a8d7cee73ad9e65b02218cef65d2945f8e63eac7d8e533bdc65d604
+DIST levmar-2.5.tgz 78817 RMD160 fc43206eef2969a143e3a9597b68d06eccbd14dd SHA1 46c11812689baba96f3b53cf89f0f3edb3582e61 SHA256 b70f6ac3eff30ec29150e217b137312cb84e85529815efea2c12e4eab74b9d75
+EBUILD levmar-2.5-r1.ebuild 854 RMD160 c8eaf7ccf23d18daa76e1af8f66b84e37aa52979 SHA1 16e16784c77ede32866dbca66e4adb4211c15af8 SHA256 6c94c91deb1bcc5835dbd9799043104a1f768502d5e16f292f55fb2cd7bf660c
+EBUILD levmar-2.5-r2.ebuild 914 RMD160 b76a0bc6dd397332152e258c5d72f6efcdb51c3e SHA1 add8e0af50481f5966b20a46fe91c8fbd9dc81f6 SHA256 1593e336c6d3ce9873140f9fae207645605fbee30220fcf61cffa56be909299c
diff --git a/sci-libs/levmar/files/2.5-cmake-shared.patch b/sci-libs/levmar/files/2.5-cmake-shared.patch
new file mode 100644
index 0000000..5d57728
--- /dev/null
+++ b/sci-libs/levmar/files/2.5-cmake-shared.patch
@@ -0,0 +1,29 @@
+--- CMakeLists.txt.orig	2010-05-28 10:55:27.000000000 +0200
++++ CMakeLists.txt	2010-06-15 17:13:34.000000000 +0200
+@@ -2,11 +2,16 @@
+ #                        http://www.insightsoftwareconsortium.org/wiki/index.php/CMake_Tutorial

+ 

+ PROJECT(LEVMAR)

+-#CMAKE_MINIMUM_REQUIRED(VERSION 1.4)

++CMAKE_MINIMUM_REQUIRED(VERSION 1.4)

++

++if(COMMAND cmake_policy)

++  cmake_policy(SET CMP0003 NEW)

++endif(COMMAND cmake_policy)

+ 

+ # compiler flags

+ #ADD_DEFINITIONS(-DLINSOLVERS_RETAIN_MEMORY) # do not free memory between linear solvers calls

+ #REMOVE_DEFINITIONS(-DLINSOLVERS_RETAIN_MEMORY) # free memory between calls

++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") # build shared library

+ 

+ # f2c is sometimes equivalent to libF77 & libI77; in that case, set HAVE_F2C to 0

+ SET(HAVE_F2C 1 CACHE BOOL "Do we have f2c or F77/I77?" )

+@@ -30,7 +35,7 @@
+ #INCLUDE_DIRECTORIES(/usr/include)

+ 

+ # levmar library source files

+-ADD_LIBRARY(levmar STATIC

++ADD_LIBRARY(levmar SHARED

+   lm.c Axb.c misc.c lmlec.c lmbc.c lmblec.c lmbleic.c

+   levmar.h misc.h compiler.h

+ )

diff --git a/sci-libs/levmar/files/2.5-cmake.patch b/sci-libs/levmar/files/2.5-cmake.patch
new file mode 100644
index 0000000..f74e21f
--- /dev/null
+++ b/sci-libs/levmar/files/2.5-cmake.patch
@@ -0,0 +1,15 @@
+--- levmar-2.5/CMakeLists.txt.orig	2010-05-28 10:55:27.000000000 +0200
++++ levmar-2.5/CMakeLists.txt	2010-05-28 10:57:30.000000000 +0200
+@@ -2,7 +2,11 @@
+ #                        http://www.insightsoftwareconsortium.org/wiki/index.php/CMake_Tutorial

+ 

+ PROJECT(LEVMAR)

+-#CMAKE_MINIMUM_REQUIRED(VERSION 1.4)

++CMAKE_MINIMUM_REQUIRED(VERSION 1.4)

++

++if(COMMAND cmake_policy)

++  cmake_policy(SET CMP0003 NEW)

++endif(COMMAND cmake_policy)

+ 

+ # compiler flags

+ #ADD_DEFINITIONS(-DLINSOLVERS_RETAIN_MEMORY) # do not free memory between linear solvers calls

diff --git a/sci-libs/levmar/files/2.5-f2c_main.patch b/sci-libs/levmar/files/2.5-f2c_main.patch
new file mode 100644
index 0000000..d7933ed
--- /dev/null
+++ b/sci-libs/levmar/files/2.5-f2c_main.patch
@@ -0,0 +1,11 @@
+--- levmar-2.5/lmdemo.c.orig	2010-05-26 11:25:05.000000000 +0200
++++ levmar-2.5/lmdemo.c	        2010-05-26 11:25:45.000000000 +0200
+@@ -781,7 +781,7 @@
+ 
+ 
+ 
+-int main()
++int MAIN__()
+ {
+ register int i, j;
+ int problem, ret;
diff --git a/sci-libs/levmar/files/2.5-make-shared.patch b/sci-libs/levmar/files/2.5-make-shared.patch
new file mode 100644
index 0000000..9b17fa4
--- /dev/null
+++ b/sci-libs/levmar/files/2.5-make-shared.patch
@@ -0,0 +1,38 @@
+--- Makefile.orig	2010-06-15 17:44:45.000000000 +0200
++++ Makefile	2010-06-15 18:10:44.000000000 +0200
+@@ -6,7 +6,7 @@
+ CC=gcc
+ CONFIGFLAGS=#-ULINSOLVERS_RETAIN_MEMORY
+ #ARCHFLAGS=-march=pentium4 # YOU MIGHT WANT TO UNCOMMENT THIS FOR P4
+-CFLAGS=$(CONFIGFLAGS) $(ARCHFLAGS) -O3 -funroll-loops -Wall #-ffast-math #-pg
++CFLAGS=$(CONFIGFLAGS) $(ARCHFLAGS) -O3 -funroll-loops -Wall -fPIC #-ffast-math #-pg
+ LAPACKLIBS_PATH=/usr/local/lib # WHEN USING LAPACK, CHANGE THIS TO WHERE YOUR COMPILED LIBS ARE!
+ LDFLAGS=-L$(LAPACKLIBS_PATH) -L.
+ LIBOBJS=lm.o Axb.o misc.o lmlec.o lmbc.o lmblec.o lmbleic.o
+@@ -30,13 +30,12 @@
+ 
+ LIBS=$(LAPACKLIBS)
+ 
+-all: liblevmar.a lmdemo
++all: liblevmar.so lmdemo
+ 
+-liblevmar.a: $(LIBOBJS)
+-	$(AR) crv liblevmar.a $(LIBOBJS)
+-	$(RANLIB) liblevmar.a
++liblevmar.so: $(LIBOBJS)
++	$(CC) -shared -Wl,-soname,liblevmar.so -o liblevmar.so $(LIBOBJS) $(LIBS)
+ 
+-lmdemo: $(DEMOBJS) liblevmar.a
++lmdemo: $(DEMOBJS) liblevmar.so
+ 	$(CC) $(LDFLAGS) $(DEMOBJS) -o lmdemo -llevmar $(LIBS) -lm
+ 
+ lm.o: lm.c lm_core.c levmar.h misc.h compiler.h
+@@ -54,7 +53,7 @@
+ 
+ cleanall: clean
+ 	@rm -f lmdemo
+-	@rm -f liblevmar.a
++	@rm -f liblevmar.so
+ 
+ depend:
+ 	makedepend -f Makefile $(LIBSRCS) $(DEMOSRCS)
diff --git a/sci-libs/levmar/levmar-2.5-r1.ebuild b/sci-libs/levmar/levmar-2.5-r1.ebuild
new file mode 100644
index 0000000..58f0a3d
--- /dev/null
+++ b/sci-libs/levmar/levmar-2.5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+DESCRIPTION="Levenberg-Marquardt nonlinear least squares algorithms ANSI C implementation"
+HOMEPAGE="http://www.ics.forth.gr/~lourakis/levmar/"
+SRC_URI="http://www.ics.forth.gr/~lourakis/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/f2c-20060507
+		>=virtual/blas-1.0
+		>=virtual/lapack-3.1"
+RDEPEND="${DEPEND}"
+
+MIN_CMAKE="dev-util/cmake-1.4"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-f2c_main.patch "${FILESDIR}"/${PV}-cmake.patch
+}
+
+src_compile() {
+	if has_version ">=${MIN_CMAKE}"
+	then
+		cmake . || die "cmake failed"
+	fi
+	emake || die "make failed"
+}
+
+src_install() {
+	local my_include_dir=/usr/include/${PN}	
+	insinto ${my_include_dir}
+	doins *.h
+
+	dolib liblevmar.a
+}
diff --git a/sci-libs/levmar/levmar-2.5-r2.ebuild b/sci-libs/levmar/levmar-2.5-r2.ebuild
new file mode 100644
index 0000000..d022626
--- /dev/null
+++ b/sci-libs/levmar/levmar-2.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit eutils
+DESCRIPTION="Levenberg-Marquardt nonlinear least squares algorithms ANSI C implementation"
+HOMEPAGE="http://www.ics.forth.gr/~lourakis/levmar/"
+SRC_URI="http://www.ics.forth.gr/~lourakis/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=dev-lang/f2c-20060507
+		>=virtual/blas-1.0
+		>=virtual/lapack-3.1"
+RDEPEND="${DEPEND}"
+
+MIN_CMAKE="dev-util/cmake-1.4"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-f2c_main.patch "${FILESDIR}"/${PV}-make-shared.patch "${FILESDIR}"/${PV}-cmake-shared.patch
+}
+
+src_compile() {
+	if has_version ">=${MIN_CMAKE}"
+	then
+		cmake . || die "cmake failed"
+	fi
+	emake || die "make failed"
+}
+
+src_install() {
+	local my_include_dir=/usr/include/${PN}	
+	insinto ${my_include_dir}
+	doins *.h
+
+	dolib liblevmar.so
+}