[gentoo-commits] dev/alexxy:master commit in: sci-libs/levmar/files/, media-gfx/u3d/, sci-libs/levmar/, dev-cpp/curlpp/files/, ...

[Alexey Shvetsov]

commit:     477a2db07ec39011955d024e0441b44a0ab7c402
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 21:30:41 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 21:30:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/alexxy.git;a=commit;h=477a2db0

Moved to betagarden

Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

---
 dev-cpp/curlpp/ChangeLog                           |    7 -
 dev-cpp/curlpp/Manifest                            |    1 -
 dev-cpp/curlpp/curlpp-0.7.2.ebuild                 |   32 --
 dev-cpp/curlpp/files/disable-examples-build.patch  |    9 -
 dev-cpp/curlpp/metadata.xml                        |    7 -
 media-gfx/meshlab/Manifest                         |    2 -
 .../meshlab-1.2.3a-r5-use-system-libs-rpath.patch  |  322 --------------------
 ...eshlab-1.3.0a-unbundle-libs-and-fix-rpath.patch |  316 -------------------
 media-gfx/meshlab/meshlab-1.2.3a-r5.ebuild         |   55 ----
 media-gfx/meshlab/meshlab-1.3.0a.ebuild            |   61 ----
 media-gfx/meshlab/metadata.xml                     |    9 -
 media-gfx/u3d/Manifest                             |    1 -
 media-gfx/u3d/metadata.xml                         |    9 -
 media-gfx/u3d/u3d-1.4.2.ebuild                     |   36 ---
 sci-libs/levmar/Manifest                           |    1 -
 sci-libs/levmar/files/cmakeusage-2.5.patch         |  128 --------
 sci-libs/levmar/levmar-2.5.ebuild                  |   61 ----
 sci-libs/levmar/metadata.xml                       |   17 -
 18 files changed, 0 insertions(+), 1074 deletions(-)

diff --git a/dev-cpp/curlpp/ChangeLog b/dev-cpp/curlpp/ChangeLog
deleted file mode 100644
index e1a78d6..0000000
--- a/dev-cpp/curlpp/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-# ChangeLog for dev-cpp/curlpp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  02 Feb 2009; Alexey Shvetsov <alexxy@g.o> curlpp-0.7.2.ebuild:
-  Bump to EAPI2
-

diff --git a/dev-cpp/curlpp/Manifest b/dev-cpp/curlpp/Manifest
deleted file mode 100644
index 77d4f55..0000000
--- a/dev-cpp/curlpp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST curlpp-0.7.2.tar.gz 472612 RMD160 2f2cab7107139782525af9147d6185f66afb7435 SHA1 545b09aa059e71ff6927ae9c0b1651b5ffde8c41 SHA256 b7af1b8d2bd5797538f88e247b3ccfc7f1e9fc5aa28259e4e026f796aec385fc

