gentoo resync : 04.12.2017

23 files changed, 214 insertions, 573 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b539c5fccd8f..518acc1df961 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index fdba1eadfcb1..dd5ffefa4078 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -2,7 +2,9 @@ AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554
 DIST abcMIDI-2017.11.08.zip 556065 SHA256 b66904f5c14ad43da32a8e0956e0dadc2e4f4ff49cc0bb6337703de773661aaa SHA512 c89a49c9a3b3f6d462acd09cc26b2720cbd9cc9525e38b1c9cce41052c01167a66f284854e3cc468737eefdaee321db294edca3a4b3b8c6d93d249330913d630 WHIRLPOOL 973ab1f8d56591fe4eb8c37c4dcf759d35bada828a47984e9390fbfcbb23dd63edd1fc337ff94411970e25e2ff2de221817772caa7698abb008433ed159caafd
 DIST abcMIDI-2017.11.10.zip 556044 SHA256 050f11d6309e944244b6ba4c709549e6e10fe38bb831f148e78b083645a4022c SHA512 6a80109849370994a74f71e358bf3225ca750736648e45d16fc5c039106c3f3da9444f509c87c3c55faabbc60db6e468a83d1fcffab788cfbd74b6255ea0cfc4 WHIRLPOOL f5449647c58d9bcdafa378f530f915af242fc62f7eb3011fbee2fc90e9d93fc2fcc48486c82031b7f6f5803570a8540a6517200b1035832bcb2ff527f317995d
 DIST abcMIDI-2017.11.19.zip 556185 BLAKE2B 01ec71e17357b3d6050d26c909e06556f5209f1aaddbb0f85031199070dbe93a7980b7b2e238dd7ad8a7a5f4f07683ccbeff1b44942e691286fb75fe1a075e34 SHA512 8e76a55bf699e69425ef51cc4c77f17b952798cd83e620d88781d209bb4f00a9c80b47ad0a40df2a64c2595d94174a2cba44f3e436d7cf066f9126f4fc548dec
+DIST abcMIDI-2017.11.27.zip 557045 BLAKE2B 8f341f7217c1a98732bdfe5e4383c6718476714a4f37f629852f46a40c5e50711194d281dafde16293d45bd0c70c9b7506f5d426db03249ba2358b0c76142941 SHA512 006313ef9fcae652996339a682d308a6e931da9692b4662e3272c8bee73a3803dd9aeb54189cb464c68593473339201b20af6b291524ea2f096567053131e7b6
 EBUILD abcmidi-2017.11.08.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
 EBUILD abcmidi-2017.11.10.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
 EBUILD abcmidi-2017.11.19.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
+EBUILD abcmidi-2017.11.27.ebuild 794 BLAKE2B 16c0fd26186c80200100e38964d5c6afc7f3e92a78dbf32e8b8ae50ceffa5ca862c1de6fbb8aaedcfebaba2c6e9bfbdf76faf782f18cbbfbf488fa4c2f0e5177 SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2017.11.27.ebuild b/media-sound/abcmidi/abcmidi-2017.11.27.ebuild
new file mode 100644
index 000000000000..adf33138050d
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2017.11.27.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+	default
+
+	rm configure makefile || die
+	sed -i "s:-O2::" configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 5f1eaabd6082..aae28f63a0d8 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -5,6 +5,6 @@ AUX amarok-2.8.90-mysql-embedded.patch 1224 BLAKE2B acc4b0abb2a7e000c76e0a07a109
 AUX amarok-2.8.90-mysqld-rpath.patch 573 BLAKE2B d56b77592e73d624269b8611751f7595e05aad139e65357c004e748f7edf3f41af54c5e3c823904dd4e44c4c2f92c6fc8db0087856967cba699206143f05f9a0 SHA512 724ee90912883baa374bdf8ceca77e1d8ec809279f2254705624fb3966e8300ed02a0ddfc4613e8b9add2b7b20eed333619b3c1d1426e14e5f8ce60bdff39be5
 AUX amarok-2.8.90-no-webkit.patch 1126 BLAKE2B 14b1fc1b3a5c20437896256a6692430934f351754c33b07c8eb61073c75577e70853834dc995474beb8b57464e04a66b143fafb405a451950a5add61f98f8620 SHA512 1c45e9d3f4d8cd9fe6adc1a10b78f7b439a0dddb09ccff399bc3ded62207d6862d61dd5bfaccceb7044f4740f59824a6c8eae34d2e9b2de9a400ffb3305a0707
 AUX amarok-2.8.90-scriptconsole.patch 1272 BLAKE2B 7483f7d7cbe3351d0ccca3c593ec49641076755f38d3cfcabd426c321957fddae7855016d2ff0ecfccb03b6b8e21017c769bd1717bdcb961b3789877538942cc SHA512 3bc31284faa45c717342917f220f7ae078e1f6b0afd313bf8f2ba28b97badb4d56dafcc1a319655b2ae01dee37e09ff34978af95d1743105be8f118be2c61c9d
-DIST amarok-2.8.90.tar.xz 48890580 SHA256 b057369ab70d192b669ee6c2c11e9e7d4140663f6a60d6175ef0bb56b4bef9a7 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc WHIRLPOOL 22da35ea61dcda04d882f4c0da7327cab10edf50140b3ae891738d10e1b9e5062eb541e35e817fd04a7f0284eb085b5ccf3edfa20438b764a9ce3615de35ca8c
-EBUILD amarok-2.8.90-r3.ebuild 3574 BLAKE2B cf88754088472335c20674252e6dbfba14c9c0a7455bc30d736acc2f910be242b2b7e7be5b9e27352461cc4f0dad47d9578214cf0887a0f2cf68ec1b28e598b0 SHA512 cbc17f61a90484f93ccb604ddb4928ac5de0036134cca4d3065d80d8a0c95aa64d9df638dd12d530be0460e96b22ecc91efb53e7e82687171bfd45e05fd984b7
+DIST amarok-2.8.90.tar.xz 48890580 BLAKE2B 81367b491237abd7a6201d94ea39412a7a69867553c688d9c691749102ac8eb6e59ab5ff17d3b74718211e4975e1daacb15ef3bc1bc35d82954de890213eb544 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc
+EBUILD amarok-2.8.90-r4.ebuild 3352 BLAKE2B cc0d968babc2bcb1fc440caa30438a1e86c25d5443a068aaba1cca653cf19330d3940c2aa3396894e1a9cedee29425b6f8003d20bfda03c3d48f775d2ce60e02 SHA512 dce046da09c14af58a7f63505516e9618a46577f861dd8c62a7144c42ef455123f032bc97742bbcdb2319deb5965f6f697e0b1b6899695cae6c6214c571721a9
 MISC metadata.xml 1159 BLAKE2B b986025a8d81ead2cc821ebc5a9bc6f447d4356615127b1795b337068f0457c1a5ee15b380822ef7fcf5eea6f24ef9e48d93329df0947c500a519978db6b1b31 SHA512 0b4a4a1f388183923ce0d9f31bd622194165421c6db388fa4091b41aec8a343d6fb19c3bbac9dd288102bebf66c74df5ce81b14270dc954d8a68f7e0f76d318e
