summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmy Winston <amynka@gentoo.org>2015-07-25 19:30:54 +0000
committerAmy Winston <amynka@gentoo.org>2015-07-25 19:30:54 +0000
commit689337c7cecb150e8fdf64eac50365acbd5d1d88 (patch)
treeb5a635c5d7213b66a0c5a037bc8f51762f21ef4f /media-gfx
parentUpstream made VNC WebSockets unconditional. As of commit (diff)
downloadhistorical-689337c7cecb150e8fdf64eac50365acbd5d1d88.tar.gz
historical-689337c7cecb150e8fdf64eac50365acbd5d1d88.tar.bz2
historical-689337c7cecb150e8fdf64eac50365acbd5d1d88.zip
Version bump bug #525948.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x34E69781
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/meshlab/ChangeLog11
-rw-r--r--media-gfx/meshlab/Manifest35
-rw-r--r--media-gfx/meshlab/files/1.3.3/gcc-4.7.patch12
-rw-r--r--media-gfx/meshlab/files/1.3.3/lapack.patch11
-rw-r--r--media-gfx/meshlab/files/1.3.3/mpir.patch10
-rw-r--r--media-gfx/meshlab/files/1.3.3/qt-4.8.patch11
-rw-r--r--media-gfx/meshlab/files/1.3.3/rpath.patch39
-rw-r--r--media-gfx/meshlab/meshlab-1.3.3.ebuild65
8 files changed, 174 insertions, 20 deletions
diff --git a/media-gfx/meshlab/ChangeLog b/media-gfx/meshlab/ChangeLog
index dea26340e697..0615ebc4f464 100644
--- a/media-gfx/meshlab/ChangeLog
+++ b/media-gfx/meshlab/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-gfx/meshlab
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/meshlab/ChangeLog,v 1.2 2014/09/11 11:27:50 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/meshlab/ChangeLog,v 1.3 2015/07/25 19:30:40 amynka Exp $
+
+*meshlab-1.3.3 (25 Jul 2015)
+
+ 25 Jul 2015; Amy Winston <amynka@gentoo.org> +files/1.3.3/gcc-4.7.patch,
+ +files/1.3.3/lapack.patch, +files/1.3.3/mpir.patch, +files/1.3.3/qt-4.8.patch,
+ +files/1.3.3/rpath.patch, +meshlab-1.3.3.ebuild:
+ Version bump bug #525948.
11 Sep 2014; Michael Palimaka <kensington@gentoo.org> meshlab-1.3.2.ebuild:
Pin dev-qt/qtcore and dev-qt/qtopengl to SLOT 4.
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 36e448be8ebd..7039ffd05d83 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX 1.3.2/01_crash-on-save.patch 1150 SHA256 c7ed4f43b01ee8d6bdfb46760f776de112fc61e19e51c1057f771fd3dfb1717d SHA512 b6c6f06584ab5c43bcfef3b697fc1b3dcc6ee6e2ac7f15cdd3ac1a71af356e56299a78353f6a1c6bc8e19cde60b78a82980ae25abd87eb0a467a3fe4f1d769e6 WHIRLPOOL 89e0c7aa254a23074318210e9b08a53ddc8df6f28565d82dc1522e839b4065be7c5319e118f128a9be14c4945f40711216a72839d5165d75c39e8a304b8c63f1
AUX 1.3.2/02_cstddef.patch 1549 SHA256 067ec2879cc5dc2ffb0870e3bc91ad285851ce370a586a1767b6665b086e40dd SHA512 4b4eb9ddb444f6c69a8dd817a2312329d9ee5d5b272ea8e7f310fd7c1f7e8cc22978e632016a27784c3456c3fe4a7ad753784c04b9c0e6f544eddc26e497da85 WHIRLPOOL 15225c6f3b33b9543493de32bfdef77baf503755eedcf21074885345d70c04fcacee548cde9a5a77658ccaa6d086f12250214ca3023474f0c5c8c7020b607a33
@@ -22,26 +22,25 @@ AUX 1.3.2/19_CONFLICTS_IN_rpath.patch 1375 SHA256 630ddac55bfc24a8814584068e0023
AUX 1.3.2/20_rpath.c18p2.patch 2016 SHA256 9aae726a619614a9f8a2e42a8c6c4d8e249e6d4169ca8b588556b3ab122f6d9a SHA512 99059d13898293fe499669e200f594cf824c2eaad728806a12e906cb97079cd8de80c494da1ff5f73aaeb4756366d8b6c0f404f8e98bfee68c012a4a2fccfb4e WHIRLPOOL 19d35f80d228489a79e7839eb8927fea963013449a7ae3722a012661acd1513576559ec342c8636a2fd7de3ac45eb5bdfd55f02559f444cf973f24eaad1769ef
AUX 1.3.2/21_RESOLUTION.patch 1444 SHA256 36820b39371ee6938219f28e3005f5d7d39d0bc6230a01bebacc4e67f15e6efc SHA512 3742e3999e5c3842d831dc4742b40ea4659a0c6b036af81047d52c8234b4854ab147c76b795adde6ec52397d46f22a00017bf85079633aacd14ae1f711f6669f WHIRLPOOL 0820a94a01d0933cddc993c3a8a63bdd5029ae2e670cd69ff7b885f046f47ad386f262f539dde522dac307605572b896504d04e39cfd3f754be0ef84e7681efd
AUX 1.3.2/22_aliasing.patch 1960 SHA256 576544a1c3646cbd9974ee30f71d18ae3775d3b1c5a3725818c000fa40963200 SHA512 5007163025f34e5f399e22843711d730b1e46612d9553e29bea46d575a4bdcb0663e978ebaa936e9213b210e9b99dd8ed30d3b40c212e7505f46da3ed45af8ed WHIRLPOOL df8bdad9c4641180765344862e4a4938f6812b7e788307c1db7e48eba10caa50e5e8b4e9574f686731b47dff5e5d03fabdfd66802d8eec6575118ef630fe309c
+AUX 1.3.3/gcc-4.7.patch 358 SHA256 96456e633261939f2e117bd4fafe512fdc06ef72386dc0c77042911243794dfb SHA512 03e45ecc09fa6911bd139f8e5a783a8fa96749cd229963f482b2b2f7bb4c730c59bffc0f0f996740db95639a5fa9caed75d841f554e6f512795e8084c0abd9cd WHIRLPOOL d87f635a6e92b8fe3b4e04a343c2c69ba24775484595ece2c01d0ea426d3555fabaf520af155389e424fc7dba5ad800da82038f04b2c1d16527f74cd3b71ccba
+AUX 1.3.3/lapack.patch 642 SHA256 148da7b41bfe6d0f441bcc4cb495bc18c4a0ead47101f9132d34221a41dc7d55 SHA512 95c34e082d777d67ed98f6e8a938ff4178cc515ac8f681cbb1bd5972ed15808e767f39824f97c6755d47e3946d79b23a637c4ea4a8ce4e0ae9291c06b2391815 WHIRLPOOL 9a5f439f9ccbfd224caa6efcf08d610069d05c8ea4ac66afda7b44876d0f39726511e67779842a3688a3a74a024abbd69f2e8e6c0c45b0cb59413ec30acdb3ba
+AUX 1.3.3/mpir.patch 839 SHA256 3b629715f364750b3c34873563df6b41d945b7947e8dcedaf2a68227a741bde6 SHA512 18c6f9c820fd88ddc11cec297867808c32b740a951719f1f05fdbb0e3fe82475c67d108fdc20275e840a3b9935f1b779406523bf6037bec137970b9954f3b053 WHIRLPOOL aeba2ef0efd545a2a9fab7189a289980db503b845e90a821880860be0bd6b921ddbe7494c4e6b206780dd54e1b0869146db896c64fa9ab04ab789dd5d69d3b3b
+AUX 1.3.3/qt-4.8.patch 376 SHA256 dbd300fc447df0a7d7c7fe348a38c5140c3730e06a77fb0e0b38ee86305d06e4 SHA512 23fadaa3f5a8ba037c6926ad60171d10126db6b40c59af0b4e65177f5278450c7ac63e3ca35f1bc353e0c014f22ed61c4940003021e8fd777decfb578d3c1559 WHIRLPOOL 21fef5a73048dc09fd3d08c9d54ab4bd2b402722ff596deeb99cb528f7e8e16678ab978943bb892f8e9596d0ed4787d9cf72dfd77440e6a5013bfbd05da45ef7
+AUX 1.3.3/rpath.patch 2166 SHA256 9cf958173b084a155251ef9f544440210a3b16834a2e1feeef427cf81c6869f0 SHA512 9f4e9ad5b40e6eddb9b4bea6d9fc8c2f9ec0215a6ce6691c3c8041968a5c120c510c885fdcb638d37b04c740d6cff7a261b9e1939aac2a2f46d2881181785639 WHIRLPOOL edfb7f95dbd834eb7f7098f2450bc2e58d2647b4ae67b97f2324c662102649949830eb7b7c5c303ddcfbf929f16bf218bd7a6df931e5ddd5de70bc45176422c7
DIST MeshLabSrc_AllInc_v132.tgz 12874196 SHA256 d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1 SHA512 40ef1f887d18e2146d6001d9c290bb76f6fc27caf13a1256a4061d5e2c43fd8dfdc843ace2cb83c6370648c2c5be3a22e2d5b31698df46e0695890d6a20651ac WHIRLPOOL aa6da94a8d5b9d28c9b787fe307774b7223e57278ed45c3bf1a823da9f5a9b59fd058a466f3f4dea3c4c57e3934b0aed88b1446f20e746349881c1bc965fec36
+DIST MeshLabSrc_AllInc_v133.tgz 13390531 SHA256 c9829cd1f58713f1f82d546af1ee69291b52a0f94585f803174fb9e55654980f SHA512 ec155292be10ebe17a7d41b26d51cce88e1f00b692b8adb29462a2c3cb15444c6f27067a3396e4427cd694c82424910ba80f32f536b5f5d46d6765b2461cef43 WHIRLPOOL f1f938e7eb8d648f2a8ac4399420d947efe403f19cc163b4a4e28f8cf620ae5aa22d17503e3b5ca7920996e78dfbb41dbd89447d61bd95e4a2f69420f2196d5d
EBUILD meshlab-1.3.2.ebuild 2508 SHA256 1e0efdc4fdb58c70b20e29296ec0149d5734b382b399621e4230d3b704b55fff SHA512 6ee72f4ddb38b609819ba0d908892afd8a617ae187dc3fc9d86d0f70a0be1771093ce1e23ee0d096f7a478963704c70302d19d9df1ba5bd2924678c80e1534da WHIRLPOOL 809dd29bcca183ebe10bbff2c0ac1534ade93599e5d0c505d711d66bb705c7a7b3ad4cfeea7bdb377032157cf6d18b0a0ea5fda24b89ab2c87afcf963d0dc38b
-MISC ChangeLog 1224 SHA256 835c67147feaae7df705373a8240051da83d99efaf75d89b7bd69300817ee590 SHA512 29ed3f14dda3d00890ea0393f00e5bd2d2411a98ab89d4ddf8d18b155b7e0f43a77a11105d5db5b5541c6aa4962f0accffca5bf217c3c1be16340734bc05db2a WHIRLPOOL 0a49c04dd33e280d8652893de5848d0c3c8184cbeec902cee3771f5946f57e961c95b6ffab41b72f0926e0c3aede1a3415248a2f39624d3c820b8958f1407dc2
+EBUILD meshlab-1.3.3.ebuild 1609 SHA256 111e68a93d14f9c9c4b39abdca934961029371c061c472d41e621f567a721563 SHA512 d95c157c8c860aff1fad1821e0bb9450b86b786eaa6998f5dd6e5b60bf40b7fc0a611dbaa12f9cceb7930ce4e685bbec01955fdfb3bd30cd05683e78ddbe97b8 WHIRLPOOL 1f5aaa5f51b9b1cd02303e4e7635a65670578bbae3cde1f65c27619e0020e0b24d8fde059e1500231505cc095dfc955e985b43d7a77807c1b3b845e8f693e068
+MISC ChangeLog 1486 SHA256 13c94bb4efeb17c55db89661321fc61bfb67d5d34a584d09c4c8ce4a760f2ab6 SHA512 7f80068c7befa98a5e5a8732e24269a528948036b380dbbef09f57654aeeca850172d175699170ab711b354a6261dcf5ec6ba168cfa9a172fee9ec1a6a19422a WHIRLPOOL 0092814620336714ff1205588e8b39f3164ca0b8bce0d2eae3e6a2a11aa690b818e57b68fde917337fc38dd46175385d18073ec9b1aee29b06f8e4b0d575025e
MISC metadata.xml 621 SHA256 8af69292648dbfcd485f246cc2767bac40c6fecb0ab5f71a2706b474574a2f1e SHA512 5e82cc986ec461e7f3267d52b71cca0cf5759c978e43cd36ef976263d20a5b8c8fe597a4a7366ae1bcba9e083d4715a82e99609cb45d67f4dbcf853dfee95812 WHIRLPOOL ad80a889f38e4093b58ad89b2009027afad1a4ab09a84f82068fe8d0ddb0a25a4f4e76535116911cc7e29a9ab35179b4b0e5e13122d33f82962d26c18ff4ea9e
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
-iQJ8BAEBCgBmBQJVfwHAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0wIP/1iMFzPtrZoBbQE/HDKd7XLp
-aaffp+E/+rzMlM5A8z8dOPYkC88J0oIQ6EePQce2xQBJ3KwkfQiUg/JkLgHAKXm1
-wQWa0gPSD6oKjJTm18A5GbexhgvqtsfSLo6p1uXAuFNSZsn8phVZPHxz32bxWYES
-ANOPpVUh0PwZId89H98mObjxkhOBtDhMcyYwfzJiehaWFymVqg0BGnt51jVHWRmJ
-kn5adckn8RePMsY8AYiohEBsRujSXd5Yh/oXQu6GNDCPNImAWYd4baDfOmp4mY+l
-riupdFtbKZNqN3CE2+rIIdl5RDq4s/6O/wpwqsovZilnPpYwng6XKZ78/nXJnK4x
-2v8gXSszmnBXYetK68RJitgOi7Goh2aNL31p/+Xic/Zj0TvFT03+ROrz3s74rmEE
-iCLjX2S53YQVN4+pTEtLyYSVFKSI23WH0ws+C6kTRaZfXEfgLxDghlyTlt5XtP0L
-pxaLcWsjFbsxhlN175XtuymKZWvPEDrzzyyYlq1fX9Y4ntB1ny+8aoL8uAy296Zm
-I5VJZRxc8LormMJ1iPwdYQhAx7x2RfcvtHH5f4FWbkhXQhbcl8j9GFSlFbnfEdLq
-ftBNH5VEmlSoZ9h+LQ+k2fpg59/XOTcK+2od462uzMbq/KS6VHTX+pc6TkxvmVLB
-hi10T7VjtdKfFUuw2OGE
-=XcaH
+iQEcBAEBCAAGBQJVs+PUAAoJEDuJ1FA05peB4ykIAMHPLL0fjjT/RdyjHqR+wDjf
+PNSsKDVJIdIWdIxxkfoeztaGVzIOQhVCLCFODUxPSyYpmPIT5RY271IpX+SPRzT3
+aAmeQf8r19XPqGUjyKiYzUp15f5gqb1f3b1GtO1vPCt7u+deXbBit+twEd/tDwJV
+Gl0lBHqQfLrYtcChVQ3jJ8YaTA6ktolVIbDYJ9/8TgyLWHPkVE5XyfK1QFW/5Ev2
+RC5N1qhkKAaGf1wJu91aZqZ5Bt2I3/G9U9V9KMWFuJkI4URsE3XQYsmcWUfLjZUU
+AD6P1/DDmo/hRLa4RlEmOEqk9ar8U+NUS5dHSLkbFfJoL0GEsZ2/awSU2grsD3Y=
+=IL+a
-----END PGP SIGNATURE-----
diff --git a/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch b/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch
new file mode 100644
index 000000000000..b918ca52ec45
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch
@@ -0,0 +1,12 @@
+diff --git vcglib/wrap/ply/plystuff.h vcglib/wrap/ply/plystuff.h
+index 3e41e63..4af9508 100644
+--- vcglib/wrap/ply/plystuff.h
++++ vcglib/wrap/ply/plystuff.h
+@@ -75,6 +75,7 @@ using namespace vcg;
+ #define pb_close _close
+ #define DIR_SEP "\\"
+ #else
++#include <unistd.h>
+ #define pb_mkdir(n) mkdir(n,0755)
+ #define pb_access access
+ #define pb_stat stat
diff --git a/media-gfx/meshlab/files/1.3.3/lapack.patch b/media-gfx/meshlab/files/1.3.3/lapack.patch
new file mode 100644
index 000000000000..81c094634050
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/lapack.patch
@@ -0,0 +1,11 @@
+diff -Nur meshlab.orig/src/external/levmar-2.3/lm.h meshlab/src/external/levmar-2.3/lm.h
+--- meshlab.orig/src/external/levmar-2.3/lm.h 2010-04-28 17:30:47.000000000 +1000
++++ meshlab/src/external/levmar-2.3/lm.h 2010-05-13 20:17:35.488505907 +1000
+@@ -27,7 +27,6 @@
+
+ /* specify whether to use LAPACK or not. The first option is strongly recommended */
+ #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
+ * retain working memory between calls. Such a choice, however, renders these routines
diff --git a/media-gfx/meshlab/files/1.3.3/mpir.patch b/media-gfx/meshlab/files/1.3.3/mpir.patch
new file mode 100644
index 000000000000..a3f8d051d891
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/mpir.patch
@@ -0,0 +1,10 @@
+diff -Nur meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro meshlab/src/meshlabplugins/filter_csg/filter_csg.pro
+--- meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro 2014-04-02 02:59:31.000000000 +1100
++++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2014-06-01 21:10:24.521095356 +1000
+@@ -18,6 +18,4 @@
+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
+ win32-msvc2010:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
+ win32-msvc2012:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
+-linux-g++:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0
+-linux-g++:LIBS += ../../external/lib/linux-g++/libmpirxx.a ../../external/lib/linux-g++/libmpir.a
+
diff --git a/media-gfx/meshlab/files/1.3.3/qt-4.8.patch b/media-gfx/meshlab/files/1.3.3/qt-4.8.patch
new file mode 100644
index 000000000000..e820aceb5bbe
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/qt-4.8.patch
@@ -0,0 +1,11 @@
+diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
+--- meshlab.orig/src/meshlab/meshlab.pro 2011-02-15 20:39:47.000000000 +1100
++++ meshlab/src/meshlab/meshlab.pro 2012-01-07 11:57:18.055586086 +1100
+@@ -85,6 +85,7 @@
+ QT += xmlpatterns
+ QT += network
+ QT += script
++unix:LIBS += -lGLU
+
+
+ # the following line is needed to avoid mismatch between
diff --git a/media-gfx/meshlab/files/1.3.3/rpath.patch b/media-gfx/meshlab/files/1.3.3/rpath.patch
new file mode 100644
index 000000000000..31ed26b0344e
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/rpath.patch
@@ -0,0 +1,39 @@
+diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
+--- meshlab.orig/src/meshlab/meshlab.pro 2012-05-31 00:32:44.000000000 +1000
++++ meshlab/src/meshlab/meshlab.pro 2012-08-06 21:26:01.405784190 +1000
+@@ -130,11 +130,11 @@
+ #}
+
+-linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
++linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW
+-linux-g++:QMAKE_RPATHDIR += ../distrib
++linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+-linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU
++linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU -lGLEW
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib
++linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+-linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU
++linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU -lGLEW
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib
++linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+
+ # uncomment in your local copy only in emergency cases.
+ # We should never be too permissive
+diff -Nur meshlab.orig/src/meshlabserver/meshlabserver.pro meshlab/src/meshlabserver/meshlabserver.pro
+--- meshlab.orig/src/meshlabserver/meshlabserver.pro 2011-10-15 03:34:48.000000000 +1100
++++ meshlab/src/meshlabserver/meshlabserver.pro 2012-08-06 21:26:34.609557938 +1000
+@@ -26,11 +26,11 @@
+ 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++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ linux-g++-32: LIBS += -L../distrib -lcommon
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib
++linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ linux-g++-64: LIBS += -L../distrib -lcommon
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib
++linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ #CONFIG (release,debug | release) {
+ # win32-msvc2005:release: LIBS += -L../common/release -lcommon
+ # win32-msvc2008:release: LIBS += -L../common/release -lcommon
diff --git a/media-gfx/meshlab/meshlab-1.3.3.ebuild b/media-gfx/meshlab/meshlab-1.3.3.ebuild
new file mode 100644
index 000000000000..e4bf92dd5b7d
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-1.3.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/meshlab/meshlab-1.3.3.ebuild,v 1.1 2015/07/25 19:30:40 amynka Exp $
+
+EAPI=5
+
+inherit eutils versionator multilib qt4-r2
+
+DESCRIPTION="A mesh processing system"
+HOMEPAGE="http://meshlab.sourceforge.net/"
+MY_PV="$(delete_all_version_separators ${PV})"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/MeshLab%20v${PV}/MeshLabSrc_AllInc_v${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-cpp/eigen:3
+ dev-cpp/muParser
+ dev-qt/qtcore:4
+ dev-qt/qtopengl:4
+ media-libs/glew
+ media-libs/qhull
+ =media-libs/lib3ds-1*
+ media-libs/openctm
+ sci-libs/levmar
+ sys-libs/libunwind
+ sci-libs/mpir"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/meshlab/src"
+
+src_prepare() {
+ cd "${WORKDIR}"
+ epatch "${FILESDIR}/${PV}"/gcc-4.7.patch \
+ "${FILESDIR}/${PV}"/lapack.patch \
+ "${FILESDIR}/${PV}"/mpir.patch \
+ "${FILESDIR}/${PV}"/qt-4.8.patch \
+ "${FILESDIR}/${PV}"/rpath.patch
+}
+
+src_configure() {
+ eqmake4 external/external.pro
+ eqmake4 meshlab_full.pro
+}
+
+src_compile() {
+ cd external && emake
+ cd .. && emake
+}
+
+src_install() {
+ dobin distrib/{meshlab,meshlabserver}
+ dolib distrib/libcommon.so.1.0.0
+ dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1
+ dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so
+
+ exeinto /usr/$(get_libdir)/meshlab/plugins
+ doexe distrib/plugins/*.so
+
+ insinto /usr/share/meshlab/shaders
+ doins -r distrib/shaders/*
+ newicon "${S}"/meshlab/images/eye64.png "${PN}".png
+ make_desktop_entry meshlab "Meshlab"
+}