diff --git a/dev-cpp/curlpp/curlpp-0.7.2.ebuild b/dev-cpp/curlpp/curlpp-0.7.2.ebuild
deleted file mode 100644
index d121c01..0000000
--- a/dev-cpp/curlpp/curlpp-0.7.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools
-
-DESCRIPTION="C++ bindings of libcurl"
-HOMEPAGE="http://rrette.com/textpattern/index.php?s=cURLpp"
-SRC_URI="http://rrette.com/files/curlpp/curlpp-0.7/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-misc/curl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "s:@CURLPP_CFLAGS@:@CURLPP_CXXFLAGS@:" curlpp-config.in
-	epatch "${FILESDIR}/disable-examples-build.patch" #example18 doesnt build
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc CHANGES AUTHORS TODO doc/guide.pdf
-	insinto "/usr/share/${P}"
-	doins examples/*
-}

diff --git a/dev-cpp/curlpp/files/disable-examples-build.patch b/dev-cpp/curlpp/files/disable-examples-build.patch
deleted file mode 100644
index 0a425eb..0000000
--- a/dev-cpp/curlpp/files/disable-examples-build.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.am	2007-01-22 01:22:19.000000000 +0100
-+++ Makefile.am__	2008-04-25 15:14:42.865079502 +0200
-@@ -1,5 +1,5 @@
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = utilspp curlpp examples doc 
-+SUBDIRS = utilspp curlpp doc 
- EXTRA_DIST = curlpp.vcproj curlpp.sln CHANGES curlpp.spec
- 
- pkgconfigdir = $(libdir)/pkgconfig

diff --git a/dev-cpp/curlpp/metadata.xml b/dev-cpp/curlpp/metadata.xml
deleted file mode 100644
index a9b66f6..0000000
--- a/dev-cpp/curlpp/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>alexxy@g.o</email>
-  </maintainer>
-</pkgmetadata>

diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
deleted file mode 100644
index 75c17ec..0000000
--- a/media-gfx/meshlab/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST MeshLabSrc_AllInc_v123a.tgz 11126723 RMD160 6443582eaefb2c98496914fbf1836bbebbb599da SHA1 17c5af3cd07b7c131d9e387e85337d50b7180a20 SHA256 3b515ddde7ff24a14ba32e3cbc755661cd7d58a4a2a467133d59fad001168427
-DIST MeshLabSrc_AllInc_v130a.tgz 12119277 SHA256 42404620bcb4fa8d3dc9576494343369feef4c2cc3d191f0007dbd530395ba5c SHA512 09820a83c2b2ec901aada9de601d355c7333e9da4cd3ceed6d11d45451970b77e1e69435d859316ba8bd86c54d57a3ed655e440f0e4db38dac570c6bb7d8c9a7 WHIRLPOOL 8837fcdd35f914c417eeebab62d30e464e5db8aa261a5aa84a9868dfcc3ce31082c6fbdee7da4f32ff1a1fb51a51672daf6cc3bba1c1a33feae926c50249d936

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
deleted file mode 100644
index f96fe4b..0000000
--- a/media-gfx/meshlab/files/meshlab-1.2.3a-r5-use-system-libs-rpath.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-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
deleted file mode 100644
index ee04cb7..0000000
--- a/media-gfx/meshlab/files/meshlab-1.3.0a-unbundle-libs-and-fix-rpath.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-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-r5.ebuild b/media-gfx/meshlab/meshlab-1.2.3a-r5.ebuild
deleted file mode 100644
index 318c461..0000000
--- a/media-gfx/meshlab/meshlab-1.2.3a-r5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 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="3"
-
-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.3.0a.ebuild b/media-gfx/meshlab/meshlab-1.3.0a.ebuild
deleted file mode 100644
index 23c248b..0000000
--- a/media-gfx/meshlab/meshlab-1.3.0a.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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
deleted file mode 100644
index 905334b..0000000
--- a/media-gfx/meshlab/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>gw.fossdev@×××××.com</email>
-    <name>Gert Wollny</name>
-  </maintainer>
-</pkgmetadata>

diff --git a/media-gfx/u3d/Manifest b/media-gfx/u3d/Manifest
deleted file mode 100644
index 2e6e8ab..0000000
--- a/media-gfx/u3d/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST u3d-1.4.2.tar.gz 22277038 SHA256 10f426646ec676f918b65a930ba420cd58d5025ae1b587492d43cef1972476aa SHA512 93577c4c6f297f0091027a729537e1696ad76bca7908b07e6261701559d8574c35f1e6b5237377039503248ac0be1851baf911966098c7f3c53932769ad7ed3d WHIRLPOOL 5eed8d96b4baf2bb28c5ae692583f5a2fb7f37a260e950ed4c2cce2d11ae03efcfd575036408196483cedaf404790cef4e40e0d2a0bcbf89462f0f3c2e679dc5

diff --git a/media-gfx/u3d/metadata.xml b/media-gfx/u3d/metadata.xml
deleted file mode 100644
index 098ac09..0000000
--- a/media-gfx/u3d/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>alexxy@g.o</email>
-    <name>Alexey Shvetsov</name>
-  </maintainer>
-</pkgmetadata>

diff --git a/media-gfx/u3d/u3d-1.4.2.ebuild b/media-gfx/u3d/u3d-1.4.2.ebuild
deleted file mode 100644
index ad090df..0000000
--- a/media-gfx/u3d/u3d-1.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit	cmake-utils multilib
-
-DESCRIPTION="Port of Intel's U3D library to gnu build tools"
-HOMEPAGE="http://u3d.sourceforge.net/"
-SRC_URI="http://www.iaas.msu.ru/tmp/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-		sys-libs/zlib
-		virtual/jpeg
-		media-libs/libpng
-		"
-RDEPEND="${DEPEND}"
-
-MYCMAKEARGS="-DU3D_SHARED=ON -DBUILD_SHARED_LIBS=ON"
-
-src_prepare() {
-	sed \
-		-e "s:LIB_DESTINATION u3d:LIB_DESTINATION $(get_libdir):g" \
-		-e "s:PLUGIN_DESTINATION u3d:PLUGIN_DESTINATION $(get_libdir):g" \
-		-e "s:BIN_DESTINATION u3d:BIN_DESTINATION bin:g" \
-		-e "s:INCLUDE_DESTINATION u3d/include:INCLUDE_DESTINATION include:g" \
-		-e "s:SAMPLE_DESTINATION u3d/samples:SAMPLE_DESTINATION share/${PN}/samples:g" \
-		-e "s:DOC_DESTINATION u3d/docs:DOC_DESTINATION share/docs/${P}:g" \
-		-i CMakeLists.txt
-}

diff --git a/sci-libs/levmar/Manifest b/sci-libs/levmar/Manifest
deleted file mode 100644
index f18497a..0000000
--- a/sci-libs/levmar/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST levmar-2.5.tgz 78817 RMD160 fc43206eef2969a143e3a9597b68d06eccbd14dd SHA1 46c11812689baba96f3b53cf89f0f3edb3582e61 SHA256 b70f6ac3eff30ec29150e217b137312cb84e85529815efea2c12e4eab74b9d75

diff --git a/sci-libs/levmar/files/cmakeusage-2.5.patch b/sci-libs/levmar/files/cmakeusage-2.5.patch
deleted file mode 100644
index ed709ca..0000000
--- a/sci-libs/levmar/files/cmakeusage-2.5.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -ur levmar-2.5/CMakeLists.txt levmar-2.5.new/CMakeLists.txt
---- levmar-2.5/CMakeLists.txt	2009-09-01 14:23:07.000000000 +0200
-+++ levmar-2.5.new/CMakeLists.txt	2010-05-18 16:58:48.943757800 +0200
-@@ -2,53 +2,50 @@
- #                        http://www.insightsoftwareconsortium.org/wiki/index.php/CMake_Tutorial
- 
- PROJECT(LEVMAR)
--#CMAKE_MINIMUM_REQUIRED(VERSION 1.4)
-+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
- 
--# compiler flags
--#ADD_DEFINITIONS(-DLINSOLVERS_RETAIN_MEMORY) # do not free memory between linear solvers calls
--#REMOVE_DEFINITIONS(-DLINSOLVERS_RETAIN_MEMORY) # free memory between calls
--
--# 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?" )
--
--# the directory where the lapack/blas/f2c libraries reside
--SET(LAPACKBLAS_DIR /usr/lib CACHE PATH "Path to lapack/blas libraries")
--
--# actual names for the lapack/blas/f2c libraries
--SET(LAPACK_LIB lapack CACHE STRING "The name of the lapack library")
--SET(BLAS_LIB blas CACHE STRING "The name of the blas library")
--IF(HAVE_F2C)
--  SET(F2C_LIB f2c CACHE STRING "The name of the f2c library")
--ELSE(HAVE_F2C)
--  SET(F77_LIB libF77 CACHE STRING "The name of the F77 library")
--  SET(I77_LIB libI77 CACHE STRING "The name of the I77 library")
--ENDIF(HAVE_F2C)
-+if(COMMAND cmake_policy)
-+  cmake_policy(SET CMP0003 NEW)
-+endif(COMMAND cmake_policy)
- 
--########################## NO CHANGES BEYOND THIS POINT ##########################
- 
--INCLUDE_DIRECTORIES(.)
--#INCLUDE_DIRECTORIES(/usr/include)
-+OPTION(SUPPORT_DOUBLE_PRECICION "support double precicion solver" TRUE)
-+OPTION(SUPPORT_SINGLE_PRECICION "support single precicion solver" TRUE)
-+OPTION(BUILD_EXAMPLE "build example" FALSE)
-+
-+IF(SUPPORT_DOUBLE_PRECICION) 
-+  ADD_DEFINITIONS(-DLM_DBL_PREC)
-+ENDIF(SUPPORT_DOUBLE_PRECICION) 
-+
-+IF(SUPPORT_SINGLE_PRECICION) 
-+  ADD_DEFINITIONS(-DLM_SNGL_PREC)
-+ENDIF(SUPPORT_SINGLE_PRECICION) 
-+
-+ENABLE_LANGUAGE(Fortran)
-+
-+FIND_PACKAGE(LAPACK REQUIRED)
-+IF(LAPACK_FOUND)
-+  ADD_DEFINITIONS(-DHAVE_LAPACK)
-+ENDIF(LAPACK_FOUND)
- 
- # 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
- )
- 
--# demo program
--LINK_DIRECTORIES(${LAPACKBLAS_DIR})
--LINK_DIRECTORIES(.)
--ADD_EXECUTABLE(lmdemo lmdemo.c levmar.h)
--# libraries the demo depends on
--IF(HAVE_F2C)
--  TARGET_LINK_LIBRARIES(lmdemo levmar ${LAPACK_LIB} ${BLAS_LIB} ${F2C_LIB})
--ELSE(HAVE_F2C)
--  TARGET_LINK_LIBRARIES(lmdemo levmar ${LAPACK_LIB} ${BLAS_LIB} ${F77_LIB} ${I77_LIB})
--ENDIF(HAVE_F2C)
--
--# make sure that the library is built before the demo
--ADD_DEPENDENCIES(lmdemo levmar)
--
--#SUBDIRS(matlab)
-+IF(LAPACK_FOUND)
-+  LINK_DIRECTORIES(${LAPACK_LINKER_FLAGS})  
-+  TARGET_LINK_LIBRARIES(levmar ${LAPACK_LIBRARIES})
-+ENDIF(LAPACK_FOUND)
-+ 
-+IF(BUILD_EXAMPLE)
-+  ADD_EXECUTABLE(lmdemo lmdemo.c)
-+  TARGET_LINK_LIBRARIES(lmdemo levmar)
-+ENDIF(BUILD_EXAMPLE)
-+
-+INSTALL(TARGETS levmar 
-+  RUNTIME DESTINATION "bin"
-+  LIBRARY DESTINATION "lib"
-+  ARCHIVE DESTINATION "lib")
- 
--#ADD_TEST(levmar_tst lmdemo)
-+INSTALL(FILES levmar.h DESTINATION "include")
-diff -ur levmar-2.5/levmar.h levmar-2.5.new/levmar.h
---- levmar-2.5/levmar.h	2009-12-02 11:23:35.000000000 +0100
-+++ levmar-2.5.new/levmar.h	2010-05-18 16:43:24.986917129 +0200
-@@ -26,7 +26,7 @@
- /************************************* Start of configuration options *************************************/
- 
- /* specify whether to use LAPACK or not. The first option is strongly recommended */
--#define HAVE_LAPACK /* use LAPACK */
-+//#define HAVE_LAPACK /* use LAPACK */
- /* #undef HAVE_LAPACK */  /* uncomment this to force not using LAPACK */
- 
- /* to avoid the overhead of repeated mallocs(), routines in Axb.c can be instructed to
-@@ -34,15 +34,15 @@
-  * non-reentrant and is not safe in a shared memory multiprocessing environment.
-  * Bellow, this option is turned on only when not compiling with OpenMP.
-  */
--#if !defined(_OPENMP) 
--#define LINSOLVERS_RETAIN_MEMORY /* comment this if you don't want routines in Axb.c retain working memory between calls */
--#endif
-+//#if !defined(_OPENMP) 
-+//#define LINSOLVERS_RETAIN_MEMORY /* comment this if you don't want routines in Axb.c retain working memory between calls */
-+//#endif
- 
- /* determine the precision variants to be build. Default settings build
-  * both the single and double precision routines
-  */
--#define LM_DBL_PREC  /* comment this if you don't want the double precision routines to be compiled */
--#define LM_SNGL_PREC /* comment this if you don't want the single precision routines to be compiled */
-+//#define LM_DBL_PREC  /* comment this if you don't want the double precision routines to be compiled */
-+//#define LM_SNGL_PREC /* comment this if you don't want the single precision routines to be compiled */
- 
- /****************** End of configuration options, no changes necessary beyond this point ******************/
- 