diff --git a/media-sound/amarok/amarok-2.8.90-r3.ebuild b/media-sound/amarok/amarok-2.8.90-r4.ebuild
index 9165fb8d31e0..4ea07c89b53e 100644
--- a/media-sound/amarok/amarok-2.8.90-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r4.ebuild
@@ -3,9 +3,6 @@
 
 EAPI=6
 
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
-lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv tr uk zh_CN zh_TW"
 KDE_REQUIRED="never"
 KDE_HANDBOOK="optional"
 SQL_REQUIRED="always"
@@ -22,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa test +utils"
 
 if [[ ${KDE_BUILD_TYPE} == live ]]; then
 	RESTRICT+=" test"
@@ -30,19 +27,19 @@ fi
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 COMMONDEPEND="
-	app-crypt/qca:2[qt4(+)]
-	kde-frameworks/kdelibs:4[opengl?,plasma(+)]
 	$(add_kdeapps_dep kdebase-kioslaves)
+	app-crypt/qca:2[qt4]
+	>=dev-qt/qtcore-4.8:4
+	>=dev-qt/qtdbus-4.8:4
+	>=dev-qt/qtscript-4.8:4
+	>=kde-frameworks/kdelibs-4.14.37:4[plasma]
 	>=media-libs/taglib-1.7[asf(+),mp4(+)]
 	>=media-libs/taglib-extras-1.0.1
 	sys-libs/zlib
 	>=virtual/mysql-5.1[embedded?]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
 	>=x11-libs/qtscriptgenerator-0.1.0
 	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
+	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] )
 	mp3tunes? (
 		dev-libs/glib:2
 		dev-libs/libxml2
@@ -53,7 +50,6 @@ COMMONDEPEND="
 	)
 	mtp? ( >=media-libs/libmtp-1.0.0 )
 	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
 "
 DEPEND="${COMMONDEPEND}
 	dev-util/automoc
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 10d39fb1582e..0dfd8cd69cd0 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -9,5 +9,5 @@ DIST clementine-1.3.1_p20171113.tar.gz 8467904 SHA256 d0393deefe4cf385ef79393527
 EBUILD clementine-1.3.1-r5.ebuild 4962 BLAKE2B 061ffdab9f81560d33ba90271056824999d17b3219f3cd4fbea6e4cfa08435045172f3bd4f10bce3a98d4b89c647ee66fb63209fed2826d914494d45231603a6 SHA512 f1815b573a1e921d257a7f64579bb42f7cdf1e6d67075d4b490c71c4fe508c579ba3aedbd7a4e54df96dcdcdcf5e2e4de87067cf56433574ae7ba19e21d0785c
 EBUILD clementine-1.3.1-r6.ebuild 5297 BLAKE2B 656fcbfaec471e5adb07bd569be65e721142cc81e4b20d1defb177477b21b9edb9dad2cdf7a2b20284c4602996184002e4d397646da7205708ddbb133df6381d SHA512 1edef30b329ad8b40c2b1ac53311fc02cb3e98f435cb8a412398f3484ae7bc897c691b4238685f19e75969bb6511d5193091644d9fdb25226775e4fce92f3370
 EBUILD clementine-1.3.1_p20171113.ebuild 4799 BLAKE2B 62f5799342dadfcce6fabca227d870e815c17e1b5e17227a699474b12fbbe6825b84ea1d8b03e4b44acbbaa0ecf022923ec80ee3b996688c494635f35cc74a7d SHA512 f34627e95778005ccc7b70827a2b5b87225e662c7034c242569e31a1bca0627dae6dc2817ff9921346f357f3b91507012979c2cf9b74a685d253d3a066017f6c
-EBUILD clementine-9999.ebuild 5254 BLAKE2B ca7185e8348af0263f160d6f927e6c6c018ba6e91d9c0f2614a4977ee56c27aafb05fcb274f348e7a1b464591d8a02596886c35af70095f51f44f6e4419c8e94 SHA512 6bbf92baa8ee8fc51efaaf362af0ec20f71007596c5b356ba5ad2e87874985e56c27846e6f330ac1bcab678c7c9b794ee35ca06a89c4f9ba0948cbd72a8a46ce
+EBUILD clementine-9999.ebuild 5193 BLAKE2B aad0efc0d126ff29ccf3211db65be57bcba02fa24d8b4c682ad95e6001d9aea33ca12e47e52d66a7cdb627930545cb72f35416b50c7110aeb66c8843da721119 SHA512 6ec8c6e0a28f53326752500fbd4a1e247127d0ac720df94e93c15868ee5a7ce25e51651a58126b8acb57bb0b6c3150c0d38be202644648dae9d054c49bfe881b
 MISC metadata.xml 1537 BLAKE2B e63db763bbd9c013dd426a710bfb042335faf01f5cc8b3321a4e698e41313ba6994c059502e3f2113eaa3216d519c9f1a0b5a7467cecb27da94cd59d21bbe453 SHA512 cf5beb80417c4099a43e7f19bb06112159af557f17ce9c0da1226f5ee41cebc8e94c2c2aa6349d140ee291608d39511477a0aa54e586d11a52bc3f697283da3f
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index b0f63f84244e..a2fe1ad85c4b 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote +X"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
 
 REQUIRED_USE="
 	udisks? ( dbus )
@@ -41,6 +41,7 @@ COMMON_DEPEND="
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	media-libs/chromaprint:=
 	media-libs/gstreamer:1.0
@@ -50,6 +51,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/glu
 	virtual/opengl
+	x11-libs/libX11
 	cdda? ( dev-libs/libcdio )
 	dbus? ( dev-qt/qtdbus:5 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
@@ -60,10 +62,6 @@ COMMON_DEPEND="
 		media-libs/glew:=
 		>=media-libs/libprojectm-1.2.0
 	)
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-	)
 "
 # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
 # Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
@@ -156,7 +154,6 @@ src_configure() {
 		-DENABLE_LIBPULSE="$(usex pulseaudio)"
 		-DENABLE_UDISKS2="$(usex udisks)"
 		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11="$(usex X)"
 	)
 
 	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
