gentoo resync : 29.06.2020

3 files changed, 69 insertions, 33 deletions

diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 76273534c942..70a5ab19f699 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -17,6 +17,7 @@ AUX 2016.12/meshlab-2016.12-align2.patch 624 BLAKE2B 342231146ef2efc52ae4295d909
 AUX 2016.12/meshlab-2016.12-asString.patch 2309 BLAKE2B 8ff58d9a247e530e7965d186dfffc2e88bd4594a366439f9a8433269e3f20e33825673447a5ebac39929f02927a20cfa8d3dad0fae5787d6855de5653023ff31 SHA512 3ad05b637ad12a88a6e32f437cf6105b09c50eef16e815f11f3a1fbd6afdb3b01d9a0d31f08eaba26d075f6f2cba6c4694ca1afa2cc1e3973350294bc41f815b
 AUX 2016.12/meshlab-2016.12-fix-plugins-path.patch 509 BLAKE2B 3a4327b41743704255039f2c06713975c2d842a3af5077385d982107289d33a5a04473f68e21769ca97e45514ca1119244c2b66b5709b99a0b772324e1b0884f SHA512 613b3cec1c50c3d4d6fd3006b80fd4cb3b66a97c1493872d76f95c5ed16ee9c2a9aba5c1a5d021a302114e8e0e172619c4d344306004f109a1f211ee6a14e102
 AUX 2016.12/meshlab-2016.12-qprintable.patch 898 BLAKE2B 1a4802e758f8c7d29839eae49d5450b4d199011544223da7d7791045d44f2b2d71f7189d0cb655204d77736e63988079eeb64876411c62f09646887dae30aff8 SHA512 12836928f1848048afe769188285cc5a0a4e23b7d63f9c12ebae0298296607167d8e6198ea779cc475ca2cd39903c4a37dc77b20c928c49cddae1b4ee2fe2a7f
+AUX 2016.12/meshlab-2016.12-qt-5.15.patch 930 BLAKE2B d9bc0073c309006206411bcc48b3db65496aed4b32e5b8d30d582174f46038d34cac669e754516be4e07f51d448d92358666dded59a0ecc38cbbc78701a57a38 SHA512 c5c529c262d036346730247735c19f15eb11bf55dc2b876b230d81e3968941019b6dc6d8a64458b3da398b8ce4cb48a7bbfada375bac06ef73df9a25d827d820
 AUX 2016.12/meshlab-2016.12-qt-includes.patch 521 BLAKE2B 44d8cd045180d25810beb74da2a916fb6a8a01354be819d43fd960913f96863d8d3696a23440e8857081560326b78538446426d676f6d0c52b42fe3bc20ae1ca SHA512 ad9613bdafa1f812f4fd6b36a215b78416b2143af6ae96bc6c40d81eee47e16c0d2e62a7b292367333ff99b09f84630f1a9b5ba59d9a1ef3209a3caa28f1f5f6
 AUX 2016.12/meshlab-2016.12-remove-header.patch 1481 BLAKE2B c52f2eb980ebec98a534d2f5f6eadb9b89719e1d28d6fdc2912348fbe715103f2ca67684e29d1fa77b9b305cf552c12eb667634bfa22a0fad0312012e9b7b99d SHA512 ea0e24aa94d2595ed340c91c7a17e4028b2792bf316dfea0d8062324583dde62c03bb2d6af74317b9e448c657e5418100f40b18b172344697fe53e36657a45fc
 AUX 2016.12/remove-edit_mutualcorrs.patch 475 BLAKE2B 925756e7bed4fd9474b2a011f95118e00159457b91d04820166efae55d27eb19006af9ae92555b46adcd817646fcfcef82937221d59fef41899f94df1925a237 SHA512 03b4907fc484941d17d208d028b63cc0a1d1740fbdac8a6dd2b9ac8161efc5899d820cd0ec59b28ba1c39562ecd93c5e11e7b7af5564ee9aa429cb8745a4a5b9
@@ -25,5 +26,5 @@ DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240
 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
 EBUILD meshlab-2016.12-r2.ebuild 3497 BLAKE2B 9e3de165ab7cb48eec6289e55f2e1df0f88c9476ee0b67b7d99fdf052d0255143d48fac4002b3554d36ba967493ae3754fddd0a8c617b3aa30860cb887e6d547 SHA512 50433f5f61a00c4ecf33f901300156845ddc404ee427af7214fb42edd292cfe91cf26f5dc96d9cb7316e6b97d3934d9534a513c8d278d327fb82ff82df49712a
 EBUILD meshlab-2016.12-r3.ebuild 3539 BLAKE2B ce73969c0caf822ce458b4e3e40c591479f032fe9780b61bb2eb852cf9ae12eb933fb4b355b36b2af70f201a6a29135d8cba814be87af2369366b0fa798a6684 SHA512 a1df95a5610db88be56ed83e16ba4fd4fc71a7ff138435f1cfbaefe71d8dd9a56c193bdc32f9f7affd303c6ac4db4ffc244452cb20571e350d2f0a6dde6246f9
