gentoo resync : 31.12.2018

5 files changed, 53 insertions, 8 deletions

diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 7d676214a1de..b8d27774267a 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,9 +1,10 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
+AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166 SHA512 c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
-DIST mixxx-2.1.4.tar.gz 34470998 BLAKE2B d442bddbab97f45c1de4f38317f5e24c2aabd8ffd351596db52ffa1e086f363ef0cfe30e169790e7f672a81474170e650b197dbd05456a83f9d196442aa9fc51 SHA512 082062ac2dde7893ff38a8b58c5d602b563de6efe94050568602b755f1dabdc9e5b311251653a3bf7a441acc456fb40f4ba063733ee7091faa6ec080122124d8
 DIST mixxx-2.1.5.tar.gz 34474975 BLAKE2B 3daf5598cc7efe162157004116ba7fed2d53a2f97b513abd03d7ce55731a9de1e85ae5c8d82e1cc1369201f3694b1a295223f70509540ca471e6e785070acbd4 SHA512 f46f528fdbd39a14a16ebce3e53c9bae12299cfd405d69e812d87c66e9f3728542f73f1156a352c0637b194f4bb35ecdd599e4bbbfbaa7ebdddcf9a1eb792854
+DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530 SHA512 8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134
 EBUILD mixxx-2.1.1-r1.ebuild 3004 BLAKE2B a1718363b127fe5515d616bf8daf6a354c9ee4798514327fee5b90d8f9d397a1b59ca5ec6423d1949ebc3863b24beeb6f8f154cf6610dd1ae3e7fcb527a329b1 SHA512 db6c3550d8453e36e0b469a283317235e27fae69f2ec7c40b893e4e2345a7a4c5295d6ab7fe4572c91867311067697a602cd8173e771f2b10319fcfc453d3bd9
-EBUILD mixxx-2.1.4.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 EBUILD mixxx-2.1.5.ebuild 3003 BLAKE2B a7f2261d2a470e77b7b7d227bf68cd15e32572bca684662c66480cb8adef3878c8b25d7e85b19496ce6e977d45cd72e7e9063a405d1603bfcaef30f4637fe022 SHA512 3d59474452d549a5c2c72028067a554ec4b4b5e11e57cbed1ca445c00578026bb87b5377066335d438245597bf120e11425e0fd0a5dd0164ba1e09378e6d56a4
-EBUILD mixxx-9999.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
-MISC metadata.xml 549 BLAKE2B 20dba66bc128eceb037f39f0bd04ee4f4dafda37968f90f09de12d6485b37f1391963d1bcf343755da69a74c3d3f72218e97b9cf13e9e699bae4ea098fbcf9af SHA512 c89877382e9baf90038ca7c6175ef8edc3296950dc7386b00f861a90fcc3296ec4d21df665c8aa62042c1b952cd270af77b85a5959518600f43f963ffce51296
+EBUILD mixxx-2.2.0.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
+EBUILD mixxx-9999.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
+MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch b/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch
new file mode 100644
index 000000000000..4addc98b1e1b
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.2.0-lilv_include_fix.patch
@@ -0,0 +1,33 @@
+--- mixxx-release-2.2.0/src/effects/lv2/lv2backend.h
++++ mixxx-release-2.2.0/src/effects/lv2/lv2backend.h
+@@ -5,7 +5,7 @@
+ #include "effects/effectsbackend.h"
+ #include "effects/lv2/lv2manifest.h"
+ #include "preferences/usersettings.h"
+-#include <lilv-0/lilv/lilv.h>
++#include <lilv/lilv.h>
+ 
+ class LV2Backend : public EffectsBackend {
+     Q_OBJECT
+--- mixxx-release-2.2.0/src/effects/lv2/lv2effectprocessor.h
++++ mixxx-release-2.2.0/src/effects/lv2/lv2effectprocessor.h
+@@ -4,7 +4,7 @@
+ #include "effects/effectprocessor.h"
+ #include "effects/effectmanifest.h"
+ #include "engine/effects/engineeffectparameter.h"
+-#include <lilv-0/lilv/lilv.h>
++#include <lilv/lilv.h>
+ #include "effects/defs.h"
+ #include "engine/engine.h"
+ 
+--- mixxx-release-2.2.0/src/effects/lv2/lv2manifest.h
++++ mixxx-release-2.2.0/src/effects/lv2/lv2manifest.h
+@@ -3,7 +3,7 @@
+ 
+ #include "effects/effectmanifest.h"
+ #include "effects/defs.h"
+-#include <lilv-0/lilv/lilv.h>
++#include <lilv/lilv.h>
+ 
+ class LV2Manifest {
+   public:
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 4627d1b0b257..da78302375e8 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="hid">Enable HID controller support</flag>
+		<flag name="lv2">Add support for Ladspa V2 via <pkg>media-libs/lilv</pkg></flag>
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
 	</use>
 	<upstream>
diff --git a/media-sound/mixxx/mixxx-2.1.4.ebuild b/media-sound/mixxx/mixxx-2.2.0.ebuild
index 465a2c26cdea..7de8d9c94349 100644
--- a/media-sound/mixxx/mixxx-2.1.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack"
 
 # fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
 # got fixed
@@ -29,6 +29,7 @@ RDEPEND="
 	dev-libs/protobuf:0=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
@@ -36,6 +37,7 @@ RDEPEND="
 	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	media-libs/chromaprint
 	media-libs/flac
@@ -59,6 +61,7 @@ RDEPEND="
 		media-libs/libmp4v2:0
 	)
 	hid? ( dev-libs/hidapi )
+	lv2? ( >=media-libs/lilv-0.24.2-r3 )
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
@@ -76,6 +79,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
 )
 
 src_prepare() {
@@ -107,6 +111,7 @@ src_configure() {
 		ffmpeg="$(usex ffmpeg 1 0)"
 		hid="$(usex hid 1 0)"
 		hifieq=1
+		lilv="$(usex lv2 1 0)"
 		m4a="$(usex mp4 1 0)"
 		mad="$(usex mp3 1 0)"
 		optimize="${myoptimize}"
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 465a2c26cdea..7de8d9c94349 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+IUSE="aac doc ffmpeg hid lv2 mp3 mp4 opus shout wavpack"
 
 # fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
 # got fixed
@@ -29,6 +29,7 @@ RDEPEND="
 	dev-libs/protobuf:0=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
@@ -36,6 +37,7 @@ RDEPEND="
 	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	media-libs/chromaprint
 	media-libs/flac
@@ -59,6 +61,7 @@ RDEPEND="
 		media-libs/libmp4v2:0
 	)
 	hid? ( dev-libs/hidapi )
+	lv2? ( >=media-libs/lilv-0.24.2-r3 )
 	mp3? ( media-libs/libmad )
 	mp4? ( media-libs/libmp4v2:= )
 	opus? (	media-libs/opusfile )
@@ -76,6 +79,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
 )
 
 src_prepare() {
@@ -107,6 +111,7 @@ src_configure() {
 		ffmpeg="$(usex ffmpeg 1 0)"
 		hid="$(usex hid 1 0)"
 		hifieq=1
+		lilv="$(usex lv2 1 0)"
 		m4a="$(usex mp4 1 0)"
 		mad="$(usex mp3 1 0)"
 		optimize="${myoptimize}"