index 73b8cb044d6b..7a30b38b30d1 100644
--- a/media-sound/gmorgan/Manifest
+++ b/media-sound/gmorgan/Manifest
@@ -3,7 +3,6 @@ AUX gmorgan-0.79-manpages.patch 1199 BLAKE2B 6989a057f92e75e5dc607e3483408446423
 AUX gmorgan-0.79-remove-dirs.patch 760 BLAKE2B 34b638a52d737ecc87219d59560449da339d5467ca6a1ba31551036610ff3fc62a7466ee33db6c073aaecc5e58646227a4e64f2c54044c44ac91ec96fde55148 SHA512 23300349241ea9dfa0b8a6ad9504a51c15ecf2a3dd23baed5a163888f9bb0208e96d728a41ad5f5388b6ffa5d4e691b7a7b6f92cd7f6a140d840393a473a231f
 AUX gmorgan-0.79-remove-gettext-version-check.patch 855 BLAKE2B d1bbce53fe0b17682fe1f08bc5eeca04d909a52dd26f1033aad37a3437436bd6f7b7cf630ffd4b2c74b92ea5d9a19d4f5d168d2202286320ac55613b88989551 SHA512 1119f8a6aaa20d81d6138f912fa13caaa4593519389094963503c0974a97f8b35d65ce0ad54d66efcc862ce092bca4e1f141fa5e62f0e4b579bbeabe535d6ab4
 AUX gmorgan-0.79-remove-old-docs.patch 736 BLAKE2B 584fe41e8f2c227fed77da87699b799090a52415a1acf193446462cac103475a8fe58edc1837b15febba8fb0119991548562268329582743f79db48b6181994e SHA512 55ba54cd3410fe70ad5e2d1f2d60c56e30b335bc90e730e0a9a6265c7e0cc688e5aa15f0e9109af7c61db217e39fbf245ab08a54ae46cbc52f6deda5be769108
-AUX gmorgan-cflags.patch 597 BLAKE2B f42348de7b6ac4cc97c71a6e583bb38b5bc8ea61d984bce8dacf1df7cc9615be3c41b988be6f939893efa0da822b24be868842a8abf449e681bb112ea8f80a79 SHA512 d33092eb45f1716d78902045a5ce1609e6264dd95ed079c05b02c19935f4686598352aeb6007b3d4a3a77215a7663b06865771419ad319c2f583dddb57d9c1b0
 DIST gmorgan-0.79.tar.gz 8055701 SHA256 eccdff6d0de745f469e45220de2b41764c0e591eb894695c24ce07cc2a65b1cf SHA512 17fadbe2c8b2b4c7e18816a6f866e4406c005fda1ca3ded628c9497aa46abacd06417d68296c500a2d108e9364eae3702f990f5c1b1b1d83328ed553aa453be0 WHIRLPOOL 96a20bc79ee9a8b62ad1061995fda5542450b5e0faee9677f548d05884e13791af79617bf1ad0546028db2a1f38b7e3882b9dd4778e7a912b6ebcb02efefa7f1
 EBUILD gmorgan-0.79-r1.ebuild 859 BLAKE2B 3a2b5b3fd35384c6856daf9a65031123bd189dbc3afe654ec6390841b0d8aa00feb674218890c2dcadf80dab5c3b77c922de45ecf2f97c86c7a0f204418e4aed SHA512 232d5250ac1b88594f116bfdc6a9da1cfc991693dc26c3bf19109cdbaee70a54c67e182defffae58a16e98bb753c8f97d33832053786934066c07d87e7a263db
 MISC metadata.xml 336 BLAKE2B 2d754b8db2a3d7f4f6c1c30393e407bdd60a1ee1a4b555b18bb12707369ad151d906ffbf3e3ebcaa816e119ccfddc682ce227f0685702fa647a4c6d25495de8a SHA512 3d5245a06c576d8a4f5fdf07ddb0a6cbc9cf0f64799da9e7e58a67fdd23a5fe082d0bc557575914ec7fba42923d8503587b327ad31f270f46710084fb7cba5f8