diff --git a/sci-libs/levmar/levmar-2.5.ebuild b/sci-libs/levmar/levmar-2.5.ebuild
deleted file mode 100644
index 73142e7..0000000
--- a/sci-libs/levmar/levmar-2.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.12-r4.ebuild,v 1.8 2006/01/07 11:43:17 eradicator Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="A C++ implementation of the Levenberg-Marquardt non-linear regression"
-HOMEPAGE="http://www.ics.forth.gr/~lourakis/levmar/"
-SRC_URI="http://www.ics.forth.gr/~lourakis/levmar/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="nosingle nodouble examples"
-
-RDEPEND="virtual/lapack"
-DEPEND="${RDEPEND}
-		>=dev-util/cmake-2.6"
-
-src_prepare() {
-	epatch "${FILESDIR}/cmakeusage-2.5.patch"
-}
-
-src_compile() {
-	local CMAKE_VARIABLES=""
-	CMAKE_VARIABLES="${CMAKE_VARIABLES} -DCMAKE_INSTALL_PREFIX:PATH=/usr"
-
-	if use nosingle; then
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DSUPPORT_SINGLE_PRECICION:BOOL=OFF"
-	else
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DSUPPORT_SINGLE_PRECICION:BOOL=ON"
-	fi
-
-	if use nodouble; then
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DSUPPORT_DOUBLE_PRECICION:BOOL=OFF"
-	else
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DSUPPORT_DOUBLE_PRECICION:BOOL=ON"
-	fi
-
-	if use examples; then
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_EXAMPLE:BOOL=ON"
-	else
-		CMAKE_VARIABLES="${CMAKE_VARIABLES} -DBUILD_EXAMPLE:BOOL=OFF"
-	fi
-
-	cmake ${CMAKE_VARIABLES} . || die "cmake configuration failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README.txt
-
-	if use examples; then
-		dodir /usr/share/${P}/examples/ || die "Failed to create examples directory"
-		cp "lmdemo.c" "${D}/usr/share/${P}/examples/" || die "Failed to copy example files"
-	fi
-}

diff --git a/sci-libs/levmar/metadata.xml b/sci-libs/levmar/metadata.xml
deleted file mode 100644
index 867a8ef..0000000
--- a/sci-libs/levmar/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>gw.fossdev@×××××.com</email>
-    <name>Gert Wollny</name>
-  </maintainer>
-<longdescription>
-  levmar is a C/C++ implementation of the Levenberg-Marquard optimization algorithm 
-</longdescription>
-<use>
-  <flag name='nosingle'>Build and install without support for single precicion math</flag>
-  <flag name='nodouble'>Build and install without support for double precicion math</flag>
-  <flag name='examples'>Build the example to test the compile and install its source</flag>
-</use>
-</pkgmetadata>