-EBUILD meshlab-2016.12-r4.ebuild 3628 BLAKE2B 4a8b4b1890378d70d4fa282d9814c9d39333c9b2b0cdd51e9ccf50f56d53b3bb5e9c723721f1e09bdff8728243266cd89f76af6b059197828ad2f99c6bedf547 SHA512 00166cb5e1f9ed0196ed6f96d8579be126a5778de93840545b5c536641204bac75365ea5f2430abc2f812090bca6ad18fe532e874d843c9de2861eba75cd27b7
+EBUILD meshlab-2016.12-r4.ebuild 3652 BLAKE2B 5ea94dd176d7229e6e07ea102b130d8e97907edbcd630258f704b14f47179ba02fe5ae44485132372b2bdfeef14317e2e10904b027b1f1d0081ba23e9cdccf82 SHA512 5bc637d6299fa057dd4549d6559c20e0a8e91d441794fa54de5963288a067fa8f435f8f38b172c8869659b334c313a2b05f4ecbe6433a37f8a69bc14b9abb130
 MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
new file mode 100644
index 000000000000..ab052cd69eb9
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
@@ -0,0 +1,33 @@
+From c57222e79f1c7840e1ed01a4abd17d089f5e5185 Mon Sep 17 00:00:00 2001
+From: alemuntoni <muntoni.alessandro@gmail.com>
+Date: Tue, 26 May 2020 12:35:03 +0200
+Subject: [PATCH] missing include
+
+---
+ meshlab/glarea.cpp  | 1 +
+ meshlab/meshlab.pro | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/meshlab/glarea.cpp b/meshlab/glarea.cpp
+index 6c0421062..dfd7af229 100644
+--- a/meshlab/glarea.cpp
++++ b/meshlab/glarea.cpp
+@@ -34,6 +34,7 @@
+ #include <QFileDialog>
+ #include <QClipboard>
+ #include <QLocale>
++#include <QPainterPath>
+ 
+ #include <wrap/gl/picking.h>
+ #include <wrap/qt/trackball.h>
+diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
+index 26ef88d00..842eb5ea5 100644
+--- a/meshlab/meshlab.pro
++++ b/meshlab/meshlab.pro
+@@ -1,5 +1,6 @@
+ # You have to copy the file by hand into the meshlab.app/Contents/Resources directory.
+ # ICON += images/meshlab_obj.icns
++QT += gui
+ QT += opengl
+ QT += xml
+ QT += xmlpatterns
diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
index bea9e2857554..505a20ab0b58 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit qmake-utils
+inherit desktop qmake-utils
 
-DESCRIPTION="the open source system for processing and editing 3D triangular meshes"
+DESCRIPTION="The open source system for processing and editing 3D triangular meshes"
 HOMEPAGE="http://www.meshlab.net"
 VCG_VERSION="1.0.1"
 SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	 https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz
+	https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz
 "
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="-minimal"
+
 DEPEND="dev-cpp/eigen:3
 	dev-cpp/muParser
 	dev-qt/qtcore:5
@@ -35,33 +36,34 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/meshlab-${PV}/src"
 
 PATCHES=(
-		"${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
-		#remove ot working plugins
-		"${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
-		"${FILESDIR}/${PV}/remove-io_TXT.patch"
-		#since structure synth doesn't seem to be compiling
-		"${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
-		#this has been fixed in the tree
-		"${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
-		#this causes segfaults
-		"${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
-		#for when we use minimal
-		"${FILESDIR}/${PV}/0001-compile-server.patch"
-		"${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
-		"${FILESDIR}/${PV}/0001-use-external-openctm.patch"
-		"${FILESDIR}/${PV}/0001-use-external-muParser.patch"
-		"${FILESDIR}/${PV}/0001-use-external-bzip.patch"
-		"${FILESDIR}/${PV}/0001-use-external-jhead.patch"
-		"${FILESDIR}/${PV}/0001-use-external-glew.patch"
-		#cause gnu stack quickstart related qa
-		"${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
-		"${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
-		"${FILESDIR}/${PV}/${P}-align1.patch"
-		"${FILESDIR}/${PV}/${P}-align2.patch"
-		"${FILESDIR}/${PV}/${P}-asString.patch"
-		"${FILESDIR}/${PV}/${P}-qprintable.patch"
-		"${FILESDIR}/${PV}/${P}-qt-includes.patch"
-	)
+	"${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
+	#remove ot working plugins
+	"${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
+	"${FILESDIR}/${PV}/remove-io_TXT.patch"
+	#since structure synth doesn't seem to be compiling
+	"${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
+	#this has been fixed in the tree
+	"${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
+	#this causes segfaults
+	"${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
+	#for when we use minimal
+	"${FILESDIR}/${PV}/0001-compile-server.patch"
+	"${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
+	"${FILESDIR}/${PV}/0001-use-external-openctm.patch"
+	"${FILESDIR}/${PV}/0001-use-external-muParser.patch"
+	"${FILESDIR}/${PV}/0001-use-external-bzip.patch"
+	"${FILESDIR}/${PV}/0001-use-external-jhead.patch"
+	"${FILESDIR}/${PV}/0001-use-external-glew.patch"
+	#cause gnu stack quickstart related qa
+	"${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
+	"${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
+	"${FILESDIR}/${PV}/${P}-align1.patch"
+	"${FILESDIR}/${PV}/${P}-align2.patch"
+	"${FILESDIR}/${PV}/${P}-asString.patch"
+	"${FILESDIR}/${PV}/${P}-qprintable.patch"
+	"${FILESDIR}/${PV}/${P}-qt-includes.patch"
+	"${FILESDIR}/${PV}/${P}-qt-5.15.patch"
+)
 
 src_prepare() {
 	mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed"
@@ -93,7 +95,7 @@ src_configure() {
 
 src_install() {
 	dobin distrib/{meshlab,meshlabserver}
-	dolib distrib/libcommon.so.1.0.0
+	dolib.so 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