diff --git a/media-sound/gmorgan/files/gmorgan-cflags.patch b/media-sound/gmorgan/files/gmorgan-cflags.patch
deleted file mode 100644
index 83c2c01a5745..000000000000
--- a/media-sound/gmorgan/files/gmorgan-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gmorgan_0.39/configure.in
-===================================================================
---- gmorgan_0.39.orig/configure.in
-+++ gmorgan_0.39/configure.in
-@@ -15,7 +15,7 @@ AC_FUNC_SELECT_ARGTYPES
- AC_CHECK_FUNCS([bzero memset select strdup])
- AM_GNU_GETTEXT([external])
- LIBS="`fltk-config --use-images --ldflags` -lasound"
--CXXFLAGS="`fltk-config --use-images --cxxflags`"
-+CXXFLAGS="${CXXFLAGS} `fltk-config --use-images --cxxflags`"
- AC_CHECK_HEADERS([unistd.h])
- AC_CHECK_HEADER(alsa/asoundlib.h, true, AC_MSG_ERROR([Alsa is required]))
- AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 6e629c6eabcf..78aace983dad 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +1,6 @@
-DIST jack2-1.9.10.tar.gz 6415555 SHA256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d SHA512 0bee815356e9e572224e7cc484c402f38797d70257c4bc79a47552ae30a25a4600c61f712a73cbbede52cd8cb8dc144c9334e28c10e23354a11b7223ee0bb0ca WHIRLPOOL a7b4e14fb1e0490955a363fe0680558d89f80c3cdf18a840991b636518ecf55d872d91d9024770874b5d28494e2cbadc0f21ce4b73ee7873f62842fb0339b0c5
-DIST jack2-1.9.11-RC1.tar.gz 6481650 SHA256 730eee0de2136e62b358f4b65d9e30109d706d2627eb2998e43763b47b17474f SHA512 4fd7d82ab6536b8c6061023858ae5b978903608b149498818971481da75c6e9e0e7e7aef5e1343730c259f4378aebfbf25916b9736e0ad8aa19584a44f894436 WHIRLPOOL 6401f16b5ef5331602c6b3c14c709adf17f765700959d87494738960c8e1407cc894789ef8b11452ca9621a9e18e93407d81ede0846118efbb81560bbe9435e6
-EBUILD jack2-1.9.10.ebuild 2344 BLAKE2B 9ee2922ed0fdfe21c65e7d7d89fcb0ba5940f558ce4b42c770c11fc5806445fb374e2c373509d8b791970d91e87289d59cca90068e9cf32f7d369f06598a856d SHA512 5a9ab02ab4e9e8cdf1bcf558b90d1d5f890548492058cb679685e700ba3c538d694e7506ccdb2f44c81d98e90c3d3caf7fe72e60b6b24cbee6664c9f4efa2ae3
-EBUILD jack2-1.9.11_rc1.ebuild 2233 BLAKE2B 0c793894a69139616658360df0259017d22db32e756d53de902e5121a3c4108f47950345c5c518994065592a6e8a7c4d4e2e438704abb62b9e3cc76569156c08 SHA512 e029d81ff459bfeb080c190189f99ebedf3c87ee266eef54a1c9d8fc3bcc2b4d8bb05822c1269bbb374e6f752c7673f44f36ef4bfbaf1cde79168ebabd87a43f
+AUX jack2-1.9.11_rc1-gcc7.patch 889 BLAKE2B e5c31c6688dbcd2cbba44993cff03e612b364a88cac146415471564f983ba07e7d822f2baf38ee0be4eabaf6369fc1f4f3640ea1a5eab51192a782b44b6dec1f SHA512 7cae070880af90bd7ee68dbfae0ea4421a5cb2cfaaf7b1228a4668767e541b263b965bed4b572053678c7dd81f380e6759a46cd97a0a5cfc95921286739e1791
+DIST jack2-1.9.11-RC1.tar.gz 6481650 BLAKE2B b9497efdb72f2e3894a062a3ffdffc3ebf67f5ea7372d993c13581202202e0f0ba7b21563768a984201d8e5eb2854add67fb5c377e2b4ddb23806a38ddddb0f9 SHA512 4fd7d82ab6536b8c6061023858ae5b978903608b149498818971481da75c6e9e0e7e7aef5e1343730c259f4378aebfbf25916b9736e0ad8aa19584a44f894436
+EBUILD jack2-1.9.11_rc1-r1.ebuild 2298 BLAKE2B 917029b1de9c87f141e7828f7cbd7d508d2015197f88f4dd8fa1201c9b75f861cc709425eead75132f81f147b4e8e8254f4d6eef1e65fb40bc626a8ae278591b SHA512 dfe3a1abb3e5807949ba53911def098695b3e3d497ad6ce915c41b698b335826f8cdf656897e0b16152ddd42bc3502d75f23363441d3e0328759168ce89f77f4
+EBUILD jack2-1.9.11_rc1.ebuild 2231 BLAKE2B f5960181f2eb1bea4f56dc01ed8314490869d4ba549f79dcf9edc31f10b7495b6cf878a1470311e7ba0c833518c8847066a6af9aba80d9a7656a3c64d4632267 SHA512 a7a7af2ca48fe233acd04ac8933910de0e4a6d37e24d411ea0e02d5898f9333dcc9af0ef36893cfd8d2c2332ab86285bbd83e8085afa8a0719fda2dd20fefe6f
+EBUILD jack2-9999.ebuild 2254 BLAKE2B 6ec064096706b262db4719ca5c68fa8a0a34c541600046dc4ed57c9f3aa058ca333110ebfdde7867d47541ebd80e21b195571a7ee34627f16175468eeca6e098 SHA512 ef3dffd92f1778e3649840268c9a96b10f3512eecd00416da00228c678b25b8e8600416e00afc7a5a8c8448b1d29c1651ba60aedf68660449d2cff8a0a5767b1
 MISC metadata.xml 679 BLAKE2B 9808048dac5d2d936aa7f6a05f66b0a98a428aa81275b5528684ba2312c49a1212ee38afac0d466e5ed87b91c253f8b973670928dd21b13470208bc84a2ff48f SHA512 8c6fc8ce9dc151cdc8adc2092a661a76ef0fd12fc8f2c922be3e7a75215e40ed5b352f8099906ae6a883fd3a3edb674d0a6784831d2cd9b881b474cf6c419152
