gentoo resync : 04.08.2018

3 files changed, 52 insertions, 13 deletions

diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 5d7c25e32de6..51a196469ba8 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,5 +1,6 @@
-DIST qtractor-0.8.4.tar.gz 1752418 BLAKE2B a66edab959df43c6210e8fb26338d1299b26eb9a767158e371741bffc847420eac3a5a487da9cb83b6da0fe2705a34c9a3290a2a5400e66cf8e6ff3060e1b541 SHA512 406c19eb37273ac932b0f797db6e064e48119a245fe25762f743a261c9f80ec3ce762c76ddbc633ad17bb5924affb7db7ded95d1403b9b1edaa360e6ff060f92
+AUX qtractor-0.9.1-qt-5.11.patch 961 BLAKE2B 392220acdf078d0011a91c77a3e2f15ea395f41d8f206a28cd8d4632752943ad1d7b6ae6f14f2c8457e4548045ba3de5ecb3706ab7fdd0534ecec19e2113e0ed SHA512 b7dd5a429693d5a4944a9b4a7ba252e7bcb5879e95ffab3caa828d3934cb3ecac30f29fb627241073fe2b40f2de523de638c2d9aa7c686dd30b53ef870c6af07
 DIST qtractor-0.8.5.tar.gz 1766017 BLAKE2B eaa75f6efd7ebcfdb1e21c717960d22eb9790c4a3f15ae8bcc364c9b6a5eed6137e4f9d47bd914abdb3679de2cbc30e9c72e32f07fc1ca06959140c5c96dc29b SHA512 9f916e46460403fcb4b1e2dadd048dd52c0d74425a2220cc4d40456141ff7bf5a9cb2fda0f394dac38079af67c322720468d9b7825181442875945899b699329
-EBUILD qtractor-0.8.4.ebuild 1500 BLAKE2B 08ae14793c7c906a98aa8b107198c1cda598c6f1c31d804fa11151bcf5eac10546e1927c16b8b14d04d22f671813e691a0b40339bf5602c483dd69e9a0039cc4 SHA512 fa3ab5724e7b23d90e2e476e2dc0238e82d69af5b863361ef7bd1b72de9e7bc902aa3130225eadf5c04ca7be2bc8a43ca28123d3eb07065b914c7470c84f8842
+DIST qtractor-0.9.1.tar.gz 1763699 BLAKE2B a1d03361266a91abc6c0425d71ee2fa53fd5ec6299a23f15ba1599e480d43c30180334defaa50fcc73a02b7ddafd694bfaf6a00fa14fbdd767276c05b7ec56b8 SHA512 c40a7535740bc8315ffc640f791b640a12a4ba135070502682681c3022923f1edb62738127cae0c523a6410cb163b4cac2828544ae629b42fc93946f3d4d8a59
 EBUILD qtractor-0.8.5.ebuild 1500 BLAKE2B 08ae14793c7c906a98aa8b107198c1cda598c6f1c31d804fa11151bcf5eac10546e1927c16b8b14d04d22f671813e691a0b40339bf5602c483dd69e9a0039cc4 SHA512 fa3ab5724e7b23d90e2e476e2dc0238e82d69af5b863361ef7bd1b72de9e7bc902aa3130225eadf5c04ca7be2bc8a43ca28123d3eb07065b914c7470c84f8842
+EBUILD qtractor-0.9.1.ebuild 1504 BLAKE2B 2f6c75da0d150666fe377dd46244df3bf98a6d40caeb61868e5ae20fa8e2503fd4b4d729186e8d211c070a16ed15c73ac5464734b49375acce2f587156703404 SHA512 cad2ef21a1577b9df0ba76d93a0f3d60a3da16702ce8919eea29c25f6204eecd8b3dd5149914dfc21cd81a9ab07166afcd6f39d4c5da1b662143446dbc899f02
 MISC metadata.xml 542 BLAKE2B bc7330f8b5f775ebbab52dcf034130ee6016eada843baca1529e58d3c72ac19ce7fcd13b3483e4bf15b3620e8ee4c379520730146a39ec72d6ea1aaba094d93b SHA512 002d353914af0071fae342598619aef3b0dfe099d500da0bc98f40c209689f123dbbd93ca80a89a53c6257a54ee808798a858987d80a0443e2cc723dbfdedb7b
diff --git a/media-sound/qtractor/files/qtractor-0.9.1-qt-5.11.patch b/media-sound/qtractor/files/qtractor-0.9.1-qt-5.11.patch
new file mode 100644
index 000000000000..c30166ea368f
--- /dev/null
+++ b/media-sound/qtractor/files/qtractor-0.9.1-qt-5.11.patch
@@ -0,0 +1,38 @@
+From b49da1c4c44e668f3ae9ceba3002d77d10694c85 Mon Sep 17 00:00:00 2001
+From: daviddavid <geiger.david68210@gmail.com>
+Date: Wed, 30 May 2018 06:49:13 +0200
+Subject: [PATCH] Fix build with Qt5 >= 5.11.0
+
+---
+ src/qtractorMeter.cpp       | 1 +
+ src/qtractorTrackButton.cpp | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/qtractorMeter.cpp b/src/qtractorMeter.cpp
+index d1b826c5..14c38366 100644
+--- a/src/qtractorMeter.cpp
++++ b/src/qtractorMeter.cpp
+@@ -29,6 +29,7 @@
+ 
+ #include "qtractorObserverWidget.h"
+ 
++#include <QAction>
+ #include <QHBoxLayout>
+ #include <QVBoxLayout>
+ #include <QPainter>
+diff --git a/src/qtractorTrackButton.cpp b/src/qtractorTrackButton.cpp
+index 488eb831..5a314dd8 100644
+--- a/src/qtractorTrackButton.cpp
++++ b/src/qtractorTrackButton.cpp
+@@ -26,6 +26,8 @@
+ 
+ #include "qtractorMidiControlObserver.h"
+ 
++#include <QAction>
++
+ 
+ 
+ //----------------------------------------------------------------------------
+-- 
+2.18.0
+
diff --git a/media-sound/qtractor/qtractor-0.8.4.ebuild b/media-sound/qtractor/qtractor-0.9.1.ebuild
index 4796180c1501..1595ca670dfa 100644
--- a/media-sound/qtractor/qtractor-0.8.4.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic qmake-utils
 
@@ -41,24 +41,24 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-DOCS=( README ChangeLog TODO AUTHORS )
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 
 src_configure() {
-	append-cxxflags '-std=c++11'
+	append-cxxflags -std=c++11
 	econf \
-		$(use_enable mad libmad) \
-		$(use_enable libsamplerate) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable osc liblo) \
 		--enable-ladspa \
-		$(use_enable dssi) \
 		--enable-lilv \
 		--disable-qt4 \
 		--with-qt5=$(qt5_get_libdir)/qt5 \
+		$(use_enable debug) \
+		$(use_enable dssi) \
+		$(use_enable libsamplerate) \
+		$(use_enable mad libmad) \
+		$(use_enable osc liblo) \
 		$(use_enable rubberband librubberband) \
 		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable zlib libz) \
-		$(use_enable debug)
+		$(use_enable vorbis libvorbis) \
+		$(use_enable zlib libz)
 
 	eqmake5 ${PN}.pro -o ${PN}.mak
 }