diff --git a/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch b/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch
new file mode 100644
index 000000000000..dcde5fb422f8
--- /dev/null
+++ b/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch
@@ -0,0 +1,19 @@
+commit f7bccdca651592cc4082b28fd4a01ed6ef8ab655
+Author: Kjetil Matheussen <k.s.matheussen@notam02.no>
+Date:   Sat Jul 15 13:21:59 2017 +0200
+
+    Tests: Fix compilation with gcc7
+
+diff --git a/tests/test.cpp b/tests/test.cpp
+index 8a8a8117..d2ef9a05 100644
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
+ 	jack_nframes_t delta_time = cur_time - last_time;
+ 
+ 	Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
+-	if (delta_time > 0  && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
++	if (delta_time > 0  && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) {
+ 		printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
+ 	}
+ 
diff --git a/media-sound/jack2/jack2-1.9.10.ebuild b/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild
index e14f43d964f7..de3d58d89ad7 100644
--- a/media-sound/jack2/jack2-1.9.10.ebuild
+++ b/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild
@@ -1,37 +1,38 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads(+)"
-[[ "${PV}" = "2.9999" ]] && inherit git-r3
 inherit eutils python-single-r1 waf-utils multilib-minimal
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
 HOMEPAGE="http://jackaudio.org/"
 
-RESTRICT="mirror"
-if [[ "${PV}" = "2.9999" ]]; then
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/jackaudio/${PN}/archive/v${PV}.tar.gz -> jack2-${PV}.tar.gz"
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="alsa celt dbus doc opus pam"
+IUSE="alsa celt dbus doc opus pam classic sndfile libsamplerate readline"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
 
-# FIXME: automagic deps: readline, samplerate, sndfile, celt, opus
-# FIXME: even though sndfile is just used for binaries, the check is flawed
-#	making the build fail if multilib libsndfile is not found.
-CDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
-	media-libs/libsndfile[${MULTILIB_USEDEP}]
-	sys-libs/readline:0
+CDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
 	${PYTHON_DEPS}
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
@@ -48,17 +49,11 @@ RDEPEND="${CDEPEND}
 	pam? ( sys-auth/realtime-base )
 	!media-sound/jack-audio-connection-kit:0"
 
-[[ "${PV}" = "2.9999" ]] || S="${WORKDIR}/jack2-${PV}"
-
 DOCS=( ChangeLog README README_NETJACK2 TODO )
 
-src_unpack() {
-	if [[ "${PV}" = "2.9999" ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc7.patch
+)
 
 src_prepare() {
 	default
@@ -67,24 +62,31 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mywafconfargs=(
-		$(usex alsa --alsa "")
-		$(usex dbus --dbus --classic)
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=$(usex celt yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=no
+		--freebob=no
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
 	)
 
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_configure ${mywafconfargs[@]}
+	waf-utils_src_configure ${mywafconfargs[@]}
 }
 
 multilib_src_compile() {
 	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-
-	if multilib_is_native_abi && use doc; then
-		doxygen || die "doxygen failed"
-	fi
 }
 
 multilib_src_install() {
-	multilib_is_native_abi && use doc && \
-		HTML_DOCS=( "${BUILD_DIR}"/html/ )
 	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
 }
 
diff --git a/media-sound/jack2/jack2-1.9.11_rc1.ebuild b/media-sound/jack2/jack2-1.9.11_rc1.ebuild
index 4f0738fc56c4..fdf94f71e711 100644
--- a/media-sound/jack2/jack2-1.9.11_rc1.ebuild
+++ b/media-sound/jack2/jack2-1.9.11_rc1.ebuild
@@ -10,7 +10,7 @@ inherit eutils python-single-r1 waf-utils multilib-minimal
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
 HOMEPAGE="http://jackaudio.org/"
 
-if [[ "${PV}" = "2.9999" ]]; then
+if [[ "${PV}" = "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
 	KEYWORDS=""
@@ -18,7 +18,7 @@ else
 	MY_PV="${PV/_rc/-RC}"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
new file mode 100644
index 000000000000..2794517a02e4
--- /dev/null
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+inherit eutils python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://jackaudio.org/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+	KEYWORDS=""
+else
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa celt dbus doc opus pam classic sndfile libsamplerate readline"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+CDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	${PYTHON_DEPS}
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( ChangeLog README README_NETJACK2 TODO )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=$(usex celt yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=no
+		--freebob=no
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/meterbridge/Manifest b/media-sound/meterbridge/Manifest
index b5a40f82dd23..90a256fdded9 100644
--- a/media-sound/meterbridge/Manifest
+++ b/media-sound/meterbridge/Manifest
@@ -3,5 +3,5 @@ AUX meterbridge-0.9.3-cflags.patch 483 BLAKE2B 02233f99771bdf233e374bedc0f965fa0
 AUX meterbridge-0.9.3-gcc41.patch 488 BLAKE2B 379e5d1967a78c53b112a7dbb8ea41d561d5517879a91335468345f56ab90c0bb438dacc69a308fcd03f1df46f1ca617bd47deb0b4329991a4b9dea8cbc5d0a8 SHA512 df259114e25efb486ad980b44449b8c33b3afe87a726a5c40641831810d0de30a56c671bbcc5fdbe2fec05b860a3b2ed1439947240c967f938c6771e91d5907e
 AUX meterbridge-0.9.3-setrgba.patch 547 BLAKE2B 5b2aa5a2701615dfd034c710faa6e75ffba3f5b03517bba4f880b53c17faa248c9e4dae8b2d7a598cd93aa213add78307a5978189c29df688f7ab6f364e37724 SHA512 2bb8e4c26d33a0383f3867459dcc15f5d7500adbbb5cdc230d7fba1d45c9ba4f0ba46731770c5ef25f6adc8121efbef9ecd0ecdac53ed3c3ced840010e3164d4
 DIST meterbridge-0.9.3.tar.gz 610566 SHA256 3feef0e52d68333c97f32393aff73f2c4d963bd974c5d3f42689c6eb3e1bf668 SHA512 19c49a584ab71a4fbe4a0d3f05382ce464c3c5f3e37a6dbd42b4920a18577d66464d8e1277d32c34cf9248a945da05fda17a3ecd35e770fdd8af6e9f691ab52a WHIRLPOOL 84cf915e64f0a93c452cb8e1ae0e3852d34610daf333a7e9f804ad1dabca82a98a5659b774cbb141bd13d95dfc6e2c71deb76edc311ff823ce99d13e4654c120
-EBUILD meterbridge-0.9.3.ebuild 826 BLAKE2B e865ac2a00c9c7226efa8691f2479c93c899bab99f97258fa16b7ce837b57436b2121dedabf53e0ff0a8e897280df1a987a9ac77f7d0a8fff09c87850e5e3ca9 SHA512 1d8dc9fb3717b7bf2a03041c025dc4a747380ea0415d14edadd80bc0b9efb17b0615512d4ab09348fb38e14999864ec1235d46565253b0543825f0aac8fcb62d
+EBUILD meterbridge-0.9.3.ebuild 807 BLAKE2B d7b4d29b312a81c962dd23874b3d32275a216d08a97fc3fbb6f6cab3dd8b1778f0b9ff9e5d16c4ff0dcbed87449c7606899343ee91e5e6d9e581d9162febbfdb SHA512 532fcd9473911c4b8284cd9e69fbefcd7d7d1eb04da0b3e78f7f4df3b585bb66f81c75aaa8cd6763261027018d4824f917c1a5ef1df0322ab1a0d5d9c6c295e2
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/meterbridge/meterbridge-0.9.3.ebuild b/media-sound/meterbridge/meterbridge-0.9.3.ebuild
index 2b51532ddda7..83bb62c55f3d 100644
--- a/media-sound/meterbridge/meterbridge-0.9.3.ebuild
+++ b/media-sound/meterbridge/meterbridge-0.9.3.ebuild
@@ -21,12 +21,15 @@ RDEPEND="media-sound/jack-audio-connection-kit
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc41.patch"
+	"${FILESDIR}/${P}-asneeded.patch"
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-setrgba.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${P}-setrgba.patch
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 42e1c5eab82c..90c0f642a9e4 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,9 +1,3 @@
-AUX mixxx-1.10.0-cflags.patch 573 BLAKE2B 15bb22bd2ae0c1f805a6279d6a488e81ed6aa5889ceceb0c03962c782e49422625337c3432b5528b857702ddabf0a296d5ae796b51e6ec2736fdafacaf9f4232 SHA512 1157161dc85314da07c47f5b42b654d5391ca3b84412f10915b5d15a9fe6cc0dbbf06f7e3156cb2f9cf21f0233ee50ae7e54cb10855332f0292b3bba915f857a
-AUX mixxx-1.10.0-docs.patch 327 BLAKE2B a40531618e0b51543c3f18f14c71b328cbb577a8172a8b42e40f0cc1fcbb5f8f6a78bbcaad812ee09ea252ba8ff28fc300486265f270ad9ad0f8d80aa2f42e9a SHA512 c785cab9ba558d5f4df04e6f89515a2056e2db84767061d0f0e1fa140fd419c384d49d78dae913e31663da4b8680a0ea966414be2c9309d4da5c2ba0dddadcc1
-AUX mixxx-1.10.0-no-bzr.patch 1503 BLAKE2B 50780142ca9611fa107fbd70627b9ab43d147f330ed3319aa0bc7f98ce22a5b1183a49841b33cda4115e4232ee81f407e311a0ad10ebbddca699ce68de295364 SHA512 faeedcdaa29ed6939b22ed6e60a8493c8d76f45904287667b4c7aa1b2e9acaa43810b005ad5d31eafb466e1717d18f773929ee41a9ab0e6c5c39b33fd07d8d59
-AUX mixxx-1.10.0-system-libs.patch 7152 BLAKE2B 9cacbf25c1919c3bc01d97bdb8b38d77760d65ffee40f8950fe226afcd1fb3bec0c419f39124b425800eedc244381d09d4e9ac6fda3ea892f2bec74e6fd1220a SHA512 18d47f0a68c9cd333ebd719e58421db27df15e9babd913750907d2a725236c6a7ad90b7c2a67b6b746d14f94676e746db0f2dcce80af09c02b0d762d6eb7d2b8
-AUX mixxx-1.11.0-no-bzr.patch 1390 BLAKE2B 2cf4ac3097c96d1f51f5623e8d0550cb58ecc45ce00cca801e76163eb7e80ec31929c6df15700b86ba29314606d1d619cd086f8c4f4c21d52ef9145c8b9c0bf5 SHA512 65f78fcb4c653b93d5ff0a308bca5ec16d0ccdd367e0ac8b15ca1d908aaee332316770cf6b11b2452b2ef8dfe44babd20fd60d58d2fca4cf794073601f6667bb
-AUX mixxx-1.11.0-system-libs.patch 8877 BLAKE2B 70bc82a5396abc6192f438ccd5278deca2e83c15d26dc60bfbe6c4a44228a0ffb8d7f6c2044b62a0c45fa6b72eb063cfc21771c0ff679de6f3be93f553d1084b SHA512 baabba8c7c873bfe5da4230f13787133b69ee72b83328b41e7eb4ade5d81350765309ae9be8154d93aeb9e7e1f90ef0ac2d8a20153d0600d41173d876d51331f
 AUX mixxx-2.0.0-chromaprint-1.4.patch 1518 BLAKE2B ead525e69d7c031b81aa00f969a1e569182eb958d794a6715d809d46dc8d5789b71e7d4dbd8a6ce8987013d614f3fd1b4b0a63fa488c7e2f48136614c3bafea8 SHA512 31da87b64646188be144611fc6f601d58edfcf9e63b5382060f5088797c24d61ff4b48a4e80c5c3b919b7291287d3977c0f61829ddfe7a43f9fbae7db3b735c0
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
 AUX mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch 1615 BLAKE2B 08a41664f1941ac100b8fbee0c92e064813f0eb549cfd17e766541034954c73ea8b5ca9c759d98edb1f3513447719313790000c92f47c53ef54e0b74fe8c7f6c SHA512 825599d1bdfbcc673c64226bde25f2ae56b046d32139c3347cb2aae698aa27158b17609dd097ce772e62bcd58b7f711d352386069683239541f3f4160dc6d915
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch b/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
deleted file mode 100644
index b6c8655a73a6..000000000000
--- a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mixxx-1.10.0/build/depends.py
-+++ mixxx-1.10.0/build/depends.py
-@@ -623,10 +555,8 @@
-         if build.toolchain_is_gnu:
-             # Default GNU Options
-             # TODO(XXX) always generate debugging info?
--            build.env.Append(CCFLAGS = '-pipe')
-             build.env.Append(CCFLAGS = '-Wall')
-             build.env.Append(CCFLAGS = '-Wextra')
--            build.env.Append(CCFLAGS = '-g')
- 
-             # Check that g++ is present (yeah, SCONS is a bit dumb here)
-             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch b/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
deleted file mode 100644
index c9205179881c..000000000000
--- a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mixxx-1.10.0/src/SConscript
-+++ mixxx-1.10.0/src/SConscript
-@@ -219,7 +218,6 @@
- 		env.Alias('install', keyboardmappings)
- 		if int(flags['ladspa']):
- 			env.Alias('install', ladspapresets)
--		env.Alias('install', docs)
- 		env.Alias('install', dotdesktop)
- 		env.Alias('install', icon)
- 		env.Alias('install', promotracks)
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
deleted file mode 100644
index 40f32266bb5e..000000000000
--- a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mixxx-1.10.0/src/SConscript.env
-+++ mixxx-1.10.0/src/SConscript.env
-@@ -19,21 +19,6 @@
-     print "Deleting deprecated build file: %s" % defs
-     os.remove(defs)
- 
--#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
--## instead, embed BZR version into build
--## Put version info into a file, so it doesn't force a rebuild of everything :)
--f = open("build.h","w")
--try:
--    branch_name = util.get_bzr_branch_name()
--    modified = util.get_bzr_modified() > 0
--    # Do not emit BUILD_BRANCH on release branches.
--    if not branch_name.startswith('release'):
--        f.write('#define BUILD_BRANCH "%s"\n' % branch_name)
--    f.write('#define BUILD_REV "%s%s"\n' % (util.get_bzr_revision(),
--                                            '+' if modified else ''))
--finally:
--    f.close()
--
- #Check for dependencies if we're not doing a clean...
- #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):
- conf = Configure(env, custom_tests = { 'CheckForPKGConfig' : util.CheckForPKGConfig,
---- mixxx-1.10.0/src/SConscript
-+++ mixxx-1.10.0/src/SConscript
-@@ -12,8 +12,8 @@
- from build import util
- 
- mixxx_version = util.get_mixxx_version()
--branch_name = util.get_bzr_branch_name()
--bazaar_revision = util.get_bzr_revision()
-+#branch_name = util.get_bzr_branch_name()
-+#bazaar_revision = util.get_bzr_revision()
- print "WE ARE IN:", os.getcwd()
- 
- plugins = []
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
deleted file mode 100644
index d2e21f3e005b..000000000000
--- a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
+++ /dev/null
@@ -1,172 +0,0 @@
---- mixxx-1.10.0/build/depends.py
-+++ mixxx-1.10.0/build/depends.py
-@@ -21,7 +21,7 @@
- 
-     def configure(self, build, conf):
-         #Check for PortTime
--        if not conf.CheckLib(['porttime', 'libporttime']) and \
-+        if not conf.CheckLib(['porttime', 'libportmidi']) and \
-                 not conf.CheckHeader(['porttime.h']):
-             raise Exception("Did not find PortTime or its development headers.")
-         if not conf.CheckLib(['portmidi', 'libportmidi']) and \
-@@ -189,25 +189,10 @@
- 
- class FidLib(Dependence):
- 
--    def sources(self, build):
--        symbol = None
--        if build.platform_is_windows:
--            if build.toolchain_is_msvs:
--                symbol = 'T_MSVC'
--            elif build.crosscompile:
--                # Not sure why, but fidlib won't build with mingw32msvc and
--                # T_MINGW
--                symbol = 'T_LINUX'
--            elif build.toolchain_is_gnu:
--                symbol = 'T_MINGW'
--        else:
--            symbol = 'T_LINUX'
--
--        return [build.env.StaticObject('#lib/fidlib-0.9.9/fidlib.c',
--                                       CPPDEFINES=symbol)]
--
-     def configure(self, build, conf):
--        build.env.Append(CPPPATH='#lib/fidlib-0.9.9/')
-+        if not conf.CheckLib('fidlib'):
-+            raise Exception('Did not find fidlib library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
- 
- class KissFFT(Dependence):
- 
-@@ -226,68 +211,15 @@
-         build.env.Append(CPPPATH="#lib/replaygain")
- 
- class SoundTouch(Dependence):
--    SOUNDTOUCH_PATH = 'soundtouch-1.5.0'
- 
-     def sources(self, build):
--        sources = ['engine/enginebufferscalest.cpp',
--                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
--        if build.platform_is_windows and build.toolchain_is_msvs:
--            if build.machine_is_64bit:
--                sources.append(
--                    '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH)
--            elif build.machine == 'x86':
--                sources.append(
--                    '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH)
--            else:
--                raise Exception("Unhandled CPU configuration for SoundTouch")
--        elif build.toolchain_is_gnu:
--            if build.machine == 'x86_64':
--                sources.append(
--                    '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH)
--            else:
--                sources.append(
--                    '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH)
--        else:
--            raise Exception("Unhandled CPU configuration for SoundTouch")
--
--        # TODO(XXX) when we figure out a better way to represent features, fix
--        # this.
--        optimize = int(util.get_flags(build.env, 'optimize', 1))
--        if build.machine_is_64bit or \
--                (build.toolchain_is_msvs and optimize > 1) or \
--                (build.toolchain_is_gnu and optimize > 2):
--            sources.extend(
--                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
--                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,
--                 ])
--        if build.toolchain_is_msvs and not build.machine_is_64bit:
--            sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH)
--        else:
--            # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have
--            # it.
--            pass
--
--        return sources
-+        return ['engine/enginebufferscalest.cpp']
- 
-     def configure(self, build, conf):
--        if build.platform_is_windows:
--            build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth)
--        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
--
--        # TODO(XXX) when we figure out a better way to represent features, fix
--        # this.
--        optimize = int(util.get_flags(build.env, 'optimize', 1))
--        if build.machine_is_64bit or \
--                (build.toolchain_is_msvs and optimize > 1) or \
--                (build.toolchain_is_gnu and optimize > 2):
--            build.env.Append(CPPDEFINES='ALLOW_X86_OPTIMIZATIONS')
-+        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
-+            raise Exception('Did not find SoundTouch library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
-+        build.env.Append(LIBS='SoundTouch')
- 
- class TagLib(Dependence):
-     def configure(self, build, conf):
---- mixxx-1.10.0/build/features.py
-+++ mixxx-1.10.0/build/features.py
-@@ -665,25 +659,15 @@
-         test_env.Append(CCFLAGS = '-pthread')
-         test_env.Append(LINKFLAGS = '-pthread')
- 
--        test_env.Append(CPPPATH="#lib/gtest-1.5.0/include")
--        gtest_dir = test_env.Dir("#lib/gtest-1.5.0")
--        #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
--        #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example, optional
--        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib'
--
--        env = test_env
--        SCons.Export('env')
--        env.SConscript(env.File('SConscript', gtest_dir))
--
--        # build and configure gmock
--        test_env.Append(CPPPATH="#lib/gmock-1.5.0/include")
--        gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
--        #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
--        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib'
--
--        env.SConscript(env.File('SConscript', gmock_dir))
--
--        return []
-+        if not conf.CheckLib('gtest'):
-+            raise Exception('Did not find gtest library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
-+        test_env.Append(LIBS='gtest')
-+
-+        if not conf.CheckLib('gmock'):
-+            raise Exception('Did not find gmock library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
-+        test_env.Append(LIBS='gmock')
- 
- class Shoutcast(Feature):
-     def description(self):
---- mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp
-+++ mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp
-@@ -20,7 +20,6 @@
- #include "engine/enginefilterbutterworth8.h"

- #include "engine/enginefilter.h"

- #include "engine/engineobject.h"

--#include "../lib/fidlib-0.9.9/fidlib.h"

- 

- /* Local Prototypes */

- inline double _processLowpass(double *coef, double *buf, register double val);

---- mixxx-1.10.0/src/engine/enginefilter.h
-+++ mixxx-1.10.0/src/engine/enginefilter.h
-@@ -20,7 +20,7 @@
- 
- #define MIXXX
- #include "engine/engineobject.h"
--#include "../lib/fidlib-0.9.9/fidlib.h"
-+#include "fidlib.h"
- #include "defs.h"
- 
- enum filterType{

diff --git a/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch
deleted file mode 100644
index b89d7f92f76e..000000000000
--- a/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- mixxx-1.11.0/src/SConscript
-+++ mixxx-1.11.0/src/SConscript
-@@ -12,8 +12,8 @@
- from build import util, depends
- 
- mixxx_version = util.get_mixxx_version()
--branch_name = util.get_bzr_branch_name()
--bazaar_revision = util.get_bzr_revision()
-+#branch_name = util.get_bzr_branch_name()
-+#bazaar_revision = util.get_bzr_revision()
- print "WE ARE IN:", os.getcwd()
- 
- plugins = []
---- mixxx-1.11.0/src/SConscript.env
-+++ mixxx-1.11.0/src/SConscript.env
-@@ -20,19 +20,6 @@
-     print "Deleting deprecated build file: %s" % defs
-     os.remove(defs)
- 
--#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
--## instead, embed BZR version into build
--## Put version info into a file, so it doesn't force a rebuild of everything :)
--
--if os.path.exists(os.path.join('..', 'build.h')):
--    # If a build.h exists in the project root mixxx/ directory then use that
--    # instead of writing our own. This is mostly since when we build Debian
--    # packages we don't have any of the Bazaar metadata so we can't write one
--    # ourselves.
--    shutil.copy(os.path.join('..', 'build.h'), 'build.h')
--else:
--    util.write_build_header('build.h')
--
- 
- #Check for dependencies if we're not doing a clean...
- #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):
diff --git a/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch
deleted file mode 100644
index 2f6b62c3440a..000000000000
--- a/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch
+++ /dev/null
@@ -1,223 +0,0 @@
---- mixxx-1.11.0/build/depends.py
-+++ mixxx-1.11.0/build/depends.py
-@@ -179,8 +179,8 @@
-         # times.
- 
-         qt_modules = [
--            'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', 'QtSvg',
--            'QtSql', 'QtScript', 'QtXmlPatterns', 'QtNetwork'
-+            'QtCore', 'QtGui', 'QtOpenGL', 'QtXml',
-+            'QtSql', 'QtScript', 'QtNetwork'
-             #'QtUiTools', #'QtDesigner',
-         ]
- 
-@@ -298,25 +298,10 @@
- 
- class FidLib(Dependence):
- 
--    def sources(self, build):
--        symbol = None
--        if build.platform_is_windows:
--            if build.toolchain_is_msvs:
--                symbol = 'T_MSVC'
--            elif build.crosscompile:
--                # Not sure why, but fidlib won't build with mingw32msvc and
--                # T_MINGW
--                symbol = 'T_LINUX'
--            elif build.toolchain_is_gnu:
--                symbol = 'T_MINGW'
--        else:
--            symbol = 'T_LINUX'
--
--        return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c',
--                                       CPPDEFINES=symbol)]
--
-     def configure(self, build, conf):
--        build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
-+        if not conf.CheckLib('fidlib'):
-+            raise Exception('Did not find fidlib library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
- 
- class ReplayGain(Dependence):
- 
-@@ -327,7 +312,6 @@
-         build.env.Append(CPPPATH="#lib/replaygain")
- 
- class SoundTouch(Dependence):
--    SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
- 
-     def sse_enabled(self, build):
-         optimize = int(util.get_flags(build.env, 'optimize', 1))
-@@ -336,30 +320,7 @@
-                 (build.toolchain_is_gnu and optimize > 1))
- 
-     def sources(self, build):
--        sources = ['engine/enginebufferscalest.cpp',
--                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
--                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
--
--        # SoundTouch CPU optimizations are only for x86
--        # architectures. SoundTouch automatically ignores these files when it is
--        # not being built for an architecture that supports them.
--        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \
--            '#lib/%s/cpu_detect_x86_gcc.cpp'
--        sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
--
--        # Check if the compiler has SSE extention enabled
--        # Allways the case on x64 (core instructions)
--        if self.sse_enabled(build):
--            sources.extend(
--                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
--                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,])
--        return sources
-+        return ['engine/enginebufferscalest.cpp']
- 
-     def configure(self, build, conf, env=None):
-         if env is None:
-@@ -367,13 +328,10 @@
-         if build.platform_is_windows:
-             # Regardless of the bitwidth, ST checks for WIN32
-             env.Append(CPPDEFINES = 'WIN32')
--        env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
--
--        # Check if the compiler has SSE extention enabled
--        # Allways the case on x64 (core instructions)
--        optimize = int(util.get_flags(env, 'optimize', 1))
--        if self.sse_enabled(build):
--            env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
-+        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
-+            raise Exception('Did not find SoundTouch library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
-+        build.env.Append(LIBS='SoundTouch')
- 
- class TagLib(Dependence):
-     def configure(self, build, conf):
---- mixxx-1.11.0/build/features.py
-+++ mixxx-1.11.0/build/features.py
-@@ -48,7 +48,6 @@
-                 'controllers/midi/hss1394enumerator.cpp']
- 
- class HID(Feature):
--    HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-pre'
-     def description(self):
-         return "HID controller support"
- 
-@@ -64,9 +63,6 @@
-     def configure(self, build, conf):
-         if not self.enabled(build):
-             return
--        # TODO(XXX) allow external hidapi install, but for now we just use our
--        # internal one.
--        build.env.Append(CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')])
- 
-         if build.platform_is_linux:
-             build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs')
-@@ -86,19 +82,17 @@
- 
-         build.env.Append(CPPDEFINES = '__HID__')
- 
-+        if not conf.CheckLib('hidapi-libusb'):
-+            raise Exception('Did not find HID API library, exiting!')
-+        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
-+        build.env.Append(LIBS='hidapi-libusb')
-+
-+
-     def sources(self, build):
-         sources = ['controllers/hid/hidcontroller.cpp',
-                    'controllers/hid/hidenumerator.cpp',
-                    'controllers/hid/hidcontrollerpresetfilehandler.cpp']
- 
--        if build.platform_is_windows:
--            # Requires setupapi.lib which is included by the above check for
--            # setupapi.
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
--        elif build.platform_is_linux:
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c'))
--        elif build.platform_is_osx:
--            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
-         return sources
- 
- class Bulk(Feature):
-@@ -455,19 +449,6 @@
- 
-         build.env.Append(CPPDEFINES = '__VAMP__')
- 
--        # Needed on Linux at least. Maybe needed elsewhere?
--        if build.platform_is_linux:
--            # Optionally link libdl and libX11. Required for some distros.
--            conf.CheckLib(['dl', 'libdl'])
--            conf.CheckLib(['X11', 'libX11'])
--
--        # FFTW3 support
--        have_fftw3_h = conf.CheckHeader('fftw3.h')
--        have_fftw3 = conf.CheckLib('fftw3', autoadd=False)
--        if(have_fftw3_h and have_fftw3 and build.platform_is_linux):
--             build.env.Append(CPPDEFINES = 'HAVE_FFTW3')
--             build.env.ParseConfig('pkg-config fftw3 --silence-errors --cflags --libs')
--
-     def sources(self, build):
-         sources = ['vamp/vampanalyser.cpp',
-                    'vamp/vamppluginloader.cpp',
-@@ -725,25 +706,15 @@
-         test_env.Append(CCFLAGS = '-pthread')
-         test_env.Append(LINKFLAGS = '-pthread')
- 
--        test_env.Append(CPPPATH="#lib/gtest-1.5.0/include")
--        gtest_dir = test_env.Dir("#lib/gtest-1.5.0")
--        #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
--        #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example, optional
--        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib'
--
--        env = test_env
--        SCons.Export('env')
--        env.SConscript(env.File('SConscript', gtest_dir))
--
--        # build and configure gmock
--        test_env.Append(CPPPATH="#lib/gmock-1.5.0/include")
--        gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
--        #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
--        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib'
--
--        env.SConscript(env.File('SConscript', gmock_dir))
--
--        return []
-+        if not conf.CheckLib('gtest'):
-+            raise Exception('Did not find gtest library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
-+        test_env.Append(LIBS='gtest')
-+
-+        if not conf.CheckLib('gmock'):
-+            raise Exception('Did not find gmock library, exiting!')
-+        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
-+        test_env.Append(LIBS='gmock')
- 
- class Shoutcast(Feature):
-     def description(self):
---- mixxx-1.11.0/src/engine/enginefilterbutterworth8.cpp
-+++ mixxx-1.11.0/src/engine/enginefilterbutterworth8.cpp
-@@ -20,7 +20,7 @@
- #include "engine/enginefilterbutterworth8.h"

- #include "engine/enginefilter.h"

- #include "engine/engineobject.h"

--#include "../lib/fidlib-0.9.10/fidlib.h"

-+#include <fidlib.h>

- 

- /* Local Prototypes */

- inline double _processLowpass(double *coef, double *buf, register double val);

---- mixxx-1.11.0/src/engine/enginefilter.h
-+++ mixxx-1.11.0/src/engine/enginefilter.h
-@@ -20,7 +20,7 @@
- 
- #define MIXXX
- #include "engine/engineobject.h"
--#include "../lib/fidlib-0.9.10/fidlib.h"
-+#include <fidlib.h>
- #include "defs.h"
- 
- enum filterType{